git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 20:14:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine: overlaping stroke cap

Browse source 
A square or a round cap was mistakenly added to the parts
of the dashed lines that should be continuous. Fixed

@Issues: https://github.com/Samsung/thorvg/issues/777
This commit is contained in:
Mira Grudzinska 2021-09-07 13:12:08 +02:00 • committed by Hermet Park
parent f652b33a27
commit ae6d574466
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib/sw_engine/tvgSwShape.cpp
View file

@ -21,6 +21,7 @@
*/ */
#include "tvgSwCommon.h" #include "tvgSwCommon.h"
#include "tvgBezier.h" #include "tvgBezier.h"
#include <float.h>
/************************************************************************/ /************************************************************************/
/* Internal Class Implementation */ /* Internal Class Implementation */
@ -234,11 +235,14 @@ static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ct
Bezier left, right; Bezier left, right;
len -= dash.curLen; len -= dash.curLen;
bezSplitAt(cur, dash.curLen, left, right); bezSplitAt(cur, dash.curLen, left, right);
dash.curIdx = (dash.curIdx + 1) % dash.cnt;
if (!dash.curOpGap) { if (!dash.curOpGap) {
_outlineMoveTo(*dash.outline, &left.start, transform); // leftovers from a previous command don't require moveTo
if (dash.pattern[dash.curIdx] - dash.curLen < FLT_EPSILON) {
_outlineMoveTo(*dash.outline, &left.start, transform);
}
_outlineCubicTo(*dash.outline, &left.ctrl1, &left.ctrl2, &left.end, transform); _outlineCubicTo(*dash.outline, &left.ctrl1, &left.ctrl2, &left.end, transform);
} }
dash.curIdx = (dash.curIdx + 1) % dash.cnt;
dash.curLen = dash.pattern[dash.curIdx]; dash.curLen = dash.pattern[dash.curIdx];
dash.curOpGap = !dash.curOpGap; dash.curOpGap = !dash.curOpGap;
cur = right; cur = right;