don't write the strings to the stream one char at a time, it's *horribly* slow

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 80ee2992d37d815c1fde1ce76cd6465c43f1e2ce..3241ed03cd28b49cc16423fc9d1888c2f66e5241 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -131,6 +131,7 @@ wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )
 #endif // wxUSE_STREAMS
 
 wxImage::wxImage( const wxImage& image )
 #endif // wxUSE_STREAMS
 
 wxImage::wxImage( const wxImage& image )

+    : wxObject()

 {
     Ref(image);
 }
 {
     Ref(image);
 }


@@ -198,8 +199,8 @@ wxImage wxImage::Copy() const
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    image.SetMask( M_IMGDATA->m_hasMask );

 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 


@@ -275,6 +276,14 @@ wxImage wxImage::Scale( int width, int height ) const
     }
 #endif
 
     }
 #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;
 }
 
     return image;
 }
 


@@ -723,12 +732,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 +745,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,9 +939,29 @@ 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 ) const
+{
+    wxString ext = filename.AfterLast('.').Lower();
+    
+    wxImageHandler * pHandler = FindHandler(ext, -1);
+    if (pHandler)
+    {
+        SaveFile(filename, pHandler->GetType());
+        return TRUE;
+    }
+
+    wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
+
+    return FALSE;
+}
+
+bool wxImage::SaveFile( const wxString& filename, int type ) const

 {
 #if wxUSE_STREAMS
 {
 #if wxUSE_STREAMS

+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+

     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )


@@ -945,9 +974,11 @@ 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
 {
 #if wxUSE_STREAMS

+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+

     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )
     wxFileOutputStream stream(filename);
 
     if ( stream.LastError() == wxStream_NOERROR )


@@ -970,11 +1001,11 @@ bool wxImage::CanRead( const wxString &name )
 #endif
 }
 
 #endif
 }
 

-int wxImage::GetImagesCount( const wxString &name, long type )
+int wxImage::GetImageCount( const wxString &name, long type )

 {
 #if wxUSE_STREAMS
   wxFileInputStream stream(name);
 {
 #if wxUSE_STREAMS
   wxFileInputStream stream(name);

-  return GetImagesCount(stream, type);
+  return GetImageCount(stream, type);

 #else
   return 0;
 #endif
 #else
   return 0;
 #endif


@@ -984,7 +1015,7 @@ int wxImage::GetImagesCount( const wxString &name, long type )
 
 bool wxImage::CanRead( wxInputStream &stream )
 {
 
 bool wxImage::CanRead( wxInputStream &stream )
 {

-    wxList &list=GetHandlers();
+    const wxList& list = GetHandlers();

 
     for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
     {
 
     for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
     {


@@ -996,7 +1027,7 @@ bool wxImage::CanRead( wxInputStream &stream )
     return FALSE;
 }
 
     return FALSE;
 }
 

-int wxImage::GetImagesCount( wxInputStream &stream, long type )
+int wxImage::GetImageCount( wxInputStream &stream, long type )

 {
     wxImageHandler *handler;
 
 {
     wxImageHandler *handler;
 


@@ -1008,7 +1039,7 @@ int wxImage::GetImagesCount( wxInputStream &stream, long type )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )
         {
              handler=(wxImageHandler*)node->GetData();
              if ( handler->CanRead(stream) )

-                 return handler->GetImagesCount(stream);
+                 return handler->GetImageCount(stream);

 
         }
 
 
         }
 


@@ -1026,7 +1057,7 @@ int wxImage::GetImagesCount( wxInputStream &stream, long type )
 
     if ( handler->CanRead(stream) )
     {
 
     if ( handler->CanRead(stream) )
     {

-        return handler->GetImagesCount(stream);
+        return handler->GetImageCount(stream);

     }
     else
     {
     }
     else
     {


@@ -1086,10 +1117,10 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
         return FALSE;
     }
 
         return FALSE;
     }
 

-    return handler->LoadFile( this, stream, 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 +1133,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 +1149,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
 


@@ -1203,7 +1234,10 @@ wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 
 void wxImage::InitStandardHandlers()
 {
 
 void wxImage::InitStandardHandlers()
 {

+#if wxUSE_STREAMS

     AddHandler(new wxBMPHandler);
     AddHandler(new wxBMPHandler);

+#endif // wxUSE_STREAMS
+

 #if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
     AddHandler(new wxXPMHandler);
 #endif
 #if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
     AddHandler(new wxXPMHandler);
 #endif


@@ -1239,7 +1273,7 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSE
     return FALSE;
 }
 
     return FALSE;
 }
 

-int wxImageHandler::GetImagesCount( wxInputStream& WXUNUSED(stream) )
+int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )

 {
     return 1;
 }
 {
     return 1;
 }


@@ -1252,12 +1286,32 @@ bool wxImageHandler::CanRead( const wxString& name )
         return CanRead(stream);
     }
 
         return CanRead(stream);
     }
 

-    else {
-        wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
+    wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );

 
 

+    return FALSE;
+}
+
+bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
+{
+    off_t posOld = stream.TellI();
+    if ( posOld == wxInvalidOffset )
+    {
+        // can't test unseekable stream

         return FALSE;
     }
         return FALSE;
     }

-//    return FALSE;
+
+    bool ok = DoCanRead(stream);
+
+    // restore the old position to be able to test other formats and so on
+    if ( stream.SeekI(posOld) == wxInvalidOffset )
+    {
+        wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
+
+        // reading would fail anyhow as we're not at the right position
+        return FALSE;
+    }
+
+    return ok;

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


@@ -1265,10 +1319,10 @@ bool wxImageHandler::CanRead( const wxString& name )
 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------

-// wxBitmap convertion routines
+// Deprecated wxBitmap convertion routines

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI

 
 #ifdef __WXGTK__
 wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const
 
 #ifdef __WXGTK__
 wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const


@@ -1290,24 +1344,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     *this = bitmap.ConvertToImage();
 }
 
     *this = bitmap.ConvertToImage();
 }
 

-#endif
-
-
-
-// A module to allow wxImage initialization/cleanup
-// without calling these functions from app.cpp or from
-// the user's application.
-
-class wxImageModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxImageModule)
-public:
-    wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
-    void OnExit() { wxImage::CleanUpHandlers(); };
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+#endif // WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -1319,7 +1356,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;


@@ -1349,19 +1386,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();


@@ -1374,18 +1405,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;


@@ -1649,4 +1671,24 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     return rotated;
 }
 
     return rotated;
 }
 

+
+
+
+
+// A module to allow wxImage initialization/cleanup
+// without calling these functions from app.cpp or from
+// the user's application.
+
+class wxImageModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxImageModule)
+public:
+    wxImageModule() {}
+    bool OnInit() { wxImage::InitStandardHandlers(); return TRUE; };
+    void OnExit() { wxImage::CleanUpHandlers(); };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+
+

 #endif // wxUSE_IMAGE
 #endif // wxUSE_IMAGE