procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid compiler warning.

Browse source 
* nsimage.m (setPixmapData): Rename local variable bmRep to avoid
compiler warning.
This commit is contained in:
Jan D 2014-12-24 12:26:25 +01:00
parent 5fc82109ba
commit 0d48826fd3
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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>

8
src/nsimage.m
View file

@ -351,15 +351,15 @@ - (void) setPixmapData
{
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;
}