[Emacs-diffs] master f3a6858: Fixes: debbugs:19133

[Jan D.]

branch: master
commit f3a685812a408968a24dd8ca97fdfae8ef266037
Author: Jan D <address@hidden>
Commit: Jan D <address@hidden>

    Fixes: debbugs:19133
    
    * nsimage.m (setPixmapData): Make bmRep local so class member is not
    set.
---
 src/ChangeLog |    5 +++++
 src/nsimage.m |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 27202f1..5caa073 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-07  Jan Djärv  <address@hidden>
+
+       * nsimage.m (setPixmapData): Make bmRep local so class member is not
+       set (Bug#19133).
+
 2014-12-05  Lee Duhem  <address@hidden>  (tiny change)
 
        * eval.c (Fsignal): Remove duplicate test.
diff --git a/src/nsimage.m b/src/nsimage.m
index 7b67da0..640dfcb 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];