suppress (harmless) unused parameter warnings

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index b29070e431acaea91191113b7a87b394bbaf6c85..07ae7ac0ac936710d6dbfa8ed9f40a8dafdfba04 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -64,6 +64,7 @@ public:
 
     int             m_width;
     int             m_height;
 
     int             m_width;
     int             m_height;

+    wxBitmapType    m_type;

     unsigned char  *m_data;
 
     bool            m_hasMask;
     unsigned char  *m_data;
 
     bool            m_hasMask;


@@ -94,6 +95,7 @@ wxImageRefData::wxImageRefData()
 {
     m_width = 0;
     m_height = 0;
 {
     m_width = 0;
     m_height = 0;

+    m_type = wxBITMAP_TYPE_INVALID;

     m_data =
     m_alpha = (unsigned char *) NULL;
 
     m_data =
     m_alpha = (unsigned char *) NULL;
 


@@ -121,7 +123,7 @@ wxImage wxNullImage;
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

-#define M_IMGDATA wx_static_cast(wxImageRefData*, m_refData)
+#define M_IMGDATA static_cast<wxImageRefData*>(m_refData)

 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
 


@@ -250,7 +252,7 @@ wxObjectRefData* wxImage::CreateRefData() const
 
 wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
 {
 
 wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
 {

-    const wxImageRefData* refData = wx_static_cast(const wxImageRefData*, that);
+    const wxImageRefData* refData = static_cast<const wxImageRefData*>(that);

     wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") );
 
     wxImageRefData* refData_new = new wxImageRefData;
     wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") );
 
     wxImageRefData* refData_new = new wxImageRefData;


@@ -1268,7 +1270,6 @@ void wxImage::Paste( const wxImage &image, int x, int y )
          (GetMaskGreen()==image.GetMaskGreen()) &&
          (GetMaskBlue()==image.GetMaskBlue()))))
     {
          (GetMaskGreen()==image.GetMaskGreen()) &&
          (GetMaskBlue()==image.GetMaskBlue()))))
     {

-        width *= 3;

         unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
         int source_step = image.GetWidth()*3;
 
         unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
         int source_step = image.GetWidth()*3;
 


@@ -1276,11 +1277,10 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         int target_step = M_IMGDATA->m_width*3;
         for (int j = 0; j < height; j++)
         {
         int target_step = M_IMGDATA->m_width*3;
         for (int j = 0; j < height; j++)
         {

-            memcpy( target_data, source_data, width );
+            memcpy( target_data, source_data, width*3 );

             source_data += source_step;
             target_data += target_step;
         }
             source_data += source_step;
             target_data += target_step;
         }

-        return;

     }
 
     // Copy over the alpha channel from the original image
     }
 
     // Copy over the alpha channel from the original image


@@ -1309,7 +1309,6 @@ void wxImage::Paste( const wxImage &image, int x, int y )
         unsigned char g = image.GetMaskGreen();
         unsigned char b = image.GetMaskBlue();
 
         unsigned char g = image.GetMaskGreen();
         unsigned char b = image.GetMaskBlue();
 

-        width *= 3;

         unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
         int source_step = image.GetWidth()*3;
 
         unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
         int source_step = image.GetWidth()*3;
 


