gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-31 09:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sort colours in bitmap as expected by Cairo.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@21664 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2005-08-20 00:10:35 +00:00
parent cfd4cdcdf1
commit 3e28deb008
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,8 +1,13 @@
2005-08-20 Fred Kiefer <FredKiefer@gmx.de> 2005-08-20 Fred Kiefer <FredKiefer@gmx.de>
* Headers/cairo/CairoFaceInfo.h (-fontFace): Use * Source/cairo/CairoGState.m (-DPSImage::::::::):
For the ARGB32 case sort the colour fields in the bitmap correctly.
2005-08-20 Fred Kiefer <FredKiefer@gmx.de>
* Source/cairo/CairoFaceInfo.m (-fontFace): Use
_cairo_toy_font_face_create, as Cairo did rename this function. _cairo_toy_font_face_create, as Cairo did rename this function.
* Headers/cairo/CairoFontInfo.h (_cairo_glyph_for_NSGlyph): Use * Source/cairo/CairoFontInfo.m (_cairo_glyph_for_NSGlyph): Use
Cairo function _cairo_scaled_font_text_to_glyphs to convert to glyphs. Cairo function _cairo_scaled_font_text_to_glyphs to convert to glyphs.
2005-08-16 Adrian Robert <arobert@cogsci.ucsd.edu> 2005-08-16 Adrian Robert <arobert@cogsci.ucsd.edu>

24
Source/cairo/CairoGState.m
View file

@ -1022,7 +1022,11 @@ _set_op(cairo_t * ct, NSCompositingOperation op)
cairo_format_t format; cairo_format_t format;
NSAffineTransformStruct tstruct; NSAffineTransformStruct tstruct;
cairo_surface_t *surface; cairo_surface_t *surface;
unsigned char *tmp;
int i = 0;
unsigned int pixels = pixelsHigh * pixelsWide;
const unsigned char *bits = data[0];
/* /*
NSLog(@"%@ DPSimage %dx%d (%p)", self, pixelsWide, pixelsHigh, NSLog(@"%@ DPSimage %dx%d (%p)", self, pixelsWide, pixelsHigh,
cairo_current_target_surface (_ct)); cairo_current_target_surface (_ct));
@ -1037,6 +1041,16 @@ _set_op(cairo_t * ct, NSCompositingOperation op)
switch (bitsPerSample * samplesPerPixel) switch (bitsPerSample * samplesPerPixel)
{ {
case 32: case 32:
tmp = objc_malloc(pixels * 4);
while (i < pixels*4)
{
tmp[i+0] = bits[i+2];
tmp[i+1] = bits[i+1];
tmp[i+2] = bits[i+0];
tmp[i+3] = bits[i+3];
i += 4;
}
bits = tmp;
format = CAIRO_FORMAT_ARGB32; format = CAIRO_FORMAT_ARGB32;
break; break;
case 24: case 24:
@ -1063,11 +1077,17 @@ _set_op(cairo_t * ct, NSCompositingOperation op)
tstruct.tX, tstruct.tY); tstruct.tX, tstruct.tY);
cairo_transform(_ct, &local_matrix); cairo_transform(_ct, &local_matrix);
surface = cairo_image_surface_create_for_data((void*)data, surface = cairo_image_surface_create_for_data((void*)bits,
format, format,
pixelsWide, pixelsWide,
pixelsHigh, pixelsHigh,
bytesPerRow); bytesPerRow);
if (bits != data[0])
{
objc_free(bits);
}
if (surface == NULL) if (surface == NULL)
{ {
NSLog(@"Image surface could not be created"); NSLog(@"Image surface could not be created");