X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a7367398e5f0378986522bc5686fb05a90dccda..f081c944e891b0cc76ba648982175279bdbce904:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index 627bcadcf2..125e97613a 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: image.cpp +// Name: src/common/image.cpp // Purpose: wxImage // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "image.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -42,11 +38,6 @@ // For memcpy #include -#ifdef __SALFORDC__ - #undef FAR -#endif - - //----------------------------------------------------------------------------- // wxImage //----------------------------------------------------------------------------- @@ -68,8 +59,13 @@ public: unsigned char *m_alpha; bool m_ok; + + // if true, m_data is pointer to static data and shouldn't be freed bool m_static; + // same as m_static but for m_alpha + bool m_staticAlpha; + #if wxUSE_PALETTE wxPalette m_palette; #endif // wxUSE_PALETTE @@ -93,16 +89,16 @@ wxImageRefData::wxImageRefData() m_hasMask = false; m_ok = false; - m_static = false; + m_static = + m_staticAlpha = false; } wxImageRefData::~wxImageRefData() { - if (!m_static) - { + if ( !m_static ) free( m_data ); + if ( !m_staticAlpha ) free( m_alpha ); - } } wxList wxImage::sm_handlers; @@ -152,17 +148,6 @@ wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index ) } #endif // wxUSE_STREAMS -wxImage::wxImage( const wxImage& image ) - : wxObject() -{ - Ref(image); -} - -wxImage::wxImage( const wxImage* image ) -{ - if (image) Ref(*image); -} - wxImage::wxImage( const char** xpmData ) { Create(xpmData); @@ -177,7 +162,7 @@ bool wxImage::Create( const char** xpmData ) { #if wxUSE_XPM UnRef(); - + wxXPMDecoder decoder; (*this) = decoder.ReadData(xpmData); return Ok(); @@ -265,9 +250,18 @@ wxImage wxImage::Copy() const image.SetMask( M_IMGDATA->m_hasMask ); memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 ); - - // also copy the image options + 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; @@ -384,7 +378,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const } } - // In case this is a cursor, make sure the hotspot is scalled accordingly: + // In case this is a cursor, make sure the hotspot is scaled accordingly: if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ) image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor); @@ -425,7 +419,7 @@ wxImage wxImage::Scale( int width, int height ) const unsigned char *target_data = data; unsigned char *source_alpha = 0 ; unsigned char *target_alpha = 0 ; - + if (M_IMGDATA->m_hasMask) { image.SetMaskColour( M_IMGDATA->m_maskRed, @@ -452,7 +446,7 @@ wxImage wxImage::Scale( int width, int height ) const { unsigned char* src_line = &source_data[(y>>16)*old_width*3]; unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ; - + long x = 0; for ( long i = 0; i < width; i++ ) { @@ -470,7 +464,7 @@ wxImage wxImage::Scale( int width, int height ) const y += y_delta; } - // In case this is a cursor, make sure the hotspot is scalled accordingly: + // In case this is a cursor, make sure the hotspot is scaled accordingly: if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ) image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width); @@ -493,25 +487,53 @@ wxImage wxImage::Rotate90( bool clockwise ) const wxCHECK_MSG( data, image, wxT("unable to create image") ); + unsigned char *source_data = M_IMGDATA->m_data; + unsigned char *target_data; + unsigned char *alpha_data = 0 ; + unsigned char *source_alpha = 0 ; + unsigned char *target_alpha = 0 ; + if (M_IMGDATA->m_hasMask) + { image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); + } + else + { + source_alpha = M_IMGDATA->m_alpha ; + if ( source_alpha ) + { + image.SetAlpha() ; + alpha_data = image.GetAlpha() ; + } + } long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; - unsigned char *source_data = M_IMGDATA->m_data; - unsigned char *target_data; - for (long j = 0; j < height; j++) { for (long i = 0; i < width; i++) { if (clockwise) + { target_data = data + (((i+1)*height) - j - 1)*3; + if(source_alpha) + target_alpha = alpha_data + (((i+1)*height) - j - 1); + } else + { target_data = data + ((height*(width-1)) + j - (i*height))*3; + if(source_alpha) + target_alpha = alpha_data + ((height*(width-1)) + j - (i*height)); + } memcpy( target_data, source_data, 3 ); source_data += 3; + + if(source_alpha) + { + memcpy( target_alpha, source_alpha, 1 ); + source_alpha += 1; + } } } @@ -603,6 +625,44 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const return image; } +wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, + int r_, int g_, int b_ ) const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") ); + + int width = GetWidth(), height = GetHeight(); + image.Create(size.GetWidth(), size.GetHeight(), false); + + unsigned char r = (unsigned char)r_; + unsigned char g = (unsigned char)g_; + unsigned char b = (unsigned char)b_; + if ((r_ == -1) && (g_ == -1) && (b_ == -1)) + { + GetOrFindMaskColour( &r, &g, &b ); + image.SetMaskColour(r, g, b); + } + + image.SetRGB(wxRect(), r, g, b); + + wxRect subRect(pos.x, pos.y, width, height); + wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight()); + + subRect.Intersect(finalRect); + + if (!subRect.IsEmpty()) + { + if ((subRect.GetWidth() == width) && (subRect.GetHeight() == height)) + image.Paste(*this, pos.x, pos.y); + else + image.Paste(GetSubImage(subRect), pos.x, pos.y); + } + + return image; +} + void wxImage::Paste( const wxImage &image, int x, int y ) { wxCHECK_RET( Ok(), wxT("invalid image") ); @@ -633,6 +693,7 @@ void wxImage::Paste( const wxImage &image, int x, int y ) if (height < 1) return; if ((!HasMask() && !image.HasMask()) || + (HasMask() && !image.HasMask()) || ((HasMask() && image.HasMask() && (GetMaskRed()==image.GetMaskRed()) && (GetMaskGreen()==image.GetMaskGreen()) && @@ -706,6 +767,46 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, } } +wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const +{ + wxImage image; + + wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + + image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false); + + unsigned char *dest = image.GetData(); + + wxCHECK_MSG( dest, image, wxT("unable to create image") ); + + unsigned char *src = M_IMGDATA->m_data; + bool hasMask = M_IMGDATA->m_hasMask; + unsigned char maskRed = M_IMGDATA->m_maskRed; + unsigned char maskGreen = M_IMGDATA->m_maskGreen; + unsigned char maskBlue = M_IMGDATA->m_maskBlue; + + if ( hasMask ) + image.SetMaskColour(maskRed, maskGreen, maskBlue); + + const long size = M_IMGDATA->m_width * M_IMGDATA->m_height; + for ( long i = 0; i < size; i++, src += 3, dest += 3 ) + { + // don't modify the mask + if ( hasMask && src[0] == maskRed && src[1] == maskGreen && src[2] == maskBlue ) + { + memcpy(dest, src, 3); + } + else + { + // 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); + } + } + + return image; +} + wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const { wxImage image; @@ -743,60 +844,106 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char return image; } -void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) +int wxImage::GetWidth() const { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; + return M_IMGDATA->m_width; +} - wxCHECK_RET( (x>=0) && (y>=0) && (xm_height; +} + +long wxImage::XYToIndex(int x, int y) const +{ + if ( Ok() && + x >= 0 && y >= 0 && + x < M_IMGDATA->m_width && y < M_IMGDATA->m_height ) + { + return y*M_IMGDATA->m_width + x; + } + + return -1; +} - long pos = (y * w + x) * 3; +void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) +{ + long pos = XYToIndex(x, y); + wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); + + pos *= 3; M_IMGDATA->m_data[ pos ] = r; M_IMGDATA->m_data[ pos+1 ] = g; M_IMGDATA->m_data[ pos+2 ] = b; } -unsigned char wxImage::GetRed( int x, int y ) const +void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_RET( Ok(), wxT("invalid image") ); + + wxRect rect(rect_); + wxRect imageRect(0, 0, GetWidth(), GetHeight()); + if ( rect == wxRect() ) + { + rect = imageRect; + } + else + { + wxCHECK_RET( imageRect.Inside(rect.GetTopLeft()) && + imageRect.Inside(rect.GetBottomRight()), + wxT("invalid bounding rectangle") ); + } - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; + int x1 = rect.GetLeft(), + y1 = rect.GetTop(), + x2 = rect.GetRight() + 1, + y2 = rect.GetBottom() + 1; - wxCHECK_MSG( (x>=0) && (y>=0) && (xm_data + (y*width + x1)*3; + for (x = x1; x < x2; x++) + { + *data++ = r; + *data++ = g; + *data++ = b; + } + } +} + +unsigned char wxImage::GetRed( int x, int y ) const +{ + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - long pos = (y * w + x) * 3; + pos *= 3; return M_IMGDATA->m_data[pos]; } unsigned char wxImage::GetGreen( int x, int y ) const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); - - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; - - wxCHECK_MSG( (x>=0) && (y>=0) && (xm_data[pos+1]; } unsigned char wxImage::GetBlue( int x, int y ) const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); - - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - wxCHECK_MSG( (x>=0) && (y>=0) && (xm_data[pos+2]; } @@ -816,7 +963,7 @@ unsigned char *wxImage::GetData() const return M_IMGDATA->m_data; } -void wxImage::SetData( unsigned char *data ) +void wxImage::SetData( unsigned char *data, bool static_data ) { wxCHECK_RET( Ok(), wxT("invalid image") ); @@ -830,13 +977,14 @@ void wxImage::SetData( unsigned char *data ) newRefData->m_maskGreen = M_IMGDATA->m_maskGreen; newRefData->m_maskBlue = M_IMGDATA->m_maskBlue; newRefData->m_hasMask = M_IMGDATA->m_hasMask; + newRefData->m_static = static_data; UnRef(); m_refData = newRefData; } -void wxImage::SetData( unsigned char *data, int new_width, int new_height ) +void wxImage::SetData( unsigned char *data, int new_width, int new_height, bool static_data ) { wxImageRefData *newRefData = new wxImageRefData(); @@ -858,6 +1006,7 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height ) newRefData->m_data = data; newRefData->m_ok = true; } + newRefData->m_static = static_data; UnRef(); @@ -870,56 +1019,50 @@ void wxImage::SetData( unsigned char *data, int new_width, int new_height ) void wxImage::SetAlpha(int x, int y, unsigned char alpha) { - wxCHECK_RET( Ok() && HasAlpha(), wxT("invalid image or no alpha channel") ); - - int w = M_IMGDATA->m_width, - h = M_IMGDATA->m_height; + wxCHECK_RET( HasAlpha(), wxT("no alpha channel") ); - wxCHECK_RET( x >=0 && y >= 0 && x < w && y < h, wxT("invalid image index") ); + long pos = XYToIndex(x, y); + wxCHECK_RET( pos != -1, wxT("invalid image coordinates") ); - M_IMGDATA->m_alpha[y*w + x] = alpha; + M_IMGDATA->m_alpha[pos] = alpha; } unsigned char wxImage::GetAlpha(int x, int y) const { - wxCHECK_MSG( Ok() && HasAlpha(), 0, wxT("invalid image or no alpha channel") ); + wxCHECK_MSG( HasAlpha(), 0, wxT("no alpha channel") ); - int w = M_IMGDATA->m_width, - h = M_IMGDATA->m_height; + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - wxCHECK_MSG( x >=0 && y >= 0 && x < w && y < h, 0, wxT("invalid image index") ); - - return M_IMGDATA->m_alpha[y*w + x]; + return M_IMGDATA->m_alpha[pos]; } -bool wxImage::ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b ) +bool +wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b) { - SetAlpha( NULL ); + SetAlpha(NULL); - int w = M_IMGDATA->m_width, - h = M_IMGDATA->m_height; + const int w = M_IMGDATA->m_width; + const int h = M_IMGDATA->m_height; unsigned char *alpha = GetAlpha(); unsigned char *data = GetData(); - int x,y; - for (y = 0; y < h; y++) - for (x = 0; x < w; x++) - { - *alpha = *data; - alpha++; - *data = r; - data++; - *data = g; - data++; - *data = b; - data++; - } + for ( int y = 0; y < h; y++ ) + { + for ( int x = 0; x < w; x++ ) + { + *alpha++ = *data; + *data++ = r; + *data++ = g; + *data++ = b; + } + } return true; } -void wxImage::SetAlpha( unsigned char *alpha ) +void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) { wxCHECK_RET( Ok(), wxT("invalid image") ); @@ -930,6 +1073,7 @@ void wxImage::SetAlpha( unsigned char *alpha ) free(M_IMGDATA->m_alpha); M_IMGDATA->m_alpha = alpha; + M_IMGDATA->m_staticAlpha = static_data; } unsigned char *wxImage::GetAlpha() const @@ -949,8 +1093,6 @@ void wxImage::InitAlpha() unsigned char *alpha = M_IMGDATA->m_alpha; const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height; - static const unsigned char ALPHA_TRANSPARENT = 0; - static const unsigned char ALPHA_OPAQUE = 0xff; if ( HasMask() ) { // use the mask to initialize the alpha channel. @@ -964,8 +1106,8 @@ void wxImage::InitAlpha() src += 3, alpha++ ) { *alpha = (src[0] == mr && src[1] == mg && src[2] == mb) - ? ALPHA_TRANSPARENT - : ALPHA_OPAQUE; + ? wxIMAGE_ALPHA_TRANSPARENT + : wxIMAGE_ALPHA_OPAQUE; } M_IMGDATA->m_hasMask = false; @@ -973,7 +1115,7 @@ void wxImage::InitAlpha() else // no mask { // make the image fully opaque - memset(alpha, ALPHA_OPAQUE, lenAlpha); + memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha); } } @@ -991,6 +1133,24 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) M_IMGDATA->m_hasMask = true; } +bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const +{ + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + + if (M_IMGDATA->m_hasMask) + { + if (r) *r = M_IMGDATA->m_maskRed; + if (g) *g = M_IMGDATA->m_maskGreen; + if (b) *b = M_IMGDATA->m_maskBlue; + return true; + } + else + { + FindFirstUnusedColour(r, g, b); + return false; + } +} + unsigned char wxImage::GetMaskRed() const { wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); @@ -1026,18 +1186,35 @@ bool wxImage::HasMask() const return M_IMGDATA->m_hasMask; } -int wxImage::GetWidth() const +bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") ); - return M_IMGDATA->m_width; -} + // check mask + if ( M_IMGDATA->m_hasMask ) + { + const unsigned char *p = M_IMGDATA->m_data + 3*pos; + if ( p[0] == M_IMGDATA->m_maskRed && + p[1] == M_IMGDATA->m_maskGreen && + p[2] == M_IMGDATA->m_maskBlue ) + { + return true; + } + } -int wxImage::GetHeight() const -{ - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + // then check alpha + if ( M_IMGDATA->m_alpha ) + { + if ( M_IMGDATA->m_alpha[pos] < threshold ) + { + // transparent enough + return true; + } + } - return M_IMGDATA->m_height; + // not transparent + return false; } bool wxImage::SetMaskFromImage(const wxImage& mask, @@ -1125,9 +1302,11 @@ bool wxImage::ConvertAlphaToMask(unsigned char threshold) return true; } -#if wxUSE_PALETTE - +// ---------------------------------------------------------------------------- // Palette functions +// ---------------------------------------------------------------------------- + +#if wxUSE_PALETTE bool wxImage::HasPalette() const { @@ -1153,7 +1332,10 @@ void wxImage::SetPalette(const wxPalette& palette) #endif // wxUSE_PALETTE +// ---------------------------------------------------------------------------- // Option functions (arbitrary name/value mapping) +// ---------------------------------------------------------------------------- + void wxImage::SetOption(const wxString& name, const wxString& value) { wxCHECK_RET( Ok(), wxT("invalid image") ); @@ -1201,6 +1383,10 @@ bool wxImage::HasOption(const wxString& name) const return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND); } +// ---------------------------------------------------------------------------- +// image I/O +// ---------------------------------------------------------------------------- + bool wxImage::LoadFile( const wxString& filename, long type, int index ) { #if wxUSE_STREAMS @@ -1406,7 +1592,13 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index ) return false; } - return handler->LoadFile(this, stream, true/*verbose*/, index); + if (stream.IsSeekable() && !handler->CanRead(stream)) + { + wxLogError(_("Image file is not of type %d."), type); + return false; + } + else + return handler->LoadFile(this, stream, true/*verbose*/, index); } bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index ) @@ -1424,7 +1616,13 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind return false; } - return handler->LoadFile( this, stream, true/*verbose*/, index ); + if (stream.IsSeekable() && !handler->CanRead(stream)) + { + wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype); + return false; + } + else + return handler->LoadFile( this, stream, true/*verbose*/, index ); } bool wxImage::SaveFile( wxOutputStream& stream, int type ) const @@ -1458,6 +1656,10 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const } #endif // wxUSE_STREAMS +// ---------------------------------------------------------------------------- +// image I/O handlers +// ---------------------------------------------------------------------------- + void wxImage::AddHandler( wxImageHandler *handler ) { // Check for an existing handler of the type being added. @@ -1597,6 +1799,177 @@ wxString wxImage::GetImageExtWildcard() return wxT("(") + fmts + wxT(")|") + fmts; } +wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb) +{ + const double red = rgb.red / 255.0, + green = rgb.green / 255.0, + blue = rgb.blue / 255.0; + + // find the min and max intensity (and remember which one was it for the + // latter) + double minimumRGB = red; + if ( green < minimumRGB ) + minimumRGB = green; + if ( blue < minimumRGB ) + minimumRGB = blue; + + enum { RED, GREEN, BLUE } chMax = RED; + double maximumRGB = red; + if ( green > maximumRGB ) + { + chMax = GREEN; + maximumRGB = green; + } + if ( blue > maximumRGB ) + { + chMax = BLUE; + maximumRGB = blue; + } + + const double value = maximumRGB; + + double hue = 0.0, saturation; + const double deltaRGB = maximumRGB - minimumRGB; + if ( wxIsNullDouble(deltaRGB) ) + { + // Gray has no color + hue = 0.0; + saturation = 0.0; + } + else + { + switch ( chMax ) + { + case RED: + hue = (green - blue) / deltaRGB; + break; + + case GREEN: + hue = 2.0 + (blue - red) / deltaRGB; + break; + + case BLUE: + hue = 4.0 + (red - green) / deltaRGB; + break; + + default: + wxFAIL_MSG(wxT("hue not specified")); + break; + } + + hue /= 6.0; + + if ( hue < 0.0 ) + hue += 1.0; + + saturation = deltaRGB / maximumRGB; + } + + return HSVValue(hue, saturation, value); +} + +wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv) +{ + double red, green, blue; + + if ( wxIsNullDouble(hsv.saturation) ) + { + // Grey + red = hsv.value; + green = hsv.value; + blue = hsv.value; + } + else // not grey + { + double hue = hsv.hue * 6.0; // sector 0 to 5 + int i = (int)floor(hue); + double f = hue - i; // fractional part of h + double p = hsv.value * (1.0 - hsv.saturation); + + switch (i) + { + case 0: + red = hsv.value; + green = hsv.value * (1.0 - hsv.saturation * (1.0 - f)); + blue = p; + break; + + case 1: + red = hsv.value * (1.0 - hsv.saturation * f); + green = hsv.value; + blue = p; + break; + + case 2: + red = p; + green = hsv.value; + blue = hsv.value * (1.0 - hsv.saturation * (1.0 - f)); + break; + + case 3: + red = p; + green = hsv.value * (1.0 - hsv.saturation * f); + blue = hsv.value; + break; + + case 4: + red = hsv.value * (1.0 - hsv.saturation * (1.0 - f)); + green = p; + blue = hsv.value; + break; + + default: // case 5: + red = hsv.value; + green = p; + blue = hsv.value * (1.0 - hsv.saturation * f); + break; + } + } + + return RGBValue((unsigned char)(red * 255.0), + (unsigned char)(green * 255.0), + (unsigned char)(blue * 255.0)); +} + +/* + * Rotates the hue of each pixel of the image. angle is a double in the range + * -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees + */ +void wxImage::RotateHue(double angle) +{ + unsigned char *srcBytePtr; + unsigned char *dstBytePtr; + unsigned long count; + wxImage::HSVValue hsv; + wxImage::RGBValue rgb; + + wxASSERT (angle >= -1.0 && angle <= 1.0); + count = M_IMGDATA->m_width * M_IMGDATA->m_height; + if ( count > 0 && !wxIsNullDouble(angle) ) + { + srcBytePtr = M_IMGDATA->m_data; + dstBytePtr = srcBytePtr; + do + { + rgb.red = *srcBytePtr++; + rgb.green = *srcBytePtr++; + rgb.blue = *srcBytePtr++; + hsv = RGBtoHSV(rgb); + + hsv.hue = hsv.hue + angle; + if (hsv.hue > 1.0) + hsv.hue = hsv.hue - 1.0; + else if (hsv.hue < 0.0) + hsv.hue = hsv.hue + 1.0; + + rgb = HSVtoRGB(hsv); + *dstBytePtr++ = rgb.red; + *dstBytePtr++ = rgb.green; + *dstBytePtr++ = rgb.blue; + } while (--count != 0); + } +} + //----------------------------------------------------------------------------- // wxImageHandler //----------------------------------------------------------------------------- @@ -1856,20 +2229,20 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i wxRealPoint p3 = rotated_point (GetWidth(), 0, cos_angle, sin_angle, p0); wxRealPoint p4 = rotated_point (GetWidth(), GetHeight(), cos_angle, sin_angle, p0); - int x1 = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x))); - int y1 = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y))); - int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x))); - int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y))); + int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x))); + int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y))); + int x2a = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x))); + int y2a = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y))); // Create rotated image - wxImage rotated (x2 - x1 + 1, y2 - y1 + 1, false); + wxImage rotated (x2a - x1a + 1, y2a - y1a + 1, false); // With alpha channel if (has_alpha) rotated.SetAlpha(); if (offset_after_rotation != NULL) { - *offset_after_rotation = wxPoint (x1, y1); + *offset_after_rotation = wxPoint (x1a, y1a); } // GRG: The rotated (destination) image is always accessed @@ -1911,7 +2284,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i { for (x = 0; x < rotated.GetWidth(); x++) { - wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + wxRealPoint src = rotated_point (x + x1a, y + y1a, cos_angle, -sin_angle, p0); if (-0.25 < src.x && src.x < GetWidth() - 0.75 && -0.25 < src.y && src.y < GetHeight() - 0.75) @@ -1919,8 +2292,6 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i // interpolate using the 4 enclosing grid-points. Those // points can be obtained using floor and ceiling of the // exact coordinates of the point - // C.M. 2000-02-17: when the point is near the border, special care is required. - int x1, y1, x2, y2; if (0 < src.x && src.x < GetWidth() - 1) @@ -1970,10 +2341,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i *(dst++) = *p; if (has_alpha) - { - unsigned char *p = alpha[y1] + x1; - *(alpha_dst++) = *p; - } + *(alpha_dst++) = *(alpha[y1] + x1); } else if (d2 < gs_Epsilon) { @@ -1983,10 +2351,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i *(dst++) = *p; if (has_alpha) - { - unsigned char *p = alpha[y1] + x2; - *(alpha_dst++) = *p; - } + *(alpha_dst++) = *(alpha[y1] + x2); } else if (d3 < gs_Epsilon) { @@ -1996,10 +2361,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i *(dst++) = *p; if (has_alpha) - { - unsigned char *p = alpha[y2] + x2; - *(alpha_dst++) = *p; - } + *(alpha_dst++) = *(alpha[y2] + x2); } else if (d4 < gs_Epsilon) { @@ -2009,10 +2371,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i *(dst++) = *p; if (has_alpha) - { - unsigned char *p = alpha[y2] + x1; - *(alpha_dst++) = *p; - } + *(alpha_dst++) = *(alpha[y2] + x1); } else { @@ -2041,10 +2400,10 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i if (has_alpha) { - unsigned char *v1 = alpha[y1] + (x1); - unsigned char *v2 = alpha[y1] + (x2); - unsigned char *v3 = alpha[y2] + (x2); - unsigned char *v4 = alpha[y2] + (x1); + v1 = alpha[y1] + (x1); + v2 = alpha[y1] + (x2); + v3 = alpha[y2] + (x2); + v4 = alpha[y2] + (x1); *(alpha_dst++) = (unsigned char) ( (w1 * *v1 + w2 * *v2 + @@ -2071,7 +2430,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i { for (x = 0; x < rotated.GetWidth(); x++) { - wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + wxRealPoint src = rotated_point (x + x1a, y + y1a, cos_angle, -sin_angle, p0); const int xs = wxCint (src.x); // wxCint rounds to the const int ys = wxCint (src.y); // closest integer @@ -2085,10 +2444,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i *(dst++) = *p; if (has_alpha) - { - unsigned char *p = alpha[ys] + (xs); - *(alpha_dst++) = *p; - } + *(alpha_dst++) = *(alpha[ys] + (xs)); } else {