X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/649d13e837b25f7b948ccfae02b18131f3a0a743..2e09dc2dc80d5dd5c42a559c4dd4738ed006a276:/src/common/image.cpp?ds=sidebyside

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 73f00d9f88..2c5ba9758d 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -275,6 +275,14 @@ wxImage wxImage::Scale( int width, int height ) const
     }
 #endif
 
+    // In case this is a cursor, make sure the hotspot is scalled accordingly:
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height);
+
     return image;
 }
 
@@ -723,12 +731,12 @@ int wxImage::GetHeight() const
 
 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;
    
-    ComputeHistogram( hTable );
+    ComputeHistogram(histogram);
     
     unsigned char r2 = startR;
     unsigned char g2 = startG;
@@ -736,7 +744,7 @@ bool wxImage::FindFirstUnusedColour(
     
     key = (r2 << 16) | (g2 << 8) | b2;
 
-    while ( (wxHNode *) hTable.Get(key) )
+    while ( histogram.find(key) != histogram.end() )
     {
         // color already used
         r2++;
@@ -930,9 +938,11 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
 #endif // wxUSE_STREAMS
 }
 
-bool wxImage::SaveFile( const wxString& filename, int type )
+bool wxImage::SaveFile( const wxString& filename, int type ) const
 {
 #if wxUSE_STREAMS
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
@@ -945,9 +955,11 @@ bool wxImage::SaveFile( const wxString& filename, int type )
     return FALSE;
 }
 
-bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
+bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
 {
 #if wxUSE_STREAMS
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
@@ -1089,7 +1101,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
     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") );
 
@@ -1102,10 +1114,10 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type )
         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") );
 
@@ -1118,7 +1130,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
         return FALSE;
     }
 
-    return handler->SaveFile( this, stream );
+    return handler->SaveFile( (wxImage*)this, stream );
 }
 #endif // wxUSE_STREAMS
 
@@ -1203,7 +1215,10 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 
 void wxImage::InitStandardHandlers()
 {
+#if wxUSE_STREAMS
     AddHandler(new wxBMPHandler);
+#endif // wxUSE_STREAMS
+
 #if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
     AddHandler(new wxXPMHandler);
 #endif
@@ -1319,7 +1334,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).
 //
-unsigned long wxImage::CountColours( unsigned long stopafter )
+unsigned long wxImage::CountColours( unsigned long stopafter ) const
 {
     wxHashTable h;
     wxObject dummy;
@@ -1349,19 +1364,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;
-    wxHNode *hnode;
+
+    h.clear();
 
     p = GetData();
     size = GetWidth() * GetHeight();
@@ -1374,18 +1383,9 @@ unsigned long wxImage::ComputeHistogram( wxHashTable &h )
         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;