[webkit-changes] cvs commit: WebCore/ksvg2/svg svgpathparser.cpp

[Eric]

eseidel     05/12/12 09:37:26

  Modified:    .        ChangeLog
               ksvg2/svg svgpathparser.cpp
  Log:
  Bug #: 6042
  Submitted by: rob buis
  Reviewed by: eseidel
          Test: svg/custom/control-points-for-S-and-T.svg
  
          "S" and "T" path types handle control points incorrectly
          http://bugzilla.opendarwin.org/show_bug.cgi?id=6042
  
          * ksvg2/svg/svgpathparser.cpp:
          (SVGPathParser::parseSVG):
  
  Revision  Changes    Path
  1.513     +18 -6     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.512
  retrieving revision 1.513
  diff -u -r1.512 -r1.513
  --- ChangeLog	12 Dec 2005 17:25:51 -0000	1.512
  +++ ChangeLog	12 Dec 2005 17:37:19 -0000	1.513
  @@ -1,3 +1,15 @@
  +2005-12-12  Rob Buis  <rwlbuis at xs4all.nl>
  +
  +        Reviewed by eseidel.  Committed by eseidel.
  +
  +        Test: svg/custom/control-points-for-S-and-T.svg
  +
  +        "S" and "T" path types handle control points incorrectly
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=6042
  +
  +        * ksvg2/svg/svgpathparser.cpp:
  +        (SVGPathParser::parseSVG):
  +
   2005-12-12  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by darin.
  @@ -2078,7 +2090,7 @@
   
   2005-11-30  Rob Buis  <rwlbuis at xs4all.nl>
   
  -        Reviewed by eseidel.
  +        Reviewed by eseidel.  Committed by eseidel.
   
           Fixes 5 test cases:
           - paths-data-02-t.svg (most noticeable)
  @@ -8796,7 +8808,7 @@
   
   2005-10-13  Rob Buis  <rwlbuis at xs4all.nl>
   
  -        Reviewed by eseidel.
  +        Reviewed by eseidel.  Committed by eseidel.
   
           Test cases updated:
           * svg-tests/W3C-SVG-1.1/filters-color-01-b-expected.checksum:
  @@ -8908,7 +8920,7 @@
   
   2005-10-11  Rob Buis  <rwlbuis at xs4all.nl>
   
  -        Reviewed by eseidel.
  +        Reviewed by eseidel.  Committed by eseidel.
   
           Fix SVGSymbolElementImpl to not warn when inheriting viewbox.
           http://bugzilla.opendarwin.org/show_bug.cgi?id=5278
  @@ -9090,7 +9102,7 @@
   
   2005-10-08  Rob Buis  <rwlbuis at xs4all.nl>
   
  -        Reviewed by eseidel.
  +        Reviewed by eseidel.  Committed by eseidel.
   
           Almost forgot the layout test for the last commit. ;)
           http://bugzilla.opendarwin.org/show_bug.cgi?id=5240
  @@ -9102,7 +9114,7 @@
   
   2005-10-08  Rob Buis  <rwlbuis at xs4all.nl>
   
  -        Reviewed by eseidel.
  +        Reviewed by eseidel.  Committed by eseidel.
   
           Fix to handle forward referencing <use> elements.
           http://bugzilla.opendarwin.org/show_bug.cgi?id=5240
  @@ -10266,7 +10278,7 @@
   
   2005-10-03  Rob Buis  <rwlbuis at xs4all.nl>
   
  -        Reviewed by eseidel.
  +        Reviewed by eseidel.  Committed by eseidel.
   
           Fixes hang, caused by path parser spinning forever.
           http://bugzilla.opendarwin.org/show_bug.cgi?id=5239
  
  
  
  1.7       +11 -6     WebCore/ksvg2/svg/svgpathparser.cpp
  
  Index: svgpathparser.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/ksvg2/svg/svgpathparser.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- svgpathparser.cpp	30 Nov 2005 09:21:08 -0000	1.6
  +++ svgpathparser.cpp	12 Dec 2005 17:37:25 -0000	1.7
  @@ -22,10 +22,6 @@
   #include <qstring.h>
   #include <math.h>
   
  -#ifndef APPLE_CHANGES
  -#include <iostream>
  -#endif
  -
   using namespace KSVG;
   
   const char *KSVG::parseCoord(const char *ptr, double &number)
  @@ -285,6 +281,11 @@
                       ptr = parseCoord( ptr, y2 );
                       ptr = parseCoord( ptr, tox );
                       ptr = parseCoord( ptr, toy );
  +                    if(!(lastCommand == 'c' || lastCommand == 'C' ||
  +                         lastCommand == 's' || lastCommand == 'S')) {
  +                        contrlx = curx;
  +                        contrly = cury;
  +					}
   
                       if( process )
                       {
  @@ -341,6 +342,11 @@
                   {
                       ptr = parseCoord(ptr, tox);
                       ptr = parseCoord(ptr, toy);
  +                    if(!(lastCommand == 'q' || lastCommand == 'Q' ||
  +                         lastCommand == 't' || lastCommand == 'T')) {
  +                        contrlx = curx;
  +                        contrly = cury;
  +					}
   
                       if( process )
                       {
  @@ -398,7 +404,6 @@
                       return;
                   }
               }
  -
               lastCommand = command;
   
               if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
  @@ -415,7 +420,7 @@
               if( lastCommand != 'C' && lastCommand != 'c' &&
                   lastCommand != 'S' && lastCommand != 's' &&
                   lastCommand != 'Q' && lastCommand != 'q' &&
  -                lastCommand != 'T' && lastCommand != 't')
  +                lastCommand != 'T' && lastCommand != 't' ) 
               {
                   contrlx = curx;
                   contrly = cury;