Avoid compiler warning.

* nsimage.m (setPixmapData): Rename local variable bmRep to avoid
compiler warning.

diff --git a/src/ChangeLog b/src/ChangeLog
index 530b913078361d7a9c4a6fa144af2a63a3b27fad..2840109ac1cf440c80d86ceebc8ceb4ccdc2f5ed 100644 (file)
--- 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 a625f20616d7355cfbf30bb32739198b5501767a..cb3d82af281006dcc49ec89a64a7a227a9d72f17 100644 (file)
--- 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;
         }