Merge branch 'adobe-sdk' into cc-2014-12-integration

Conflicts:
	XMPFiles/source/FileHandlers/MP3_Handler.cpp
	XMPFiles/source/FileHandlers/UCF_Handler.hpp
	public/include/XMP_Const.h
	samples/source/common/TagTree.cpp

8 files changed, 179 insertions, 97 deletions

diff --git a/public/include/TXMPFiles.hpp b/public/include/TXMPFiles.hpp
index a05154e..27ee413 100644
--- a/public/include/TXMPFiles.hpp
+++ b/public/include/TXMPFiles.hpp
@@ -492,6 +492,8 @@ public:
     ///   might be no difference.
     ///   \li \c #kXMPFiles_OpenUseSmartHandler - Require the use of a smart handler.
     ///   \li \c #kXMPFiles_OpenUsePacketScanning - Force packet scanning, do not use a smart handler.
+	///   \li \c #kXMPFiles_OptimizeFileLayout - When updating a file, spend the effort necessary 
+	///    to optimize file layout.
     ///
     /// @return True if the file is succesfully opened and attached to a file handler. False for
     /// anticipated problems, such as passing \c #kXMPFiles_OpenUseSmartHandler but not having an
diff --git a/public/include/XMP_Const.h b/public/include/XMP_Const.h
index e2eab40..a29c5fa 100644
--- a/public/include/XMP_Const.h
+++ b/public/include/XMP_Const.h
@@ -103,6 +103,25 @@ const XMP_Uns8 kXMP_Bool_False = 0;
 #define ConvertXMP_BoolToBool(a) (a) != kXMP_Bool_False
 #define ConvertBoolToXMP_Bool(a) (a) ? !kXMP_Bool_False : kXMP_Bool_False
 
+static const XMP_Uns8 Min_XMP_Uns8		= ( (XMP_Uns8) 0x00 );
+static const XMP_Uns8 Max_XMP_Uns8		= ( (XMP_Uns8) 0xFF );
+static const XMP_Uns16 Min_XMP_Uns16	= ( (XMP_Uns16) 0x00 );
+static const XMP_Uns16 Max_XMP_Uns16	= ( (XMP_Uns16) 0xFFFF );
+static const XMP_Uns32 Min_XMP_Uns32	= ( (XMP_Uns32) 0x00 );
+static const XMP_Uns32 Max_XMP_Uns32	= ( (XMP_Uns32) 0xFFFFFFFF );
+static const XMP_Uns64 Min_XMP_Uns64	= ( (XMP_Uns64) 0x00 );
+static const XMP_Uns64 Max_XMP_Uns64	= ( (XMP_Uns64) 0xFFFFFFFFFFFFFFFFLL );
+
+static const XMP_Int8 Min_XMP_Int8		= ( (XMP_Int8) 0x80 );
+static const XMP_Int8 Max_XMP_Int8		= ( (XMP_Int8) 0x7F );
+static const XMP_Int16 Min_XMP_Int16	= ( (XMP_Int16) 0x8000 );
+static const XMP_Int16 Max_XMP_Int16	= ( (XMP_Int16) 0x7FFF );
+static const XMP_Int32 Min_XMP_Int32	= ( (XMP_Int32) 0x80000000 );
+static const XMP_Int32 Max_XMP_Int32	= ( (XMP_Int32) 0x7FFFFFFF );
+static const XMP_Int64 Min_XMP_Int64	= ( (XMP_Int64) 0x8000000000000000LL );
+static const XMP_Int64 Max_XMP_Int64	= ( (XMP_Int64) 0x7FFFFFFFFFFFFFFFLL );
+
+
 /// An "ABI safe" pointer to the internal part of an XMP object. Use to pass an XMP object across
 /// client DLL boundaries. See \c TXMPMeta::GetInternalRef().
 typedef struct __XMPMeta__ *        XMPMetaRef;
@@ -241,7 +260,7 @@ struct XMP_DateTime {
 
 	#if __cplusplus
 		XMP_DateTime() : year(0), month(0), day(0), hour(0), minute(0), second(0),
-		                 hasDate(false), hasTime(false), hasTimeZone(false), tzSign(0), tzHour(0), tzMinute(0), nanoSecond(0) {};
+		                 hasDate(false),hasTime(false), hasTimeZone(false), tzSign(0), tzHour(0), tzMinute(0), nanoSecond(0){};
 	#endif
 
 };
