fix linux build

This commit is contained in:
cDc
2017-08-11 14:52:44 +03:00
parent 8523cdcf3a
commit 902c1a08fb

View File

@@ -844,21 +844,21 @@ int EXIFInfo::parseFromXMPSegment(const uint8_t* buf, unsigned len) {
tinyxml2::XMLDocument doc; tinyxml2::XMLDocument doc;
const tinyxml2::XMLElement* document; const tinyxml2::XMLElement* document;
if (doc.Parse(strXMP, len) != tinyxml2::XML_SUCCESS || if (doc.Parse(strXMP, len) != tinyxml2::XML_SUCCESS ||
((document=doc.FirstChildElement(_T("x:xmpmeta"))) == NULL && (document=doc.FirstChildElement(_T("xmp:xmpmeta"))) == NULL) || ((document=doc.FirstChildElement("x:xmpmeta")) == NULL && (document=doc.FirstChildElement("xmp:xmpmeta")) == NULL) ||
(document=document->FirstChildElement(_T("rdf:RDF"))) == NULL || (document=document->FirstChildElement("rdf:RDF")) == NULL ||
(document=document->FirstChildElement(_T("rdf:Description"))) == NULL) (document=document->FirstChildElement("rdf:Description")) == NULL)
return PARSE_EXIF_SUCCESS; return PARSE_EXIF_SUCCESS;
// Now try parsing the XMP content for projection type. // Now try parsing the XMP content for projection type.
{ {
const tinyxml2::XMLElement* const element(document->FirstChildElement(_T("GPano:ProjectionType"))); const tinyxml2::XMLElement* const element(document->FirstChildElement("GPano:ProjectionType"));
if (element != NULL) { if (element != NULL) {
const char* const szProjectionType(element->GetText()); const char* const szProjectionType(element->GetText());
if (szProjectionType != NULL) { if (szProjectionType != NULL) {
if (0 == _tcsicmp(szProjectionType, _T("perspective"))) if (0 == _tcsicmp(szProjectionType, "perspective"))
ProjectionType = 1; ProjectionType = 1;
else if (0 == _tcsicmp(szProjectionType, _T("equirectangular")) || else if (0 == _tcsicmp(szProjectionType, "equirectangular") ||
0 == _tcsicmp(szProjectionType, _T("spherical"))) 0 == _tcsicmp(szProjectionType, "spherical"))
ProjectionType = 2; ProjectionType = 2;
} }
} }