X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/559a723c1dcf8b3929ab3122fb04429d4abdda8e..cc4d5638c66a409e421420ed7110917755a66788:/src/common/quantize.cpp diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index b5936f21fb..618f4e26b6 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 22/6/2000 -// RCS-ID: $Id$ // Copyright: (c) Thomas G. Lane, Vaclav Slavik, Julian Smart // Licence: wxWindows licence + JPEG library licence ///////////////////////////////////////////////////////////////////////////// @@ -43,12 +42,11 @@ #ifndef WX_PRECOMP #include "wx/palette.h" + #include "wx/image.h" #endif -#include "wx/image.h" - #ifdef __WXMSW__ -#include "wx/msw/private.h" + #include "wx/msw/private.h" #endif #include @@ -1547,7 +1545,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE) { - if (!dest.Ok()) + if (!dest.IsOk()) dest.Create(w, h); imgdt = dest.GetData(); @@ -1622,7 +1620,9 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, delete[] g; delete[] b; } -#endif // wxUSE_PALETTE +#else // !wxUSE_PALETTE + wxUnusedVar(pPalette); +#endif // wxUSE_PALETTE/!wxUSE_PALETTE return true; }