gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-29 19:57:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move main part of affine transform code to base for MacOS-X compatibility

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24133 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-11-19 11:32:51 +00:00
parent 3900ae6fb7
commit 8e6eaaac0f
6 changed files with 61 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/NSImage.m
View file

@ -1005,7 +1005,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
NSAffineTransform *transform;
if (!dstRect.size.width || !dstRect.size.height
|| !srcRect.size.width || !srcRect.size.height)
|| !srcRect.size.width || !srcRect.size.height)
return;
if (![ctxt isDrawingToScreen])
@ -1046,16 +1046,19 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
/* If the effective transform is the identity transform and there's
no dissolve, we can composite from our cache. */
if (delta == 1.0
&& fabs(transform->matrix.m11 - 1.0) < 0.01
&& fabs(transform->matrix.m12) < 0.01
&& fabs(transform->matrix.m21) < 0.01
&& fabs(transform->matrix.m22 - 1.0) < 0.01)
if (delta == 1.0)
{
[self compositeToPoint: dstRect.origin
fromRect: srcRect
operation: op];
return;
NSAffineTransformStruct ts = [transform transformStruct];
if (fabs(ts.m11 - 1.0) < 0.01 && fabs(ts.m12) < 0.01
&& fabs(ts.m21) < 0.01 && fabs(ts.m22 - 1.0) < 0.01)
{
[self compositeToPoint: dstRect.origin
fromRect: srcRect
operation: op];
return;
}
}
/* We can't composite or dissolve directly from the image reps, so we
@ -1078,6 +1081,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
*/
{
NSCachedImageRep *cache;
NSAffineTransformStruct ts;
NSSize s;
NSPoint p;
double x0, y0, x1, y1, w, h;
@ -1134,8 +1138,10 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
/* Set up the effective transform. We also save a gState with this
transform to make it easier to do the final composite. */
transform->matrix.tX = p.x;
transform->matrix.tY = p.y;
ts = [transform transformStruct];
ts.tX = p.x;
ts.tY = p.y;
[transform setTransformStruct: ts];
[ctxt GSSetCTM: transform];
gState = [ctxt GSDefineGState];