ensure minimal mime support in wxHTML even without wxMimeTypesMananger

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index fe48bf366af3b2f6e342ad7a56964c8cea4b8fcb..73f00d9f88508e2f82617bd60d09adf2a54c0177 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -108,25 +108,25 @@ wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
     Create( width, height, data, static_data );
 }
 
     Create( width, height, data, static_data );
 }
 

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

 {
 {

-    LoadFile( name, type );
+    LoadFile( name, type, index );

 }
 
 }
 

-wxImage::wxImage( const wxString& name, const wxString& mimetype )
+wxImage::wxImage( const wxString& name, const wxString& mimetype, int index )

 {
 {

-    LoadFile( name, mimetype );
+    LoadFile( name, mimetype, index );

 }
 
 #if wxUSE_STREAMS
 }
 
 #if wxUSE_STREAMS

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

 {
 {

-    LoadFile( stream, type );
+    LoadFile( stream, type, index );

 }
 
 }
 

-wxImage::wxImage( wxInputStream& stream, const wxString& mimetype )
+wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )

 {
 {

-    LoadFile( stream, mimetype );
+    LoadFile( stream, mimetype, index );

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


@@ -720,6 +720,98 @@ int wxImage::GetHeight() const
     return M_IMGDATA->m_height;
 }
 
     return M_IMGDATA->m_height;
 }
 

+
+bool wxImage::FindFirstUnusedColour(
+            unsigned char *r, unsigned char *g, unsigned char *b,
+            unsigned char startR, unsigned char startG, unsigned char startB)
+{
+    wxHashTable hTable;
+    unsigned long key;
+   
+    ComputeHistogram( hTable );
+    
+    unsigned char r2 = startR;
+    unsigned char g2 = startG;
+    unsigned char b2 = startB;
+    
+    key = (r2 << 16) | (g2 << 8) | b2;
+
+    while ( (wxHNode *) hTable.Get(key) )
+    {
+        // color already used
+        r2++;
+        if ( r2 >= 255 )
+        {
+            r2 = 0;
+            g2++;
+            if ( g2 >= 255 )
+            {
+                g2 = 0;
+                b2++;
+                if ( b2 >= 255 )
+                {
+                    wxLogError( _("GetUnusedColour:: No Unused Color in image ") );            
+                    return FALSE;                              
+                }
+            }
+        }
+        
+        key = (r2 << 16) | (g2 << 8) | b2;
+    }
+    
+    if (r) *r = r2;
+    if (g) *g = g2;
+    if (b) *b = b2;
+    
+    return TRUE;
+}
+
+
+bool wxImage::SetMaskFromImage(const wxImage& mask, 
+                               unsigned char mr, unsigned char mg, unsigned char mb)
+{
+    // check that the images are the same size
+    if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
+    {
+        wxLogError( _("Image and Mask have different sizes") );            
+        return FALSE;
+    }
+    
+    // find unused colour
+    unsigned char r,g,b ;
+    if (!FindFirstUnusedColour(&r, &g, &b))
+    {
+        wxLogError( _("No Unused Color in image being masked") );            
+        return FALSE ;
+    }
+        
+    char unsigned *imgdata = GetData();
+    char unsigned *maskdata = mask.GetData();
+
+    const int w = GetWidth();
+    const int h = GetHeight();
+
+    for (int j = 0; j < h; j++)
+    {
+        for (int i = 0; i < w; i++)
+        {
+            if ((maskdata[0] == mr) && (maskdata[1]  == mg) && (maskdata[2] == mb))
+            {
+                imgdata[0] = r;
+                imgdata[1] = g;
+                imgdata[2] = b;
+            }
+            imgdata  += 3;
+            maskdata += 3;
+        }
+    }
+
+    SetMaskColour(r, g, b);
+    SetMask(TRUE);
+    
+    return TRUE;
+}
+

 #if wxUSE_PALETTE
 
 // Palette functions
 #if wxUSE_PALETTE
 
 // Palette functions


@@ -798,14 +890,14 @@ bool wxImage::HasOption(const wxString& name) const
     return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
 }
 
     return (M_IMGDATA->m_optionNames.Index(name, FALSE) != wxNOT_FOUND);
 }
 

-bool wxImage::LoadFile( const wxString& filename, long type )
+bool wxImage::LoadFile( const wxString& filename, long type, int index )

 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );
 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );

