ooo-build r11772 - in trunk: . patches/src680

[rodo svn gnome org]

Author: rodo
Date: Mon Mar  3 10:13:48 2008
New Revision: 11772
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11772&view=rev

Log:
2008-03-03  Radek Doulik  <rodo novell com>

	* build/ooh680-m8/canvas/source/cairo/cairo_canvashelper.cxx: set
	cairo operator to source when preparing scaled image. it was
	commented out, dunno why, but it was definitely wrong as it was
	introducing random garbage for images with alpha channel
	(cairocanvas-fix-image-cache.diff)



Added:
   trunk/patches/src680/cairocanvas-fix-image-cache.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Mar  3 10:13:48 2008
@@ -2282,4 +2282,5 @@
 sw-section-import-fix.diff, n#364533, freuter
 sw-allow-negative-spacing.diff, n#364534, freuter
 
-sd-slideshow-slideshowview-transformation-fix.diff
+sd-slideshow-slideshowview-transformation-fix.diff, rodo
+cairocanvas-fix-image-cache.diff, rodo

Added: trunk/patches/src680/cairocanvas-fix-image-cache.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/cairocanvas-fix-image-cache.diff	Mon Mar  3 10:13:48 2008
@@ -0,0 +1,12 @@
+diff -rup canvas-orig/source/cairo/cairo_canvashelper.cxx canvas/source/cairo/cairo_canvashelper.cxx
+--- canvas-orig/source/cairo/cairo_canvashelper.cxx	2008-03-03 11:01:58.000000000 +0100
++++ canvas/source/cairo/cairo_canvashelper.cxx	2008-03-03 11:04:49.000000000 +0100
+@@ -1271,7 +1271,7 @@ namespace cairocanvas
+                                                                                         bHasAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR );
+ 					Cairo* pCairo = pScaledSurface->getCairo();
+ 
+-					// cairo_set_operator( pCairo, CAIRO_OPERATOR_SOURCE );
++					cairo_set_operator( pCairo, CAIRO_OPERATOR_SOURCE );
+                     // add 0.5px to size to avoid rounding errors in cairo, leading sometimes to random data on the image right/bottom borders
+ 					cairo_scale( pCairo, (dWidth+0.5)/rSize.Width, (dHeight+0.5)/rSize.Height );
+ 					cairo_set_source_surface( pCairo, pSurface->mpSurface, 0, 0 );