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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Feb 28 11:16:06 2008
New Revision: 11733
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11733&view=rev

Log:
        * patches/src680/svg-import-basegfx.diff: fixed issues with
        wrongly written s/S svg:d commands (must not be used on very
        first bezier segment).



Modified:
   trunk/ChangeLog
   trunk/patches/src680/svg-import-basegfx.diff

Modified: trunk/patches/src680/svg-import-basegfx.diff
==============================================================================
--- trunk/patches/src680/svg-import-basegfx.diff	(original)
+++ trunk/patches/src680/svg-import-basegfx.diff	Thu Feb 28 11:16:06 2008
@@ -1,6 +1,6 @@
 --- basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
 +++ basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
-@@ -127,19 +127,37 @@ namespace basegfx
+@@ -127,19 +127,38 @@ namespace basegfx
          /** Read poly-polygon from SVG.
  
          	This function imports a poly-polygon from an SVG-D
@@ -44,7 +44,7 @@
  		// create 3d PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the
  		// third coordinate.
 --- basegfx/source/polygon/b2dsvgpolypolygon.cxx	18 Jul 2007 11:07:24 -0000	1.7
-+++ basegfx/source/polygon/b2dsvgpolypolygon.cxx	28 Feb 2008 08:57:11 -0000
++++ basegfx/source/polygon/b2dsvgpolypolygon.cxx	28 Feb 2008 11:11:31 -0000
 @@ -37,7 +37,9 @@
  #include "precompiled_basegfx.hxx"
  
@@ -342,7 +342,7 @@
  
                      if(0 == j)
                      {
-@@ -697,15 +911,17 @@
+@@ -697,16 +911,18 @@
                      else
                      {
  						// handle edge from j-1 to j
@@ -360,12 +360,14 @@
 -                            const B2DPoint aControl0(aPolygon.getNextControlPoint(j - 1));
 -                            const B2DPoint aControl1(aPolygon.getPrevControlPoint(j));
 -							const B2VectorContinuity aPrevCont(aPolygon.getContinuityInPoint(j - 1));
+-							const bool bSymmetricControlVector(CONTINUITY_C2 == aPrevCont);
 +                            const B2DPoint aControl0(aPolygon.getNextControlPoint((j - 1)%nPointCount));
 +                            const B2DPoint aControl1(aPolygon.getPrevControlPoint(j%nPointCount));
 +							const B2VectorContinuity aPrevCont(aPolygon.getContinuityInPoint((j - 1)%nPointCount));
- 							const bool bSymmetricControlVector(CONTINUITY_C2 == aPrevCont);
++							const bool bSymmetricControlVector(j>1 && CONTINUITY_C2 == aPrevCont);
  							bool bIsQuadraticBezier(false);
  
+ 							if(bDetectQuadraticBeziers)
 @@ -798,7 +1014,13 @@
                          }
                          else