@@ -713,7 +732,10 @@ enum {
     kXMP_OmitAllFormatting   = 0x0800UL,
 
     /// Omit the x:xmpmeta element surrounding the rdf:RDF element.
-    kXMP_OmitXMPMetaElement  = 0x1000UL,
+	kXMP_OmitXMPMetaElement  = 0x1000UL,    
+	
+	/// Include a rdf Hash and Merged flag in x:xmpmeta element.
+	kXMP_IncludeRDFHash      = 0x2000UL,
 
     _XMP_LittleEndian_Bit    = 0x0001UL,  // ! Don't use directly, see the combined values below!
     _XMP_UTF16_Bit           = 0x0002UL,
@@ -1151,7 +1173,10 @@ enum {
     kXMPFiles_OpenLimitedScanning   = 0x00000080,
 
     /// Attempt to repair a file opened for update, default is to not open (throw an exception).
-    kXMPFiles_OpenRepairFile        = 0x00000100
+    kXMPFiles_OpenRepairFile        = 0x00000100,
+
+	/// When updating a file, spend the effort necessary to optimize file layout.
+	kXMPFiles_OptimizeFileLayout    = 0x00000200
 
 };
 
diff --git a/public/include/XMP_Environment.h b/public/include/XMP_Environment.h
index b7765b7..d8bab98 100644
--- a/public/include/XMP_Environment.h
+++ b/public/include/XMP_Environment.h
@@ -133,15 +133,56 @@
 // =================================================================================================
 // Macintosh Specific Settings
 // ===========================
+#if (XMP_MacBuild)
+	#define XMP_HELPER_DLL_IMPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_EXPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_PRIVATE __attribute__((visibility("hidden")))
+#endif
 
 // =================================================================================================
 // Windows Specific Settings
 // =========================
+#if (XMP_WinBuild)
+	#define XMP_HELPER_DLL_IMPORT
+	#define XMP_HELPER_DLL_EXPORT
+	#define XMP_HELPER_DLL_PRIVATE
+#endif
 
 // =================================================================================================
 // UNIX Specific Settings
 // ======================
+#if (XMP_UNIXBuild)
+	#define XMP_HELPER_DLL_IMPORT
+	#define XMP_HELPER_DLL_EXPORT
+	#define XMP_HELPER_DLL_PRIVATE
+#endif
+
+// =================================================================================================
+// IOS Specific Settings
+// ===========================
+#if (XMP_iOSBuild)
+	#include <TargetConditionals.h>
+	#if (TARGET_CPU_ARM)
+		#define XMP_IOS_ARM 1
+	#else
+		#define XMP_IOS_ARM 0
+	#endif
+	#define XMP_HELPER_DLL_IMPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_EXPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_PRIVATE __attribute__((visibility("hidden")))
+#endif
 
 // =================================================================================================
 
+#if (XMP_DynamicBuild)
+	#define XMP_PUBLIC XMP_HELPER_DLL_EXPORT
+	#define XMP_PRIVATE XMP_HELPER_DLL_PRIVATE
+#elif (XMP_StaticBuild)
+	#define XMP_PUBLIC
+	#define XMP_PRIVATE
+#else
+	#define XMP_PUBLIC XMP_HELPER_DLL_IMPORT
+	#define XMP_PRIVATE XMP_HELPER_DLL_PRIVATE
+#endif
+
 #endif  // __XMP_Environment_h__
diff --git a/public/include/client-glue/TXMPMeta.incl_cpp b/public/include/client-glue/TXMPMeta.incl_cpp
index 098355a..aa5f4b8 100644
--- a/public/include/client-glue/TXMPMeta.incl_cpp
+++ b/public/include/client-glue/TXMPMeta.incl_cpp
@@ -17,6 +17,15 @@
 
 #include "client-glue/WXMPMeta.hpp"
 
+#if INCLUDE_XMP_NEW_DOM_MODEL
+	#include "XMPCore/XMPCore_Defines.h"
+
+	#if ENABLE_NEW_DOM_MODEL
+		#include "XMPCore/XMPCore_Defines.h"
+		#include "XMPCore/Interfaces/IXMPDOMFactory.h"
+	#endif
+#endif
+
 // =================================================================================================
 // Implementation Guidelines
 // =========================
@@ -116,6 +125,11 @@ Initialize()
 	#endif
 
 	WrapCheckBool ( ok, zXMPMeta_Initialize_1() );
+
+	#if ENABLE_NEW_DOM_MODEL
+		NS_XMPCOMMON::IXMPDOMFactory_latest::CreateInstance();
+	#endif
+
 	return ok;
 
 }
