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

[rodo svn gnome org]

Author: rodo
Date: Mon Mar  3 17:24:08 2008
New Revision: 11786
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11786&view=rev

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

	* build/ooh680-m8/canvas/source/cairo/cairo_canvasbitmap.cxx:
	fixed glitch I introduced when preparing the
	cairocanvas-alpha-pixmap-rewrite.diff



Modified:
   trunk/ChangeLog
   trunk/patches/src680/cairocanvas-alpha-pixmap-rewrite.diff

Modified: trunk/patches/src680/cairocanvas-alpha-pixmap-rewrite.diff
==============================================================================
--- trunk/patches/src680/cairocanvas-alpha-pixmap-rewrite.diff	(original)
+++ trunk/patches/src680/cairocanvas-alpha-pixmap-rewrite.diff	Mon Mar  3 17:24:08 2008
@@ -1,7 +1,7 @@
 diff -rup canvas-orig/source/cairo/cairo_canvasbitmap.cxx canvas/source/cairo/cairo_canvasbitmap.cxx
---- canvas-orig/source/cairo/cairo_canvasbitmap.cxx	2008-03-03 14:58:28.000000000 +0100
-+++ canvas/source/cairo/cairo_canvasbitmap.cxx	2008-03-03 15:00:52.000000000 +0100
-@@ -120,9 +120,7 @@ namespace cairocanvas
+--- canvas-orig/source/cairo/cairo_canvasbitmap.cxx	2008-03-03 18:19:05.000000000 +0100
++++ canvas/source/cairo/cairo_canvasbitmap.cxx	2008-03-03 18:20:23.000000000 +0100
+@@ -120,31 +120,23 @@ namespace cairocanvas
          case 2: {
  #ifdef CAIRO_HAS_XLIB_SURFACE
          ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > args( 3 );
@@ -11,8 +11,13 @@
          Cairo* pAlphaCairo = pAlphaSurface->getCairo();
  
          // create RGB image (levels of gray) of alpha channel of original picture
-@@ -131,20 +129,11 @@ namespace cairocanvas
+-        cairo_set_source_surface( pAlphaCairo, mpBufferSurface->mpSurface, 0, 0 );
++        cairo_set_source_rgba( pAlphaCairo, 0, 0, 0, 1 );
+         cairo_set_operator( pAlphaCairo, CAIRO_OPERATOR_SOURCE );
          cairo_paint( pAlphaCairo );
++        cairo_set_source_surface( pAlphaCairo, mpBufferSurface->mpSurface, 0, 0 );
++        cairo_set_operator( pAlphaCairo, CAIRO_OPERATOR_XOR );
++        cairo_paint( pAlphaCairo );
          cairo_destroy( pAlphaCairo );
  
 -        cairo_set_source_rgba(pCairo, 1, 1, 1, 1 );
@@ -37,8 +42,8 @@
          // return pixmap and alphachannel pixmap - it will be used in BitmapEx
          aRV = ::com::sun::star::uno::Any( args );
 diff -rup canvas-orig/source/cairo/cairo_canvasbitmap.hxx canvas/source/cairo/cairo_canvasbitmap.hxx
---- canvas-orig/source/cairo/cairo_canvasbitmap.hxx	2008-03-03 14:58:28.000000000 +0100
-+++ canvas/source/cairo/cairo_canvasbitmap.hxx	2008-03-03 15:02:47.000000000 +0100
+--- canvas-orig/source/cairo/cairo_canvasbitmap.hxx	2008-03-03 18:19:05.000000000 +0100
++++ canvas/source/cairo/cairo_canvasbitmap.hxx	2008-03-03 18:18:59.000000000 +0100
 @@ -110,7 +110,7 @@ namespace cairocanvas
          //     2nd the pixmap handle
          //     3rd the pixmap depth
@@ -49,8 +54,8 @@
      private:
          /** MUST hold here, too, since CanvasHelper only contains a
 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 14:58:28.000000000 +0100
-+++ canvas/source/cairo/cairo_canvashelper.cxx	2008-03-03 15:03:26.000000000 +0100
+--- canvas-orig/source/cairo/cairo_canvashelper.cxx	2008-03-03 18:19:05.000000000 +0100
++++ canvas/source/cairo/cairo_canvashelper.cxx	2008-03-03 18:18:59.000000000 +0100
 @@ -734,7 +734,7 @@ namespace cairocanvas
  	    cy = 0.5;
  	    r0 = 0;