X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..a8c5e1a9d1f56190e2d87aadc40a75589585af1f:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index 125e97613a..545afb1301 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -14,30 +14,43 @@ #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_IMAGE #include "wx/image.h" -#include "wx/bitmap.h" -#include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/hash.h" + #include "wx/utils.h" + #include "wx/math.h" + #include "wx/module.h" + #include "wx/palette.h" + #include "wx/intl.h" +#endif + #include "wx/filefn.h" #include "wx/wfstream.h" -#include "wx/intl.h" -#include "wx/module.h" -#include "wx/hash.h" -#include "wx/utils.h" -#include "wx/math.h" #if wxUSE_XPM -#include "wx/xpmdecod.h" + #include "wx/xpmdecod.h" #endif // For memcpy #include +// make the code compile with either wxFile*Stream or wxFFile*Stream: +#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE)) + +#if HAS_FILE_STREAMS + #if wxUSE_FILE + typedef wxFileInputStream wxImageFileInputStream; + typedef wxFileOutputStream wxImageFileOutputStream; + #elif wxUSE_FFILE + typedef wxFFileInputStream wxImageFileInputStream; + typedef wxFFileOutputStream wxImageFileOutputStream; + #endif // wxUSE_FILE/wxUSE_FFILE +#endif // HAS_FILE_STREAMS + //----------------------------------------------------------------------------- // wxImage //----------------------------------------------------------------------------- @@ -107,7 +120,7 @@ wxImage wxNullImage; //----------------------------------------------------------------------------- -#define M_IMGDATA ((wxImageRefData *)m_refData) +#define M_IMGDATA wx_static_cast(wxImageRefData*, m_refData) IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) @@ -234,36 +247,48 @@ void wxImage::Destroy() UnRef(); } -wxImage wxImage::Copy() const +wxObjectRefData* wxImage::CreateRefData() const { - wxImage image; - - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + return new wxImageRefData; +} - image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false ); +wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const +{ + const wxImageRefData* refData = wx_static_cast(const wxImageRefData*, that); + wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") ); - unsigned char *data = image.GetData(); + wxImageRefData* refData_new = new wxImageRefData; + refData_new->m_width = refData->m_width; + refData_new->m_height = refData->m_height; + refData_new->m_maskRed = refData->m_maskRed; + refData_new->m_maskGreen = refData->m_maskGreen; + refData_new->m_maskBlue = refData->m_maskBlue; + refData_new->m_hasMask = refData->m_hasMask; + refData_new->m_ok = true; + unsigned size = unsigned(refData->m_width) * unsigned(refData->m_height); + if (refData->m_alpha != NULL) + { + refData_new->m_alpha = (unsigned char*)malloc(size); + memcpy(refData_new->m_alpha, refData->m_alpha, size); + } + size *= 3; + refData_new->m_data = (unsigned char*)malloc(size); + memcpy(refData_new->m_data, refData->m_data, size); +#if wxUSE_PALETTE + refData_new->m_palette = refData->m_palette; +#endif + refData_new->m_optionNames = refData->m_optionNames; + refData_new->m_optionValues = refData->m_optionValues; + return refData_new; +} - wxCHECK_MSG( data, image, wxT("unable to create image") ); +wxImage wxImage::Copy() const +{ + wxImage image; - image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); - image.SetMask( M_IMGDATA->m_hasMask ); + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); - memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 ); - - wxImageRefData *imgData = (wxImageRefData *)image.m_refData; - - // also copy the alpha channel - if (HasAlpha()) - { - image.SetAlpha(); - unsigned char* alpha = image.GetAlpha(); - memcpy( alpha, GetAlpha(), M_IMGDATA->m_width*M_IMGDATA->m_height ); - } - - // also copy the image options - imgData->m_optionNames = M_IMGDATA->m_optionNames; - imgData->m_optionValues = M_IMGDATA->m_optionValues; + image.m_refData = CloneRefData(m_refData); return image; } @@ -271,7 +296,7 @@ wxImage wxImage::Copy() const wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const { if( xFactor == 1 && yFactor == 1 ) - return Copy() ; + return *this; wxImage image; @@ -549,9 +574,16 @@ wxImage wxImage::Mirror( bool horizontally ) const image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false ); unsigned char *data = image.GetData(); + unsigned char *alpha = NULL; wxCHECK_MSG( data, image, wxT("unable to create image") ); + if (M_IMGDATA->m_alpha != NULL) { + image.SetAlpha(); + alpha = image.GetAlpha(); + wxCHECK_MSG( alpha, image, wxT("unable to create alpha channel") ); + } + if (M_IMGDATA->m_hasMask) image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); @@ -574,6 +606,25 @@ wxImage wxImage::Mirror( bool horizontally ) const target_data -= 3; } } + + if (alpha != NULL) + { + // src_alpha starts at the first pixel and increases by 1 after each step + // (a step here is the copy of the alpha value of one pixel) + const unsigned char *src_alpha = M_IMGDATA->m_alpha; + // dest_alpha starts just beyond the first line, decreases before each step, + // and after each line is finished, increases by 2 widths (skipping the line + // just copied and the line that will be copied next) + unsigned char *dest_alpha = alpha + width; + + for (long jj = 0; jj < height; ++jj) + { + for (long i = 0; i < width; ++i) { + *(--dest_alpha) = *(src_alpha++); // copy one pixel + } + dest_alpha += 2 * width; // advance beyond the end of the next line + } + } } else { @@ -583,6 +634,23 @@ wxImage wxImage::Mirror( bool horizontally ) const memcpy( target_data, source_data, (size_t)3*width ); source_data += 3*width; } + + if (alpha != NULL) + { + // src_alpha starts at the first pixel and increases by 1 width after each step + // (a step here is the copy of the alpha channel of an entire line) + const unsigned char *src_alpha = M_IMGDATA->m_alpha; + // dest_alpha starts just beyond the last line (beyond the whole image) + // and decreases by 1 width before each step + unsigned char *dest_alpha = alpha + width * height; + + for (long jj = 0; jj < height; ++jj) + { + dest_alpha -= width; + memcpy( dest_alpha, src_alpha, (size_t)width ); + src_alpha += width; + } + } } return image; @@ -594,32 +662,47 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const wxCHECK_MSG( Ok(), image, wxT("invalid image") ); - wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), + wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && + (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), image, wxT("invalid subimage size") ); - int subwidth=rect.GetWidth(); - const int subheight=rect.GetHeight(); + const int subwidth = rect.GetWidth(); + const int subheight = rect.GetHeight(); image.Create( subwidth, subheight, false ); - unsigned char *subdata = image.GetData(), *data=GetData(); + const unsigned char *src_data = GetData(); + const unsigned char *src_alpha = M_IMGDATA->m_alpha; + unsigned char *subdata = image.GetData(); + unsigned char *subalpha = NULL; wxCHECK_MSG( subdata, image, wxT("unable to create image") ); + if (src_alpha != NULL) { + image.SetAlpha(); + subalpha = image.GetAlpha(); + wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel")); + } + if (M_IMGDATA->m_hasMask) image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); - const int subleft=3*rect.GetLeft(); - const int width=3*GetWidth(); - subwidth*=3; + const int width = GetWidth(); + const int pixsoff = rect.GetLeft() + width * rect.GetTop(); - data+=rect.GetTop()*width+subleft; + src_data += 3 * pixsoff; + src_alpha += pixsoff; // won't be used if was NULL, so this is ok for (long j = 0; j < subheight; ++j) { - memcpy( subdata, data, subwidth); - subdata+=subwidth; - data+=width; + memcpy( subdata, src_data, 3 * subwidth ); + subdata += 3 * subwidth; + src_data += 3 * width; + if (subalpha != NULL) { + memcpy( subalpha, src_alpha, subwidth ); + subalpha += subwidth; + src_alpha += width; + } } return image; @@ -649,6 +732,10 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, wxRect subRect(pos.x, pos.y, width, height); wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight()); + if (pos.x < 0) + finalRect.width -= pos.x; + if (pos.y < 0) + finalRect.height -= pos.y; subRect.Intersect(finalRect); @@ -668,6 +755,8 @@ void wxImage::Paste( const wxImage &image, int x, int y ) wxCHECK_RET( Ok(), wxT("invalid image") ); wxCHECK_RET( image.Ok(), wxT("invalid image") ); + AllocExclusive(); + int xx = 0; int yy = 0; int width = image.GetWidth(); @@ -749,6 +838,8 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, { wxCHECK_RET( Ok(), wxT("invalid image") ); + AllocExclusive(); + unsigned char *data = GetData(); const int w = GetWidth(); @@ -804,6 +895,16 @@ wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const } } + // copy the alpha channel, if any + if (HasAlpha()) + { + const size_t alphaSize = GetWidth() * GetHeight(); + unsigned char *alpha = (unsigned char*)malloc(alphaSize); + memcpy(alpha, GetAlpha(), alphaSize); + image.InitAlpha(); + image.SetAlpha(alpha); + } + return image; } @@ -875,6 +976,8 @@ void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned c long pos = XYToIndex(x, y); wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); + AllocExclusive(); + pos *= 3; M_IMGDATA->m_data[ pos ] = r; @@ -886,6 +989,8 @@ void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, uns { wxCHECK_RET( Ok(), wxT("invalid image") ); + AllocExclusive(); + wxRect rect(rect_); wxRect imageRect(0, 0, GetWidth(), GetHeight()); if ( rect == wxRect() ) @@ -1024,6 +1129,8 @@ void wxImage::SetAlpha(int x, int y, unsigned char alpha) long pos = XYToIndex(x, y); wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); + AllocExclusive(); + M_IMGDATA->m_alpha[pos] = alpha; } @@ -1066,6 +1173,8 @@ void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) { wxCHECK_RET( Ok(), wxT("invalid image") ); + AllocExclusive(); + if ( !alpha ) { alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height); @@ -1127,6 +1236,8 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) { wxCHECK_RET( Ok(), wxT("invalid image") ); + AllocExclusive(); + M_IMGDATA->m_maskRed = r; M_IMGDATA->m_maskGreen = g; M_IMGDATA->m_maskBlue = b; @@ -1176,6 +1287,8 @@ void wxImage::SetMask( bool mask ) { wxCHECK_RET( Ok(), wxT("invalid image") ); + AllocExclusive(); + M_IMGDATA->m_hasMask = mask; } @@ -1235,6 +1348,8 @@ bool wxImage::SetMaskFromImage(const wxImage& mask, return false ; } + AllocExclusive(); + unsigned char *imgdata = GetData(); unsigned char *maskdata = mask.GetData(); @@ -1274,6 +1389,8 @@ bool wxImage::ConvertAlphaToMask(unsigned char threshold) return false; } + AllocExclusive(); + SetMask(true); SetMaskColour(mr, mg, mb); @@ -1327,6 +1444,8 @@ void wxImage::SetPalette(const wxPalette& palette) { wxCHECK_RET( Ok(), wxT("invalid image") ); + AllocExclusive(); + M_IMGDATA->m_palette = palette; } @@ -1340,6 +1459,8 @@ 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) { @@ -1387,12 +1508,14 @@ bool wxImage::HasOption(const wxString& name) const // image I/O // ---------------------------------------------------------------------------- -bool wxImage::LoadFile( const wxString& filename, long type, int index ) +bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + long WXUNUSED_UNLESS_STREAMS(type), + int WXUNUSED_UNLESS_STREAMS(index) ) { -#if wxUSE_STREAMS +#if HAS_FILE_STREAMS if (wxFileExists(filename)) { - wxFileInputStream stream(filename); + wxImageFileInputStream stream(filename); wxBufferedInputStream bstream( stream ); return LoadFile(bstream, type, index); } @@ -1402,17 +1525,19 @@ bool wxImage::LoadFile( const wxString& filename, long type, int index ) return false; } -#else // !wxUSE_STREAMS +#else // !HAS_FILE_STREAMS return false; -#endif // wxUSE_STREAMS +#endif // HAS_FILE_STREAMS } -bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int index ) +bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + const wxString& WXUNUSED_UNLESS_STREAMS(mimetype), + int WXUNUSED_UNLESS_STREAMS(index) ) { -#if wxUSE_STREAMS +#if HAS_FILE_STREAMS if (wxFileExists(filename)) { - wxFileInputStream stream(filename); + wxImageFileInputStream stream(filename); wxBufferedInputStream bstream( stream ); return LoadFile(bstream, mimetype, index); } @@ -1422,9 +1547,9 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int return false; } -#else // !wxUSE_STREAMS +#else // !HAS_FILE_STREAMS return false; -#endif // wxUSE_STREAMS +#endif // HAS_FILE_STREAMS } @@ -1445,60 +1570,63 @@ bool wxImage::SaveFile( const wxString& filename ) const return false; } -bool wxImage::SaveFile( const wxString& filename, int type ) const +bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + int WXUNUSED_UNLESS_STREAMS(type) ) const { -#if wxUSE_STREAMS +#if HAS_FILE_STREAMS wxCHECK_MSG( Ok(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); - wxFileOutputStream stream(filename); + wxImageFileOutputStream stream(filename); if ( stream.IsOk() ) { wxBufferedOutputStream bstream( stream ); return SaveFile(bstream, type); } -#endif // wxUSE_STREAMS +#endif // HAS_FILE_STREAMS return false; } -bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const +bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), + const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const { -#if wxUSE_STREAMS +#if HAS_FILE_STREAMS wxCHECK_MSG( Ok(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); - wxFileOutputStream stream(filename); + wxImageFileOutputStream stream(filename); if ( stream.IsOk() ) { wxBufferedOutputStream bstream( stream ); return SaveFile(bstream, mimetype); } -#endif // wxUSE_STREAMS +#endif // HAS_FILE_STREAMS return false; } -bool wxImage::CanRead( const wxString &name ) +bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) ) { -#if wxUSE_STREAMS - wxFileInputStream stream(name); - return CanRead(stream); +#if HAS_FILE_STREAMS + wxImageFileInputStream stream(name); + return CanRead(stream); #else - return false; + return false; #endif } -int wxImage::GetImageCount( const wxString &name, long type ) +int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name), + long WXUNUSED_UNLESS_STREAMS(type) ) { -#if wxUSE_STREAMS - wxFileInputStream stream(name); - if (stream.Ok()) - return GetImageCount(stream, type); +#if HAS_FILE_STREAMS + wxImageFileInputStream stream(name); + if (stream.Ok()) + return GetImageCount(stream, type); #endif return 0; @@ -1544,7 +1672,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type ) if ( !handler ) { - wxLogWarning(_("No image handler for type %d defined."), type); + wxLogWarning(_("No image handler for type %ld defined."), type); return false; } @@ -1554,7 +1682,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type ) } else { - wxLogError(_("Image file is not of type %d."), type); + wxLogError(_("Image file is not of type %ld."), type); return 0; } } @@ -1587,14 +1715,14 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index ) if (handler == 0) { - wxLogWarning( _("No image handler for type %d defined."), type ); + wxLogWarning( _("No image handler for type %ld defined."), type ); return false; } if (stream.IsSeekable() && !handler->CanRead(stream)) { - wxLogError(_("Image file is not of type %d."), type); + wxLogError(_("Image file is not of type %ld."), type); return false; } else @@ -1937,6 +2065,8 @@ wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv) */ void wxImage::RotateHue(double angle) { + AllocExclusive(); + unsigned char *srcBytePtr; unsigned char *dstBytePtr; unsigned long count; @@ -1996,7 +2126,7 @@ bool wxImageHandler::CanRead( const wxString& name ) { if (wxFileExists(name)) { - wxFileInputStream stream(name); + wxImageFileInputStream stream(name); return CanRead(stream); }