Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Validate "encoding" attribute of "image/png" file nodes.

Browse Source
This commit is contained in:
Jim Evins
2018-02-10 16:06:01 -05:00
parent 0cc3be205f
commit 931294a0f9
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/XmlLabelParser.cpp
+7
View File
@@ -747,6 +747,8 @@ namespace glabels
QString encoding = XmlUtil::getStringAttr( node, "encoding", "base64" ); QString encoding = XmlUtil::getStringAttr( node, "encoding", "base64" );
if ( mimetype == "image/png" ) if ( mimetype == "image/png" )
{
if ( encoding == "base64" )
{ {
QByteArray ba64 = node.text().toUtf8(); QByteArray ba64 = node.text().toUtf8();
QByteArray ba = QByteArray::fromBase64( ba64 ); QByteArray ba = QByteArray::fromBase64( ba64 );
@@ -755,6 +757,11 @@ namespace glabels
data.addImage( name, image ); data.addImage( name, image );
} }
else
{
qWarning() << "Unexpected encoding:" << encoding << "node:" << node.tagName();
}
}
else if ( mimetype == "image/svg+xml" ) else if ( mimetype == "image/svg+xml" )
{ {
data.addSvg( name, node.text().toUtf8() ); data.addSvg( name, node.text().toUtf8() );