-        return LoadFile(bstream, type);
+        return LoadFile(bstream, type, index);

     }
     else
     {
     }
     else
     {


@@ -818,14 +910,14 @@ bool wxImage::LoadFile( const wxString& filename, long type )
 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS
 }
 

-bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
+bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int index )

 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );
 {
 #if wxUSE_STREAMS
     if (wxFileExists(filename))
     {
         wxFileInputStream stream(filename);
         wxBufferedInputStream bstream( stream );

-        return LoadFile(bstream, mimetype);
+        return LoadFile(bstream, mimetype, index);

     }
     else
     {
     }
     else
     {


@@ -878,23 +970,72 @@ bool wxImage::CanRead( const wxString &name )
 #endif
 }
 
 #endif
 }
 

+int wxImage::GetImageCount( const wxString &name, long type )
+{
+#if wxUSE_STREAMS
+  wxFileInputStream stream(name);
+  return GetImageCount(stream, type);
+#else
+  return 0;
+#endif
+}
+

 #if wxUSE_STREAMS
 
 bool wxImage::CanRead( wxInputStream &stream )
 {
 #if wxUSE_STREAMS
 
 bool wxImage::CanRead( wxInputStream &stream )
 {

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

 
 

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

     {
     {

-      wxImageHandler *handler=(wxImageHandler*)node->GetData();
-      if (handler->CanRead( stream ))
-        return TRUE;
+        wxImageHandler *handler=(wxImageHandler*)node->GetData();
+        if (handler->CanRead( stream ))
+            return TRUE;

     }
 
     }
 

-  return FALSE;
+    return FALSE;
+}
+
+int wxImage::GetImageCount( wxInputStream &stream, long type )
+{
+    wxImageHandler *handler;
+
+    if ( type == wxBITMAP_TYPE_ANY )
+    {
+        wxList &list=GetHandlers();
+
+        for (wxList::Node *node = list.GetFirst(); node; node = node->GetNext())
+        {
+             handler=(wxImageHandler*)node->GetData();
+             if ( handler->CanRead(stream) )
+                 return handler->GetImageCount(stream);
+
+        }
+
+        wxLogWarning(_("No handler found for image type."));
+        return 0;
+    }
+
+    handler = FindHandler(type);
+
+    if ( !handler )
+    {
+        wxLogWarning(_("No image handler for type %d defined."), type);
+        return FALSE;
+    }
+
+    if ( handler->CanRead(stream) )
+    {
+        return handler->GetImageCount(stream);
+    }
+    else
+    {
+        wxLogError(_("Image file is not of type %d."), type);
+        return 0;
+    }

 }
 
 }
 

-bool wxImage::LoadFile( wxInputStream& stream, long type )
+bool wxImage::LoadFile( wxInputStream& stream, long type, int index )

 {
     UnRef();
 
 {
     UnRef();
 


@@ -902,15 +1043,15 @@ bool wxImage::LoadFile( wxInputStream& stream, long type )
 
     wxImageHandler *handler;
 
 
     wxImageHandler *handler;
 

-    if (type==wxBITMAP_TYPE_ANY)
+    if ( type == wxBITMAP_TYPE_ANY )

     {
         wxList &list=GetHandlers();
 
         for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
         {
              handler=(wxImageHandler*)node->GetData();
     {
         wxList &list=GetHandlers();
 
         for ( wxList::Node *node = list.GetFirst(); node; node = node->GetNext() )
         {
              handler=(wxImageHandler*)node->GetData();

-             if (handler->CanRead( stream ))
-                 return handler->LoadFile( this, stream );
+             if ( handler->CanRead(stream) )
+                 return handler->LoadFile(this, stream, TRUE/*verbose*/, index);

 
         }
 
 
         }
 


@@ -927,10 +1068,10 @@ bool wxImage::LoadFile( wxInputStream& stream, long type )
         return FALSE;
     }
 
         return FALSE;
     }
 

-    return handler->LoadFile( this, stream );
+    return handler->LoadFile(this, stream, TRUE/*verbose*/, index);

 }
 
 }
 

-bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype )
+bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )

 {
     UnRef();
 
 {
     UnRef();
 


@@ -945,7 +1086,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype )
         return FALSE;
     }
 
         return FALSE;
     }
 

-    return handler->LoadFile( this, stream );
+    return handler->LoadFile( this, stream, TRUE/*verbose*/, index );

 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type )
 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type )