diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/nsimage.m | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 530b9130783..2840109ac1c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,6 +4,8 @@ (dealloc): Release bmRep. (setPixmapData): Make bmRep local so class member is not set (Bug#19133). + (setPixmapData): Rename local variable bmRep to avoid compiler + warning. 2014-12-24 Jan Djärv <jan.h.d@swipnet.se> diff --git a/src/nsimage.m b/src/nsimage.m index a625f20616d..cb3d82af281 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -351,15 +351,15 @@ ns_set_alpha (void *img, int x, int y, unsigned char a) { if ([rep respondsToSelector: @selector (getBitmapDataPlanes:)]) { - NSBitmapImageRep *bmRep = (NSBitmapImageRep *) rep; + NSBitmapImageRep *bmr = (NSBitmapImageRep *) rep; - if ([bmRep numberOfPlanes] >= 3) - [bmRep getBitmapDataPlanes: pixmapData]; + if ([bmr numberOfPlanes] >= 3) + [bmr getBitmapDataPlanes: pixmapData]; /* The next two lines cause the DPI of the image to be ignored. This seems to be the behavior users expect. */ [self setScalesWhenResized: YES]; - [self setSize: NSMakeSize([bmRep pixelsWide], [bmRep pixelsHigh])]; + [self setSize: NSMakeSize([bmr pixelsWide], [bmr pixelsHigh])]; break; } |