cleanup - fixed warnings, reformatting

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

diff --git a/include/wx/quantize.h b/include/wx/quantize.h
index 592718e431377b126dd53262c1743d32241ed3ae..6133e2863d0256c063c44b86902a6be5ffa6ad78 100644 (file)
--- a/include/wx/quantize.h
+++ b/include/wx/quantize.h
@@ -9,6 +9,9 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_QUANTIZE_H_
+#define _WX_QUANTIZE_H_
+

 /*
  * From jquant2.c
  *
 /*
  * From jquant2.c
  *


@@ -17,13 +20,6 @@
  * For conditions of distribution and use, see the accompanying README file.
  */
 
  * For conditions of distribution and use, see the accompanying README file.
  */
 

-#ifdef __GNUG__
-#pragma interface "quantize.h"
-#endif
-
-#ifndef _WX_QUANTIZE_H_
-#define _WX_QUANTIZE_H_
-

 class WXDLLEXPORT wxImage;
 
 /*
 class WXDLLEXPORT wxImage;
 
 /*


@@ -42,7 +38,8 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
 
 //// Constructor
 
 
 //// Constructor
 

-    wxQuantize() {};
+    wxQuantize() {}
+    ~wxQuantize() {}

 
 //// Operations
 
 
 //// Operations
 


@@ -52,7 +49,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.
 
     // 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
         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


@@ -64,7 +61,7 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
 //// Helpers
 
     // Converts input bitmap(s) into 8bit representation with custom palette
 //// Helpers
 
     // Converts input bitmap(s) into 8bit representation with custom palette

-    
+

     // in_rows and out_rows are arrays [0..h-1] of pointer to rows
     // (in_rows contains w * 3 bytes per row, out_rows w bytes per row)
     // fills out_rows with indexes into palette (which is also stored into palette variable)
     // in_rows and out_rows are arrays [0..h-1] of pointer to rows
     // (in_rows contains w * 3 bytes per row, out_rows w bytes per row)
     // fills out_rows with indexes into palette (which is also stored into palette variable)