return wxStandardPaths, not wxStandardPathsBase, from wxStandardPathsBase::Get()...

[wxWidgets.git] / interface / wx / quantize.h

diff --git a/interface/wx/quantize.h b/interface/wx/quantize.h
index eeea5bcad9476d4cd46647882d6711ca9ffc9c5c..b98564cb3651201742bc0728710ae841d403f759 100644 (file)
--- a/interface/wx/quantize.h
+++ b/interface/wx/quantize.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxQuantize
 
 /**
     @class wxQuantize

-    @wxheader{quantize.h}

 
     Performs quantization, or colour reduction, on a wxImage.
 
 
     Performs quantization, or colour reduction, on a wxImage.
 


@@ -34,9 +33,9 @@ public:
         Fills @a out_rows with indexes into palette (which is also stored into @a palette
         variable).
     */
         Fills @a out_rows with indexes into palette (which is also stored into @a palette
         variable).
     */

-    void DoQuantize(unsigned w, unsigned h, unsigned char** in_rows,
-                    unsigned char** out_rows, unsigned char* palette,
-                    int desiredNoColours);
+    static void DoQuantize(unsigned int w, unsigned int h,
+                           unsigned char** in_rows, unsigned char** out_rows,
+                           unsigned char* palette, int desiredNoColours);

 
     /**
         Reduce the colours in the source image and put the result into the destination image.
 
     /**
         Reduce the colours in the source image and put the result into the destination image.


@@ -45,22 +44,22 @@ public:
         Specify an optional palette pointer to receive the resulting palette.
         This palette may be passed to ConvertImageToBitmap, for example.
     */
         Specify an optional palette pointer to receive the resulting palette.
         This palette may be passed to ConvertImageToBitmap, for example.
     */

-    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);
+    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.
     */
 
     /**
         This version sets a palette in the destination image so you don't
         have to manage it yourself.
     */

-    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);
+    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);

 };
 
 };