From d0b58a4fd418ca210f2a0784c27927b24080bb6f Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Tue, 14 Jun 2011 18:31:35 +0000 Subject: [PATCH] * Source/NSImage.m (-guiDrawInRect:...): Handle dstRect with a zero size git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33303 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 4 ++++ Source/NSImage.m | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 049ddb7ff..72748bfa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-06-14 Eric Wasylishen + + * Source/NSImage.m (-guiDrawInRect:...): Handle dstRect with a zero size + 2011-06-14 Eric Wasylishen * Source/NSImage.m: Remove unnecessary DPSgsave/DPSgrestore I added diff --git a/Source/NSImage.m b/Source/NSImage.m index a64ad3c2d..a95bb8e76 100644 --- a/Source/NSImage.m +++ b/Source/NSImage.m @@ -1086,7 +1086,14 @@ Fallback for backends other than Cairo. */ s = [self size]; if (NSEqualRects(srcRect, NSZeroRect)) - srcRect = NSMakeRect(0, 0, s.width, s.height); + { + srcRect.size = s; + /* For -drawAtPoint:fromRect:operation:fraction: used with a zero rect */ + if (NSEqualSizes(dstRect.size, NSZeroSize)) + { + dstRect.size = s; + } + } if (!dstRect.size.width || !dstRect.size.height || !srcRect.size.width || !srcRect.size.height)