[maemo-commits] [maemo-commits] r11149 - in projects/haf/trunk/sapwood: . src

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-04-19 15:03:00 +0300 (Thu, 19 Apr 2007)
New Revision: 11149

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-server.c
Log:
Revert the white background initialization as it adds unwanted tint

2007-04-19  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* src/sapwood-server.c (extract_pixmap_single): Revert the white
	background initialization as it adds unwanted tint to the graphics.
	Reopens MB#1216


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-04-19 11:50:00 UTC (rev 11148)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-04-19 12:03:00 UTC (rev 11149)
@@ -1,3 +1,9 @@
+2007-04-19  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* src/sapwood-server.c (extract_pixmap_single): Revert the white
+	background initialization as it adds unwanted tint to the graphics.
+	Reopens MB#1216
+
 2007-04-18  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* demos/Makefile.am

Modified: projects/haf/trunk/sapwood/src/sapwood-server.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-server.c	2007-04-19 11:50:00 UTC (rev 11148)
+++ projects/haf/trunk/sapwood/src/sapwood-server.c	2007-04-19 12:03:00 UTC (rev 11149)
@@ -82,11 +82,6 @@
 		       int width, int height,
 		       PixbufOpenResponse *rep)
 {
-  /* This function is almost a copy of gdk_pixbuf_render_pixmap_and_mask() with
-   * the exception that it draws only a part of the pixbuf (could be achieved
-   * with gdk_pixbuf_new_subpixbuf()) and initializes the destination pixmap
-   * with white background to avoid uninitialized pixels when using alpha.
-   */
   GdkPixmap    *pixmap;
   static GdkGC *tmp_gc = NULL;
   gboolean      need_mask;
@@ -94,15 +89,8 @@
   pixmap = gdk_pixmap_new (NULL, width, height, server_depth);
 
   if (!tmp_gc)
-    {
-      const GdkColor white = {0, 0xffff, 0xffff, 0xffff};
+    tmp_gc = gdk_gc_new (pixmap);
 
-      tmp_gc = gdk_gc_new (pixmap);
-
-      gdk_gc_set_rgb_fg_color (tmp_gc, &white);
-    }
-
-  gdk_draw_rectangle (pixmap, tmp_gc, TRUE, 0, 0, width, height);
   gdk_draw_pixbuf (pixmap, tmp_gc, pixbuf,
 		   x, y, 0, 0,
 		   width, height,