gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 11:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug #18260 in art backend

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24299 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Mark Tracy 2006-12-31 04:24:54 +00:00
parent ec7b7e4742
commit 30bfacc835
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2006-12-30 Mark Tracy <tracy454@concentric.net>
* Source/art/ReadRect.m (-GSReadRect:): incorporate offset into
coordinate transformation calculations. Fixes bug #18260
2006-12-28 Matt Rice <ratmice@gmail.com>
* Source/x11/XGServerWindow.m (-flushwindowrect::): Don't convert

9
Source/art/ReadRect.m
View file

@ -42,7 +42,7 @@
NSMutableDictionary *md = [[NSMutableDictionary alloc] init];
NSAffineTransform *matrix;
int x0, y0, x1, y1, w, h;
int x0, y0, x1, y1, w, h, ox, oy;
NSPoint p;
/* Get the bounding rect in pixel coordinates. */
@ -94,6 +94,9 @@
matrix=[ctm copy];
[matrix translateXBy: -x0 yBy: -y0];
ox = [matrix transformPoint: NSMakePoint(0, 0)].x - offset.x;
oy = offset.y - [matrix transformPoint: NSMakePoint(0, 0)].y;
[md setObject: NSDeviceRGBColorSpace forKey: @"ColorSpace"];
[md setObject: [NSNumber numberWithUnsignedInt: 1] forKey: @"HasAlpha"];
[md setObject: [NSNumber numberWithUnsignedInt: 8] forKey: @"BitsPerSample"];
@ -115,8 +118,8 @@
c.dst = [d mutableBytes];
c.src = wi->data + (wi->sy - y1) * wi->bytes_per_line + x0 * DI.bytes_per_pixel;
c.srca = wi->alpha + (wi->sy - y1) * wi->sx + x0;
c.src = wi->data + (oy - y1) * wi->bytes_per_line + (x0 + ox) * DI.bytes_per_pixel;
c.srca = wi->alpha + (oy - y1) * wi->sx + (x0 + ox);
for (y = 0; y < h; y++)
{