corrected conflicts after import of libpng-1.2.4

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

diff --git a/include/wx/quantize.h b/include/wx/quantize.h
index 592718e431377b126dd53262c1743d32241ed3ae..fac092df9a9e9b7ad267e4f681cd3e110f43ec7b 100644 (file)
--- a/include/wx/quantize.h
+++ b/include/wx/quantize.h
@@ -42,7 +42,8 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
 
 //// Constructor
 
-    wxQuantize() {};
+    wxQuantize() {}
+    ~wxQuantize() {}
 
 //// Operations
 
@@ -52,7 +53,7 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
     // This palette may be passed to ConvertImageToBitmap, for example.
     // If you pass a palette pointer, you must free the palette yourself.
 
-    static bool Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalette = NULL, int desiredNoColours = 236,
+    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