[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src image.c
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src image.c |
Date: |
Thu, 29 Jan 2009 10:36:49 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/01/29 10:36:49
Modified files:
src : image.c
Log message:
* image.c (svg_load_image): Don't right-shift background RGB
when
obtained from FRAME_BACKGROUND_PIXEL. Under HAVE_NS use
ns_query_color.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/image.c?cvsroot=emacs&r1=1.118&r2=1.119
Patches:
Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- image.c 8 Jan 2009 03:15:43 -0000 1.118
+++ image.c 29 Jan 2009 10:36:49 -0000 1.119
@@ -8082,21 +8082,21 @@
if (STRINGP (specified_bg)
&& x_defined_color (f, SDATA (specified_bg), &background, 0))
{
+ /* SVG pixmaps specify transparency in the last byte, so right
+ shift 8 bits to get rid of it, since emacs doesn't support
+ transparency. */
background.red >>= 8;
background.green >>= 8;
background.blue >>= 8;
}
else
{
+#ifndef HAVE_NS
background.pixel = FRAME_BACKGROUND_PIXEL (f);
x_query_color (f, &background);
-
- /* SVG pixmaps specify transparency in the last byte, so right
- shift 8 bits to get rid of it, since emacs doesn't support
- transparency. */
- background.red >>= 8;
- background.green >>= 8;
- background.blue >>= 8;
+#else
+ ns_query_color(FRAME_BACKGROUND_COLOR (f), &background, 1);
+#endif
}
/* This loop handles opacity values, since Emacs assumes
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src image.c,
Adrian Robert <=