[Emacs-diffs] emacs/src ChangeLog nsimage.m

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/21 17:28:08

Modified files:
        src            : ChangeLog nsimage.m 

Log message:
        * nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore DPI. 
(Bug#1316)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7290&r2=1.7291
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsimage.m?cvsroot=emacs&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7290
retrieving revision 1.7291
diff -u -b -r1.7290 -r1.7291
--- ChangeLog   21 Jan 2009 17:09:28 -0000      1.7290
+++ ChangeLog   21 Jan 2009 17:28:05 -0000      1.7291
@@ -1,12 +1,16 @@
 2009-01-21  Adrian Robert  <address@hidden>
 
        * nsmenu.m (NSMENUPROFILE): Change #if style.
+
        * nsterm.m: (x_set_frame_alpha): Add prototype.
        (ns_fake_keydown, EmacsView-keyUp:): New variable and function to
        handle Ctrl-tab.  (Bug#1841)
        (ns_get_color): Use unsigned long long for scanned hex string value.
        (ns_term_shutdown): Abort on non SIGTERM signals.
 
+       * nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore DPI.
+       (Bug#1316)
+
 2009-01-19  Chong Yidong  <address@hidden>
 
        * xfaces.c (Finternal_set_lisp_face_attribute, Fx_list_fonts):

Index: nsimage.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsimage.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- nsimage.m   8 Jan 2009 03:15:52 -0000       1.6
+++ nsimage.m   21 Jan 2009 17:28:08 -0000      1.7
@@ -163,6 +163,7 @@
 + allocInitFromFile: (Lisp_Object)file
 {
   EmacsImage *image = ImageList;
+  NSImageRep *imgRep;
   Lisp_Object found;
 
   /* look for an existing image of the same name */
@@ -185,12 +186,18 @@
   image = [[EmacsImage alloc] initByReferencingFile:
                      [NSString stringWithUTF8String: SDATA (found)]];
 
-  if ([image bestRepresentationForDevice: nil] == nil)
+  imgRep = [image bestRepresentationForDevice: nil];
+  if (imgRep == nil)
     {
       [image release];
       return nil;
     }
 
+  /* The next two lines cause the DPI of the image to be ignored.
+     This seems to be the behavior users expect. */
+  [image setScalesWhenResized: YES];
+  [image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])];
+
   [image setName: [NSString stringWithUTF8String: SDATA (file)]];
   [image reference];
   ImageList = [image imageListSetNext: ImageList];