@@ -1318,7 +1317,7 @@ void wxImage::Paste( const wxImage &image, int x, int y )
 
         for (int j = 0; j < height; j++)
         {
 
         for (int j = 0; j < height; j++)
         {

-            for (int i = 0; i < width; i+=3)
+            for (int i = 0; i < width*3; i+=3)

             {
                 if ((source_data[i]   != r) ||
                     (source_data[i+1] != g) ||
             {
                 if ((source_data[i]   != r) ||
                     (source_data[i+1] != g) ||


@@ -1391,7 +1390,7 @@ wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const
         {
             // calculate the luma
             double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5;
         {
             // calculate the luma
             double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5;

-            dest[0] = dest[1] = dest[2] = wx_static_cast(unsigned char, luma);
+            dest[0] = dest[1] = dest[2] = static_cast<unsigned char>(luma);

         }
     }
 
         }
     }
 


@@ -1459,6 +1458,23 @@ int wxImage::GetHeight() const
     return M_IMGDATA->m_height;
 }
 
     return M_IMGDATA->m_height;
 }
 

+wxBitmapType wxImage::GetType() const
+{
+    wxCHECK_MSG( IsOk(), wxBITMAP_TYPE_INVALID, wxT("invalid image") );
+
+    return M_IMGDATA->m_type;
+}
+
+void wxImage::SetType(wxBitmapType type)
+{
+    wxCHECK_RET( IsOk(), "must create the image before setting its type");
+
+    // type can be wxBITMAP_TYPE_INVALID to reset the image type to default
+    wxASSERT_MSG( type != wxBITMAP_TYPE_MAX, "invalid bitmap type" );
+
+    M_IMGDATA->m_type = type;
+}
+

 long wxImage::XYToIndex(int x, int y) const
 {
     if ( Ok() &&
 long wxImage::XYToIndex(int x, int y) const
 {
     if ( Ok() &&


@@ -1962,12 +1978,10 @@ void wxImage::SetPalette(const wxPalette& palette)
 
 void wxImage::SetOption(const wxString& name, const wxString& value)
 {
 
 void wxImage::SetOption(const wxString& name, const wxString& value)
 {

-    wxCHECK_RET( Ok(), wxT("invalid image") );
-

     AllocExclusive();
 
     int idx = M_IMGDATA->m_optionNames.Index(name, false);
     AllocExclusive();
 
     int idx = M_IMGDATA->m_optionNames.Index(name, false);

-    if (idx == wxNOT_FOUND)
+    if ( idx == wxNOT_FOUND )

     {
         M_IMGDATA->m_optionNames.Add(name);
         M_IMGDATA->m_optionValues.Add(value);
     {
         M_IMGDATA->m_optionNames.Add(name);
         M_IMGDATA->m_optionValues.Add(value);


@@ -1988,10 +2002,11 @@ void wxImage::SetOption(const wxString& name, int value)
 
 wxString wxImage::GetOption(const wxString& name) const
 {
 
 wxString wxImage::GetOption(const wxString& name) const
 {

-    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
+    if ( !M_IMGDATA )
+        return wxEmptyString;

 
     int idx = M_IMGDATA->m_optionNames.Index(name, false);
 
     int idx = M_IMGDATA->m_optionNames.Index(name, false);

-    if (idx == wxNOT_FOUND)
+    if ( idx == wxNOT_FOUND )

         return wxEmptyString;
     else
         return M_IMGDATA->m_optionValues[idx];
         return wxEmptyString;
     else
         return M_IMGDATA->m_optionValues[idx];


@@ -2004,9 +2019,8 @@ int wxImage::GetOptionInt(const wxString& name) const
 
 bool wxImage::HasOption(const wxString& name) const
 {
 
 bool wxImage::HasOption(const wxString& name) const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
-
-    return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND);
+    return M_IMGDATA ? M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND
+                     : false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2196,11 +2210,44 @@ int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type )
     }
 }
 
     }
 }
 

-bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
+bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)

 {
 {

-    UnRef();
+    // save the options values which can be clobbered by the handler (e.g. many
+    // of them call Destroy() before trying to load the file)
+    const unsigned maxWidth = GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH),
+                   maxHeight = GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT);

 
 

-    m_refData = new wxImageRefData;
+    if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )
+        return false;
+
+    M_IMGDATA->m_type = handler.GetType();
+
+    // rescale the image to the specified size if needed
+    if ( maxWidth || maxHeight )
+    {
+        const unsigned widthOrig = GetWidth(),
+                       heightOrig = GetHeight();
+
+        // this uses the same (trivial) algorithm as the JPEG handler
+        unsigned width = widthOrig,
+                 height = heightOrig;
+        while ( (maxWidth && width > maxWidth) ||
+                    (maxHeight && height > maxHeight) )
+        {
+            width /= 2;
+            height /= 2;
+        }
+
+        if ( width != widthOrig || height != heightOrig )
+            Rescale(width, height, wxIMAGE_QUALITY_HIGH);
+    }
+
+    return true;
+}
+
+bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
+{
+    AllocExclusive();

 
     wxImageHandler *handler;
 
 
     wxImageHandler *handler;
 


@@ -2212,12 +2259,8 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
               node = node->GetNext() )
         {
              handler = (wxImageHandler*)node->GetData();
               node = node->GetNext() )
         {
              handler = (wxImageHandler*)node->GetData();

-             if ( handler->CanRead(stream) &&
-                    handler->LoadFile(this, stream, true/*verbose*/, index) )
-             {
+             if ( handler->CanRead(stream) && DoLoad(*handler, stream, index) )

                  return true;
                  return true;

-             }
-

         }
 
         wxLogWarning( _("No handler found for image type.") );
         }
 
         wxLogWarning( _("No handler found for image type.") );


@@ -2239,7 +2282,7 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
         return false;
     }
 
         return false;
     }
 

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

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


@@ -2262,7 +2305,17 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
         return false;
     }
 
         return false;
     }
 

-    return handler->LoadFile( this, stream, true/*verbose*/, index );
+    return DoLoad(*handler, stream, index);
+}
+
+bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const
+{
+    wxImage * const self = const_cast<wxImage *>(this);
+    if ( !handler.SaveFile(self, stream) )
+        return false;
+
+    M_IMGDATA->m_type = handler.GetType();
+    return true;

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


@@ -2276,7 +2329,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
         return false;
     }
 
         return false;
     }
 

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

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


@@ -2289,7 +2342,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
     }
 
         wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
     }
 

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

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