X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd0bbd03d7d78094dee2691cbec7a2fd4d84a3fb..99f0cdf2e9f61b3095356d3eea75082797ddae69:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index 35acc5ef6d..50307d6ec8 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -35,13 +35,12 @@ #include "wx/utils.h" #include "wx/math.h" -// For memcpy -#include - -#ifdef __SALFORDC__ - #undef FAR +#if wxUSE_XPM +#include "wx/xpmdecod.h" #endif +// For memcpy +#include //----------------------------------------------------------------------------- // wxImage @@ -64,8 +63,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 @@ -89,16 +93,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; @@ -159,6 +163,29 @@ wxImage::wxImage( const wxImage* image ) if (image) Ref(*image); } +wxImage::wxImage( const char** xpmData ) +{ + Create(xpmData); +} + +wxImage::wxImage( char** xpmData ) +{ + Create((const char**) xpmData); +} + +bool wxImage::Create( const char** xpmData ) +{ +#if wxUSE_XPM + UnRef(); + + wxXPMDecoder decoder; + (*this) = decoder.ReadData(xpmData); + return Ok(); +#else + return false; +#endif +} + bool wxImage::Create( int width, int height, bool clear ) { UnRef(); @@ -394,15 +421,26 @@ wxImage wxImage::Scale( int width, int height ) const wxCHECK_MSG( data, image, wxT("unable to create image") ); + unsigned char *source_data = M_IMGDATA->m_data; + 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, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue ); } - - unsigned char *source_data = M_IMGDATA->m_data; - unsigned char *target_data = data; + else + { + source_alpha = M_IMGDATA->m_alpha ; + if ( source_alpha ) + { + image.SetAlpha() ; + target_alpha = image.GetAlpha() ; + } + } long x_delta = (old_width<<16) / width; long y_delta = (old_height<<16) / height; @@ -413,15 +451,19 @@ wxImage wxImage::Scale( int width, int height ) const for ( long j = 0; j < height; j++ ) { 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++ ) { unsigned char* src_pixel = &src_line[(x>>16)*3]; + unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ; dest_pixel[0] = src_pixel[0]; dest_pixel[1] = src_pixel[1]; dest_pixel[2] = src_pixel[2]; dest_pixel += 3; + if ( source_alpha ) + *(target_alpha++) = *src_alpha_pixel ; x += x_delta; } @@ -451,25 +493,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; + } } } @@ -561,6 +631,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") ); @@ -591,6 +699,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()) && @@ -701,60 +810,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; +} + +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") ); - int w = M_IMGDATA->m_width; - int h = M_IMGDATA->m_height; + 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") ); + } - 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") ); + + 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; + long pos = XYToIndex(x, y); + wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") ); - 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]; } @@ -774,7 +929,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") ); @@ -788,13 +943,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(); @@ -816,6 +972,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(); @@ -828,56 +985,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") ); @@ -888,6 +1039,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 @@ -897,6 +1049,42 @@ unsigned char *wxImage::GetAlpha() const return M_IMGDATA->m_alpha; } +void wxImage::InitAlpha() +{ + wxCHECK_RET( !HasAlpha(), wxT("image already has an alpha channel") ); + + // initialize memory for alpha channel + SetAlpha(); + + unsigned char *alpha = M_IMGDATA->m_alpha; + const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height; + + if ( HasMask() ) + { + // use the mask to initialize the alpha channel. + const unsigned char * const alphaEnd = alpha + lenAlpha; + + const unsigned char mr = M_IMGDATA->m_maskRed; + const unsigned char mg = M_IMGDATA->m_maskGreen; + const unsigned char mb = M_IMGDATA->m_maskBlue; + for ( unsigned char *src = M_IMGDATA->m_data; + alpha < alphaEnd; + src += 3, alpha++ ) + { + *alpha = (src[0] == mr && src[1] == mg && src[2] == mb) + ? wxIMAGE_ALPHA_TRANSPARENT + : wxIMAGE_ALPHA_OPAQUE; + } + + M_IMGDATA->m_hasMask = false; + } + else // no mask + { + // make the image fully opaque + memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha); + } +} + // ---------------------------------------------------------------------------- // mask support // ---------------------------------------------------------------------------- @@ -911,6 +1099,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") ); @@ -946,18 +1152,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, @@ -1045,9 +1268,11 @@ bool wxImage::ConvertAlphaToMask(unsigned char threshold) return true; } -#if wxUSE_PALETTE - +// ---------------------------------------------------------------------------- // Palette functions +// ---------------------------------------------------------------------------- + +#if wxUSE_PALETTE bool wxImage::HasPalette() const { @@ -1073,7 +1298,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") ); @@ -1111,8 +1339,6 @@ wxString wxImage::GetOption(const wxString& name) const int wxImage::GetOptionInt(const wxString& name) const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); - return wxAtoi(GetOption(name)); } @@ -1123,6 +1349,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 @@ -1184,6 +1414,8 @@ bool wxImage::SaveFile( const wxString& filename ) const bool wxImage::SaveFile( const wxString& filename, int type ) const { #if wxUSE_STREAMS + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); wxFileOutputStream stream(filename); @@ -1201,6 +1433,8 @@ bool wxImage::SaveFile( const wxString& filename, int type ) const bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const { #if wxUSE_STREAMS + wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); wxFileOutputStream stream(filename); @@ -1350,8 +1584,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const wxCHECK_MSG( Ok(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandler(type); - - if (handler == 0) + if ( !handler ) { wxLogWarning( _("No image handler for type %d defined."), type ); @@ -1366,8 +1599,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const wxCHECK_MSG( Ok(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandlerMime(mimetype); - - if (handler == 0) + if ( !handler ) { wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); @@ -1378,6 +1610,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. @@ -1517,6 +1753,159 @@ wxString wxImage::GetImageExtWildcard() return wxT("(") + fmts + wxT(")|") + fmts; } +wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb) +{ + double hue, saturation, value; + + const double red = rgb.red / 255.0, + green = rgb.green / 255.0, + blue = rgb.blue / 255.0; + + double minimumRGB = red; + if (green < minimumRGB) + minimumRGB = green; + + if (blue < minimumRGB) + minimumRGB = blue; + + double maximumRGB = red; + if (green > maximumRGB) + maximumRGB = green; + + if (blue > maximumRGB) + maximumRGB = blue; + + value = maximumRGB; + + if (maximumRGB == minimumRGB) + { + // Gray has no color + hue = 0.0; + saturation = 0.0; + } + else + { + double deltaRGB = maximumRGB - minimumRGB; + + saturation = deltaRGB / maximumRGB; + + if ( red == maximumRGB ) + hue = (green - blue) / deltaRGB; + else if (green == maximumRGB) + hue = 2.0 + (blue - red) / deltaRGB; + else + hue = 4.0 + (red - green) / deltaRGB; + + hue = hue / 6.0; + + if (hue < 0.0) + hue = hue + 1.0; + } + + return HSVValue(hue, saturation, value); +} + +wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv) +{ + double red, green, blue; + + if ( hsv.saturation == 0.0 ) + { + red = hsv.value; //Grey + green = hsv.value; + blue = hsv.value; + } + else + { + 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 && angle != 0.0) + { + 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 //-----------------------------------------------------------------------------