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

sw_engine: memory optimization.

Browse source 
Save the size of the Countour array,
16 bits is large enough to count the points number in one Shape.
This commit is contained in:
Hermet Park 2021-08-12 20:06:07 +09:00 • committed by Hermet Park
parent 2280bb9ce7
commit e1d5ade705
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,12 +98,12 @@ struct SwSize
struct SwOutline struct SwOutline
{ {
uint32_t* cntrs; //the contour end points
uint32_t cntrsCnt; //number of contours in glyph
uint32_t reservedCntrsCnt;
SwPoint* pts; //the outline's points SwPoint* pts; //the outline's points
uint32_t ptsCnt; //number of points in the glyph uint16_t ptsCnt; //number of points in the glyph
uint32_t reservedPtsCnt; uint16_t reservedPtsCnt;
uint16_t* cntrs; //the contour end points
uint16_t cntrsCnt; //number of contours in glyph
uint16_t reservedCntrsCnt;
uint8_t* types; //curve type uint8_t* types; //curve type
bool* closed; //opened or closed path? bool* closed; //opened or closed path?
FillRule fillRule; FillRule fillRule;

2
src/lib/sw_engine/tvgSwImage.cpp
View file

@ -39,7 +39,7 @@ static bool _genOutline(SwImage* image, const Matrix* transform, SwMpool* mpool,
if (outline->reservedCntrsCnt < 1) { if (outline->reservedCntrsCnt < 1) {
outline->reservedCntrsCnt = 1; outline->reservedCntrsCnt = 1;
outline->cntrs = static_cast<uint32_t*>(realloc(outline->cntrs, outline->reservedCntrsCnt * sizeof(uint32_t))); outline->cntrs = static_cast<uint16_t*>(realloc(outline->cntrs, outline->reservedCntrsCnt * sizeof(uint16_t)));
outline->closed = static_cast<bool*>(realloc(outline->closed, outline->reservedCntrsCnt * sizeof(bool))); outline->closed = static_cast<bool*>(realloc(outline->closed, outline->reservedCntrsCnt * sizeof(bool)));
outline->closed[0] = true; outline->closed[0] = true;
} }

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

@ -62,7 +62,7 @@ static bool _growOutlineContour(SwOutline& outline, uint32_t n)
{ {
if (outline.reservedCntrsCnt >= outline.cntrsCnt + n) return false; if (outline.reservedCntrsCnt >= outline.cntrsCnt + n) return false;
outline.reservedCntrsCnt = outline.cntrsCnt + n; outline.reservedCntrsCnt = outline.cntrsCnt + n;
outline.cntrs = static_cast<uint32_t*>(realloc(outline.cntrs, outline.reservedCntrsCnt * sizeof(uint32_t))); outline.cntrs = static_cast<uint16_t*>(realloc(outline.cntrs, outline.reservedCntrsCnt * sizeof(uint16_t)));
return true; return true;
} }

2
src/lib/sw_engine/tvgSwStroke.cpp
View file

@ -921,7 +921,7 @@ SwOutline* strokeExportOutline(SwStroke* stroke, SwMpool* mpool, unsigned tid)
outline->reservedPtsCnt = ptsCnt; outline->reservedPtsCnt = ptsCnt;
} }
if (outline->reservedCntrsCnt < cntrsCnt) { if (outline->reservedCntrsCnt < cntrsCnt) {
outline->cntrs = static_cast<uint32_t*>(realloc(outline->cntrs, sizeof(uint32_t) * cntrsCnt)); outline->cntrs = static_cast<uint16_t*>(realloc(outline->cntrs, sizeof(uint16_t) * cntrsCnt));
outline->reservedCntrsCnt = cntrsCnt; outline->reservedCntrsCnt = cntrsCnt;
} }