Mirrors/lcd-image-converter
2
0
Fork 0
mirror of https://github.com/riuson/lcd-image-converter.git synced 2026-03-08 09:07:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Null reference from list #32743

Browse Source
This commit is contained in:
Vladimir
2015-11-12 18:00:42 +05:00
parent bcc8c4e861
commit d42d9ec3db
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
classes/parser/parser.cpp
View File

@@ -165,19 +165,22 @@ QString Parser::parseImagesTable(const QString &templateString,
ParsedImageData *data = images->value(key);
QString charCode = this->hexCode(key, encoding, useBom);
if (data != NULL)
{
QString charCode = this->hexCode(key, encoding, useBom);
tags.importValues(data->tags());
tags.setTagValue(Tags::OutputCharacterCode, charCode);
if (it.hasNext())
tags.setTagValue(Tags::OutputComma, ",");
else
tags.setTagValue(Tags::OutputComma, "");
tags.importValues(data->tags());
tags.setTagValue(Tags::OutputCharacterCode, charCode);
if (it.hasNext())
tags.setTagValue(Tags::OutputComma, ",");
else
tags.setTagValue(Tags::OutputComma, "");
tags.setTagValue(Tags::OutputCharacterText, FontHelper::escapeControlChars(key));
tags.setTagValue(Tags::OutputCharacterText, FontHelper::escapeControlChars(key));
QString imageString = this->parse(templateString, tags, doc, images);
result.append(imageString);
QString imageString = this->parse(templateString, tags, doc, images);
result.append(imageString);
}
}
return result;