X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14678d6d227b7b82ee3250e32109d8fb73372246..fcdd53359135f790b85728c4254b97095a56dad8:/src/common/image.cpp?ds=sidebyside diff --git a/src/common/image.cpp b/src/common/image.cpp index e4ccc1b8f3..ba344445ef 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -64,6 +64,7 @@ public: int m_width; int m_height; + wxBitmapType m_type; unsigned char *m_data; bool m_hasMask; @@ -94,6 +95,7 @@ wxImageRefData::wxImageRefData() { m_width = 0; m_height = 0; + m_type = wxBITMAP_TYPE_INVALID; 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(m_refData) IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) @@ -140,7 +142,7 @@ wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alp Create( width, height, data, alpha, static_data ); } -wxImage::wxImage( const wxString& name, long type, int index ) +wxImage::wxImage( const wxString& name, wxBitmapType type, int index ) { LoadFile( name, type, index ); } @@ -151,7 +153,7 @@ wxImage::wxImage( const wxString& name, const wxString& mimetype, int index ) } #if wxUSE_STREAMS -wxImage::wxImage( wxInputStream& stream, long type, int index ) +wxImage::wxImage( wxInputStream& stream, wxBitmapType type, int index ) { LoadFile( stream, type, index ); } @@ -234,6 +236,7 @@ bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* M_IMGDATA->m_height = height; M_IMGDATA->m_ok = true; M_IMGDATA->m_static = static_data; + M_IMGDATA->m_staticAlpha = static_data; return true; } @@ -250,7 +253,7 @@ wxObjectRefData* wxImage::CreateRefData() const wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const { - const wxImageRefData* refData = wx_static_cast(const wxImageRefData*, that); + const wxImageRefData* refData = static_cast(that); wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") ); wxImageRefData* refData_new = new wxImageRefData; @@ -1268,7 +1271,6 @@ void wxImage::Paste( const wxImage &image, int x, int y ) (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; @@ -1276,11 +1278,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++) { - memcpy( target_data, source_data, width ); + memcpy( target_data, source_data, width*3 ); source_data += source_step; target_data += target_step; } - return; } // Copy over the alpha channel from the original image @@ -1309,7 +1310,6 @@ void wxImage::Paste( const wxImage &image, int x, int y ) 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; @@ -1318,7 +1318,7 @@ void wxImage::Paste( const wxImage &image, int x, int y ) 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) || @@ -1391,7 +1391,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; - dest[0] = dest[1] = dest[2] = wx_static_cast(unsigned char, luma); + dest[0] = dest[1] = dest[2] = static_cast(luma); } } @@ -1459,6 +1459,23 @@ int wxImage::GetHeight() const 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() && @@ -1962,12 +1979,10 @@ void wxImage::SetPalette(const wxPalette& palette) 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); - if (idx == wxNOT_FOUND) + if ( idx == wxNOT_FOUND ) { M_IMGDATA->m_optionNames.Add(name); M_IMGDATA->m_optionValues.Add(value); @@ -1988,10 +2003,11 @@ void wxImage::SetOption(const wxString& name, int value) 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); - if (idx == wxNOT_FOUND) + if ( idx == wxNOT_FOUND ) return wxEmptyString; else return M_IMGDATA->m_optionValues[idx]; @@ -2004,9 +2020,8 @@ int wxImage::GetOptionInt(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; } // ---------------------------------------------------------------------------- @@ -2014,7 +2029,7 @@ bool wxImage::HasOption(const wxString& name) const // ---------------------------------------------------------------------------- bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), - long WXUNUSED_UNLESS_STREAMS(type), + wxBitmapType WXUNUSED_UNLESS_STREAMS(type), int WXUNUSED_UNLESS_STREAMS(index) ) { #if HAS_FILE_STREAMS @@ -2058,25 +2073,23 @@ bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), } - bool wxImage::SaveFile( const wxString& filename ) const { wxString ext = filename.AfterLast('.').Lower(); - wxImageHandler * pHandler = FindHandler(ext, -1); - if (pHandler) + wxImageHandler *handler = FindHandler(ext, wxBITMAP_TYPE_ANY); + if ( !handler) { - SaveFile(filename, pHandler->GetType()); - return true; + wxLogError(_("Can't save image to file '%s': unknown extension."), + filename); + return false; } - wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str()); - - return false; + return SaveFile(filename, handler->GetType()); } bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), - int WXUNUSED_UNLESS_STREAMS(type) ) const + wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const { #if HAS_FILE_STREAMS wxCHECK_MSG( Ok(), false, wxT("invalid image") ); @@ -2126,7 +2139,7 @@ bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) ) } int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name), - long WXUNUSED_UNLESS_STREAMS(type) ) + wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) { #if HAS_FILE_STREAMS wxImageFileInputStream stream(name); @@ -2153,19 +2166,25 @@ bool wxImage::CanRead( wxInputStream &stream ) return false; } -int wxImage::GetImageCount( wxInputStream &stream, long type ) +int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type ) { wxImageHandler *handler; if ( type == wxBITMAP_TYPE_ANY ) { - wxList &list=GetHandlers(); + const wxList& list = GetHandlers(); - for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) + for ( wxList::compatibility_iterator node = list.GetFirst(); + node; + node = node->GetNext() ) { - handler=(wxImageHandler*)node->GetData(); + handler = (wxImageHandler*)node->GetData(); if ( handler->CanRead(stream) ) - return handler->GetImageCount(stream); + { + const int count = handler->GetImageCount(stream); + if ( count >= 0 ) + return count; + } } @@ -2192,46 +2211,79 @@ int wxImage::GetImageCount( wxInputStream &stream, long type ) } } -bool wxImage::LoadFile( wxInputStream& stream, long 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; - wxImageHandler *handler; + M_IMGDATA->m_type = handler.GetType(); - if ( type == wxBITMAP_TYPE_ANY ) + // rescale the image to the specified size if needed + if ( maxWidth || maxHeight ) { - wxList &list=GetHandlers(); + const unsigned widthOrig = GetWidth(), + heightOrig = GetHeight(); - for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() ) + // this uses the same (trivial) algorithm as the JPEG handler + unsigned width = widthOrig, + height = heightOrig; + while ( (maxWidth && width > maxWidth) || + (maxHeight && height > maxHeight) ) { - handler=(wxImageHandler*)node->GetData(); - if ( handler->CanRead(stream) ) - return handler->LoadFile(this, stream, true/*verbose*/, index); + 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; + + if ( type == wxBITMAP_TYPE_ANY ) + { + const wxList& list = GetHandlers(); + for ( wxList::compatibility_iterator node = list.GetFirst(); + node; + node = node->GetNext() ) + { + handler = (wxImageHandler*)node->GetData(); + if ( handler->CanRead(stream) && DoLoad(*handler, stream, index) ) + return true; } wxLogWarning( _("No handler found for image type.") ); + return false; } + //else: have specific type handler = FindHandler(type); - - if (handler == 0) + if ( !handler ) { wxLogWarning( _("No image handler for type %ld defined."), type ); - return false; } - if (stream.IsSeekable() && !handler->CanRead(stream)) + if ( stream.IsSeekable() && !handler->CanRead(stream) ) { wxLogError(_("Image file is not of type %ld."), type); return false; } - else - return handler->LoadFile(this, stream, true/*verbose*/, index); + + return DoLoad(*handler, stream, index); } bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index ) @@ -2242,23 +2294,32 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind wxImageHandler *handler = FindHandlerMime(mimetype); - if (handler == 0) + if ( !handler ) { wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); - return false; } - if (stream.IsSeekable() && !handler->CanRead(stream)) + if ( stream.IsSeekable() && !handler->CanRead(stream) ) { wxLogError(_("Image file is not of type %s."), mimetype); return false; } - else - return handler->LoadFile( this, stream, true/*verbose*/, index ); + + return DoLoad(*handler, stream, index); } -bool wxImage::SaveFile( wxOutputStream& stream, int type ) const +bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const +{ + wxImage * const self = const_cast(this); + if ( !handler.SaveFile(self, stream) ) + return false; + + M_IMGDATA->m_type = handler.GetType(); + return true; +} + +bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const { wxCHECK_MSG( Ok(), false, wxT("invalid image") ); @@ -2266,11 +2327,10 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const if ( !handler ) { wxLogWarning( _("No image handler for type %d defined."), type ); - return false; } - return handler->SaveFile( (wxImage*)this, stream ); + return DoSave(*handler, stream); } bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const @@ -2281,12 +2341,11 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const if ( !handler ) { wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); - - return false; } - return handler->SaveFile( (wxImage*)this, stream ); + return DoSave(*handler, stream); } + #endif // wxUSE_STREAMS // ---------------------------------------------------------------------------- @@ -2356,21 +2415,23 @@ wxImageHandler *wxImage::FindHandler( const wxString& name ) return NULL; } -wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType ) +wxImageHandler *wxImage::FindHandler( const wxString& extension, wxBitmapType bitmapType ) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node) { wxImageHandler *handler = (wxImageHandler*)node->GetData(); if ( (handler->GetExtension().Cmp(extension) == 0) && - (bitmapType == -1 || handler->GetType() == bitmapType) ) + ( (bitmapType == wxBITMAP_TYPE_ANY) || (handler->GetType() == bitmapType)) ) + { return handler; + } node = node->GetNext(); } return NULL; } -wxImageHandler *wxImage::FindHandler( long bitmapType ) +wxImageHandler *wxImage::FindHandler(wxBitmapType bitmapType ) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node)