gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 23:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSImage.m: Remove unnecessary DPSgsave/DPSgrestore I added

Browse source 
earlier in -nativeDrawInRect:... and replace them with saving/restoring
the transformation matrix. The DPSgsave/DPSgrestore were causing problems
when drawing images with a non-rectangular clipping area.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33300 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ericwa 2011-06-14 16:27:38 +00:00
parent 38d3783263
commit b31f48569c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-06-14 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSImage.m: Remove unnecessary DPSgsave/DPSgrestore I added
earlier in -nativeDrawInRect:... and replace them with saving/restoring
the transformation matrix. The DPSgsave/DPSgrestore were causing problems
when drawing images with a non-rectangular clipping area.
2011-06-14 Eric Wasylishen <ewasylishen@gmail.com> 2011-06-14 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSImage.m: Tidy the -composite*/-dissolve* methods * Source/NSImage.m: Tidy the -composite*/-dissolve* methods

6
Source/NSImage.m
View file

@ -1016,7 +1016,7 @@ behavior precisely matches Cocoa. */
srcRect.origin.y * imgToCacheHeightScaleFactor, srcRect.origin.y * imgToCacheHeightScaleFactor,
srcRect.size.width * imgToCacheWidthScaleFactor, srcRect.size.width * imgToCacheWidthScaleFactor,
srcRect.size.height * imgToCacheHeightScaleFactor); srcRect.size.height * imgToCacheHeightScaleFactor);
NSAffineTransform *transform; NSAffineTransform *transform, *backup;
cache = [[NSCachedImageRep alloc] cache = [[NSCachedImageRep alloc]
initWithSize: NSMakeSize(ceil(cacheSize.width), ceil(cacheSize.height)) initWithSize: NSMakeSize(ceil(cacheSize.width), ceil(cacheSize.height))
@ -1051,7 +1051,7 @@ behavior precisely matches Cocoa. */
//NSLog(@"Draw in %@ from %@ from cache rect %@", NSStringFromRect(dstRect), //NSLog(@"Draw in %@ from %@ from cache rect %@", NSStringFromRect(dstRect),
// NSStringFromRect(srcRect), NSStringFromRect(srcRectInCache)); // NSStringFromRect(srcRect), NSStringFromRect(srcRectInCache));
DPSgsave(ctxt); backup = [ctxt GSCurrentCTM];
transform = [NSAffineTransform transform]; transform = [NSAffineTransform transform];
[transform translateXBy: dstRect.origin.x yBy: dstRect.origin.y]; [transform translateXBy: dstRect.origin.x yBy: dstRect.origin.y];
@ -1065,7 +1065,7 @@ behavior precisely matches Cocoa. */
operation: op operation: op
fraction: delta]; fraction: delta];
DPSgrestore(ctxt); [ctxt GSSetCTM: backup];
[ctxt GSUndefineGState: gState]; [ctxt GSUndefineGState: gState];
DESTROY(cache); DESTROY(cache);