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

tvg: support stroke miterlimit property.

Browse source 
implement the miterlimit property that was introduced by
44a750ee5d

@Issue: https://github.com/thorvg/thorvg/issues/1490
This commit is contained in:
Hermet Park 2023-06-13 14:01:29 +09:00 • committed by Hermet Park
parent f9816a9e6f
commit 075e3e6b2a
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/tvgBinaryDesc.h
View file

@ -71,14 +71,16 @@ using TvgBinFlag = TvgBinByte;
#define TVG_TAG_SHAPE_FILL (TvgBinTag)0x42 #define TVG_TAG_SHAPE_FILL (TvgBinTag)0x42
#define TVG_TAG_SHAPE_COLOR (TvgBinTag)0x43 #define TVG_TAG_SHAPE_COLOR (TvgBinTag)0x43
#define TVG_TAG_SHAPE_FILLRULE (TvgBinTag)0x44 #define TVG_TAG_SHAPE_FILLRULE (TvgBinTag)0x44
#define TVG_TAG_SHAPE_STROKE_CAP (TvgBinTag)0x50
#define TVG_TAG_SHAPE_STROKE_JOIN (TvgBinTag)0x51
//Stroke //Stroke
#define TVG_TAG_SHAPE_STROKE_CAP (TvgBinTag)0x50
#define TVG_TAG_SHAPE_STROKE_JOIN (TvgBinTag)0x51
#define TVG_TAG_SHAPE_STROKE_WIDTH (TvgBinTag)0x52 #define TVG_TAG_SHAPE_STROKE_WIDTH (TvgBinTag)0x52
#define TVG_TAG_SHAPE_STROKE_COLOR (TvgBinTag)0x53 #define TVG_TAG_SHAPE_STROKE_COLOR (TvgBinTag)0x53
#define TVG_TAG_SHAPE_STROKE_FILL (TvgBinTag)0x54 #define TVG_TAG_SHAPE_STROKE_FILL (TvgBinTag)0x54
#define TVG_TAG_SHAPE_STROKE_DASHPTRN (TvgBinTag)0x55 #define TVG_TAG_SHAPE_STROKE_DASHPTRN (TvgBinTag)0x55
#define TVG_TAG_SHAPE_STROKE_MITERLIMIT (TvgBinTag)0x56
//Fill //Fill

7
src/loaders/tvg/tvgTvgBinInterpreter.cpp
View file

@ -309,6 +309,13 @@ static bool _parseShapeStroke(const char *ptr, const char *end, Shape *shape)
if (!_parseShapeStrokeDashPattern(block.data, block.end, shape)) return false; if (!_parseShapeStrokeDashPattern(block.data, block.end, shape)) return false;
break; break;
} }
case TVG_TAG_SHAPE_STROKE_MITERLIMIT: {
if (block.length != SIZE(float)) return false;
float miterlimit;
READ_FLOAT(&miterlimit, block.data);
shape->strokeMiterlimit(miterlimit);
break;
}
default: { default: {
TVGLOG("TVG", "Unsupported tag %d (0x%x) used as one of stroke properties, %d bytes skipped", block.type, block.type, block.length); TVGLOG("TVG", "Unsupported tag %d (0x%x) used as one of stroke properties, %d bytes skipped", block.type, block.type, block.length);
break; break;

8
src/savers/tvg/tvgTvgSaver.cpp
View file

@ -115,6 +115,8 @@ static bool _merge(Shape* from, Shape* to)
if (from->strokeDash(nullptr) > 0 || to->strokeDash(nullptr) > 0) return false; if (from->strokeDash(nullptr) > 0 || to->strokeDash(nullptr) > 0) return false;
if (from->strokeFill() || to->strokeFill()) return false; if (from->strokeFill() || to->strokeFill()) return false;
if (fabsf(from->strokeMiterlimit() - to->strokeMiterlimit()) > FLT_EPSILON) return false;
//fill rule //fill rule
if (from->fillRule() != to->fillRule()) return false; if (from->fillRule() != to->fillRule()) return false;
@ -476,6 +478,12 @@ TvgBinCounter TvgSaver::serializeStroke(const Shape* shape, const Matrix* pTrans
cnt += SIZE(TvgBinTag) + SIZE(TvgBinCounter); cnt += SIZE(TvgBinTag) + SIZE(TvgBinCounter);
} }
//miterlimit (the default value is 4)
auto miterlimit = shape->strokeMiterlimit();
if (fabsf(miterlimit - 4.0f) > FLT_EPSILON) {
cnt += writeTagProperty(TVG_TAG_SHAPE_STROKE_MITERLIMIT, SIZE(miterlimit), &miterlimit);
}
writeReservedCount(cnt); writeReservedCount(cnt);
return SERIAL_DONE(cnt); return SERIAL_DONE(cnt);