ooo-build r11204 - in branches/sled-10-ooo-build-2-3: . patches/src680

[rodo svn gnome org]

Author: rodo
Date: Mon Jan  7 11:05:00 2008
New Revision: 11204
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11204&view=rev

Log:
2008-01-07  Radek Doulik  <rodo@>

        * patches/src680/apply: added EMFPlus section with emf+ patches,
        not enabled by default. added all neccessary patches



Added:
   branches/sled-10-ooo-build-2-3/patches/src680/cairocanvas-image-borders.diff
Modified:
   branches/sled-10-ooo-build-2-3/ChangeLog
   branches/sled-10-ooo-build-2-3/patches/src680/apply

Modified: branches/sled-10-ooo-build-2-3/ChangeLog
==============================================================================
--- branches/sled-10-ooo-build-2-3/ChangeLog	(original)
+++ branches/sled-10-ooo-build-2-3/ChangeLog	Mon Jan  7 11:05:00 2008
@@ -1,3 +1,8 @@
+2008-01-07  Radek Doulik  <rodo@>
+
+	* patches/src680/apply: added EMFPlus section with emf+ patches,
+	not enabled by default. added all neccessary patches
+
 2007-12-20  Noel Power  <noel power novell com>
 
 	* patches/vba/vba-brackets-params-fix.diff: fix for n#349283

Modified: branches/sled-10-ooo-build-2-3/patches/src680/apply
==============================================================================
--- branches/sled-10-ooo-build-2-3/patches/src680/apply	(original)
+++ branches/sled-10-ooo-build-2-3/patches/src680/apply	Mon Jan  7 11:05:00 2008
@@ -4,7 +4,7 @@
 
 # -------- Options --------
 
-PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql
+PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql:../emf+
 
 OLDEST_SUPPORTED=oog680-m5
 
@@ -1896,3 +1896,22 @@
 
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, rodo
+
+[ EMFPlus ]
+cairocanvas-image-borders.diff, n#340142, rodo
+
+emf+-canvas.diff
+emf+-canvas-line-width.diff
+emf+-canvas-vcl-clear.diff
+emf+-canvas-smooth-poly.diff
+emf+-canvas-vcl-non-closed-polygons.diff
+emf+-cppcanvas.diff
+emf+-cppcanvas-renderer.diff
+emf+-cppcanvas-emfplus.diff
+emf+-cppcanvas-polyaction.diff
+emf+-offapi.diff
+emf+-offapi-renderer.diff
+emf+-vcl-bitmap.diff
+emf+-vcl-renderer.diff
+emf+-svtools.diff
+emf+-scp2-renderer.diff

Added: branches/sled-10-ooo-build-2-3/patches/src680/cairocanvas-image-borders.diff
==============================================================================
--- (empty file)
+++ branches/sled-10-ooo-build-2-3/patches/src680/cairocanvas-image-borders.diff	Mon Jan  7 11:05:00 2008
@@ -0,0 +1,13 @@
+diff -rup canvas-orig/source/cairo/cairo_canvashelper.cxx canvas/source/cairo/cairo_canvashelper.cxx
+--- canvas-orig/source/cairo/cairo_canvashelper.cxx	2007-11-12 10:22:37.000000000 +0100
++++ canvas/source/cairo/cairo_canvashelper.cxx	2007-11-12 15:06:43.000000000 +0100
+@@ -1270,7 +1270,8 @@ namespace cairocanvas
+ 					Cairo* pCairo = pScaledSurface->getCairo();
+ 
+ 					// cairo_set_operator( pCairo, CAIRO_OPERATOR_SOURCE );
+-					cairo_scale( pCairo, dWidth/rSize.Width, dHeight/rSize.Height );
++                    // 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 );
+ 					cairo_paint( pCairo );
+