X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..a0c6a355b7b53866286ec6263b99f787cfdbe731:/src/common/quantize.cpp

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 47ca3a956d..736619734c 100644
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -30,7 +30,7 @@
 
 /* modified by Vaclav Slavik for use as jpeglib-independent module */
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "quantize.h"
 #endif
 
@@ -42,13 +42,16 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/palette.h"
 #endif
 
+#if wxUSE_IMAGE
+
 #include "wx/image.h"
 #include "wx/quantize.h"
 
 #ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/private.h"
 #endif
 
 #include <stdlib.h>
@@ -90,7 +93,7 @@ typedef struct {
         JSAMPLE *sample_range_limit, *srl_orig;
 } j_decompress;
 
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
     #define JMETHOD(type,methodname,arglist)  type (__cdecl methodname) arglist
 #else
     #define JMETHOD(type,methodname,arglist)  type (methodname) arglist
@@ -334,7 +337,7 @@ typedef my_cquantizer * my_cquantize_ptr;
 
 void
 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-          JSAMPARRAY output_buf, int num_rows)
+          JSAMPARRAY WXUNUSED(output_buf), int num_rows)
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   register JSAMPROW ptr;
@@ -549,7 +552,7 @@ median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
     /* Select box to split.
      * Current algorithm: by population for first half, then by volume.
      */
-    if (numboxes*2 <= desired_colors) {
+    if ((numboxes*2) <= desired_colors) {
       b1 = find_biggest_color_pop(boxlist, numboxes);
     } else {
       b1 = find_biggest_volume(boxlist, numboxes);
@@ -1284,7 +1287,7 @@ finish_pass1 (j_decompress_ptr cinfo)
 
 
 void
-finish_pass2 (j_decompress_ptr cinfo)
+finish_pass2 (j_decompress_ptr WXUNUSED(cinfo))
 {
   /* no work */
 }
@@ -1654,3 +1657,6 @@ bool wxQuantize::Quantize(const wxImage& src,
     return TRUE;
 }
 
+#endif
+    // wxUSE_IMAGE
+