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

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/23 14:08:26

Modified files:
        src            : nsimage.m ChangeLog 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsimage.m?cvsroot=emacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7306&r2=1.7307

Patches:
Index: nsimage.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsimage.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- nsimage.m   21 Jan 2009 22:28:46 -0000      1.8
+++ nsimage.m   23 Jan 2009 14:08:24 -0000      1.9
@@ -400,6 +400,12 @@
 
           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;
         }
     }

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7306
retrieving revision 1.7307
diff -u -b -r1.7306 -r1.7307
--- ChangeLog   23 Jan 2009 10:31:54 -0000      1.7306
+++ ChangeLog   23 Jan 2009 14:08:24 -0000      1.7307
@@ -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  <address@hidden>  (tiny change)
 
        * alloc.c (mark_stack): Use "flushw" instead of "ta 3" assembly