* Source/NSImage.m (-nativeDrawInRect:...): Deal with a zero rep size

* Source/NSCustomImageRep.m:
- Don't retain the delegate (matching OS X)
- Remove unnecessary flip checks from -drawAtPoint: and -drawInRect:
  to match the code in NSImageRep
- Fix a mistake when setting the ctm scale factor


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33741 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,12 @@
+2011-08-15  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSImage.m (-nativeDrawInRect:...): Deal with a zero rep size
+	* Source/NSCustomImageRep.m:
+	- Don't retain the delegate (matching OS X)
+	- Remove unnecessary flip checks from -drawAtPoint: and -drawInRect:
+	  to match the code in NSImageRep
+	- Fix a mistake when setting the ctm scale factor
+
 2011-08-11 10:57  theraven
 
 	* libs/gui/trunk/Tools/speech/GSSpeechEngine.h: Move the

Source/NSCustomImageRep.m

@@ -40,7 +40,9 @@
 @implementation NSCustomImageRep
 
 /**<p> Initializes a new NSCustomImageRep with. When a -draw message is
-   recieved it send aSelector message to the delegate anObject.</p>
+   recieved it send aSelector message to the delegate anObject.
+   The delegate is not retained, so it is the caller's responsibility
+   to ensure the delegate remains valid for the life of the receiver.</p>
    <p>See Also: -delegate -drawSelector [NSImageRep-draw]</p>
  */
 - (id) initWithDrawSelector: (SEL)aSelector
@@ -49,15 +51,13 @@
   if ( ! ( self = [super init] ) ) 
     return nil;
 
-  /* WARNING: Retaining the delegate may or may not create a cyclic graph */
-  _delegate = RETAIN(anObject);
+  _delegate = anObject;
   _selector = aSelector;
   return self;
 }
 
 - (void) dealloc
 {
-  RELEASE(_delegate);
   [super dealloc];
 }
 
@@ -104,8 +104,6 @@
   ctxt = GSCurrentContext();
   if (aPoint.x != 0 || aPoint.y != 0)
     {
-      if ([[ctxt focusView] isFlipped])
-	aPoint.y -= _size.height;
       ctm = GSCurrentCTM(ctxt);
       DPStranslate(ctxt, aPoint.x, aPoint.y);
       reset = 1;
@@ -135,8 +133,7 @@
   // if either is zero, don't scale at all.
   if (_size.width == 0 || _size.height == 0)
     {
-      scale = NSMakeSize(NSWidth(aRect), 
-			 NSHeight(aRect));
+      scale = NSMakeSize(1, 1); 
     }
   else
     {
@@ -144,8 +141,6 @@
 			 NSHeight(aRect) / _size.height);
     }
 
-  if ([[ctxt focusView] isFlipped])
-    aRect.origin.y -= NSHeight(aRect);
   ctm = GSCurrentCTM(ctxt);
   DPStranslate(ctxt, NSMinX(aRect), NSMinY(aRect));
   DPSscale(ctxt, scale.width, scale.height);
@@ -158,7 +153,8 @@
 - (void) encodeWithCoder: (NSCoder*)aCoder
 {
   [super encodeWithCoder: aCoder];
-  
+
+  // FIXME: Should this be changed to encodeConditionalObject: ?
   [aCoder encodeObject: _delegate];
   [aCoder encodeValueOfObjCType: @encode(SEL) at: &_selector];
 }

Source/NSImage.m

@@ -1025,6 +1025,11 @@ behavior precisely matches Cocoa. */
     NSRect srcRectInCache;
     NSAffineTransform *transform, *backup;
 
+    if (NSEqualSizes(repSize, NSZeroSize))
+      {
+	repSize = dstRect.size;
+      }
+
     if (([rep pixelsWide] == NSImageRepMatchesDevice &&
 	 [rep pixelsHigh] == NSImageRepMatchesDevice) &&
 	(dstRect.size.width > repSize.width ||