Fix a number of mingw compile errors.

[wxWidgets.git] / src / common / quantize.cpp

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index b5936f21fb74430668eda7f2d254548ee5d34910..57b311ec3a93b5b18b9791cf7020d1327a1a6816 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -43,12 +43,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/palette.h"
 
 #ifndef WX_PRECOMP
     #include "wx/palette.h"

+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/image.h"
-

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-#include "wx/msw/private.h"
+    #include "wx/msw/private.h"

 #endif
 
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>


@@ -1622,7 +1621,9 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
         delete[] g;
         delete[] b;
     }
         delete[] g;
         delete[] b;
     }

-#endif // wxUSE_PALETTE
+#else // !wxUSE_PALETTE
+    wxUnusedVar(pPalette);
+#endif // wxUSE_PALETTE/!wxUSE_PALETTE

 
     return true;
 }
 
     return true;
 }