Unicode compilation fix

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

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index f6e1fb45baea63a82a54988b2dce6bdbe4426f7e..07c63c52e246df6542279b99013b887be1413fd1 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -1483,8 +1483,11 @@ void wxQuantize::DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, uns
 // TODO: somehow make use of the Windows system colours, rather than ignoring them for the
 // purposes of quantization.
 
 // TODO: somehow make use of the Windows system colours, rather than ignoring them for the
 // purposes of quantization.
 

-bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalette, int desiredNoColours,
-        unsigned char** eightBitData, int flags)
+bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
+                          wxPalette** pPalette,
+                          int desiredNoColours,
+                          unsigned char** eightBitData,
+                          int flags)

 
 {
     int i;
 
 {
     int i;


@@ -1559,6 +1562,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalett
     else
         delete[] data8bit;
 
     else
         delete[] data8bit;
 

+#if wxUSE_PALETTE

     // Make a wxWindows palette
     if (pPalette)
     {
     // Make a wxWindows palette
     if (pPalette)
     {


@@ -1604,6 +1608,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalett
         delete[] g;
         delete[] b;
     }
         delete[] g;
         delete[] b;
     }

+#endif // wxUSE_PALETTE

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -1611,20 +1616,24 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalett
 // This version sets a palette in the destination image so you don't
 // have to manage it yourself.
 
 // This version sets a palette in the destination image so you don't
 // have to manage it yourself.
 

-bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, int desiredNoColours,
-        unsigned char** eightBitData, int flags)
+bool wxQuantize::Quantize(const wxImage& src,
+                          wxImage& dest,
+                          int desiredNoColours,
+                          unsigned char** eightBitData,
+                          int flags)

 {
     wxPalette* palette = NULL;
 {
     wxPalette* palette = NULL;

-    if (Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags))
+    if ( !Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags) )
+        return FALSE;
+
+#if wxUSE_PALETTE
+    if (palette)

     {
     {

-        if (palette)
-        {
-            dest.SetPalette(* palette);
-            delete palette;
-        }
-        return TRUE;
+        dest.SetPalette(* palette);
+        delete palette;

     }
     }

-    else
-        return FALSE;
+#endif // wxUSE_PALETTE
+
+    return TRUE;

 }
 
 }