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 )
if (wxFileExists(filename))
{
wxFileInputStream stream(filename);
- wxBufferedInputStream bstream( stream );
+ wxBufferedInputStream bstream( stream );
return LoadFile(bstream, type);
}
else
if (wxFileExists(filename))
{
wxFileInputStream stream(filename);
- wxBufferedInputStream bstream( stream );
+ wxBufferedInputStream bstream( stream );
return LoadFile(bstream, mimetype);
}
else
if ( stream.LastError() == wxStream_NOERROR )
{
- wxBufferedOutputStream bstream( stream );
+ wxBufferedOutputStream bstream( stream );
return SaveFile(bstream, type);
}
else
if ( stream.LastError() == wxStream_NOERROR )
{
- wxBufferedOutputStream bstream( stream );
+ wxBufferedOutputStream bstream( stream );
return SaveFile(bstream, mimetype);
}
else
{
wxImageHandler *handler=(wxImageHandler*)node->GetData();
if (handler->CanRead( stream ))
- return TRUE;
+ return TRUE;
}
return FALSE;
{
for(i=0; i<width; i++ )
{
- if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
+ // was causing a code gen bug in cw : if( ( cr !=r) || (cg!=g) || (cb!=b) )
+ unsigned char cr = (*(ptdata++)) ;
+ unsigned char cg = (*(ptdata++)) ;
+ unsigned char cb = (*(ptdata++)) ;
+
+ if( ( cr !=r) || (cg!=g) || (cb!=b) )
{
*(ptbits++) = one;
*(ptbits++) = one;
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 );
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;
}
ptbits += 3;
}
ptbits += padding;
- }
+ }
// similarly, set data according to the possible mask bitmap
if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
}
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 );
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;
{
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)
{
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;
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;
}
}
*/
#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;
}
projects / wxWidgets.git / blobdiff