From 915d0e353b4ec7fb7e14e0f5c5e3f110fa771f87 Mon Sep 17 00:00:00 2001
From: Juha Reunanen <juha.reunanen@tomaattinen.com>
Date: Thu, 25 Mar 2021 15:33:24 +0200
Subject: [PATCH] Make XMP support optional (no need for tinyxml2) (#10)

---
 TinyEXIF.cpp | 11 +++++++++++
 TinyEXIF.h   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/TinyEXIF.cpp b/TinyEXIF.cpp
index 029cb62..8a75b43 100644
--- a/TinyEXIF.cpp
+++ b/TinyEXIF.cpp
@@ -32,7 +32,11 @@
 */
 
 #include "TinyEXIF.h"
+
+#ifndef TINYEXIF_NO_XMP_SUPPORT
 #include <tinyxml2.h>
+#endif // TINYEXIF_NO_XMP_SUPPORT
+
 #include <cstdint>
 #include <cstdio>
 #include <cmath>
@@ -434,11 +438,13 @@ void EXIFInfo::parseIFDImage(EntryParser& parser, unsigned& exif_sub_ifd_offset,
 void EXIFInfo::parseIFDExif(EntryParser& parser) {
 	switch (parser.GetTag()) {
 	case 0x02bc:
+#ifndef TINYEXIF_NO_XMP_SUPPORT
 		// XMP Metadata (Adobe technote 9-14-02)
 		if (parser.IsUndefined()) {
 			const std::string strXML(parser.FetchString());
 			parseFromXMPSegmentXML(strXML.c_str(), (unsigned)strXML.length());
 		}
+#endif // TINYEXIF_NO_XMP_SUPPORT
 		break;
 
 	case 0x829a:
@@ -808,6 +814,7 @@ int EXIFInfo::parseFrom(EXIFStream& stream) {
 				return app1s(PARSE_INVALID_JPEG);
 			switch (int ret=parseFromEXIFSegment(buf, sectionLength)) {
 			case PARSE_ABSENT_DATA:
+#ifndef TINYEXIF_NO_XMP_SUPPORT
 				switch (ret=parseFromXMPSegment(buf, sectionLength)) {
 				case PARSE_ABSENT_DATA:
 					break;
@@ -818,6 +825,7 @@ int EXIFInfo::parseFrom(EXIFStream& stream) {
 				default:
 					return app1s(ret); // some error
 				}
+#endif // TINYEXIF_NO_XMP_SUPPORT
 				break;
 			case PARSE_SUCCESS:
 				if ((app1s|=FIELD_EXIF) == FIELD_ALL)
@@ -970,6 +978,8 @@ int EXIFInfo::parseFromEXIFSegment(const uint8_t* buf, unsigned len) {
 	return PARSE_SUCCESS;
 }
 
+#ifndef TINYEXIF_NO_XMP_SUPPORT
+
 //
 // Main parsing function for a XMP segment.
 // Do a sanity check by looking for bytes "http://ns.adobe.com/xap/1.0/\0".
@@ -1098,6 +1108,7 @@ int EXIFInfo::parseFromXMPSegmentXML(const char* szXML, unsigned len) {
 	return PARSE_SUCCESS;
 }
 
+#endif // TINYEXIF_NO_XMP_SUPPORT
 
 void EXIFInfo::Geolocation_t::parseCoords() {
 	// Convert GPS latitude
diff --git a/TinyEXIF.h b/TinyEXIF.h
index fed8d81..09c26f7 100644
--- a/TinyEXIF.h
+++ b/TinyEXIF.h
@@ -117,11 +117,13 @@ public:
 	// available (i.e., a blob starting with the bytes "Exif\0\0").
 	int parseFromEXIFSegment(const uint8_t* buf, unsigned len);
 
+#ifndef TINYEXIF_NO_XMP_SUPPORT
 	// Parsing function for an XMP segment. This is used internally by parseFrom()
 	// but can be called for special cases where only the XMP section is 
 	// available (i.e., a blob starting with the bytes "http://ns.adobe.com/xap/1.0/\0").
 	int parseFromXMPSegment(const uint8_t* buf, unsigned len);
 	int parseFromXMPSegmentXML(const char* szXML, unsigned len);
+#endif // TINYEXIF_NO_XMP_SUPPORT
 
 	// Set all data members to default values.
 	// Should be called before parsing a new stream.