Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 07:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Squashed 'external/lunasvg/' changes from be5d0977b..c272a2188

Browse source 
c272a2188 Fix smooth curve parsing #80 #114

git-subtree-dir: external/lunasvg
git-subtree-split: c272a2188bc38b0e46130f7a289cab57e50238cb
This commit is contained in:
Leon Styhre 2022-10-30 10:53:52 +01:00
parent e5b9b53006
commit 53fa042a7f
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/parser.cpp
View file

@ -176,7 +176,6 @@ Path Parser::parsePath(const std::string& string)
double c[6]; double c[6];
bool f[2]; bool f[2];
int lastCommand = 0;
Point startPoint; Point startPoint;
Point currentPoint; Point currentPoint;
Point controlPoint; Point controlPoint;
@ -259,8 +258,6 @@ Path Parser::parsePath(const std::string& string)
break; break;
case 'T': case 'T':
case 't': case 't':
if(lastCommand != 'Q' && lastCommand != 'q' && lastCommand != 'T' && lastCommand != 't')
controlPoint = currentPoint;
c[0] = 2 * currentPoint.x - controlPoint.x; c[0] = 2 * currentPoint.x - controlPoint.x;
c[1] = 2 * currentPoint.y - controlPoint.y; c[1] = 2 * currentPoint.y - controlPoint.y;
if(!parseNumberList(ptr, end, c + 2, 2)) if(!parseNumberList(ptr, end, c + 2, 2))
@ -280,8 +277,6 @@ Path Parser::parsePath(const std::string& string)
break; break;
case 'S': case 'S':
case 's': case 's':
if(lastCommand != 'C' && lastCommand != 'c' && lastCommand != 'S' && lastCommand != 's')
controlPoint = currentPoint;
c[0] = 2 * currentPoint.x - controlPoint.x; c[0] = 2 * currentPoint.x - controlPoint.x;
c[1] = 2 * currentPoint.y - controlPoint.y; c[1] = 2 * currentPoint.y - controlPoint.y;
if(!parseNumberList(ptr, end, c + 2, 4)) if(!parseNumberList(ptr, end, c + 2, 4))
@ -311,6 +306,7 @@ Path Parser::parsePath(const std::string& string)
path.lineTo(c[0], currentPoint.y); path.lineTo(c[0], currentPoint.y);
currentPoint.x = controlPoint.x = c[0]; currentPoint.x = controlPoint.x = c[0];
controlPoint.y = currentPoint.y;
break; break;
case 'V': case 'V':
case 'v': case 'v':
@ -321,6 +317,7 @@ Path Parser::parsePath(const std::string& string)
c[1] += currentPoint.y; c[1] += currentPoint.y;
path.lineTo(currentPoint.x, c[1]); path.lineTo(currentPoint.x, c[1]);
controlPoint.x = currentPoint.x;
currentPoint.y = controlPoint.y = c[1]; currentPoint.y = controlPoint.y = c[1];
break; break;
case 'A': case 'A':
@ -356,10 +353,7 @@ Path Parser::parsePath(const std::string& string)
break; break;
if(IS_ALPHA(*ptr)) if(IS_ALPHA(*ptr))
{
lastCommand = command;
command = *ptr++; command = *ptr++;
}
} }
return path; return path;