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

svg_loader: fix trivial build warnings.

Browse source 
../src/loaders/svg/tvgSvgLoader.cpp: In function ‘void _copyAttr(SvgNode*, const SvgNode*)’:
../src/loaders/svg/tvgSvgLoader.cpp:1598:60: warning: ‘void* memcpy(void*, const void*, size_t)’ writing to an object of type ‘struct SvgStyleProperty’ with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess]
     memcpy(to->style, from->style, sizeof(SvgStyleProperty));

@Issue: 498
This commit is contained in:
Hermet Park 2021-06-28 13:38:12 +09:00 • committed by JunsuChoi
parent 57a22b8462
commit 78bb8d1f2e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/loaders/svg/tvgSvgLoader.cpp
View file

@ -1596,15 +1596,13 @@ static void _copyAttr(SvgNode* to, const SvgNode* from)
{ {
//Copy matrix attribute //Copy matrix attribute
if (from->transform) { if (from->transform) {
to->transform = (Matrix*)calloc(1, sizeof(Matrix)); to->transform = (Matrix*)malloc(sizeof(Matrix));
if (to->transform) memcpy(to->transform, from->transform, sizeof(Matrix)); if (to->transform) *to->transform = *from->transform;
} }
//Copy style attribute; //Copy style attribute
memcpy(to->style, from->style, sizeof(SvgStyleProperty)); *to->style = *from->style;
if (from->style->fill.paint.url) to->style->fill.paint.url = new string(from->style->fill.paint.url->c_str()); if (from->style->fill.paint.url) to->style->fill.paint.url = new string(from->style->fill.paint.url->c_str());
if (from->style->stroke.paint.url) to->style->stroke.paint.url = new string(from->style->stroke.paint.url->c_str()); if (from->style->stroke.paint.url) to->style->stroke.paint.url = new string(from->style->stroke.paint.url->c_str());
//Copy style composite attribute (clip-path, mask, ...)
if (from->style->comp.url) to->style->comp.url = new string(from->style->comp.url->c_str()); if (from->style->comp.url) to->style->comp.url = new string(from->style->comp.url->c_str());
//Copy node attribute //Copy node attribute