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

renderer: safety++

Browse source 
introduced a threshold for the minimum dash size
to prevent excessive fragmentation.

issue: https://github.com/thorvg/thorvg/issues/3332
This commit is contained in:
Hermet Park 2025-03-24 23:43:33 +09:00 • committed by Mira Grudzinska
parent aa697d9311
commit ba00675559
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/renderer/gl_engine/tvgGlTessellator.cpp
View file

@ -2284,7 +2284,7 @@ void DashStroke::dashLineTo(const GlPoint &to)
} else { } else {
detail::Line curr{mPtCur, to}; detail::Line curr{mPtCur, to};
while (len - mCurrLen > 0.0001f) { while (len - mCurrLen > DASH_PATTERN_THRESHOLD) {
detail::Line right; detail::Line right;
if (mCurrLen > 0.0f) { if (mCurrLen > 0.0f) {
detail::Line left; detail::Line left;
@ -2347,7 +2347,7 @@ void DashStroke::dashCubicTo(const GlPoint &cnt1, const GlPoint &cnt2, const GlP
this->cubicTo(cnt1, cnt2, end); this->cubicTo(cnt1, cnt2, end);
} }
} else { } else {
while (len - mCurrLen > 0.0001f) { while (len - mCurrLen > DASH_PATTERN_THRESHOLD) {
Bezier right; Bezier right;
if (mCurrLen > 0.0f) { if (mCurrLen > 0.0f) {
Bezier left; Bezier left;

5
src/renderer/sw_engine/tvgSwShape.cpp
View file

@ -102,7 +102,6 @@ static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& trans
{ {
Line cur = {dash.ptCur, *to}; Line cur = {dash.ptCur, *to};
auto len = cur.length(); auto len = cur.length();
if (tvg::zero(len)) { if (tvg::zero(len)) {
_outlineMoveTo(*dash.outline, &dash.ptCur, transform); _outlineMoveTo(*dash.outline, &dash.ptCur, transform);
//draw the current line fully //draw the current line fully
@ -117,7 +116,7 @@ static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& trans
} }
//draw the current line partially //draw the current line partially
} else { } else {
while (len - dash.curLen > 0.0001f) { while (len - dash.curLen > DASH_PATTERN_THRESHOLD) {
Line left, right; Line left, right;
if (dash.curLen > 0) { if (dash.curLen > 0) {
len -= dash.curLen; len -= dash.curLen;
@ -178,7 +177,7 @@ static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ct
} }
//draw the current line partially //draw the current line partially
} else { } else {
while ((len - dash.curLen) > 0.0001f) { while ((len - dash.curLen) > DASH_PATTERN_THRESHOLD) {
Bezier left, right; Bezier left, right;
if (dash.curLen > 0) { if (dash.curLen > 0) {
len -= dash.curLen; len -= dash.curLen;

2
src/renderer/tvgRender.h
View file

@ -35,6 +35,8 @@ namespace tvg
using RenderData = void*; using RenderData = void*;
using pixel_t = uint32_t; using pixel_t = uint32_t;
#define DASH_PATTERN_THRESHOLD 0.001f
enum RenderUpdateFlag : uint8_t {None = 0, Path = 1, Color = 2, Gradient = 4, Stroke = 8, Transform = 16, Image = 32, GradientStroke = 64, Blend = 128, All = 255}; enum RenderUpdateFlag : uint8_t {None = 0, Path = 1, Color = 2, Gradient = 4, Stroke = 8, Transform = 16, Image = 32, GradientStroke = 64, Blend = 128, All = 255};
enum CompositionFlag : uint8_t {Invalid = 0, Opacity = 1, Blending = 2, Masking = 4, PostProcessing = 8}; //Composition Purpose enum CompositionFlag : uint8_t {Invalid = 0, Opacity = 1, Blending = 2, Masking = 4, PostProcessing = 8}; //Composition Purpose