From: Jan D <jan.h.d@swipnet.se>
Date: Sun, 7 Dec 2014 16:12:40 +0000 (+0100)
Subject: Fixes: debbugs:19133
X-Git-Tag: emacs-25.0.90~2635^2~177
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3a685812a408968a24dd8ca97fdfae8ef266037;p=emacs.git

Fixes: debbugs:19133

* nsimage.m (setPixmapData): Make bmRep local so class member is not
set.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 27202f10bf5..5caa073c2c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsimage.m (setPixmapData): Make bmRep local so class member is not
+	set (Bug#19133).
+
 2014-12-05  Lee Duhem  <lee.duhem@gmail.com>  (tiny change)
 
 	* eval.c (Fsignal): Remove duplicate test.
diff --git a/src/nsimage.m b/src/nsimage.m
index 7b67da015af..640dfcbc113 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -351,7 +351,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
     {
       if ([rep respondsToSelector: @selector (getBitmapDataPlanes:)])
         {
-          bmRep = (NSBitmapImageRep *) rep;
+          NSBitmapImageRep *bmRep = (NSBitmapImageRep *) rep;
 
           if ([bmRep numberOfPlanes] >= 3)
               [bmRep getBitmapDataPlanes: pixmapData];