wxX11 might compile now.

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index d45076980834c64af7b736420bb0ac35dc268d4c..48b39581f5a6a69f1d13687d93e268061fb44db7 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -723,12 +723,12 @@ int wxImage::GetHeight() const
 
 bool wxImage::FindFirstUnusedColour(
             unsigned char *r, unsigned char *g, unsigned char *b,
 
 bool wxImage::FindFirstUnusedColour(
             unsigned char *r, unsigned char *g, unsigned char *b,

-            unsigned char startR, unsigned char startG, unsigned char startB)
+            unsigned char startR, unsigned char startG, unsigned char startB) const

 {
 {

-    wxHashTable hTable;
+    wxImageHistogram histogram;

     unsigned long key;
    
     unsigned long key;
    

-    ComputeHistogram( hTable );
+    ComputeHistogram(histogram);

     
     unsigned char r2 = startR;
     unsigned char g2 = startG;
     
     unsigned char r2 = startR;
     unsigned char g2 = startG;


@@ -736,7 +736,7 @@ bool wxImage::FindFirstUnusedColour(
     
     key = (r2 << 16) | (g2 << 8) | b2;
 
     
     key = (r2 << 16) | (g2 << 8) | b2;
 

-    while ( (wxHNode *) hTable.Get(key) )
+    while ( histogram.find(key) != histogram.end() )

     {
         // color already used
         r2++;
     {
         // color already used
         r2++;


@@ -930,7 +930,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS
 }
 

-bool wxImage::SaveFile( const wxString& filename, int type )
+bool wxImage::SaveFile( const wxString& filename, int type ) const

 {
 #if wxUSE_STREAMS
     wxFileOutputStream stream(filename);
 {
 #if wxUSE_STREAMS
     wxFileOutputStream stream(filename);


@@ -945,7 +945,7 @@ bool wxImage::SaveFile( const wxString& filename, int type )
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
+bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const

 {
 #if wxUSE_STREAMS
     wxFileOutputStream stream(filename);
 {
 #if wxUSE_STREAMS
     wxFileOutputStream stream(filename);


@@ -1089,7 +1089,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
     return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
 }
 
     return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
 }
 

-bool wxImage::SaveFile( wxOutputStream& stream, int type )
+bool wxImage::SaveFile( wxOutputStream& stream, int type ) const

 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
 
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
 


@@ -1102,10 +1102,10 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type )
         return FALSE;
     }
 
         return FALSE;
     }
 

-    return handler->SaveFile( this, stream );
+    return handler->SaveFile( (wxImage*)this, stream );

 }
 
 }
 

-bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
+bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const

 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
 
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
 


@@ -1118,7 +1118,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
         return FALSE;
     }
 
         return FALSE;
     }
 

-    return handler->SaveFile( this, stream );
+    return handler->SaveFile( (wxImage*)this, stream );

 }
 #endif // wxUSE_STREAMS
 
 }
 #endif // wxUSE_STREAMS
 


@@ -1322,7 +1322,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
 // less, in this case it would be invoked as CountColours(256)). Default
 // value for stopafter is -1 (don't care).
 //
 // less, in this case it would be invoked as CountColours(256)). Default
 // value for stopafter is -1 (don't care).
 //

-unsigned long wxImage::CountColours( unsigned long stopafter )
+unsigned long wxImage::CountColours( unsigned long stopafter ) const

 {
     wxHashTable h;
     wxObject dummy;
 {
     wxHashTable h;
     wxObject dummy;


@@ -1352,19 +1352,13 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
 }
 
 
 }
 
 

-// GRG, Dic/99
-// Computes the histogram of the image and fills a hash table, indexed
-// with integer keys built as 0xRRGGBB, containing wxHNode objects. Each
-// wxHNode contains an 'index' (useful to build a palette with the image
-// colours) and a 'value', which is the number of pixels in the image with
-// that colour.
-//
-unsigned long wxImage::ComputeHistogram( wxHashTable &h )
+unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const

 {
     unsigned char r, g, b;
     unsigned char *p;
     unsigned long size, nentries, key;
 {
     unsigned char r, g, b;
     unsigned char *p;
     unsigned long size, nentries, key;

-    wxHNode *hnode;
+
+    h.clear();

 
     p = GetData();
     size = GetWidth() * GetHeight();
 
     p = GetData();
     size = GetWidth() * GetHeight();


@@ -1377,18 +1371,9 @@ unsigned long wxImage::ComputeHistogram( wxHashTable &h )
         b = *(p++);
         key = (r << 16) | (g << 8) | b;
 
         b = *(p++);
         key = (r << 16) | (g << 8) | b;
 

-        hnode = (wxHNode *) h.Get(key);
-
-        if (hnode)
-            hnode->value++;
-        else
-        {
-            hnode = new wxHNode();
-            hnode->index = nentries++;
-            hnode->value = 1;
-
-            h.Put(key, (wxObject *)hnode);
-        }
+        wxImageHistogramEntry& entry = h[key];
+        if ( entry.value++ == 0 )
+            entry.index = nentries++;

     }
 
     return nentries;
     }
 
     return nentries;