From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Fri, 23 Jan 2009 14:08:24 +0000 (+0000)
Subject: * nsimage.m (setPixmapData:): Set to ignore image DPI.
X-Git-Tag: emacs-pretest-23.0.90~264
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e0d2e69ae3d9ad1931013626268a712bdb609cd8;p=emacs.git

* nsimage.m (setPixmapData:): Set to ignore image DPI.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b334b8b1de..fb7ff70f29b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,14 +3,19 @@
 	* emacs.c (main): Do fork+exec under --daemon in Cocoa.
 	(ns_no_defaults): New declaration.
 	(main): Use it.
+
 	* nsterm.h (ns_no_defaults): New declaration.
+
 	* nsfns.m (x_get_string_resource): Don't read when ns_no_defaults.
+
 	* nsterm.m (ns_no_defaults): New variable.
 	(ns_initialize): Don't read defaults when ns_no_defaults.
 	(EmacsView-readSelectionFromPasteboard:)
 	(writeSelectionToPasteboard:types:): New stubbed-out methods for
 	NSServicesRequests protocol. (Bug#1435)
 
+	* nsimage.m (setPixmapData:): Set to ignore image DPI.
+
 2009-01-23  Giorgos Keramidas  <keramida@freebsd.org>  (tiny change)
 
 	* alloc.c (mark_stack): Use "flushw" instead of "ta 3" assembly
diff --git a/src/nsimage.m b/src/nsimage.m
index b13c12903ad..c95ad09addd 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -400,6 +400,12 @@ static EmacsImage *ImageList = nil;
 
           if ([bmRep numberOfPlanes] >= 3)
               [bmRep 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])];
+
           break;
         }
     }