@@ -125,7 +139,7 @@ XMP_MethodIntro(TXMPMeta,void)::
 Terminate()
 {
 	WrapNoCheckVoid ( zXMPMeta_Terminate_1() );
-	
+
 	#if XMP_TraceClientCallsToFile
 		if ( xmpClientLog != stderr ) fclose ( xmpClientLog );
 		xmpClientLog = stderr;
diff --git a/public/include/client-glue/WXMPIterator.hpp b/public/include/client-glue/WXMPIterator.hpp
index aaccc08..e40a1d4 100644
--- a/public/include/client-glue/WXMPIterator.hpp
+++ b/public/include/client-glue/WXMPIterator.hpp
@@ -33,26 +33,26 @@ extern "C" {
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPIterator_PropCTor_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPIterator_PropCTor_1 ( XMPMetaRef     xmpRef,
                           XMP_StringPtr  schemaNS,
                           XMP_StringPtr  propName,
                           XMP_OptionBits options,
                           WXMP_Result *  wResult );
 
 extern void
-WXMPIterator_TableCTor_1 ( XMP_StringPtr  schemaNS,
+XMP_PUBLIC WXMPIterator_TableCTor_1 ( XMP_StringPtr  schemaNS,
                            XMP_StringPtr  propName,
                            XMP_OptionBits options,
                            WXMP_Result *  wResult );
 
 extern void
-WXMPIterator_IncrementRefCount_1 ( XMPIteratorRef iterRef );
+XMP_PUBLIC WXMPIterator_IncrementRefCount_1 ( XMPIteratorRef iterRef );
 
 extern void
-WXMPIterator_DecrementRefCount_1 ( XMPIteratorRef iterRef );
+XMP_PUBLIC WXMPIterator_DecrementRefCount_1 ( XMPIteratorRef iterRef );
 
 extern void
-WXMPIterator_Next_1 ( XMPIteratorRef   iterRef,
+XMP_PUBLIC WXMPIterator_Next_1 ( XMPIteratorRef   iterRef,
                       void *           schemaNS,
                       void *           propPath,
                       void *           propValue,
@@ -61,7 +61,7 @@ WXMPIterator_Next_1 ( XMPIteratorRef   iterRef,
                       WXMP_Result *    wResult );
 
 extern void
-WXMPIterator_Skip_1 ( XMPIteratorRef iterRef,
+XMP_PUBLIC WXMPIterator_Skip_1 ( XMPIteratorRef iterRef,
                       XMP_OptionBits options,
                       WXMP_Result *  wResult );
 
diff --git a/public/include/client-glue/WXMPMeta.hpp b/public/include/client-glue/WXMPMeta.hpp
index 5182aca..6991c12 100644
--- a/public/include/client-glue/WXMPMeta.hpp
+++ b/public/include/client-glue/WXMPMeta.hpp
@@ -197,69 +197,69 @@ inline XMP_Bool WrapErrorNotify ( XMPMeta_ErrorCallbackProc proc, void * context
 // =================================================================================================
 
 extern void
-WXMPMeta_GetVersionInfo_1 ( XMP_VersionInfo * info );
+XMP_PUBLIC WXMPMeta_GetVersionInfo_1 ( XMP_VersionInfo * info );
 
 extern void
-WXMPMeta_Initialize_1 ( WXMP_Result * wResult );
+XMP_PUBLIC WXMPMeta_Initialize_1 ( WXMP_Result * wResult );
 extern void
-WXMPMeta_Terminate_1();
+XMP_PUBLIC WXMPMeta_Terminate_1();
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_CTor_1 ( WXMP_Result * wResult );
+XMP_PUBLIC WXMPMeta_CTor_1 ( WXMP_Result * wResult );
 
 extern void
-WXMPMeta_IncrementRefCount_1 ( XMPMetaRef xmpRef );
+XMP_PUBLIC WXMPMeta_IncrementRefCount_1 ( XMPMetaRef xmpRef );
 
 extern void
-WXMPMeta_DecrementRefCount_1 ( XMPMetaRef xmpRef );
+XMP_PUBLIC WXMPMeta_DecrementRefCount_1 ( XMPMetaRef xmpRef );
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_GetGlobalOptions_1 ( WXMP_Result * wResult );
+XMP_PUBLIC WXMPMeta_GetGlobalOptions_1 ( WXMP_Result * wResult );
 
 extern void
-WXMPMeta_SetGlobalOptions_1 ( XMP_OptionBits options,
+XMP_PUBLIC WXMPMeta_SetGlobalOptions_1 ( XMP_OptionBits options,
                               WXMP_Result *  wResult );
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_DumpNamespaces_1 ( XMP_TextOutputProc outProc,
+XMP_PUBLIC WXMPMeta_DumpNamespaces_1 ( XMP_TextOutputProc outProc,
                             void *             refCon,
                             WXMP_Result *      wResult );
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_RegisterNamespace_1 ( XMP_StringPtr namespaceURI,
+XMP_PUBLIC WXMPMeta_RegisterNamespace_1 ( XMP_StringPtr namespaceURI,
                                XMP_StringPtr suggestedPrefix,
                                void *        actualPrefix,
                                SetClientStringProc SetClientString,
                                WXMP_Result * wResult );
 
 extern void
-WXMPMeta_GetNamespacePrefix_1 ( XMP_StringPtr namespaceURI,
+XMP_PUBLIC WXMPMeta_GetNamespacePrefix_1 ( XMP_StringPtr namespaceURI,
                                 void *        namespacePrefix,
                                 SetClientStringProc SetClientString,
                                 WXMP_Result * wResult );
 
 extern void
-WXMPMeta_GetNamespaceURI_1 ( XMP_StringPtr namespacePrefix,
+XMP_PUBLIC WXMPMeta_GetNamespaceURI_1 ( XMP_StringPtr namespacePrefix,
                              void *        namespaceURI,
                              SetClientStringProc SetClientString,
                              WXMP_Result * wResult );
 
 extern void
-WXMPMeta_DeleteNamespace_1 ( XMP_StringPtr namespaceURI,
+XMP_PUBLIC WXMPMeta_DeleteNamespace_1 ( XMP_StringPtr namespaceURI,
                              WXMP_Result * wResult );
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_GetProperty_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetProperty_1 ( XMPMetaRef       xmpRef,
                          XMP_StringPtr    schemaNS,
                          XMP_StringPtr    propName,
                          void *           propValue,
@@ -268,7 +268,7 @@ WXMPMeta_GetProperty_1 ( XMPMetaRef       xmpRef,
                          WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_GetArrayItem_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetArrayItem_1 ( XMPMetaRef       xmpRef,
                           XMP_StringPtr    schemaNS,
                           XMP_StringPtr    arrayName,
                           XMP_Index        itemIndex,
@@ -278,7 +278,7 @@ WXMPMeta_GetArrayItem_1 ( XMPMetaRef       xmpRef,
                           WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_GetStructField_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetStructField_1 ( XMPMetaRef       xmpRef,
                             XMP_StringPtr    schemaNS,
                             XMP_StringPtr    structName,
                             XMP_StringPtr    fieldNS,
@@ -289,7 +289,7 @@ WXMPMeta_GetStructField_1 ( XMPMetaRef       xmpRef,
                             WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_GetQualifier_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetQualifier_1 ( XMPMetaRef       xmpRef,
                           XMP_StringPtr    schemaNS,
                           XMP_StringPtr    propName,
                           XMP_StringPtr    qualNS,
@@ -302,7 +302,7 @@ WXMPMeta_GetQualifier_1 ( XMPMetaRef       xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_SetProperty_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetProperty_1 ( XMPMetaRef     xmpRef,
                          XMP_StringPtr  schemaNS,
                          XMP_StringPtr  propName,
                          XMP_StringPtr  propValue,
@@ -310,7 +310,7 @@ WXMPMeta_SetProperty_1 ( XMPMetaRef     xmpRef,
                          WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SetArrayItem_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetArrayItem_1 ( XMPMetaRef     xmpRef,
                           XMP_StringPtr  schemaNS,
                           XMP_StringPtr  arrayName,
                           XMP_Index      itemIndex,
@@ -319,7 +319,7 @@ WXMPMeta_SetArrayItem_1 ( XMPMetaRef     xmpRef,
                           WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_AppendArrayItem_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_AppendArrayItem_1 ( XMPMetaRef     xmpRef,
                              XMP_StringPtr  schemaNS,
                              XMP_StringPtr  arrayName,
                              XMP_OptionBits arrayOptions,
@@ -328,7 +328,7 @@ WXMPMeta_AppendArrayItem_1 ( XMPMetaRef     xmpRef,
                              WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SetStructField_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetStructField_1 ( XMPMetaRef     xmpRef,
                             XMP_StringPtr  schemaNS,
                             XMP_StringPtr  structName,
                             XMP_StringPtr  fieldNS,
@@ -338,7 +338,7 @@ WXMPMeta_SetStructField_1 ( XMPMetaRef     xmpRef,
                             WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SetQualifier_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetQualifier_1 ( XMPMetaRef     xmpRef,
                           XMP_StringPtr  schemaNS,
                           XMP_StringPtr  propName,
                           XMP_StringPtr  qualNS,
@@ -350,20 +350,20 @@ WXMPMeta_SetQualifier_1 ( XMPMetaRef     xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_DeleteProperty_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DeleteProperty_1 ( XMPMetaRef    xmpRef,
                             XMP_StringPtr schemaNS,
                             XMP_StringPtr propName,
                             WXMP_Result * wResult );
 
 extern void
-WXMPMeta_DeleteArrayItem_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DeleteArrayItem_1 ( XMPMetaRef    xmpRef,
                              XMP_StringPtr schemaNS,
                              XMP_StringPtr arrayName,
                              XMP_Index     itemIndex,
                              WXMP_Result * wResult );
 
 extern void
-WXMPMeta_DeleteStructField_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DeleteStructField_1 ( XMPMetaRef    xmpRef,
                                XMP_StringPtr schemaNS,
                                XMP_StringPtr structName,
                                XMP_StringPtr fieldNS,
@@ -371,7 +371,7 @@ WXMPMeta_DeleteStructField_1 ( XMPMetaRef    xmpRef,
                                WXMP_Result * wResult );
 
 extern void
-WXMPMeta_DeleteQualifier_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DeleteQualifier_1 ( XMPMetaRef    xmpRef,
                              XMP_StringPtr schemaNS,
                              XMP_StringPtr propName,
                              XMP_StringPtr qualNS,
@@ -381,20 +381,20 @@ WXMPMeta_DeleteQualifier_1 ( XMPMetaRef    xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_DoesPropertyExist_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DoesPropertyExist_1 ( XMPMetaRef    xmpRef,
                                XMP_StringPtr schemaNS,
                                XMP_StringPtr propName,
                                WXMP_Result * wResult ) /* const */ ;
 
 extern void
-WXMPMeta_DoesArrayItemExist_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DoesArrayItemExist_1 ( XMPMetaRef    xmpRef,
                                 XMP_StringPtr schemaNS,
                                 XMP_StringPtr arrayName,
                                 XMP_Index     itemIndex,
                                 WXMP_Result * wResult ) /* const */ ;
 
 extern void
-WXMPMeta_DoesStructFieldExist_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DoesStructFieldExist_1 ( XMPMetaRef    xmpRef,
                                   XMP_StringPtr schemaNS,
                                   XMP_StringPtr structName,
                                   XMP_StringPtr fieldNS,
@@ -402,7 +402,7 @@ WXMPMeta_DoesStructFieldExist_1 ( XMPMetaRef    xmpRef,
                                   WXMP_Result * wResult ) /* const */ ;
 
 extern void
-WXMPMeta_DoesQualifierExist_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_DoesQualifierExist_1 ( XMPMetaRef    xmpRef,
                                 XMP_StringPtr schemaNS,
                                 XMP_StringPtr propName,
                                 XMP_StringPtr qualNS,
@@ -412,7 +412,7 @@ WXMPMeta_DoesQualifierExist_1 ( XMPMetaRef    xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_GetLocalizedText_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetLocalizedText_1 ( XMPMetaRef       xmpRef,
                               XMP_StringPtr    schemaNS,
                               XMP_StringPtr    altTextName,
                               XMP_StringPtr    genericLang,
@@ -424,7 +424,7 @@ WXMPMeta_GetLocalizedText_1 ( XMPMetaRef       xmpRef,
                               WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_SetLocalizedText_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetLocalizedText_1 ( XMPMetaRef     xmpRef,
                               XMP_StringPtr  schemaNS,
                               XMP_StringPtr  altTextName,
                               XMP_StringPtr  genericLang,
@@ -434,7 +434,7 @@ WXMPMeta_SetLocalizedText_1 ( XMPMetaRef     xmpRef,
                               WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_DeleteLocalizedText_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_DeleteLocalizedText_1 ( XMPMetaRef       xmpRef,
                               XMP_StringPtr    schemaNS,
                               XMP_StringPtr    altTextName,
                               XMP_StringPtr    genericLang,
@@ -444,7 +444,7 @@ WXMPMeta_DeleteLocalizedText_1 ( XMPMetaRef       xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_GetProperty_Bool_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetProperty_Bool_1 ( XMPMetaRef       xmpRef,
                               XMP_StringPtr    schemaNS,
                               XMP_StringPtr    propName,
                               XMP_Bool *       propValue,
@@ -452,7 +452,7 @@ WXMPMeta_GetProperty_Bool_1 ( XMPMetaRef       xmpRef,
                               WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_GetProperty_Int_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetProperty_Int_1 ( XMPMetaRef       xmpRef,
                              XMP_StringPtr    schemaNS,
                              XMP_StringPtr    propName,
                              XMP_Int32 *      propValue,
@@ -460,7 +460,7 @@ WXMPMeta_GetProperty_Int_1 ( XMPMetaRef       xmpRef,
                              WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_GetProperty_Int64_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetProperty_Int64_1 ( XMPMetaRef       xmpRef,
                                XMP_StringPtr    schemaNS,
                                XMP_StringPtr    propName,
                                XMP_Int64 *      propValue,
@@ -468,7 +468,7 @@ WXMPMeta_GetProperty_Int64_1 ( XMPMetaRef       xmpRef,
                                WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_GetProperty_Float_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetProperty_Float_1 ( XMPMetaRef       xmpRef,
                                XMP_StringPtr    schemaNS,
                                XMP_StringPtr    propName,
                                double *         propValue,
@@ -476,7 +476,7 @@ WXMPMeta_GetProperty_Float_1 ( XMPMetaRef       xmpRef,
                                WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_GetProperty_Date_1 ( XMPMetaRef       xmpRef,
+XMP_PUBLIC WXMPMeta_GetProperty_Date_1 ( XMPMetaRef       xmpRef,
                               XMP_StringPtr    schemaNS,
                               XMP_StringPtr    propName,
                               XMP_DateTime *   propValue,
@@ -484,7 +484,7 @@ WXMPMeta_GetProperty_Date_1 ( XMPMetaRef       xmpRef,
                               WXMP_Result *    wResult ) /* const */ ;
 
 extern void
-WXMPMeta_SetProperty_Bool_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetProperty_Bool_1 ( XMPMetaRef     xmpRef,
                               XMP_StringPtr  schemaNS,
                               XMP_StringPtr  propName,
                               XMP_Bool       propValue,
@@ -492,7 +492,7 @@ WXMPMeta_SetProperty_Bool_1 ( XMPMetaRef     xmpRef,
                               WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SetProperty_Int_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetProperty_Int_1 ( XMPMetaRef     xmpRef,
                              XMP_StringPtr  schemaNS,
                              XMP_StringPtr  propName,
                              XMP_Int32      propValue,
@@ -500,7 +500,7 @@ WXMPMeta_SetProperty_Int_1 ( XMPMetaRef     xmpRef,
                              WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SetProperty_Int64_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetProperty_Int64_1 ( XMPMetaRef     xmpRef,
                                XMP_StringPtr  schemaNS,
                                XMP_StringPtr  propName,
                                XMP_Int64      propValue,
@@ -508,7 +508,7 @@ WXMPMeta_SetProperty_Int64_1 ( XMPMetaRef     xmpRef,
                                WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SetProperty_Float_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetProperty_Float_1 ( XMPMetaRef     xmpRef,
                                XMP_StringPtr  schemaNS,
                                XMP_StringPtr  propName,
                                double         propValue,
@@ -516,7 +516,7 @@ WXMPMeta_SetProperty_Float_1 ( XMPMetaRef     xmpRef,
                                WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SetProperty_Date_1 ( XMPMetaRef           xmpRef,
+XMP_PUBLIC WXMPMeta_SetProperty_Date_1 ( XMPMetaRef           xmpRef,
                               XMP_StringPtr        schemaNS,
                               XMP_StringPtr        propName,
                               const XMP_DateTime & propValue,
@@ -526,46 +526,46 @@ WXMPMeta_SetProperty_Date_1 ( XMPMetaRef           xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_GetObjectName_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_GetObjectName_1 ( XMPMetaRef    xmpRef,
                            void *        objName,
                            SetClientStringProc SetClientString,
                            WXMP_Result * wResult ) /* const */ ;
 
 extern void
-WXMPMeta_SetObjectName_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_SetObjectName_1 ( XMPMetaRef    xmpRef,
                            XMP_StringPtr name,
                            WXMP_Result * wResult );
 
 extern void
-WXMPMeta_GetObjectOptions_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_GetObjectOptions_1 ( XMPMetaRef    xmpRef,
                               WXMP_Result * wResult ) /* const */ ;
 
 extern void
-WXMPMeta_SetObjectOptions_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SetObjectOptions_1 ( XMPMetaRef     xmpRef,
                               XMP_OptionBits options,
                               WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_Sort_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_Sort_1 ( XMPMetaRef    xmpRef,
                   WXMP_Result * wResult );
 
 extern void
-WXMPMeta_Erase_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_Erase_1 ( XMPMetaRef    xmpRef,
                    WXMP_Result * wResult );
 
 extern void
-WXMPMeta_Clone_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_Clone_1 ( XMPMetaRef     xmpRef,
                    XMP_OptionBits options,
                    WXMP_Result *  wResult ) /* const */ ;
 
 extern void
-WXMPMeta_CountArrayItems_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_CountArrayItems_1 ( XMPMetaRef    xmpRef,
                              XMP_StringPtr schemaNS,
                              XMP_StringPtr arrayName,
                              WXMP_Result * wResult ) /* const */ ;
 
 extern void
-WXMPMeta_DumpObject_1 ( XMPMetaRef         xmpRef,
+XMP_PUBLIC WXMPMeta_DumpObject_1 ( XMPMetaRef         xmpRef,
                         XMP_TextOutputProc outProc,
                         void *             refCon,
                         WXMP_Result *      wResult ) /* const */ ;
@@ -573,14 +573,14 @@ WXMPMeta_DumpObject_1 ( XMPMetaRef         xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_ParseFromBuffer_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_ParseFromBuffer_1 ( XMPMetaRef     xmpRef,
                              XMP_StringPtr  buffer,
                              XMP_StringLen  bufferSize,
                              XMP_OptionBits options,
                              WXMP_Result *  wResult );
 
 extern void
-WXMPMeta_SerializeToBuffer_1 ( XMPMetaRef     xmpRef,
+XMP_PUBLIC WXMPMeta_SerializeToBuffer_1 ( XMPMetaRef     xmpRef,
                                void *         pktString,
                                XMP_OptionBits options,
                                XMP_StringLen  padding,
@@ -593,14 +593,14 @@ WXMPMeta_SerializeToBuffer_1 ( XMPMetaRef     xmpRef,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPMeta_SetDefaultErrorCallback_1 ( XMPMeta_ErrorCallbackWrapper wrapperProc,
+XMP_PUBLIC WXMPMeta_SetDefaultErrorCallback_1 ( XMPMeta_ErrorCallbackWrapper wrapperProc,
 									 XMPMeta_ErrorCallbackProc    clientProc,
 									 void *        context,
 									 XMP_Uns32     limit,
                    					 WXMP_Result * wResult );
 
 extern void
-WXMPMeta_SetErrorCallback_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_SetErrorCallback_1 ( XMPMetaRef    xmpRef,
                               XMPMeta_ErrorCallbackWrapper wrapperProc,
 							  XMPMeta_ErrorCallbackProc    clientProc,
 							  void *        context,
@@ -608,7 +608,7 @@ WXMPMeta_SetErrorCallback_1 ( XMPMetaRef    xmpRef,
 							  WXMP_Result * wResult );
 
 extern void
-WXMPMeta_ResetErrorCallbackLimit_1 ( XMPMetaRef    xmpRef,
+XMP_PUBLIC WXMPMeta_ResetErrorCallbackLimit_1 ( XMPMetaRef    xmpRef,
 							  		 XMP_Uns32     limit,
 							  		 WXMP_Result * wResult );
 
diff --git a/public/include/client-glue/WXMPUtils.hpp b/public/include/client-glue/WXMPUtils.hpp
index fb4e042..3c96b83 100644
--- a/public/include/client-glue/WXMPUtils.hpp
+++ b/public/include/client-glue/WXMPUtils.hpp
@@ -107,7 +107,7 @@ extern "C" {
 // =================================================================================================
 
 extern void
-WXMPUtils_ComposeArrayItemPath_1 ( XMP_StringPtr   schemaNS,
+XMP_PUBLIC WXMPUtils_ComposeArrayItemPath_1 ( XMP_StringPtr   schemaNS,
                                    XMP_StringPtr   arrayName,
                                    XMP_Index       itemIndex,
                                    void *          itemPath,
@@ -115,7 +115,7 @@ WXMPUtils_ComposeArrayItemPath_1 ( XMP_StringPtr   schemaNS,
                                    WXMP_Result *   wResult );
 
 extern void
-WXMPUtils_ComposeStructFieldPath_1 ( XMP_StringPtr   schemaNS,
+XMP_PUBLIC WXMPUtils_ComposeStructFieldPath_1 ( XMP_StringPtr   schemaNS,
                                      XMP_StringPtr   structName,
                                      XMP_StringPtr   fieldNS,
                                      XMP_StringPtr   fieldName,
@@ -124,7 +124,7 @@ WXMPUtils_ComposeStructFieldPath_1 ( XMP_StringPtr   schemaNS,
                                      WXMP_Result *   wResult );
 
 extern void
-WXMPUtils_ComposeQualifierPath_1 ( XMP_StringPtr   schemaNS,
+XMP_PUBLIC WXMPUtils_ComposeQualifierPath_1 ( XMP_StringPtr   schemaNS,
                                    XMP_StringPtr   propName,
                                    XMP_StringPtr   qualNS,
                                    XMP_StringPtr   qualName,
@@ -133,7 +133,7 @@ WXMPUtils_ComposeQualifierPath_1 ( XMP_StringPtr   schemaNS,
                                    WXMP_Result *   wResult );
 
 extern void
-WXMPUtils_ComposeLangSelector_1 ( XMP_StringPtr   schemaNS,
+XMP_PUBLIC WXMPUtils_ComposeLangSelector_1 ( XMP_StringPtr   schemaNS,
                                   XMP_StringPtr   arrayName,
                                   XMP_StringPtr   langName,
                                   void *          selPath,
@@ -141,7 +141,7 @@ WXMPUtils_ComposeLangSelector_1 ( XMP_StringPtr   schemaNS,
                                   WXMP_Result *   wResult );
 
 extern void
-WXMPUtils_ComposeFieldSelector_1 ( XMP_StringPtr   schemaNS,
+XMP_PUBLIC WXMPUtils_ComposeFieldSelector_1 ( XMP_StringPtr   schemaNS,
                                    XMP_StringPtr   arrayName,
                                    XMP_StringPtr   fieldNS,
                                    XMP_StringPtr   fieldName,
@@ -153,34 +153,34 @@ WXMPUtils_ComposeFieldSelector_1 ( XMP_StringPtr   schemaNS,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPUtils_ConvertFromBool_1 ( XMP_Bool      binValue,
+XMP_PUBLIC WXMPUtils_ConvertFromBool_1 ( XMP_Bool      binValue,
                               void *        strValue,
                               SetClientStringProc SetClientString,
                               WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertFromInt_1 ( XMP_Int32     binValue,
+XMP_PUBLIC WXMPUtils_ConvertFromInt_1 ( XMP_Int32     binValue,
                              XMP_StringPtr format,
                              void *        strValue,
                              SetClientStringProc SetClientString,
                              WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertFromInt64_1 ( XMP_Int64     binValue,
+XMP_PUBLIC WXMPUtils_ConvertFromInt64_1 ( XMP_Int64     binValue,
                                XMP_StringPtr format,
                                void *        strValue,
                                SetClientStringProc SetClientString,
                                WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertFromFloat_1 ( double        binValue,
+XMP_PUBLIC WXMPUtils_ConvertFromFloat_1 ( double        binValue,
                                XMP_StringPtr format,
                                void *        strValue,
                                SetClientStringProc SetClientString,
                                WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertFromDate_1 ( const XMP_DateTime & binValue,
+XMP_PUBLIC WXMPUtils_ConvertFromDate_1 ( const XMP_DateTime & binValue,
                               void *               strValue,
                               SetClientStringProc SetClientString,
                               WXMP_Result *        wResult );
@@ -188,60 +188,60 @@ WXMPUtils_ConvertFromDate_1 ( const XMP_DateTime & binValue,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPUtils_ConvertToBool_1 ( XMP_StringPtr strValue,
+XMP_PUBLIC WXMPUtils_ConvertToBool_1 ( XMP_StringPtr strValue,
                             WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertToInt_1 ( XMP_StringPtr strValue,
+XMP_PUBLIC WXMPUtils_ConvertToInt_1 ( XMP_StringPtr strValue,
                            WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertToInt64_1 ( XMP_StringPtr strValue,
+XMP_PUBLIC WXMPUtils_ConvertToInt64_1 ( XMP_StringPtr strValue,
                              WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertToFloat_1 ( XMP_StringPtr strValue,
+XMP_PUBLIC WXMPUtils_ConvertToFloat_1 ( XMP_StringPtr strValue,
                              WXMP_Result * wResult );
 
 extern void
-WXMPUtils_ConvertToDate_1 ( XMP_StringPtr  strValue,
+XMP_PUBLIC WXMPUtils_ConvertToDate_1 ( XMP_StringPtr  strValue,
                             XMP_DateTime * binValue,
                             WXMP_Result *  wResult );
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPUtils_CurrentDateTime_1 ( XMP_DateTime * time,
+XMP_PUBLIC WXMPUtils_CurrentDateTime_1 ( XMP_DateTime * time,
                               WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_SetTimeZone_1 ( XMP_DateTime * time,
+XMP_PUBLIC WXMPUtils_SetTimeZone_1 ( XMP_DateTime * time,
                           WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_ConvertToUTCTime_1 ( XMP_DateTime * time,
+XMP_PUBLIC WXMPUtils_ConvertToUTCTime_1 ( XMP_DateTime * time,
                                WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_ConvertToLocalTime_1 ( XMP_DateTime * time,
+XMP_PUBLIC WXMPUtils_ConvertToLocalTime_1 ( XMP_DateTime * time,
                                  WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_CompareDateTime_1 ( const XMP_DateTime & left,
+XMP_PUBLIC WXMPUtils_CompareDateTime_1 ( const XMP_DateTime & left,
                               const XMP_DateTime & right,
                               WXMP_Result *        wResult );
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPUtils_EncodeToBase64_1 ( XMP_StringPtr rawStr,
+XMP_PUBLIC WXMPUtils_EncodeToBase64_1 ( XMP_StringPtr rawStr,
                              XMP_StringLen rawLen,
                              void *        encodedStr,
                              SetClientStringProc SetClientString,
                              WXMP_Result * wResult );
 
 extern void
-WXMPUtils_DecodeFromBase64_1 ( XMP_StringPtr encodedStr,
+XMP_PUBLIC WXMPUtils_DecodeFromBase64_1 ( XMP_StringPtr encodedStr,
                                XMP_StringLen encodedLen,
                                void *        rawStr,
                                SetClientStringProc SetClientString,
@@ -250,7 +250,7 @@ WXMPUtils_DecodeFromBase64_1 ( XMP_StringPtr encodedStr,
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPUtils_PackageForJPEG_1 ( XMPMetaRef    xmpObj,
+XMP_PUBLIC WXMPUtils_PackageForJPEG_1 ( XMPMetaRef    xmpObj,
                              void *        stdStr,
                              void *        extStr,
                              void *        digestStr,
@@ -258,14 +258,14 @@ WXMPUtils_PackageForJPEG_1 ( XMPMetaRef    xmpObj,
                              WXMP_Result * wResult );
 
 extern void
-WXMPUtils_MergeFromJPEG_1 ( XMPMetaRef    fullXMP,
+XMP_PUBLIC WXMPUtils_MergeFromJPEG_1 ( XMPMetaRef    fullXMP,
                             XMPMetaRef    extendedXMP,
                             WXMP_Result * wResult );
 
 // -------------------------------------------------------------------------------------------------
 
 extern void
-WXMPUtils_CatenateArrayItems_1 ( XMPMetaRef     xmpObj,
+XMP_PUBLIC WXMPUtils_CatenateArrayItems_1 ( XMPMetaRef     xmpObj,
                                  XMP_StringPtr  schemaNS,
                                  XMP_StringPtr  arrayName,
                                  XMP_StringPtr  separator,
@@ -276,7 +276,7 @@ WXMPUtils_CatenateArrayItems_1 ( XMPMetaRef     xmpObj,
                                  WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_SeparateArrayItems_1 ( XMPMetaRef     xmpObj,
+XMP_PUBLIC WXMPUtils_SeparateArrayItems_1 ( XMPMetaRef     xmpObj,
                                  XMP_StringPtr  schemaNS,
                                  XMP_StringPtr  arrayName,
                                  XMP_OptionBits options,
@@ -284,20 +284,20 @@ WXMPUtils_SeparateArrayItems_1 ( XMPMetaRef     xmpObj,
                                  WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_ApplyTemplate_1 ( XMPMetaRef     workingXMP,
+XMP_PUBLIC WXMPUtils_ApplyTemplate_1 ( XMPMetaRef     workingXMP,
 							XMPMetaRef     templateXMP,
 							XMP_OptionBits options,
 							WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_RemoveProperties_1 ( XMPMetaRef     xmpObj,
+XMP_PUBLIC WXMPUtils_RemoveProperties_1 ( XMPMetaRef     xmpObj,
                                XMP_StringPtr  schemaNS,
                                XMP_StringPtr  propName,
                                XMP_OptionBits options,
                                WXMP_Result *  wResult );
 
 extern void
-WXMPUtils_DuplicateSubtree_1 ( XMPMetaRef     source,
+XMP_PUBLIC WXMPUtils_DuplicateSubtree_1 ( XMPMetaRef     source,
                                XMPMetaRef     dest,
                                XMP_StringPtr  sourceNS,
                                XMP_StringPtr  sourceRoot,
diff --git a/public/include/client-glue/WXMP_Common.hpp b/public/include/client-glue/WXMP_Common.hpp
index abc3ccb..97fb9fc 100644
--- a/public/include/client-glue/WXMP_Common.hpp
+++ b/public/include/client-glue/WXMP_Common.hpp
@@ -29,7 +29,7 @@ struct WXMP_Result {
     double        floatResult;
     XMP_Uns64     int64Result;
     XMP_Uns32     int32Result;
-    WXMP_Result() : errMessage(0) {};
+	WXMP_Result() : errMessage(0),ptrResult(NULL),floatResult(0),int64Result(0),int32Result(0){};
 };
 
 #if __cplusplus