mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +01:00
822326eea9
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
76 lines
2.6 KiB
C++
76 lines
2.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/quantize.h
|
|
// Purpose: wxQuantizer class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 22/6/2000
|
|
// Copyright: (c) Julian Smart
|
|
// Licence:
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_QUANTIZE_H_
|
|
#define _WX_QUANTIZE_H_
|
|
|
|
#include "wx/object.h"
|
|
|
|
/*
|
|
* From jquant2.c
|
|
*
|
|
* Copyright (C) 1991-1996, Thomas G. Lane.
|
|
* This file is part of the Independent JPEG Group's software.
|
|
* For conditions of distribution and use, see the accompanying README file.
|
|
*/
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxImage;
|
|
class WXDLLIMPEXP_FWD_CORE wxPalette;
|
|
|
|
/*
|
|
* wxQuantize
|
|
* Based on the JPEG quantization code. Reduces the number of colours in a wxImage.
|
|
*/
|
|
|
|
#define wxQUANTIZE_INCLUDE_WINDOWS_COLOURS 0x01
|
|
#define wxQUANTIZE_RETURN_8BIT_DATA 0x02
|
|
#define wxQUANTIZE_FILL_DESTINATION_IMAGE 0x04
|
|
|
|
class WXDLLIMPEXP_CORE wxQuantize: public wxObject
|
|
{
|
|
public:
|
|
wxDECLARE_DYNAMIC_CLASS(wxQuantize);
|
|
|
|
//// Constructor
|
|
|
|
wxQuantize() {}
|
|
virtual ~wxQuantize() {}
|
|
|
|
//// Operations
|
|
|
|
// Reduce the colours in the source image and put the result into the
|
|
// destination image. Both images may be the same, to overwrite the source image.
|
|
// Specify an optional palette pointer to receive the resulting palette.
|
|
// This palette may be passed to ConvertImageToBitmap, for example.
|
|
// If you pass a palette pointer, you must free the palette yourself.
|
|
|
|
static bool Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalette, int desiredNoColours = 236,
|
|
unsigned char** eightBitData = 0, int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE|wxQUANTIZE_RETURN_8BIT_DATA);
|
|
|
|
// This version sets a palette in the destination image so you don't
|
|
// have to manage it yourself.
|
|
|
|
static bool Quantize(const wxImage& src, wxImage& dest, int desiredNoColours = 236,
|
|
unsigned char** eightBitData = 0, int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE|wxQUANTIZE_RETURN_8BIT_DATA);
|
|
|
|
//// Helpers
|
|
|
|
// Converts input bitmap(s) into 8bit representation with custom palette
|
|
|
|
// in_rows and out_rows are arrays [0..h-1] of pointer to rows
|
|
// (in_rows contains w * 3 bytes per row, out_rows w bytes per row)
|
|
// fills out_rows with indexes into palette (which is also stored into palette variable)
|
|
static void DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, unsigned char **out_rows, unsigned char *palette, int desiredNoColours);
|
|
|
|
};
|
|
|
|
#endif
|
|
// _WX_QUANTIZE_H_
|