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

common shape: handling dash patterns < 1

Browse source 
For the dash pattern values (both, length and gap) < 1 the program crashed.
curLen - variable type changed from int to float.
This commit is contained in:
Mira Grudzinska 2020-10-23 01:32:52 +02:00 • committed by Hermet Park
parent 0b767750e6
commit 4b58c5a5de
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/sw_engine/tvgSwCommon.h
View file

@ -165,7 +165,7 @@ struct SwStroke
struct SwDashStroke
{
SwOutline* outline;
int32_t curLen;
float curLen;
int32_t curIdx;
Point ptStart;
Point ptCur;

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

@ -113,7 +113,6 @@ static void _outlineMoveTo(SwOutline& outline, const Point* to, const Matrix* tr
_growOutlinePoint(outline, 1);
outline.pts[outline.ptsCnt] = _transform(to, transform);
outline.types[outline.ptsCnt] = SW_CURVE_TYPE_POINT;
if (outline.ptsCnt > 0) {
@ -285,7 +284,7 @@ static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ct
_growOutlinePoint(*dash.outline, dash.outline->ptsCnt >> 1);
_growOutlineContour(*dash.outline, dash.outline->cntrsCnt >> 1);
Bezier cur = { dash.ptCur, *ctrl1, *ctrl2, *to};
Bezier cur = {dash.ptCur, *ctrl1, *ctrl2, *to};
auto len = bezLength(cur);
if (len < dash.curLen) {

4
src/lib/tvgShape.cpp
View file

@ -339,6 +339,9 @@ Result Shape::stroke(const float* dashPattern, uint32_t cnt) noexcept
{
if (cnt < 2 || !dashPattern) return Result::InvalidArguments;
for (uint32_t i = 0; i < cnt; i++)
if (dashPattern[i] < FLT_EPSILON) return Result::InvalidArguments;
if (!pImpl->strokeDash(dashPattern, cnt)) return Result::FailedAllocation;
return Result::Success;
@ -350,6 +353,7 @@ uint32_t Shape::strokeDash(const float** dashPattern) const noexcept
if (!pImpl->stroke) return 0;
if (dashPattern) *dashPattern = pImpl->stroke->dashPattern;
return pImpl->stroke->dashCnt;
}