aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsimage.m
diff options
context:
space:
mode:
authorAdrian Robert2010-11-04 20:10:50 +0200
committerAdrian Robert2010-11-04 20:10:50 +0200
commit3fdebbf9ac5507cf112ee58613a02f73039c4e41 (patch)
treef09b005ed34cc50ee1771c0cf069a66c97ad59f3 /src/nsimage.m
parenteea682b6d1e8a2c518dc8402160bbccd999d64e7 (diff)
downloademacs-3fdebbf9ac5507cf112ee58613a02f73039c4e41.tar.gz
emacs-3fdebbf9ac5507cf112ee58613a02f73039c4e41.zip
* nsfont.m (nsfont_draw) * nsimage.m (EmacsImage-setXBMColor:) * nsterm.m (EmacsView-performDragOperation:): Correct empty return statements. Based on a patch by Ismail Donmez <ismail@namtrac.org>.
Diffstat (limited to 'src/nsimage.m')
-rw-r--r--src/nsimage.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nsimage.m b/src/nsimage.m
index a42950d1f52..81198be0862 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -336,7 +336,7 @@ static EmacsImage *ImageList = nil;
336 NSColor *rgbColor; 336 NSColor *rgbColor;
337 337
338 if (bmRep == nil || color == nil) 338 if (bmRep == nil || color == nil)
339 return; 339 return self;
340 340
341 if ([color colorSpaceName] != NSCalibratedRGBColorSpace) 341 if ([color colorSpaceName] != NSCalibratedRGBColorSpace)
342 rgbColor = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; 342 rgbColor = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
@@ -361,6 +361,8 @@ static EmacsImage *ImageList = nil;
361 planes[2][i] = bb; 361 planes[2][i] = bb;
362 } 362 }
363 } 363 }
364
365 return self;
364} 366}
365 367
366 368