Mercurial > emacs
comparison src/nsimage.m @ 111398:4afa0b625189
* 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>.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 04 Nov 2010 20:10:50 +0200 |
| parents | 44aeafd02c21 |
| children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 111397:ee55b6620594 | 111398:4afa0b625189 |
|---|---|
| 334 unsigned char *planes[5]; | 334 unsigned char *planes[5]; |
| 335 CGFloat r, g, b, a; | 335 CGFloat r, g, b, a; |
| 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]; |
| 343 else | 343 else |
| 344 rgbColor = color; | 344 rgbColor = color; |
| 359 planes[0][i] = rr; | 359 planes[0][i] = rr; |
| 360 planes[1][i] = gg; | 360 planes[1][i] = gg; |
| 361 planes[2][i] = bb; | 361 planes[2][i] = bb; |
| 362 } | 362 } |
| 363 } | 363 } |
| 364 | |
| 365 return self; | |
| 364 } | 366 } |
| 365 | 367 |
| 366 | 368 |
| 367 - initForXPMWithDepth: (int)depth width: (int)width height: (int)height | 369 - initForXPMWithDepth: (int)depth width: (int)width height: (int)height |
| 368 { | 370 { |