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

[Adrian Robert]

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

Modified files:
        src            : ChangeLog nsimage.m nsterm.m 

Log message:
        * nsimage.m (EmacsImage-setPixelAtX:Y:toRed:green:blue:alpha:): Fix 
color values in onTiger section.  * nsterm.m (ns_defined_color): Fix settings 
of the XColor variable fields: red,green,blue scale to 2-byte, pixel's 
components to 1-byte. (Bug#1663)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7294&r2=1.7295
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsimage.m?cvsroot=emacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7294
retrieving revision 1.7295
diff -u -b -r1.7294 -r1.7295
--- ChangeLog   21 Jan 2009 18:56:41 -0000      1.7294
+++ ChangeLog   21 Jan 2009 22:28:45 -0000      1.7295
@@ -18,9 +18,13 @@
        (EmacsPrefsController-setPanelFromDefaultValues) New function.
        (EmacsPrefsController-resetToDefaults:): Use it. (Bug#1801)
        (ns_font_to_xlfd, ns_fontname_to_xlfd): Remove, unused.
+       (ns_defined_color): Fix settings of the XColor variable fields:
+       red,green,blue scale to 2-byte, pixel's parts to 1-byte. (Bug#1663)
 
-       * nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore DPI.
-       (Bug#1316)
+       * nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore image
+       DPI. (Bug#1316)
+       (EmacsImage-setPixelAtX:Y:toRed:green:blue:alpha:): Fix color
+       values in onTiger section.
 
 2009-01-19  Chong Yidong  <address@hidden>
 

Index: nsimage.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsimage.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- nsimage.m   21 Jan 2009 17:28:08 -0000      1.7
+++ nsimage.m   21 Jan 2009 22:28:46 -0000      1.8
@@ -453,7 +453,8 @@
   else if (onTiger)
     {
       [bmRep setColor:
-               [NSColor colorWithCalibratedRed: r green: g blue: b alpha: a]
+               [NSColor colorWithCalibratedRed: (r/255.0) green: (g/255.0)
+                                          blue: (b/255.0) alpha: (a/255.0)]
                   atX: x y: y];
     }
 }

Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- nsterm.m    21 Jan 2009 18:56:43 -0000      1.46
+++ nsterm.m    21 Jan 2009 22:28:47 -0000      1.47
@@ -1610,14 +1610,14 @@
       color_def->pixel = ns_index_color(temp, f); /* [temp retain]; */
 
   [temp getRed: &r green: &g blue: &b alpha: &a];
-  color_def->red   = r * 256;
-  color_def->green = g * 256;
-  color_def->blue  = b * 256;
+  color_def->red   = r * 65535;
+  color_def->green = g * 65535;
+  color_def->blue  = b * 65535;
 
   if (!makeIndex)
     color_def->pixel
-      = ARGB_TO_ULONG((int)(a*256),
-                     color_def->red, color_def->green, color_def->blue);
+      = ARGB_TO_ULONG((int)(a*255),
+                     (int)(r*255), (int)(g*255), (int)(b*255));
 
   return 1;
 }