#600: Upgrading XMP-Toolkit to version 4.4; Additional changes. (COMPILES ON LINUX BUT COMPLETELY UNTESTED)

xmpsdk/include/TXMPIterator.hpp

@@ -19,7 +19,7 @@
 /// \brief API for access to the XMP Toolkit iteration services.
 ///
 /// \c TXMPIterator is the template class providing iteration services for the XMP Toolkit. It must
-/// be instantiated with a string class such as \c std::string. See the instructions in XMP.hpp, and
+/// be instantiated with a string class such as \c std::string. See the instructions in XMPSDK.hpp, and
 /// the Overview for a discussion of the overall architecture of the XMP API.
 // =================================================================================================
 
@@ -29,7 +29,7 @@
 ///
 /// \c TXMPIterator provides a uniform means to iterate over the schema and properties within an XMP
 /// object. \c TXMPIterator is a template class which must be instantiated with a string class such
-/// as \c std::string. See the instructions in XMP.hpp, and the Overview for a discussion of the
+/// as \c std::string. See the instructions in XMPSDK.hpp, and the Overview for a discussion of the
 /// overall architecture of the XMP API. Access these functions through the concrete class,
 /// \c SXMPIterator.
 ///

xmpsdk/include/TXMPMeta.hpp

@@ -20,7 +20,7 @@
 ///
 /// \c TXMPMeta is the template class providing the core services of the XMP Toolkit. It must be
 /// instantiated with a string class such as \c std::string. Read the Toolkit Overview for
-/// information about the overall architecture of the XMP API, and the documentation for \c XMP.hpp
+/// information about the overall architecture of the XMP API, and the documentation for \c XMPSDK.hpp
 /// for specific instantiation instructions.
 ///
 /// Access these functions through the concrete class, \c SXMPMeta.
@@ -32,7 +32,7 @@
 ///
 /// \c TXMPMeta is the template class providing the core services of the XMP Toolkit. It should be
 /// instantiated with a string class such as \c std::string. Read the Toolkit Overview for
-/// information about the overall architecture of the XMP API, and the documentation for \c XMP.hpp
+/// information about the overall architecture of the XMP API, and the documentation for \c XMPSDK.hpp
 /// for specific instantiation instructions.
 ///
 /// Access these functions through the concrete class, \c SXMPMeta.

xmpsdk/include/TXMPUtils.hpp

@@ -19,7 +19,7 @@
 /// \brief API for access to the XMP Toolkit utility services.
 ///
 /// \c TXMPUtils is the template class providing utility services for the XMP Toolkit. It must be
-/// instantiated with a string class such as \c std::string. See the instructions in XMP.hpp, and
+/// instantiated with a string class such as \c std::string. See the instructions in XMPSDK.hpp, and
 /// the Overview for a discussion of the overall architecture of the XMP API.
 // =================================================================================================
 
@@ -28,7 +28,7 @@
 /// @brief API for access to the XMP Toolkit utility services.
 ///
 /// \c TXMPUtils is a template class which must be instantiated with a string class such as
-/// \c std::string. See the instructions in XMP.hpp, and the Overview for a discussion of the overall
+/// \c std::string. See the instructions in XMPSDK.hpp, and the Overview for a discussion of the overall
 /// architecture of the XMP API.
 ///
 /// This class defines helper functions that support the basic metadata manipulation provided by
@@ -320,7 +320,7 @@ public:
 	///
 	///	Strings can be specified as null-terminated UTF-8 (\c #XMP_StringPtr), or as string
 	///	objects (\c tStringObj) of the type declared when instantiating the XMP classes; see
-	///	\c XMP.hpp. Alternate forms of each conversion function allow either type of string.
+	///	\c XMPSDK.hpp. Alternate forms of each conversion function allow either type of string.
 
     // ---------------------------------------------------------------------------------------------
     /// @brief \c ConvertFromBool() converts a Boolean value to a string.

xmpsdk/src/Makefile

@@ -55,7 +55,8 @@ include $(top_srcdir)/config/config.mk
 # Source files
 
 # Add library C++ source files to this list
-CCSRC = XMPMeta.cpp            \
+CCSRC = XML_Node.cpp           \
+        XMPMeta.cpp            \
         XMPMeta-GetSet.cpp     \
         XMPMeta-Parse.cpp      \
         XMPMeta-Serialize.cpp  \

xmpsdk/src/XMLParserAdapter.hpp

@@ -87,10 +87,10 @@ public:
 	void ClearNode();
 
 	XML_Node ( XML_NodePtr _parent, XMP_StringPtr _name, XMP_Uns8 _kind )
-		: kind(_kind), name(_name), parent(_parent), nsPrefixLen(0) {};
+            : kind(_kind), name(_name), nsPrefixLen(0), parent(_parent) {};
 
 	XML_Node ( XML_NodePtr _parent, const std::string & _name, XMP_Uns8 _kind )
-		: kind(_kind), name(_name), parent(_parent), nsPrefixLen(0) {};
+            : kind(_kind), name(_name), nsPrefixLen(0), parent(_parent) {};
 
 	virtual ~XML_Node() { RemoveAttrs(); RemoveContent(); };
 

xmpsdk/src/XML_Node.cpp

@@ -10,6 +10,7 @@
 #include "XMLParserAdapter.hpp"
 
 #include <map>
+#include <cstring>
 
 // ! Can't include XMP..._Impl.hpp - used by both Core and Files.
 #define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)