use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

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

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 6b702ebf5e7c5299e461bfaf0f6effbd986d2dd7..55fe0fc032c26ba09164bf181cbe5a4706ce2581 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -30,7 +30,7 @@
 
 /* modified by Vaclav Slavik for use as jpeglib-independent module */
 
 
 /* modified by Vaclav Slavik for use as jpeglib-independent module */
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "quantize.h"
 #endif
 
 #pragma implementation "quantize.h"
 #endif
 


@@ -42,13 +42,16 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/palette.h"

 #endif
 
 #endif
 

+#if wxUSE_IMAGE
+

 #include "wx/image.h"
 #include "wx/quantize.h"
 
 #ifdef __WXMSW__
 #include "wx/image.h"
 #include "wx/quantize.h"
 
 #ifdef __WXMSW__

-#include <windows.h>
+#include "wx/msw/private.h"

 #endif
 
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>


@@ -90,7 +93,7 @@ typedef struct {
         JSAMPLE *sample_range_limit, *srl_orig;
 } j_decompress;
 
         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
     #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,
 
 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;
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   register JSAMPROW ptr;


@@ -1284,7 +1287,7 @@ finish_pass1 (j_decompress_ptr cinfo)
 
 
 void
 
 
 void

-finish_pass2 (j_decompress_ptr cinfo)
+finish_pass2 (j_decompress_ptr WXUNUSED(cinfo))

 {
   /* no work */
 }
 {
   /* no work */
 }


@@ -1299,7 +1302,6 @@ start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   hist3d histogram = cquantize->histogram;
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   hist3d histogram = cquantize->histogram;

-  int i;

 
   if (is_pre_scan) {
     /* Set up method pointers */
 
   if (is_pre_scan) {
     /* Set up method pointers */


@@ -1311,9 +1313,6 @@ start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
     cquantize->pub.color_quantize = pass2_fs_dither;
     cquantize->pub.finish_pass = finish_pass2;
 
     cquantize->pub.color_quantize = pass2_fs_dither;
     cquantize->pub.finish_pass = finish_pass2;
 

-    /* Make sure color count is acceptable */
-    i = cinfo->actual_number_of_colors;
-

     {
       size_t arraysize = (size_t) ((cinfo->output_width + 2) *
                    (3 * sizeof(FSERROR)));
     {
       size_t arraysize = (size_t) ((cinfo->output_width + 2) *
                    (3 * sizeof(FSERROR)));


@@ -1331,7 +1330,7 @@ start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
   }
   /* Zero the histogram or inverse color map, if necessary */
   if (cquantize->needs_zeroed) {
   }
   /* Zero the histogram or inverse color map, if necessary */
   if (cquantize->needs_zeroed) {

-    for (i = 0; i < HIST_C0_ELEMS; i++) {
+    for (int i = 0; i < HIST_C0_ELEMS; i++) {

       memset((void  *) histogram[i], 0,
         HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
     }
       memset((void  *) histogram[i], 0,
         HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
     }


@@ -1507,8 +1506,6 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
 
 {
     int i;
 
 {
     int i;

-    int w = src.GetWidth();
-    int h = src.GetHeight();

 
     int windowsSystemColourCount = 20;
 
 
     int windowsSystemColourCount = 20;
 


@@ -1526,8 +1523,9 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
 #endif
 
     // create rows info:
 #endif
 
     // create rows info:

+    int h = src.GetHeight();
+    int w = src.GetWidth();

     unsigned char **rows = new unsigned char *[h];
     unsigned char **rows = new unsigned char *[h];

-    h = src.GetHeight(), w = src.GetWidth();

     unsigned char *imgdt = src.GetData();
     for (i = 0; i < h; i++)
         rows[i] = imgdt + 3/*RGB*/ * w * i;
     unsigned char *imgdt = src.GetData();
     for (i = 0; i < h; i++)
         rows[i] = imgdt + 3/*RGB*/ * w * i;


@@ -1654,3 +1652,6 @@ bool wxQuantize::Quantize(const wxImage& src,
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif
+    // wxUSE_IMAGE
+