X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdb7d5bbc200b5a8abd323bab39f5f804cb037bc..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index 1d82b39ca5..40b0ab0325 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -2,7 +2,6 @@ // Name: src/common/image.cpp // Purpose: wxImage // Author: Robert Roebling -// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -140,8 +139,9 @@ bool wxImage::Create(const char* const* xpmData) wxXPMDecoder decoder; (*this) = decoder.ReadData(xpmData); - return Ok(); + return IsOk(); #else + wxUnusedVar(xpmData); return false; #endif } @@ -258,7 +258,7 @@ wxImage wxImage::MakeEmptyClone(int flags) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxS("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxS("invalid image") ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -293,7 +293,7 @@ wxImage wxImage::Copy() const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); image.m_refData = CloneRefData(m_refData); @@ -307,7 +307,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); // can't scale to/from 0 size wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image, @@ -426,7 +426,7 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); // can't scale to/from 0 size wxCHECK_MSG( (width > 0) && (height > 0), image, @@ -442,13 +442,6 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const if ( old_width == width && old_height == height ) return *this; - if (quality == wxIMAGE_QUALITY_HIGH) - { - quality = (width < old_width && height < old_height) - ? wxIMAGE_QUALITY_BOX_AVERAGE - : wxIMAGE_QUALITY_BICUBIC; - } - // Resample the image using the method as specified. switch ( quality ) { @@ -473,6 +466,12 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const case wxIMAGE_QUALITY_BOX_AVERAGE: image = ResampleBox(width, height); break; + + case wxIMAGE_QUALITY_HIGH: + image = width < old_width && height < old_height + ? ResampleBox(width, height) + : ResampleBicubic(width, height); + break; } // If the original image has a mask, apply the mask to the new image @@ -551,6 +550,42 @@ wxImage wxImage::ResampleNearest(int width, int height) const return image; } +namespace +{ + +struct BoxPrecalc +{ + int boxStart; + int boxEnd; +}; + +inline int BoxBetween(int value, int low, int high) +{ + return wxMax(wxMin(value, high), low); +} + +void ResampleBoxPrecalc(wxVector& boxes, int oldDim) +{ + const int newDim = boxes.size(); + const double scale_factor_1 = double(oldDim) / newDim; + const int scale_factor_2 = (int)(scale_factor_1 / 2); + + for ( int dst = 0; dst < newDim; ++dst ) + { + // Source pixel in the Y direction + const int src_p = int(dst * scale_factor_1); + + BoxPrecalc& precalc = boxes[dst]; + precalc.boxStart = BoxBetween(int(src_p - scale_factor_1/2.0 + 1), + 0, oldDim - 1); + precalc.boxEnd = BoxBetween(wxMax(precalc.boxStart + 1, + int(src_p + scale_factor_2)), + 0, oldDim - 1); + } +} + +} // anonymous namespace + wxImage wxImage::ResampleBox(int width, int height) const { // This function implements a simple pre-blur/box averaging method for @@ -560,11 +595,12 @@ wxImage wxImage::ResampleBox(int width, int height) const wxImage ret_image(width, height, false); - const double scale_factor_x = double(M_IMGDATA->m_width) / width; - const double scale_factor_y = double(M_IMGDATA->m_height) / height; + wxVector vPrecalcs(height); + wxVector hPrecalcs(width); + + ResampleBoxPrecalc(vPrecalcs, M_IMGDATA->m_height); + ResampleBoxPrecalc(hPrecalcs, M_IMGDATA->m_width); - const int scale_factor_x_2 = (int)(scale_factor_x / 2); - const int scale_factor_y_2 = (int)(scale_factor_y / 2); const unsigned char* src_data = M_IMGDATA->m_data; const unsigned char* src_alpha = M_IMGDATA->m_alpha; @@ -583,33 +619,21 @@ wxImage wxImage::ResampleBox(int width, int height) const for ( int y = 0; y < height; y++ ) // Destination image - Y direction { // Source pixel in the Y direction - int src_y = (int)(y * scale_factor_y); + const BoxPrecalc& vPrecalc = vPrecalcs[y]; for ( int x = 0; x < width; x++ ) // Destination image - X direction { // Source pixel in the X direction - int src_x = (int)(x * scale_factor_x); + const BoxPrecalc& hPrecalc = hPrecalcs[x]; // Box of pixels to average averaged_pixels = 0; sum_r = sum_g = sum_b = sum_a = 0.0; - for ( int j = int(src_y - scale_factor_y/2.0 + 1), k = j; - j <= int(src_y + scale_factor_y_2) || j < k + 2; - j++ ) + for ( int j = vPrecalc.boxStart; j <= vPrecalc.boxEnd; ++j ) { - // We don't care to average pixels that don't exist (edges) - if ( j < 0 || j > M_IMGDATA->m_height - 1 ) - continue; - - for ( int i = int(src_x - scale_factor_x/2.0 + 1), e = i; - i <= src_x + scale_factor_x_2 || i < e + 2; - i++ ) + for ( int i = hPrecalc.boxStart; i <= hPrecalc.boxEnd; ++i ) { - // Don't average edge pixels - if ( i < 0 || i > M_IMGDATA->m_width - 1 ) - continue; - // Calculate the actual index in our source pixels src_pixel_index = j * M_IMGDATA->m_width + i; @@ -636,6 +660,49 @@ wxImage wxImage::ResampleBox(int width, int height) const return ret_image; } +namespace +{ + +struct BilinearPrecalc +{ + int offset1; + int offset2; + double dd; + double dd1; +}; + +void ResampleBilinearPrecalc(wxVector& precalcs, int oldDim) +{ + const int newDim = precalcs.size(); + const double scale_factor = double(oldDim) / newDim; + const int srcpixmax = oldDim - 1; + + for ( int dsty = 0; dsty < newDim; dsty++ ) + { + // We need to calculate the source pixel to interpolate from - Y-axis + double srcpix = double(dsty) * scale_factor; + double srcpix1 = int(srcpix); + double srcpix2 = srcpix1 == srcpixmax ? srcpix1 : srcpix1 + 1.0; + + BilinearPrecalc& precalc = precalcs[dsty]; + + precalc.dd = srcpix - (int)srcpix; + precalc.dd1 = 1.0 - precalc.dd; + precalc.offset1 = srcpix1 < 0.0 + ? 0 + : srcpix1 > srcpixmax + ? srcpixmax + : (int)srcpix1; + precalc.offset2 = srcpix2 < 0.0 + ? 0 + : srcpix2 > srcpixmax + ? srcpixmax + : (int)srcpix2; + } +} + +} // anonymous namespace + wxImage wxImage::ResampleBilinear(int width, int height) const { // This function implements a Bilinear algorithm for resampling. @@ -650,14 +717,11 @@ wxImage wxImage::ResampleBilinear(int width, int height) const ret_image.SetAlpha(); dst_alpha = ret_image.GetAlpha(); } - double HFactor = double(M_IMGDATA->m_height) / height; - double WFactor = double(M_IMGDATA->m_width) / width; - - int srcpixymax = M_IMGDATA->m_height - 1; - int srcpixxmax = M_IMGDATA->m_width - 1; - double srcpixy, srcpixy1, srcpixy2, dy, dy1; - double srcpixx, srcpixx1, srcpixx2, dx, dx1; + wxVector vPrecalcs(height); + wxVector hPrecalcs(width); + ResampleBilinearPrecalc(vPrecalcs, M_IMGDATA->m_height); + ResampleBilinearPrecalc(hPrecalcs, M_IMGDATA->m_width); // initialize alpha values to avoid g++ warnings about possibly // uninitialized variables @@ -667,26 +731,22 @@ wxImage wxImage::ResampleBilinear(int width, int height) const for ( int dsty = 0; dsty < height; dsty++ ) { // We need to calculate the source pixel to interpolate from - Y-axis - srcpixy = double(dsty) * HFactor; - srcpixy1 = int(srcpixy); - srcpixy2 = ( srcpixy1 == srcpixymax ) ? srcpixy1 : srcpixy1 + 1.0; - dy = srcpixy - (int)srcpixy; - dy1 = 1.0 - dy; + const BilinearPrecalc& vPrecalc = vPrecalcs[dsty]; + const int y_offset1 = vPrecalc.offset1; + const int y_offset2 = vPrecalc.offset2; + const double dy = vPrecalc.dd; + const double dy1 = vPrecalc.dd1; for ( int dstx = 0; dstx < width; dstx++ ) { // X-axis of pixel to interpolate from - srcpixx = double(dstx) * WFactor; - srcpixx1 = int(srcpixx); - srcpixx2 = ( srcpixx1 == srcpixxmax ) ? srcpixx1 : srcpixx1 + 1.0; - dx = srcpixx - (int)srcpixx; - dx1 = 1.0 - dx; + const BilinearPrecalc& hPrecalc = hPrecalcs[dstx]; - int x_offset1 = srcpixx1 < 0.0 ? 0 : srcpixx1 > srcpixxmax ? srcpixxmax : (int)srcpixx1; - int x_offset2 = srcpixx2 < 0.0 ? 0 : srcpixx2 > srcpixxmax ? srcpixxmax : (int)srcpixx2; - int y_offset1 = srcpixy1 < 0.0 ? 0 : srcpixy1 > srcpixymax ? srcpixymax : (int)srcpixy1; - int y_offset2 = srcpixy2 < 0.0 ? 0 : srcpixy2 > srcpixymax ? srcpixymax : (int)srcpixy2; + const int x_offset1 = hPrecalc.offset1; + const int x_offset2 = hPrecalc.offset2; + const double dx = hPrecalc.dd; + const double dx1 = hPrecalc.dd1; int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1; int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2; @@ -737,6 +797,42 @@ static inline double spline_weight(double value) 4 * spline_cube(value - 1)) / 6; } + +namespace +{ + +struct BicubicPrecalc +{ + double weight[4]; + int offset[4]; +}; + +void ResampleBicubicPrecalc(wxVector &aWeight, int oldDim) +{ + const int newDim = aWeight.size(); + for ( int dstd = 0; dstd < newDim; dstd++ ) + { + // We need to calculate the source pixel to interpolate from - Y-axis + const double srcpixd = static_cast(dstd * oldDim) / newDim; + const double dd = srcpixd - static_cast(srcpixd); + + BicubicPrecalc &precalc = aWeight[dstd]; + + for ( int k = -1; k <= 2; k++ ) + { + precalc.offset[k + 1] = srcpixd + k < 0.0 + ? 0 + : srcpixd + k >= oldDim + ? oldDim - 1 + : static_cast(srcpixd + k); + + precalc.weight[k + 1] = spline_weight(k - dd); + } + } +} + +} // anonymous namespace + // This is the bicubic resampling algorithm wxImage wxImage::ResampleBicubic(int width, int height) const { @@ -781,17 +877,22 @@ wxImage wxImage::ResampleBicubic(int width, int height) const dst_alpha = ret_image.GetAlpha(); } + // Precalculate weights + wxVector vPrecalcs(height); + wxVector hPrecalcs(width); + + ResampleBicubicPrecalc(vPrecalcs, M_IMGDATA->m_height); + ResampleBicubicPrecalc(hPrecalcs, M_IMGDATA->m_width); + for ( int dsty = 0; dsty < height; dsty++ ) { // We need to calculate the source pixel to interpolate from - Y-axis - double srcpixy = double(dsty * M_IMGDATA->m_height) / height; - double dy = srcpixy - (int)srcpixy; + const BicubicPrecalc& vPrecalc = vPrecalcs[dsty]; for ( int dstx = 0; dstx < width; dstx++ ) { // X-axis of pixel to interpolate from - double srcpixx = double(dstx * M_IMGDATA->m_width) / width; - double dx = srcpixx - (int)srcpixx; + const BicubicPrecalc& hPrecalc = hPrecalcs[dstx]; // Sums for each color channel double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0; @@ -800,21 +901,13 @@ wxImage wxImage::ResampleBicubic(int width, int height) const for ( int k = -1; k <= 2; k++ ) { // Y offset - int y_offset = srcpixy + k < 0.0 - ? 0 - : srcpixy + k >= M_IMGDATA->m_height - ? M_IMGDATA->m_height - 1 - : (int)(srcpixy + k); + const int y_offset = vPrecalc.offset[k + 1]; // Loop across the X axis for ( int i = -1; i <= 2; i++ ) { // X offset - int x_offset = srcpixx + i < 0.0 - ? 0 - : srcpixx + i >= M_IMGDATA->m_width - ? M_IMGDATA->m_width - 1 - : (int)(srcpixx + i); + const int x_offset = hPrecalc.offset[i + 1]; // Calculate the exact position where the source data // should be pulled from based on the x_offset and y_offset @@ -823,8 +916,8 @@ wxImage wxImage::ResampleBicubic(int width, int height) const // Calculate the weight for the specified pixel according // to the bicubic b-spline kernel we're using for // interpolation - double - pixel_weight = spline_weight(i - dx)*spline_weight(k - dy); + const double + pixel_weight = vPrecalc.weight[k + 1] * hPrecalc.weight[i + 1]; // Create a sum of all velues for each color channel // adjusted for the pixel's calculated weight @@ -856,7 +949,7 @@ wxImage wxImage::BlurHorizontal(int blurRadius) const { wxImage ret_image(MakeEmptyClone()); - wxCHECK( ret_image.Ok(), ret_image ); + wxCHECK( ret_image.IsOk(), ret_image ); const unsigned char* src_data = M_IMGDATA->m_data; unsigned char* dst_data = ret_image.GetData(); @@ -959,7 +1052,7 @@ wxImage wxImage::BlurVertical(int blurRadius) const { wxImage ret_image(MakeEmptyClone()); - wxCHECK( ret_image.Ok(), ret_image ); + wxCHECK( ret_image.IsOk(), ret_image ); const unsigned char* src_data = M_IMGDATA->m_data; unsigned char* dst_data = ret_image.GetData(); @@ -1074,7 +1167,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const { wxImage image(MakeEmptyClone(Clone_SwapOrientation)); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1099,7 +1192,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const // we rotate the image in 21-pixel (63-byte) wide strips // to make better use of cpu cache - memory transfers // (note: while much better than single-pixel "strips", - // our vertical strips will still generally straddle cachelines) + // our vertical strips will still generally straddle 64-byte cachelines) for (long ii = 0; ii < width; ) { long next_ii = wxMin(ii + 21, width); @@ -1113,11 +1206,11 @@ wxImage wxImage::Rotate90( bool clockwise ) const { if ( clockwise ) { - target_data = data + (((i+1)*height) - j - 1)*3; + target_data = data + ((i + 1)*height - j - 1)*3; } else { - target_data = data + ((height*(width - 1 - i)) + j)*3; + target_data = data + (height*(width - 1 - i) + j)*3; } memcpy( target_data, source_data, 3 ); source_data += 3; @@ -1134,21 +1227,30 @@ wxImage wxImage::Rotate90( bool clockwise ) const unsigned char *alpha_data = image.GetAlpha(); unsigned char *target_alpha = 0 ; - for (long j = 0; j < height; j++) + for (long ii = 0; ii < width; ) { - for (long i = 0; i < width; i++) + long next_ii = wxMin(ii + 64, width); + + for (long j = 0; j < height; j++) { - if ( clockwise ) - { - target_alpha = alpha_data + (((i+1)*height) - j - 1); - } - else + source_alpha = M_IMGDATA->m_alpha + j*width + ii; + + for (long i = ii; i < next_ii; i++) { - target_alpha = alpha_data + ((height*(width-1)) + j - (i*height)); - } + if ( clockwise ) + { + target_alpha = alpha_data + (i+1)*height - j - 1; + } + else + { + target_alpha = alpha_data + height*(width - i - 1) + j; + } - *target_alpha = *source_alpha++; + *target_alpha = *source_alpha++; + } } + + ii = next_ii; } } @@ -1159,7 +1261,7 @@ wxImage wxImage::Rotate180() const { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1212,7 +1314,7 @@ wxImage wxImage::Mirror( bool horizontally ) const { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1289,7 +1391,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), @@ -1342,7 +1444,7 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") ); int width = GetWidth(), height = GetHeight(); @@ -1390,8 +1492,8 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, void wxImage::Paste( const wxImage &image, int x, int y ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); - wxCHECK_RET( image.Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); + wxCHECK_RET( image.IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1419,12 +1521,15 @@ void wxImage::Paste( const wxImage &image, int x, int y ) if (width < 1) return; if (height < 1) return; - if ((!HasMask() && !image.HasMask()) || - (HasMask() && !image.HasMask()) || - ((HasMask() && image.HasMask() && + // If we can, copy the data using memcpy() as this is the fastest way. But + // for this the image being pasted must have "compatible" mask with this + // one meaning that either it must not have one at all or it must use the + // same masked colour. + if ( !image.HasMask() || + ((HasMask() && (GetMaskRed()==image.GetMaskRed()) && (GetMaskGreen()==image.GetMaskGreen()) && - (GetMaskBlue()==image.GetMaskBlue())))) + (GetMaskBlue()==image.GetMaskBlue()))) ) { const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth()); int source_step = image.GetWidth()*3; @@ -1491,7 +1596,7 @@ void wxImage::Paste( const wxImage &image, int x, int y ) void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, unsigned char r2, unsigned char g2, unsigned char b2 ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1520,35 +1625,39 @@ wxImage wxImage::ConvertToGreyscale(void) const wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const { - wxImage image(MakeEmptyClone()); - - wxCHECK( image.Ok(), image ); - - const unsigned char *src = M_IMGDATA->m_data; - unsigned char *dest = image.GetData(); - - const bool hasMask = M_IMGDATA->m_hasMask; - const unsigned char maskRed = M_IMGDATA->m_maskRed; - const unsigned char maskGreen = M_IMGDATA->m_maskGreen; - const unsigned char maskBlue = M_IMGDATA->m_maskBlue; + wxImage image; + wxCHECK_MSG(IsOk(), image, "invalid image"); - const long size = M_IMGDATA->m_width * M_IMGDATA->m_height; - for ( long i = 0; i < size; i++, src += 3, dest += 3 ) + const int w = M_IMGDATA->m_width; + const int h = M_IMGDATA->m_height; + size_t size = size_t(w) * h; + image.Create(w, h, false); + const unsigned char* alpha = M_IMGDATA->m_alpha; + if (alpha) { - memcpy(dest, src, 3); - // only modify non-masked pixels - if ( !hasMask || src[0] != maskRed || src[1] != maskGreen || src[2] != maskBlue ) - { - wxColour::MakeGrey(dest + 0, dest + 1, dest + 2, weight_r, weight_g, weight_b); - } + image.SetAlpha(); + memcpy(image.GetAlpha(), alpha, size); } - - // copy the alpha channel, if any - if ( image.HasAlpha() ) - { - memcpy( image.GetAlpha(), GetAlpha(), GetWidth() * GetHeight() ); + const unsigned char mask_r = M_IMGDATA->m_maskRed; + const unsigned char mask_g = M_IMGDATA->m_maskGreen; + const unsigned char mask_b = M_IMGDATA->m_maskBlue; + const bool hasMask = M_IMGDATA->m_hasMask; + if (hasMask) + image.SetMaskColour(mask_r, mask_g, mask_b); + + const unsigned char* src = M_IMGDATA->m_data; + unsigned char* dst = image.GetData(); + while (size--) + { + unsigned char r = *src++; + unsigned char g = *src++; + unsigned char b = *src++; + if (!hasMask || r != mask_r || g != mask_g || b != mask_b) + wxColour::MakeGrey(&r, &g, &b, weight_r, weight_g, weight_b); + *dst++ = r; + *dst++ = g; + *dst++ = b; } - return image; } @@ -1556,7 +1665,7 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false ); @@ -1589,44 +1698,52 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char wxImage wxImage::ConvertToDisabled(unsigned char brightness) const { - wxImage image = *this; - - unsigned char mr = image.GetMaskRed(); - unsigned char mg = image.GetMaskGreen(); - unsigned char mb = image.GetMaskBlue(); - - int width = image.GetWidth(); - int height = image.GetHeight(); - bool has_mask = image.HasMask(); + wxImage image; + wxCHECK_MSG(IsOk(), image, "invalid image"); - for (int y = height-1; y >= 0; --y) + const int w = M_IMGDATA->m_width; + const int h = M_IMGDATA->m_height; + size_t size = size_t(w) * h; + image.Create(w, h, false); + const unsigned char* alpha = M_IMGDATA->m_alpha; + if (alpha) { - for (int x = width-1; x >= 0; --x) - { - unsigned char* data = image.GetData() + (y*(width*3))+(x*3); - unsigned char* r = data; - unsigned char* g = data+1; - unsigned char* b = data+2; - - if (has_mask && (*r == mr) && (*g == mg) && (*b == mb)) - continue; - - wxColour::MakeDisabled(r, g, b, brightness); - } + image.SetAlpha(); + memcpy(image.GetAlpha(), alpha, size); + } + const unsigned char mask_r = M_IMGDATA->m_maskRed; + const unsigned char mask_g = M_IMGDATA->m_maskGreen; + const unsigned char mask_b = M_IMGDATA->m_maskBlue; + const bool hasMask = M_IMGDATA->m_hasMask; + if (hasMask) + image.SetMaskColour(mask_r, mask_g, mask_b); + + const unsigned char* src = M_IMGDATA->m_data; + unsigned char* dst = image.GetData(); + while (size--) + { + unsigned char r = *src++; + unsigned char g = *src++; + unsigned char b = *src++; + if (!hasMask || r != mask_r || g != mask_g || b != mask_b) + wxColour::MakeDisabled(&r, &g, &b, brightness); + *dst++ = r; + *dst++ = g; + *dst++ = b; } return image; } int wxImage::GetWidth() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_width; } int wxImage::GetHeight() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_height; } @@ -1650,7 +1767,7 @@ void wxImage::SetType(wxBitmapType type) long wxImage::XYToIndex(int x, int y) const { - if ( Ok() && + if ( IsOk() && x >= 0 && y >= 0 && x < M_IMGDATA->m_width && y < M_IMGDATA->m_height ) { @@ -1676,7 +1793,7 @@ void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned c void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1752,14 +1869,14 @@ bool wxImage::IsOk() const unsigned char *wxImage::GetData() const { - wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); return M_IMGDATA->m_data; } void wxImage::SetData( unsigned char *data, bool static_data ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); wxImageRefData *newRefData = new wxImageRefData(); @@ -1860,7 +1977,7 @@ wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b) void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1878,7 +1995,7 @@ void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) unsigned char *wxImage::GetAlpha() const { - wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); return M_IMGDATA->m_alpha; } @@ -1936,7 +2053,7 @@ void wxImage::ClearAlpha() void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1948,7 +2065,7 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); if (M_IMGDATA->m_hasMask) { @@ -1966,28 +2083,28 @@ bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned unsigned char wxImage::GetMaskRed() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskRed; } unsigned char wxImage::GetMaskGreen() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskGreen; } unsigned char wxImage::GetMaskBlue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskBlue; } void wxImage::SetMask( bool mask ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1996,7 +2113,7 @@ void wxImage::SetMask( bool mask ) bool wxImage::HasMask() const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); return M_IMGDATA->m_hasMask; } @@ -2143,22 +2260,22 @@ bool wxImage::ConvertAlphaToMask(unsigned char mr, bool wxImage::HasPalette() const { - if (!Ok()) + if (!IsOk()) return false; - return M_IMGDATA->m_palette.Ok(); + return M_IMGDATA->m_palette.IsOk(); } const wxPalette& wxImage::GetPalette() const { - wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), wxNullPalette, wxT("invalid image") ); return M_IMGDATA->m_palette; } void wxImage::SetPalette(const wxPalette& palette) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -2222,10 +2339,105 @@ bool wxImage::HasOption(const wxString& name) const // image I/O // ---------------------------------------------------------------------------- -bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), - wxBitmapType WXUNUSED_UNLESS_STREAMS(type), +// Under Windows we can load wxImage not only from files but also from +// resources. +#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE + #define HAS_LOAD_FROM_RESOURCE +#endif + +#ifdef HAS_LOAD_FROM_RESOURCE + +#include "wx/msw/dib.h" +#include "wx/msw/private.h" + +static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type) +{ + AutoHBITMAP + hBitmap, + hMask; + + if ( type == wxBITMAP_TYPE_BMP_RESOURCE ) + { + hBitmap.Init( ::LoadBitmap(wxGetInstance(), name.t_str()) ); + + if ( !hBitmap ) + { + wxLogError(_("Failed to load bitmap \"%s\" from resources."), name); + } + } + else if ( type == wxBITMAP_TYPE_ICO_RESOURCE ) + { + const HICON hIcon = ::LoadIcon(wxGetInstance(), name.t_str()); + + if ( !hIcon ) + { + wxLogError(_("Failed to load icon \"%s\" from resources."), name); + } + else + { + ICONINFO info; + if ( !::GetIconInfo(hIcon, &info) ) + { + wxLogLastError(wxT("GetIconInfo")); + return wxImage(); + } + + hBitmap.Init(info.hbmColor); + hMask.Init(info.hbmMask); + } + } + else if ( type == wxBITMAP_TYPE_CUR_RESOURCE ) + { + wxLogDebug(wxS("Loading cursors from resources is not implemented.")); + } + else + { + wxFAIL_MSG(wxS("Invalid bitmap resource type.")); + } + + if ( !hBitmap ) + return wxImage(); + + wxImage image = wxDIB(hBitmap).ConvertToImage(); + if ( hMask ) + { + const wxImage mask = wxDIB(hMask).ConvertToImage(); + image.SetMaskFromImage(mask, 255, 255, 255); + } + else + { + // Light gray colour is a default mask + image.SetMaskColour(0xc0, 0xc0, 0xc0); + } + + // We could have already loaded alpha from the resources, but if not, + // initialize it now using the mask. + if ( !image.HasAlpha() ) + image.InitAlpha(); + + return image; +} + +#endif // HAS_LOAD_FROM_RESOURCE + +bool wxImage::LoadFile( const wxString& filename, + wxBitmapType type, int WXUNUSED_UNLESS_STREAMS(index) ) { +#ifdef HAS_LOAD_FROM_RESOURCE + if ( type == wxBITMAP_TYPE_BMP_RESOURCE + || type == wxBITMAP_TYPE_ICO_RESOURCE + || type == wxBITMAP_TYPE_CUR_RESOURCE) + { + const wxImage image = ::LoadImageFromResource(filename, type); + if ( image.IsOk() ) + { + *this = image; + return true; + } + } +#endif // HAS_LOAD_FROM_RESOURCE + #if HAS_FILE_STREAMS wxImageFileInputStream stream(filename); if ( stream.IsOk() ) @@ -2280,7 +2492,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const { #if HAS_FILE_STREAMS - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); @@ -2300,7 +2512,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const { #if HAS_FILE_STREAMS - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); @@ -2331,7 +2543,7 @@ int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name), { #if HAS_FILE_STREAMS wxImageFileInputStream stream(name); - if (stream.Ok()) + if (stream.IsOk()) return GetImageCount(stream, type); #endif @@ -2438,7 +2650,17 @@ bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index) } if ( width != widthOrig || height != heightOrig ) + { + // get the original size if it was set by the image handler + // but also in order to restore it after Rescale + int widthOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_WIDTH), + heightOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_HEIGHT); + Rescale(width, height, wxIMAGE_QUALITY_HIGH); + + SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, widthOrigOption ? widthOrigOption : widthOrig); + SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, heightOrigOption ? heightOrigOption : heightOrig); + } } // Set this after Rescale, which currently does not preserve it @@ -2533,7 +2755,7 @@ bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandler(type); if ( !handler ) @@ -2547,12 +2769,13 @@ bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandlerMime(mimetype); if ( !handler ) { wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); + return false; } return DoSave(*handler, stream); @@ -2761,10 +2984,6 @@ wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb) case BLUE: hue = 4.0 + (red - green) / deltaRGB; break; - - default: - wxFAIL_MSG(wxT("hue not specified")); - break; } hue /= 6.0;