X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88195b2b70a7ebf7f6dde020bd97d362d7956c5b..399b60a0ad232265cd74ce8bf6a53a1f2cc57ff2:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index 2f167850fc..5f61154db2 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -30,6 +30,7 @@ // For memcpy #include +#include #ifdef __SALFORDC__ #undef FAR @@ -126,6 +127,8 @@ wxImage::wxImage( const wxImage* image ) void wxImage::Create( int width, int height ) { + UnRef(); + m_refData = new wxImageRefData(); M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 ); @@ -230,21 +233,21 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, wxCHECK_RET( Ok(), wxT("invalid image") ); char unsigned *data = GetData(); - + const int w = GetWidth(); const int h = GetHeight(); for (int j = 0; j < h; j++) for (int i = 0; i < w; i++) - { - if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1)) - { - data[0] = r2; - data[1] = g2; - data[2] = b2; - } - data += 3; - } + { + if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1)) + { + data[0] = r2; + data[1] = g2; + data[2] = b2; + } + data += 3; + } } void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ) @@ -402,7 +405,7 @@ bool wxImage::LoadFile( const wxString& filename, long type ) if (wxFileExists(filename)) { wxFileInputStream stream(filename); - wxBufferedInputStream bstream( stream ); + wxBufferedInputStream bstream( stream ); return LoadFile(bstream, type); } else @@ -422,7 +425,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype ) if (wxFileExists(filename)) { wxFileInputStream stream(filename); - wxBufferedInputStream bstream( stream ); + wxBufferedInputStream bstream( stream ); return LoadFile(bstream, mimetype); } else @@ -443,7 +446,7 @@ bool wxImage::SaveFile( const wxString& filename, int type ) if ( stream.LastError() == wxStream_NOERROR ) { - wxBufferedOutputStream bstream( stream ); + wxBufferedOutputStream bstream( stream ); return SaveFile(bstream, type); } else @@ -458,7 +461,7 @@ bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) if ( stream.LastError() == wxStream_NOERROR ) { - wxBufferedOutputStream bstream( stream ); + wxBufferedOutputStream bstream( stream ); return SaveFile(bstream, mimetype); } else @@ -486,7 +489,7 @@ bool wxImage::CanRead( wxInputStream &stream ) { wxImageHandler *handler=(wxImageHandler*)node->GetData(); if (handler->CanRead( stream )) - return TRUE; + return TRUE; } return FALSE; @@ -857,7 +860,7 @@ wxBitmap wxImage::ConvertToBitmap() const if( HasMask() ) { hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL ); - ::SelectObject( memdc, hbitmap); + HGDIOBJ hbmpOld = ::SelectObject( memdc, hbitmap); if( numDIB == 1 ) height = bmpHeight; else height = sizeLimit/bytePerLine; lpDIBh->bmiHeader.biHeight = (DWORD)(-height); @@ -883,7 +886,12 @@ wxBitmap wxImage::ConvertToBitmap() const { for(i=0; i> 3)+8) * height ); mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); @@ -1102,64 +1111,38 @@ wxBitmap wxImage::ConvertToBitmap() const int g_mask = GetMaskGreen(); int b_mask = GetMaskBlue(); - CGrafPtr origPort ; - GDHandle origDevice ; - - GetGWorld( &origPort , &origDevice ) ; - SetGWorld( bitmap.GetHBITMAP() , NULL ) ; + CGrafPtr origPort ; + GDHandle origDevice ; + + GetGWorld( &origPort , &origDevice ) ; + SetGWorld( bitmap.GetHBITMAP() , NULL ) ; register unsigned char* data = GetData(); int index = 0; for (int y = 0; y < height; y++) { -#if 0 - unsigned char lastr = 0 ; - unsigned char lastg = 0 ; - unsigned char lastb = 0 ; - RGBColor lastcolor ; - - MoveTo( 0 , y ) ; - for (int x = 0; x < width; x++) - { - unsigned char r = data[index++]; - unsigned char g = data[index++]; - unsigned char b = data[index++]; - - if ( r != lastr || g != lastg || b != lastb ) - { - lastcolor.red = ( lastr << 8 ) + lastr ; - lastcolor.green = ( lastg << 8 ) + lastg ; - lastcolor.blue = ( lastb << 8 ) + lastb ; - RGBForeColor( &lastcolor ) ; - LineTo( x , y ) ; - lastr = r ; - lastg = g ; - lastb = b ; - } - } // for width - lastcolor.red = ( lastr << 8 ) + lastr ; - lastcolor.green = ( lastg << 8 ) + lastg ; - lastcolor.blue = ( lastb << 8 ) + lastb ; - RGBForeColor( &lastcolor ) ; - LineTo( width - 1 , y ) ; -#else for (int x = 0; x < width; x++) { - unsigned char r = data[index++]; - unsigned char g = data[index++]; - unsigned char b = data[index++]; - RGBColor color ; - color.red = ( r << 8 ) + r ; - color.green = ( g << 8 ) + g ; - color.blue = ( b << 8 ) + b ; - SetCPixel( x , y , &color ) ; - } -#endif + unsigned char r = data[index++]; + unsigned char g = data[index++]; + unsigned char b = data[index++]; + RGBColor color ; + color.red = ( r << 8 ) + r ; + color.green = ( g << 8 ) + g ; + color.blue = ( b << 8 ) + b ; + SetCPixel( x , y , &color ) ; + } } // for height - SetGWorld( origPort , origDevice ) ; + SetGWorld( origPort , origDevice ) ; + if ( HasMask() ) + { + wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue()); + wxMask *mask = new wxMask( bitmap, colour ); + bitmap.SetMask( mask ); + } return bitmap; } @@ -1249,7 +1232,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) ptbits += 3; } ptbits += padding; - } + } // similarly, set data according to the possible mask bitmap if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() ) @@ -1311,6 +1294,109 @@ wxImage::wxImage( const wxBitmap &bitmap ) #include #endif +extern GtkWidget *wxRootWindow; + +wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) +{ + wxBitmap bitmap; + + wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); + + int width = GetWidth(); + int height = GetHeight(); + + bitmap.SetHeight( height ); + bitmap.SetWidth( width ); + + bitmap.SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) ); + + bitmap.SetDepth( 1 ); + + GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); + wxASSERT( visual ); + + // Create picture image + + unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); + + GdkImage *data_image = + gdk_image_new_bitmap( visual, data_data, width, height ); + + // Create mask image + + GdkImage *mask_image = (GdkImage*) NULL; + + if (HasMask()) + { + unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); + + mask_image = gdk_image_new_bitmap( visual, mask_data, width, height ); + + wxMask *mask = new wxMask(); + mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 ); + + bitmap.SetMask( mask ); + } + + int r_mask = GetMaskRed(); + int g_mask = GetMaskGreen(); + int b_mask = GetMaskBlue(); + + unsigned char* data = GetData(); + + int index = 0; + for (int y = 0; y < height; y++) + { + for (int x = 0; x < width; x++) + { + int r = data[index]; + index++; + int g = data[index]; + index++; + int b = data[index]; + index++; + + if (HasMask()) + { + if ((r == r_mask) && (b == b_mask) && (g == g_mask)) + gdk_image_put_pixel( mask_image, x, y, 1 ); + else + gdk_image_put_pixel( mask_image, x, y, 0 ); + } + + if ((r == red) && (b == blue) && (g == green)) + gdk_image_put_pixel( data_image, x, y, 1 ); + else + gdk_image_put_pixel( data_image, x, y, 0 ); + + } // for + } // for + + // Blit picture + + GdkGC *data_gc = gdk_gc_new( bitmap.GetBitmap() ); + + gdk_draw_image( bitmap.GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height ); + + gdk_image_destroy( data_image ); + gdk_gc_unref( data_gc ); + + // Blit mask + + if (HasMask()) + { + GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() ); + + gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height ); + + gdk_image_destroy( mask_image ); + gdk_gc_unref( mask_gc ); + } + + return bitmap; +} + + wxBitmap wxImage::ConvertToBitmap() const { wxBitmap bitmap; @@ -1323,12 +1409,13 @@ wxBitmap wxImage::ConvertToBitmap() const bitmap.SetHeight( height ); bitmap.SetWidth( width ); - bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) ); + bitmap.SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) ); + + // Retrieve depth - // Retrieve depth + GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); + wxASSERT( visual ); - GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); - if (visual == NULL) visual = gdk_visual_get_system(); int bpp = visual->depth; bitmap.SetDepth( bpp ); @@ -1368,7 +1455,7 @@ wxBitmap wxImage::ConvertToBitmap() const // Create picture image GdkImage *data_image = - gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height ); + gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height ); // Create mask image @@ -1378,10 +1465,10 @@ wxBitmap wxImage::ConvertToBitmap() const { unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); - mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); + mask_image = gdk_image_new_bitmap( visual, mask_data, width, height ); wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 ); + mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 ); bitmap.SetMask( mask ); } @@ -1393,7 +1480,6 @@ wxBitmap wxImage::ConvertToBitmap() const if (bpp >= 24) { - GdkVisual *visual = gdk_visual_get_system(); if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask)) b_o = RGB; else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RGB; else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask)) b_o = BRG; @@ -1428,14 +1514,6 @@ wxBitmap wxImage::ConvertToBitmap() const gdk_image_put_pixel( mask_image, x, y, 0 ); } - if (HasMask()) - { - if ((r == r_mask) && (b == b_mask) && (g == g_mask)) - gdk_image_put_pixel( mask_image, x, y, 1 ); - else - gdk_image_put_pixel( mask_image, x, y, 0 ); - } - switch (bpp) { case 8: @@ -1565,19 +1643,36 @@ wxImage::wxImage( const wxBitmap &bitmap ) } int bpp = -1; + int red_shift_right = 0; + int green_shift_right = 0; + int blue_shift_right = 0; + int red_shift_left = 0; + int green_shift_left = 0; + int blue_shift_left = 0; + bool use_shift = FALSE; + if (bitmap.GetPixmap()) { GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); - if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent ); + if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->window ); bpp = visual->depth; - if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec; + red_shift_right = visual->red_shift; + red_shift_left = 8-visual->red_prec; + green_shift_right = visual->green_shift; + green_shift_left = 8-visual->green_prec; + blue_shift_right = visual->blue_shift; + blue_shift_left = 8-visual->blue_prec; + + use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR); } if (bitmap.GetBitmap()) { bpp = 1; } + GdkColormap *cmap = gtk_widget_get_default_colormap(); long pos = 0; @@ -1585,53 +1680,37 @@ wxImage::wxImage( const wxBitmap &bitmap ) { for (int i = 0; i < bitmap.GetWidth(); i++) { - wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j ); - if (bpp == 1) - { - if (pixel == 0) - { - data[pos] = 0; + wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j ); + if (bpp == 1) + { + if (pixel == 0) + { + data[pos] = 0; data[pos+1] = 0; data[pos+2] = 0; - } - else - { - data[pos] = 255; + } + else + { + data[pos] = 255; data[pos+1] = 255; data[pos+2] = 255; - } - } else if (bpp <= 8) - { - data[pos] = cmap->colors[pixel].red >> 8; - data[pos+1] = cmap->colors[pixel].green >> 8; - data[pos+2] = cmap->colors[pixel].blue >> 8; - } else if (bpp == 15) + } + } + else if (use_shift) { -#if (wxBYTE_ORDER == wxBIG_ENDIAN) - // ? -#endif - data[pos] = (pixel >> 7) & 0xf8; - data[pos+1] = (pixel >> 2) & 0xf8; - data[pos+2] = (pixel << 3) & 0xf8; - } else if (bpp == 16) + data[pos] = (pixel >> red_shift_right) << red_shift_left; + data[pos+1] = (pixel >> green_shift_right) << green_shift_left; + data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left; + } + else if (cmap->colors) { -#if (wxBYTE_ORDER == wxBIG_ENDIAN) - // ? -#endif - data[pos] = (pixel >> 8) & 0xf8; - data[pos+1] = (pixel >> 3) & 0xfc; - data[pos+2] = (pixel << 3) & 0xf8; - } else + data[pos] = cmap->colors[pixel].red >> 8; + data[pos+1] = cmap->colors[pixel].green >> 8; + data[pos+2] = cmap->colors[pixel].blue >> 8; + } + else { -#if (wxBYTE_ORDER == wxBIG_ENDIAN) - data[pos] = (pixel) & 0xff; // Red - data[pos+1] = (pixel >> 8) & 0xff; // Green - data[pos+2] = (pixel >> 16) & 0xff; // Blue -#else - data[pos] = (pixel >> 16) & 0xff; - data[pos+1] = (pixel >> 8) & 0xff; - data[pos+2] = pixel & 0xff; -#endif + wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") ); } if (gdk_image_mask) @@ -1728,50 +1807,50 @@ private: wxSearchColor::wxSearchColor( void ) { - this->size = 0; - this->colors = (XColor*) NULL; - this->color = (unsigned int *) NULL; - this->entry = (int*) NULL; + size = 0; + colors = (XColor*) NULL; + color = (unsigned int *) NULL; + entry = (int*) NULL; - this->bottom = 0; - this->top = 0; + bottom = 0; + top = 0; } -wxSearchColor::wxSearchColor( int size, XColor *colors ) +wxSearchColor::wxSearchColor( int size_, XColor *colors_ ) { int i; - this->size = size; - this->colors = colors; - this->color = new unsigned int[size]; - this->entry = new int [size]; + size = size_; + colors = colors_; + color = new unsigned int[size]; + entry = new int [size]; - for (i = 0; i < this->size; i++ ) { - this->entry[i] = -1; - } + for (i = 0; i < size; i++ ) { + entry[i] = -1; + } - this->bottom = this->top = ( size >> 1 ); + bottom = top = ( size >> 1 ); } wxSearchColor::~wxSearchColor( void ) { - if ( this->color ) delete this->color; - if ( this->entry ) delete this->entry; + if ( color ) delete color; + if ( entry ) delete entry; } int wxSearchColor::SearchColor( int r, int g, int b ) { unsigned int value = ( ( ( r * 256 ) + g ) * 256 ) + b; - int begin = this->bottom; - int end = this->top; + int begin = bottom; + int end = top; int middle; while ( begin <= end ) { middle = ( begin + end ) >> 1; - if ( value == this->color[middle] ) { - return( this->entry[middle] ); - } else if ( value < this->color[middle] ) { + if ( value == color[middle] ) { + return( entry[middle] ); + } else if ( value < color[middle] ) { end = middle - 1; } else { begin = middle + 1; @@ -1795,47 +1874,47 @@ int wxSearchColor::AddColor( unsigned int value, int pos ) if (sum < max) { pixel = i; max = sum; } } - if ( this->entry[pos] < 0 ) { - this->color[pos] = value; - this->entry[pos] = pixel; - } else if ( value < this->color[pos] ) { + if ( entry[pos] < 0 ) { + color[pos] = value; + entry[pos] = pixel; + } else if ( value < color[pos] ) { - if ( this->bottom > 0 ) { - for ( i = this->bottom; i < pos; i++ ) { - this->color[i-1] = this->color[i]; - this->entry[i-1] = this->entry[i]; + if ( bottom > 0 ) { + for ( i = bottom; i < pos; i++ ) { + color[i-1] = color[i]; + entry[i-1] = entry[i]; } - this->bottom--; - this->color[pos-1] = value; - this->entry[pos-1] = pixel; - } else if ( this->top < this->size-1 ) { - for ( i = this->top; i >= pos; i-- ) { - this->color[i+1] = this->color[i]; - this->entry[i+1] = this->entry[i]; + bottom--; + color[pos-1] = value; + entry[pos-1] = pixel; + } else if ( top < size-1 ) { + for ( i = top; i >= pos; i-- ) { + color[i+1] = color[i]; + entry[i+1] = entry[i]; } - this->top++; - this->color[pos] = value; - this->entry[pos] = pixel; + top++; + color[pos] = value; + entry[pos] = pixel; } } else { - if ( this->top < this->size-1 ) { - for ( i = this->top; i > pos; i-- ) { - this->color[i+1] = this->color[i]; - this->entry[i+1] = this->entry[i]; + if ( top < size-1 ) { + for ( i = top; i > pos; i-- ) { + color[i+1] = color[i]; + entry[i+1] = entry[i]; } - this->top++; - this->color[pos+1] = value; - this->entry[pos+1] = pixel; - } else if ( this->bottom > 0 ) { - for ( i = this->bottom; i < pos; i++ ) { - this->color[i-1] = this->color[i]; - this->entry[i-1] = this->entry[i]; + top++; + color[pos+1] = value; + entry[pos+1] = pixel; + } else if ( bottom > 0 ) { + for ( i = bottom; i < pos; i++ ) { + color[i-1] = color[i]; + entry[i-1] = entry[i]; } - this->bottom--; - this->color[pos] = value; - this->entry[pos] = pixel; + bottom--; + color[pos] = value; + entry[pos] = pixel; } } @@ -1866,23 +1945,14 @@ wxBitmap wxImage::ConvertToBitmap() const bitmap.Create( width, height, bpp ); - /* // Create mask - GdkImage *mask_image = (GdkImage*) NULL; - - if (HasMask()) - { - unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); - - mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); - - wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 ); - - bitmap.SetMask( mask ); - } - */ + XImage *mask_image = (XImage*) NULL; + if (HasMask()) + { + mask_image = XCreateImage( dpy, vis, 1, ZPixmap, 0, 0, width, height, 32, 0 ); + mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height ); + } // Retrieve depth info @@ -1918,11 +1988,9 @@ wxBitmap wxImage::ConvertToBitmap() const else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask)) b_o = GBR; } - /* int r_mask = GetMaskRed(); int g_mask = GetMaskGreen(); int b_mask = GetMaskBlue(); - */ XColor colors[256]; if (bpp == 8) @@ -1936,6 +2004,8 @@ wxBitmap wxImage::ConvertToBitmap() const wxSearchColor scolor( 256, colors ); unsigned char* data = GetData(); + bool hasMask = HasMask(); + int index = 0; for (int y = 0; y < height; y++) { @@ -1948,15 +2018,13 @@ wxBitmap wxImage::ConvertToBitmap() const int b = data[index]; index++; - /* - if (HasMask()) + if (hasMask) { - if ((r == r_mask) && (b == b_mask) && (g == g_mask)) - gdk_image_put_pixel( mask_image, x, y, 1 ); - else - gdk_image_put_pixel( mask_image, x, y, 0 ); + if ((r == r_mask) && (b == b_mask) && (g == g_mask)) + XPutPixel( mask_image, x, y, 0 ); + else + XPutPixel( mask_image, x, y, 1 ); } - */ switch (bpp) { @@ -1987,8 +2055,8 @@ wxBitmap wxImage::ConvertToBitmap() const */ #endif - // And this is all to get the 'right' color... - int pixel = scolor.SearchColor( r, g, b ); + // And this is all to get the 'right' color... + int pixel = scolor.SearchColor( r, g, b ); XPutPixel( data_image, x, y, pixel ); break; } @@ -2034,19 +2102,24 @@ wxBitmap wxImage::ConvertToBitmap() const XDestroyImage( data_image ); XFreeGC( dpy, gc ); - /* // Blit mask + if (HasMask()) + { + wxBitmap maskBitmap(width, height, 1); - if (HasMask()) - { - GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() ); + GC gcMask = XCreateGC( dpy, (Pixmap) maskBitmap.GetPixmap(), (XtGCMask) 0, (XGCValues*)NULL ); + XPutImage( dpy, (Drawable)maskBitmap.GetPixmap(), gcMask, mask_image, 0, 0, 0, 0, width, height ); - gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height ); + XDestroyImage( mask_image ); + XFreeGC( dpy, gcMask ); - gdk_image_destroy( mask_image ); - gdk_gc_unref( mask_gc ); - } - */ + wxMask* mask = new wxMask; + mask->SetPixmap(maskBitmap.GetPixmap()); + + bitmap.SetMask(mask); + + maskBitmap.SetPixmapNull(); + } return bitmap; } @@ -2531,8 +2604,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule) unsigned long wxImage::CountColours( unsigned long stopafter ) { wxHashTable h; - wxNode *node; - wxHNode *hnode; + wxObject dummy; unsigned char r, g, b, *p; unsigned long size, nentries, key; @@ -2547,20 +2619,13 @@ unsigned long wxImage::CountColours( unsigned long stopafter ) b = *(p++); key = (r << 16) | (g << 8) | b; - hnode = (wxHNode *) h.Get(key); - - if (!hnode) + if (h.Get(key) == NULL) { - h.Put(key, (wxObject *)(new wxHNode)); + h.Put(key, &dummy); nentries++; } } - // delete all HNodes - h.BeginFind(); - while ((node = h.Next()) != NULL) - delete (wxHNode *)node->GetData(); - return nentries; } @@ -2606,4 +2671,261 @@ unsigned long wxImage::ComputeHistogram( wxHashTable &h ) return nentries; } +/* + * Rotation code by Carlos Moreno + */ + +// GRG: I've removed wxRotationPoint - we already have wxRealPoint which +// does exactly the same thing. And I also got rid of wxRotationPixel +// bacause of potential problems in architectures where alignment +// is an issue, so I had to rewrite parts of the code. + +static const double gs_Epsilon = 1e-10; + +static inline int wxCint (double x) +{ + return (x > 0) ? (int) (x + 0.5) : (int) (x - 0.5); +} + + +// Auxiliary function to rotate a point (x,y) with respect to point p0 +// make it inline and use a straight return to facilitate optimization +// also, the function receives the sine and cosine of the angle to avoid +// repeating the time-consuming calls to these functions -- sin/cos can +// be computed and stored in the calling function. + +inline wxRealPoint rotated_point (const wxRealPoint & p, double cos_angle, double sin_angle, const wxRealPoint & p0) +{ + return wxRealPoint (p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle, + p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle); +} + +inline wxRealPoint rotated_point (double x, double y, double cos_angle, double sin_angle, const wxRealPoint & p0) +{ + return rotated_point (wxRealPoint(x,y), cos_angle, sin_angle, p0); +} + +wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool interpolating, wxPoint * offset_after_rotation) const +{ + int i; + angle = -angle; // screen coordinates are a mirror image of "real" coordinates + + // Create pointer-based array to accelerate access to wxImage's data + unsigned char ** data = new unsigned char * [GetHeight()]; + + data[0] = GetData(); + + for (i = 1; i < GetHeight(); i++) + data[i] = data[i - 1] + (3 * GetWidth()); + + // precompute coefficients for rotation formula + // (sine and cosine of the angle) + const double cos_angle = cos(angle); + const double sin_angle = sin(angle); + + // Create new Image to store the result + // First, find rectangle that covers the rotated image; to do that, + // rotate the four corners + + const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y); + + wxRealPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0); + wxRealPoint p2 = rotated_point (0, GetHeight(), cos_angle, sin_angle, p0); + 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))); + + wxImage rotated (x2 - x1 + 1, y2 - y1 + 1); + + if (offset_after_rotation != NULL) + { + *offset_after_rotation = wxPoint (x1, y1); + } + + // GRG: The rotated (destination) image is always accessed + // sequentially, so there is no need for a pointer-based + // array here (and in fact it would be slower). + // + unsigned char * dst = rotated.GetData(); + + // GRG: if the original image has a mask, use its RGB values + // as the blank pixel, else, fall back to default (black). + // + unsigned char blank_r = 0; + unsigned char blank_g = 0; + unsigned char blank_b = 0; + + if (HasMask()) + { + blank_r = GetMaskRed(); + blank_g = GetMaskGreen(); + blank_b = GetMaskBlue(); + rotated.SetMaskColour( blank_r, blank_g, blank_b ); + } + + // Now, for each point of the rotated image, find where it came from, by + // performing an inverse rotation (a rotation of -angle) and getting the + // pixel at those coordinates + + // GRG: I've taken the (interpolating) test out of the loops, so that + // it is done only once, instead of repeating it for each pixel. + + int x; + if (interpolating) + { + for (int y = 0; y < rotated.GetHeight(); y++) + { + for (x = 0; x < rotated.GetWidth(); x++) + { + wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + + if (-0.25 < src.x && src.x < GetWidth() - 0.75 && + -0.25 < src.y && src.y < GetHeight() - 0.75) + { + // 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) + { + x1 = wxCint(floor(src.x)); + x2 = wxCint(ceil(src.x)); + } + else // else means that x is near one of the borders (0 or width-1) + { + x1 = x2 = wxCint (src.x); + } + + if (0 < src.y && src.y < GetHeight() - 1) + { + y1 = wxCint(floor(src.y)); + y2 = wxCint(ceil(src.y)); + } + else + { + y1 = y2 = wxCint (src.y); + } + + // get four points and the distances (square of the distance, + // for efficiency reasons) for the interpolation formula + + // GRG: Do not calculate the points until they are + // really needed -- this way we can calculate + // just one, instead of four, if d1, d2, d3 + // or d4 are < gs_Epsilon + + const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1); + const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1); + const double d3 = (src.x - x2) * (src.x - x2) + (src.y - y2) * (src.y - y2); + const double d4 = (src.x - x1) * (src.x - x1) + (src.y - y2) * (src.y - y2); + + // Now interpolate as a weighted average of the four surrounding + // points, where the weights are the distances to each of those points + + // If the point is exactly at one point of the grid of the source + // image, then don't interpolate -- just assign the pixel + + if (d1 < gs_Epsilon) // d1,d2,d3,d4 are positive -- no need for abs() + { + unsigned char *p = data[y1] + (3 * x1); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else if (d2 < gs_Epsilon) + { + unsigned char *p = data[y1] + (3 * x2); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else if (d3 < gs_Epsilon) + { + unsigned char *p = data[y2] + (3 * x2); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else if (d4 < gs_Epsilon) + { + unsigned char *p = data[y2] + (3 * x1); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else + { + // weights for the weighted average are proportional to the inverse of the distance + unsigned char *v1 = data[y1] + (3 * x1); + unsigned char *v2 = data[y1] + (3 * x2); + unsigned char *v3 = data[y2] + (3 * x2); + unsigned char *v4 = data[y2] + (3 * x1); + + const double w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4; + + // GRG: Unrolled. + + *(dst++) = (unsigned char) + ( (w1 * *(v1++) + w2 * *(v2++) + + w3 * *(v3++) + w4 * *(v4++)) / + (w1 + w2 + w3 + w4) ); + *(dst++) = (unsigned char) + ( (w1 * *(v1++) + w2 * *(v2++) + + w3 * *(v3++) + w4 * *(v4++)) / + (w1 + w2 + w3 + w4) ); + *(dst++) = (unsigned char) + ( (w1 * *(v1++) + w2 * *(v2++) + + w3 * *(v3++) + w4 * *(v4++)) / + (w1 + w2 + w3 + w4) ); + } + } + else + { + *(dst++) = blank_r; + *(dst++) = blank_g; + *(dst++) = blank_b; + } + } + } + } + else // not interpolating + { + for (int y = 0; y < rotated.GetHeight(); y++) + { + for (x = 0; x < rotated.GetWidth(); x++) + { + wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0); + + const int xs = wxCint (src.x); // wxCint rounds to the + const int ys = wxCint (src.y); // closest integer + + if (0 <= xs && xs < GetWidth() && + 0 <= ys && ys < GetHeight()) + { + unsigned char *p = data[ys] + (3 * xs); + *(dst++) = *(p++); + *(dst++) = *(p++); + *(dst++) = *(p++); + } + else + { + *(dst++) = blank_r; + *(dst++) = blank_g; + *(dst++) = blank_b; + } + } + } + } + + delete [] data; + + return rotated; +}