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

svg_loader XmlParser: Print unsupported elements, attribute with log option

Browse source 
* Using printf is temporary. We are planning a proper way to print the log.
When parsing a Svg file, Loader print unsupported elements and attributes.
This commit is contained in:
JunsuChoi 2020-12-14 14:02:24 +09:00 • committed by Hermet Park
parent 55978d1bf4
commit 54816339ed
4 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -28,6 +28,10 @@ if get_option('bindings').contains('capi') == true
config_h.set10('THORVG_CAPI_BINDING_SUPPORT', true) config_h.set10('THORVG_CAPI_BINDING_SUPPORT', true)
endif endif
if get_option('log') == true
config_h.set10('THORVG_LOG_ENABLED', true)
endif
configure_file( configure_file(
output: 'config.h', output: 'config.h',
configuration: config_h configuration: config_h

5
meson_options.txt
View file

@ -37,3 +37,8 @@ option('test',
type: 'boolean', type: 'boolean',
value: false, value: false,
description: 'Enable building unit tests') description: 'Enable building unit tests')
option('log',
type: 'boolean',
value: false,
description: 'Enable log message')

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

@ -745,7 +745,13 @@ static bool _attrParseSvgNode(void* data, const char* key, const char* value)
if (!strcmp(value, "none")) doc->preserveAspect = false; if (!strcmp(value, "none")) doc->preserveAspect = false;
} else if (!strcmp(key, "style")) { } else if (!strcmp(key, "style")) {
return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader); return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
} else { }
#ifdef THORVG_LOG_ENABLED
else if (!strcmp(key, "xmlns") || !strcmp(key, "xmlns:xlink") || strcmp (key, "xmlns:svg")) {
//No action
}
#endif
else {
return _parseStyleAttr(loader, key, value); return _parseStyleAttr(loader, key, value);
} }
return true; return true;
@ -1043,6 +1049,9 @@ static SvgNode* _createMaskNode(SvgLoaderData* loader, SvgNode* parent, const ch
loader->svgParse->node = _createNode(parent, SvgNodeType::Unknown); loader->svgParse->node = _createNode(parent, SvgNodeType::Unknown);
loader->svgParse->node->display = false; loader->svgParse->node->display = false;
#ifdef THORVG_LOG_ENABLED
printf("[SVG] Unsuppoted elements used [Elements: mask]\n");
#endif
return loader->svgParse->node; return loader->svgParse->node;
} }
@ -2120,6 +2129,11 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
loader->latestGradient->stops.push(stop); loader->latestGradient->stops.push(stop);
} }
} }
#ifdef THORVG_LOG_ENABLED
else {
printf("[SVG] Unsuppoted elements used [Elements: %s]\n", tagName);
}
#endif
} }

37
src/loaders/svg/tvgXmlParser.cpp
View file

@ -28,8 +28,41 @@
#include <alloca.h> #include <alloca.h>
#endif #endif
#ifdef THORVG_LOG_ENABLED
#include <stdio.h>
#endif
#include "tvgXmlParser.h" #include "tvgXmlParser.h"
#ifdef THORVG_LOG_ENABLED
static string nodeTypeToString(SvgNodeType type)
{
switch (type) {
case SvgNodeType::Doc: return "Doc";
case SvgNodeType::G: return "G";
case SvgNodeType::Defs: return "Defs";
case SvgNodeType::Animation: return "Animation";
case SvgNodeType::Arc: return "Arc";
case SvgNodeType::Circle: return "Circle";
case SvgNodeType::Ellipse: return "Ellipse";
case SvgNodeType::Image: return "Image";
case SvgNodeType::Line: return "Line";
case SvgNodeType::Path: return "Path";
case SvgNodeType::Polygon: return "Polygon";
case SvgNodeType::Polyline: return "Polyline";
case SvgNodeType::Rect: return "Rect";
case SvgNodeType::Text: return "Text";
case SvgNodeType::TextArea: return "TextArea";
case SvgNodeType::Tspan: return "Tspan";
case SvgNodeType::Use: return "Use";
case SvgNodeType::Video: return "Video";
case SvgNodeType::ClipPath: return "ClipPath";
default: return "Unknown";
}
return "Unknown";
}
#endif
static const char* _simpleXmlFindWhiteSpace(const char* itr, const char* itrEnd) static const char* _simpleXmlFindWhiteSpace(const char* itr, const char* itrEnd)
{ {
for (; itr < itrEnd; itr++) { for (; itr < itrEnd; itr++) {
@ -152,7 +185,11 @@ bool simpleXmlParseAttributes(const char* buf, unsigned bufLength, simpleXMLAttr
memcpy(tval, value, valueEnd - value); memcpy(tval, value, valueEnd - value);
tval[valueEnd - value] = '\0'; tval[valueEnd - value] = '\0';
#ifdef THORVG_LOG_ENABLED
if (!func((void*)data, tmpBuf, tval)) printf("[SVG] Unsuppoted attributes used [Elements type: %s][Attribute: %s]\n", nodeTypeToString(((SvgLoaderData*)data)->svgParse->node->type).c_str(), tmpBuf);
#else
func((void*)data, tmpBuf, tval); func((void*)data, tmpBuf, tval);
#endif
itr = valueEnd + 1; itr = valueEnd + 1;
} }