upgrade to XMP-SDK 4.4.2

author: Hubert Figuiere <hub@figuiere.net> 2008-11-17 23:42:00 -0500
committer: Hubert Figuiere <hub@figuiere.net> 2008-11-17 23:42:00 -0500
commit: 88af812fde414aca8f9add90bc800ea3d8e9a281 (patch)
tree: 0403dd1897c0b287d4d710dd422827683c59dfcb /samples
parent: 9d7d7c3caac05db240692ad7e9196fcb7f5a1ce5 (diff)
63 files changed, 16661 insertions, 1998 deletions
diff --git a/samples/build/gcc/XMPSamples.mak b/samples/build/gcc3.2/XMPSamples.mak
index e1aaf0f..d4ca09b 100644
--- a/samples/build/gcc/XMPSamples.mak
+++ b/samples/build/gcc3.2/XMPSamples.mak
@@ -1,12 +1,11 @@
-# ==================================================================================================
-# Copyright 2002-2004 Adobe Systems Incorporated
+# ##########################################################################################
+# Copyright 2008 Adobe Systems Incorporated
 # All Rights Reserved.
 #
-# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# ==================================================================================================
-
-# ==================================================================================================
+# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with
+# the terms of the Adobe license agreement accompanying it.
+#
+# ##########################################################################################
 
 # Define internal use variables.
 
@@ -22,6 +21,11 @@ ifeq "${Sample}" ""
 	Error += The sample name must be provided
 endif
 
+# case tolerance
+ifeq "${Sample}" "dumpfile"
+	Sample = dumpfile/main
+endif
+
 TargetOS = ${OS}
 
 ifeq "${TargetOS}" ""
@@ -78,11 +82,12 @@ BuildRoot  = ../..
 TargetRoot = ${BuildRoot}/target/${TargetOS}/${TargetStage}
 TempRoot   = ${BuildRoot}/intermediate/${TargetOS}/${TargetStage}
 
+# NB: this is SDKRoot to be exakt
 XMPRoot    = ${BuildRoot}/..
 
 LibXMP = ${XMPRoot}/public/libraries/${TargetOS}/${TargetStage}/libXMPCore${LibSuffix}.a
 
-# ==================================================================================================
+################################################################################################
 
 CC  = gcc
 CPP = gcc -x c++
@@ -96,29 +101,42 @@ LDLibs  =  ${LibXMP} -Xlinker -R -Xlinker .
 LDLibs  += -lc -lm -lpthread -lstdc++
 
 ifeq "${TargetOS}" "i80386linux"
-	CFlags += -mcpu=i686
+	CPPFlags += -D__LITTLE_ENDIAN__=1
 	LDLibs += -lgcc_eh
 endif
 ifeq "${TargetOS}" "sparcsolaris"
-	CFlags += -mtune=ultrasparc
+	CPPFlags += -mtune=ultrasparc -D__BIG_ENDIAN__=1
 endif
 
 ifeq "${TargetStage}" "debug"
-	CFlags += -g -O0 -DDEBUG=1 -D_DEBUG=1
+	CPPFlags += -g -O0 -DDEBUG=1 -D_DEBUG=1
 endif
 ifeq "${TargetStage}" "release"
-	CFlags += -O2 -Os -DNDEBUG=1
+	CPPFlags += -O2 -Os -DNDEBUG=1
 endif
 
-# ==================================================================================================
+################################################################################################
 
 vpath %.cpp\
-    ${BuildRoot}/source:
+    ${BuildRoot}/source: \
+    ${BuildRoot}/source/common:\
+    ${XMPRoot}/source/common:
 
 Includes = \
-   -I${XMPRoot}/public/include
-
-# ==================================================================================================
+   -I${XMPRoot}/public/include \
+   -I${XMPRoot}/samples/source/common \
+   -I${XMPRoot}/source/common
+
+DumfileCommonObj = \
+	${TempRoot}/QELog.o \
+	${TempRoot}/QETagTree.o \
+	${TempRoot}/QEMemLeak.o \
+	${TempRoot}/QEDumpFile.o \
+	${TempRoot}/QEBuginese.o \
+	${TempRoot}/LargeFileAccess.o \
+	${TempRoot}/QEScanner.o
+	
+################################################################################################
 
 ${TempRoot}/%.o : %.c
 	@echo ""
@@ -130,12 +148,19 @@ ${TempRoot}/%.o : %.cpp
 	@echo "Compiling $<"
 	${CPP} ${CPPFlags} ${Includes} -c $< -o $@
 
-${TargetRoot}/% : ${TempRoot}/%.o ${TempRoot}/XMPScanner.o
+ifeq "${Sample}" "dumpfile/main"
+${TargetRoot}/% :${TempRoot}/%.o ${DumfileCommonObj}
 	@echo ""
+	@echo "Linking ${TargetRoot}/dumpfile"
+	${LD} ${LDFlags} $< ${DumfileCommonObj}  ${LDLibs} -o ${TargetRoot}/dumpfile
+else
+${TargetRoot}/% :${TempRoot}/%.o ${TempRoot}/XMPScanner.o
 	@echo "Linking $@"
 	${LD} ${LDFlags} $< ${TempRoot}/XMPScanner.o ${LDLibs} -o $@
+endif
+	
 
-# ==================================================================================================
+################################################################################################
 
 Sample : Sample_ann msg create_dirs ${TargetRoot}/${Sample}
 	@echo ""
@@ -145,7 +170,6 @@ ifeq "${Error}" ""
 	@echo ""
 	@echo Building XMP sample ${Sample} for ${TargetOS} ${TargetStage}
 endif
-	rm -f ${TargetRoot}/${Sample}
 
 msg :
 ifneq "${Error}" ""
@@ -158,11 +182,11 @@ ifneq "${Error}" ""
 	@echo "#   os    = i80386linux | sparcsolaris"
 	@echo "#   stage = debug | release"
 	@echo "#"
-	@echo "# The name argument is the "simple name" of the sample, e.g."
-	@echo "# XMPCoverage or DumpXMP."
+
+	@echo "# The name argument is the "simple name" of the sample:"
+	@echo "# XMPCoreCoverage, CustomSchema or DumpScannedXMP."
 	@echo "#"
-	@echo "# The os and stage arguments can also be uppercase, OS and STAGE."
-	@echo "# If the OS is omitted it will try to default from the OSTYPE and"
+	@echo "# If the os is omitted it will try to default from the OSTYPE and"
 	@echo "# MACHTYPE environment variables. If the stage is omitted it"
 	@echo "# defaults to debug."
 	@echo ""
@@ -171,8 +195,16 @@ endif
 
 create_dirs :
 	mkdir -p ${TempRoot}
+	mkdir -p ${TempRoot}/dumpfile
 	mkdir -p ${TargetRoot}
-
+	
 .PHONY : clean
+
 clean : msg
-	rm -f ${TempRoot}/* ${TargetRoot}/*
+	# just to be extra safe:
+	ifneq "${TempRoot}" ""
+	ifneq "${TargetRoot}" ""
+		rm -rf ${TempRoot}/*
+	endif
+	endif
+
diff --git a/samples/build/vsnet/DumpMainXMP.vcproj b/samples/build/vsnet/DumpMainXMP.vcproj
deleted file mode 100644
index d8e3afd..0000000
--- a/samples/build/vsnet/DumpMainXMP.vcproj
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="DumpMainXMP (static)"
-	ProjectGUID="{9C52F46F-E90C-4FE9-83C5-A2C194C91B54}"
-	RootNamespace="DumpMainXMP"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../target/windows/debug"
-			IntermediateDirectory="../../intermediate/windows/debug"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			BuildLogFile="$(IntDir)\BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\source;..\..\..\public\include\"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/debug/"
-				ProgramDataBaseFileName="../../intermediate/windows/debug/"
-				XMLDocumentationFileName="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
-				OutputFile="$(OutDir)/DumpMainXMP.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/debug/"
-				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../target/windows/release"
-			IntermediateDirectory="../../intermediate/windows/release"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\..\source;..\..\..\public\include\"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="0"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/release/"
-				ProgramDataBaseFileName="../../intermediate/windows/release/"
-				WarningLevel="4"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
-				OutputFile="$(OutDir)/DumpMainXMP.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/release/"
-				GenerateDebugInformation="false"
-				AssemblyDebug="0"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\source\DumpMainXMP.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPFiles.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPIterator.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPMeta.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPUtils.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP.incl_cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP_Const.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP_Environment.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP_Version.h"
-				>
-			</File>
-			<Filter
-				Name="Client Glue"
-				>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMP_Common.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPFiles.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPIterator.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPMeta.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPUtils.hpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/samples/build/vsnet/DumpScannedXMP.vcproj b/samples/build/vsnet/DumpScannedXMP.vcproj
deleted file mode 100644
index 9759e2f..0000000
--- a/samples/build/vsnet/DumpScannedXMP.vcproj
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="DumpScannedXMP"
-	ProjectGUID="{5E467275-083F-4C6E-8645-EC3CCA70E3DE}"
-	RootNamespace="DumpScannedXMP"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../target/windows/debug"
-			IntermediateDirectory="../../intermediate/windows/debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../public/include/"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="1"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="1"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/debug/"
-				ProgramDataBaseFileName="../../intermediate/windows/debug/"
-				WarningLevel="4"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticDebug.lib"
-				OutputFile="$(OutDir)/DumpScannedXMP.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/debug/"
-				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../target/windows/release"
-			IntermediateDirectory="../../intermediate/windows/release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../../../public/include/;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="0"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/release/"
-				ProgramDataBaseFileName="../../intermediate/windows/release/"
-				WarningLevel="4"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticRelease.lib"
-				OutputFile="$(OutDir)/DumpScannedXMP.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/release/"
-				GenerateDebugInformation="false"
-				AssemblyDebug="0"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\source\DumpScannedXMP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\source\XMPScanner.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/samples/build/vsnet/XMPCoreCoverage.vcproj b/samples/build/vsnet/XMPCoreCoverage.vcproj
deleted file mode 100644
index b794bd3..0000000
--- a/samples/build/vsnet/XMPCoreCoverage.vcproj
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="XMPCoreCoverage"
-	ProjectGUID="{6E63FCD8-1D1B-41E6-85CB-79EE9E95E89E}"
-	RootNamespace="XMPCoreCoverage"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../target/windows/debug"
-			IntermediateDirectory="../../intermediate/windows/debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../public/include/"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="1"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="1"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/debug/"
-				ProgramDataBaseFileName="../../intermediate/windows/debug/"
-				WarningLevel="4"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticDebug.lib"
-				OutputFile="$(OutDir)/XMPCoreCoverage.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/debug/"
-				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../target/windows/release"
-			IntermediateDirectory="../../intermediate/windows/release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../../../public/include/;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="0"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/release/"
-				ProgramDataBaseFileName="../../intermediate/windows/release/"
-				WarningLevel="4"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticRelease.lib"
-				OutputFile="$(OutDir)/XMPCoreCoverage.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/release/"
-				GenerateDebugInformation="false"
-				AssemblyDebug="0"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\source\XMPCoreCoverage.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/samples/build/vsnet/XMPFilesCoverage.vcproj b/samples/build/vsnet/XMPFilesCoverage.vcproj
deleted file mode 100644
index 412f4ef..0000000
--- a/samples/build/vsnet/XMPFilesCoverage.vcproj
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="XMPFilesCoverage"
-	ProjectGUID="{7179F7FA-1A10-4B1C-9E99-8F8B20E51C7C}"
-	RootNamespace="XMPFilesCoverage"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../target/windows/debug"
-			IntermediateDirectory="../../intermediate/windows/debug"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			BuildLogFile="$(IntDir)\BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\public\include\"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/debug/"
-				ProgramDataBaseFileName="../../intermediate/windows/debug/"
-				XMLDocumentationFileName="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
-				OutputFile="$(OutDir)/XMPFilesCoverage.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/debug/"
-				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xcopy /d /i /y ..\..\BlueSquares\*.* ..\..\target\windows\debug\BlueSquares&#x0D;&#x0A;attrib -R ..\..\target\windows\debug\BlueSquares\*.*&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../target/windows/release"
-			IntermediateDirectory="../../intermediate/windows/release"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\..\..\public\include\"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="0"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="../../intermediate/windows/release/"
-				ProgramDataBaseFileName="../../intermediate/windows/release/"
-				WarningLevel="4"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
-				OutputFile="$(OutDir)/XMPFilesCoverage.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../public/libraries/windows/release/"
-				GenerateDebugInformation="false"
-				AssemblyDebug="0"
-				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="0"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xcopy /d /i /y ..\..\BlueSquares\*.* ..\..\target\windows\release\BlueSquares&#x0D;&#x0A;attrib -R ..\..\target\windows\release\BlueSquares\*.*&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\source\XMPFilesCoverage.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPFiles.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPIterator.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPMeta.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\TXMPUtils.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP.incl_cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP_Const.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP_Environment.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\public\include\XMP_Version.h"
-				>
-			</File>
-			<Filter
-				Name="Client Glue"
-				>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMP_Common.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPFiles.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPIterator.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPMeta.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\..\public\include\client-glue\WXMPUtils.hpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Build Files"
-			>
-			<File
-				RelativePath="CopyFiles.bat"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/samples/build/vsnet/XMPSamples.sln b/samples/build/vsnet/XMPSamples.sln
deleted file mode 100644
index a4c318a..0000000
--- a/samples/build/vsnet/XMPSamples.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPCoreCoverage", "XMPCoreCoverage.vcproj", "{6E63FCD8-1D1B-41E6-85CB-79EE9E95E89E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpScannedXMP", "DumpScannedXMP.vcproj", "{5E467275-083F-4C6E-8645-EC3CCA70E3DE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPFilesCoverage", "XMPFilesCoverage.vcproj", "{7179F7FA-1A10-4B1C-9E99-8F8B20E51C7C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpMainXMP (static)", "DumpMainXMP.vcproj", "{9C52F46F-E90C-4FE9-83C5-A2C194C91B54}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6E63FCD8-1D1B-41E6-85CB-79EE9E95E89E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6E63FCD8-1D1B-41E6-85CB-79EE9E95E89E}.Debug|Win32.Build.0 = Debug|Win32
-		{6E63FCD8-1D1B-41E6-85CB-79EE9E95E89E}.Release|Win32.ActiveCfg = Release|Win32
-		{6E63FCD8-1D1B-41E6-85CB-79EE9E95E89E}.Release|Win32.Build.0 = Release|Win32
-		{5E467275-083F-4C6E-8645-EC3CCA70E3DE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E467275-083F-4C6E-8645-EC3CCA70E3DE}.Debug|Win32.Build.0 = Debug|Win32
-		{5E467275-083F-4C6E-8645-EC3CCA70E3DE}.Release|Win32.ActiveCfg = Release|Win32
-		{5E467275-083F-4C6E-8645-EC3CCA70E3DE}.Release|Win32.Build.0 = Release|Win32
-		{7179F7FA-1A10-4B1C-9E99-8F8B20E51C7C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7179F7FA-1A10-4B1C-9E99-8F8B20E51C7C}.Debug|Win32.Build.0 = Debug|Win32
-		{7179F7FA-1A10-4B1C-9E99-8F8B20E51C7C}.Release|Win32.ActiveCfg = Release|Win32
-		{7179F7FA-1A10-4B1C-9E99-8F8B20E51C7C}.Release|Win32.Build.0 = Release|Win32
-		{9C52F46F-E90C-4FE9-83C5-A2C194C91B54}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9C52F46F-E90C-4FE9-83C5-A2C194C91B54}.Debug|Win32.Build.0 = Debug|Win32
-		{9C52F46F-E90C-4FE9-83C5-A2C194C91B54}.Release|Win32.ActiveCfg = Release|Win32
-		{9C52F46F-E90C-4FE9-83C5-A2C194C91B54}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/samples/build/vsnet8/CustomSchema.vcproj b/samples/build/vsnet8/CustomSchema.vcproj
new file mode 100755
index 0000000..c0651fa
--- /dev/null
+++ b/samples/build/vsnet8/CustomSchema.vcproj
@@ -0,0 +1,474 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="CustomSchema"
+	ProjectGUID="{90F628F9-A5B0-4E73-8371-B3BF03A414AF}"
+	RootNamespace="CustomSchema"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\CustomSchema.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/DumpFile.vcproj b/samples/build/vsnet8/DumpFile.vcproj
new file mode 100755
index 0000000..719ef35
--- /dev/null
+++ b/samples/build/vsnet8/DumpFile.vcproj
@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="DumpFile"
+	ProjectGUID="{E724653D-062D-4191-99BF-6A596DC7ACCC}"
+	RootNamespace="DumpFile"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\source\common;..\..\..\public\include;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)\dumpfile.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\source\common;..\..\..\public\include;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)\dumpfile.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\source\common;..\..\..\public\include;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)\dumpfile.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\source\common;..\..\..\public\include;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)\dumpfile.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\dumpfile\main.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Common Source"
+			>
+			<File
+				RelativePath="..\..\source\common\DumpFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\common\EndianUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\common\globals.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\common\LargeFileAccess.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\source\common\LargeFileAccess.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\common\Log.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\common\OutputUtils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\common\QEScanner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\common\TagTree.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/DumpMainXMP.vcproj b/samples/build/vsnet8/DumpMainXMP.vcproj
new file mode 100755
index 0000000..4e0e040
--- /dev/null
+++ b/samples/build/vsnet8/DumpMainXMP.vcproj
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="DumpMainXMP"
+	ProjectGUID="{90F628F9-A5B0-4E73-8371-B3B483A415CF}"
+	RootNamespace="DumpMainXMP"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\DumpMainXMP.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/DumpScannedXMP.vcproj b/samples/build/vsnet8/DumpScannedXMP.vcproj
new file mode 100755
index 0000000..fbd90d8
--- /dev/null
+++ b/samples/build/vsnet8/DumpScannedXMP.vcproj
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="DumpScannedXMP"
+	ProjectGUID="{90F628F9-A5B0-4E73-8471-F2F683C815CF}"
+	RootNamespace="DumpScannedXMP"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\DumpScannedXMP.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/ModifyingXMP.vcproj b/samples/build/vsnet8/ModifyingXMP.vcproj
new file mode 100755
index 0000000..2d95772
--- /dev/null
+++ b/samples/build/vsnet8/ModifyingXMP.vcproj
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="ModifyingXMP"
+	ProjectGUID="{90F628F9-A5B0-4E73-8371-BAC387452322}"
+	RootNamespace="ModifyingXMP"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\ModifyingXMP.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/ReadingXMP.vcproj b/samples/build/vsnet8/ReadingXMP.vcproj
new file mode 100755
index 0000000..af15d7f
--- /dev/null
+++ b/samples/build/vsnet8/ReadingXMP.vcproj
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="ReadingXMP"
+	ProjectGUID="{90F628F9-A5B0-4E73-8371-ABD427489422}"
+	RootNamespace="ReadingXMP"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\ReadingXMP.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/XMP-Toolkit-SDK-Samples.sln b/samples/build/vsnet8/XMP-Toolkit-SDK-Samples.sln
new file mode 100644
index 0000000..b9f5b98
--- /dev/null
+++ b/samples/build/vsnet8/XMP-Toolkit-SDK-Samples.sln
@@ -0,0 +1,115 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CustomSchema", "CustomSchema.vcproj", "{90F628F9-A5B0-4E73-8371-B3BF03A414AF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpFile", "DumpFile.vcproj", "{E724653D-062D-4191-99BF-6A596DC7ACCC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpMainXMP", "DumpMainXMP.vcproj", "{90F628F9-A5B0-4E73-8371-B3B483A415CF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModifyingXMP", "ModifyingXMP.vcproj", "{90F628F9-A5B0-4E73-8371-BAC387452322}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpScannedXMP", "DumpScannedXMP.vcproj", "{90F628F9-A5B0-4E73-8471-F2F683C815CF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReadingXMP", "ReadingXMP.vcproj", "{90F628F9-A5B0-4E73-8371-ABD427489422}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPIterations", "XMPIterations.vcproj", "{90F628F9-A5B0-4E74-8482-ADD423479422}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPCoreCoverage", "XMPCoreCoverage.vcproj", "{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPFilesCoverage", "XMPFilesCoverage.vcproj", "{90F628F9-A5B1-4E88-8482-ADD45111AAA2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPCommand", "XMPCommand.vcproj", "{90F628F9-A5B1-4E73-8371-B3B6723F112F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B0-4E73-8371-B3BF03A414AF}.Release|x64.Build.0 = Release|x64
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Debug|Win32.Build.0 = Debug|Win32
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Debug|x64.ActiveCfg = Debug|x64
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Debug|x64.Build.0 = Debug|x64
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Release|Win32.ActiveCfg = Release|Win32
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Release|Win32.Build.0 = Release|Win32
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Release|x64.ActiveCfg = Release|x64
+		{E724653D-062D-4191-99BF-6A596DC7ACCC}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B0-4E73-8371-B3B483A415CF}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B0-4E73-8371-BAC387452322}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B0-4E73-8471-F2F683C815CF}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B0-4E73-8371-ABD427489422}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B0-4E74-8482-ADD423479422}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B1-4E88-8482-ADD45111AAA2}.Release|x64.Build.0 = Release|x64
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Debug|Win32.Build.0 = Debug|Win32
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Debug|x64.ActiveCfg = Debug|x64
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Debug|x64.Build.0 = Debug|x64
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Release|Win32.ActiveCfg = Release|Win32
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Release|Win32.Build.0 = Release|Win32
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Release|x64.ActiveCfg = Release|x64
+		{90F628F9-A5B1-4E73-8371-B3B6723F112F}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/build/vsnet8/XMPCommand.vcproj b/samples/build/vsnet8/XMPCommand.vcproj
new file mode 100755
index 0000000..b447de5
--- /dev/null
+++ b/samples/build/vsnet8/XMPCommand.vcproj
@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="XMPCommand"
+	ProjectGUID="{90F628F9-A5B1-4E73-8371-B3B6723F112F}"
+	RootNamespace="XMPCommand"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include;..\..\source\xmpcommand;..\..\source\common;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)\xmpcommand.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include;..\..\source\xmpcommand;..\..\source\common;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)\xmpcommand.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include;..\..\source\xmpcommand;..\..\source\common;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)\xmpcommand.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include;..\..\source\xmpcommand;..\..\source\common;..\..\..\source\common"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)\xmpcommand.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<Filter
+				Name="xmpcommand"
+				>
+				<File
+					RelativePath="..\..\source\xmpcommand\Actions.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\xmpcommand\Actions.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\xmpcommand\main.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\xmpcommand\PrintUsage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\xmpcommand\PrintUsage.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\source\common\DumpFile.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\DumpFile.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\globals.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\Log.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\Log.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\OutputUtils.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\OutputUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\QEScanner.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\QEScanner.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\TagTree.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\source\common\TagTree.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/XMPCoreCoverage.vcproj b/samples/build/vsnet8/XMPCoreCoverage.vcproj
new file mode 100755
index 0000000..a0e613d
--- /dev/null
+++ b/samples/build/vsnet8/XMPCoreCoverage.vcproj
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="XMPCoreCoverage"
+	ProjectGUID="{90F628F9-A5B0-4E74-8562-AD256FFAC0A2}"
+	RootNamespace="XMPCoreCoverage"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\XMPCoreCoverage.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/XMPFilesCoverage.vcproj b/samples/build/vsnet8/XMPFilesCoverage.vcproj
new file mode 100755
index 0000000..4e082ce
--- /dev/null
+++ b/samples/build/vsnet8/XMPFilesCoverage.vcproj
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="XMPFilesCoverage"
+	ProjectGUID="{90F628F9-A5B1-4E88-8482-ADD45111AAA2}"
+	RootNamespace="XMPFilesCoverage"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\XMPFilesCoverage.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/vsnet8/XMPIterations.vcproj b/samples/build/vsnet8/XMPIterations.vcproj
new file mode 100755
index 0000000..376af09
--- /dev/null
+++ b/samples/build/vsnet8/XMPIterations.vcproj
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="XMPIterations"
+	ProjectGUID="{90F628F9-A5B0-4E74-8482-ADD423479422}"
+	RootNamespace="XMPIterations"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\target\windows\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\target\windows_x64\debug\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticDebug.lib XMPFilesStaticDebug.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\debug"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\target\windows\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib $(NOINHERIT)"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../../public/libraries/windows/release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\target\windows_x64\release\"
+			IntermediateDirectory="..\..\intermediate\$(ProjectName)\windows_x64\$(ConfigurationName)\"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\public\include"
+				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;NDEBUG=1;XMP_StaticBuild=1"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="true"
+				DefaultCharIsUnsigned="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="XMPCoreStaticRelease.lib XMPFilesStaticRelease.lib"
+				OutputFile="$(OutDir)$(ProjectName).exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\public\libraries\windows_x64\release"
+				GenerateDebugInformation="true"
+				AssemblyDebug="0"
+				GenerateMapFile="true"
+				MapFileName=" $(TargetDir)$(TargetName).map"
+				SubSystem="0"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\source\XMPIterations.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\public\include\TXMPFiles.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPIterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPMeta.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\TXMPUtils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP.incl_cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Environment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\public\include\XMP_Version.h"
+				>
+			</File>
+			<Filter
+				Name="Client Glue"
+				>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPFiles.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPIterator.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPMeta.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\TXMPUtils.incl_cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMP_Common.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPFiles.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPIterator.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPMeta.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\public\include\client-glue\WXMPUtils.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/build/xcode/XMPSamples.xcodeproj/project.pbxproj b/samples/build/xcode/XMPSamples.xcodeproj/project.pbxproj
deleted file mode 100644
index 4a94bb0..0000000
--- a/samples/build/xcode/XMPSamples.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,705 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		DC97291609A3EACA005A68DF /* Build All */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = DC97292709A3EB4F005A68DF /* Build configuration list for PBXAggregateTarget "Build All" */;
-			buildPhases = (
-			);
-			dependencies = (
-				DC97291809A3EAD0005A68DF /* PBXTargetDependency */,
-				DC97291E09A3EB06005A68DF /* PBXTargetDependency */,
-				DC97292009A3EB0C005A68DF /* PBXTargetDependency */,
-				DC97292209A3EB12005A68DF /* PBXTargetDependency */,
-				018882280B7C941400EECA52 /* PBXTargetDependency */,
-				018882260B7C941400EECA52 /* PBXTargetDependency */,
-				018882240B7C941400EECA52 /* PBXTargetDependency */,
-				018882220B7C941400EECA52 /* PBXTargetDependency */,
-			);
-			name = "Build All";
-			productName = "Build All";
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		018881FF0B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */; };
-		018882000B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */; };
-		018882040B7C93AB00EECA52 /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
-		0188820D0B7C93AF00EECA52 /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
-		018882130B7C93EE00EECA52 /* DumpMainXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */; };
-		018882140B7C93EF00EECA52 /* DumpMainXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */; };
-		DC97291109A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */; };
-		DC97291209A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */; };
-		DC97291409A3E9BF005A68DF /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
-		DC97291509A3E9BF005A68DF /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
-		DCE615430951C75C001247EE /* XMPCoreCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */; };
-		DCED0E5D089E7E6E009B80AF /* XMPCoreCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		018882210B7C941400EECA52 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 0188820A0B7C93AF00EECA52;
-			remoteInfo = "DumpMainXMP Release";
-		};
-		018882230B7C941400EECA52 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 018882010B7C93AB00EECA52;
-			remoteInfo = "DumpMainXMP Debug";
-		};
-		018882250B7C941400EECA52 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 018881F70B7C936A00EECA52;
-			remoteInfo = "XMPFilesCoverage Release";
-		};
-		018882270B7C941400EECA52 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 018881EF0B7C935100EECA52;
-			remoteInfo = "XMPFilesCoverage Debug";
-		};
-		DC97291709A3EAD0005A68DF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = DCED0E5B089E7E6E009B80AF;
-			remoteInfo = "XMPCoverage Debug";
-		};
-		DC97291D09A3EB06005A68DF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = DCE615410951C75C001247EE;
-			remoteInfo = "XMPCoverage Release";
-		};
-		DC97291F09A3EB0C005A68DF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = DC9728FD09A3E964005A68DF;
-			remoteInfo = "DumpXMP Debug";
-		};
-		DC97292109A3EB12005A68DF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = DC97290509A3E969005A68DF;
-			remoteInfo = "DumpXMP Release";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DumpMainXMP.cpp; sourceTree = "<group>"; };
-		018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPFilesCoverage.cpp; sourceTree = "<group>"; };
-		018881F50B7C935100EECA52 /* XMPFilesCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPFilesCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
-		018881FD0B7C936A00EECA52 /* XMPFilesCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPFilesCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
-		018882080B7C93AB00EECA52 /* DumpMainXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpMainXMP; sourceTree = BUILT_PRODUCTS_DIR; };
-		018882110B7C93AF00EECA52 /* DumpMainXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpMainXMP; sourceTree = BUILT_PRODUCTS_DIR; };
-		DC97290309A3E964005A68DF /* DumpScannedXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpScannedXMP; sourceTree = BUILT_PRODUCTS_DIR; };
-		DC97290B09A3E969005A68DF /* DumpScannedXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpScannedXMP; sourceTree = BUILT_PRODUCTS_DIR; };
-		DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DumpScannedXMP.cpp; sourceTree = "<group>"; };
-		DC97291309A3E9BF005A68DF /* XMPScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPScanner.cpp; sourceTree = "<group>"; };
-		DCE400B00951CF710040D71F /* XMPSamples-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = "XMPSamples-Common.xcconfig"; sourceTree = "<group>"; };
-		DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = "XMPSamples-Debug.xcconfig"; sourceTree = "<group>"; };
-		DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = "XMPSamples-Release.xcconfig"; sourceTree = "<group>"; };
-		DCE615470951C75C001247EE /* XMPCoreCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPCoreCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
-		DCED0E65089E7E6E009B80AF /* XMPCoreCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPCoreCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
-		DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPCoreCoverage.cpp; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		018881F20B7C935100EECA52 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		018881FA0B7C936A00EECA52 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		018882050B7C93AB00EECA52 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		0188820E0B7C93AF00EECA52 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DC97290009A3E964005A68DF /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DC97290809A3E969005A68DF /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DCE615440951C75C001247EE /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DCED0E5E089E7E6E009B80AF /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* XMPCoverage */ = {
-			isa = PBXGroup;
-			children = (
-				08FB7795FE84155DC02AAC07 /* Source */,
-				DCE4006D0951CC850040D71F /* Build Extras */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-			);
-			name = XMPCoverage;
-			sourceTree = "<group>";
-		};
-		08FB7795FE84155DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */,
-				018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */,
-				DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */,
-				DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */,
-				DC97291309A3E9BF005A68DF /* XMPScanner.cpp */,
-			);
-			name = Source;
-			path = ../../source;
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				DCED0E65089E7E6E009B80AF /* XMPCoreCoverage */,
-				DCE615470951C75C001247EE /* XMPCoreCoverage */,
-				DC97290309A3E964005A68DF /* DumpScannedXMP */,
-				DC97290B09A3E969005A68DF /* DumpScannedXMP */,
-				018881F50B7C935100EECA52 /* XMPFilesCoverage */,
-				018881FD0B7C936A00EECA52 /* XMPFilesCoverage */,
-				018882080B7C93AB00EECA52 /* DumpMainXMP */,
-				018882110B7C93AF00EECA52 /* DumpMainXMP */,
-			);
-			name = Products;
-			path = ../..;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		DCE4006D0951CC850040D71F /* Build Extras */ = {
-			isa = PBXGroup;
-			children = (
-				DCE400B00951CF710040D71F /* XMPSamples-Common.xcconfig */,
-				DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */,
-				DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */,
-			);
-			name = "Build Extras";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		018881EF0B7C935100EECA52 /* XMPFilesCoverage Debug */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 018881F30B7C935100EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Debug" */;
-			buildPhases = (
-				018881F00B7C935100EECA52 /* Sources */,
-				018881F20B7C935100EECA52 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "XMPFilesCoverage Debug";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = 018881F50B7C935100EECA52 /* XMPFilesCoverage */;
-			productType = "com.apple.product-type.tool";
-		};
-		018881F70B7C936A00EECA52 /* XMPFilesCoverage Release */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 018881FB0B7C936A00EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Release" */;
-			buildPhases = (
-				018881F80B7C936A00EECA52 /* Sources */,
-				018881FA0B7C936A00EECA52 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "XMPFilesCoverage Release";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = 018881FD0B7C936A00EECA52 /* XMPFilesCoverage */;
-			productType = "com.apple.product-type.tool";
-		};
-		018882010B7C93AB00EECA52 /* DumpMainXMP Debug */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 018882060B7C93AB00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Debug" */;
-			buildPhases = (
-				018882020B7C93AB00EECA52 /* Sources */,
-				018882050B7C93AB00EECA52 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "DumpMainXMP Debug";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = 018882080B7C93AB00EECA52 /* DumpMainXMP */;
-			productType = "com.apple.product-type.tool";
-		};
-		0188820A0B7C93AF00EECA52 /* DumpMainXMP Release */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 0188820F0B7C93AF00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Release" */;
-			buildPhases = (
-				0188820B0B7C93AF00EECA52 /* Sources */,
-				0188820E0B7C93AF00EECA52 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "DumpMainXMP Release";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = 018882110B7C93AF00EECA52 /* DumpMainXMP */;
-			productType = "com.apple.product-type.tool";
-		};
-		DC9728FD09A3E964005A68DF /* DumpScannedXMP Debug */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DC97290109A3E964005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Debug" */;
-			buildPhases = (
-				DC9728FE09A3E964005A68DF /* Sources */,
-				DC97290009A3E964005A68DF /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "DumpScannedXMP Debug";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = DC97290309A3E964005A68DF /* DumpScannedXMP */;
-			productType = "com.apple.product-type.tool";
-		};
-		DC97290509A3E969005A68DF /* DumpScannedXMP Release */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DC97290909A3E969005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Release" */;
-			buildPhases = (
-				DC97290609A3E969005A68DF /* Sources */,
-				DC97290809A3E969005A68DF /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "DumpScannedXMP Release";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = DC97290B09A3E969005A68DF /* DumpScannedXMP */;
-			productType = "com.apple.product-type.tool";
-		};
-		DCE615410951C75C001247EE /* XMPCoreCoverage Release */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DCE615450951C75C001247EE /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Release" */;
-			buildPhases = (
-				DCE615420951C75C001247EE /* Sources */,
-				DCE615440951C75C001247EE /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "XMPCoreCoverage Release";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = DCE615470951C75C001247EE /* XMPCoreCoverage */;
-			productType = "com.apple.product-type.tool";
-		};
-		DCED0E5B089E7E6E009B80AF /* XMPCoreCoverage Debug */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DCED0E60089E7E6E009B80AF /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Debug" */;
-			buildPhases = (
-				DCED0E5C089E7E6E009B80AF /* Sources */,
-				DCED0E5E089E7E6E009B80AF /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "XMPCoreCoverage Debug";
-			productInstallPath = "$(HOME)/bin";
-			productName = XMPCoverage;
-			productReference = DCED0E65089E7E6E009B80AF /* XMPCoreCoverage */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = DC47BE960871F34F0088D201 /* Build configuration list for PBXProject "XMPSamples" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 08FB7794FE84155DC02AAC07 /* XMPCoverage */;
-			projectDirPath = "";
-			targets = (
-				DC97291609A3EACA005A68DF /* Build All */,
-				DCED0E5B089E7E6E009B80AF /* XMPCoreCoverage Debug */,
-				DCE615410951C75C001247EE /* XMPCoreCoverage Release */,
-				DC9728FD09A3E964005A68DF /* DumpScannedXMP Debug */,
-				DC97290509A3E969005A68DF /* DumpScannedXMP Release */,
-				018881EF0B7C935100EECA52 /* XMPFilesCoverage Debug */,
-				018881F70B7C936A00EECA52 /* XMPFilesCoverage Release */,
-				018882010B7C93AB00EECA52 /* DumpMainXMP Debug */,
-				0188820A0B7C93AF00EECA52 /* DumpMainXMP Release */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		018881F00B7C935100EECA52 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				018881FF0B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		018881F80B7C936A00EECA52 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				018882000B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		018882020B7C93AB00EECA52 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				018882040B7C93AB00EECA52 /* XMPScanner.cpp in Sources */,
-				018882130B7C93EE00EECA52 /* DumpMainXMP.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		0188820B0B7C93AF00EECA52 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0188820D0B7C93AF00EECA52 /* XMPScanner.cpp in Sources */,
-				018882140B7C93EF00EECA52 /* DumpMainXMP.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DC9728FE09A3E964005A68DF /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DC97291109A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */,
-				DC97291409A3E9BF005A68DF /* XMPScanner.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DC97290609A3E969005A68DF /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DC97291209A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */,
-				DC97291509A3E9BF005A68DF /* XMPScanner.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DCE615420951C75C001247EE /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DCE615430951C75C001247EE /* XMPCoreCoverage.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DCED0E5C089E7E6E009B80AF /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DCED0E5D089E7E6E009B80AF /* XMPCoreCoverage.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		018882220B7C941400EECA52 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 0188820A0B7C93AF00EECA52 /* DumpMainXMP Release */;
-			targetProxy = 018882210B7C941400EECA52 /* PBXContainerItemProxy */;
-		};
-		018882240B7C941400EECA52 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 018882010B7C93AB00EECA52 /* DumpMainXMP Debug */;
-			targetProxy = 018882230B7C941400EECA52 /* PBXContainerItemProxy */;
-		};
-		018882260B7C941400EECA52 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 018881F70B7C936A00EECA52 /* XMPFilesCoverage Release */;
-			targetProxy = 018882250B7C941400EECA52 /* PBXContainerItemProxy */;
-		};
-		018882280B7C941400EECA52 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 018881EF0B7C935100EECA52 /* XMPFilesCoverage Debug */;
-			targetProxy = 018882270B7C941400EECA52 /* PBXContainerItemProxy */;
-		};
-		DC97291809A3EAD0005A68DF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = DCED0E5B089E7E6E009B80AF /* XMPCoreCoverage Debug */;
-			targetProxy = DC97291709A3EAD0005A68DF /* PBXContainerItemProxy */;
-		};
-		DC97291E09A3EB06005A68DF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = DCE615410951C75C001247EE /* XMPCoreCoverage Release */;
-			targetProxy = DC97291D09A3EB06005A68DF /* PBXContainerItemProxy */;
-		};
-		DC97292009A3EB0C005A68DF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = DC9728FD09A3E964005A68DF /* DumpScannedXMP Debug */;
-			targetProxy = DC97291F09A3EB0C005A68DF /* PBXContainerItemProxy */;
-		};
-		DC97292209A3EB12005A68DF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = DC97290509A3E969005A68DF /* DumpScannedXMP Release */;
-			targetProxy = DC97292109A3EB12005A68DF /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		018881F40B7C935100EECA52 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
-			buildSettings = {
-				OTHER_LDFLAGS = (
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
-					"-framework",
-					Carbon,
-					"-framework",
-					QuickTime,
-				);
-				PRODUCT_NAME = XMPFilesCoverage;
-			};
-			name = Default;
-		};
-		018881FC0B7C936A00EECA52 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
-			buildSettings = {
-				OTHER_LDFLAGS = (
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
-					"-framework",
-					Carbon,
-					"-framework",
-					QuickTime,
-				);
-				PRODUCT_NAME = XMPFilesCoverage;
-			};
-			name = Default;
-		};
-		018882070B7C93AB00EECA52 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
-			buildSettings = {
-				OTHER_LDFLAGS = (
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
-					"-framework",
-					Carbon,
-					"-framework",
-					QuickTime,
-				);
-				PRODUCT_NAME = DumpMainXMP;
-			};
-			name = Default;
-		};
-		018882100B7C93AF00EECA52 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
-			buildSettings = {
-				OTHER_LDFLAGS = (
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
-					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
-					"-framework",
-					Carbon,
-					"-framework",
-					QuickTime,
-				);
-				PRODUCT_NAME = DumpMainXMP;
-			};
-			name = Default;
-		};
-		DC47BE980871F34F0088D201 /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B00951CF710040D71F /* XMPSamples-Common.xcconfig */;
-			buildSettings = {
-			};
-			name = Default;
-		};
-		DC97290209A3E964005A68DF /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = DumpScannedXMP;
-			};
-			name = Default;
-		};
-		DC97290A09A3E969005A68DF /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = DumpScannedXMP;
-			};
-			name = Default;
-		};
-		DC97292809A3EB4F005A68DF /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "Build All";
-			};
-			name = Default;
-		};
-		DCE615460951C75C001247EE /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = XMPCoreCoverage;
-			};
-			name = Default;
-		};
-		DCED0E63089E7E6E009B80AF /* Default */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
-			buildSettings = {
-				PRODUCT_NAME = XMPCoreCoverage;
-			};
-			name = Default;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		018881F30B7C935100EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Debug" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				018881F40B7C935100EECA52 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		018881FB0B7C936A00EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Release" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				018881FC0B7C936A00EECA52 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		018882060B7C93AB00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Debug" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				018882070B7C93AB00EECA52 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		0188820F0B7C93AF00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Release" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				018882100B7C93AF00EECA52 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		DC47BE960871F34F0088D201 /* Build configuration list for PBXProject "XMPSamples" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DC47BE980871F34F0088D201 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		DC97290109A3E964005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Debug" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DC97290209A3E964005A68DF /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		DC97290909A3E969005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Release" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DC97290A09A3E969005A68DF /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		DC97292709A3EB4F005A68DF /* Build configuration list for PBXAggregateTarget "Build All" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DC97292809A3EB4F005A68DF /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		DCE615450951C75C001247EE /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Release" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DCE615460951C75C001247EE /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		DCED0E60089E7E6E009B80AF /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Debug" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DCED0E63089E7E6E009B80AF /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
diff --git a/samples/build/xcode/XMPSamples-Common.xcconfig b/samples/build/xcode2/XMPSamples-Common.xcconfig
index 53dcdb0..53dcdb0 100644
--- a/samples/build/xcode/XMPSamples-Common.xcconfig
+++ b/samples/build/xcode2/XMPSamples-Common.xcconfig
diff --git a/samples/build/xcode/XMPSamples-Debug.xcconfig b/samples/build/xcode2/XMPSamples-Debug.xcconfig
index 78a602e..78a602e 100644
--- a/samples/build/xcode/XMPSamples-Debug.xcconfig
+++ b/samples/build/xcode2/XMPSamples-Debug.xcconfig
diff --git a/samples/build/xcode/XMPSamples-Release.xcconfig b/samples/build/xcode2/XMPSamples-Release.xcconfig
index 87c599a..87c599a 100644
--- a/samples/build/xcode/XMPSamples-Release.xcconfig
+++ b/samples/build/xcode2/XMPSamples-Release.xcconfig
diff --git a/samples/build/xcode2/XMPSamples.xcodeproj/project.pbxproj b/samples/build/xcode2/XMPSamples.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..5ac220e
--- /dev/null
+++ b/samples/build/xcode2/XMPSamples.xcodeproj/project.pbxproj
@@ -0,0 +1,1761 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		DC97291609A3EACA005A68DF /* Build All */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = DC97292709A3EB4F005A68DF /* Build configuration list for PBXAggregateTarget "Build All" */;
+			buildPhases = (
+			);
+			dependencies = (
+				DC97291809A3EAD0005A68DF /* PBXTargetDependency */,
+				DC97291E09A3EB06005A68DF /* PBXTargetDependency */,
+				DC97292009A3EB0C005A68DF /* PBXTargetDependency */,
+				DC97292209A3EB12005A68DF /* PBXTargetDependency */,
+				018882280B7C941400EECA52 /* PBXTargetDependency */,
+				018882260B7C941400EECA52 /* PBXTargetDependency */,
+				018882240B7C941400EECA52 /* PBXTargetDependency */,
+				018882220B7C941400EECA52 /* PBXTargetDependency */,
+				01C2B04E0E3A0681003F4586 /* PBXTargetDependency */,
+				01C2B04C0E3A0681003F4586 /* PBXTargetDependency */,
+				01C2B0520E3A0684003F4586 /* PBXTargetDependency */,
+				01C2B0500E3A0684003F4586 /* PBXTargetDependency */,
+				01C2B0810E3A0776003F4586 /* PBXTargetDependency */,
+				01C2B07F0E3A0776003F4586 /* PBXTargetDependency */,
+				01C2B07D0E3A0776003F4586 /* PBXTargetDependency */,
+				01C2B07B0E3A0776003F4586 /* PBXTargetDependency */,
+				01C2B09E0E3A081C003F4586 /* PBXTargetDependency */,
+				01C2B09C0E3A081C003F4586 /* PBXTargetDependency */,
+				01C2B0D30E3A0984003F4586 /* PBXTargetDependency */,
+				01C2B0D10E3A0984003F4586 /* PBXTargetDependency */,
+			);
+			name = "Build All";
+			productName = "Build All";
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		018881FF0B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */; };
+		018882000B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */; };
+		018882040B7C93AB00EECA52 /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
+		0188820D0B7C93AF00EECA52 /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
+		018882130B7C93EE00EECA52 /* DumpMainXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */; };
+		018882140B7C93EF00EECA52 /* DumpMainXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */; };
+		01C2AFDB0E3A023B003F4586 /* CustomSchema.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2AFDA0E3A023B003F4586 /* CustomSchema.cpp */; };
+		01C2AFDC0E3A023B003F4586 /* CustomSchema.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2AFDA0E3A023B003F4586 /* CustomSchema.cpp */; };
+		01C2AFF30E3A0398003F4586 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2AFF20E3A0398003F4586 /* main.cpp */; };
+		01C2AFF40E3A0398003F4586 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2AFF20E3A0398003F4586 /* main.cpp */; };
+		01C2B0300E3A04F9003F4586 /* DumpFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0220E3A04F9003F4586 /* DumpFile.cpp */; };
+		01C2B0320E3A04F9003F4586 /* Log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0260E3A04F9003F4586 /* Log.cpp */; };
+		01C2B0340E3A04F9003F4586 /* OutputUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02A0E3A04F9003F4586 /* OutputUtils.cpp */; };
+		01C2B0350E3A04F9003F4586 /* QEScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02C0E3A04F9003F4586 /* QEScanner.cpp */; };
+		01C2B0360E3A04F9003F4586 /* TagTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02E0E3A04F9003F4586 /* TagTree.cpp */; };
+		01C2B0380E3A04F9003F4586 /* DumpFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0220E3A04F9003F4586 /* DumpFile.cpp */; };
+		01C2B03A0E3A04F9003F4586 /* Log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0260E3A04F9003F4586 /* Log.cpp */; };
+		01C2B03C0E3A04F9003F4586 /* OutputUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02A0E3A04F9003F4586 /* OutputUtils.cpp */; };
+		01C2B03D0E3A04F9003F4586 /* QEScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02C0E3A04F9003F4586 /* QEScanner.cpp */; };
+		01C2B03E0E3A04F9003F4586 /* TagTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02E0E3A04F9003F4586 /* TagTree.cpp */; };
+		01C2B0410E3A0591003F4586 /* LargeFileAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B03F0E3A0523003F4586 /* LargeFileAccess.cpp */; };
+		01C2B0420E3A0591003F4586 /* LargeFileAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B03F0E3A0523003F4586 /* LargeFileAccess.cpp */; };
+		01C2B0780E3A076E003F4586 /* ReadingXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0770E3A076E003F4586 /* ReadingXMP.cpp */; };
+		01C2B0790E3A076E003F4586 /* ReadingXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0770E3A076E003F4586 /* ReadingXMP.cpp */; };
+		01C2B0960E3A07F5003F4586 /* ModifyingXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0740E3A0765003F4586 /* ModifyingXMP.cpp */; };
+		01C2B0970E3A07F6003F4586 /* ModifyingXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0740E3A0765003F4586 /* ModifyingXMP.cpp */; };
+		01C2B09A0E3A0805003F4586 /* XmpIterations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0980E3A0805003F4586 /* XmpIterations.cpp */; };
+		01C2B0B20E3A08A3003F4586 /* XmpIterations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0980E3A0805003F4586 /* XmpIterations.cpp */; };
+		01C2B0B90E3A08B3003F4586 /* Actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0B50E3A08B3003F4586 /* Actions.cpp */; };
+		01C2B0BA0E3A08B3003F4586 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0B70E3A08B3003F4586 /* main.cpp */; };
+		01C2B0BB0E3A08B3003F4586 /* PrintUsage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0B80E3A08B3003F4586 /* PrintUsage.cpp */; };
+		01C2B0BC0E3A08B3003F4586 /* Actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0B50E3A08B3003F4586 /* Actions.cpp */; };
+		01C2B0BD0E3A08B3003F4586 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0B70E3A08B3003F4586 /* main.cpp */; };
+		01C2B0BE0E3A08B3003F4586 /* PrintUsage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0B80E3A08B3003F4586 /* PrintUsage.cpp */; };
+		01C2B0C00E3A08DB003F4586 /* Log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0260E3A04F9003F4586 /* Log.cpp */; };
+		01C2B0C10E3A08DC003F4586 /* Log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B0260E3A04F9003F4586 /* Log.cpp */; };
+		01C2B0C20E3A08E8003F4586 /* LargeFileAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B03F0E3A0523003F4586 /* LargeFileAccess.cpp */; };
+		01C2B0C30E3A08E9003F4586 /* LargeFileAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B03F0E3A0523003F4586 /* LargeFileAccess.cpp */; };
+		01C2B0CB0E3A0947003F4586 /* OutputUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02A0E3A04F9003F4586 /* OutputUtils.cpp */; };
+		01C2B0CC0E3A0948003F4586 /* OutputUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C2B02A0E3A04F9003F4586 /* OutputUtils.cpp */; };
+		DC97291109A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */; };
+		DC97291209A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */; };
+		DC97291409A3E9BF005A68DF /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
+		DC97291509A3E9BF005A68DF /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC97291309A3E9BF005A68DF /* XMPScanner.cpp */; };
+		DCE615430951C75C001247EE /* XMPCoreCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */; };
+		DCED0E5D089E7E6E009B80AF /* XMPCoreCoverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		018882210B7C941400EECA52 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0188820A0B7C93AF00EECA52;
+			remoteInfo = "DumpMainXMP Release";
+		};
+		018882230B7C941400EECA52 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 018882010B7C93AB00EECA52;
+			remoteInfo = "DumpMainXMP Debug";
+		};
+		018882250B7C941400EECA52 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 018881F70B7C936A00EECA52;
+			remoteInfo = "XMPFilesCoverage Release";
+		};
+		018882270B7C941400EECA52 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 018881EF0B7C935100EECA52;
+			remoteInfo = "XMPFilesCoverage Debug";
+		};
+		01C2B04B0E3A0681003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2AFD20E3A01F9003F4586;
+			remoteInfo = "CustomSchema Release";
+		};
+		01C2B04D0E3A0681003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2AFCA0E3A01F6003F4586;
+			remoteInfo = "CustomSchema Debug";
+		};
+		01C2B04F0E3A0684003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2AFEA0E3A0364003F4586;
+			remoteInfo = "Dumpfile Release";
+		};
+		01C2B0510E3A0684003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2AFE20E3A035E003F4586;
+			remoteInfo = "Dumpfile Debug";
+		};
+		01C2B07A0E3A0776003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B06B0E3A06C4003F4586;
+			remoteInfo = "ModifyingXMP Release";
+		};
+		01C2B07C0E3A0776003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B0630E3A06C4003F4586;
+			remoteInfo = "ModifyingXMP Debug";
+		};
+		01C2B07E0E3A0776003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B05B0E3A069A003F4586;
+			remoteInfo = "ReadingXMP Release";
+		};
+		01C2B0800E3A0776003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B0530E3A069A003F4586;
+			remoteInfo = "ReadingXMP Debug";
+		};
+		01C2B09B0E3A081C003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B08E0E3A07A7003F4586;
+			remoteInfo = "XMPIterations Release";
+		};
+		01C2B09D0E3A081C003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B0860E3A07A7003F4586;
+			remoteInfo = "XMPIterations Debug";
+		};
+		01C2B0D00E3A0984003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B0AA0E3A084F003F4586;
+			remoteInfo = "XMPCommand Release";
+		};
+		01C2B0D20E3A0984003F4586 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 01C2B0A20E3A084F003F4586;
+			remoteInfo = "XMPCommand Debug";
+		};
+		DC97291709A3EAD0005A68DF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = DCED0E5B089E7E6E009B80AF;
+			remoteInfo = "XMPCoverage Debug";
+		};
+		DC97291D09A3EB06005A68DF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = DCE615410951C75C001247EE;
+			remoteInfo = "XMPCoverage Release";
+		};
+		DC97291F09A3EB0C005A68DF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = DC9728FD09A3E964005A68DF;
+			remoteInfo = "DumpXMP Debug";
+		};
+		DC97292109A3EB12005A68DF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = DC97290509A3E969005A68DF;
+			remoteInfo = "DumpXMP Release";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DumpMainXMP.cpp; sourceTree = "<group>"; };
+		018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPFilesCoverage.cpp; sourceTree = "<group>"; };
+		018881F50B7C935100EECA52 /* XMPFilesCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPFilesCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
+		018881FD0B7C936A00EECA52 /* XMPFilesCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPFilesCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
+		018882080B7C93AB00EECA52 /* DumpMainXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpMainXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		018882110B7C93AF00EECA52 /* DumpMainXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpMainXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2AFD00E3A01F6003F4586 /* CustomSchema */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CustomSchema; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2AFD80E3A01F9003F4586 /* CustomSchema */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CustomSchema; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2AFDA0E3A023B003F4586 /* CustomSchema.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomSchema.cpp; sourceTree = "<group>"; };
+		01C2AFE80E3A035E003F4586 /* dumpfile */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dumpfile; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2AFF00E3A0364003F4586 /* dumpfile */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dumpfile; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2AFF20E3A0398003F4586 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = dumpfile/main.cpp; sourceTree = "<group>"; };
+		01C2B01E0E3A04F9003F4586 /* TagTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagTree.h; sourceTree = "<group>"; };
+		01C2B01F0E3A04F9003F4586 /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = globals.h; sourceTree = "<group>"; };
+		01C2B0220E3A04F9003F4586 /* DumpFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DumpFile.cpp; sourceTree = "<group>"; };
+		01C2B0230E3A04F9003F4586 /* DumpFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpFile.h; sourceTree = "<group>"; };
+		01C2B0260E3A04F9003F4586 /* Log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Log.cpp; sourceTree = "<group>"; };
+		01C2B0270E3A04F9003F4586 /* Log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Log.h; sourceTree = "<group>"; };
+		01C2B02A0E3A04F9003F4586 /* OutputUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OutputUtils.cpp; sourceTree = "<group>"; };
+		01C2B02B0E3A04F9003F4586 /* OutputUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputUtils.h; sourceTree = "<group>"; };
+		01C2B02C0E3A04F9003F4586 /* QEScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QEScanner.cpp; sourceTree = "<group>"; };
+		01C2B02D0E3A04F9003F4586 /* QEScanner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = QEScanner.hpp; sourceTree = "<group>"; };
+		01C2B02E0E3A04F9003F4586 /* TagTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TagTree.cpp; sourceTree = "<group>"; };
+		01C2B03F0E3A0523003F4586 /* LargeFileAccess.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = LargeFileAccess.cpp; path = ../../../source/common/LargeFileAccess.cpp; sourceTree = "<group>"; };
+		01C2B0400E3A0523003F4586 /* LargeFileAccess.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = LargeFileAccess.hpp; path = ../../../source/common/LargeFileAccess.hpp; sourceTree = "<group>"; };
+		01C2B0590E3A069A003F4586 /* ReadingXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ReadingXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0610E3A069A003F4586 /* ReadingXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ReadingXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0690E3A06C4003F4586 /* ModifyingXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ModifyingXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0710E3A06C4003F4586 /* ModifyingXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ModifyingXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0740E3A0765003F4586 /* ModifyingXMP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModifyingXMP.cpp; sourceTree = "<group>"; };
+		01C2B0770E3A076E003F4586 /* ReadingXMP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadingXMP.cpp; sourceTree = "<group>"; };
+		01C2B08C0E3A07A7003F4586 /* XMPIterations */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPIterations; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0940E3A07A7003F4586 /* XMPIterations */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPIterations; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0980E3A0805003F4586 /* XmpIterations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XmpIterations.cpp; sourceTree = "<group>"; };
+		01C2B0A80E3A084F003F4586 /* xmpcommand */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = xmpcommand; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0B00E3A084F003F4586 /* xmpcommand */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = xmpcommand; sourceTree = BUILT_PRODUCTS_DIR; };
+		01C2B0B40E3A08B3003F4586 /* PrintUsage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrintUsage.h; path = xmpcommand/PrintUsage.h; sourceTree = "<group>"; };
+		01C2B0B50E3A08B3003F4586 /* Actions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Actions.cpp; path = xmpcommand/Actions.cpp; sourceTree = "<group>"; };
+		01C2B0B60E3A08B3003F4586 /* Actions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Actions.h; path = xmpcommand/Actions.h; sourceTree = "<group>"; };
+		01C2B0B70E3A08B3003F4586 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = xmpcommand/main.cpp; sourceTree = "<group>"; };
+		01C2B0B80E3A08B3003F4586 /* PrintUsage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PrintUsage.cpp; path = xmpcommand/PrintUsage.cpp; sourceTree = "<group>"; };
+		DC97290309A3E964005A68DF /* DumpScannedXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpScannedXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		DC97290B09A3E969005A68DF /* DumpScannedXMP */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpScannedXMP; sourceTree = BUILT_PRODUCTS_DIR; };
+		DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DumpScannedXMP.cpp; sourceTree = "<group>"; };
+		DC97291309A3E9BF005A68DF /* XMPScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPScanner.cpp; sourceTree = "<group>"; };
+		DCE400B00951CF710040D71F /* XMPSamples-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = "XMPSamples-Common.xcconfig"; sourceTree = "<group>"; };
+		DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = "XMPSamples-Debug.xcconfig"; sourceTree = "<group>"; };
+		DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = "XMPSamples-Release.xcconfig"; sourceTree = "<group>"; };
+		DCE615470951C75C001247EE /* XMPCoreCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPCoreCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCED0E65089E7E6E009B80AF /* XMPCoreCoverage */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XMPCoreCoverage; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPCoreCoverage.cpp; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		018881F20B7C935100EECA52 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		018881FA0B7C936A00EECA52 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		018882050B7C93AB00EECA52 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		0188820E0B7C93AF00EECA52 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFCD0E3A01F6003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFD50E3A01F9003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFE50E3A035E003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFED0E3A0364003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0560E3A069A003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B05E0E3A069A003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0660E3A06C4003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B06E0E3A06C4003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0890E3A07A7003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0910E3A07A7003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0A50E3A084F003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0AD0E3A084F003F4586 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DC97290009A3E964005A68DF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DC97290809A3E969005A68DF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DCE615440951C75C001247EE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DCED0E5E089E7E6E009B80AF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		01C2AFB40E39EAD6003F4586 /* XMPIterations */ = {
+			isa = PBXGroup;
+			children = (
+				01C2B0980E3A0805003F4586 /* XmpIterations.cpp */,
+			);
+			name = XMPIterations;
+			sourceTree = "<group>";
+		};
+		01C2AFB50E39EAD8003F4586 /* XMPFilesCoverage */ = {
+			isa = PBXGroup;
+			children = (
+				018881EE0B7C934100EECA52 /* XMPFilesCoverage.cpp */,
+			);
+			name = XMPFilesCoverage;
+			sourceTree = "<group>";
+		};
+		01C2AFB60E39EADB003F4586 /* XMPCoreCoverage */ = {
+			isa = PBXGroup;
+			children = (
+				DCF3A64D087F1D9000FEB713 /* XMPCoreCoverage.cpp */,
+			);
+			name = XMPCoreCoverage;
+			sourceTree = "<group>";
+		};
+		01C2AFB70E39EADD003F4586 /* XMPCommand */ = {
+			isa = PBXGroup;
+			children = (
+				01C2B0B40E3A08B3003F4586 /* PrintUsage.h */,
+				01C2B0B50E3A08B3003F4586 /* Actions.cpp */,
+				01C2B0B60E3A08B3003F4586 /* Actions.h */,
+				01C2B0B70E3A08B3003F4586 /* main.cpp */,
+				01C2B0B80E3A08B3003F4586 /* PrintUsage.cpp */,
+			);
+			name = XMPCommand;
+			sourceTree = "<group>";
+		};
+		01C2AFB80E39EAF3003F4586 /* ReadingXMP */ = {
+			isa = PBXGroup;
+			children = (
+				01C2B0770E3A076E003F4586 /* ReadingXMP.cpp */,
+			);
+			name = ReadingXMP;
+			sourceTree = "<group>";
+		};
+		01C2AFB90E39EAF5003F4586 /* ModifyingXMP */ = {
+			isa = PBXGroup;
+			children = (
+				01C2B0740E3A0765003F4586 /* ModifyingXMP.cpp */,
+			);
+			name = ModifyingXMP;
+			sourceTree = "<group>";
+		};
+		01C2AFBA0E39EAFA003F4586 /* DumpScannedXMP */ = {
+			isa = PBXGroup;
+			children = (
+				DC97291309A3E9BF005A68DF /* XMPScanner.cpp */,
+				DC97291009A3E9B7005A68DF /* DumpScannedXMP.cpp */,
+			);
+			name = DumpScannedXMP;
+			sourceTree = "<group>";
+		};
+		01C2AFBB0E39EAFD003F4586 /* DumpMainXMP */ = {
+			isa = PBXGroup;
+			children = (
+				018881ED0B7C934100EECA52 /* DumpMainXMP.cpp */,
+			);
+			name = DumpMainXMP;
+			sourceTree = "<group>";
+		};
+		01C2AFBC0E39EAFF003F4586 /* DumpFile */ = {
+			isa = PBXGroup;
+			children = (
+				01C2AFF20E3A0398003F4586 /* main.cpp */,
+			);
+			name = DumpFile;
+			sourceTree = "<group>";
+		};
+		01C2AFBD0E39EB01003F4586 /* CustomSchema */ = {
+			isa = PBXGroup;
+			children = (
+				01C2AFDA0E3A023B003F4586 /* CustomSchema.cpp */,
+			);
+			name = CustomSchema;
+			sourceTree = "<group>";
+		};
+		01C2AFF60E3A03F3003F4586 /* common */ = {
+			isa = PBXGroup;
+			children = (
+				01C2B03F0E3A0523003F4586 /* LargeFileAccess.cpp */,
+				01C2B0400E3A0523003F4586 /* LargeFileAccess.hpp */,
+				01C2B01E0E3A04F9003F4586 /* TagTree.h */,
+				01C2B01F0E3A04F9003F4586 /* globals.h */,
+				01C2B0220E3A04F9003F4586 /* DumpFile.cpp */,
+				01C2B0230E3A04F9003F4586 /* DumpFile.h */,
+				01C2B0260E3A04F9003F4586 /* Log.cpp */,
+				01C2B0270E3A04F9003F4586 /* Log.h */,
+				01C2B02A0E3A04F9003F4586 /* OutputUtils.cpp */,
+				01C2B02B0E3A04F9003F4586 /* OutputUtils.h */,
+				01C2B02C0E3A04F9003F4586 /* QEScanner.cpp */,
+				01C2B02D0E3A04F9003F4586 /* QEScanner.hpp */,
+				01C2B02E0E3A04F9003F4586 /* TagTree.cpp */,
+			);
+			path = common;
+			sourceTree = "<group>";
+		};
+		08FB7794FE84155DC02AAC07 /* XMPCoverage */ = {
+			isa = PBXGroup;
+			children = (
+				08FB7795FE84155DC02AAC07 /* Source */,
+				DCE4006D0951CC850040D71F /* Build Extras */,
+				1AB674ADFE9D54B511CA2CBB /* Products */,
+			);
+			name = XMPCoverage;
+			sourceTree = "<group>";
+		};
+		08FB7795FE84155DC02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				01C2AFF60E3A03F3003F4586 /* common */,
+				01C2AFBD0E39EB01003F4586 /* CustomSchema */,
+				01C2AFBC0E39EAFF003F4586 /* DumpFile */,
+				01C2AFBB0E39EAFD003F4586 /* DumpMainXMP */,
+				01C2AFBA0E39EAFA003F4586 /* DumpScannedXMP */,
+				01C2AFB90E39EAF5003F4586 /* ModifyingXMP */,
+				01C2AFB80E39EAF3003F4586 /* ReadingXMP */,
+				01C2AFB70E39EADD003F4586 /* XMPCommand */,
+				01C2AFB60E39EADB003F4586 /* XMPCoreCoverage */,
+				01C2AFB50E39EAD8003F4586 /* XMPFilesCoverage */,
+				01C2AFB40E39EAD6003F4586 /* XMPIterations */,
+			);
+			name = Source;
+			path = ../../source;
+			sourceTree = "<group>";
+		};
+		1AB674ADFE9D54B511CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				DCED0E65089E7E6E009B80AF /* XMPCoreCoverage */,
+				DCE615470951C75C001247EE /* XMPCoreCoverage */,
+				DC97290309A3E964005A68DF /* DumpScannedXMP */,
+				DC97290B09A3E969005A68DF /* DumpScannedXMP */,
+				018881F50B7C935100EECA52 /* XMPFilesCoverage */,
+				018881FD0B7C936A00EECA52 /* XMPFilesCoverage */,
+				018882080B7C93AB00EECA52 /* DumpMainXMP */,
+				018882110B7C93AF00EECA52 /* DumpMainXMP */,
+				01C2AFD00E3A01F6003F4586 /* CustomSchema */,
+				01C2AFD80E3A01F9003F4586 /* CustomSchema */,
+				01C2AFE80E3A035E003F4586 /* dumpfile */,
+				01C2AFF00E3A0364003F4586 /* dumpfile */,
+				01C2B0590E3A069A003F4586 /* ReadingXMP */,
+				01C2B0610E3A069A003F4586 /* ReadingXMP */,
+				01C2B0690E3A06C4003F4586 /* ModifyingXMP */,
+				01C2B0710E3A06C4003F4586 /* ModifyingXMP */,
+				01C2B08C0E3A07A7003F4586 /* XMPIterations */,
+				01C2B0940E3A07A7003F4586 /* XMPIterations */,
+				01C2B0A80E3A084F003F4586 /* xmpcommand */,
+				01C2B0B00E3A084F003F4586 /* xmpcommand */,
+			);
+			name = Products;
+			path = ../..;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		DCE4006D0951CC850040D71F /* Build Extras */ = {
+			isa = PBXGroup;
+			children = (
+				DCE400B00951CF710040D71F /* XMPSamples-Common.xcconfig */,
+				DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */,
+				DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */,
+			);
+			name = "Build Extras";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		018881EF0B7C935100EECA52 /* XMPFilesCoverage Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 018881F30B7C935100EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Debug" */;
+			buildPhases = (
+				018881F00B7C935100EECA52 /* Sources */,
+				018881F20B7C935100EECA52 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPFilesCoverage Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 018881F50B7C935100EECA52 /* XMPFilesCoverage */;
+			productType = "com.apple.product-type.tool";
+		};
+		018881F70B7C936A00EECA52 /* XMPFilesCoverage Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 018881FB0B7C936A00EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Release" */;
+			buildPhases = (
+				018881F80B7C936A00EECA52 /* Sources */,
+				018881FA0B7C936A00EECA52 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPFilesCoverage Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 018881FD0B7C936A00EECA52 /* XMPFilesCoverage */;
+			productType = "com.apple.product-type.tool";
+		};
+		018882010B7C93AB00EECA52 /* DumpMainXMP Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 018882060B7C93AB00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Debug" */;
+			buildPhases = (
+				018882020B7C93AB00EECA52 /* Sources */,
+				018882050B7C93AB00EECA52 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "DumpMainXMP Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 018882080B7C93AB00EECA52 /* DumpMainXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		0188820A0B7C93AF00EECA52 /* DumpMainXMP Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 0188820F0B7C93AF00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Release" */;
+			buildPhases = (
+				0188820B0B7C93AF00EECA52 /* Sources */,
+				0188820E0B7C93AF00EECA52 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "DumpMainXMP Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 018882110B7C93AF00EECA52 /* DumpMainXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2AFCA0E3A01F6003F4586 /* CustomSchema Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2AFCE0E3A01F6003F4586 /* Build configuration list for PBXNativeTarget "CustomSchema Debug" */;
+			buildPhases = (
+				01C2AFCB0E3A01F6003F4586 /* Sources */,
+				01C2AFCD0E3A01F6003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "CustomSchema Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2AFD00E3A01F6003F4586 /* CustomSchema */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2AFD20E3A01F9003F4586 /* CustomSchema Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2AFD60E3A01F9003F4586 /* Build configuration list for PBXNativeTarget "CustomSchema Release" */;
+			buildPhases = (
+				01C2AFD30E3A01F9003F4586 /* Sources */,
+				01C2AFD50E3A01F9003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "CustomSchema Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2AFD80E3A01F9003F4586 /* CustomSchema */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2AFE20E3A035E003F4586 /* Dumpfile Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2AFE60E3A035E003F4586 /* Build configuration list for PBXNativeTarget "Dumpfile Debug" */;
+			buildPhases = (
+				01C2AFE30E3A035E003F4586 /* Sources */,
+				01C2AFE50E3A035E003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Dumpfile Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2AFE80E3A035E003F4586 /* dumpfile */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2AFEA0E3A0364003F4586 /* Dumpfile Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2AFEE0E3A0364003F4586 /* Build configuration list for PBXNativeTarget "Dumpfile Release" */;
+			buildPhases = (
+				01C2AFEB0E3A0364003F4586 /* Sources */,
+				01C2AFED0E3A0364003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Dumpfile Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2AFF00E3A0364003F4586 /* dumpfile */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B0530E3A069A003F4586 /* ReadingXMP Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B0570E3A069A003F4586 /* Build configuration list for PBXNativeTarget "ReadingXMP Debug" */;
+			buildPhases = (
+				01C2B0540E3A069A003F4586 /* Sources */,
+				01C2B0560E3A069A003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ReadingXMP Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B0590E3A069A003F4586 /* ReadingXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B05B0E3A069A003F4586 /* ReadingXMP Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B05F0E3A069A003F4586 /* Build configuration list for PBXNativeTarget "ReadingXMP Release" */;
+			buildPhases = (
+				01C2B05C0E3A069A003F4586 /* Sources */,
+				01C2B05E0E3A069A003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ReadingXMP Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B0610E3A069A003F4586 /* ReadingXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B0630E3A06C4003F4586 /* ModifyingXMP Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B0670E3A06C4003F4586 /* Build configuration list for PBXNativeTarget "ModifyingXMP Debug" */;
+			buildPhases = (
+				01C2B0640E3A06C4003F4586 /* Sources */,
+				01C2B0660E3A06C4003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ModifyingXMP Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B0690E3A06C4003F4586 /* ModifyingXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B06B0E3A06C4003F4586 /* ModifyingXMP Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B06F0E3A06C4003F4586 /* Build configuration list for PBXNativeTarget "ModifyingXMP Release" */;
+			buildPhases = (
+				01C2B06C0E3A06C4003F4586 /* Sources */,
+				01C2B06E0E3A06C4003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ModifyingXMP Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B0710E3A06C4003F4586 /* ModifyingXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B0860E3A07A7003F4586 /* XMPIterations Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B08A0E3A07A7003F4586 /* Build configuration list for PBXNativeTarget "XMPIterations Debug" */;
+			buildPhases = (
+				01C2B0870E3A07A7003F4586 /* Sources */,
+				01C2B0890E3A07A7003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPIterations Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B08C0E3A07A7003F4586 /* XMPIterations */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B08E0E3A07A7003F4586 /* XMPIterations Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B0920E3A07A7003F4586 /* Build configuration list for PBXNativeTarget "XMPIterations Release" */;
+			buildPhases = (
+				01C2B08F0E3A07A7003F4586 /* Sources */,
+				01C2B0910E3A07A7003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPIterations Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B0940E3A07A7003F4586 /* XMPIterations */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B0A20E3A084F003F4586 /* XMPCommand Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B0A60E3A084F003F4586 /* Build configuration list for PBXNativeTarget "XMPCommand Debug" */;
+			buildPhases = (
+				01C2B0A30E3A084F003F4586 /* Sources */,
+				01C2B0A50E3A084F003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPCommand Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B0A80E3A084F003F4586 /* xmpcommand */;
+			productType = "com.apple.product-type.tool";
+		};
+		01C2B0AA0E3A084F003F4586 /* XMPCommand Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 01C2B0AE0E3A084F003F4586 /* Build configuration list for PBXNativeTarget "XMPCommand Release" */;
+			buildPhases = (
+				01C2B0AB0E3A084F003F4586 /* Sources */,
+				01C2B0AD0E3A084F003F4586 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPCommand Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = 01C2B0B00E3A084F003F4586 /* xmpcommand */;
+			productType = "com.apple.product-type.tool";
+		};
+		DC9728FD09A3E964005A68DF /* DumpScannedXMP Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = DC97290109A3E964005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Debug" */;
+			buildPhases = (
+				DC9728FE09A3E964005A68DF /* Sources */,
+				DC97290009A3E964005A68DF /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "DumpScannedXMP Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = DC97290309A3E964005A68DF /* DumpScannedXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		DC97290509A3E969005A68DF /* DumpScannedXMP Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = DC97290909A3E969005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Release" */;
+			buildPhases = (
+				DC97290609A3E969005A68DF /* Sources */,
+				DC97290809A3E969005A68DF /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "DumpScannedXMP Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = DC97290B09A3E969005A68DF /* DumpScannedXMP */;
+			productType = "com.apple.product-type.tool";
+		};
+		DCE615410951C75C001247EE /* XMPCoreCoverage Release */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = DCE615450951C75C001247EE /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Release" */;
+			buildPhases = (
+				DCE615420951C75C001247EE /* Sources */,
+				DCE615440951C75C001247EE /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPCoreCoverage Release";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = DCE615470951C75C001247EE /* XMPCoreCoverage */;
+			productType = "com.apple.product-type.tool";
+		};
+		DCED0E5B089E7E6E009B80AF /* XMPCoreCoverage Debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = DCED0E60089E7E6E009B80AF /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Debug" */;
+			buildPhases = (
+				DCED0E5C089E7E6E009B80AF /* Sources */,
+				DCED0E5E089E7E6E009B80AF /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XMPCoreCoverage Debug";
+			productInstallPath = "$(HOME)/bin";
+			productName = XMPCoverage;
+			productReference = DCED0E65089E7E6E009B80AF /* XMPCoreCoverage */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		08FB7793FE84155DC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = DC47BE960871F34F0088D201 /* Build configuration list for PBXProject "XMPSamples" */;
+			compatibilityVersion = "Xcode 2.4";
+			hasScannedForEncodings = 1;
+			mainGroup = 08FB7794FE84155DC02AAC07 /* XMPCoverage */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				DC97291609A3EACA005A68DF /* Build All */,
+				DCED0E5B089E7E6E009B80AF /* XMPCoreCoverage Debug */,
+				DCE615410951C75C001247EE /* XMPCoreCoverage Release */,
+				DC9728FD09A3E964005A68DF /* DumpScannedXMP Debug */,
+				DC97290509A3E969005A68DF /* DumpScannedXMP Release */,
+				018881EF0B7C935100EECA52 /* XMPFilesCoverage Debug */,
+				018881F70B7C936A00EECA52 /* XMPFilesCoverage Release */,
+				018882010B7C93AB00EECA52 /* DumpMainXMP Debug */,
+				0188820A0B7C93AF00EECA52 /* DumpMainXMP Release */,
+				01C2AFCA0E3A01F6003F4586 /* CustomSchema Debug */,
+				01C2AFD20E3A01F9003F4586 /* CustomSchema Release */,
+				01C2AFE20E3A035E003F4586 /* Dumpfile Debug */,
+				01C2AFEA0E3A0364003F4586 /* Dumpfile Release */,
+				01C2B0530E3A069A003F4586 /* ReadingXMP Debug */,
+				01C2B05B0E3A069A003F4586 /* ReadingXMP Release */,
+				01C2B0630E3A06C4003F4586 /* ModifyingXMP Debug */,
+				01C2B06B0E3A06C4003F4586 /* ModifyingXMP Release */,
+				01C2B0860E3A07A7003F4586 /* XMPIterations Debug */,
+				01C2B08E0E3A07A7003F4586 /* XMPIterations Release */,
+				01C2B0A20E3A084F003F4586 /* XMPCommand Debug */,
+				01C2B0AA0E3A084F003F4586 /* XMPCommand Release */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		018881F00B7C935100EECA52 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				018881FF0B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		018881F80B7C936A00EECA52 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				018882000B7C93A300EECA52 /* XMPFilesCoverage.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		018882020B7C93AB00EECA52 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				018882040B7C93AB00EECA52 /* XMPScanner.cpp in Sources */,
+				018882130B7C93EE00EECA52 /* DumpMainXMP.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		0188820B0B7C93AF00EECA52 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0188820D0B7C93AF00EECA52 /* XMPScanner.cpp in Sources */,
+				018882140B7C93EF00EECA52 /* DumpMainXMP.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFCB0E3A01F6003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2AFDC0E3A023B003F4586 /* CustomSchema.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFD30E3A01F9003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2AFDB0E3A023B003F4586 /* CustomSchema.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFE30E3A035E003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2AFF30E3A0398003F4586 /* main.cpp in Sources */,
+				01C2B0300E3A04F9003F4586 /* DumpFile.cpp in Sources */,
+				01C2B0320E3A04F9003F4586 /* Log.cpp in Sources */,
+				01C2B0340E3A04F9003F4586 /* OutputUtils.cpp in Sources */,
+				01C2B0350E3A04F9003F4586 /* QEScanner.cpp in Sources */,
+				01C2B0360E3A04F9003F4586 /* TagTree.cpp in Sources */,
+				01C2B0420E3A0591003F4586 /* LargeFileAccess.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2AFEB0E3A0364003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2AFF40E3A0398003F4586 /* main.cpp in Sources */,
+				01C2B0380E3A04F9003F4586 /* DumpFile.cpp in Sources */,
+				01C2B03A0E3A04F9003F4586 /* Log.cpp in Sources */,
+				01C2B03C0E3A04F9003F4586 /* OutputUtils.cpp in Sources */,
+				01C2B03D0E3A04F9003F4586 /* QEScanner.cpp in Sources */,
+				01C2B03E0E3A04F9003F4586 /* TagTree.cpp in Sources */,
+				01C2B0410E3A0591003F4586 /* LargeFileAccess.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0540E3A069A003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B0790E3A076E003F4586 /* ReadingXMP.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B05C0E3A069A003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B0780E3A076E003F4586 /* ReadingXMP.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0640E3A06C4003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B0970E3A07F6003F4586 /* ModifyingXMP.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B06C0E3A06C4003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B0960E3A07F5003F4586 /* ModifyingXMP.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0870E3A07A7003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B09A0E3A0805003F4586 /* XmpIterations.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B08F0E3A07A7003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B0B20E3A08A3003F4586 /* XmpIterations.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0A30E3A084F003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B0B90E3A08B3003F4586 /* Actions.cpp in Sources */,
+				01C2B0BA0E3A08B3003F4586 /* main.cpp in Sources */,
+				01C2B0BB0E3A08B3003F4586 /* PrintUsage.cpp in Sources */,
+				01C2B0C10E3A08DC003F4586 /* Log.cpp in Sources */,
+				01C2B0C20E3A08E8003F4586 /* LargeFileAccess.cpp in Sources */,
+				01C2B0CB0E3A0947003F4586 /* OutputUtils.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		01C2B0AB0E3A084F003F4586 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				01C2B0BC0E3A08B3003F4586 /* Actions.cpp in Sources */,
+				01C2B0BD0E3A08B3003F4586 /* main.cpp in Sources */,
+				01C2B0BE0E3A08B3003F4586 /* PrintUsage.cpp in Sources */,
+				01C2B0C00E3A08DB003F4586 /* Log.cpp in Sources */,
+				01C2B0C30E3A08E9003F4586 /* LargeFileAccess.cpp in Sources */,
+				01C2B0CC0E3A0948003F4586 /* OutputUtils.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DC9728FE09A3E964005A68DF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DC97291109A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */,
+				DC97291409A3E9BF005A68DF /* XMPScanner.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DC97290609A3E969005A68DF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DC97291209A3E9B7005A68DF /* DumpScannedXMP.cpp in Sources */,
+				DC97291509A3E9BF005A68DF /* XMPScanner.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DCE615420951C75C001247EE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DCE615430951C75C001247EE /* XMPCoreCoverage.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DCED0E5C089E7E6E009B80AF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DCED0E5D089E7E6E009B80AF /* XMPCoreCoverage.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		018882220B7C941400EECA52 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 0188820A0B7C93AF00EECA52 /* DumpMainXMP Release */;
+			targetProxy = 018882210B7C941400EECA52 /* PBXContainerItemProxy */;
+		};
+		018882240B7C941400EECA52 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 018882010B7C93AB00EECA52 /* DumpMainXMP Debug */;
+			targetProxy = 018882230B7C941400EECA52 /* PBXContainerItemProxy */;
+		};
+		018882260B7C941400EECA52 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 018881F70B7C936A00EECA52 /* XMPFilesCoverage Release */;
+			targetProxy = 018882250B7C941400EECA52 /* PBXContainerItemProxy */;
+		};
+		018882280B7C941400EECA52 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 018881EF0B7C935100EECA52 /* XMPFilesCoverage Debug */;
+			targetProxy = 018882270B7C941400EECA52 /* PBXContainerItemProxy */;
+		};
+		01C2B04C0E3A0681003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2AFD20E3A01F9003F4586 /* CustomSchema Release */;
+			targetProxy = 01C2B04B0E3A0681003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B04E0E3A0681003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2AFCA0E3A01F6003F4586 /* CustomSchema Debug */;
+			targetProxy = 01C2B04D0E3A0681003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B0500E3A0684003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2AFEA0E3A0364003F4586 /* Dumpfile Release */;
+			targetProxy = 01C2B04F0E3A0684003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B0520E3A0684003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2AFE20E3A035E003F4586 /* Dumpfile Debug */;
+			targetProxy = 01C2B0510E3A0684003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B07B0E3A0776003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B06B0E3A06C4003F4586 /* ModifyingXMP Release */;
+			targetProxy = 01C2B07A0E3A0776003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B07D0E3A0776003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B0630E3A06C4003F4586 /* ModifyingXMP Debug */;
+			targetProxy = 01C2B07C0E3A0776003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B07F0E3A0776003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B05B0E3A069A003F4586 /* ReadingXMP Release */;
+			targetProxy = 01C2B07E0E3A0776003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B0810E3A0776003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B0530E3A069A003F4586 /* ReadingXMP Debug */;
+			targetProxy = 01C2B0800E3A0776003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B09C0E3A081C003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B08E0E3A07A7003F4586 /* XMPIterations Release */;
+			targetProxy = 01C2B09B0E3A081C003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B09E0E3A081C003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B0860E3A07A7003F4586 /* XMPIterations Debug */;
+			targetProxy = 01C2B09D0E3A081C003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B0D10E3A0984003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B0AA0E3A084F003F4586 /* XMPCommand Release */;
+			targetProxy = 01C2B0D00E3A0984003F4586 /* PBXContainerItemProxy */;
+		};
+		01C2B0D30E3A0984003F4586 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 01C2B0A20E3A084F003F4586 /* XMPCommand Debug */;
+			targetProxy = 01C2B0D20E3A0984003F4586 /* PBXContainerItemProxy */;
+		};
+		DC97291809A3EAD0005A68DF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = DCED0E5B089E7E6E009B80AF /* XMPCoreCoverage Debug */;
+			targetProxy = DC97291709A3EAD0005A68DF /* PBXContainerItemProxy */;
+		};
+		DC97291E09A3EB06005A68DF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = DCE615410951C75C001247EE /* XMPCoreCoverage Release */;
+			targetProxy = DC97291D09A3EB06005A68DF /* PBXContainerItemProxy */;
+		};
+		DC97292009A3EB0C005A68DF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = DC9728FD09A3E964005A68DF /* DumpScannedXMP Debug */;
+			targetProxy = DC97291F09A3EB0C005A68DF /* PBXContainerItemProxy */;
+		};
+		DC97292209A3EB12005A68DF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = DC97290509A3E969005A68DF /* DumpScannedXMP Release */;
+			targetProxy = DC97292109A3EB12005A68DF /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		018881F40B7C935100EECA52 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = XMPFilesCoverage;
+			};
+			name = Default;
+		};
+		018881FC0B7C936A00EECA52 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = XMPFilesCoverage;
+			};
+			name = Default;
+		};
+		018882070B7C93AB00EECA52 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = DumpMainXMP;
+			};
+			name = Default;
+		};
+		018882100B7C93AF00EECA52 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = DumpMainXMP;
+			};
+			name = Default;
+		};
+		01C2AFCF0E3A01F6003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = CustomSchema;
+			};
+			name = Default;
+		};
+		01C2AFD70E3A01F9003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = CustomSchema;
+			};
+			name = Default;
+		};
+		01C2AFE70E3A035E003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = dumpfile;
+			};
+			name = Default;
+		};
+		01C2AFEF0E3A0364003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = dumpfile;
+			};
+			name = Default;
+		};
+		01C2B0580E3A069A003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = ReadingXMP;
+			};
+			name = Default;
+		};
+		01C2B0600E3A069A003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = ReadingXMP;
+			};
+			name = Default;
+		};
+		01C2B0680E3A06C4003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = ModifyingXMP;
+			};
+			name = Default;
+		};
+		01C2B0700E3A06C4003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = ModifyingXMP;
+			};
+			name = Default;
+		};
+		01C2B08B0E3A07A7003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = XMPIterations;
+			};
+			name = Default;
+		};
+		01C2B0930E3A07A7003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = XMPIterations;
+			};
+			name = Default;
+		};
+		01C2B0A70E3A084F003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = xmpcommand;
+			};
+			name = Default;
+		};
+		01C2B0AF0E3A084F003F4586 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = (
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPCore${LIB_SUFFIX}.a",
+					"${XMP_ROOT}/libraries/macintosh/${BUILD_MODE}/libXMPFiles${LIB_SUFFIX}.a",
+					"-framework",
+					Carbon,
+					"-framework",
+					QuickTime,
+				);
+				PRODUCT_NAME = xmpcommand;
+			};
+			name = Default;
+		};
+		DC47BE980871F34F0088D201 /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B00951CF710040D71F /* XMPSamples-Common.xcconfig */;
+			buildSettings = {
+			};
+			name = Default;
+		};
+		DC97290209A3E964005A68DF /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = DumpScannedXMP;
+			};
+			name = Default;
+		};
+		DC97290A09A3E969005A68DF /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = DumpScannedXMP;
+			};
+			name = Default;
+		};
+		DC97292809A3EB4F005A68DF /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "Build All";
+			};
+			name = Default;
+		};
+		DCE615460951C75C001247EE /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B20951CF710040D71F /* XMPSamples-Release.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = XMPCoreCoverage;
+			};
+			name = Default;
+		};
+		DCED0E63089E7E6E009B80AF /* Default */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DCE400B10951CF710040D71F /* XMPSamples-Debug.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = XMPCoreCoverage;
+			};
+			name = Default;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		018881F30B7C935100EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				018881F40B7C935100EECA52 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		018881FB0B7C936A00EECA52 /* Build configuration list for PBXNativeTarget "XMPFilesCoverage Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				018881FC0B7C936A00EECA52 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		018882060B7C93AB00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				018882070B7C93AB00EECA52 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		0188820F0B7C93AF00EECA52 /* Build configuration list for PBXNativeTarget "DumpMainXMP Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				018882100B7C93AF00EECA52 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2AFCE0E3A01F6003F4586 /* Build configuration list for PBXNativeTarget "CustomSchema Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2AFCF0E3A01F6003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2AFD60E3A01F9003F4586 /* Build configuration list for PBXNativeTarget "CustomSchema Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2AFD70E3A01F9003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2AFE60E3A035E003F4586 /* Build configuration list for PBXNativeTarget "Dumpfile Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2AFE70E3A035E003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2AFEE0E3A0364003F4586 /* Build configuration list for PBXNativeTarget "Dumpfile Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2AFEF0E3A0364003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B0570E3A069A003F4586 /* Build configuration list for PBXNativeTarget "ReadingXMP Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B0580E3A069A003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B05F0E3A069A003F4586 /* Build configuration list for PBXNativeTarget "ReadingXMP Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B0600E3A069A003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B0670E3A06C4003F4586 /* Build configuration list for PBXNativeTarget "ModifyingXMP Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B0680E3A06C4003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B06F0E3A06C4003F4586 /* Build configuration list for PBXNativeTarget "ModifyingXMP Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B0700E3A06C4003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B08A0E3A07A7003F4586 /* Build configuration list for PBXNativeTarget "XMPIterations Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B08B0E3A07A7003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B0920E3A07A7003F4586 /* Build configuration list for PBXNativeTarget "XMPIterations Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B0930E3A07A7003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B0A60E3A084F003F4586 /* Build configuration list for PBXNativeTarget "XMPCommand Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B0A70E3A084F003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		01C2B0AE0E3A084F003F4586 /* Build configuration list for PBXNativeTarget "XMPCommand Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				01C2B0AF0E3A084F003F4586 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		DC47BE960871F34F0088D201 /* Build configuration list for PBXProject "XMPSamples" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DC47BE980871F34F0088D201 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		DC97290109A3E964005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DC97290209A3E964005A68DF /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		DC97290909A3E969005A68DF /* Build configuration list for PBXNativeTarget "DumpScannedXMP Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DC97290A09A3E969005A68DF /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		DC97292709A3EB4F005A68DF /* Build configuration list for PBXAggregateTarget "Build All" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DC97292809A3EB4F005A68DF /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		DCE615450951C75C001247EE /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Release" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DCE615460951C75C001247EE /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		DCED0E60089E7E6E009B80AF /* Build configuration list for PBXNativeTarget "XMPCoreCoverage Debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DCED0E63089E7E6E009B80AF /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+}
diff --git a/samples/source/CustomSchema.cpp b/samples/source/CustomSchema.cpp
new file mode 100644
index 0000000..7e159b4
--- /dev/null
+++ b/samples/source/CustomSchema.cpp
@@ -0,0 +1,237 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+/**
+* Tutorial solution for the Walkthrough 3 in the XMP Programmers Guide, Working with custom schema.
+* 
+* Demonstrates how to work with a custom schema that has complex properties. It shows how to access 
+* and modify properties with complex paths using the path composition utilities from the XMP API
+*/
+
+#include <string>
+
+// Must be defined to instantiate template classes
+#define TXMP_STRING_TYPE std::string
+
+// Ensure XMP templates are instantiated
+#include "XMP.incl_cpp"
+
+// Provide access to the API
+#include "XMP.hpp"
+
+#include <iostream>
+#include <fstream>
+
+// Made up namespace URI.  Prefix will be xsdkEdit and xsdkUser
+const XMP_StringPtr  kXMP_NS_SDK_EDIT = "http://ns.adobe/meta/sdk/Edit/";
+const XMP_StringPtr  kXMP_NS_SDK_USERS = "http://ns.adobe/meta/sdk/User/";
+
+using namespace std;
+
+/**
+* Client defined callback function to dump XMP to a file.  In this case an output file stream is used
+* to write a buffer, of length bufferSize, to a text file.  This callback is called multiple 
+* times during the DumpObject() operation.  See the XMP API reference for details of 
+* XMP_TextOutputProc() callbacks.
+*/
+XMP_Status XMPFileDump(void * refCon, XMP_StringPtr buffer, XMP_StringLen bufferSize)
+{
+	XMP_Status status = 0;
+	try
+	{
+		ofstream * outFile = static_cast<ofstream*>(refCon);
+		(*outFile).write(buffer, bufferSize);
+	}
+	catch(XMP_Error & e)
+	{
+		cout << e.GetErrMsg() << endl;
+		return -1;
+	}
+	return status;
+}
+
+/**
+* Client defined callback function to dump the registered namespaces to a file.  In this case 
+* an output file stream is used to write a buffer, of length bufferSize, to a text file.  This 
+* callback is called multiple times during the DumpObject() operation.  See the XMP API 
+* reference for details of XMP_TextOutputProc() callbacks.
+*/
+XMP_Status DumpNS(void * refCon, XMP_StringPtr buffer, XMP_StringLen bufferSize)
+{
+	XMP_Status status = 0;
+
+	try
+	{
+		ofstream *outFile= static_cast<ofstream*>(refCon);
+		(*outFile).write(buffer, bufferSize);
+	}
+	catch(XMP_Error & e)
+	{
+		cout << e.GetErrMsg() << endl;
+		return -1;
+	}
+	return status;
+}
+
+/**
+* Writes an XMP packet in XML format to a text file
+* 
+* rdf - a pointer to the serialized XMP
+* filename - the name of the file to write to
+*/
+void writeRDFToFile(string * rdf, string filename)
+{
+	ofstream outFile;
+	outFile.open(filename.c_str(), ios::out);
+	outFile << *rdf;
+	outFile.close();
+}
+
+/**
+* Registers the namespaces that will be used with the custom schema.  Then adds several new
+* properties to that schema.  The properties are complex, containing nested arrays and structures.
+*
+* XMPFiles is not used in this sample, hence no external resource is updated with the metadata. The
+* created XMP object is serialized and written as RDF to a text file, the XMP object is dumped to 
+* a text file and the registered namespaces are also dumped to a text file.*
+*
+*/
+int main()
+{
+	if(!SXMPMeta::Initialize())
+	{
+		cout << "Could not initialize Toolkit!";
+	}
+	else
+	{
+		try
+		{
+			// Register the namespaces
+			string actualPrefix;
+			SXMPMeta::RegisterNamespace(kXMP_NS_SDK_EDIT, "xsdkEdit", &actualPrefix);
+			SXMPMeta::RegisterNamespace(kXMP_NS_SDK_USERS, "xsdkUser",&actualPrefix);
+
+			SXMPMeta meta;
+
+			// Adds a user of the document
+			// 1.  Add a new item onto the DocumentUsers array - 
+			// 2.  Compose a path to the last element of DocumentUsers array
+			// 3.  Add a value for the User field of the UserDetails structure
+			// 4.  Add a qualifier to the User field.  Compose the path and set the value
+			// 5.  Add a value for the DUID field of the UserDetails structure
+			// 6.  Add a Contact property for the ContactDetails field of the UserDetails structure
+			// 7.  Compose a path to the ContactDetails field of the UserDetails structure.
+			// 8.  Create the fields of the ContactDetails structure and provide values
+
+			// Create/Append the top level DocumentUsers array.  If the array exists a new item will be added
+			meta.AppendArrayItem(kXMP_NS_SDK_EDIT, "DocumentUsers", kXMP_PropValueIsArray, 0, kXMP_PropValueIsStruct);
+
+			// Compose a path to the last item in the DocumentUsers array, this will point to a UserDetails structure
+			string userItemPath;
+			SXMPUtils::ComposeArrayItemPath(kXMP_NS_SDK_EDIT, "DocumentUsers", kXMP_ArrayLastItem, &userItemPath);
+
+			// We now have a path to the structure, so we can set the field values
+			meta.SetStructField(kXMP_NS_SDK_EDIT, userItemPath.c_str(), kXMP_NS_SDK_USERS, "User", "John Smith", 0);
+
+			// Add a qualifier to the User field, first compose the path to the field and then add the qualifier
+			string userFieldPath;
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, userItemPath.c_str(), kXMP_NS_SDK_USERS, "User", &userFieldPath);
+			meta.SetQualifier(kXMP_NS_SDK_EDIT, userFieldPath.c_str(), kXMP_NS_SDK_USERS, "Role", "Dev Engineer");
+
+			// Compose a path to the DUID and set field value
+			string duidPath;
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, userItemPath.c_str(), kXMP_NS_SDK_USERS, "DUID", &duidPath);
+			meta.SetProperty_Int(kXMP_NS_SDK_EDIT, duidPath.c_str(), 2, 0);
+
+			// Add the ContactDetails field, this field is a Contact structure
+			meta.SetStructField(kXMP_NS_SDK_EDIT, userItemPath.c_str(), kXMP_NS_SDK_USERS, "ContactDetails", 0, kXMP_PropValueIsStruct);
+
+			// Compose a path to the field that has the ContactDetails structure
+			string contactStructPath;
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, userItemPath.c_str(), kXMP_NS_SDK_USERS, "ContactDetails", &contactStructPath);
+
+			// Now add the fields - all empty initially
+			meta.SetStructField(kXMP_NS_SDK_EDIT, contactStructPath.c_str(), kXMP_NS_SDK_USERS, "Email", 0, kXMP_PropArrayIsAlternate);	
+			meta.SetStructField(kXMP_NS_SDK_EDIT, contactStructPath.c_str(), kXMP_NS_SDK_USERS, "Telephone", 0, kXMP_PropValueIsArray);
+			meta.SetStructField(kXMP_NS_SDK_EDIT, contactStructPath.c_str(), kXMP_NS_SDK_USERS, "BaseLocation", "", 0);
+
+			// Add some values for the fields
+			// Email: Get the path to the field named 'Email' in the ContactDetails structure and use it to append items
+			string path;
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, contactStructPath.c_str(), kXMP_NS_SDK_USERS, "Email", &path);
+			meta.AppendArrayItem(kXMP_NS_SDK_EDIT, path.c_str(), 0, "js@adobe.meta.com", 0);
+			meta.AppendArrayItem(kXMP_NS_SDK_EDIT, path.c_str(), 0, "js@adobe.home.com", 0);
+			
+			// Telephone
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, contactStructPath.c_str(), kXMP_NS_SDK_USERS, "Telephone", &path);
+			meta.AppendArrayItem(kXMP_NS_SDK_EDIT, path.c_str(), 0, "89112", 0);
+			meta.AppendArrayItem(kXMP_NS_SDK_EDIT, path.c_str(), 0, "84432", 0);
+
+			// BaseLocation
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, contactStructPath.c_str(), kXMP_NS_SDK_USERS, "BaseLocation", &path);
+			meta.SetProperty(kXMP_NS_SDK_EDIT, path.c_str(), "London", 0);
+
+			// Add a user edit
+			// 1.  Add an item (a structure) to the DocumentEdit array
+			// 2.  Compose a path to the last item in the DocumentEdit array
+			// 3.  Add fields and values to the EditDetails structure
+
+			// Create the array
+			meta.AppendArrayItem(kXMP_NS_SDK_EDIT, "DocumentEdit", kXMP_PropArrayIsOrdered, 0, kXMP_PropValueIsStruct);
+
+			// Compose a path to the last item of the DocumentEdit array, this gives the path to the structure
+			string lastItemPath;
+			SXMPUtils::ComposeArrayItemPath(kXMP_NS_SDK_EDIT, "DocumentEdit", kXMP_ArrayLastItem, &lastItemPath);
+
+			// Add the Date field
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, lastItemPath.c_str(), kXMP_NS_SDK_EDIT, "EditDate", &path);
+			XMP_DateTime dt;
+			SXMPUtils::CurrentDateTime(&dt);
+			meta.SetProperty_Date(kXMP_NS_SDK_EDIT, path.c_str(), dt, 0);
+
+			// Add the DUID field
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, lastItemPath.c_str(), kXMP_NS_SDK_EDIT, "DUID", &path);
+			meta.SetProperty_Int(kXMP_NS_SDK_EDIT, path.c_str(), 2, 0);
+			
+			// Add the EditComments field
+			SXMPUtils::ComposeStructFieldPath(kXMP_NS_SDK_EDIT, lastItemPath.c_str(), kXMP_NS_SDK_EDIT, "EditComments", &path);
+			meta.SetLocalizedText(kXMP_NS_SDK_EDIT, path.c_str(), "en", "en-US", "Document created.", 0);
+
+			// Add the EditTool field
+			meta.SetStructField(kXMP_NS_SDK_EDIT, lastItemPath.c_str(), kXMP_NS_SDK_EDIT, "EditTool", "FrameXML", 0);
+			
+			// Write the RDF to a file
+			cout << "writing RDF to file CS_RDF.txt" << endl;
+			string metaBuffer;
+			meta.SerializeToBuffer(&metaBuffer);
+			writeRDFToFile(&metaBuffer, "CS_RDF.txt");
+			
+			// Dump the XMP object
+			cout << "dumping XMP object to file XMPDump.txt" << endl;
+			ofstream dumpFile;
+			dumpFile.open("XMPDump.txt", ios::out);
+			meta.DumpObject(XMPFileDump, &dumpFile);
+			dumpFile.close();
+
+			// Dump the namespaces to a file
+			cout << "dumping namespaces to file NameDump.txt" << endl;
+			dumpFile.open("NameDump.txt", ios::out);
+			meta.DumpNamespaces(XMPFileDump, &dumpFile);
+			dumpFile.close();
+			
+		}
+		catch(XMP_Error & e)
+		{
+			cout << "ERROR: " << e.GetErrMsg();
+		}
+
+		SXMPMeta::Terminate();
+	}
+
+	return 0;
+}
diff --git a/samples/source/DumpMainXMP.cpp b/samples/source/DumpMainXMP.cpp
index 805b999..06d367a 100644
--- a/samples/source/DumpMainXMP.cpp
+++ b/samples/source/DumpMainXMP.cpp
@@ -1,14 +1,16 @@
-// XMP Toolkit sample application to dump the main XMP packet in a file using the XMP File Handler
-// component of the XMP Toolkit. This is preferred over "dumb" packet scanning.
-
 // =================================================================================================
-// Copyright 2002-2005 Adobe Systems Incorporated
+// Copyright 2002-2008 Adobe Systems Incorporated
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
 // of the Adobe license agreement accompanying it.
 // =================================================================================================
 
+/**
+* Uses the XMPFiles component API to find the main XMP Packet for a data file, serializes the XMP, and writes 
+* it to a human-readable log file. This is preferred over "dumb" packet scanning.
+*/
+
 #include <string>
 #include <time.h>
 
@@ -98,7 +100,7 @@ ProcessFile ( const char * fileName  )
 
 // =================================================================================================
 
-extern "C" int
+int
 main ( int argc, const char * argv [] )
 {
 
@@ -108,51 +110,20 @@ main ( int argc, const char * argv [] )
 	}	
 
 	if ( ! SXMPFiles::Initialize() ) {
-		fprintf ( sLogFile, "## SXMPFiles::Initialize failed!\n" );
+		printf ( "## SXMPFiles::Initialize failed!\n" );
 		return -1;
 	}
 
-	if ( argc > 1 ) {
-	
-		printf ( "\n" );
-		for ( int i = 1; i < argc; i++ ) ProcessFile ( argv[i] );
-	
-	} else {
-
-		char fileNameBuffer[1025];
-
-		while ( true ) {
-		
-			printf ( "\nFile: " );
-			fgets( fileNameBuffer, sizeof(fileNameBuffer), stdin );
-			string	fileName ( fileNameBuffer );
-
-			if ( fileName.empty() ) break;
-
-			if ( (fileName[fileName.size()-1] == '\n') || (fileName[fileName.size()-1] == '\r') ) {
-				fileName.erase ( fileName.size()-1, 1 );	// Remove eol, allowing for CRLF.
-				if ( (fileName[fileName.size()-1] == '\n') || (fileName[fileName.size()-1] == '\r') ) {
-					fileName.erase ( fileName.size()-1, 1 );
-				}
-			}
-
-			if ( fileName == "." ) break;
-			
-			// Dragging an icon on Windows pastes a quoted path.
-			if ( fileName[fileName.size()-1] == '"' ) fileName.erase ( fileName.size()-1, 1 );
-			if ( fileName[0] == '"' ) fileName.erase ( 0, 1 );
-
-			if ( ! fileName.empty() ) {
-				printf ( "\n" );
-				ProcessFile ( fileName.c_str() );
-			}
-		
-		}
-
+	if ( argc != 2 ) // 2 := command and 1 parameter
+	{
+		printf( "usage: DumpMainXMP (filename)\n");
+		return 0;
 	}
+
+	ProcessFile ( argv[1] );
 		
 	SXMPFiles::Terminate();
 	SXMPMeta::Terminate();
+	
 	return 0;
-
 }
diff --git a/samples/source/DumpScannedXMP.cpp b/samples/source/DumpScannedXMP.cpp
index c8c5f94..37929c6 100644
--- a/samples/source/DumpScannedXMP.cpp
+++ b/samples/source/DumpScannedXMP.cpp
@@ -1,11 +1,16 @@
 // =================================================================================================
-// Copyright 2002-2005 Adobe Systems Incorporated
+// Copyright 2002-2008 Adobe Systems Incorporated
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
 // of the Adobe license agreement accompanying it.
 // =================================================================================================
 
+/**
+* Scans a data file to find all embedded XMP Packets, without using the smart handlers. If a packet is found, 
+* serializes the XMP and writes it to log file.
+*/
+
 #include <string>
 #include <time.h>
 
@@ -143,44 +148,13 @@ main ( int argc, const char * argv [] )
 		return -1;
 	}	
 
-	if ( argc > 1 ) {
-	
-		printf ( "\n" );
-		for ( int i = 1; i < argc; i++ ) ProcessFile ( argv[i] );
-	
-	} else {
-
-		char fileNameBuffer[1025];
-
-		while ( true ) {
-		
-			printf ( "\nFile: " );
-			fgets( fileNameBuffer, sizeof(fileNameBuffer), stdin );
-			string	fileName ( fileNameBuffer );
-
-			if ( fileName.empty() ) break;
-
-			if ( (fileName[fileName.size()-1] == '\n') || (fileName[fileName.size()-1] == '\r') ) {
-				fileName.erase ( fileName.size()-1, 1 );	// Remove eol, allowing for CRLF.
-				if ( (fileName[fileName.size()-1] == '\n') || (fileName[fileName.size()-1] == '\r') ) {
-					fileName.erase ( fileName.size()-1, 1 );
-				}
-			}
-
-			if ( fileName == "." ) break;
-			
-			// Dragging an icon on Windows pastes a quoted path.
-			if ( fileName[fileName.size()-1] == '"' ) fileName.erase ( fileName.size()-1, 1 );
-			if ( fileName[0] == '"' ) fileName.erase ( 0, 1 );
-
-			if ( ! fileName.empty() ) {
-				printf ( "\n" );
-				ProcessFile ( fileName.c_str() );
-			}
-		
-		}
-
+	if ( argc != 2 ) // 2 := command and 1 parameter
+	{
+		printf ("usage: DumpScannedXMP (filename)\n");
+		return 0;
 	}
+
+	ProcessFile ( argv[1] );
 		
 	SXMPMeta::Terminate();
 	return 0;
diff --git a/samples/source/ModifyingXMP.cpp b/samples/source/ModifyingXMP.cpp
new file mode 100644
index 0000000..7b73bc0
--- /dev/null
+++ b/samples/source/ModifyingXMP.cpp
@@ -0,0 +1,297 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+/**
+* Tutorial solution for Walkthrough 2 in the XMP Programmers Guide, Modifying XMP
+* Demonstrates how to open a file for update, and modifying the contained XMP before writing it back to the file.
+*/
+
+#include <string>
+
+// Must be defined to instantiate template classes
+#define TXMP_STRING_TYPE std::string 
+
+// Must be defined to give access to XMPFiles
+#define XMP_INCLUDE_XMPFILES 1 
+
+// Ensure XMP templates are instantiated
+#include "XMP.incl_cpp"
+
+// Provide access to the API
+#include "XMP.hpp"
+
+#include <iostream>
+#include <fstream>
+
+using namespace std; 
+
+/**
+* Display some property values to the console
+* 
+* meta - a pointer to the XMP object that will have the properties read
+*/
+void displayPropertyValues(SXMPMeta * meta)
+{
+	// Read a simple property
+	string simpleValue;  //Stores the value for the property
+	meta->GetProperty(kXMP_NS_XMP, "CreatorTool", &simpleValue, 0);
+	cout << "meta:CreatorTool = " << simpleValue << endl;
+
+	// Get the first and second element in the dc:creator array
+	string elementValue;
+	meta->GetArrayItem(kXMP_NS_DC, "creator", 1, &elementValue, 0);
+	if(elementValue != "")
+	{
+		cout << "dc:creator[1] = " << elementValue << endl;
+		meta->GetArrayItem(kXMP_NS_DC, "creator", 2, &elementValue, 0);
+		cout << "dc:creator[2] = " << elementValue << endl;
+	}
+
+	// Get the the entire dc:subject array 
+	string propValue;
+	int arrSize = meta->CountArrayItems(kXMP_NS_DC, "subject");
+	for(int i = 1; i <= arrSize;i++)
+	{
+		meta->GetArrayItem(kXMP_NS_DC, "subject", i, &propValue, 0);
+		cout << "dc:subject[" << i << "] = " << propValue << endl;
+	}
+
+	// Get the dc:title for English and French
+	string itemValue;
+	string actualLang;
+	meta->GetLocalizedText(kXMP_NS_DC, "title", "en", "en-US", 0, &itemValue, 0);
+	cout << "dc:title in English = " << itemValue << endl;
+
+	meta->GetLocalizedText(kXMP_NS_DC, "title", "fr", "fr-FR", 0, &itemValue, 0);
+	cout << "dc:title in French = " << itemValue << endl;
+
+	// Get dc:MetadataDate
+	XMP_DateTime myDate;
+	if(meta->GetProperty_Date(kXMP_NS_XMP, "MetadataDate", &myDate, 0))
+	{
+		// Convert the date struct into a convenient string and display it
+		string myDateStr;
+		SXMPUtils::ConvertFromDate(myDate, &myDateStr);
+		cout << "meta:MetadataDate = " << myDateStr << endl;						 
+	}
+
+	cout << "----------------------------------------" << endl;
+}
+
+/**
+* Creates an XMP object from an RDF string.  The string is used to
+* to simulate creating and XMP object from multiple input buffers.
+* The last call to ParseFromBuffer has no kXMP_ParseMoreBuffers options,
+* thereby indicating this is the last input buffer.
+*/
+SXMPMeta createXMPFromRDF()
+{
+	const char * rdf = 
+		"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+			"<rdf:Description rdf:about='' xmlns:dc='http://purl.org/dc/elements/1.1/'>"
+				"<dc:subject>"
+					"<rdf:Bag>"
+						"<rdf:li>XMP</rdf:li>"
+						"<rdf:li>SDK</rdf:li>"
+						"<rdf:li>Sample</rdf:li>"
+					"</rdf:Bag>"
+				"</dc:subject>"
+				"<dc:format>image/tiff</dc:format>"
+			"</rdf:Description>"
+		"</rdf:RDF>";
+
+	SXMPMeta meta;
+	// Loop over the rdf string and create the XMP object
+	// 10 characters at a time 
+	int i;
+	for (i = 0; i < (long)strlen(rdf) - 10; i += 10 )
+	{
+		meta.ParseFromBuffer ( &rdf[i], 10, kXMP_ParseMoreBuffers );
+	}
+	
+	// The last call has no kXMP_ParseMoreBuffers options, signifying 
+	// this is the last input buffer
+	meta.ParseFromBuffer ( &rdf[i], (XMP_StringLen) strlen(rdf) - i );
+	return meta;
+
+}
+
+/**
+* Writes an XMP packet in XML format to a text file
+* 
+* rdf - a pointer to the serialized XMP
+* filename - the name of the file to write to
+*/
+void writeRDFToFile(string * rdf, string filename)
+{
+	ofstream outFile;
+	outFile.open(filename.c_str(), ios::out);
+	outFile << *rdf;
+	outFile.close();
+}
+
+/**
+* Initializes the toolkit and attempts to open a file for updating its metadata. Initially
+* an attempt to open the file is done with a handler, if this fails then the file is opened with
+* packet scanning. Once the file is open several properties are read and displayed in the console.
+*
+* Several properties are then modified, first by checking for their existence and then, if they 
+* exist, by updating their values. The updated properties are then displayed again in the console. 
+*
+* Next a new XMP object is created from an RDF stream, the properties from the new XMP object are
+* appended to the original XMP object and the updated properties are displayed in the console for
+* last time.
+*
+* The updated XMP object is then serialized in different formats and written to text files.  Lastly,
+* the modified XMP is written back to the resource file.
+*/
+int main ( int argc, const char * argv[] )
+{
+	if ( argc != 2 ) // 2 := command and 1 parameter
+	{
+		cout << "usage: ModifyingXMP (filename)" << endl;
+		return 0;
+	}
+
+	string filename = string( argv[1] );
+
+	if(!SXMPMeta::Initialize())
+	{
+		cout << "Could not initialize toolkit!";
+		return -1;
+	}
+
+	// Must initialize SXMPFiles before we use it
+	if(SXMPFiles::Initialize())
+	{
+		try
+		{
+			// Options to open the file with - open for editing and use a smart handler
+			XMP_OptionBits opts = kXMPFiles_OpenForUpdate | kXMPFiles_OpenUseSmartHandler;
+
+			bool ok;
+			SXMPFiles myFile;
+			std::string status = "";
+
+			// First we try and open the file
+			ok = myFile.OpenFile(filename, kXMP_UnknownFile, opts);
+			if( ! ok )
+			{
+				status += "No smart handler available for " + filename + "\n";
+				status += "Trying packet scanning.\n";
+
+				// Now try using packet scanning
+				opts = kXMPFiles_OpenForUpdate | kXMPFiles_OpenUsePacketScanning;
+				ok = myFile.OpenFile(filename, kXMP_UnknownFile, opts);
+			}
+
+			// If the file is open then read get the XMP data
+			if(ok)
+			{
+				cout << status << endl;
+				cout << filename << " is opened successfully" << endl;
+				// Create the XMP object and get the XMP data
+				SXMPMeta meta;
+				myFile.GetXMP(&meta);
+
+				// Display some properties in the console
+				displayPropertyValues(&meta);
+				
+				///////////////////////////////////////////////////
+				// Now modify the XMP
+				if(meta.DoesPropertyExist(kXMP_NS_XMP, "CreatorTool"))
+				{
+					// Update xap:CreatorTool - we don't need to set any option bits
+					meta.SetProperty(kXMP_NS_XMP, "CreatorTool", "Updated By XMP SDK", 0);
+				}
+
+				// Update the Metadata Date
+				XMP_DateTime updatedTime;
+				// Get the current time.  This is a UTC time automatically 
+				// adjusted for the local time
+				SXMPUtils::CurrentDateTime(&updatedTime);
+				if(meta.DoesPropertyExist(kXMP_NS_XMP, "MetadataDate"))
+				{
+					meta.SetProperty_Date(kXMP_NS_XMP, "MetadataDate", updatedTime, 0);
+				}
+				
+				// Add an item onto the dc:creator array
+				// Note the options used, kXMP_PropArrayIsOrdered, if the array does not exist it will be created
+				meta.AppendArrayItem(kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered, "Author Name", 0);
+				meta.AppendArrayItem(kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered, "Another Author Name", 0);
+
+				// Now update alt-text properties
+				meta.SetLocalizedText(kXMP_NS_DC, "title", "en", "en-US", "An English title");
+				meta.SetLocalizedText(kXMP_NS_DC, "title", "fr", "fr-FR", "Un titre Francais");
+				
+				// Display the properties again to show changes
+				cout << "After update:" << endl;
+				displayPropertyValues(&meta);
+
+				// Create a new XMP object from an RDF string
+				SXMPMeta rdfMeta = createXMPFromRDF();
+
+				// Append the newly created properties onto the original XMP object
+				// This will:
+				// a) Add ANY new TOP LEVEL properties in the source (rdfMeta) to the destination (meta)
+				// b) Replace any top level properties in the source with the matching properties from the destination
+				SXMPUtils::AppendProperties(rdfMeta, &meta, (kXMPUtil_DoAllProperties | kXMPUtil_ReplaceOldValues ));
+
+				// Display the properties again to show changes
+				cout << "After Appending Properties:" << endl;
+				displayPropertyValues(&meta);
+
+				// Serialize the packet and write the buffer to a file
+				// Let the padding be computed and use the default linefeed and indents without limits
+				string metaBuffer;
+				meta.SerializeToBuffer(&metaBuffer, 0, 0, "", "", 0);
+
+				// Write the packet to a file as RDF
+				writeRDFToFile(&metaBuffer, filename+"_XMP_RDF.txt");
+								
+				// Write the packet to a file but this time as compact RDF
+				XMP_OptionBits outOpts = kXMP_OmitPacketWrapper | kXMP_UseCompactFormat;
+				meta.SerializeToBuffer(&metaBuffer, outOpts);
+				writeRDFToFile(&metaBuffer, filename+"_XMP_RDF_Compact.txt");
+
+				// Check we can put the XMP packet back into the file
+				if(myFile.CanPutXMP(meta))
+				{
+					// If so then update the file with the modified XMP
+					myFile.PutXMP(meta);
+				}
+			
+				// Close the SXMPFile.  This *must* be called.  The XMP is not
+				// actually written and the disk file is not closed until this call is made.
+				myFile.CloseFile();
+			}
+			else
+			{
+				cout << "Unable to open " << filename << endl;
+			}
+		}
+		catch(XMP_Error & e)
+		{
+			cout << "ERROR: " << e.GetErrMsg() << endl;
+		}
+
+		// Terminate the toolkit
+		SXMPFiles::Terminate();
+		SXMPMeta::Terminate();
+
+	}
+	else
+	{
+		cout << "Could not initialize SXMPFiles.";
+		return -1;
+	}
+	
+	return 0;
+}
+
+
diff --git a/samples/source/ReadingXMP.cpp b/samples/source/ReadingXMP.cpp
new file mode 100644
index 0000000..b1ec3c4
--- /dev/null
+++ b/samples/source/ReadingXMP.cpp
@@ -0,0 +1,204 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+/**
+* Tutorial solution for the Walkthrough 1 in the XMP Programmers Guide, Opening files and reading XMP.
+* Demonstrates the basic use of the XMPFiles and XMPCore components, obtaining read-only XMP from a file 
+* and examining it through the XMP object.
+*/
+
+#include <string>
+
+// Must be defined to instantiate template classes
+#define TXMP_STRING_TYPE std::string 
+
+// Must be defined to give access to XMPFiles
+#define XMP_INCLUDE_XMPFILES 1 
+
+// Ensure XMP templates are instantiated
+#include "XMP.incl_cpp"
+
+// Provide access to the API
+#include "XMP.hpp"
+
+#include <iostream>
+#include <fstream>
+
+using namespace std; 
+
+/**
+* Client defined callback function to dump XMP to a file.  In this case an output file stream is used
+* to write a buffer, of length bufferSize, to a text file.  This callback is called multiple 
+* times during the DumpObject() operation.  See the XMP API reference for details of 
+* XMP_TextOutputProc() callbacks.
+*/
+XMP_Status DumpXMPToFile(void * refCon, XMP_StringPtr buffer, XMP_StringLen bufferSize)
+{
+	XMP_Status status = 0;
+	
+	try
+	{
+		ofstream * outFile = static_cast<ofstream*>(refCon);
+		(*outFile).write(buffer, bufferSize);
+	}
+	catch(XMP_Error & e)
+	{
+		cout << e.GetErrMsg() << endl;
+		return -1;  // Return a bad status
+	}
+
+	return status;
+}
+
+/**
+*	Initializes the toolkit and attempts to open a file for reading metadata.  Initially
+* an attempt to open the file is done with a handler, if this fails then the file is opened with
+* packet scanning. Once the file is open several properties are read and displayed in the console.  
+* The XMP object is then dumped to a text file and the resource file is closed.
+*/
+int main ( int argc, const char * argv[] )
+{
+	if ( argc != 2 ) // 2 := command and 1 parameter
+	{
+		cout << "usage: ReadingXMP (filename)" << endl;
+		return 0;
+	}
+	
+	string filename = string( argv[1] );
+
+	if(!SXMPMeta::Initialize())
+	{
+		cout << "Could not initialize toolkit!";
+		return -1;
+	}
+	
+	// Must initialize SXMPFiles before we use it
+	if ( ! SXMPFiles::Initialize() )
+	{
+		cout << "Could not initialize SXMPFiles.";
+		return -1;
+	}
+	
+	try
+	{
+		// Options to open the file with - read only and use a file handler
+		XMP_OptionBits opts = kXMPFiles_OpenForRead | kXMPFiles_OpenUseSmartHandler;
+
+		bool ok;
+		SXMPFiles myFile;			
+		std::string status = "";
+
+		// First we try and open the file
+		ok = myFile.OpenFile(filename, kXMP_UnknownFile, opts);
+		if( ! ok )
+		{
+			status += "No smart handler available for " + filename + "\n";
+			status += "Trying packet scanning.\n";
+
+			// Now try using packet scanning
+			opts = kXMPFiles_OpenForUpdate | kXMPFiles_OpenUsePacketScanning;
+			ok = myFile.OpenFile(filename, kXMP_UnknownFile, opts);
+		}
+
+
+		// If the file is open then read the metadata
+		if(ok)
+		{
+			cout << status << endl;
+			cout << filename << " is opened successfully" << endl;
+			// Create the xmp object and get the xmp data
+			SXMPMeta meta;
+			myFile.GetXMP(&meta);
+
+			bool exists;
+
+			// Read a simple property
+			string simpleValue;  //Stores the value for the property
+			exists = meta.GetProperty(kXMP_NS_XMP, "CreatorTool", &simpleValue, NULL);
+			if(exists)
+				cout << "CreatorTool = " << simpleValue << endl;
+			else
+				simpleValue.clear();
+
+			// Get the first element in the dc:creator array
+			string elementValue;
+			exists = meta.GetArrayItem(kXMP_NS_DC, "creator", 1, &elementValue, NULL);
+			if(exists)
+				cout << "dc:creator = " << elementValue << endl;
+			else
+				elementValue.clear();
+
+			// Get the the entire dc:subject array 
+			string propValue;
+			int arrSize = meta.CountArrayItems(kXMP_NS_DC, "subject");
+			for(int i = 1; i <= arrSize;i++)
+			{
+				meta.GetArrayItem(kXMP_NS_DC, "subject", i, &propValue, 0);
+				cout << "dc:subject[" << i << "] = " << propValue << endl;
+			}
+
+			// Get the dc:title for English and French
+			string itemValue;
+			string actualLang;
+			meta.GetLocalizedText(kXMP_NS_DC, "title", "en", "en-US", NULL, &itemValue, NULL);
+			cout << "dc:title in English = " << itemValue << endl;
+
+			meta.GetLocalizedText(kXMP_NS_DC, "title", "fr", "fr-FR", NULL, &itemValue, NULL);
+			cout << "dc:title in French = " << itemValue << endl;
+
+			// Get dc:MetadataDate
+			XMP_DateTime myDate;
+			if(meta.GetProperty_Date(kXMP_NS_XMP, "MetadataDate", &myDate, NULL))
+			{
+				// Convert the date struct into a convenient string and display it
+				string myDateStr;
+				SXMPUtils::ConvertFromDate(myDate, &myDateStr);
+				cout << "meta:MetadataDate = " << myDateStr << endl;						 
+			}
+
+			// See if the flash struct exists and see if it was used
+			string path, value;
+			exists = meta.DoesStructFieldExist(kXMP_NS_EXIF, "Flash", kXMP_NS_EXIF,"Fired");
+			if(exists)
+			{
+				bool flashFired;
+				SXMPUtils::ComposeStructFieldPath(kXMP_NS_EXIF, "Flash", kXMP_NS_EXIF, "Fired", &path);
+				meta.GetProperty_Bool(kXMP_NS_EXIF, path.c_str(), &flashFired, NULL);
+				string flash = (flashFired) ? "True" : "False";
+
+				cout << "Flash Used = " << flash << endl;
+			}
+
+			// Dump the current xmp object to a file
+			ofstream dumpFile;
+			dumpFile.open("XMPDump.txt", ios::out);
+			meta.DumpObject(DumpXMPToFile, &dumpFile);
+			dumpFile.close();
+			cout << endl << "XMP dumped to XMPDump.txt" << endl;
+
+			// Close the SXMPFile.  The resource file is already closed if it was
+			// opened as read only but this call must still be made.
+			myFile.CloseFile();
+		}
+		else
+		{
+			cout << "Unable to open " << filename << endl;
+		}
+	}
+	catch(XMP_Error & e)
+	{
+		cout << "ERROR: " << e.GetErrMsg() << endl;
+	}
+
+	// Terminate the toolkit
+	SXMPFiles::Terminate();
+	SXMPMeta::Terminate();
+
+	return 0;
+}
+
diff --git a/samples/source/XMPCoreCoverage.cpp b/samples/source/XMPCoreCoverage.cpp
index feb6306..c0c2cef 100644
--- a/samples/source/XMPCoreCoverage.cpp
+++ b/samples/source/XMPCoreCoverage.cpp
@@ -1,3 +1,15 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+/**
+* Demonstrates syntax and usage by exercising most of the API functions of XMPCore Toolkit SDK component, 
+* using a sample XMP Packet that contains all of the different property and attribute types.
+*/
 #include <string>
 #include <iostream>
 #include <iomanip>
@@ -18,6 +30,7 @@ using namespace std;
 #if WIN_ENV
 	#pragma warning ( disable : 4100 )	// ignore unused variable
 	#pragma warning ( disable : 4127 )	// conditional expression is constant
+	#pragma warning ( disable : 4267 )	// possible loss of data (temporary for 64-bit builds)
 	#pragma warning ( disable : 4505 )	// unreferenced local function has been removed
 	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
 #endif
@@ -1927,6 +1940,8 @@ extern "C" int main ( int /*argc*/, const char * argv [] )
 
 	try {
 
+// *** Add memory leak checking for both DLL and static builds ***
+
 		if ( ! SXMPMeta::Initialize() ) {
 			fprintf ( log, "## XMPMeta::Initialize failed!\n" );
 			return -1;
@@ -1946,10 +1961,14 @@ extern "C" int main ( int /*argc*/, const char * argv [] )
 	}
 
 	SXMPMeta::Terminate();
+
 	now = time(0);
 	fprintf ( log, "XMPCoreCoverage finished %s", ctime(&now) );
 	fprintf ( log,	"Final status = %d\n", result );
 	fclose ( log );
+	
+	printf( "results have been logged into %s\n", logName );
+	
 	return result;
 
 }
diff --git a/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp
index 768d055..84e5e27 100644
--- a/samples/source/XMPFilesCoverage.cpp
+++ b/samples/source/XMPFilesCoverage.cpp
@@ -1,3 +1,16 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+/**
+* Demonstrates syntax and usage by exercising most of the API functions of XMPFiles Toolkit SDK component, 
+* using a sample XMP Packet that contains all of the different property and attribute types.
+*/
+
 #include <vector>
 #include <string>
 #include <stdexcept>
@@ -238,7 +251,15 @@ static void TestOneFile ( const char * fileName )
 
 	xmpFile.PutXMP ( xmpMeta );
 	XMP_OptionBits closeOptions = 0;
-	if ( (xmpMeta.CountArrayItems ( kXMP_NS_XMP, "XMPFileStamps" ) & 1) == 0 ) closeOptions |= kXMPFiles_UpdateSafely;
+	XMP_OptionBits capabilities = 0;
+	XMP_FileFormat fileFormat = 0;
+	xmpFile.GetFileInfo( NULL, NULL, &fileFormat, NULL);
+	SXMPFiles::GetFormatInfo( fileFormat, &capabilities);
+
+	if ( (xmpMeta.CountArrayItems ( kXMP_NS_XMP, "XMPFileStamps" ) & 1) == 0
+			&& ( capabilities & kXMPFiles_AllowsSafeUpdate ) ) 
+		closeOptions |= kXMPFiles_UpdateSafely;
+
 	xmpFile.CloseFile ( closeOptions );
 
 	fprintf ( sLogFile, "\n" );
@@ -258,7 +279,7 @@ extern "C" int main ( int argc, const char * argv[] )
 	int result = 0;
 
 	char   logName[256];
-	int    nameLen = strlen ( argv[0] );
+	int    nameLen = (int) strlen ( argv[0] );
 	if ( (nameLen >= 4) && (strcmp ( argv[0]+nameLen-4, ".exe" ) == 0) ) nameLen -= 4;
 	memcpy ( logName, argv[0], nameLen );
 	memcpy ( &logName[nameLen], "Log.txt", 8 );	// Include final null.
@@ -285,18 +306,18 @@ extern "C" int main ( int argc, const char * argv[] )
 		
 		DumpHandlerInfo();
 	
-		TestOneFile ( "BlueSquares/BlueSquare.ai" );
-		TestOneFile ( "BlueSquares/BlueSquare.eps" );
-		TestOneFile ( "BlueSquares/BlueSquare.indd" );
-		TestOneFile ( "BlueSquares/BlueSquare.jpg" );
-		TestOneFile ( "BlueSquares/BlueSquare.pdf" );
-		TestOneFile ( "BlueSquares/BlueSquare.psd" );
-		TestOneFile ( "BlueSquares/BlueSquare.tif" );
-		TestOneFile ( "BlueSquares/BlueSquare.avi" );
-		TestOneFile ( "BlueSquares/BlueSquare.mov" );
-		TestOneFile ( "BlueSquares/BlueSquare.mp3" );
-		TestOneFile ( "BlueSquares/BlueSquare.wav" );
-		TestOneFile ( "BlueSquares/BlueSquare.png" );
+		TestOneFile ( "../../../testfiles/BlueSquare.ai" );
+		TestOneFile ( "../../../testfiles/BlueSquare.eps" );
+		TestOneFile ( "../../../testfiles/BlueSquare.indd" );
+		TestOneFile ( "../../../testfiles/BlueSquare.jpg" );
+		TestOneFile ( "../../../testfiles/BlueSquare.pdf" );
+		TestOneFile ( "../../../testfiles/BlueSquare.psd" );
+		TestOneFile ( "../../../testfiles/BlueSquare.tif" );
+		TestOneFile ( "../../../testfiles/BlueSquare.avi" );
+		TestOneFile ( "../../../testfiles/BlueSquare.mov" );
+		TestOneFile ( "../../../testfiles/BlueSquare.mp3" );
+		TestOneFile ( "../../../testfiles/BlueSquare.wav" );
+		TestOneFile ( "../../../testfiles/BlueSquare.png" );
 
 	} catch ( XMP_Error & excep ) {
 
@@ -317,6 +338,9 @@ extern "C" int main ( int argc, const char * argv[] )
 	fprintf ( sLogFile, "\nXMPFilesCoverage finished %s", ctime(&now) );
 	fprintf ( sLogFile,	"Final status = %d\n", result );
 	fclose ( sLogFile );
+	
+	printf( "\nresults have been logged into %s\n", logName );
+	
 	return result;
 
 }	// main
diff --git a/samples/source/XMPScanner.cpp b/samples/source/XMPScanner.cpp
index 6527b0e..63f03d0 100644
--- a/samples/source/XMPScanner.cpp
+++ b/samples/source/XMPScanner.cpp
@@ -1,5 +1,5 @@
 // =================================================================================================
-// Copyright 2002-2006 Adobe Systems Incorporated
+// Copyright 2002-2007 Adobe Systems Incorporated
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
@@ -9,10 +9,11 @@
 // one format in a file with a different format', inventors: Sean Parent, Greg Gilley.
 // =================================================================================================
 
-#if WIN_ENV
+#if WIN32
 	#pragma warning ( disable : 4127 )	// conditional expression is constant
-	#pragma warning ( disable : 4702 )	// unreachable code
-	#pragma warning ( disable : 4786 )	// The VC++ debugger can't handle long symbol names.
+	#pragma warning ( disable : 4510 )	// default constructor could not be generated
+	#pragma warning ( disable : 4610 )	// user defined constructor required
+	#pragma warning ( disable : 4786 )	// debugger can't handle long symbol names
 #endif
 
 
@@ -20,11 +21,14 @@
 
 #include <cassert>
 #include <string>
-#include <iostream>
-#include <iomanip>
-#include <fstream>
 #include <cstdlib>
 
+#if DEBUG
+	#include <iostream>
+	#include <iomanip>
+	#include <fstream>
+#endif
+
 
 #ifndef UseStringPushBack	// VC++ 6.x does not provide push_back for strings!
 	#define UseStringPushBack	0
@@ -81,7 +85,7 @@ using namespace std;
 // PacketMachine
 // =============
 
-XMPScanner::PacketMachine::PacketMachine ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength ) :
+XMPScanner::PacketMachine::PacketMachine ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 bufferLength ) :
 
 	// Public members
 	fPacketStart ( 0 ),
@@ -130,7 +134,7 @@ XMPScanner::PacketMachine::~PacketMachine ()
 // ===============
 
 void
-XMPScanner::PacketMachine::AssociateBuffer ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength )
+XMPScanner::PacketMachine::AssociateBuffer ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 bufferLength )
 {
 
 	fBufferOffset = bufferOffset;
@@ -783,13 +787,15 @@ XMPScanner::PacketMachine::CheckPacketEnd ( PacketMachine * ths, const char * /*
 
 	if ( ths->fPosition == 0 ) {	// First call, decide if there is trailing padding.
 	
-		const SInt64 currLength = (ths->fBufferOffset + (ths->fBufferPtr - ths->fBufferOrigin)) - ths->fPacketStart;
-
+		const XMP_Int64 currLen64 = (ths->fBufferOffset + (ths->fBufferPtr - ths->fBufferOrigin)) - ths->fPacketStart;
+		if ( currLen64 > 0x7FFFFFFF ) throw std::runtime_error ( "Packet length exceeds 2GB-1" );
+		const XMP_Int32 currLength = (XMP_Int32)currLen64;
+		
 		if ( (ths->fBytesAttr != -1) && (ths->fBytesAttr != currLength) ) {
 			if ( ths->fBytesAttr < currLength ) {
 				ths->fBogusPacket = true;	// The bytes attribute value is too small.
 			} else {
-				ths->fPosition = (signed long)(ths->fBytesAttr - currLength);
+				ths->fPosition = ths->fBytesAttr - currLength;
 				if ( (ths->fPosition % ths->fBytesPerChar) != 0 ) {
 					ths->fBogusPacket = true;	// The padding is not a multiple of the character size.
 					ths->fPosition = (ths->fPosition / ths->fBytesPerChar) * ths->fBytesPerChar;
@@ -815,7 +821,9 @@ XMPScanner::PacketMachine::CheckPacketEnd ( PacketMachine * ths, const char * /*
 
 	}
 	
-	ths->fPacketLength = (ths->fBufferOffset + (ths->fBufferPtr - ths->fBufferOrigin)) - ths->fPacketStart;
+	const XMP_Int64 currLen64 = (ths->fBufferOffset + (ths->fBufferPtr - ths->fBufferOrigin)) - ths->fPacketStart;
+	if ( currLen64 > 0x7FFFFFFF ) throw std::runtime_error ( "Packet length exceeds 2GB-1" );
+	ths->fPacketLength = (XMP_Int32)currLen64;
 	return eTriYes;
 
 }	// CheckPacketEnd
@@ -985,7 +993,7 @@ XMPScanner::PacketMachine::FindNextPacket ()
 // InternalSnip
 // ============
 
-XMPScanner::InternalSnip::InternalSnip ( SInt64 offset, SInt64 length )
+XMPScanner::InternalSnip::InternalSnip ( XMP_Int64 offset, XMP_Int64 length )
 {
 
 	fInfo.fOffset = offset;
@@ -1029,12 +1037,13 @@ XMPScanner::InternalSnip::~InternalSnip ()
 // DumpSnipList
 // ============
 
+#if DEBUG
+
 static const char *	snipStateName [6] = { "not-seen", "pending", "raw-data", "good-packet", "partial", "bad-packet" };
 
 void
 XMPScanner::DumpSnipList ( const char * title )
 {
-#if 1
 	InternalSnipIterator currPos = fInternalSnips.begin();
 	InternalSnipIterator endPos  = fInternalSnips.end();
 	
@@ -1046,9 +1055,10 @@ XMPScanner::DumpSnipList ( const char * title )
 		     << currSnip->fOffset << ".." << (currSnip->fOffset + currSnip->fLength - 1)
 			 << ' ' << currSnip->fLength << ' ' << endl;
 	}
-#endif
 }	// DumpSnipList
 
+#endif
+
 
 // =================================================================================================
 // PrevSnip and NextSnip
@@ -1079,7 +1089,7 @@ XMPScanner::NextSnip ( InternalSnipIterator snipPos )
 //
 // Initialize the scanner object with one "not seen" snip covering the whole stream.
 
-XMPScanner::XMPScanner ( SInt64 streamLength ) :
+XMPScanner::XMPScanner ( XMP_Int64 streamLength ) :
 
 	fStreamLength ( streamLength )
 	
@@ -1146,7 +1156,7 @@ XMPScanner::StreamAllScanned ()
 // *** happen in parallel, serialize all mucking with the list.
 
 void
-XMPScanner::SplitInternalSnip ( InternalSnipIterator snipPos, SInt64 relOffset, SInt64 newLength )
+XMPScanner::SplitInternalSnip ( InternalSnipIterator snipPos, XMP_Int64 relOffset, XMP_Int64 newLength )
 {
 
 	assert ( (relOffset + newLength) > relOffset );	// Check for overflow.
@@ -1180,7 +1190,7 @@ XMPScanner::SplitInternalSnip ( InternalSnipIterator snipPos, SInt64 relOffset,
 	if ( newLength < snipPos->fInfo.fLength ) {
 
 		InternalSnipIterator nextPos    = NextSnip ( snipPos );
-		const SInt64         tailLength = snipPos->fInfo.fLength - newLength;
+		const XMP_Int64      tailLength = snipPos->fInfo.fLength - newLength;
 
 		if ( (nextPos != fInternalSnips.end()) && (snipPos->fInfo.fState == nextPos->fInfo.fState) ) {
 			nextPos->fInfo.fOffset -= tailLength;		// Adjust the following snip.
@@ -1219,9 +1229,9 @@ XMPScanner::MergeInternalSnips ( InternalSnipIterator firstPos, InternalSnipIter
 // ====
 
 void
-XMPScanner::Scan ( const void * bufferOrigin, SInt64 bufferOffset, SInt64 bufferLength )
+XMPScanner::Scan ( const void * bufferOrigin, XMP_Int64 bufferOffset, XMP_Int64 bufferLength )
 {
-	SInt64	relOffset;
+	XMP_Int64	relOffset;
 	
 	#if 0
 		cout << "Scan: @ " << bufferOrigin << ", " << bufferOffset << ", " << bufferLength << endl;
@@ -1244,7 +1254,7 @@ XMPScanner::Scan ( const void * bufferOrigin, SInt64 bufferOffset, SInt64 buffer
 	
 	// *** It would be friendly for rescans for out of order problems to accept any buffer postion.
 	
-	const SInt64			endOffset	= bufferOffset + bufferLength - 1;
+	const XMP_Int64			endOffset	= bufferOffset + bufferLength - 1;
 	InternalSnipIterator	snipPos	= fInternalSnips.begin();
 	
 	while ( endOffset > (snipPos->fInfo.fOffset + snipPos->fInfo.fLength - 1) ) ++ snipPos;
diff --git a/samples/source/XMPScanner.hpp b/samples/source/XMPScanner.hpp
index 7f92853..2c8b6fa 100644
--- a/samples/source/XMPScanner.hpp
+++ b/samples/source/XMPScanner.hpp
@@ -2,7 +2,7 @@
 #define __XMPScanner_hpp__
 
 // =================================================================================================
-// Copyright 2002-2005 Adobe Systems Incorporated
+// Copyright 2002-2007 Adobe Systems Incorporated
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
@@ -12,12 +12,15 @@
 // one format in a file with a different format', inventors: Sean Parent, Greg Gilley.
 // =================================================================================================
 
+#include "XMP_Environment.h"	// ! This must be the first include.
+
 #include <list>
 #include <vector>
 #include <string>
 #include <memory>
 #include <stdexcept>
 
+#include "XMP_Const.h"
 
 // =================================================================================================
 // The XMPScanner class is used to scan a stream of input for XMP packets.  A scanner object is
@@ -50,10 +53,6 @@ public:
 	// It is possible to have ill-formed packets.  These have a syntactically valid header and
 	// trailer, but some semantic error.  For example, if the "bytes" attribute length does not span
 	// to the end of the trailer, or if the following packet begins within trailing padding.
-
-	typedef unsigned char	UInt8;
-	typedef unsigned long	UInt32;
-	typedef long long		SInt64;
 	
 	enum {
 		eNotSeenSnip,		// This snip has not been seen yet.
@@ -63,7 +62,7 @@ public:
 		ePartialPacketSnip,	// This snip contains the start of a possible XMP packet.
 		eBadPacketSnip		// This snip contains a complete, but semantically incorrect XMP packet.
 	};
-	typedef UInt8	SnipState;
+	typedef XMP_Uns8	SnipState;
 	
 	enum {	// The values allow easy testing for 16/32 bit and big/little endian.
 		eChar8Bit			= 0,
@@ -72,7 +71,7 @@ public:
 		eChar32BitBig		= 4,
 		eChar32BitLittle	= 5
 	};
-	typedef UInt8	CharacterForm;
+	typedef XMP_Uns8	CharacterForm;
 
 	enum {
 		eChar16BitMask			= 2,	// These constant shouldn't be used directly, they are mainly
@@ -88,14 +87,14 @@ public:
 	
 	struct SnipInfo {
 
-		SInt64			fOffset;		// The byte offset of this snip within the input stream.
-		SInt64			fLength;		// The length in bytes of this snip.
+		XMP_Int64		fOffset;		// The byte offset of this snip within the input stream.
+		XMP_Int64		fLength;		// The length in bytes of this snip.
 		SnipState		fState;			// The state of this snip.
 		bool			fOutOfOrder;	// If true, this snip was seen before the one in front of it.
 		char			fAccess;		// The read-only/read-write access from the end attribute.
 		CharacterForm	fCharForm;		// How the packet is divided into characters.
 		const char *	fEncodingAttr;	// The value of the encoding attribute, if any, with nulls removed.
-		SInt64			fBytesAttr;		// The value of the bytes attribute, -1 if not present.
+		XMP_Int64		fBytesAttr;		// The value of the bytes attribute, -1 if not present.
 
 		SnipInfo() :
 			fOffset ( 0 ),
@@ -108,7 +107,7 @@ public:
 			fBytesAttr( -1 )
 		{ }
 
-		SnipInfo ( SnipState state, SInt64 offset, SInt64 length ) :
+		SnipInfo ( SnipState state, XMP_Int64 offset, XMP_Int64 length ) :
 			fOffset ( offset ),
 			fLength ( length ),
 			fState ( state ),
@@ -123,7 +122,7 @@ public:
 	
 	typedef std::vector<SnipInfo>	SnipInfoVector;
 
-	XMPScanner ( SInt64 streamLength );
+	XMPScanner ( XMP_Int64 streamLength );
 	// Constructs a new XMPScanner object for a stream with the given length.
 	
 	~XMPScanner();
@@ -134,7 +133,7 @@ public:
  	bool StreamAllScanned();
  	// Returns true if all of the stream has been seen.
 	
-	void Scan ( const void * bufferOrigin, SInt64 bufferOffset, SInt64 bufferLength );
+	void Scan ( const void * bufferOrigin, XMP_Int64 bufferOffset, XMP_Int64 bufferLength );
 	// Scans the given part of the input, incorporating it in to the known snips.
 	// The bufferOffset is the offset of this block of input relative to the entire stream.
 	// The bufferLength is the length in bytes of this block of input.
@@ -159,10 +158,9 @@ private:	// XMPScanner
 		SnipInfo	fInfo;							// The public info about this snip.
 		std::auto_ptr<PacketMachine>	fMachine;	// The state machine for "active" snips.
 		
-		InternalSnip() {};	// Let everything default.
-		InternalSnip ( SInt64 offset, SInt64 length );
+		InternalSnip ( XMP_Int64 offset, XMP_Int64 length );
 		InternalSnip ( const InternalSnip & );
-		~InternalSnip();
+		~InternalSnip ();
 
 	};	// InternalSnip
 
@@ -172,9 +170,9 @@ private:	// XMPScanner
 	class PacketMachine {
 	public:
 		
-		SInt64			fPacketStart;	// Byte offset relative to the entire stream.
-		SInt64			fPacketLength;	// Length in bytes to the end of the trailer processing instruction.
-		SInt64			fBytesAttr;		// The value of the bytes attribute, -1 if not present.
+		XMP_Int64		fPacketStart;	// Byte offset relative to the entire stream.
+		XMP_Int32		fPacketLength;	// Length in bytes to the end of the trailer processing instruction.
+		XMP_Int32		fBytesAttr;		// The value of the bytes attribute, -1 if not present.
 		std::string		fEncodingAttr;	// The value of the encoding attribute, if any, with nulls removed.
 		CharacterForm	fCharForm;		// How the packet is divided into characters.
 		char			fAccess;		// The read-only/read-write access from the end attribute.
@@ -190,9 +188,9 @@ private:	// XMPScanner
 
 		TriState FindNextPacket();
 		
-		void AssociateBuffer ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength );
+		void AssociateBuffer ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 bufferLength );
 		
-		PacketMachine ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength );
+		PacketMachine ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 bufferLength );
 		~PacketMachine();
 	
 	private:	// PacketMachine
@@ -240,7 +238,7 @@ private:	// XMPScanner
 
 		};
 		
-		SInt64			fBufferOffset;	// The offset of the data buffer within the input stream.
+		XMP_Int64		fBufferOffset;	// The offset of the data buffer within the input stream.
 		const char *	fBufferOrigin;	// The starting address of the data buffer for this snip.
 		const char *	fBufferPtr;		// The current postion in the data buffer.
 		const char *	fBufferLimit;	// The address one past the last byte in the data buffer.
@@ -308,25 +306,25 @@ private:	// XMPScanner
 		
 	};	// PacketMachine
 	
-	SInt64				fStreamLength;
+	XMP_Int64			fStreamLength;
 	InternalSnipList	fInternalSnips;
 
 	void
-	SplitInternalSnip ( InternalSnipIterator snipPos, SInt64 relOffset, SInt64 newLength );
+	SplitInternalSnip ( InternalSnipIterator snipPos, XMP_Int64 relOffset, XMP_Int64 newLength );
 
 	InternalSnipIterator
 	MergeInternalSnips ( InternalSnipIterator firstPos, InternalSnipIterator secondPos );
 
-	void
-	DumpSnipList ( const char * title );
-
 	InternalSnipIterator
 	PrevSnip ( InternalSnipIterator snipPos );
 
 	InternalSnipIterator
 	NextSnip ( InternalSnipIterator snipPos );
+
+	#if DEBUG
+		void DumpSnipList ( const char * title );
+	#endif
 	
 };	// XMPScanner
 
-
 #endif	// __XMPScanner_hpp__
diff --git a/samples/source/XmpIterations.cpp b/samples/source/XmpIterations.cpp
new file mode 100644
index 0000000..855bb71
--- /dev/null
+++ b/samples/source/XmpIterations.cpp
@@ -0,0 +1,318 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+/**
+* Demonstrates how to use the iteration utility in the XMPCore component to walk through property trees.
+*/
+
+#include <string>
+
+// Must be defined to instantiate template classes
+#define TXMP_STRING_TYPE std::string
+
+// Must be defined to give access to XMPFiles
+#define XMP_INCLUDE_XMPFILES 1 
+
+// Ensure XMP templates are instantiated
+#include "XMP.incl_cpp"
+
+// Provide access to the API
+#include "XMP.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+// Provide some custom XMP
+static const char * rdf =
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='' xmlns:xmpTest='http://ns.adobe.com/xmpTest/'>"
+	""
+	"	 <xmpTest:MySimpleProp rdf:parseType='Resource'>"
+	"		<rdf:value>A Value</rdf:value>"
+	"		<xmpTest:MyQual>Qual Value</xmpTest:MyQual>"
+	"  </xmpTest:MySimpleProp>"
+	""
+  "		<xmpTest:MyTopStruct rdf:parseType='Resource'>"
+  "			<xmpTest:MySecondStruct rdf:parseType='Resource'>"
+  "				<xmpTest:MyThirdStruct rdf:parseType='Resource'>"
+  "					<xmpTest:MyThirdStructField>Field Value 3</xmpTest:MyThirdStructField>"
+  "       </xmpTest:MyThirdStruct>"
+  "				<xmpTest:MySecondStructField>Field Value 2</xmpTest:MySecondStructField>"
+  "     </xmpTest:MySecondStruct>"
+  "    <xmpTest:MyTopStructField>Field Value 1</xmpTest:MyTopStructField>"
+  "   </xmpTest:MyTopStruct>"
+
+  "   <xmpTest:MyArrayWithNestedArray>"
+  "			<rdf:Bag>"
+  "				<rdf:li>"
+  "					<rdf:Seq>"
+  "						<rdf:li>Item 1</rdf:li>"
+  "           <rdf:li>Item 2</rdf:li>"
+  "         </rdf:Seq>"
+  "				</rdf:li>"
+  "			</rdf:Bag>"
+  "   </xmpTest:MyArrayWithNestedArray>"
+
+  "   <xmpTest:MyArrayWithStructures>"
+  "			<rdf:Seq>"
+  "				<rdf:li rdf:parseType='Resource'>"
+	"					<rdf:value>Field Value 1</rdf:value>"
+	"						<xmpTest:FirstQual>Qual Value 1</xmpTest:FirstQual>"
+  "           <xmpTest:SecondQual>Qual Value 2</xmpTest:SecondQual>"
+  "        </rdf:li>"
+  "        <rdf:li rdf:parseType='Resource'>"
+	"					<rdf:value>Field Value 2</rdf:value>"
+	"						<xmpTest:FirstQual>Qual Value 3</xmpTest:FirstQual>"
+  "           <xmpTest:SecondQual>Qual Value 4</xmpTest:SecondQual>"
+  "        </rdf:li>"
+  "     </rdf:Seq>"
+  "   </xmpTest:MyArrayWithStructures>"
+	""
+  "		<xmpTest:MyStructureWithArray rdf:parseType='Resource'>"
+  "			<xmpTest:NestedArray>"
+  "				<rdf:Bag>"
+  "					<rdf:li>Item 3</rdf:li>"
+  "         <rdf:li>Item 4</rdf:li>"
+	"					<rdf:li>Item 5</rdf:li>"
+	"					<rdf:li>Item 6</rdf:li>"
+  "       </rdf:Bag>"
+  "     </xmpTest:NestedArray>"
+	"			<xmpTest:NestedArray2>"
+  "				<rdf:Bag>"
+  "					<rdf:li>Item 66</rdf:li>"
+  "         <rdf:li>Item 46</rdf:li>"
+	"					<rdf:li>Item 56</rdf:li>"
+	"					<rdf:li>Item 66</rdf:li>"
+  "       </rdf:Bag>"
+  "     </xmpTest:NestedArray2>"
+  "   </xmpTest:MyStructureWithArray>"
+	""
+  " </rdf:Description>"
+	"</rdf:RDF>";
+
+// The namespace to be used.  This will be automatically registered
+// when the RDF is parsed.
+const XMP_StringPtr kXMP_NS_SDK = "http://ns.adobe.com/xmpTest/";
+
+/**
+* Reads some metadata from a file and appends some custom XMP to it.  Then does several 
+* iterations, using various iterators.  Each iteration is displayed in the console window.
+*/
+int main()
+{
+	if(SXMPMeta::Initialize())
+	{
+		SXMPFiles::Initialize();
+
+		bool ok;
+		SXMPFiles myFile;
+
+		XMP_OptionBits opts = kXMPFiles_OpenForRead | kXMPFiles_OpenUseSmartHandler;
+		ok = myFile.OpenFile("../../../testfiles/Image1.jpg", kXMP_UnknownFile, opts);
+		if(ok)
+		{
+			SXMPMeta xmp;
+			myFile.GetXMP(&xmp);
+
+			// Add some custom metadata to the XMP object
+			SXMPMeta custXMP(rdf, (XMP_StringLen) strlen(rdf));
+			SXMPUtils::AppendProperties(custXMP, &xmp);
+
+			// Store any details from the iter.Next() call
+			string schemaNS, propPath, propVal;
+
+			// Only visit the immediate children that are leaf properties of the Dublin Core schema
+			SXMPIterator dcLeafIter(xmp, kXMP_NS_DC, (kXMP_IterJustChildren | kXMP_IterJustLeafNodes));
+			while(dcLeafIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit one property from the XMP Basic schema
+			SXMPIterator xmpKeywordsIter(xmp, kXMP_NS_XMP, "Keywords", kXMP_IterJustLeafNodes);
+			while(xmpKeywordsIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit the Dublin Core schema, omit any quailifiers and only
+			// show the leaf properties
+			SXMPIterator dcIter(xmp, kXMP_NS_DC, (kXMP_IterOmitQualifiers | kXMP_IterJustLeafNodes));
+			while(dcIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit the Dublin Core schema, omit any quailifiers, 
+			// show the leaf properties but only return the leaf name and not the full path
+			SXMPIterator dcIter2(xmp, kXMP_NS_DC, (kXMP_IterOmitQualifiers | kXMP_IterJustLeafNodes | kXMP_IterJustLeafName));
+			while(dcIter2.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Iterate over a single namespace.  Show all properties within
+			// the Photoshop schema
+			SXMPIterator exifIter(xmp, kXMP_NS_Photoshop);
+			while(exifIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Just visit the leaf nodes of EXIF properties. That is just 
+			// properties that may have values.
+			SXMPIterator exifLeafIter(xmp, kXMP_NS_EXIF, kXMP_IterJustLeafNodes);
+			while(exifLeafIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Iterate over all properties but skip the EXIF schema and skip the custom schema
+			// and continue visiting nodes
+			SXMPIterator skipExifIter (xmp);
+			while(skipExifIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				if(schemaNS == kXMP_NS_EXIF || schemaNS == kXMP_NS_SDK)
+				{
+					skipExifIter.Skip(kXMP_IterSkipSubtree);
+				}
+				else
+				{ 
+					cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+				}
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Iterate over all properties but skip the EXIF schema
+			// and any remaining siblings of the current node.
+			SXMPIterator stopAfterExifIter ( xmp );
+			while(stopAfterExifIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				if(schemaNS == kXMP_NS_EXIF || schemaNS == kXMP_NS_SDK)
+				{
+					stopAfterExifIter.Skip(kXMP_IterSkipSiblings);
+				}
+				else
+				{
+					cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+				}
+			}
+
+			cout << "----------------------------------" << endl;
+
+			//////////////////////////////////////////////////////////////////////////////////////
+
+			// Iterate over the custom XMP
+
+			// Visit the immediate children of this node. 
+			// No qualifiers are visisted as they are below the property being visisted.
+			SXMPIterator justChildrenIter(xmp, kXMP_NS_SDK, kXMP_IterJustChildren);
+			while(justChildrenIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit the immediate children of this node but only those that may have values.
+			// No qualifiers are visisted as they are below the property being visisted.
+			SXMPIterator justChildrenAndLeafIter(xmp, kXMP_NS_SDK, (kXMP_IterJustChildren | kXMP_IterJustLeafNodes));
+			while(justChildrenAndLeafIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit the leaf nodes of TopStructProperty
+			SXMPIterator myTopStructIter(xmp, kXMP_NS_SDK, "MyTopStruct", kXMP_IterJustLeafNodes);
+			while(myTopStructIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit the leaf nodes of the TopStructProperty but only return the names for 
+			// the leaf components and not the full path
+			SXMPIterator xmyTopStructIterShortNames(xmp, kXMP_NS_SDK, "MyTopStruct", (kXMP_IterJustLeafNodes | kXMP_IterJustLeafName));
+			while(xmyTopStructIterShortNames.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit a property and all of the qualifiers
+			SXMPIterator iterArrayProp (xmp, kXMP_NS_SDK, "ArrayWithStructures", kXMP_IterJustLeafNodes );
+			while(iterArrayProp.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Visit a property and omit all of the qualifiers
+			SXMPIterator iterArrayPropNoQual (xmp, kXMP_NS_SDK, "ArrayWithStructures", (kXMP_IterJustLeafNodes | kXMP_IterOmitQualifiers));
+			while(iterArrayPropNoQual.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << propPath << " = " << propVal << endl;
+			}
+
+			cout << "----------------------------------" << endl;
+
+			// Skip a subtree and continue onwards.  Once 'Item 4' is found then the we can skip all of the
+			// siblings of the current node.  If the the current node were a top level node the iteration 
+			// would be complete as all siblings would be skipped.  However, when 'Item 4' is found the current 
+			// node is not at the top level so there are other nodes further up the tree that still need to be
+			// visited.
+			SXMPIterator skipIter (xmp, kXMP_NS_SDK, (kXMP_IterJustLeafNodes | kXMP_IterOmitQualifiers | kXMP_IterJustLeafName));
+			while(skipIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				if(propVal == "Item 4")
+				{
+					skipIter.Skip(kXMP_IterSkipSiblings);
+				}
+				else
+				{
+					cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+				}
+			}
+
+			/*
+			// Visit all properties and qualifiers
+			SXMPIterator allPropsIter(xmp);
+			while(allPropsIter.Next(&schemaNS, &propPath, &propVal))
+			{
+				cout << schemaNS << "  " << propPath << " = " << propVal << endl;
+			}
+			*/
+		}
+
+	}
+	
+	SXMPFiles::Terminate();
+	SXMPMeta::Terminate();
+
+	return 0;
+}
+
diff --git a/samples/source/common/DumpFile.cpp b/samples/source/common/DumpFile.cpp
new file mode 100644
index 0000000..64aa548
--- /dev/null
+++ b/samples/source/common/DumpFile.cpp
@@ -0,0 +1,4458 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+//
+// DumpFile is suitable for both dumping an entire file structure to screen _as well as_ access to 
+// specific to specific legacy fields (as much required for auto-testing).
+// 
+//  Currently supports
+//     - JPEG
+//     - TIFF
+//     - PHOTOSHOP
+//     - JPEG2K
+//     - WMAV (ASF/WMA/WMV)
+//     - AVI
+//     - WAV
+//     - PNG
+//     - InDesign
+//     - MP3
+//     - MOV (Quicktime)
+//     - UCF (done, including comment zips, zip64 (>4GB))
+//     - SWF (in progress)
+//     - FLV
+//     - MPEG-4
+//
+// DumpFile does depend on XMPCore, it does not depend on XMPFiles. Thus not suitable for any form
+// of XMPCore testing. Suitable for XMPFiles in particular reconciliation issues.
+
+#include <stdarg.h>
+#include "globals.h"
+#include "DumpFile.h"
+#include "LargeFileAccess.hpp"
+
+static const XMP_Uns32 CONST_INFINITE=(XMP_Uns32)(-1);
+
+// converts a (supposed) 8Bit-encoded String to Buginese
+// - suitable for UTF-8 or any other encoding
+// - stopOnNull does just that, exceeding length is declared as |R:1234 at the end of string
+// - len is the max parsing size, defaults to unlimited
+// - having set neither stopOnNull nor max parsing size is a bad idea (checked and yields error)
+std::string convert8Bit( void* str, bool stopOnNull, XMP_Uns32 byteLen )
+{
+	std::string r;	//result
+	r.clear();	// ...I have become cautious... :-)
+
+	if ( byteLen == 0 )
+		return r; //nothing to do
+
+	//provoke access violation:
+	//if invalid length leads to access violation, I want it here and now...
+	if ( byteLen!=CONST_INFINITE ) { //if not "CONST_INFINITE"
+		char tmp=((char*)str)[byteLen-1];
+		tmp=tmp;
+	}
+	if( !stopOnNull && (byteLen==CONST_INFINITE ) )
+		Log::error("must set either stopOnNULL or specify length of string");
+
+	bool outside = false;	// toggle-flag: outside ASCII ?
+	XMP_Uns32 remainder = 0;
+	char buffer[200];  //changed from 20 to 200 (whatever reason there was to have it so small)
+
+	for (   XMP_Uns32 i = 0; 
+			i<byteLen;  //either byteLen==0 or run forever (read: till 'break')
+			i++ )
+	{
+		XMP_Uns8 ch = ((char*)str)[i];
+		if ( (0x20 <= ch) && (ch <= 0x7E) ) 
+		{	//outside-case
+			if ( outside )
+				r+=">";
+			r+=ch;
+			outside = false;
+		} else {
+			if ( !outside ) 
+				r+="<";	//first inside-case
+			else
+				r+=" ";
+			sprintf(buffer, "%.2X", ch ); 
+			r+=buffer;			
+			outside = true;
+		}
+
+		if ( stopOnNull && (ch==0)) {
+			if (byteLen!=CONST_INFINITE) remainder = byteLen -i -2;
+			break;
+		}
+	}
+
+	if ( outside ) r+=">";
+	if (remainder>0) {
+		sprintf(buffer, "|R:%d", remainder ); 
+		r+=buffer;
+	}
+	return r;
+}
+
+
+//same story, but for (UTF-)16BE characters
+//note: length still to be specified in byte, thus must be even (verified)
+std::string convert16Bit( bool bigEndian, XMP_Uns8* str, bool stopOnNull, XMP_Uns32 byteLen )
+{
+	//if invalid length leads to access violation, I want it here and now...
+	if ( byteLen!=CONST_INFINITE ) {
+		char tmp=str[byteLen-1];
+		tmp=tmp;
+	}
+
+	if( !stopOnNull && (byteLen==CONST_INFINITE ) )
+		Log::error("must set either stopOnNULL or specify length of string");
+	if ( (byteLen!=CONST_INFINITE) && (byteLen % 2 != 0) )  //if neither CONST_INFINITE or even...#
+		Log::error("convert16BitToBuginese: byteLen must be even");
+
+
+	bool outside = false;	// toggle-flag: outside ASCII ?
+	XMP_Uns32 remainder = 0;
+	char buffer[20];
+
+	std::string r;	//result
+	r.clear();	// ...I have become cautious... :-)
+
+	for (   XMP_Uns32 i = 0; 
+			i<byteLen;  //either byteLen==0 or run forever (read: till 'break')
+			i=i+2 )
+	{
+		XMP_Uns16 ch = (bigEndian) ? GetUns16BE( &str[i] ) : GetUns16LE( &str[i] );
+
+		if ( (0x20 <= ch) && (ch <= 0x7E) ) 
+		{	//outside-case
+			if ( outside )
+				r+=">";
+			r+=(char)ch;
+			outside = false;
+		} else {
+			if ( !outside ) 
+				r+="<";	//first inside-case
+			else
+				r+=" ";
+			//I want to reflect actual byte order when dumping, thus byte-wise here and no endian-fork
+			sprintf(buffer, "%.2X %.2X", str[i], str[i+1] ); 
+			r+=buffer;			
+			outside = true;
+		}
+
+		if ( stopOnNull && (ch==0)) {
+			if (byteLen!=CONST_INFINITE) remainder = byteLen -i -2;
+			break;
+		}
+	}
+
+	if ( outside ) r+=">";
+	if (remainder>0) {
+		sprintf(buffer, "|R:%d", remainder ); 
+		r+=buffer;
+	}
+	return r;
+}
+
+
+std::string fromArgs(const char* format, ...)
+{
+	//note: format and ... are somehow "used up", i.e. dumping them 
+	//      via vsprintf _and_ via printf brought up errors on Mac (only)
+	//      i.e. %d %X stuff looking odd (roughly like signed vs unsigned...)
+	//      buffer reuse is fine, just dont use format/... twice.
+
+	char buffer[4096];  //should be big enough but no guarantees..
+	va_list args;
+	va_start(args, format);
+		vsprintf(buffer, format, args);
+	va_end(args);
+
+	return std::string(buffer);
+}
+
+#include <iostream>
+#include <stdarg.h>	//fpr va_list et al
+
+DumpFileException::DumpFileException(const char *format, ...) : std::runtime_error("dumpfile exception")
+{ 
+	va_list args; va_start(args, format);
+		vsnprintf( buffer, XMPQE_MAX_ERROR_LENGTH, format, args);
+	va_end(args);
+}
+
+// overriding, since the buffer needs to be constructed first...
+const char* DumpFileException::what_dumpfile_reason()
+{
+		return buffer;
+}
+
+// REMOVED ON PURPOSE: #include <assert.h>
+// define two assert macros, /w and w/o msg
+// (we don't want to slip malformed files through. Neither in release mode.)
+#undef assertMsg
+#undef assert
+
+//TODO: integrate file pos in parse failure description (LFA_Tell ()...)
+
+// this method just 
+#define assertNoThrowMsg(msg,c)                                                             \
+try { c }                                                                                   \
+catch ( ... ) {                                                                             \
+	throw DumpFileException( "- assert:   %s\n- message:  %s\n- location: " __FILE__ ":%u", \
+                            #c, std::string( msg ).c_str(), __LINE__ );                     \
+}
+
+#define assertMsg(msg,c)																				\
+if ( ! (c) ) {																							\
+	throw DumpFileException( "- assert:   %s\n- message:  %s\n- location: " __FILE__ ":%u", #c, std::string( msg ).c_str(), __LINE__ );		\
+}
+
+#define assert(c)																				\
+if ( ! (c) ) {																					\
+	throw DumpFileException( "- assert:   %s\n- location: " __FILE__ ":%u", #c, __LINE__ );		\
+}
+
+#define assertEOF(file)		\
+if ( ! LFA_isEof(file) ) {	\
+	throw DumpFileException( "- assert:   feof(file)\n- message:  end of file not reached, still at 0x%X\n- location: " __FILE__ ":%u", LFA_Tell (file), __LINE__ );		\
+}
+
+#define fail(msg)																				\
+	throw DumpFileException( "- failure\n- message:  %s\n- location: " __FILE__ ":%u", std::string( msg ).c_str(), __LINE__ );
+
+using namespace std;
+
+//XMPCore related
+//! no use of XMPFiles
+//! no "XMP.incl_cpp" here, happens in Dumpfile/main.cpp resp. CppUnit/main.cpp
+#define TXMP_STRING_TYPE std::string
+#include "XMP.hpp"
+#include "XMP_Const.h"
+
+//scanning routines - needed by PacketScan(...) routine for unknown files
+#include "QEScanner.hpp"
+
+//  QE related
+#include "Log.h"
+
+//disabled warning (take-over)
+#if XMP_WinBuild
+	#pragma warning (disable : 4996)	// '...' was declared deprecated
+	#pragma warning (disable : 4244)	// conversion from '__w64 int' to 'XMP_Uns32', possible loss of data
+	#pragma warning (disable : 4267)	// conversion from 'size_t' to 'int', possible loss of data
+#endif
+
+#pragma pack (1)
+
+//the tag tree to be build up, 
+//  then dumped (dumpfile.exe) resp.
+//  resp. queried (testrunner)
+static TagTree* tree;
+
+// =================================================================================================
+
+long kOne = 1;
+char firstByte = *((char*)&kOne);
+
+const bool sBigEndianHost = (firstByte == 0);
+const bool sLittleEndianHost = (firstByte == 1);
+
+typedef const char * ChPtr;
+#define CheckBytes(left,right,len)	(memcmp (((ChPtr)(left)), ((ChPtr)(right)), len) == 0)
+
+static XMP_Uns8* sDataPtr = 0;	// Used via CaptureFileData for variable length data.
+static XMP_Uns32 sDataMax = 0;
+static XMP_Uns32 sDataLen = 0;
+
+// storing XMP Info 'globally' for a later dump...
+static XMP_Uns8* sXMPPtr = 0;	// Used via CaptureXMP for the main XMP.
+static XMP_Uns32 sXMPMax = 0;
+static XMP_Uns32 sXMPLen = 0;
+static XMP_Int64 sXMPPos = 0;
+
+typedef XMP_Uns16 (*GetUns16_Proc) ( const void * addr );
+typedef XMP_Uns32 (*GetUns32_Proc) ( const void * addr );
+typedef XMP_Uns64 (*GetUns64_Proc) ( const void * addr );
+
+static XMP_Uns16 GetUns16BE ( const void * addr );
+static XMP_Uns16 GetUns16LE ( const void * addr );
+static XMP_Uns32 GetUns32BE ( const void * addr );
+static XMP_Uns32 GetUns32LE ( const void * addr );
+static XMP_Uns64 GetUns64BE ( const void * addr );
+static XMP_Uns64 GetUns64LE ( const void * addr );
+
+#define High32(u64) ((XMP_Uns32)((u64) >> 32))
+#define Low32(u64)  ((XMP_Uns32)((u64) & 0xFFFFFFFFUL))
+
+// =================================================================================================
+
+// ahead declarations
+static void DumpTIFF ( XMP_Uns8 * tiffContent, XMP_Uns32 tiffLen, XMP_Uns32 fileOffset, const char * label );
+static void DumpIPTC ( XMP_Uns8 * iptcOrigin, XMP_Uns32 iptcLen, XMP_Uns32 fileOffset, const char * label );
+static void DumpImageResources ( XMP_Uns8 * psirOrigin, XMP_Uns32 psirLen, XMP_Uns32 fileOffset, const char * label );
+static void DumpIFDChain ( XMP_Uns8 * startPtr, XMP_Uns8 * endPtr, XMP_Uns8 * tiffContent, XMP_Uns32 fileOffset, const char * label );
+
+// =================================================================================================
+
+static GetUns16_Proc TIFF_GetUns16 = 0;	// Keeps endian procs for the "current" TIFF.
+static GetUns32_Proc TIFF_GetUns32 = 0;
+static GetUns64_Proc TIFF_GetUns64 = 0;
+
+enum {	// Special TIFF tags
+	kTIFF_XMP       = 700,
+	kTIFF_IPTC      = 33723,
+	kTIFF_PSIR      = 34377,
+	kTIFF_Exif      = 34665,
+	kTIFF_GPS       = 34853,
+	kTIFF_MakerNote = 37500,
+	kTIFF_Interop   = 40965
+};
+
+enum {	// Special Photoshop image resource IDs
+	kPSIR_OldCaption	= 1008,
+	kPSIR_PrintCaption	= 1020,
+	kPSIR_IPTC			= 1028,
+	kPSIR_CopyrightFlag	= 1034,
+	kPSIR_CopyrightURL	= 1035,
+	kPSIR_Exif_1		= 1058,
+	kPSIR_Exif_3		= 1059,
+	kPSIR_XMP			= 1060,
+	kPSIR_IPTC_Digest	= 1061
+};
+
+struct IPTC_DataSet {	// The 5 byte header of an IPTC DataSet.
+	XMP_Uns8 tagMarker;
+	XMP_Uns8 recordNumber;
+	XMP_Uns8 dataSetNumber;
+	XMP_Uns8 octetCountHigh;
+	XMP_Uns8 octetCountLow;
+};
+
+enum {	// IPTC DataSet IDs
+	kIPTC_IntellectualGenre =   4,
+	kIPTC_Title             =   5,
+	kIPTC_Urgency           =  10,
+	kIPTC_SubjectCode       =  12,
+	kIPTC_Category          =  15,
+	kIPTC_SuppCategory      =  20,
+	kIPTC_Keyword           =  25,
+	kIPTC_Instructions      =  40,
+	kIPTC_DateCreated       =  55,
+	kIPTC_TimeCreated       =  60,
+	kIPTC_Creator           =  80,
+	kIPTC_CreatorJobtitle   =  85,
+	kIPTC_City              =  90,
+	kIPTC_Location          =  92,
+	kIPTC_State             =  95,
+	kIPTC_CountryCode       = 100,
+	kIPTC_Country           = 101,
+	kIPTC_JobID             = 103,
+	kIPTC_Headline          = 105,
+	kIPTC_Provider          = 110,
+	kIPTC_Source            = 115,
+	kIPTC_CopyrightNotice   = 116,
+	kIPTC_Description       = 120,
+	kIPTC_DescriptionWriter = 122 
+};
+
+struct DataSetInfo {
+	XMP_Uns8 id;
+	const char * name;
+};
+
+static const DataSetInfo kDataSetNames[] =
+{ { kIPTC_IntellectualGenre, "Intellectual Genre" },
+{ kIPTC_Title, "Title" },
+{ kIPTC_Urgency, "Urgency" },
+{ kIPTC_SubjectCode, "Subject Code" },
+{ kIPTC_Category, "Category" },
+{ kIPTC_SuppCategory, "Supplemental Category" },
+{ kIPTC_Keyword, "Keyword" },
+{ kIPTC_Instructions, "Instructions" },
+{ kIPTC_DateCreated, "Date Created" },
+{ kIPTC_TimeCreated, "Time Created" },
+{ kIPTC_Creator, "Creator" },
+{ kIPTC_CreatorJobtitle, "Creator Jobtitle" },
+{ kIPTC_City, "City" },
+{ kIPTC_Location, "Location" },
+{ kIPTC_State, "Province-State" },
+{ kIPTC_CountryCode, "Country Code" },
+{ kIPTC_Country, "Country" },
+{ kIPTC_JobID, "Job ID" },
+{ kIPTC_Headline, "Headline" },
+{ kIPTC_Provider, "Provider" },
+{ kIPTC_Source, "Source" },
+{ kIPTC_CopyrightNotice, "Copyright Notice" },
+{ kIPTC_Description, "Description" },
+{ kIPTC_DescriptionWriter, "Description Writer" },
+{ 0, 0 } };
+
+enum {
+	kTIFF_Uns8		=  1,
+	kTIFF_ASCII		=  2,
+	kTIFF_Uns16		=  3,
+	kTIFF_Uns32		=  4,
+	kTIFF_URational	=  5,
+	kTIFF_Int8		=  6,
+	kTIFF_Undef8	=  7,
+	kTIFF_Int16		=  8,
+	kTIFF_Int32		=  9,
+	kTIFF_SRational	= 10,
+	kTIFF_Float		= 11,
+	kTIFF_Double	= 12,
+	kTIFF_TypeEnd
+};
+
+static const int sTIFF_TypeSizes[] = { 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 };
+static const char * sTIFF_TypeNames[] = { "", "BYTE", "ASCII", "SHORT", "LONG", "RATIONAL",
+"SBYTE", "UNDEFINED", "SSHORT", "SLONG", "SRATIONAL",
+"FLOAT", "DOUBLE" };
+
+struct TagNameInfo {
+	long	tag;
+	const char * name;
+};
+
+static const TagNameInfo sTIFF_TagNames[] =
+{ { 256, "ImageWidth" },
+{ 257, "ImageLength" },
+{ 258, "BitsPerSample" },
+{ 259, "Compression" },
+{ 262, "PhotometricInterpretation" },
+{ 270, "ImageDescription" },
+{ 271, "Make" },
+{ 272, "Model" },
+{ 274, "Orientation" },
+{ 282, "XResolution" },
+{ 283, "YResolution" },
+{ 284, "PlanarConfiguration" },
+{ 296, "ResolutionUnit" },
+{ 301, "TransferFunction" },
+{ 305, "Software" },
+{ 306, "DateTime" },
+{ 315, "Artist" },
+{ 318, "WhitePoint" },
+{ 319, "PrimaryChromaticities" },
+{ 529, "YCbCrCoefficients" },
+{ 530, "YCbCrSubSampling" },
+{ 531, "YCbCrPositioning" },
+{ 532, "ReferenceBlackWhite" },
+{ 33432, "Copyright" },
+{ 33434, "ExposureTime" },
+{ 33437, "FNumber" },
+{ 34850, "ExposureProgram" },
+{ 34852, "SpectralSensitivity" },
+{ 34855, "ISOSpeedRatings" },
+{ 34856, "OECF" },
+{ 36864, "ExifVersion" },
+{ 36867, "DateTimeOriginal" },
+{ 36868, "DateTimeDigitized" },
+{ 37121, "ComponentsConfiguration" },
+{ 37122, "CompressedBitsPerPixel" },
+{ 37377, "ShutterSpeedValue" },
+{ 37378, "ApertureValue" },
+{ 37379, "BrightnessValue" },
+{ 37380, "ExposureBiasValue" },
+{ 37381, "MaxApertureValue" },
+{ 37382, "SubjectDistance" },
+{ 37383, "MeteringMode" },
+{ 37384, "LightSource" },
+{ 37385, "Flash" },
+{ 37386, "FocalLength" },
+{ 37396, "SubjectArea" },
+{ 37500, "MakerNote" },
+{ 37510, "UserComment" },
+{ 37520, "SubSecTime" },
+{ 37521, "SubSecTimeOriginal" },
+{ 37522, "SubSecTimeDigitized" },
+{ 40960, "FlashpixVersion" },
+{ 40961, "ColorSpace" },
+{ 40962, "PixelXDimension" },
+{ 40963, "PixelYDimension" },
+{ 40964, "RelatedSoundFile" },
+{ 41483, "FlashEnergy" },
+{ 41484, "SpatialFrequencyResponse" },
+{ 41486, "FocalPlaneXResolution" },
+{ 41487, "FocalPlaneYResolution" },
+{ 41488, "FocalPlaneResolutionUnit" },
+{ 41492, "SubjectLocation" },
+{ 41493, "ExposureIndex" },
+{ 41495, "SensingMethod" },
+{ 41728, "FileSource" },
+{ 41729, "SceneType" },
+{ 41730, "CFAPattern" },
+{ 41985, "CustomRendered" },
+{ 41986, "ExposureMode" },
+{ 41987, "WhiteBalance" },
+{ 41988, "DigitalZoomRatio" },
+{ 41989, "FocalLengthIn35mmFilm" },
+{ 41990, "SceneCaptureType" },
+{ 41991, "GainControl" },
+{ 41992, "Contrast" },
+{ 41993, "Saturation" },
+{ 41994, "Sharpness" },
+{ 41995, "DeviceSettingDescription" },
+{ 41996, "SubjectDistanceRange" },
+{ 42016, "ImageUniqueID" },
+{ 50706, "DNGVersion" },
+{ 50707, "DNGBackwardVersion" },
+{ 50708, "DNG UniqueCameraModel" },
+{ 0, "" } };
+
+// =================================================================================================
+
+struct ASF_GUID {
+
+	XMP_Uns32 part1;	// Written little endian.
+	XMP_Uns16 part2;	// Written little endian.
+	XMP_Uns16 part3;	// Written little endian.
+	XMP_Uns16 part4;	// Written big endian.
+	XMP_Uns8  part5[6];	// Written in order.
+
+	ASF_GUID() {};
+	ASF_GUID ( XMP_Uns32 p1, XMP_Uns16 p2, XMP_Uns16 p3, XMP_Uns16 p4, const void* p5 )
+	{
+		part1 = GetUns32LE (&p1);
+		part2 = GetUns16LE (&p2);
+		part3 = GetUns16LE (&p3);
+		part4 = GetUns16BE (&p4);
+		memcpy (&part5, p5, 6);
+	};
+
+};
+
+enum {	// Objects for which we have special knowledge.
+	kASFObj_Unknown = 0,
+	kASFObj_Header,			// Special top level objects.
+	kASFObj_Data,
+	kASFObj_XMP,
+	kASFObj_FileProperties,	// Children of the Header Object.
+	kASFObj_ContentDesc,
+	kASFObj_ContentBrand,
+	kASFObj_ContentEncrypt,
+	kASFObj_HeaderExtension,
+	kASFObj_Padding
+
+};
+
+static const ASF_GUID kASF_HeaderGUID ( 0x75B22630, 0x668E, 0x11CF, 0xA6D9, "\x00\xAA\x00\x62\xCE\x6C" );
+
+struct ASF_ObjectInfo {
+	ASF_GUID     guid;
+	const char * name;
+	XMP_Uns8     kind;
+};
+
+static const ASF_ObjectInfo kASF_KnownObjects[] =
+{
+	{ ASF_GUID (0x75B22630, 0x668E, 0x11CF, 0xA6D9, "\x00\xAA\x00\x62\xCE\x6C"), "Header", kASFObj_Header },
+	{ ASF_GUID (0x75B22636, 0x668E, 0x11CF, 0xA6D9, "\x00\xAA\x00\x62\xCE\x6C"), "Data", kASFObj_Data },
+	{ ASF_GUID (0xBE7ACFCB, 0x97A9, 0x42E8, 0x9C71, "\x99\x94\x91\xE3\xAF\xAC"), "XMP", kASFObj_XMP },
+
+	{ ASF_GUID (0x33000890, 0xE5B1, 0x11CF, 0x89F4, "\x00\xA0\xC9\x03\x49\xCB"), "Simple_Index", 0 },
+	{ ASF_GUID (0xD6E229D3, 0x35DA, 0x11D1, 0x9034, "\x00\xA0\xC9\x03\x49\xBE"), "Index", 0 },
+	{ ASF_GUID (0xFEB103F8, 0x12AD, 0x4C64, 0x840F, "\x2A\x1D\x2F\x7A\xD4\x8C"), "Media_Object_Index", 0 },
+	{ ASF_GUID (0x3CB73FD0, 0x0C4A, 0x4803, 0x953D, "\xED\xF7\xB6\x22\x8F\x0C"), "Timecode_Index", 0 },
+
+	{ ASF_GUID (0x8CABDCA1, 0xA947, 0x11CF, 0x8EE4, "\x00\xC0\x0C\x20\x53\x65"), "File_Properties", kASFObj_FileProperties },
+	{ ASF_GUID (0xB7DC0791, 0xA9B7, 0x11CF, 0x8EE6, "\x00\xC0\x0C\x20\x53\x65"), "Stream_Properties", 0 },
+	{ ASF_GUID (0x5FBF03B5, 0xA92E, 0x11CF, 0x8EE3, "\x00\xC0\x0C\x20\x53\x65"), "Header_Extension", kASFObj_HeaderExtension },
+	{ ASF_GUID (0x86D15240, 0x311D, 0x11D0, 0xA3A4, "\x00\xA0\xC9\x03\x48\xF6"), "Codec_List", 0 },
+	{ ASF_GUID (0x1EFB1A30, 0x0B62, 0x11D0, 0xA39B, "\x00\xA0\xC9\x03\x48\xF6"), "Script_Command", 0 },
+	{ ASF_GUID (0xF487CD01, 0xA951, 0x11CF, 0x8EE6, "\x00\xC0\x0C\x20\x53\x65"), "Marker", 0 },
+	{ ASF_GUID (0xD6E229DC, 0x35DA, 0x11D1, 0x9034, "\x00\xA0\xC9\x03\x49\xBE"), "Bitrate_Mutual_Exclusion", 0 },
+	{ ASF_GUID (0x75B22635, 0x668E, 0x11CF, 0xA6D9, "\x00\xAA\x00\x62\xCE\x6C"), "Error_Correction", 0 },
+	{ ASF_GUID (0x75B22633, 0x668E, 0x11CF, 0xA6D9, "\x00\xAA\x00\x62\xCE\x6C"), "Content_Description", kASFObj_ContentDesc },
+	{ ASF_GUID (0xD2D0A440, 0xE307, 0x11D2, 0x97F0, "\x00\xA0\xC9\x5E\xA8\x50"), "Extended_Content_Description", 0 },
+	{ ASF_GUID (0x2211B3FA, 0xBD23, 0x11D2, 0xB4B7, "\x00\xA0\xC9\x55\xFC\x6E"), "Content_Branding", kASFObj_ContentBrand },
+	{ ASF_GUID (0x7BF875CE, 0x468D, 0x11D1, 0x8D82, "\x00\x60\x97\xC9\xA2\xB2"), "Stream_Bitrate_Properties", 0 },
+	{ ASF_GUID (0x2211B3FB, 0xBD23, 0x11D2, 0xB4B7, "\x00\xA0\xC9\x55\xFC\x6E"), "Content_Encryption", kASFObj_ContentEncrypt },
+	{ ASF_GUID (0x298AE614, 0x2622, 0x4C17, 0xB935, "\xDA\xE0\x7E\xE9\x28\x9C"), "Extended_Content_Encryption", 0 },
+	{ ASF_GUID (0x2211B3FC, 0xBD23, 0x11D2, 0xB4B7, "\x00\xA0\xC9\x55\xFC\x6E"), "Digital_Signature", 0 },
+	{ ASF_GUID (0x1806D474, 0xCADF, 0x4509, 0xA4BA, "\x9A\xAB\xCB\x96\xAA\xE8"), "Padding", kASFObj_Padding },
+
+	{ ASF_GUID (0x14E6A5CB, 0xC672, 0x4332, 0x8399, "\xA9\x69\x52\x06\x5B\x5A"), "Extended_Stream_Properties", 0 },
+	{ ASF_GUID (0xA08649CF, 0x4775, 0x4670, 0x8A16, "\x6E\x35\x35\x75\x66\xCD"), "Advanced_Mutual_Exclusion", 0 },
+	{ ASF_GUID (0xD1465A40, 0x5A79, 0x4338, 0xB71B, "\xE3\x6B\x8F\xD6\xC2\x49"), "Group_Mutual_Exclusion", 0 },
+	{ ASF_GUID (0xD4FED15B, 0x88D3, 0x454F, 0x81F0, "\xED\x5C\x45\x99\x9E\x24"), "Stream_Prioritization", 0 },
+	{ ASF_GUID (0xA69609E6, 0x517B, 0x11D2, 0xB6AF, "\x00\xC0\x4F\xD9\x08\xE9"), "Bandwidth_Sharing", 0 },
+	{ ASF_GUID (0x7C4346A9, 0xEFE0, 0x4BFC, 0xB229, "\x39\x3E\xDE\x41\x5C\x85"), "Language_List", 0 },
+	{ ASF_GUID (0xC5F8CBEA, 0x5BAF, 0x4877, 0x8467, "\xAA\x8C\x44\xFA\x4C\xCA"), "Metadata", 0 },
+	{ ASF_GUID (0x44231C94, 0x9498, 0x49D1, 0xA141, "\x1D\x13\x4E\x45\x70\x54"), "Metadata_Library", 0 },
+	{ ASF_GUID (0xD6E229DF, 0x35DA, 0x11D1, 0x9034, "\x00\xA0\xC9\x03\x49\xBE"), "Index_Parameters", 0 },
+	{ ASF_GUID (0x6B203BAD, 0x3F11, 0x48E4, 0xACA8, "\xD7\x61\x3D\xE2\xCF\xA7"), "Media_Object_Index_Parameters", 0 },
+	{ ASF_GUID (0xF55E496D, 0x9797, 0x4B5D, 0x8C8B, "\x60\x4D\xFE\x9B\xFB\x24"), "Timecode_Index_Parameters", 0 },
+	{ ASF_GUID (0x75B22630, 0x668E, 0x11CF, 0xA6D9, "\x00\xAA\x00\x62\xCE\x6C"), "Compatibility", 0 },
+	{ ASF_GUID (0x43058533, 0x6981, 0x49E6, 0x9B74, "\xAD\x12\xCB\x86\xD5\x8C"), "Advanced_Content_Encryption", 0 },
+
+	{ ASF_GUID (0x00000000, 0x0000, 0x0000, 0x0000, "\x00\x00\x00\x00\x00\x00"), 0, 0 }
+};
+
+struct ASF_ObjHeader {
+	ASF_GUID  guid;
+	XMP_Int64 size;
+};
+
+struct ASF_FileProperties {
+	ASF_GUID  guid;
+	XMP_Int64 size;
+	ASF_GUID  fileID;
+	XMP_Int64 fileSize;
+	XMP_Int64 creationDate;	// Number of 100-nanosecond intervals since January 1, 1601.
+	XMP_Int64 dataPacketsCount;
+	XMP_Int64 playDuration;
+	XMP_Int64 sendDuration;
+	XMP_Int64 preroll;
+	XMP_Uns32 flags;	// The Broadcast flag is bit 0 (lsb).
+	XMP_Uns32 minDataPacketSize;
+	XMP_Uns32 maxDataPacketSize;
+	XMP_Uns32 maxBitrate;
+};
+#define kASF_FilePropertiesSize	(16 + 8 + 16 + 6*8 + 4*4)
+
+struct ASF_ContentDescription {
+	ASF_GUID  guid;
+	XMP_Int64 size;
+	XMP_Uns16 titleLen;
+	XMP_Uns16 authorLen;
+	XMP_Uns16 copyrightLen;
+	XMP_Uns16 descriptionLen;
+	XMP_Uns16 ratingLen;
+	// Little endian UTF-16 strings follow, no BOM, possible nul terminator.
+};
+#define kASF_ContentDescriptionSize	(16 + 8 + 5*2)
+
+#if 0	// ! Has embedded variable length fields!
+struct ASF_ContentBranding {
+	ASF_GUID  guid;
+	XMP_Int64 size;
+	XMP_Uns32 bannerType;
+	XMP_Uns32 bannerDataSize;
+	// The banner data is here.
+	XMP_Uns32 bannerURLSize;
+	// The banner URL string is here, an ASCII string.
+	XMP_Uns32 copyrightURLSize;
+	// The copyright URL string is here, an ASCII string.
+};
+#endif
+
+#if 0	// ! Has embedded variable length fields!
+struct ASF_ContentEncryption {
+	ASF_GUID  guid;
+	XMP_Int64 size;
+	XMP_Uns32 secretDataSize;
+	// The secret data is here.
+	XMP_Uns32 protectionTypeSize;
+	// The protection type is here, an ASCII string.
+	XMP_Uns32 keyIDSize;
+	// The key ID is here, an ASCII string.
+	XMP_Uns32 licenseURLSize;
+	// The licensed URL is here, an ASCII string.
+};
+#endif
+
+struct ASF_HeaderExtension {
+	ASF_GUID  guid;
+	XMP_Int64 size;
+	ASF_GUID  reserved1;
+	XMP_Uns16 reserved2;
+	XMP_Uns32 dataLen;
+	// The header extension data is a sequence of nested objects.
+};
+#define kASF_HeaderExtensionSize (16 + 8 + 16 + 2 + 4)
+
+// =================================================================================================
+
+enum {
+	kINDD_PageSize     = 4096,
+	kINDD_LittleEndian = 1,
+	kINDD_BigEndian    = 2,
+	kInDesignGUIDSize  = 16
+};
+
+struct InDesignMasterPage {
+	XMP_Uns8  fGUID [kInDesignGUIDSize];
+	XMP_Uns8  fMagicBytes [8];
+	XMP_Uns8  fObjectStreamEndian;
+	XMP_Uns8  fIrrelevant1 [239];
+	XMP_Uns64 fSequenceNumber;
+	XMP_Uns8  fIrrelevant2 [8];
+	XMP_Uns32 fFilePages;
+	XMP_Uns8  fIrrelevant3 [3812];
+};
+
+static const XMP_Uns8 kInDesign_MasterPageGUID [kInDesignGUIDSize] =
+{ 0x06, 0x06, 0xED, 0xF5, 0xD8, 0x1D, 0x46, 0xE5, 0xBD, 0x31, 0xEF, 0xE7, 0xFE, 0x74, 0xB7, 0x1D };
+
+struct InDesignContigObjMarker {
+	XMP_Uns8  fGUID [kInDesignGUIDSize];
+	XMP_Uns32 fObjectUID;
+	XMP_Uns32 fObjectClassID;
+	XMP_Uns32 fStreamLength;
+	XMP_Uns32 fChecksum;
+};
+
+static const XMP_Uns8 kINDDContigObjHeaderGUID [kInDesignGUIDSize] =
+{ 0xDE, 0x39, 0x39, 0x79, 0x51, 0x88, 0x4B, 0x6C, 0x8E, 0x63, 0xEE, 0xF8, 0xAE, 0xE0, 0xDD, 0x38 };
+
+// =================================================================================================
+
+struct FileExtMapping {
+	XMP_StringPtr  ext;
+	XMP_FileFormat format;
+};
+
+const FileExtMapping kFileExtMap[] =	// Add all known mappings, multiple mappings (tif, tiff) are OK.
+{ { "pdf",  kXMP_PDFFile },
+{ "ps",   kXMP_PostScriptFile },
+{ "eps",  kXMP_EPSFile },
+
+{ "jpg",  kXMP_JPEGFile },
+{ "jpeg", kXMP_JPEGFile },
+{ "jpx",  kXMP_JPEG2KFile },
+{ "tif",  kXMP_TIFFFile },
+{ "tiff", kXMP_TIFFFile },
+{ "gif",  kXMP_GIFFile },
+{ "giff", kXMP_GIFFile },
+{ "png",  kXMP_PNGFile },
+
+{ "swf",  kXMP_SWFFile },
+{ "flv",  kXMP_FLVFile },
+
+{ "aif",  kXMP_AIFFFile },
+
+{ "mov",  kXMP_MOVFile },
+{ "avi",  kXMP_AVIFile },
+{ "cin",  kXMP_CINFile },
+{ "wav",  kXMP_WAVFile },
+{ "mp3",  kXMP_MP3File },
+{ "mp4",  kXMP_MPEG4File },
+{ "ses",  kXMP_SESFile },
+{ "cel",  kXMP_CELFile },
+{ "wma",  kXMP_WMAVFile },
+{ "wmv",  kXMP_WMAVFile },
+
+{ "mpg",  kXMP_MPEGFile },
+{ "mpeg", kXMP_MPEGFile },
+{ "mp2",  kXMP_MPEGFile },
+{ "mod",  kXMP_MPEGFile },
+{ "m2v",  kXMP_MPEGFile },
+{ "mpa",  kXMP_MPEGFile },
+{ "mpv",  kXMP_MPEGFile },
+{ "m2p",  kXMP_MPEGFile },
+{ "m2a",  kXMP_MPEGFile },
+{ "m2t",  kXMP_MPEGFile },
+{ "mpe",  kXMP_MPEGFile },
+{ "vob",  kXMP_MPEGFile },
+{ "ms-pvr", kXMP_MPEGFile },
+{ "dvr-ms", kXMP_MPEGFile },
+
+{ "html", kXMP_HTMLFile },
+{ "xml",  kXMP_XMLFile },
+{ "txt",  kXMP_TextFile },
+{ "text", kXMP_TextFile },
+
+{ "psd",  kXMP_PhotoshopFile },
+{ "ai",   kXMP_IllustratorFile },
+{ "indd", kXMP_InDesignFile },
+{ "indt", kXMP_InDesignFile },
+{ "aep",  kXMP_AEProjectFile },
+{ "aet",  kXMP_AEProjTemplateFile },
+{ "ffx",  kXMP_AEFilterPresetFile },
+{ "ncor", kXMP_EncoreProjectFile },
+{ "prproj", kXMP_PremiereProjectFile },
+{ "prtl", kXMP_PremiereTitleFile },
+
+{ 0, kXMP_UnknownFile } };	// ! Must be last as a sentinel.
+
+// File convenience wrappers (now LFA-based) ====================================
+
+// skip forward by <size> bytes and verify not beyond EOF
+void static Skip(LFA_FileRef file, XMP_Int64 size)
+{
+	// assert no more, since LFA_Seek does not return 0 to say o.k., but actual filePos
+	// OLD	assertMsg("unexpected end of file", 0 == LFA_Seek (file, size, SEEK_CUR) );
+	LFA_Seek(file, size, SEEK_CUR);
+}
+
+// going back in the file (use positive values!)
+// (yes redundant to above but "makes a better read")
+void static Rewind(LFA_FileRef file, XMP_Int64 size)
+{
+	assertMsg("use positive values",size > 0);
+	LFA_Seek (file, -size, SEEK_CUR); // ditto to above
+}
+
+// overload, no size parameter, rewinds to start
+void static Rewind(LFA_FileRef file)
+{
+	LFA_Seek (file, 0, SEEK_SET);
+}
+
+XMP_Uns32 static Peek32u(LFA_FileRef file)
+{
+	XMP_Uns32 value = tree->digest32u(file);
+	Rewind(file, 4);
+	return value;
+}
+
+
+// =================================================================================================
+
+static XMP_FileFormat
+LookupFileExtMapping ( const char * filePath )
+{
+	std::string fileExt;
+	size_t extPos = strlen (filePath);
+	for ( --extPos; extPos > 0; --extPos ) if ( filePath[extPos] == '.' ) break;
+
+	if ( filePath[extPos] != '.' ) return kXMP_UnknownFile;
+
+	++extPos;
+	fileExt.assign ( &filePath[extPos] );
+	for ( size_t i = 0; i < fileExt.size(); ++i ) {
+		if ( ('A' <= fileExt[i]) && (fileExt[i] <= 'Z') ) fileExt[i] += 0x20;
+	}
+
+	size_t mapPos;
+	for ( mapPos = 0; kFileExtMap[mapPos].ext != 0; ++mapPos ) {
+		if ( fileExt == kFileExtMap[mapPos].ext ) break;
+	}
+
+	return kFileExtMap[mapPos].format;
+
+}	// LookupFileExtMapping
+
+// =================================================================================================
+
+//*** used by in-RAM code? needs replacement?
+static void
+CaptureFileData ( LFA_FileRef file, XMP_Int64 offset, XMP_Uns32 length )
+{
+
+	if ( length > sDataMax ) {
+		if ( sDataPtr != 0 ) free (sDataPtr);
+		sDataPtr = (XMP_Uns8*) malloc (length);
+		sDataMax = length;
+	}
+
+	if ( offset != 0 ) LFA_Seek ( file, (long)offset, SEEK_SET );
+	LFA_Read ( file,  sDataPtr, length, true);
+	sDataLen = length;
+
+}	// CaptureFileData
+
+// -------------------------------------------------------------------------------------------------
+
+//*** used by in-RAM code? needs replacement !!!
+static void
+CaptureXMPF ( LFA_FileRef file, XMP_Int64 offset, XMP_Uns32 length )
+{
+
+	if ( length > sXMPMax ) {
+		if ( sXMPPtr != 0 ) free (sXMPPtr);
+		sXMPPtr = (XMP_Uns8*) malloc (length);
+		sXMPMax = length;
+	}
+
+	if ( offset != 0 ) LFA_Seek ( file, (long)offset, SEEK_SET );
+	LFA_Read ( file,  sXMPPtr, length, true);
+	sXMPLen = length;
+	sXMPPos = offset;
+
+}	// CaptureXMPF
+
+// -------------------------------------------------------------------------------------------------
+
+static void
+CaptureXMP ( const XMP_Uns8 * xmpPtr, const XMP_Uns32 xmpLen, XMP_Int64 fileOffset )
+{
+
+	if ( xmpLen > sXMPMax ) {
+		if (sXMPPtr != 0) free (sXMPPtr);
+		sXMPPtr = (XMP_Uns8*) malloc (xmpLen);
+		sXMPMax = xmpLen;
+	}
+
+	memcpy ( sXMPPtr, xmpPtr, xmpLen );
+	sXMPLen = xmpLen;
+	sXMPPos = fileOffset;
+
+}	// CaptureXMP
+
+// -------------------------------------------------------------------------------------------------
+
+static void PrintOnlyASCII_8 ( XMP_Uns8 * strPtr, XMP_Uns32 strLen, const char * /*label = 0*/, bool /*stopOnNUL*/ = true )
+{
+	//wrapping to QEBuginese
+	// - NB: remainder (zero termination earlier then length) is catered for...
+
+	tree->addComment ( convert8Bit ( strPtr, true, strLen ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static void PrintOnlyASCII_16BE ( XMP_Uns16 * u16Ptr, XMP_Uns32 u16Bytes,
+								  const char * label = 0, bool stopOnNUL = true )
+{
+	//TODO: wrap to QEBuginese just like 8bit flavor above...
+
+	bool prevBig = false;
+	size_t remainder = 0;
+	XMP_Uns32 u16Count = u16Bytes/2;
+
+	if ( (label != 0) && (*label != 0) ) tree->addComment ( "%s \"", label );
+
+	for ( XMP_Uns32 i = 0; i < u16Count; ++i ) {
+
+		XMP_Uns16 u16 = u16Ptr[i];
+		u16 = GetUns16BE (&u16);
+
+		if ( (0x20 <= u16) && (u16 <= 0x7E) ) {
+			if (prevBig) tree->addComment ( "\xA9" );
+			tree->addComment ( "%c", u16 );
+			prevBig = false;
+		} else {
+			if ( ! prevBig ) tree->addComment ( "\xA9" );
+			tree->addComment ( "%.4X", u16 );
+			prevBig = true;
+			if ( (u16 == 0) && stopOnNUL ) {
+				remainder = 2 * (u16Count - (i + 1));
+				break;
+			}
+		}
+
+	}
+
+	if ( prevBig ) tree->addComment ( "\xA9" );
+
+	if ( (label != 0) && (*label != 0) ) {
+		tree->addComment ( "\"" );
+		if (remainder != 0) tree->addComment ( "** remainder %d bytes **", remainder );
+
+	}
+
+}	// PrintOnlyASCII_16BE
+
+// -------------------------------------------------------------------------------------------------
+
+static void PrintOnlyASCII_16LE ( XMP_Uns16 * u16Ptr, XMP_Uns32 u16Bytes,
+								  const char * label = 0, bool stopOnNUL = true )
+{
+	bool prevBig = false;
+	size_t remainder = 0;
+	XMP_Uns32 u16Count = u16Bytes/2;
+
+	if ( (label != 0) && (*label != 0) ) tree->addComment ( "%s \"", label );
+
+	for ( XMP_Uns32 i = 0; i < u16Count; ++i ) {
+
+		XMP_Uns16 u16 = u16Ptr[i];
+		u16 = GetUns16LE (&u16);
+
+		if ( (0x20 <= u16) && (u16 <= 0x7E) ) {
+			if ( prevBig ) tree->addComment ( "\xA9" );
+			tree->addComment ( "%c", u16 );
+			prevBig = false;
+		} else {
+			if ( ! prevBig ) tree->addComment ( "\xA9" );
+			tree->addComment ( "%.4X", u16 );
+			prevBig = true;
+			if ( (u16 == 0) && stopOnNUL ) {
+				remainder = 2 * (u16Count - (i + 1));
+				break;
+			}
+		}
+
+	}
+
+	if ( prevBig ) tree->addComment ( "\xA9" );
+
+	if ( (label != 0) && (*label != 0) ) {
+		tree->addComment ( "\"" );
+		if ( remainder != 0 ) tree->addComment ( "** remainder %d bytes **", remainder );
+
+	}
+
+}	// PrintOnlyASCII_16LE
+
+// =================================================================================================
+
+static const XMP_Int64 kJPEGMinSize = 4;	// At least the SOI and EOI markers.
+static const XMP_Uns8  kJPEGStart[] = { 0xFF, 0xD8, 0xFF };	// 0xFFD8 is SOI, plus 0xFF for next marker.
+
+static const XMP_Int64 kPhotoshopMinSize = 26 + 4*4;	// At least the file header and 4 section lengths.
+static const XMP_Uns8  kPhotoshopV1Start[] = { 0x38, 0x42, 0x50, 0x53, 0x00, 0x01 };	// 0x38425053 is "8BPS".
+static const XMP_Uns8  kPhotoshopV2Start[] = { 0x38, 0x42, 0x50, 0x53, 0x00, 0x02 };
+
+static const XMP_Int64 kTIFFMinSize = 8+2+12+4;	// At least the header plus 1 minimal IFD.
+static const XMP_Uns8  kTIFFBigStart[]    = { 0x4D, 0x4D, 0x00, 0x2A };	// 0x4D is 'M', 0x2A is 42.
+static const XMP_Uns8  kTIFFLittleStart[] = { 0x49, 0x49, 0x2A, 0x00 };	// 0x49 is 'I'.
+
+static const XMP_Int64 kJPEG2KMinSize = 12+16;	// At least the signature and minimal file type boxes.
+static const XMP_Uns8  kJPEG2KStart[] = { 0x00, 0x00, 0x00, 0x0C, 0x6A, 0x50, 0x20, 0x20, 0x0D, 0x0A, 0x87, 0x0A };
+
+static const XMP_Int64 kPNGMinSize = 8 + (12+13) + 12;	// At least the file header plus IHDR and IEND chunks.
+static const XMP_Uns8  kPNGStart[] = { 137, 80, 78, 71, 13, 10, 26, 10 };
+
+static const XMP_Int64 kASFMinSize = 16;	// ! Not really accurate, but covers the header GUID.
+
+static const XMP_Int64 kRIFFMinSize = 12;
+
+static const XMP_Int64 kInDesignMinSize = 2 * kINDD_PageSize;	// Two master pages.
+
+static const XMP_Int64 kISOMediaMinSize = 16;	// At least a minimal file type box.
+static const XMP_Uns8  kISOMediaFTyp[]  = { 0x66, 0x74, 0x79, 0x70 };	// "ftyp"
+
+static const XMP_Uns32 kISOTag_ftyp   = 0x66747970UL;
+static const XMP_Uns32 kISOTag_uuid   = 0x75756964UL;
+static const XMP_Uns32 kISOTag_moov   = 0x6D6F6F76UL;
+static const XMP_Uns32 kISOTag_mvhd   = 0x6D766864UL;
+static const XMP_Uns32 kISOTag_udta   = 0x75647461UL;
+static const XMP_Uns32 kISOTag_trak   = 0x7472616BUL;
+static const XMP_Uns32 kISOTag_meta   = 0x6D657461UL;
+static const XMP_Uns32 kISOTag_ilst   = 0x696C7374UL;
+
+static const XMP_Uns32 kISOBrand_mp41 = 0x6D703431UL;
+static const XMP_Uns32 kISOBrand_mp42 = 0x6D703432UL;
+static const XMP_Uns32 kISOBrand_f4v  = 0x66347620UL;
+
+static const XMP_Uns32 kQTTag_XMP_    = 0x584D505FUL;
+
+static const XMP_Int64 kSWFMinSize = (8+2+4 + 2);	// Header with minimal rectangle and an End tag.
+
+static const XMP_Int64 kFLVMinSize = 9;	// Header with zero length data.
+
+static XMP_FileFormat
+CheckFileFormat ( const char * filePath, XMP_Uns8 * fileContent, XMP_Int64 fileSize )
+{
+	// ! The buffer passed to CheckFileFormat is just the first 4K bytes of the file.
+
+	if ( (fileSize >= kJPEGMinSize) && CheckBytes (fileContent, kJPEGStart, 3) ) {
+		return kXMP_JPEGFile;
+	}
+
+	if ( (fileSize >= kPhotoshopMinSize) &&
+		 (CheckBytes ( fileContent, kPhotoshopV1Start, 6 ) || CheckBytes ( fileContent, kPhotoshopV2Start, 6 )) ) {
+			return kXMP_PhotoshopFile;
+	}
+
+	if ( (fileSize >= kTIFFMinSize ) &&
+		 (CheckBytes ( fileContent, kTIFFBigStart , 4 ) || CheckBytes ( fileContent, kTIFFLittleStart, 4 )) ) {
+			return kXMP_TIFFFile;
+	}
+
+	if ( (fileSize >= kJPEG2KMinSize) && CheckBytes ( fileContent, kJPEG2KStart, 12 ) ) {
+		return kXMP_JPEG2KFile;
+	}
+
+	if ( (fileSize >= kASFMinSize) && CheckBytes ( fileContent, &kASF_HeaderGUID, 16 ) ) {
+		return kXMP_WMAVFile;
+	}
+
+	if ( (fileSize >= kPNGMinSize) && CheckBytes ( fileContent, kPNGStart, 8 ) ) {
+		return kXMP_PNGFile;
+	}
+
+	if ( (fileSize >= kRIFFMinSize) && CheckBytes ( fileContent, "RIFF", 4 ) ) {
+		if ( CheckBytes ( fileContent+8, "AVI ", 4 ) ) return kXMP_AVIFile;
+		if ( CheckBytes ( fileContent+8, "WAVE", 4 ) ) return kXMP_WAVFile;
+	}
+
+	if ( (fileSize >= kInDesignMinSize) && CheckBytes ( fileContent, kInDesign_MasterPageGUID, kInDesignGUIDSize ) ) {
+		return kXMP_InDesignFile;
+	}
+
+	if ( (fileSize >= kSWFMinSize) &&
+		 (CheckBytes ( fileContent, "FWS", 3 ) || CheckBytes ( fileContent, "CWS", 3 )) &&
+		 (fileContent[3] <= 10 /* 2007 latest is 8 */) ) {
+		return kXMP_SWFFile;
+	}
+	
+	if ( (fileSize >= kFLVMinSize) &&
+		 CheckBytes ( fileContent, "FLV", 3 ) &&
+		 (fileContent[3] <= 10 /* 2007 latest is 1 */) ) {
+		return kXMP_FLVFile;
+	}
+
+	if ( (fileSize >= kISOMediaMinSize) && CheckBytes ( fileContent+4, kISOMediaFTyp, 4 ) ) {
+
+		XMP_Uns32 ftypLen = GetUns32BE (fileContent);
+		if ( ftypLen == 0 ) ftypLen = fileSize;
+		if ( (ftypLen < kISOMediaMinSize) || (ftypLen > fileSize) || (ftypLen > 4096) ) return kXMP_UnknownFile;
+
+		XMP_Uns8 * compatPtr = fileContent + 16;
+		XMP_Uns8 * compatEnd = fileContent + ftypLen;
+
+		for ( ; compatPtr < compatEnd; compatPtr += 4 ) {
+			XMP_Uns32 compatBrand = GetUns32BE (compatPtr);
+			if ( (compatBrand == kISOBrand_mp41) || (compatBrand == kISOBrand_mp42) ) return kXMP_MPEG4File;
+		}
+
+	}
+
+	if ( (fileSize > 30) && CheckBytes ( fileContent, "\x50\x4B\x03\x04", 4 ) ) {  // "PK 03 04"
+		return kXMP_UCFFile;
+	}
+
+	// ! Do MP3 next to last. It uses the file extension if there is no ID3.
+	if ( CheckBytes ( fileContent, "ID3", 3 ) ||
+		 (LookupFileExtMapping (filePath) == kXMP_MP3File) ) return kXMP_MP3File;
+
+	// ! Do MPEG (MP2) and MOV last. They use just the file extension, not content.
+	if ( LookupFileExtMapping (filePath) == kXMP_MPEGFile ) return kXMP_MPEGFile;
+	if ( LookupFileExtMapping (filePath) == kXMP_MOVFile ) return kXMP_MOVFile;
+
+	return kXMP_UnknownFile;
+
+}	// CheckFileFormat
+
+// =================================================================================================
+// DumpXMP
+// =======
+
+static void
+DumpXMP (XMP_Uns8 * xmpPtr, XMP_Uns32 xmpLen, XMP_Int64 xmpOffset, const char * label)
+{
+	if (xmpOffset <= 0xFFFFFFFFUL) {
+		tree->pushNode("XMP");
+		tree->addComment("from %s, offset %u (0x%X), size %d", 
+			label, (XMP_Uns32)xmpOffset, (XMP_Uns32)xmpOffset, xmpLen);
+	} else {
+		tree->pushNode("XMP");
+		tree->addComment("from %s, offset %ll (0x%X-%.8X), size %d",
+			label, High32(xmpOffset), Low32(xmpOffset), xmpLen);
+	}
+
+	//bool atStart = true;
+	SXMPMeta xmp ((XMP_StringPtr)xmpPtr, xmpLen);
+	xmp.Sort();
+
+	//FNO: could be reactived, but makes the dump naturally very long - harder to read for dev work
+	//xmp.DumpObject( (DumpCallback, &atStart);
+	tree->popNode();
+}
+
+// =================================================================================================
+// DumpXMP
+// =======
+
+// an (old) wrapper for above function relying on static, "global" variables
+static void
+DumpXMP (const char * label)
+{
+	DumpXMP (sXMPPtr, sXMPLen, sXMPPos, label);
+}	// DumpXMP
+
+// =================================================================================================
+// DumpIPTC
+// ========
+//
+// The IPTC (IIM, NAA) values are in a sequence of "data sets". Each has a 5 byte header followed
+// by the value. There is no overall length in the sequence itself. Photoshop writes this in TIFF
+// as LONGs (4 byte chunks), so there might be padding at the end.
+
+static void
+DumpIPTC (XMP_Uns8 * iptcOrigin, XMP_Uns32 iptcLen, XMP_Uns32 fileOffset, const char * label)
+{
+	tree->pushNode("IPTC data");
+	tree->addComment("from %s, offset %d (0x%X), size %d", 
+		label, fileOffset, fileOffset, iptcLen);
+
+	// ** Compute and print the MD5 digest.
+	XMP_Uns8 * iptcPtr = iptcOrigin;
+	XMP_Uns8 * iptcEnd = iptcPtr + iptcLen;
+	XMP_Uns8 * valuePtr;
+	XMP_Uns32 valueLen;
+
+	while (iptcPtr < (iptcEnd - 4)) {	// ! The -4 is to skip terminal padding.
+		IPTC_DataSet * currDS = (IPTC_DataSet*)iptcPtr;
+		if (currDS->tagMarker != 0x1C) {
+			tree->comment("** invalid IPTC marker **");
+			break;
+		}
+		valuePtr = iptcPtr + 5;
+		valueLen = (currDS->octetCountHigh << 8) + currDS->octetCountLow;
+
+		if ((valueLen >> 15) == 1) {
+			int count = valueLen & 0x7FFF;
+			valueLen = 0;
+			for (int i = 0; i < count; ++i) valueLen = (valueLen << 8) + valuePtr[i];
+			valuePtr += count;
+		}
+
+		XMP_Uns32 dsOffset = fileOffset + (iptcPtr - iptcOrigin);
+
+		//key come here ===================
+		tree->setKeyValue(
+			fromArgs("IPTC:%d:%d", currDS->recordNumber, currDS->dataSetNumber),"");
+		tree->addComment("offset %d (0x%X), size %d", dsOffset, dsOffset, valueLen);
+
+
+		if ((currDS->recordNumber != 1) && (currDS->recordNumber != 2)) {
+
+			//LF only 1:** and 2:** bother us
+
+		} else if (currDS->recordNumber == 1) {
+
+			switch (currDS->dataSetNumber) {
+				case 0 :
+					{
+						XMP_Uns16 version = GetUns16BE (valuePtr);
+						tree->addComment("version = 0x%.4X", version);
+						break;
+					}
+				case 90 :
+					if (valueLen == 3) {
+						tree->addComment("encoding = 0x%.2X%.2X%.2X", valuePtr[0], valuePtr[1], valuePtr[2]);
+						if (memcmp (valuePtr, "\x1B\x25\x47", 3) == 0) tree->addComment(" (UTF-8)");
+					}
+					break;
+				default :
+					break;
+			}
+
+		} else if (currDS->dataSetNumber == 0) {
+
+			XMP_Uns16 version = GetUns16BE (valuePtr);
+			tree->addComment(",Version = 0x%.4X", version);
+
+		} else {
+
+			int ds;
+			for (ds = 0; kDataSetNames[ds].name != 0; ++ds) {
+				if (currDS->dataSetNumber == kDataSetNames[ds].id) break;
+			}
+			if (kDataSetNames[ds].name == 0) {
+				//LF
+			} else {
+				tree->addComment("%s", kDataSetNames[ds].name);
+				tree->changeValue(convert8Bit(valuePtr,false,valueLen));
+			}
+
+		}
+
+		iptcPtr = valuePtr + valueLen;
+
+	}
+
+	//LF
+	if (iptcPtr > iptcEnd) {
+		tree->comment("** Too much IPTC data, delta %d", (long)(iptcEnd - iptcPtr));
+	} else {
+		while ((iptcPtr < iptcEnd) && (*iptcPtr == 0)) ++iptcPtr;
+		if (iptcPtr != iptcEnd) tree->comment("** Too little IPTC data, delta %d", (long)(iptcPtr - iptcEnd));
+	}
+
+	tree->popNode();
+}	// DumpIPTC
+
+// =================================================================================================
+static void
+DumpImageResources (XMP_Uns8 * psirOrigin, XMP_Uns32 psirLen, XMP_Uns32 fileOffset, const char * label)
+{
+	tree->pushNode("Photoshop Image Resources");
+	tree->addComment("from %s, offset %d (0x%X), size %d",
+		label, fileOffset, fileOffset, psirLen);
+
+	XMP_Uns8 * psirPtr = psirOrigin;
+	XMP_Uns8 * psirEnd = psirPtr + psirLen;
+	XMP_Uns8 * irPtr;
+	XMP_Uns32  irLen, irOffset; //irType replaced by irTypeStr below
+
+	XMP_Uns8 * iptcPtr = 0;
+	XMP_Uns8 * xmpPtr = 0;
+	XMP_Uns8 * exif1Ptr = 0;
+	XMP_Uns8 * exif3Ptr = 0;
+	XMP_Uns32  iptcLen, xmpLen, exif1Len, exif3Len;
+
+	while (psirPtr < psirEnd) {
+		std::string irTypeStr = convert8Bit(psirPtr,false,4); //get in an endian neutral way
+		XMP_Uns16 irID = GetUns16BE ( psirPtr+4 );	// The image resource ID.
+
+		const char* irName = (XMP_StringPtr)psirPtr+6;	// A Pascal string.
+		irOffset = 6 + ((*irName + 2) & 0xFFFFFFFE);	// Offset to the image resource data length.
+		irLen = GetUns32BE (psirPtr+irOffset);
+		irPtr = psirPtr + irOffset + 4;
+
+		irOffset = fileOffset + (psirPtr - psirOrigin);
+
+		if ( irTypeStr != "8BIM" ) {
+			tree->setKeyValue( fromArgs("PSIR:%s:#%u",irTypeStr.c_str(),irID),"" );
+			tree->comment("(non-8BIM encountered and tolerated, see bug 1454756)");
+		} else if ( irID == kPSIR_IPTC ) {			//****************
+			tree->setKeyValue("PSIR:IPTC","");
+			iptcPtr = irPtr;
+			iptcLen = irLen;
+			if (iptcPtr != 0) DumpIPTC (iptcPtr, iptcLen, (fileOffset + (iptcPtr - psirOrigin)), "PSIR #1028");
+		} else if (irID == kPSIR_XMP) {				//****************
+			tree->setKeyValue("PSIR:XMP","");
+			xmpPtr = irPtr;
+			xmpLen = irLen;
+			if (xmpPtr != 0) DumpXMP (xmpPtr, xmpLen, (fileOffset + (xmpPtr - psirOrigin)), "PSIR #1060");
+		} else if (irID == kPSIR_Exif_1) {			//****************
+			tree->setKeyValue("PSIR:Exif-1","");
+			exif1Ptr = irPtr;
+			exif1Len = irLen;
+			DumpTIFF (exif1Ptr, exif1Len, (fileOffset + (exif1Ptr - psirOrigin)), "PSIR #1058 (Exif 1)");
+		} else if (irID == kPSIR_Exif_3) {			//****************
+			tree->setKeyValue("PSIR:Exif-3","");
+			exif3Ptr = irPtr;
+			exif3Len = irLen;
+			if (exif3Ptr != 0) DumpTIFF (exif3Ptr, exif3Len, (fileOffset + (exif3Ptr - psirOrigin)), "PSIR #1059 (Exif 3)");
+		} else if (irID == kPSIR_IPTC_Digest) {
+			tree->setKeyValue("PSIR:IPTC digest",
+				fromArgs("%.8X-%.8X-%.8X-%.8X",
+				GetUns32BE(irPtr), 
+				GetUns32BE(irPtr+4), 
+				GetUns32BE(irPtr+8), 
+				GetUns32BE(irPtr+12) )
+				);
+		} else if (irID == kPSIR_CopyrightFlag) {
+			bool copyrighted = (*irPtr != 0);
+			tree->setKeyValue("PSIR:copyrighted",(copyrighted ? "yes" : "no"));
+		} else if (irID == kPSIR_CopyrightURL) {
+			tree->setKeyValue("PSIR:copyright URL",convert8Bit(irPtr,true,irLen));
+		} else if (irID == kPSIR_OldCaption) {
+			tree->setKeyValue("PSIR:old caption",convert8Bit(irPtr,true,irLen));
+		} else if (irID == kPSIR_PrintCaption) {
+			tree->comment("** obsolete print caption **");
+		} else {
+			tree->setKeyValue(
+				fromArgs("PSIR:%s:#%d",irTypeStr.c_str(),irID),
+				""
+				);	
+		}
+		tree->addComment("offset %d (0x%X), size %d", irOffset, irOffset, irLen);	
+		if (*irName != 0) tree->addComment("\"%.*s\"", (int)(*irName), (irName+1));
+		psirPtr = irPtr + ((irLen + 1) & 0xFFFFFFFE);	// Round the length to be even.
+	} //while-loop
+
+	if (psirPtr != psirEnd) {
+		tree->addComment("** Unexpected end of image resources, delta %d", (long)(psirPtr - psirEnd));
+	}
+
+	//NB: dump routines moved up into if-else's	
+
+	tree->popNode();
+}	// DumpImageResources
+
+// =================================================================================================
+
+static void
+DumpOneIFD (int ifdIndex, XMP_Uns8 * ifdPtr, XMP_Uns8 * endPtr,
+			XMP_Uns8 * tiffContent, XMP_Uns32 fileOffset, const char * label)
+{
+	XMP_Uns8 * exifPtr = 0;
+	XMP_Uns8 * gpsPtr = 0;
+	XMP_Uns8 * interopPtr = 0;
+	XMP_Uns8 * makerNotePtr = 0;
+	XMP_Uns8 * psirPtr = 0;
+	XMP_Uns8 * iptcPtr = 0;
+	XMP_Uns8 * xmpPtr = 0;
+	XMP_Uns32 psirLen = 0;
+	XMP_Uns32 iptcLen = 0;
+	XMP_Uns32 xmpLen = 0;
+
+	XMP_Uns32 ifdOffset = ifdPtr - tiffContent;
+	XMP_Uns16 fieldCount = TIFF_GetUns16 (ifdPtr);
+	XMP_Uns32 ifdLen = 2 + (12 * fieldCount) + 4;
+	XMP_Uns32 nextIFD = TIFF_GetUns32 (ifdPtr+ifdLen-4);
+
+	tree->pushNode("TIFF IFD #%d from %s",ifdIndex,label);
+	tree->addComment("offset %d (0x%X), tag count %d",
+		(ifdOffset + fileOffset), (ifdOffset + fileOffset), fieldCount);
+
+	if (nextIFD == 0) {
+		tree->comment("end of IFD chain");
+	} else {
+		tree->comment("next IFD offset %d (0x%X)", (nextIFD + fileOffset), (nextIFD + fileOffset));
+	}
+
+	XMP_Uns16 prevTag = 0;
+	XMP_Uns8 * fieldPtr = tiffContent+ifdOffset+2;
+	for (int i = 0; i < fieldCount; ++i, fieldPtr += 12) {
+
+		XMP_Uns16 fieldTag = TIFF_GetUns16 (fieldPtr);
+		XMP_Uns16 fieldType = TIFF_GetUns16 (fieldPtr+2);
+		XMP_Uns32 valueCount = TIFF_GetUns32 (fieldPtr+4);
+		XMP_Uns32 valueOffset = TIFF_GetUns32 (fieldPtr+8);
+
+		XMP_Uns8 * valuePtr = ifdPtr - ifdOffset + valueOffset;
+		XMP_Uns32 valueLen = 0;
+		if (fieldType < kTIFF_TypeEnd) valueLen = valueCount * sTIFF_TypeSizes[fieldType];
+		if (valueLen <= 4) valuePtr = fieldPtr + 8;
+
+		//===================== adding key here
+		tree->setKeyValue( fromArgs("TIFF:%d", fieldTag) );
+
+		if ((fieldType < 1) || (fieldType >=  kTIFF_TypeEnd)) {
+			tree->addComment("type %d", fieldType);
+		} else {
+			tree->addComment("%s", sTIFF_TypeNames[fieldType]);
+		}
+
+		tree->addComment("count %d, value size %d", valueCount, valueLen);
+
+		if (valueLen > 4) {
+			tree->addComment("value offset %d (0x%X)", (valueOffset + fileOffset), (valueOffset + fileOffset));
+		} else {
+			XMP_Uns32 rawValue = GetUns32BE (fieldPtr+8);
+			tree->addComment("value in IFD (0x%.8X)", rawValue);
+		}
+
+		if (fieldTag == kTIFF_Exif) {
+			tree->addComment("Exif IFD offset");
+			exifPtr = tiffContent + TIFF_GetUns32 (valuePtr);	// Value is Exif IFD offset.
+		} else if (fieldTag == kTIFF_GPS) {
+			tree->addComment("GPS IFD offset");
+			gpsPtr = tiffContent + TIFF_GetUns32 (valuePtr);	// Value is GPS IFD offset.
+		} else if (fieldTag == kTIFF_Interop) {
+			tree->addComment("Interoperability IFD offset");
+			interopPtr = tiffContent + TIFF_GetUns32 (valuePtr);	// Value is Interoperability IFD offset.
+		} else if (fieldTag == kTIFF_MakerNote) {	// Decide if the Maker Note might be formatted as an IFD.
+			tree->addComment("Maker Note");
+			XMP_Uns32 itemCount = (valueLen - 6) / 12;
+			if ((valueLen >= 18) && (valueLen == (6 + itemCount*12)) &&
+				(itemCount == TIFF_GetUns16 (valuePtr)) &&
+				(TIFF_GetUns32 (valuePtr+2+(12*itemCount)) == 0)) {
+					makerNotePtr = valuePtr;
+			}
+		} else if (fieldTag == kTIFF_PSIR) {
+			tree->addComment("PSIR");
+			psirPtr = valuePtr;
+			psirLen = valueLen;
+		} else if (fieldTag == kTIFF_IPTC) {
+			tree->addComment("IPTC");
+			iptcPtr = valuePtr;
+			iptcLen = valueLen;
+		} else if (fieldTag == kTIFF_XMP) {
+			tree->addComment("XMP");
+			if (fieldType == kTIFF_ASCII) fieldType = kTIFF_Uns8;	// Avoid displaying the raw packet for mis-typed XMP.
+			xmpPtr = valuePtr;
+			xmpLen = valueLen;
+		} else {
+			for (int i = 0; sTIFF_TagNames[i].tag != 0; ++i) {
+				if (sTIFF_TagNames[i].tag == fieldTag) {
+					tree->addComment("%s", sTIFF_TagNames[i].name);
+					break;
+				}
+			}
+		}
+
+		XMP_Uns8 value8;
+		XMP_Uns16 value16;
+		XMP_Uns32 value32;
+		std::string tempStr;
+
+		switch (fieldType) {
+
+			case kTIFF_Uns8 :
+				if (valueCount == 1) {
+					value8 = *valuePtr;
+					tree->addComment("hex value = 0x%.2X", value8);
+					tree->changeValue("%u",value8);
+				}
+				break;
+
+			case kTIFF_ASCII :
+				tree->changeValue(convert8Bit(valuePtr,false /* internal NULs OK*/,valueLen));	
+				break;
+
+			case kTIFF_Uns16 :
+				if (valueCount == 1) {
+					value16 = TIFF_GetUns16 (valuePtr);
+					tree->addComment("hex value = 0x%.4X", value16);
+					tree->changeValue("%u",value16);
+				}
+				break;
+
+			case kTIFF_Uns32 :
+				if (valueCount == 1) {
+					value32 = TIFF_GetUns32 (valuePtr);
+					tree->addComment("hex value = 0x%.8X", value32);
+					tree->changeValue( "%u" , value32);
+				}
+				break;
+
+			case kTIFF_URational :
+				if (valueCount == 1) {
+					value32 = TIFF_GetUns32 (valuePtr);
+					XMP_Uns32 denom = TIFF_GetUns32 (valuePtr+4);
+					tree->changeValue( "%u/%u" , value32,denom);
+				}
+				break;
+
+			case kTIFF_Int8 :
+				if (valueCount == 1) {
+					value8 = *valuePtr;
+					//fno: show the hex value unsigned (memory representation)�and the decimal signed
+					tree->addComment("hex value 0x%.2X", value8);
+					tree->changeValue( "%d" , *((XMP_Int8*)&value8));
+				}
+				break;
+
+			case kTIFF_Undef8 :
+				if (valueCount == 1) {
+					value8 = *valuePtr;
+					tree->changeValue("0x%.2X", value8);
+				}
+				break;
+
+			case kTIFF_Int16 :
+				if (valueCount == 1) {
+					value16 = TIFF_GetUns16 (valuePtr);
+					tree->changeValue("%d (0x%.4X)", *((XMP_Int16*)&value16), value16);
+				}
+				break;
+
+			case kTIFF_Int32 :
+				if (valueCount == 1) {
+					value32 = TIFF_GetUns32 (valuePtr);
+					tree->changeValue("%d (0x%.8X)", *((XMP_Int32*)&value32), value32);
+				}
+				break;
+
+			case kTIFF_SRational :
+				if (valueCount == 1) {
+					value32 = TIFF_GetUns32 (valuePtr);
+					XMP_Uns32 denom = TIFF_GetUns32 (valuePtr+4);
+					tree->changeValue("%d/%d", *((XMP_Int32*)&value32), *((XMP_Int32*)&denom));
+				}
+				break;
+
+			case kTIFF_Float :
+				break;
+
+			case kTIFF_Double :
+				break;
+
+			default :
+				tree->addComment("** unknown type **");
+				break;
+
+		}
+
+		if (fieldTag == prevTag) {
+			tree->addComment("** Repeated tag **");
+		} else if (fieldTag < prevTag) {
+			tree->addComment("** Out of order tag **");
+		}
+
+		prevTag = fieldTag;
+
+	}
+
+	if (exifPtr != 0) {
+		DumpIFDChain (exifPtr, endPtr, tiffContent,
+			(fileOffset + (exifPtr - tiffContent)), "TIFF tag #34665 (Exif IFD)");
+	}
+
+	if (gpsPtr != 0) {
+		DumpIFDChain (gpsPtr, endPtr, tiffContent,
+			(fileOffset + (gpsPtr - tiffContent)), "TIFF tag #34853 (GPS Info IFD)");
+	}
+
+	if (interopPtr != 0) {
+		DumpIFDChain (interopPtr, endPtr, tiffContent,
+			(fileOffset + (interopPtr - tiffContent)), "TIFF tag #40965 (Interoperability IFD)");
+	}
+
+	if (makerNotePtr != 0) {
+		DumpIFDChain (makerNotePtr, endPtr, tiffContent,
+			(fileOffset + (makerNotePtr - tiffContent)), "TIFF tag #37500 (Maker Note)");
+	}
+
+	if (iptcPtr != 0) {
+		DumpIPTC (iptcPtr, iptcLen, (fileOffset + (iptcPtr - tiffContent)), "TIFF tag #33723");
+	}
+
+	if (psirPtr != 0) {
+		DumpImageResources (psirPtr, psirLen, (fileOffset + (psirPtr - tiffContent)), "TIFF tag #34377");
+	}
+
+	if (xmpPtr != 0) {
+		DumpXMP (xmpPtr, xmpLen, (fileOffset + (xmpPtr - tiffContent)), "TIFF tag #700");
+	}
+
+	tree->popNode();
+}	// DumpOneIFD
+
+// =================================================================================================
+
+
+static void
+DumpIFDChain (XMP_Uns8 * startPtr, XMP_Uns8 * endPtr,
+			  XMP_Uns8 * tiffContent, XMP_Uns32 fileOrigin, const char * label)
+{
+	XMP_Uns8 * ifdPtr = startPtr;
+	XMP_Uns32  ifdOffset = startPtr - tiffContent;
+
+	for (size_t ifdIndex = 0; ifdOffset != 0; ++ifdIndex) {
+
+		if ((ifdPtr < tiffContent) || (ifdPtr >= endPtr)) {
+			ifdOffset = fileOrigin + (ifdPtr - tiffContent);
+			tree->comment("** Invalid IFD offset, %d (0x%X) tree.", ifdOffset, ifdOffset);
+			return;
+		}
+
+		XMP_Uns16 fieldCount = TIFF_GetUns16 (ifdPtr);
+		DumpOneIFD (ifdIndex, ifdPtr, endPtr, tiffContent, fileOrigin, label);
+		ifdOffset = TIFF_GetUns32 (ifdPtr+2+(12*fieldCount));
+		ifdPtr = tiffContent + ifdOffset;
+
+	}
+
+}	// DumpIFDChain
+
+// =================================================================================================
+
+static void
+DumpTIFF (XMP_Uns8 * tiffContent, XMP_Uns32 tiffLen, XMP_Uns32 fileOffset, const char * label)
+{
+	// ! TIFF can be nested because of the Photoshop 6 weiredness. Save and restore the procs.
+	GetUns16_Proc save_GetUns16 = TIFF_GetUns16;
+	GetUns32_Proc save_GetUns32 = TIFF_GetUns32;
+	GetUns64_Proc save_GetUns64 = TIFF_GetUns64;
+
+	if (CheckBytes(tiffContent,"II\x2A\x00",4)) {
+		TIFF_GetUns16 = GetUns16LE;
+		TIFF_GetUns32 = GetUns32LE;
+		TIFF_GetUns64 = GetUns64LE;
+		tree->addComment("Little endian ");
+	} else if (CheckBytes(tiffContent,"MM\x00\x2A",4)) {
+		TIFF_GetUns16 = GetUns16BE;
+		TIFF_GetUns32 = GetUns32BE;
+		TIFF_GetUns64 = GetUns64BE;
+		tree->addComment("Big endian ");
+	} else {
+		tree->comment("** Missing TIFF image file header tree.");
+		return;
+	}
+
+	tree->addComment("TIFF from %s, offset %d (0x%X), size %d", label, fileOffset, fileOffset, tiffLen);
+
+	XMP_Uns32 ifdOffset = TIFF_GetUns32 (tiffContent+4);
+	DumpIFDChain (tiffContent+ifdOffset, tiffContent+tiffLen, tiffContent, fileOffset, label);
+
+	TIFF_GetUns16 = save_GetUns16;
+	TIFF_GetUns32 = save_GetUns32;
+	TIFF_GetUns64 = save_GetUns64;
+
+}	// DumpTIFF
+
+// =================================================================================================
+
+static void
+DumpPhotoshop (XMP_Uns8 * psdContent, XMP_Uns32 psdLen)
+{
+	psdLen=psdLen;	// Avoid unused parameter warning.
+
+	XMP_Uns32  psirOffset = 26 + 4 + GetUns32BE (psdContent+26);
+	XMP_Uns8 * psirSect = psdContent + psirOffset;
+	XMP_Uns8 * psirPtr  = psirSect + 4;
+	XMP_Uns32  psirLen = GetUns32BE (psirSect);
+
+	DumpImageResources (psirPtr, psirLen, (psirPtr - psdContent), "Photoshop file");
+
+}	// DumpPhotoshop
+
+// =================================================================================================
+
+static void
+DumpJPEG (XMP_Uns8 * jpegContent, XMP_Uns32 jpegLen)
+{
+	XMP_Uns8 * endPtr = jpegContent + jpegLen;
+	XMP_Uns8 * segPtr = jpegContent;
+	XMP_Uns32  segOffset;
+
+	XMP_Uns8 * xmpPtr = 0;
+	XMP_Uns8 * psirPtr = 0;
+	XMP_Uns8 * exifPtr = 0;
+	XMP_Uns16 xmpLen = 0;
+	XMP_Uns16 psirLen = 0;
+	XMP_Uns16 exifLen = 0;
+
+	while (segPtr < endPtr) { // ----------------------------------------------------------------
+
+		XMP_Uns16  segMark = GetUns16BE (segPtr);
+		if (segMark == 0xFFFF) {
+			segPtr += 1;	// Skip leading 0xFF pad byte.
+			continue;
+		}
+
+		XMP_Uns16 minorKind = segMark & 0x000F;
+		segOffset = segPtr - jpegContent;
+
+		tree->pushNode("JPEG:%.4X",segMark);
+		tree->addComment("offset %d (0x%X)", segOffset, segOffset);
+
+		if (((segMark >> 8) != 0xFF) || (segMark == 0xFF00)) {
+			tree->addComment("** invalid JPEG marker **");
+			tree->popNode();
+			break;
+		}
+
+		// Check for standalone markers first, only fetch the length for marker segments.
+
+		if (segMark == 0xFF01) {
+			tree->addComment("** TEM **");
+			segPtr += 2;	// A standalone marker.
+			tree->popNode();
+			continue;
+		} else if ((0xFFD0 <= segMark) && (segMark <= 0xFFD7)) {
+			tree->addComment(fromArgs("RST%d  ** unexpected **", minorKind));
+			segPtr += 2;	// A standalone marker.
+			tree->popNode();
+			continue;
+		} else if (segMark == 0xFFD8) {
+			tree->addComment("SOI");
+			segPtr += 2;	// A standalone marker.
+			tree->popNode();
+			continue;
+		} else if (segMark == 0xFFD9) {
+			tree->addComment("EOI");
+			segPtr += 2;	// A standalone marker.
+			tree->popNode();
+			break;	// Exit on EOI.
+		}
+
+		XMP_Uns16 segLen = GetUns16BE (segPtr+2);
+
+		// figure out Exif vs PSIR vs XMP
+		if ((0xFFE0 <= segMark) && (segMark <= 0xFFEF)) {
+			const char* segName = (const char *)(segPtr+4);
+			tree->addComment(fromArgs("size %d, APP%d, \"%s\"", segLen, minorKind, segName));
+			if ((minorKind == 1) &&
+				((memcmp(segName,"Exif\0\0",6) == 0) || (memcmp(segName,"Exif\0\xFF",6) == 0))) {
+					tree->addComment("Exif");
+					exifPtr = segPtr + 4 + 6;
+					exifLen = segLen - 2 - 6;
+			} else if ((minorKind == 13) && (strcmp(segName,"Photoshop 3.0") == 0)) {
+				tree->addComment("PSIR");
+				psirPtr = segPtr + 4 + strlen(segName) + 1;
+				psirLen = (XMP_Uns16)(segLen - 2 - strlen(segName) - 1);
+			} else if ((minorKind == 1) && (strcmp(segName,"http://ns.adobe.com/xap/1.0/") == 0)) {
+				tree->addComment("XMP");
+				xmpPtr = segPtr + 4 + strlen(segName) + 1;
+				xmpLen = (XMP_Uns16)(segLen - 2 - strlen(segName) - 1);
+			}
+			segPtr += 2+segLen;
+			tree->popNode();
+			continue;
+		}
+
+		if (segMark == 0xFFDA) {
+			tree->addComment(fromArgs("size %d, SOS", segLen));
+			segPtr += 2+segLen;	// Skip the SOS marker segment itself
+			long rstCount = 0;
+			while (segPtr < endPtr) {	// Skip the entropy-coded data and RSTn markers.
+				if (*segPtr != 0xFF) {
+					segPtr += 1;	// General data byte.
+				} else {
+					segMark = GetUns16BE (segPtr);
+					if (segMark == 0xFF00) {
+						segPtr += 2;	// Padded 0xFF data byte.
+					} else if ((segMark < 0xFFD0) || (segMark > 0xFFD7)) {
+						segLen = 0;
+						segPtr -= 2;	// Prepare for the increment in the outer loop.
+						break;	// Exit, non-RSTn marker.
+					} else {
+						++rstCount;
+						segPtr += 2;
+					}
+				}
+			}
+			tree->addComment(fromArgs("%d restart markers", rstCount));
+
+			segPtr += 2+segLen;
+			tree->popNode();
+			continue;
+		}
+
+
+		if ((0xFF02 <= segMark) && (segMark <= 0xFFBF)) {
+			tree->addComment(fromArgs("size %d, ** RES **", segLen));
+		} else if ((0xFFC0 <= segMark) && (segMark <= 0xFFC3)) {
+			tree->addComment(fromArgs("size %d, SOF%d", segLen, minorKind));
+		} else if (segMark == 0xFFC4) {
+			tree->addComment(fromArgs("size %d, DHT", segLen));
+		} else if ((0xFFC5 <= segMark) && (segMark <= 0xFFC7)) {
+			tree->addComment(fromArgs("size %d, SOF%d", segLen, minorKind));
+		} else if (segMark == 0xFFC8) {
+			tree->addComment(fromArgs("size %d, JPG", segLen));
+		} else if ((0xFFC9 <= segMark) && (segMark <= 0xFFCB)) {
+			tree->addComment(fromArgs("size %d, SOF%d", segLen, minorKind));
+		} else if (segMark == 0xFFCC) {
+			tree->addComment(fromArgs("size %d, DAC", segLen));
+		} else if ((0xFFCD <= segMark) && (segMark <= 0xFFCF)) {
+			tree->addComment(fromArgs("size %d, SOF%d", segLen, minorKind));
+		} else if (segMark == 0xFFDB) {
+			tree->addComment(fromArgs("size %d, DQT", segLen));
+		} else if (segMark == 0xFFDC) {
+			tree->addComment(fromArgs("size %d, DNL", segLen));
+		} else if (segMark == 0xFFDD) {
+			tree->addComment(fromArgs("size %d, DRI", segLen));
+		} else if (segMark == 0xFFDE) {
+			tree->addComment(fromArgs("size %d, DHP", segLen));
+		} else if (segMark == 0xFFDF) {
+			tree->addComment(fromArgs("size %d, EXP", segLen));
+		} else if ((0xFFF0 <= segMark) && (segMark <= 0xFFFD)) {
+			tree->addComment(fromArgs("size %d, JPG%d", segLen, minorKind));
+		} else if (segMark == 0xFFFE) {
+			tree->addComment(fromArgs("size %d, COM", segLen));
+		} else {
+			tree->addComment("** UNRECOGNIZED MARKER **");
+		}
+
+		segPtr += 2+segLen;
+
+		tree->popNode();
+	} // ------------------------------------------------------------------------------------
+
+	if (segPtr != endPtr) {
+		segOffset = segPtr - jpegContent;
+		tree->addComment(fromArgs(
+			"** Unexpected end of JPEG markers at offset %d (0x%X), delta %d tree.",
+			segOffset, segOffset, (long)(endPtr-segPtr)
+			));
+	}
+
+	if (exifPtr != 0) DumpTIFF (exifPtr, exifLen, (exifPtr - jpegContent), "JPEG Exif APP1");
+	if (psirPtr != 0) DumpImageResources (psirPtr, psirLen, (psirPtr - jpegContent), "JPEG Photoshop APP13");
+	if (xmpPtr != 0) DumpXMP (xmpPtr, xmpLen, (xmpPtr - jpegContent), "JPEG XMP APP1");
+
+}	// DumpJPEG
+
+// =================================================================================================
+
+static XMP_Uns32
+DumpISOFileType (XMP_Uns8 * ftypPtr, XMP_Uns32 ftypLimit)
+{
+	XMP_Uns32 ftypLen = GetUns32BE (ftypPtr);
+	XMP_Uns32 ftypTag = GetUns32BE (ftypPtr+4);
+
+	if (ftypLen == 0) ftypLen = ftypLimit;
+
+	if ((ftypLen < 16) || (ftypLen > ftypLimit) || (ftypTag != kISOTag_ftyp)) {
+		tree->addComment(	"** Invalid File Type box: tag = '%.4s' (0x%.8X), size = %d **",
+			ftypPtr+4, ftypTag, ftypLen);
+		return ftypLimit;	// Force caller to skip the rest of the file.
+	}
+
+	XMP_Uns32 ftypVersion = GetUns32BE (ftypPtr+12);
+
+	tree->comment("Major Brand '%.4s', version %d",ftypPtr+8, ftypVersion);
+	tree->comment("Compatible brands:");
+
+	XMP_Uns8 * compatPtr = ftypPtr + 16;
+	XMP_Uns8 * compatEnd = ftypPtr + ftypLen;
+
+	if (compatPtr >= compatEnd)
+		tree->addComment("<none>");
+
+	for (; compatPtr < compatEnd; compatPtr += 4) {
+		tree->addComment("'%.4s'", compatPtr);
+	}
+
+	return ftypLen;
+}	// DumpISOFileType
+
+// =================================================================================================
+
+static const XMP_Uns8 kUUID_XMP[16]  =
+{ 0xBE, 0x7A, 0xCF, 0xCB, 0x97, 0xA9, 0x42, 0xE8, 0x9C, 0x71, 0x99, 0x94, 0x91, 0xE3, 0xAF, 0xAC };
+static const XMP_Uns8 kUUID_Exif[16] =
+{ 0x05, 0x37, 0xCD, 0xAB, 0x9D, 0x0C, 0x44, 0x31, 0xA7, 0x2A, 0xFA, 0x56, 0x1F, 0x2A, 0x11, 0x3E };
+static const XMP_Uns8 kUUID_IPTC[16] =
+{ 0x09, 0xA1, 0x4E, 0x97, 0xC0, 0xB4, 0x42, 0xE0, 0xBE, 0xBF, 0x36, 0xDF, 0x6F, 0x0C, 0xE3, 0x6F };
+static const XMP_Uns8 kUUID_PSIR[16] =
+{ 0x2C, 0x4C, 0x01, 0x00, 0x85, 0x04, 0x40, 0xB9, 0xA0, 0x3E, 0x56, 0x21, 0x48, 0xD6, 0xDF, 0xEB };
+
+static XMP_Uns8 * sISOPtr_XMP  = 0;	// ! Rather ugly, but what the heck.
+static XMP_Uns32  sISOLen_XMP  = 0;
+static XMP_Int32  sISOPos_XMP  = 0;	// *** Should be 64 bits.
+
+static XMP_Uns8 * sISOPtr_Exif = 0;
+static XMP_Uns32  sISOLen_Exif = 0;
+static XMP_Uns32  sISOPos_Exif = 0;
+
+static XMP_Uns8 * sISOPtr_IPTC = 0;
+static XMP_Uns32  sISOLen_IPTC = 0;
+static XMP_Uns32  sISOPos_IPTC = 0;
+
+static XMP_Uns8 * sISOPtr_PSIR = 0;
+static XMP_Uns32  sISOLen_PSIR = 0;
+static XMP_Uns32  sISOPos_PSIR = 0;
+
+// -------------------------------------------------------------------------------------------------
+
+static void
+CleanISOLegacy()
+{
+	if (sISOPtr_XMP != 0) free (sISOPtr_XMP);
+	sISOPtr_XMP = 0;
+	sISOLen_XMP = 0;
+	sISOPos_XMP = 0;
+
+	if (sISOPtr_Exif != 0) free (sISOPtr_Exif);
+	sISOPtr_Exif = 0;
+	sISOLen_Exif = 0;
+	sISOPos_Exif = 0;
+
+	if (sISOPtr_IPTC != 0) free (sISOPtr_IPTC);
+	sISOPtr_IPTC = 0;
+	sISOLen_IPTC = 0;
+	sISOPos_IPTC = 0;
+
+	if (sISOPtr_PSIR != 0) free (sISOPtr_PSIR);
+	sISOPtr_PSIR = 0;
+	sISOLen_PSIR = 0;
+	sISOPos_PSIR = 0;
+
+}	// CleanISOLegacy
+
+// =================================================================================================
+
+static XMP_Uns32
+DumpISOBoxInfo ( LFA_FileRef file, XMP_Uns32 parent, XMP_Uns32 boxOffset, XMP_Uns32 boxLimit,
+				 bool isQT = false, bool doPop = true )
+{
+	XMP_Uns32 boxLen, boxTag, contentOffset;
+	XMP_Int64 bigLen = 0;
+	
+	if ( (boxOffset > boxLimit) || ((boxLimit-boxOffset) < 8) ) {
+		tree->comment ( "** No room for box in %d..%d, %d **", boxOffset, boxLimit, (boxLimit-boxOffset) );
+		return boxLimit;	// Off track, stop looking for boxes.
+	}
+
+	LFA_Seek ( file, boxOffset, SEEK_SET );
+	LFA_Read ( file, &boxLen, 4, true);
+	LFA_Read ( file, &boxTag, 4, true);
+
+	boxLen = GetUns32BE ( &boxLen );
+	contentOffset = 8;
+
+	if ( boxLen == 0 ) {
+		boxLen = boxLimit;
+	} else if ( boxLen == 1 ) {
+		LFA_Read ( file,  &bigLen, 8, true);
+		bigLen = GetUns64BE ( &bigLen );
+		boxLen = Low32(bigLen);	// ! HACK!
+		contentOffset = 16;
+	}
+
+	if ( boxLen < 8 ) {
+		tree->comment ( "** Bad box size of %d **", boxLen );
+		return boxLimit;	// Off track, stop looking for boxes.
+	}
+	
+	tree->pushNode ( fromArgs("'%.4s'", &boxTag) );
+	
+	boxTag = GetUns32BE ( &boxTag );	// ! After string print before hex print. needed below, too, to make comparisons work.
+	if ( bigLen == 0 ) {
+		tree->addComment( fromArgs( "hex value: %X, offset %d (0x%X), size %d", boxTag, boxOffset, boxOffset, boxLen ) );
+	} else {
+		tree->addComment( fromArgs( "hex value: %X, offset %d (0x%X), size %llu (0x %X_%.8X)",boxTag, boxOffset, boxOffset, bigLen, High32(bigLen), Low32(bigLen) ));
+	}	
+
+	// only go deeper into boxes that matter:
+	if ( (boxTag == kISOTag_moov) || (boxTag == kISOTag_udta) ||
+		 (boxTag == kISOTag_trak) || (boxTag == kISOTag_meta) ) {
+	
+		XMP_Uns32 childPos, childLen;
+		XMP_Uns32 childLimit = boxOffset + boxLen;
+		if ( boxTag == kISOTag_meta ) {
+			// reasoning here:
+			// meta boxes with parent udta have versions
+			//  (as any ISO-part-12 file should, thus "!isQT or ...")
+			// other meta boxes (i.e. under 'trak') do not
+			if ( (! isQT) || (parent == kISOTag_udta) ) {
+				contentOffset += 4;	// Skip the version and flags.
+			} else {
+				tree->addComment ( "\t** QT hack for 'meta' with no version/flags **" );
+			}
+		}
+
+		for ( childPos = (boxOffset + contentOffset); childPos < childLimit; childPos += childLen ) {
+			childLen = DumpISOBoxInfo ( file, boxTag, childPos, childLimit, isQT );
+		}
+
+	} else if ( boxTag == kISOTag_ilst ) {
+
+		// The Apple 'ilst' metadata appears to have a simple 2 level structure. 'Appears to' because
+		// we do not have official documentation. The 'ilst' box is a simple container Box (no
+		// version/flags), as are the boxes that it contains. It looks like those subboxes are the
+		// metadata items. The sub-box type is the metadata item name, the sub-box contains just a
+		// 'data' box with the value.
+		
+		// *** The inner loop is hardwired to assume the sub-box has an 8 byte header.
+	
+		XMP_Uns32 downOnePos, downOneLen;
+		XMP_Uns32 downOneLimit = boxOffset + boxLen;
+
+		for ( downOnePos = (boxOffset + contentOffset); downOnePos < downOneLimit; downOnePos += downOneLen ) {
+
+			downOneLen = DumpISOBoxInfo ( file, boxTag, downOnePos, downOneLimit, isQT, false /* no pop */ );
+	
+			XMP_Uns32 downTwoPos, downTwoLen;
+			XMP_Uns32 downTwoLimit = downOnePos + downOneLen;
+
+			for ( downTwoPos = (downOnePos + 8); downTwoPos < downTwoLimit; downTwoPos += downTwoLen ) {
+				downTwoLen = DumpISOBoxInfo ( file, boxTag, downTwoPos, downTwoLimit, isQT );
+			}
+			
+			tree->popNode();
+
+		}
+
+	} else if ( boxTag == kQTTag_XMP_ ) {
+
+		tree->addComment ( "QuickTime XMP" );
+		if ( sISOPtr_XMP != 0 ) tree->addComment ( "** Redundant QuickTime XMP **" );
+		
+		sISOLen_XMP = boxLen - 8;
+		sISOPtr_XMP = (XMP_Uns8*) malloc ( sISOLen_XMP );
+		sISOPos_XMP = LFA_Tell ( file );
+		LFA_Read ( file,  sISOPtr_XMP, sISOLen_XMP, true );
+
+	} else if ( (boxTag == kISOTag_uuid) && (boxLen >= 24) ) {
+
+		XMP_Uns8 uuid[16];
+		LFA_Read ( file,  &uuid, 16, true);
+
+		tree->addComment ( "UUID" );
+		for ( int i = 0; i < 16; ++i ) {
+			if ( (i & 3) == 0 ) tree->addComment ( " " );
+			tree->addComment ( "%.2X", uuid[i] );
+		}
+
+		if ( CheckBytes ( uuid, kUUID_XMP, 16 ) ) {
+
+			tree->addComment ( "ISO Base Media XMP" );
+			if ( sISOPtr_XMP != 0 ) tree->addComment ( "** Redundant ISO Base Media XMP **" );
+
+			sISOLen_XMP = boxLen - 24;
+			sISOPtr_XMP = (XMP_Uns8*) malloc ( sISOLen_XMP );
+			sISOPos_XMP = LFA_Tell ( file );
+			LFA_Read ( file,  sISOPtr_XMP, sISOLen_XMP, true );
+
+		} else if ( CheckBytes ( uuid, kUUID_Exif, 16 ) ) {
+
+			tree->addComment ( "ISO Base Media Exif" );
+			if ( sISOPtr_Exif != 0 ) tree->addComment ( "** Redundant ISO Base Media Exif **" );
+
+			sISOLen_Exif = boxLen - 24;
+			sISOPtr_Exif = (XMP_Uns8*) malloc ( sISOLen_Exif );
+			sISOPos_Exif = LFA_Tell ( file );
+			LFA_Read ( file,  sISOPtr_Exif, sISOLen_Exif, true );
+
+		} else if ( CheckBytes ( uuid, kUUID_IPTC, 16 ) ) {
+
+			tree->addComment ( "ISO Base Media IPTC" );
+			if ( sISOPtr_IPTC != 0 ) tree->addComment ( "** Redundant ISO Base Media IPTC **" );
+
+			sISOLen_IPTC = boxLen - 24;
+			sISOPtr_IPTC = (XMP_Uns8*) malloc ( sISOLen_IPTC );
+			sISOPos_IPTC = LFA_Tell ( file );
+			LFA_Read ( file,  sISOPtr_IPTC, sISOLen_IPTC, true );
+
+		} else if ( CheckBytes ( uuid, kUUID_PSIR, 16 ) ) {
+
+			tree->addComment ( "ISO Base Media PSIR" );
+			if ( sISOPtr_PSIR != 0 ) tree->addComment ( "** Redundant ISO Base Media PSIR **" );
+
+			sISOLen_PSIR = boxLen - 24;
+			sISOPtr_PSIR = (XMP_Uns8*) malloc ( sISOLen_PSIR );
+			sISOPos_PSIR = LFA_Tell ( file );
+			LFA_Read ( file,  sISOPtr_PSIR, sISOLen_PSIR, true );
+		}
+
+	}
+
+	if ( doPop ) tree->popNode();
+
+	return boxLen;
+
+}	// DumpISOBoxInfo
+
+// =================================================================================================
+
+static void
+DumpJPEG2000 (LFA_FileRef file, XMP_Uns32 jp2kLen)
+{
+	// JPEG 2000 files are ISO base media file format, 
+	// ISO 14496-12, with an initial 12 byte signature.
+
+	XMP_Uns8 buffer[4096];
+	size_t   bufLen;
+
+	LFA_Seek ( file, 12, SEEK_SET );
+	bufLen = LFA_Read ( file,  buffer, sizeof(buffer), false);
+
+	XMP_Uns32 ftypLen = DumpISOFileType ( buffer, bufLen );
+
+	XMP_Uns32 boxPos, boxLen;
+
+	for ( boxPos = ftypLen+12; boxPos < jp2kLen; boxPos += boxLen ) {
+		boxLen = DumpISOBoxInfo ( file, 0, boxPos, jp2kLen );
+	}
+
+	if ( sISOPtr_Exif != 0 ) {
+		DumpTIFF ( sISOPtr_Exif, sISOLen_Exif, sISOPos_Exif, "JPEG 2000 Exif" );
+	}
+
+	if ( sISOPtr_IPTC != 0)  {
+		DumpIPTC ( sISOPtr_IPTC, sISOLen_IPTC, sISOPos_IPTC, "JPEG 2000 IPTC" );
+	}
+
+	if ( sISOPtr_PSIR != 0 ) {
+		DumpImageResources ( sISOPtr_PSIR, sISOLen_PSIR, sISOPos_PSIR, "JPEG 2000 PSIR" );
+	}
+
+	if ( sISOPtr_XMP != 0 ) {
+		DumpXMP ( sISOPtr_XMP, sISOLen_XMP, sISOPos_XMP, "JPEG 2000 XMP" );
+	}
+
+	CleanISOLegacy();
+}	// DumpJPEG2000
+
+// =================================================================================================
+
+// attempt to combine dumping of mpeg-4 and quicktime (mov) into one routine...
+static void
+DumpISO ( LFA_FileRef file, XMP_Uns32 fileLen, bool isQT )
+{
+	// MPEG-4 
+	// uses the ISO base media file format, ISO 14496-12. The base structure is a sequence of
+	// boxes, a box can have nested boxes. The box structure is:
+	//   A big endian UInt32 box size, the offset to the following box
+	//   A big endian UInt32 box type, generally 4 ASCII characters
+	//   The box data
+	// A box size of 0 means the last box in the file. If the box size is 1 a big endian UInt64 size
+	// is present between the box type and data. A common subtype is a UUID box. These have a type
+	// of uuid, followed by a 16 byte UUID, followed by other box data.
+	//
+	// The XMP is in a top level UUID box with the UUID BE7ACFCB 97A942E8 9C719994 91E3AFAC.
+
+	// MOV
+	// A QuickTime file happens to be identical to the ISO base media file format at the raw level.
+	// * The chunks are called "atoms" instead of "boxes"
+	// * A leading 'ftyp' atom is not required.
+	
+	XMP_Uns32 boxPos = 0; //assume null (presence of ftyp box will correct)
+	XMP_Uns32 boxLen;
+
+	// TODO: make obsolete
+	XMP_Uns8 buffer[4096];
+	size_t   bufLen;
+	LFA_Seek ( file, 0, SEEK_SET );
+	bufLen = LFA_Read ( file,  buffer, sizeof(buffer) );
+
+	//peek at first 4 bytes
+	Rewind(file);
+	Skip(file,4);
+
+	XMP_Uns32 temp = tree->digest32u( file , "" , true, true );
+	bool hasFtyp = ( kISOTag_ftyp == temp);
+	Rewind(file,4);
+
+	//in Quicktime, a leading 'ftyp' atom is optional,
+	//in MPEG-4 it is mandatory:
+	if (! isQT)
+		assertMsg("MPEG-4 File must have a first 'ftyp' box!", hasFtyp );
+
+	// if existing, go parse it:
+	if( hasFtyp )
+		boxPos = DumpISOFileType ( buffer, bufLen );
+
+	// iterate rest of boxes
+	for ( ; boxPos < fileLen; boxPos += boxLen ) {
+		boxLen = DumpISOBoxInfo ( file, 0, boxPos, fileLen, isQT);
+	}
+
+	// final memory test
+	assertMsg("Unexpected Exif (somewhere in file)", sISOPtr_Exif == 0);
+	assertMsg("Unexpected IPTC (somewhere in file)", sISOPtr_IPTC == 0);
+	assertMsg("Unexpected PSIR (somewhere in file)", sISOPtr_PSIR == 0);
+
+	CleanISOLegacy(); //free's some memory
+}
+
+// =================================================================================================
+
+static size_t GetASFObjectInfo (LFA_FileRef file, XMP_Uns32 objOffset, ASF_ObjHeader* objHeader, size_t nesting)
+{
+	LFA_Seek (file, objOffset, SEEK_SET);
+	LFA_Read ( file, objHeader, 24, true);
+
+	objHeader->size = GetUns64LE (&objHeader->size);
+	XMP_Uns32 size32 = (XMP_Uns32)objHeader->size;
+
+	if (objHeader->size > 0xFFFFFFFF) {
+		tree->addComment("** ASF Object at offset 0x%X is over 4GB: 0x%.8X 0x%.8X",
+			objOffset, High32(objHeader->size), Low32(objHeader->size));
+	}
+
+	size_t infoIndex;
+	for (infoIndex = 0; kASF_KnownObjects[infoIndex].name != 0; ++infoIndex) {
+		if (memcmp (&objHeader->guid, &kASF_KnownObjects[infoIndex].guid, 16) == 0) break;
+	}
+
+	std::string indent (3*nesting, ' ');
+
+	if (kASF_KnownObjects[infoIndex].name != 0) {
+		tree->addComment("%s   %s Object, offset %u (0x%X), size %u",
+			indent.c_str(), kASF_KnownObjects[infoIndex].name, objOffset, objOffset, size32);
+	} else {
+		tree->addComment("%s   <<unknown object>>, offset %u (0x%X), size %u",
+			indent.c_str(), objOffset, objOffset, size32);
+		ASF_GUID guid;
+		guid.part1 = GetUns32LE (&objHeader->guid.part1);
+		guid.part2 = GetUns16LE (&objHeader->guid.part2);
+		guid.part3 = GetUns16LE (&objHeader->guid.part3);
+		guid.part4 = GetUns16LE (&objHeader->guid.part4);
+		tree->addComment("GUID %.8X-%.4X-%.4X-%.4X-%.4X%.8X",
+			guid.part1, guid.part2, guid.part3, guid.part4,
+			*(XMP_Uns16*)(&guid.part5[0]), *(XMP_Uns32*)(&guid.part5[2]));
+	}
+
+	if (objOffset != 0) tree->addComment("");	// Don't print newline for the real header.
+
+	return infoIndex;
+
+}	// GetASFObjectInfo
+
+// =================================================================================================
+
+static void PrinfASF_UTF16 (LFA_FileRef file, XMP_Uns16 byteCount, const char * label)
+{
+	size_t filePos = LFA_Tell (file);
+	//FNO: note: has sideeffect on sDataPtr
+	CaptureFileData (file, 0, byteCount);
+
+	tree->setKeyValue(
+		label,
+		convert16Bit(false,sDataPtr,false,byteCount),
+		fromArgs("offset %d (0x%X), size %d",filePos, filePos, byteCount)
+		);
+}
+
+static void DumpASFFileProperties (LFA_FileRef file, XMP_Uns32 objOffset, XMP_Uns32 objLen)
+{
+	ASF_FileProperties fileProps;
+
+	if (objLen < kASF_FilePropertiesSize) {
+		tree->comment("** File Properties Object is too short");
+		return;
+	}
+
+	LFA_Seek (file, objOffset, SEEK_SET);
+	LFA_Read ( file, &fileProps, kASF_FilePropertiesSize, true);
+
+	fileProps.flags = GetUns32LE (&fileProps.flags);	// Only care about flags and create date.
+	fileProps.creationDate = GetUns64LE (&fileProps.creationDate);
+
+	bool bcast = (bool)(fileProps.flags & 1);
+	tree->setKeyValue("ASF:broadcast",
+		(bcast ? "set" : "not set")
+		);
+
+	XMP_Int64 totalSecs = fileProps.creationDate / (10*1000*1000);
+	XMP_Int32 nanoSec = ((XMP_Int32) (fileProps.creationDate - (totalSecs * 10*1000*1000))) * 100;
+	XMP_Int32 days = (XMP_Int32) (totalSecs / 86400);
+	totalSecs -= ((XMP_Int64)days * 86400);
+	XMP_Int32 hour = (XMP_Int32) (totalSecs / 3600);
+	totalSecs -= ((XMP_Int64)hour * 3600);
+	XMP_Int32 minute = (XMP_Int32) (totalSecs / 60);
+	totalSecs -= ((XMP_Int64)minute * 60);
+	XMP_Int32 second = (XMP_Int32)totalSecs;
+	XMP_DateTime binDate;
+	memset (&binDate, 0, sizeof(binDate));
+
+	binDate.year = 1601;
+	binDate.month = 1;
+	binDate.day = 1;
+
+	binDate.day += days;
+	binDate.hour = hour;
+	binDate.minute = minute;
+	binDate.second = second;
+	binDate.nanoSecond = nanoSec;
+
+	SXMPUtils::ConvertToUTCTime (&binDate);
+	std::string strDate;
+	SXMPUtils::ConvertFromDate (binDate, &strDate);
+
+	tree->setKeyValue("ASF:creation date",
+		fromArgs("%s (0x%.8X-%.8X)",
+		strDate.c_str(), High32(fileProps.creationDate), Low32(fileProps.creationDate))
+		);
+}	// DumpASFFileProperties
+
+// =================================================================================================
+
+static void DumpASFContentDescription (LFA_FileRef file, XMP_Uns32 objOffset, XMP_Uns32 objLen)
+{
+	ASF_ContentDescription contentDesc;	// ! The lengths are in bytes.
+
+	if (objLen < kASF_ContentDescriptionSize) {
+		tree->comment("** Content Description Object is too short");
+		return;
+	}
+
+	LFA_Seek (file, objOffset, SEEK_SET);
+	LFA_Read ( file, &contentDesc, kASF_ContentDescriptionSize, true);
+
+	contentDesc.titleLen = GetUns16LE (&contentDesc.titleLen);
+	contentDesc.authorLen = GetUns16LE (&contentDesc.authorLen);
+	contentDesc.copyrightLen = GetUns16LE (&contentDesc.copyrightLen);
+	contentDesc.descriptionLen = GetUns16LE (&contentDesc.descriptionLen);
+	contentDesc.ratingLen = GetUns16LE (&contentDesc.ratingLen);
+
+	PrinfASF_UTF16 (file, contentDesc.titleLen, "ASF:title");
+	PrinfASF_UTF16 (file, contentDesc.authorLen, "ASF:author");
+	PrinfASF_UTF16 (file, contentDesc.copyrightLen, "ASF:copyright");
+	PrinfASF_UTF16 (file, contentDesc.descriptionLen, "ASF:description");
+	PrinfASF_UTF16 (file, contentDesc.ratingLen, "ASF:rating");
+
+}	// DumpASFContentDescription
+
+// =================================================================================================
+
+static void DumpASFContentBranding (LFA_FileRef file, XMP_Uns32 objOffset, XMP_Uns32 objLen)
+{
+	XMP_Uns32 fieldSize;
+
+	if (objLen < (16 + 8 + 4*4)) {
+		tree->comment("** Content Branding Object is too short");
+		return;
+	}
+
+	XMP_Uns32 fieldOffset = objOffset + 16 + 8 + 4;
+	LFA_Seek (file, fieldOffset, SEEK_SET);
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	fieldOffset += fieldSize;
+	LFA_Seek (file, fieldSize, SEEK_CUR);	// Skip the banner data.
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	fieldOffset += fieldSize;
+	tree->setKeyValue("ASF:banner URL",
+		"",
+		fromArgs("offset %d (0x%X), size %d", fieldOffset, fieldOffset, fieldSize )
+		);
+
+	if (fieldSize != 0) {
+		CaptureFileData (file, 0, fieldSize);
+		//NB: not yet tested..., not sure if stopOnNull needed, thus using false
+		tree->changeValue(convert8Bit(sDataPtr,false,fieldSize));
+	}
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	fieldOffset += fieldSize;
+	tree->setKeyValue("ASF:copyright URL",
+		"",
+		fromArgs("offset %d (0x%X), size %d",	fieldOffset, fieldOffset, fieldSize)
+		);
+
+	if (fieldSize != 0) {
+		CaptureFileData (file, 0, fieldSize);
+		//NB: not yet tested..., not sure if stopOnNull needed, thus using false
+		tree->changeValue(convert8Bit(sDataPtr,false,fieldSize));
+	}
+
+}	// DumpASFContentBranding
+
+// =================================================================================================
+
+static void DumpASFContentEncryption (LFA_FileRef file, XMP_Uns32 objOffset, XMP_Uns32 objLen)
+{
+	XMP_Uns32 fieldSize;
+
+	if (objLen < (16 + 8 + 4*4)) {
+		tree->addComment("** Content Encryption Object is too short");
+		return;
+	}
+
+	LFA_Seek (file, (objOffset+16+8), SEEK_SET);
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	LFA_Seek (file, fieldSize, SEEK_CUR);	// Skip the secret data.
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	LFA_Seek (file, fieldSize, SEEK_CUR);	// Skip the protection type.
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	CaptureFileData (file, 0, fieldSize);
+	PrintOnlyASCII_8 (sDataPtr, fieldSize, "Key ID");
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	CaptureFileData (file, 0, fieldSize);
+	PrintOnlyASCII_8 (sDataPtr, fieldSize, "License URL");
+
+}	// DumpASFContentEncryption
+
+// =================================================================================================
+
+static void DumpASFHeaderExtension (LFA_FileRef file, XMP_Uns32 extOffset, XMP_Uns32 extLen)
+{
+	// The Header Extension Object is a child of the Header Object and the parent of nested objects.
+
+	XMP_Uns32 extEnd = extOffset + extLen;
+
+	XMP_Uns32 childLen;
+	XMP_Uns32 childOffset;
+
+	ASF_ObjHeader childHeader;
+
+	for (childOffset = (extOffset + kASF_HeaderExtensionSize); childOffset < extEnd; childOffset += childLen) {
+		(void) GetASFObjectInfo (file, childOffset, &childHeader, 2);
+		childLen = (XMP_Uns32)childHeader.size;
+	}
+
+	if (childOffset != extEnd) {
+		tree->addComment("** Invalid end to nested Header Extension objects, offset %u", childOffset);
+	}
+
+}	// DumpASFHeaderExtension
+
+// =================================================================================================
+
+static void
+DumpASF (LFA_FileRef file, XMP_Uns32 asfLen)
+{
+	// An ASF file contains objects of the form:
+	//   A 16 byte GUID giving the object's type and use
+	//   A little endian 64-bit object length, includes the GUID and length (== 24 + data size)
+	//   The object's data
+	// Objects can be nested. The top level of a file is a Header Object, followed by a Data Object,
+	// followed by any number of "other" top level objects, followed by any number of index objects.
+	// There is legacy metadata in certain nested objects within the Header Object. The XMP is an
+	// "other" top level object.
+
+	size_t infoIndex;
+
+	XMP_Uns32  objLen;
+	XMP_Uns32  objOffset;
+	ASF_ObjHeader objHeader;
+
+	tree->comment("ASF file Object layout");
+
+	// Dump the Header Object's content, looking for legacy metadata.
+	infoIndex = GetASFObjectInfo (file, 0, &objHeader, 0);
+	XMP_Uns32 headerLen = (XMP_Uns32)objHeader.size;
+
+	if (kASF_KnownObjects[infoIndex].kind != kASFObj_Header) {
+		tree->comment("** First object is not the Header Object");
+		return;
+	}
+
+	XMP_Uns32 nestedCount;
+	LFA_Seek (file, 24, SEEK_SET);
+	LFA_Read ( file, &nestedCount, 4, true);
+	nestedCount = GetUns32LE (&nestedCount);
+	tree->addComment("%u nested objects", nestedCount);
+
+	for (objOffset = (16+8+4+2); objOffset < headerLen; objOffset += objLen, --nestedCount) {
+		infoIndex = GetASFObjectInfo (file, objOffset, &objHeader, 1);
+		objLen = (XMP_Uns32)objHeader.size;
+
+		switch (kASF_KnownObjects[infoIndex].kind) {
+			case kASFObj_FileProperties :
+				DumpASFFileProperties (file, objOffset, objLen);
+				break;
+			case kASFObj_ContentDesc :
+				DumpASFContentDescription (file, objOffset, objLen);
+				break;
+			case kASFObj_ContentBrand :
+				DumpASFContentBranding (file, objOffset, objLen);
+				break;
+			case kASFObj_ContentEncrypt :
+				DumpASFContentEncryption (file, objOffset, objLen);
+				break;
+			case kASFObj_HeaderExtension :
+				DumpASFHeaderExtension (file, objOffset, objLen);
+				break;
+			default :
+				break;
+		}
+	}
+
+	if ((objOffset != headerLen) || (nestedCount != 0)) {
+		tree->comment("** Invalid end to nested Header objects, offset %u, count %u",
+			objOffset, nestedCount);
+		objOffset = headerLen;
+	}
+
+	// Dump the basic info for the remaining objects, looking for the XMP along the way.
+	infoIndex = GetASFObjectInfo (file, objOffset, &objHeader, 0);
+	objLen = (XMP_Uns32)objHeader.size;
+
+	if (kASF_KnownObjects[infoIndex].kind != kASFObj_Data) {
+		tree->addComment("** Second object is not the Data Object");
+		if (kASF_KnownObjects[infoIndex].kind == kASFObj_XMP) {
+			if (sXMPPtr == 0)
+				CaptureXMPF (file, (objOffset + 24), (objLen - 24));
+			else
+				tree->addComment("** Multiple XMP objects");
+		}
+	}
+
+	for (objOffset += objLen; objOffset < asfLen; objOffset += objLen) {
+		GetASFObjectInfo (file, objOffset, &objHeader, 0);
+		objLen = (XMP_Uns32)objHeader.size;
+
+		if (kASF_KnownObjects[infoIndex].kind == kASFObj_XMP) {
+			if (sXMPPtr == 0)
+				CaptureXMPF (file, (objOffset + 24), (objLen - 24));
+			else
+				tree->addComment("** Multiple XMP objects");
+		}
+	}
+
+	if (objOffset != asfLen) tree->addComment("** Invalid end to top level objects: %u", objOffset);
+	if (sXMPPtr != 0) DumpXMP ("ASF XMP object");
+
+}	// DumpASF
+
+// =================================================================================================
+
+static void
+DumpUCF(LFA_FileRef file, XMP_Int64 len)
+{
+	//////////////////////////////////////////////////////////////////////
+	// constants
+	const static XMP_Uns32 UCF_HS_CONTENTFILE=0x04034b50;
+	const static XMP_Uns32 UCF_CD_FILE_HEADER=0x02014b50;		//central directory - file header
+	const static XMP_Uns32 UCF_ZIP64_END_OF_CD_RECORD=0x06064b50;
+	const static XMP_Uns32 UCF_ZIP64_END_OF_CD_LOCATOR=0x07064b50;
+	const static XMP_Uns32 UCF_CD_END=0x06054b50;
+
+	const static XMP_Int32 UCF_COMMENT_MAX = 0xFFFF;
+	const static XMP_Int32 UCF_EOD_FIXED_SIZE = 22;
+
+	const static XMP_Int32 UCF_ZIP64_LOCATOR_FIXED_SIZE = 20;
+	const static XMP_Int32 UCF_ZIP64_RECORD_FIXED_SIZE = 56;
+
+	//////////////////////////////////////////////////////////////////////
+	// variables:
+	XMP_Int64 curPos=0;
+	bool isZip64;
+
+	XMP_Uns32 numDirEntries;
+	
+	XMP_Uns64 size_CD;	
+	XMP_Uns64 offset_Zip64_EndOfCD_Record=0;
+	XMP_Uns64 offset_CD;
+
+	typedef std::list<XMP_Int64> OffsetStack;
+	OffsetStack contentFiles;
+	contentFiles.clear(); //precaution for mac
+
+	//////////////////////////////////////////////////////////////////////
+	// prolog:
+	tree->comment("len is 0x%I64X",len);
+	tree->comment("inherently parsing bottom-up");
+	if( len > 0xFFFFFFFFl )
+		tree->comment("info: >4GB ==> most like zip64 !");
+
+	//////////////////////////////////////////////////////////////////////
+	// parse bottom up:
+
+	/////////////////////////////////////////////////////////////////////
+	// zip comment:
+	XMP_Int32 zipCommentLen = 0;
+	for ( ; zipCommentLen <= UCF_COMMENT_MAX; zipCommentLen++ )
+	{
+		LFA_Seek( file, -zipCommentLen -2, SEEK_END );
+		if ( LFA_ReadUns16_LE( file ) == zipCommentLen )	//found it?
+		{
+			//double check, might just look like comment length (actually be 'evil' comment)
+			LFA_Seek( file , - UCF_EOD_FIXED_SIZE, SEEK_CUR );
+			if ( LFA_ReadUns32_LE( file ) == UCF_CD_END ) break; //heureka, directory ID
+			// 'else': just go on
+		}
+	}
+	tree->comment( fromArgs("zip Comment length: %d",zipCommentLen ));
+
+	//was it a break or just not found ?
+	assertMsg ( "zip broken near end or invalid comment", zipCommentLen < UCF_COMMENT_MAX );
+
+	/////////////////////////////////////////////////////////////////////
+	// End of CDR:
+	LFA_Seek( file , - UCF_EOD_FIXED_SIZE - zipCommentLen, SEEK_END);
+	curPos = LFA_Tell(file);
+	tree->pushNode("End of Central Directory");
+	tree->addOffset( file );
+	{
+		assertMsg("expected 'end of central directory record'", UCF_CD_END == tree->digest32u(file) );
+		assertMsg("UCF allow single-volume zips only", 0 == tree->digest16u(file)); //volume number (0,1,..)
+		assertMsg("UCF allow single-volume zips only(thus directory must be in 0)", 0 == tree->digest16u(file,"")); //volume number (0,1,..)
+		
+		numDirEntries=tree->digest16u(file,"number of directory entries");
+		tree->digest16u(numDirEntries, file,"number of total directory entries");
+
+		size_CD = tree->digest32u(file,"size of central directory",false,true);
+		offset_CD = tree->digest32u(file,"offset of central directory",false,true);
+		if (offset_CD == 0xFFFFFFFF) tree->addComment("apparently zip-64");
+
+		XMP_Uns16 zipCommentLengReverify = tree->digest16u(file,"zip comment length");
+		assertMsg( "zipCommentLengReverify failed", zipCommentLengReverify == zipCommentLen );
+	}
+	tree->popNode();
+	/////////////////////////////////////////////////////////////////////
+	// Zip64 End Of CD Locator
+	LFA_Seek( file, curPos - UCF_ZIP64_LOCATOR_FIXED_SIZE ,SEEK_SET );
+
+	//tree->comment("offset is %X", LFA_Tell(file) );
+	//tree->comment("peek is %X", Peek32u(file) );
+
+	if ( Peek32u(file) != UCF_ZIP64_END_OF_CD_LOCATOR )
+	{
+		tree->comment("no Zip64 CDL -> no Zip64");
+		assertMsg("offset FFFF FFFF indicates zip-64, but no Zip64 CDL found", offset_CD != 0xFFFFFFFF );
+		isZip64=false;
+	}
+	else
+	{
+		isZip64=true;
+		tree->pushNode("Zip64 End-Of-CD Locator");
+		tree->addOffset( file );
+
+		tree->digest32u(file,"sig",false,true);
+		assertMsg("'numOfDisk with central start dir' must be 0",
+			0 == tree->digest32u(file,"disk with start dir"));
+		tree->digest64u(&offset_Zip64_EndOfCD_Record, file,"Zip64 End Of CD Offset",false,true);
+		
+		tree->digest32u( /* deactived while bug #1742179:   1,*/ file, "total num of disks", false, true); 
+		tree->popNode();
+	}
+
+	/////////////////////////////////////////////////////////////////////
+	// Zip64 End of CD Record
+	if (isZip64)
+	{
+		XMP_Uns64 size_Zip64_EndOfCD_Record;
+		tree->pushNode("Zip64 End of CD Record");
+		LFA_Seek( file, offset_Zip64_EndOfCD_Record ,SEEK_SET );
+		tree->addOffset( file );
+
+		tree->digest32u( UCF_ZIP64_END_OF_CD_RECORD ,file, "sig", false, true );	
+		tree->digest64u( &size_Zip64_EndOfCD_Record, file, "size of zip64 CDR", false, true);
+		tree->digest16u( file, "made by", false, true );
+		tree->digest16u( file, "needed to extract", false, true );
+		tree->digest32u( (XMP_Uns32)0 , file, "number of this disk", false, true);
+		tree->digest32u( (XMP_Uns32)0 , file, "disk that contains start of CD", false, true);
+		tree->digest64u( (XMP_Uns64) numDirEntries, file, "total Num of Entries This Disk", false, false );
+		tree->digest64u( (XMP_Uns64) numDirEntries, file, "total Num of Entries", false, false );
+		//TODO assert agtainst each other and above
+		tree->digest64u( &size_CD, file, "size_CD", false, true );
+		tree->digest64u( &offset_CD, file, "offset_CD", false, true );
+		XMP_Int64 lenExtensibleSector = UCF_ZIP64_RECORD_FIXED_SIZE - size_Zip64_EndOfCD_Record;
+		tree->comment("zip64 extensible data sector (%d bytes)", lenExtensibleSector );
+		//sanity test:
+		Skip( file, lenExtensibleSector );
+		assertMsg("numbers don't add up", Peek32u(file) != UCF_ZIP64_END_OF_CD_LOCATOR ); 
+
+		tree->popNode();
+	}
+	
+	/////////////////////////////////////////////////////////////////////
+	// parse Central directory structure: content file 1..n
+	tree->pushNode("Central directory structure:");
+	LFA_Seek( file, offset_CD ,SEEK_SET );
+	tree->addOffset( file );
+
+	for (XMP_Uns32 contentFileNo=1 ; contentFileNo <= numDirEntries; contentFileNo++ )
+	{
+		tree->pushNode("File Header No %d:", contentFileNo);
+		tree->addOffset( file );
+
+		XMP_Uns16 version, flags, cmethod;
+		XMP_Uns32 crc,compressed_size,uncompressed_size32;
+		XMP_Uns64 offsetLocalHeader = 0;
+		bool usesDescriptionHeader;
+
+		tree->digest32u( UCF_CD_FILE_HEADER, file, "sig", false, true );
+		
+		tree->digest16u(file,"version made by",false,true);
+		tree->digest16u(&version, file,"version needed to extract");
+		assertMsg( fromArgs("illegal 'version needed to extract' (must be 10,20 or 45, was %u)",version),
+					( version == 10 || version == 20 || version == 45));
+
+		tree->digest16u ( &flags, file, "general purpose bit flags", false, true );
+		assertMsg("no zip encryption must be used", (flags&0x1)==0);
+		usesDescriptionHeader= ((flags&0x8) != 0);
+		if (usesDescriptionHeader) tree->addComment("uses description header");
+
+		tree->digest16u(&cmethod, file,"compression method");
+		assertMsg("illegal compression method (must be 0 or 8(flate))!",( cmethod == 0 || cmethod == 8 ));
+
+		tree->digest(file,"last mod file time",0,2);
+		tree->digest(file,"last mod file date",0,2);
+
+		tree->digest32u(&crc, file); //crc-32
+		tree->digest32u(&compressed_size, file,"compressed size");
+		tree->digest32u(&uncompressed_size32, file,"uncompressed size");
+
+		XMP_Uns16 size_filename,size_extra,size_comment;
+
+		tree->digest16u( &size_filename , file , "size filename");	
+		assertMsg("unusual name length length (broken file?)", size_filename>0 && size_filename < 500 ); //discover parsing nonsense...
+		tree->digest16u( &size_extra , file , "size extra field");		
+		tree->digest16u( &size_comment , file , "size file comment");
+		tree->digest16u( (XMP_Uns16)0 , file , "disk start no");
+
+		tree->digest16u( file , "internal attribs");
+		tree->digest32u( file , "external attribs");
+
+		offsetLocalHeader = tree->digest32u( file , "relative offset local header",false,true); // Int64 <== Uns32
+
+		// name of file, optional relative path, strictly forward slashes.
+		assert(size_filename != 0);
+		std::string filename = tree->digestString(file,"filename",size_filename); //NOT zero-terminated
+
+		if (contentFileNo == 1)
+		{
+			assert( size_extra == 0); //spec guarantes mimetype content at 38 <=> extraFieldLen == 0
+			assertMsg ( 
+				fromArgs("first file in UCF must be called mimetype, was %s",filename.c_str()),
+					(size_filename == 8) && (filename == "mimetype"));
+		}
+		
+		if(size_extra != 0)
+		{
+			tree->pushNode("extraField");
+			XMP_Int32 remaining = size_extra;
+			while (remaining > 0)
+			{
+				assertMsg( "need 4 bytes for next header ID+len", remaining >= 4);
+				XMP_Uns16 headerID = tree->digest16u(file,"headerID",false,true);
+				XMP_Uns16 dataSize = tree->digest16u(file,"data size",false,true);
+				remaining -= 4;
+				assertMsg( "actual field lenght not given", remaining >= dataSize);
+				if ( headerID == 0x1 ) //we only care about "Zip64 extended information extra field"
+				{					
+					tree->digest64u( &offsetLocalHeader, file, "64bit offset", false, true);
+					remaining -= 8;
+				}
+				else
+				{
+					Skip(file, dataSize );
+					remaining -= dataSize;
+				}
+			
+			}
+			tree->popNode();
+		}
+
+		//now that regular 32 bit and zip-64 is through...
+		if (contentFileNo == 1)
+		{
+			assertMsg( "first header offset (aka content file offset) must (naturally) be 0", offsetLocalHeader==0 );
+		}
+		else
+		{
+			assertMsg("local header offset (aka content file offset) must not be 0", offsetLocalHeader!=0 );
+		}
+		contentFiles.push_back(offsetLocalHeader);
+
+		if(size_comment != 0)
+		{
+			tree->digest(file,"file comment",0,size_comment);
+		}
+		tree->popNode(); //file header
+	}
+	tree->popNode(); //central directory structure
+	
+	/////////////////////////////////////////////////////////////////////
+	// Content Files (incl. Headers, etc)
+	for(XMP_Uns16 cfNo=1; cfNo <= numDirEntries; cfNo++)
+	{
+		//vars
+		XMP_Uns32 compressed_size,uncompressed_size, crc32;
+		XMP_Uns16 version,nameLen,extraFieldLen;
+
+		tree->pushNode("Content File %d:", cfNo);
+		
+		assert( !contentFiles.empty());
+		XMP_Int64 fileHeaderOffset = contentFiles.front();
+		contentFiles.pop_front();
+
+		bool ok;
+		LFA_Seek( file, fileHeaderOffset, SEEK_SET, &ok );
+		tree->addOffset( file );
+		assert(ok);
+
+		//local file header
+		tree->digest32u( UCF_HS_CONTENTFILE, file, "sig", false, true );
+		tree->digest16u(&version, file,"version"); 
+		assertMsg("illegal 'version needed to extract' (must be 10,20 or 45, was %u)",
+				( version == 10 || version == 20 || version == 45));
+		Skip(file,8);
+		tree->digest32u( &crc32, file, "crc-32", false, true );
+		tree->digest32u( &compressed_size, file, "compressed", false, false );
+		tree->digest32u( &uncompressed_size, file, "uncompressed", false, false );
+		tree->digest16u( &nameLen, file, "file name length", false, false );
+		tree->digest16u( &extraFieldLen, file, "extra field length", false, false );
+
+		assert(nameLen != 0);
+		assertMsg("unusual name length length (broken file?)", nameLen>0 && nameLen < 500 ); //discover parsing nonsense...
+
+		// name of file, optional relative path, strictly forward slashes.
+		std::string filename = tree->digestString(file,"filename",nameLen); //NOT zero-terminated
+		if (cfNo == 1)
+		{
+			assertMsg("first file in UCF muste be called mimetype", filename=="mimetype" );
+			assert( extraFieldLen == 0); //spec guarantes mimetype content at 38 <=> extraFieldLen == 0
+			assert( LFA_Tell(file)==38 );
+			tree->digestString(file,"file data (mimetype)",compressed_size);
+		}
+		else //not the first mimetype file thing
+		{
+			// FILE DATA =============================================================
+			if (extraFieldLen != 0)		// may indeed not exist, and lenght=0 must not be passed into digestString()
+				tree->digestString(file,"extra field",extraFieldLen); //NOT zero-terminated
+			tree->setKeyValue("file data","",fromArgs("skipping %u bytes",compressed_size));
+			Skip(file,compressed_size);
+		}
+
+
+
+
+		tree->popNode();
+	}
+	
+	/////////////////////////////////////////////////////////////////////
+	// :
+	tree->pushNode("");
+	tree->popNode();
+	
+	/////////////////////////////////////////////////////////////////////
+	// :
+	
+	/////////////////////////////////////////////////////////////////////
+	// :
+	
+	/////////////////////////////////////////////////////////////////////
+	// :
+
+
+}	// DumpUCF
+
+// =================================================================================================
+
+static const char * kRIFF_Lists[] = { "INFO", "hdrl", "Tdat", "Cdat", 0 };
+
+static const char * kRIFF_LegacyText[] =
+{
+	// INFO list items, taken from Exif 2.2, ASCII with terminating nul:
+	"IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI", "IENG", "IGNR",
+	"IKEY", "ILGT", "IMED", "INAM", "IPLT", "IPRD", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH",
+	// AVI legacy items, taken from AVI handler code:
+	"ISMT", "tc_O", "tc_A", "rn_O", "rn_A", "cmnt",
+	// WAV legacy items, taken from WAV handler code:
+	"DISP",
+	// Final sentinel
+	0
+};
+
+// =================================================================================================
+
+static bool
+IsKnownRIFFList ( const char * listID )
+{
+	for ( size_t i = 0; kRIFF_Lists[i] != 0; ++i ) {
+		if ( strncmp ( listID, kRIFF_Lists[i], 4 ) == 0 ) return true;
+	}
+
+	return false;
+
+}	// IsKnownRIFFList
+
+// =================================================================================================
+
+static bool
+IsKnownRIFFLegacy ( const char * chunkID )
+{
+	for ( size_t i = 0; kRIFF_LegacyText[i] != 0; ++i ) {
+		if ( strncmp ( chunkID, kRIFF_LegacyText[i], 4 ) == 0 ) return true;
+	}
+
+	return false;
+
+}	// IsKnownRIFFLegacy
+
+// =================================================================================================
+
+static XMP_Uns32
+DumpRIFFChunk ( LFA_FileRef file, XMP_Uns32 chunkOffset, XMP_Uns32 parentEnd, size_t nesting )
+{
+	// AVI and WAV files are RIFF based. Although they have usage differences, we can have a common
+	// dumper. This might need changes for other RIFF-based files, e.g. for specific legacy
+	// metadata. RIFF is a chunky format. AVI and WAV have an outermost RIFF chunk. The XMP is in a
+	// top level "_PMX" chunk. Legacy metadata for WAV is in a top level LIST/INFO chunk.  Legacy
+	// metadata for AVI is in a variety of places, don't have specs at present. Free space can be
+	// JUNK or JUNQ.
+	//
+	// A RIFF chunk contains:
+	//   - A 4 byte chunk ID, typically ASCII letters
+	//   - A little endian UInt32 size of the chunk data
+	//   - The chunk data
+	//	 - Pad byte if the chunk data length is odd (added on 2007-03-22)
+
+	// The ID is written in "reading order", e.g. the 'R' in "RIFF" is first in the file. Chunks
+	// must start on even offsets. A pad byte of 0 is written after the data if necessary. The size
+	// does not include the pad, nor the ID and size fields. Some chunks contain nested chunks,
+	// notably the RIFF and LIST chunks do. These have the layout:
+	//   - A 4 byte chunk ID, typically ASCII letters
+	//   - A little endian UInt32 size of the chunk data
+	//   - A 4 byte usage ID, typically ASCII letters
+	//   - The nested chunks
+
+	LFA_Seek ( file, chunkOffset, SEEK_SET );
+	char chunkID[4];
+	LFA_Read ( file,  chunkID, 4, true );
+
+	XMP_Uns32 chunkLen = tree->digest32u(file);
+
+	bool isRIFF = CheckBytes ( chunkID, "RIFF", 4 );
+	bool isLIST = CheckBytes ( chunkID, "LIST", 4 );
+
+	if ( isRIFF | isLIST ) {
+		char subID[4];
+		LFA_Read ( file,  subID, 4, true );
+
+		bool knownList = false;
+		if ( isLIST ) knownList = IsKnownRIFFList ( subID );
+
+		tree->pushNode ( "%.4s:%.4s" , chunkID, subID );	
+		tree->addComment ( "offset 0x%X, size %d%s",
+						   chunkOffset, chunkLen, (((chunkLen & 1) == 0) ? "" : " (has pad byte)") );
+
+		if ( (chunkOffset + chunkLen) > parentEnd ) {
+			tree->addComment ( "Chunk too long, extends beyond parent" );
+		}
+
+		if ( (isRIFF && (nesting == 0)) || (knownList && (nesting == 1)) ) {
+
+			XMP_Uns32 childLimit = chunkOffset + 8 + chunkLen;
+			XMP_Uns32 childOffset, childLen;
+
+			for ( childOffset = (chunkOffset + 12); childOffset < childLimit; childOffset += (8 + childLen) ) {
+				childLen = DumpRIFFChunk ( file, childOffset, childLimit, nesting+1 );
+			}
+
+			if ( childOffset != childLimit ) {
+				tree->addComment ( "Unexpected end to nested chunks at offset %u (0x%X)", childOffset, childOffset );
+			}
+		}
+		tree->popNode();
+	} else {
+		tree->pushNode ( "%.4s",chunkID );
+		tree->addComment ( "offset 0x%X, size %d%s",
+						   chunkOffset, chunkLen, (((chunkLen & 1) == 0) ? "" : " (has pad byte)") );
+
+		if ( (chunkLen > 0) && IsKnownRIFFLegacy (chunkID) ) {
+			CaptureFileData ( file, (chunkOffset + 8), chunkLen );
+			std::string legacyField = convert8Bit ( sDataPtr, false, chunkLen );
+			tree->changeValue ( legacyField.substr(0,30) + ((legacyField.size()>30)?"...":"") );
+		}
+
+		if ( (chunkLen > 0) && CheckBytes ( chunkID, "_PMX", 4 ) ) {
+			tree->pushNode( "XMP packet" );
+			{
+				tree->addComment( "xmp at offset 0x%X, length 0x%X", (chunkOffset + 8), chunkLen );
+			}
+			tree->popNode();
+		}
+		tree->popNode();
+	}
+
+	return (chunkLen + (chunkLen & 1));	// Account for the pad byte.
+}	// DumpRIFFChunk
+
+// =================================================================================================
+
+static void
+DumpRIFF ( LFA_FileRef file, XMP_Uns32 fileLen )
+{
+	XMP_Uns32 riffLen = DumpRIFFChunk ( file, 0, fileLen, 0 );
+	riffLen += 8;	// Include the chunk header.
+	
+	assertMsg( fromArgs("Unexpected end to RIFF at offset %d (0x%X)", riffLen, riffLen), riffLen == fileLen );
+}
+
+// =================================================================================================
+
+static XMP_Uns32 crcTable[256];
+static bool crcTableInited = false;
+
+static XMP_Uns32 ComputeCRCforPNG ( LFA_FileRef file, XMP_Uns32 crcOffset, XMP_Uns32 crcLen )
+{
+	if ( ! crcTableInited ) {
+		for ( int n = 0; n < 256; ++n ) {
+			XMP_Uns32 c = n;
+			for ( int k = 0; k < 8; ++k ) {
+				XMP_Uns32 lowBit = c & 1;
+				c = c >> 1;
+				if ( lowBit != 0 ) c = c ^ 0xEDB88320;
+			}
+			crcTable[n] = c;
+		}
+		crcTableInited = true;
+	}
+
+	XMP_Uns32 crc = 0xFFFFFFFF;
+	CaptureFileData ( file, crcOffset, crcLen );
+
+	for ( XMP_Uns32 i = 0; i < crcLen; ++i ) {	// ! The CRC includes the chunk type and data.
+		XMP_Uns8 byte = sDataPtr[i];
+		XMP_Uns8 index = (XMP_Uns8) ((crc ^ byte) & 0xFF);
+		crc = crcTable[index] ^ (crc >> 8);
+	}
+
+	return crc ^ 0xFFFFFFFF;
+
+}	// ComputeCRCforPNG
+
+// =================================================================================================
+
+static const XMP_Uns32 kPNG_iTXt = 0x69545874;
+static const XMP_Uns32 kPNG_tEXt = 0x74455874;
+static const XMP_Uns32 kPNG_zTXt = 0x7A545874;
+
+static XMP_Uns32
+DumpPNGChunk ( LFA_FileRef file, XMP_Uns32 pngLen, XMP_Uns32 chunkOffset )
+{
+	// A PNG chunk contains:
+	//   A big endian UInt32 length for the data portion. Zero is OK.
+	//   A 4 byte chunk type, should be 4 ASCII letters, lower or upper case.
+	//   The chunk data.
+	//   A big endian UInt32 CRC.
+	// There are no alignment constraints.
+	//
+	// Chunks of type tEXt, iTXt, and zTXt have text values. Each text form has a leading "usage
+	// keyword" followed by the data string. The keywords must be visible Latin-1, 0x20..0x7E and
+	// 0xA1..0xFF. They are limited to 1 to 79 characters, plus a terminating nul.
+	//
+	// A tEXt chunk has 0 or more bytes of Latin-1 characters. The data is not nul terminated, and
+	// embedded nuls are not allowed. A zTXt chunk is like tEXt but the data string is zlib compressed.
+	// An iTXt chunk has a variety of "info tags" followed by a UTF-8 data string.
+	//
+	// The XMP is in an iTXt chunk with the keyword XML:com.adobe.xmp and 4 bytes of 0 for the info.
+
+	XMP_Uns32 chunkLen;
+	XMP_Uns32 chunkType;
+	XMP_Uns32 chunkCRC;
+
+	if ( (pngLen - chunkOffset) < 12 ) {
+		tree->addComment ( "** Unexpected end of PNG file, %ul bytes remaining **", (pngLen - chunkOffset) );
+		return (pngLen - chunkOffset);
+	}
+
+	LFA_Seek ( file, chunkOffset, SEEK_SET );
+	LFA_Read ( file,  &chunkLen, 4, true );
+	chunkLen = GetUns32BE (&chunkLen);
+
+	if ( chunkLen > (pngLen - chunkOffset) ) {
+		tree->addComment ( "** No room for PNG chunk, need %u, have %u **", chunkLen, pngLen-chunkOffset );
+		return (pngLen - chunkOffset);	// ! Not chunkLen, might be bad and cause wrap-around.
+	}
+
+	LFA_Read ( file,  &chunkType, 4, true);	// After read, memory is in file order.
+
+	LFA_Seek ( file, (chunkOffset + 8 + chunkLen) , SEEK_SET );
+	LFA_Read ( file,  &chunkCRC, 4, true);
+	chunkCRC = GetUns32BE (&chunkCRC);
+
+	tree->addComment ( "   '%.4s', offset %u (0x%X), size %d, CRC 0x%.8X",
+					   &chunkType, chunkOffset, chunkOffset, chunkLen, chunkCRC );
+
+	XMP_Uns32 newCRC = ComputeCRCforPNG ( file, (chunkOffset + 4), (chunkLen + 4) );
+
+	if ( chunkCRC != newCRC ) tree->addComment ( "** CRC should be 0x%.8X **", newCRC );
+
+	chunkType = GetUns32BE (&chunkType);	// Reorder the type to compare with constants.
+
+	if ( (chunkType == kPNG_iTXt) || (chunkType == kPNG_tEXt) || (chunkType == kPNG_zTXt) ) {
+
+		CaptureFileData ( file, (chunkOffset + 8), chunkLen );
+
+		XMP_Uns8 * keywordPtr = sDataPtr;
+		size_t     keywordLen = strlen ((char*)keywordPtr);
+
+		PrintOnlyASCII_8 ( keywordPtr, keywordLen, "," );
+
+		if ( (chunkType == kPNG_iTXt) && (keywordLen == 17) && CheckBytes (keywordPtr, "XML:com.adobe.xmp", 18) ) {
+
+			if ( sXMPPtr != 0 ) {
+				tree->addComment ( "      ** Redundant XMP **" );
+			} else {
+				CaptureXMP ( (keywordPtr + 22), (chunkLen - 22), (chunkOffset + 8 + 22) );
+				XMP_Uns32 otherFlags = GetUns32BE (keywordPtr+18);
+				if ( otherFlags != 0 ) tree->addComment ( "** bad flags %.8X **", otherFlags );
+			}
+
+		}
+
+	}
+
+	return (8 + chunkLen + 4);
+
+}	// DumpPNGChunk
+
+// =================================================================================================
+
+static void
+DumpPNG ( LFA_FileRef file, XMP_Uns32 pngLen )
+{
+	// A PNG file contains an 8 byte signature followed by a sequence of chunks.
+
+	XMP_Uns32  chunkOffset = 8;
+
+	while ( chunkOffset < pngLen ) {
+		XMP_Uns32 chunkLen = DumpPNGChunk ( file, pngLen, chunkOffset );
+		chunkOffset += chunkLen;
+	}
+
+	if ( sXMPPtr != 0 ) DumpXMP ( "PNG XMP 'iTXt' chunk" );
+
+}	// DumpPNG
+
+// =================================================================================================
+
+static void
+DumpInDesign (LFA_FileRef file, XMP_Uns32 inddLen)
+{
+	InDesignMasterPage masters[2];
+	size_t	 dbPages;
+	XMP_Uns8 cobjEndian;
+
+	// FIgure out which master page to use.
+
+	LFA_Seek (file, 0, SEEK_SET);
+	LFA_Read ( file, &masters, sizeof(masters), true);
+
+	XMP_Uns64 seq0 = GetUns64LE ((XMP_Uns8 *) &masters[0].fSequenceNumber);
+	XMP_Uns64 seq1 = GetUns64LE ((XMP_Uns8 *) &masters[1].fSequenceNumber);
+
+	if (seq0 > seq1) {
+		dbPages = GetUns32LE ((XMP_Uns8 *) &masters[0].fFilePages);
+		cobjEndian = masters[0].fObjectStreamEndian;
+		tree->addComment("   Using master page 0");
+	} else {
+		dbPages = GetUns32LE ((XMP_Uns8 *)  &masters[1].fFilePages);
+		cobjEndian = masters[1].fObjectStreamEndian;
+		tree->addComment("   Using master page 1");
+	}
+
+	bool bigEndian = (cobjEndian == kINDD_BigEndian);
+
+	tree->addComment("%d pages, %s endian", dbPages, (bigEndian ? "big" : "little"));
+
+	// Look for the XMP contiguous object.
+
+	// *** XMP_Int64 cobjPos = (XMP_Int64)dbPages * kINDD_PageSize;	// ! Use a 64 bit multiply!
+	XMP_Uns32 cobjPos = dbPages * kINDD_PageSize;
+	XMP_Uns32 cobjLen;
+
+	for (; cobjPos < inddLen; cobjPos += cobjLen) {
+
+		InDesignContigObjMarker cobjHead;
+
+		LFA_Seek (file, cobjPos, SEEK_SET);
+		LFA_Read ( file, &cobjHead, sizeof(cobjHead), true);
+
+		if (! CheckBytes (&cobjHead.fGUID, kINDDContigObjHeaderGUID, kInDesignGUIDSize)) {
+
+			// No Contiguous Object header. Could be in zero padding for the last page.
+
+			XMP_Uns8 fileTail [kINDD_PageSize];
+			size_t   tailLen = inddLen - cobjPos;
+			bool endOK = (tailLen < kINDD_PageSize);
+
+			if (endOK) {
+				LFA_Seek ( file, cobjPos, SEEK_SET );
+				LFA_Read ( file, fileTail, sizeof(fileTail), true);
+				for (size_t i = 0; i < tailLen; ++i) {
+					if (fileTail[i] != 0) {
+						endOK = false;
+						break;
+					}
+				}
+			}
+
+			if (endOK) break;
+			tree->addComment("   ** No Contiguous Object GUID at offset %u (0x%X) tree.", cobjPos, cobjPos);
+			return;
+
+		}
+
+		cobjHead.fObjectUID = GetUns32LE (&cobjHead.fObjectUID);
+		cobjHead.fObjectClassID = GetUns32LE (&cobjHead.fObjectClassID);
+		cobjHead.fStreamLength = GetUns32LE (&cobjHead.fStreamLength);
+		cobjHead.fChecksum = GetUns32LE (&cobjHead.fChecksum);
+
+		cobjLen = cobjHead.fStreamLength + (2 * sizeof(InDesignContigObjMarker));
+
+		tree->addComment("   ContigObj offset %d (0x%X), size %d, Object UID %.8X, class ID %.8X, checksum %.8X",
+			cobjPos, cobjPos, cobjHead.fStreamLength, cobjHead.fObjectUID, cobjHead.fObjectClassID, cobjHead.fChecksum);
+
+		if ((cobjHead.fObjectClassID & 0x40000000) == 0) tree->addComment("read only");
+
+		XMP_Uns32 xmpLen;
+		LFA_Read ( file, &xmpLen, 4, true);
+		if (bigEndian) {
+			xmpLen = GetUns32BE (&xmpLen);
+		} else {
+			xmpLen = GetUns32LE (&xmpLen);
+		}
+
+		XMP_Uns8 xmpStart[16];	// Enough for "<?xpacket begin=".
+		LFA_Read ( file, &xmpStart, sizeof(xmpStart), true);
+
+		if ((cobjHead.fStreamLength > (4+16)) && ((xmpLen+4) == cobjHead.fStreamLength) &&
+			CheckBytes (xmpStart, "<?xpacket begin=", 16)) {
+
+				if (sXMPPtr != 0) {
+					tree->addComment("** redundant XMP **");
+				} else {
+					tree->addComment("XMP");
+					CaptureXMPF (file, (cobjPos + sizeof(InDesignContigObjMarker) + 4), xmpLen);
+				}
+
+		}
+
+	}
+
+	if (sXMPPtr != 0) DumpXMP ("InDesign XMP Contiguous Object");
+
+}	// DumpInDesign
+
+// =================================================================================================
+
+#define kSWF_FileAttributesTag	69
+#define kSWF_MetadataTag		77
+
+static void
+DumpSWF ( LFA_FileRef file, XMP_Uns32 swfLen )
+{
+	// SWF is a chunky format, the chunks are called tags. The data of a tag cannot contain an
+	// offset to another tag, so tags can generally be freely inserted, removed, etc. Each tag has a
+	// header followed by data. There are short (2 byte) and long (6 byte) headers. A short header
+	// is a UInt16 with a type code in the upper 10 bits and data length in the lower 6 bits. The
+	// length does not include the header. A length of 63 (0x3F) indicates a long header. This adds
+	// an SInt32 data length.
+	//
+	// All multi-byte integers in SWF are little endian. Strings use byte storage and are null
+	// terminated. In SWF 5 or earlier strings use ASCII or shift-JIS encoding with no indication in
+	// the file. In SWF 6 or later strings use UTF-8.
+	//
+	// The overall structure of a SWF file:
+	//   File header
+	//   FileAttributes tag, optional before SWF 8
+	//   other tags
+	//   End tag
+	//
+	// The End tag is #0. No data is defined, but a reader should process the length normally. The
+	// last tag must be an End tag, but End tags can also be used elsewhere (e.g. to end a sprite
+	// definition). There is no standard tag for free or unused space.
+	//
+	// SWF file header:
+	//   0  3 - signature, "FWS"=uncompressed, 'CWS'=compressed (zlib, SWF6 or later)
+	//   3  1 - UInt8 major version
+	//   4  4 - UInt32 uncompressed file length
+	//   8  v - frame rectangle, variable size
+	//   ?  2 - UInt16 frame rate
+	//   ?  2 - UInt16 frame count
+	//
+	// FileAttributes tag, #69:
+	//   0  3 - reserved, must be 0
+	//   3  1 - HasMetadata, 0/1 Boolean
+	//   4  3 - reserved, must be 0
+	//   7  1 - UseNetwork, 0/1 Boolean
+	//   8 24 - reserved, must be 0
+	//
+	// The Metadata tag is #77. If present, the FileAttributes tag must also be present and
+	// HasMetadata must be set. The data is a string, must be XMP, should be as compact as possible.
+	//
+	// The frame rectangle is a packed sequence of 5 bit fields, with zero bits add as padding to a
+	// byte boundary. The first field is 5 bits long and gives the number of bits in each of the
+	// other 4 fields (0..31). The others are signed integers for the X min/max and Y min/max
+	// coordinates. The frame rectangle field is at least 2 bytes long, and at most 17 bytes long.
+	
+	XMP_Uns8 buffer [100];	// Big enough, need 32 for file header and 38 for FileAttributes.
+	size_t   ioCount;
+	
+	// Dump the file header.
+
+	bool isCompressed = false;
+	bool hasMetadata  = false;
+	
+	XMP_Uns8  fileVersion;
+	XMP_Uns32 fullLength;
+	XMP_Uns8  rectBits;
+	XMP_Uns16 frameRate, frameCount;
+	
+	ioCount = LFA_Read ( file,  buffer, sizeof(buffer), true);
+	if ( ioCount < 14 ) {
+		tree->comment ( "** Invalid SWF, file header is too short." );
+		return;
+	}
+	
+	if ( CheckBytes ( buffer, "CWS", 3 ) ) {
+		isCompressed = true;
+	} else if ( ! CheckBytes ( buffer, "FWS", 3 ) ) {
+		tree->comment ( "** Invalid SWF, unknown file header signature." );
+		return;
+	}
+	
+	fileVersion = buffer[3];
+	fullLength  = GetUns32LE ( &buffer[4] );
+	rectBits    = buffer[8] >> 3;
+	
+	XMP_Uns32 rectBytes   = ((5 + 4*rectBits) + 7) >> 3;
+	XMP_Uns32 headerBytes = 8 + rectBytes + 4;
+	
+	if ( ioCount < headerBytes ) {
+		tree->comment ( "** Invalid SWF, file header is too short." );
+		return;
+	}
+	
+	frameRate  = GetUns16LE ( &buffer[8+rectBytes] );
+	frameCount = GetUns16LE ( &buffer[8+rectBytes+2] );
+	
+	// *** Someday decode the frame rectangle.
+	
+	tree->comment ( "File Header: %scompressed, version %d, full length %d, frame rate %d, frame count %d",
+					(isCompressed ? "" : "un"), fileVersion, fullLength, frameRate, frameCount );
+	
+	if ( isCompressed ) {
+		// *** Add support to decompress into a temp file.
+		tree->comment ( "** Ignoring compressed SWF contents." );
+		return;
+	}
+	
+	// Dump the tags in the body of the file.
+	
+	XMP_Uns16 tagType;
+	XMP_Uns32 tagOffset, tagLength, headerLength, dataLength;
+	
+	for ( tagOffset = headerBytes; (tagOffset < swfLen); tagOffset += tagLength ) {
+
+		// Read the tag header, extract the type and data length.
+		
+		LFA_Seek ( file, tagOffset, SEEK_SET );
+		ioCount = LFA_Read ( file,  buffer, sizeof(buffer), true);
+		if ( ioCount < 2 ) {
+			tree->comment ( "** Invalid SWF, tag header is too short at offset %u (0x%X).", tagOffset, tagOffset );
+			break;
+		}
+		
+		tagType = GetUns16LE ( &buffer[0] );
+		dataLength = tagType & 0x3F;
+		tagType = tagType >> 6;
+		
+		if ( dataLength < 63 ) {
+			headerLength = 2;
+		} else {
+			if ( ioCount < 6 ) {
+				tree->comment ( "** Invalid SWF, tag header is too short at offset %u (0x%X).", tagOffset, tagOffset );
+				break;
+			}
+			headerLength = 6;
+			dataLength = GetUns32LE ( &buffer[2] );
+		}
+		tagLength = headerLength + dataLength;
+		
+		// Make sure the tag fits in the file, being careful about arithmetic overflow.
+		
+		if ( tagLength > (swfLen - tagOffset) ) {
+			tree->comment ( "** Invalid SWF, tag is too long at offset %u (0x%X).", tagOffset, tagOffset );
+			break;
+		}
+		
+		// See if this is the FileAttributes tag or the Metadata tag.
+		
+		if ( (tagOffset == headerBytes) && (tagType != kSWF_FileAttributesTag) && (fileVersion >= 8) ) {
+			tree->comment ( "** Invalid SWF, first tag is not FileAttributes." );
+		}
+
+		if ( tagType == kSWF_FileAttributesTag ) {
+
+			if ( dataLength < 32 ) {
+				tree->comment ( "** Invalid SWF, FileAttributes tag is too short at offset %u (0x%X).", tagOffset, tagOffset );
+				continue;
+			}
+			
+			XMP_Uns8 xmpFlag = buffer[headerLength+3];
+			if ( xmpFlag != 0 ) {
+				hasMetadata = true;
+				if ( xmpFlag != 1 ) {
+					tree->comment ( "** Improper SWF, HasMetadata flag not 0/1 at tag offset %d (0x%X).", tagOffset, tagOffset );
+				}
+			}
+			
+			tree->comment ( "FileAttributes tag @ %d (0x%X), %s XMP", tagOffset, tagOffset, (hasMetadata ? "has" : "no") );
+
+		} else if ( tagType == kSWF_MetadataTag ) {
+
+			if ( ! hasMetadata ) {
+				tree->comment ( "** Invalid SWF, Metadata tag without HasMetadata flag at offset %u (0x%X).", tagOffset, tagOffset );
+				continue;
+			}
+
+			tree->comment ( "Metadata tag @ %d (0x%X)", tagOffset, tagOffset );
+			
+			if ( sXMPPtr != 0 ) {
+				tree->comment ( "  ** Redundant Metadata tag" );
+			} else {
+				CaptureXMPF ( file, (tagOffset + headerLength), dataLength );
+			}
+
+		} else {
+
+			// Only for deep debugging:
+			// tree->comment ( "Unspecified tag #%d @ %d (0x%X)", tagType, tagOffset, tagOffset );
+
+		}
+		
+	}
+
+	if ( sXMPPtr != 0 ) DumpXMP ( "SWF Metadata tag (#77) XMP" );
+	
+}	// DumpSWF
+
+// =================================================================================================
+
+static XMP_Uns32 DumpScriptDataArray ( LFA_FileRef file, XMP_Uns32 sdOffset, XMP_Uns32 count,
+									   bool isStrict, bool isOnXMP = false );
+static XMP_Uns32 DumpScriptDataObject ( LFA_FileRef file, XMP_Uns32 sdOffset );
+static XMP_Uns32 DumpScriptDataObjectList ( LFA_FileRef file, XMP_Uns32 sdOffset );
+
+static inline XMP_Uns32 GetUns24BE ( XMP_Uns8 * ptr )
+{
+	return (GetUns32BE(ptr) >> 8);
+}
+
+#define ReadSDValue(len)	\
+	ioCount = LFA_Read ( file,  buffer, len,true);									\
+	if ( ioCount != len ) {																\
+		tree->comment ( "** Failure reading ScriptDataValue, ioCount = %d", ioCount );	\
+		return (sdOffset + 1 + ioCount);												\
+	}
+
+
+static XMP_Uns32 DumpScriptDataValue ( LFA_FileRef file, XMP_Uns32 sdOffset, bool isOnXMP = false )
+{
+	XMP_Uns8 buffer [64*1024];
+	size_t   ioCount;
+
+	XMP_Uns8  kind;
+	XMP_Uns16 u16;
+	XMP_Uns32 u32;
+	XMP_Uns64 u64;
+	
+	LFA_Seek ( file, sdOffset, SEEK_SET );
+	ioCount = LFA_Read ( file,  &kind, 1, true);
+	if ( ioCount != 1 ) {
+		tree->comment ( "** Failure reading ScriptDataValue kind, ioCount = %d", ioCount );
+		return sdOffset;
+	}
+	
+	if ( isOnXMP ) {
+		if ( (kind != 8) && (kind != 2) && (kind != 0xC) ) {
+			tree->comment ( "** Invalid kind for onXMPData tag **" );
+		}
+	}
+	
+	XMP_Uns64 time;
+	XMP_Int16 tz;
+
+	switch ( kind ) {
+	
+		case 0x00:	// A number, IEEE double.
+			ReadSDValue ( 8 );
+			u64 = GetUns64BE ( &buffer[0] );
+			tree->addComment ( "float = %f", *((double*)(&u64)) );
+			return (sdOffset + 1 + 8);
+	
+		case 0x01:	// A 0/1 Boolean. (??? general Uns8?)
+			ReadSDValue ( 1 );
+			tree->addComment ( "bool = %d", buffer[0] );
+			return (sdOffset + 1 + 1);
+	
+		case 0x02:	// A short UTF-8 string, leading 2 byte count.
+			ReadSDValue ( 2 );
+			u16 = GetUns16BE ( &buffer[0] );
+			ReadSDValue ( u16 );
+			tree->addComment ( "string (%d) = \"%.*s\"", u16, u16, buffer );
+			if ( buffer[u16-1] != 0 ) tree->addComment ( "value lacks trailing nul" );
+			if ( isOnXMP ) CaptureXMPF ( file, (sdOffset+1+2), u16 );
+			return (sdOffset + 1 + 2 + u16);
+	
+		case 0x03:	// An object list, triples of 0x02/key/value, ends at 0x02000009.
+			tree->addComment ( "object list" );
+			return DumpScriptDataObjectList ( file, sdOffset+1 );
+	
+		case 0x04:	// A movie clip path as short UTF-8 string
+			ReadSDValue ( 2 );
+			u16 = GetUns16BE ( &buffer[0] );
+			ReadSDValue ( u16 );
+			tree->addComment ( "movie (%d) = \"%.*s\"", u16, u16, buffer );
+			if ( buffer[u16-1] != 0 ) tree->addComment ( "value lacks trailing nul" );
+			return (sdOffset + 1 + 2 + u16);
+	
+		case 0x05:	// A null, single byte.
+			tree->addComment ( "null" );
+			return (sdOffset + 1);
+	
+		case 0x06:	// A undefined, single byte.
+			tree->addComment ( "undefined" );
+			return (sdOffset + 1);
+	
+		case 0x07:	// A reference, Uns16.
+			ReadSDValue ( 2 );
+			u16 = GetUns16BE ( &buffer[0] );
+			tree->addComment ( "reference = %d", u16 );
+			return (sdOffset + 1 + 2);
+	
+		case 0x08:	// An ECMA array, 32-bit count then any number of key/value pairs. Has 0x000009 terminator.
+			ReadSDValue ( 4 );
+			u32 = GetUns32BE ( &buffer[0] );
+			tree->addComment ( "ECMA array [%d]", u32 );
+			return DumpScriptDataArray ( file, sdOffset+1+4, u32, false, isOnXMP );
+	
+		case 0x09:	// End of object or array. Should not see this here!
+			tree->addComment ( "** end **" );
+			return (sdOffset + 1);
+	
+		case 0x0A:	// A strict array, count then that many key/value pairs, no 0x000009 terminator.
+			ReadSDValue ( 4 );
+			u32 = GetUns32BE ( &buffer[0] );
+			tree->addComment ( "strict array [%d]", u32 );
+			return DumpScriptDataArray ( file, sdOffset+1+4, u32, true );
+	
+		case 0x0B:	// A date, Uns64 milliseconds since Jan 1 1970, Int16 TZ offset in minutes.
+			ReadSDValue ( 10 );
+			time = GetUns64BE ( &buffer[0] );
+			tz = (XMP_Int16) GetUns16BE ( &buffer[8] );
+			tree->addComment ( "date, time=%ULL, tz=%d", time, tz );
+			return (sdOffset + 1 + 10);
+	
+		case 0x0C:	// A long UTF-8 string, leading 4 byte count.
+			ReadSDValue ( 4 );
+			u32 = GetUns32BE ( &buffer[0] );
+			if ( u32 < sizeof(buffer) ) {
+				ReadSDValue ( u32 );
+				tree->addComment ( "long string (%d) = \"%.*s\"", u32, u32, buffer );
+				if ( buffer[u32-1] != 0 ) tree->addComment ( "value lacks trailing nul" );
+			} else {
+				ReadSDValue ( sizeof(buffer) );
+				tree->addComment ( "long string (%d) = \"%.*s\"", u32, sizeof(buffer), buffer );
+				tree->comment ( "** truncated long string output **" );
+			}
+			if ( isOnXMP ) CaptureXMPF ( file, (sdOffset+1+4), u32 );
+			return (sdOffset + 1 + 4 + u32);
+	
+		case 0x0D:	// Unsupported, single byte.
+			tree->addComment ( "unsupported" );
+			return (sdOffset + 1);
+	
+		case 0x0E:	// A RecordSet. (???)
+			tree->addComment ( "** record set ?? **" );
+			return (sdOffset + 1);
+	
+		case 0x0F:	// XML as a long UTF-8 string
+			ReadSDValue ( 4 );
+			u32 = GetUns32BE ( &buffer[0] );
+			if ( u32 < sizeof(buffer) ) {
+				ReadSDValue ( u32 );
+				tree->addComment ( "XML (%d) = \"%.*s\"", u32, u32, buffer );
+				if ( buffer[u32-1] != 0 ) tree->addComment ( "value lacks trailing nul" );
+			} else {
+				ReadSDValue ( sizeof(buffer) );
+				tree->addComment ( "XML (%d) = \"%.*s\"", u32, sizeof(buffer), buffer );
+				tree->comment ( "** truncated long string output **" );
+			}
+			if ( isOnXMP ) CaptureXMPF ( file, (sdOffset+1+4), u32 );
+			return (sdOffset + 1 + 4 + u32);
+	
+		case 0x10:	// A typed object list, short string class name, object list (like case 0x03).
+			ReadSDValue ( 2 );
+			u16 = GetUns16BE ( &buffer[0] );
+			ReadSDValue ( u16 );
+			tree->addComment ( "class, name = %.*s", u16, u16, buffer );
+			if ( buffer[u16-1] == 0 ) tree->addComment ( "name has trailing nul" );
+			return DumpScriptDataObjectList ( file, (sdOffset + 1 + 2 + u16) );
+	
+		case 0x11:	// AMF 3 data. (???)
+			tree->addComment ( "** AMF 3 data ?? **" );
+			return (sdOffset + 1);
+		
+		default:
+			tree->addComment ( "** unknown kind = %d **", kind );
+			return (sdOffset + 1);
+	
+	}
+
+}	// DumpScriptDataValue
+
+// =================================================================================================
+
+static XMP_Uns32 DumpScriptVariable ( LFA_FileRef file, XMP_Uns32 sdOffset, bool isOnXMP = false )
+{
+	XMP_Uns8 buffer [64*1024];
+	size_t   ioCount;
+	
+	LFA_Seek ( file, sdOffset, SEEK_SET );
+	ioCount = LFA_Read ( file,  buffer,  2, true );
+	if ( ioCount != 2 ) {
+		tree->comment ( "** Failure reading DumpScriptVariable start, ioCount = %d", ioCount );
+		return (sdOffset + ioCount);
+	}
+	
+	XMP_Uns16 nameLen = GetUns16BE ( &buffer[0] );
+	ioCount = LFA_Read ( file,  buffer, nameLen, true );
+	if ( ioCount != nameLen ) {
+		tree->comment ( "** Failure reading ScriptDataObject name, ioCount = %d", ioCount );
+		return (sdOffset + 3 + ioCount);
+	}
+	
+	tree->pushNode ( "%.*s @ 0x%X", nameLen, buffer, sdOffset );
+	if ( buffer[nameLen-1] == 0 ) tree->addComment ( "name has trailing nul" );
+	if ( strncmp ( (char*)buffer, "liveXML", nameLen ) != 0 ) isOnXMP = false;	// ! Else keep the input value.
+	XMP_Uns32 nextOffset = DumpScriptDataValue ( file, (sdOffset+2+nameLen), isOnXMP );
+	tree->popNode();
+
+	return nextOffset;
+
+}	// DumpScriptVariable
+
+// =================================================================================================
+
+static XMP_Uns32 DumpScriptDataArray ( LFA_FileRef file, XMP_Uns32 sdOffset, XMP_Uns32 headerCount,
+									   bool isStrict, bool isOnXMP /* = false */ )
+{
+	XMP_Uns8 buffer [3];
+	size_t   ioCount;
+	
+	XMP_Uns32 actualCount = 0;
+	XMP_Uns32 currOffset  = sdOffset;
+	
+	if ( isStrict ) {
+		
+		for ( ; headerCount > 0; --headerCount ) {
+			XMP_Uns32 nextOffset = DumpScriptVariable ( file, currOffset );
+			if ( nextOffset == currOffset ) {
+				tree->comment ( "** Failure reading DumpScriptDataArray, no progress" );
+				return currOffset;
+			}
+			currOffset = nextOffset;
+		}
+	
+	} else {
+	
+		while ( true ) {
+		
+			LFA_Seek ( file, currOffset, SEEK_SET );
+			ioCount = LFA_Read ( file,  buffer, 3, true );
+			if ( ioCount != 3 ) {
+				tree->comment ( "** Failure check DumpScriptDataArray, ioCount = %d", ioCount );
+				return (currOffset + ioCount);
+			}
+			if ( GetUns24BE ( &buffer[0] ) == 9 ) break;
+			
+			XMP_Uns32 nextOffset = DumpScriptVariable ( file, currOffset, isOnXMP );
+			if ( nextOffset == currOffset ) {
+				tree->comment ( "** Failure reading DumpScriptDataArray, no progress" );
+				return currOffset;
+			}
+			
+			++actualCount;
+			currOffset = nextOffset;
+		
+		}
+		
+		if ( (headerCount != (XMP_Uns32)(-1)) && (headerCount != actualCount) ) {
+			tree->comment ( "Count mismatch, actual = %d", actualCount );	// ! Not an error!
+		}
+		
+		currOffset += 3;	// ! Include the 0x000009 terminator.
+	
+	}
+	
+	return currOffset;
+
+}	// DumpScriptDataArray
+
+// =================================================================================================
+
+static XMP_Uns32 DumpScriptDataObject ( LFA_FileRef file, XMP_Uns32 sdOffset )
+{
+	XMP_Uns8 buffer [64*1024];
+	size_t   ioCount;
+	
+	LFA_Seek ( file, sdOffset, SEEK_SET );
+	ioCount = LFA_Read ( file,  buffer, 2,true);
+	if ( ioCount != 2 ) {
+		tree->comment ( "** Failure reading ScriptDataObject name length, ioCount = %d", ioCount );
+		return (sdOffset + ioCount);
+	}
+	
+	XMP_Uns16 nameLen = GetUns16BE ( &buffer[1] );
+	ioCount = LFA_Read ( file,  buffer, nameLen, true);
+	if ( ioCount != nameLen ) {
+		tree->comment ( "** Failure reading ScriptDataObject name, ioCount = %d", ioCount );
+		return (sdOffset + 2 + ioCount);
+	}
+	
+	tree->pushNode ( "%.*s @ 0x%X", nameLen, buffer, sdOffset );
+	if ( buffer[nameLen-1] == 0 ) tree->addComment ( "name has trailing nul" );
+	XMP_Uns32 nextOffset = DumpScriptDataValue ( file, (sdOffset+2+nameLen) );
+	tree->popNode();
+	
+	return nextOffset;
+
+}	// DumpScriptDataObject
+
+// =================================================================================================
+
+static XMP_Uns32 DumpScriptDataObjectList ( LFA_FileRef file, XMP_Uns32 sdOffset )
+{
+	XMP_Uns8 buffer [3];
+	size_t   ioCount;
+	
+	XMP_Uns32 currOffset = sdOffset;
+	
+	while ( true ) {
+	
+		LFA_Seek ( file, currOffset, SEEK_SET );
+		ioCount = LFA_Read ( file,  buffer, 3, true);
+		if ( ioCount != 3 ) {
+			tree->comment ( "** Failure check ScriptDataObjectList, ioCount = %d", ioCount );
+			return (currOffset + ioCount);
+		}
+		
+		XMP_Uns32 endFlag = GetUns24BE ( &buffer[0] );
+		if ( endFlag == 9 ) return (currOffset + 3);
+		
+		XMP_Uns32 nextOffset = DumpScriptDataObject ( file, currOffset );
+		if ( nextOffset == currOffset ) {
+			tree->comment ( "** Failure reading ScriptDataObjectList, no progress" );
+			return currOffset;
+		}
+		
+		currOffset = nextOffset;
+	
+	}
+
+}	// DumpScriptDataObjectList
+
+// =================================================================================================
+
+static XMP_Uns32 DumpScriptDataTagContent ( LFA_FileRef file, XMP_Uns32 sdOffset, XMP_Uns32 tagTime )
+{
+	XMP_Uns8 buffer [64*1024];
+	size_t   ioCount;
+	
+	LFA_Seek ( file, sdOffset, SEEK_SET );
+	ioCount = LFA_Read ( file, buffer, 3, true );
+	if ( (ioCount != 3) || (buffer[0] != 2) ) {
+		tree->comment ( "** Failure reading ScriptDataObject start, ioCount = %d, buffer[0]=0x%X", ioCount, buffer[0] );
+		return (sdOffset + ioCount);
+	}
+	
+	XMP_Uns16 nameLen = GetUns16BE ( &buffer[1] );
+	ioCount = LFA_Read ( file, buffer, nameLen, true );
+	if ( ioCount != nameLen ) {
+		tree->comment ( "** Failure reading ScriptDataObject name, ioCount = %d", ioCount );
+		return (sdOffset + 3 + ioCount);
+	}
+	
+	tree->addComment ( "%.*s @ 0x%X", nameLen, buffer, sdOffset );
+	if ( buffer[nameLen-1] == 0 ) tree->addComment ( "name has trailing nul" );
+	
+	bool isOnXMP = (tagTime == 0) && (nameLen == 9) && (strncmp ( (char*)buffer, "onXMPData", 9 ) == 0);
+	return DumpScriptDataValue ( file, (sdOffset+1+2+nameLen), isOnXMP );
+
+}	// DumpScriptDataTagContent
+
+// =================================================================================================
+
+static void
+DumpFLV ( LFA_FileRef file, XMP_Uns32 flvLen )
+{
+	// FLV must not be confused with SWF, they are quite different internally. FLV is a chunky
+	// format, the chunks are called tags. All multi-byte integers in FLV are stored in big endian
+	// order. An FLV file begins with a variable length file header followed by a sequence of tags
+	// (the file body).
+	//
+	// Each tag contains a header, content, and back-pointer. The size in a tag header is just the
+	// data size. The back-pointer is the full size of the preceeding tag, not just the data length.
+	// The first tag is preceeded by a 0 back-pointer (not by the length of the header). The last
+	// tagk is followed by a back pointer.
+	//
+	// The FLV file header:
+	//   0  3 - signature, "FLV"
+	//   3  1 - UInt8 major version
+	//   4  1 - UInt8 flags
+	//   5  4 - UInt32 size of header (offset to body)
+	//
+	// The FLV tag header:
+	//   0  1 - UInt8 tag type
+	//   1  3 - UInt24 length of data
+	//   4  3 - UInt24 timestamp, milliseconds into the playback
+	//   7  1 - UInt8 timestamp high, for a full UInt32 playback time
+	//   8  3 - UInt24 stream ID, must be 0
+	//
+	// Only 3 tag types are defined by SWF-FLV-8, 8 = audio, 9 = video, 18 = script data. There is
+	// confusion or missing information in the spec about script data tags. In one place it uses the
+	// term "script data", in another SCRIPTDATAOBJECT for type 18. Then within the "Data Tags"
+	// section it talks about SCRIPTDATAOBJECT, SCRIPTDATAOBJECTEND, SCRIPTDATASTRING,
+	// SCRIPTDATALONGSTRING, SCRIPTDATAVALUE, SCRIPTDATAVARIABLE, SCRIPTDATAVARIABLEEND, and
+	// SCRIPTDATADATE. It isn't clear if these SCRIPTDATA* things are FLV tags, or substructure
+	// within the data of tag type 18.
+
+	XMP_Uns8 buffer [100];
+	size_t   ioCount;
+	XMP_Uns32 size, time, stream, backSize;
+	
+	ioCount = LFA_Read ( file,  buffer, 9+4, true);
+	if ( ioCount != 9+4 ) {
+		tree->comment ( "** Failure reading FLV header, ioCount = %d", ioCount );
+		return;
+	}
+	
+	size = GetUns32BE ( &buffer[5] );
+	tree->addComment ( "FLV header: \"%.3s\", version %d, flags 0x%.2X, size %d (0x%X)",
+					   &buffer[0], buffer[3], buffer[4], size );
+
+	LFA_Seek ( file, size, SEEK_SET );
+	ioCount = LFA_Read ( file,  buffer, 4, true);
+	if ( ioCount != 4 ) {
+		tree->comment ( "** Failure reading leading backSize, ioCount = %d", ioCount );
+		return;
+	}
+	backSize = GetUns32BE ( &buffer[0] );
+	if ( backSize != 0 ) {
+		tree->comment ( "** Bad leading backSize = %d", backSize );
+		return;
+	}
+	
+	for ( XMP_Uns32 tagOffset = (size+4); tagOffset < flvLen; tagOffset += (11+size+4) ) {
+
+		LFA_Seek ( file, tagOffset, SEEK_SET );
+		ioCount = LFA_Read ( file,  buffer, 11, true);	// Back pointer plus tag header.
+		if ( ioCount != 11 ) {
+			tree->comment ( "** Failure reading FLV tag, ioCount = %d", ioCount );
+			return;
+		}
+		
+		size = GetUns24BE ( &buffer[1] );
+		time = GetUns24BE ( &buffer[4] );
+		time += ((XMP_Uns32)buffer[7] << 24);
+		stream = GetUns24BE ( &buffer[8] );
+		
+		if ( time != 0 ) break;	// ! Just do the time 0 tags for this tool.
+		
+		char label [100];
+		char comment [1000];
+		
+		XMP_Uns8 kind = buffer[0];
+		if ( kind == 8 ) {
+			if ( time == 0 ) sprintf ( label, "Audio" );	// Don't normally print, there are too many.
+		} else if ( kind == 9 ) {
+			if ( time == 0 ) sprintf ( label, "Video" );	// Don't normally print, there are too many.
+		} else if ( kind == 18 ) {
+			sprintf ( label, "ScriptData" );
+		} else {
+			sprintf ( label, "<other-%d>", kind );
+		}
+		sprintf ( comment, "%s @ 0x%X, size=%d, time=%d, stream=%d", label, tagOffset, size, time, stream );
+
+		tree->pushNode ( comment );
+		
+		LFA_Seek ( file, (tagOffset+11+size), SEEK_SET );
+		ioCount = LFA_Read ( file,  buffer, 4, true );	// Back pointer plus tag header.
+		if ( ioCount != 4 ) {
+			tree->comment ( "** Failure reading backSize, ioCount = %d", ioCount );
+			return;
+		}
+
+		backSize = GetUns32BE ( &buffer[0] );
+		if ( backSize != (11+size) ) tree->comment ( "** Bad backSize= %d", backSize );
+
+		if ( kind == 18 ) {
+			XMP_Uns32 endOffset = DumpScriptDataTagContent ( file, (tagOffset+11), time );
+			if ( endOffset != (tagOffset+11+size) ) {
+				tree->comment ( "** Bad endOffset = 0x%X", endOffset );
+			}
+		}
+		
+		tree->popNode();
+
+	}
+	
+	if ( sXMPPtr != 0 ) DumpXMP ( "FLV onXMPData tag" );
+
+}	// DumpFLV
+
+// =================================================================================================
+
+static bool
+PrintID3Encoding ( XMP_Uns8 encoding, XMP_Uns8 * strPtr )
+{
+	bool bigEndian = true;
+
+	tree->addComment ( "encoding %d", encoding );
+
+	switch ( encoding ) {
+		case 0 :
+			tree->addComment ( " (ISO Latin-1)" );
+			break;
+		case 1 :
+			if ( *strPtr == 0xFF ) bigEndian = false;
+			tree->addComment ( " (UTF-16 with BOM, %s endian)", (bigEndian ? "big" : "little") );
+			break;
+		case 2 :
+			tree->addComment ( " (UTF-16 big endian)" );
+			break;
+		case 3 :
+			tree->addComment ( " (UTF-8)" );
+			break;
+		default :
+			tree->addComment ( " (** unknown **)" );
+			break;
+	}
+
+	return bigEndian;
+
+}	// PrintID3Encoding
+
+// =================================================================================================
+
+//static void
+//PrintID3EncodedText (XMP_Uns8 encoding, void * _strPtr, const char * label)
+//{
+//}	// PrintID3EncodedText
+
+// =================================================================================================
+
+struct ID3_Header {
+	char id3[3];
+	XMP_Uns8 vMajor, vMinor, flags;
+	XMP_Uns8 size[4];
+};
+
+struct ID3_FrameHeader {
+	char id[4];
+	XMP_Uns32 size;
+	XMP_Uns16 flags;
+};
+
+#define _U32b(ptr,n) ((XMP_Uns32) (((XMP_Uns8*)(ptr))[n]))
+#define GetSyncSafe32(ptr)	((_U32b(ptr,0) << 21) | (_U32b(ptr,1) << 14) | (_U32b(ptr,2) <<  7) | _U32b(ptr,3))
+
+#define GetID3Size(ver,ptr)	((ver == 3) ? GetUns32BE(ptr) : GetSyncSafe32(ptr))
+
+static void
+DumpMP3 (LFA_FileRef file, XMP_Uns32 /*mp3Len*/)
+{
+	// ** We're ignoring the effects of the unsync flag, and not checking the CRC (if present).
+
+	assert (sizeof(ID3_Header) == 10);
+	assert (sizeof(ID3_FrameHeader) == 10);
+
+	// Dump the basic ID3 header.
+
+	ID3_Header id3Head;
+
+	LFA_Seek (file, 0, SEEK_SET);
+	LFA_Read ( file, &id3Head, sizeof(id3Head), true);
+
+	if (! CheckBytes (id3Head.id3, "ID3", 3)) {
+		tree->addComment("   No ID3v2 section");
+		return;
+	}
+
+	XMP_Uns32 id3Len = GetSyncSafe32 (id3Head.size);
+	XMP_Uns32 framePos = sizeof(id3Head);	// The offset of the next (first) ID3 frame.
+	XMP_Uns32 frameEnd = framePos + id3Len;
+
+	tree->addComment("   ID3v2.%d.%d, size %d, flags 0x%.2X",
+		id3Head.vMajor, id3Head.vMinor, id3Len, id3Head.flags);
+	if (id3Head.flags != 0) {
+		tree->addComment("%s%s%s%s",
+			((id3Head.flags & 0x80) ? ", unsync" : ""),
+			((id3Head.flags & 0x40) ? ", extended header" : ""),
+			((id3Head.flags & 0x20) ? ", experimental" : ""),
+			((id3Head.flags & 0x10) ? ", has footer" : ""));
+	}
+
+
+	if ((id3Head.vMajor != 3) && (id3Head.vMajor != 4)) {
+		tree->addComment("   ** Unrecognized major version tree.");
+		return;
+	}
+
+	bool hasExtHeader = ((id3Head.flags & 0x40) != 0);
+
+	// Dump the extended header if present.
+
+	if (hasExtHeader) {
+
+		XMP_Uns32 extHeaderLen;
+		LFA_Read ( file, &extHeaderLen, 4, true );
+		extHeaderLen = GetID3Size (id3Head.vMajor, &extHeaderLen);
+
+		framePos += (4 + extHeaderLen);
+
+		if (id3Head.vMajor == 3) {
+
+			XMP_Uns16 extHeaderFlags;
+			LFA_Read ( file, &extHeaderFlags, 2, true );
+			extHeaderFlags = GetUns16BE (&extHeaderFlags);
+
+			XMP_Uns32 padLen;
+			LFA_Read ( file, &padLen, 4, true );
+			padLen = GetUns32BE (&padLen);
+
+			frameEnd -= padLen;
+
+			tree->addComment("      Extended header size %d, flags 0x%.4X, pad size %d",
+				extHeaderLen, extHeaderFlags, padLen);
+
+			if (extHeaderFlags & 0x8000) {
+				XMP_Uns32 crc;
+				LFA_Read ( file, &crc, 4, true );
+				crc = GetUns32BE (&crc);
+				tree->addComment("CRC 0x%.8X", crc);
+			}
+
+		} else if (id3Head.vMajor == 4) {
+
+			XMP_Uns8 flagCount;
+			LFA_Read ( file, &flagCount, 1, true );
+
+			tree->addComment("      Extended header size %d, flag count %d", extHeaderLen, flagCount);
+
+			for (size_t i = 0; i < flagCount; ++i) {
+				XMP_Uns8 flag;
+				LFA_Read ( file, &flag, 1, true );
+				tree->addComment("0x%.2X", flag);
+			}
+
+		}
+
+	}
+
+	// Dump the ID3 frames.
+
+	while (framePos < frameEnd) {
+
+		if ((frameEnd - framePos) < 10) break;	// Assume into ID3v2.4 padding.
+
+		ID3_FrameHeader frameHead;
+		LFA_Seek (file, framePos, SEEK_SET);
+		LFA_Read ( file, &frameHead, sizeof(frameHead), true);
+
+		if (CheckBytes (frameHead.id, "\x0\x0\x0\x0", 4)) break;	// Assume into ID3v2.4 padding.
+
+		frameHead.size = GetID3Size (id3Head.vMajor, &frameHead.size);
+		frameHead.flags = GetUns16BE (&frameHead.flags);
+
+		tree->addComment("   '%.4s', offset %d (0x%X), size %d, flags 0x%.2X",
+			frameHead.id, framePos, framePos, frameHead.size, frameHead.flags);
+
+		if (frameHead.id[0] == 'T') {
+
+			CaptureFileData (file, 0, frameHead.size);
+			XMP_Uns8 encoding = sDataPtr[0];
+
+			bool bigEndian = PrintID3Encoding (encoding, (sDataPtr + 1));
+
+			if ((encoding == 0) || (encoding == 3)) {
+				PrintOnlyASCII_8 ((sDataPtr + 1), (frameHead.size - 1), "      ");
+			} else if ((encoding == 1) || (encoding == 2)) {
+				XMP_Uns16 * valuePtr = (XMP_Uns16*) (sDataPtr + 1);
+				if (bigEndian) {
+					PrintOnlyASCII_16BE (valuePtr, (frameHead.size - 1), "      ");
+				} else {
+					PrintOnlyASCII_16LE (valuePtr, (frameHead.size - 1), "      ");
+				}
+			}
+
+		} else if (CheckBytes (frameHead.id, "PRIV", 4) && (frameHead.size >= 4)) {
+
+			CaptureFileData (file, 0, frameHead.size);
+			PrintOnlyASCII_8 (sDataPtr, strlen((char*)sDataPtr), ",");
+			if (CheckBytes (sDataPtr, "XMP\x0", 4)) {
+				CaptureXMPF (file, (framePos + 10 + 4), (frameHead.size - 4));
+			}
+
+		} else if (CheckBytes (frameHead.id, "COMM", 4)) {
+
+			CaptureFileData (file, 0, frameHead.size);
+			XMP_Uns8 * frameEnd = sDataPtr + frameHead.size;
+
+			XMP_Uns8   encoding = sDataPtr[0];
+			char *     lang     = (char*) (sDataPtr + 1);
+
+			tree->addComment("lang '%.3s'", lang);
+			bool bigEndian = PrintID3Encoding (encoding, (sDataPtr + 4));
+
+			if ((encoding == 0) || (encoding == 3)) {
+
+				XMP_Uns8 * descrPtr = sDataPtr + 4;
+				XMP_Uns8 * valuePtr = descrPtr;
+				while (*valuePtr != 0) ++valuePtr;
+				++valuePtr;
+
+				PrintOnlyASCII_8 (descrPtr, (valuePtr - descrPtr - 1), "      ");
+				PrintOnlyASCII_8 (valuePtr, (frameEnd - valuePtr), "      ");
+
+			} else if ((encoding == 1) || (encoding == 2)) {
+
+				XMP_Uns16 * descrPtr = (XMP_Uns16*) (sDataPtr + 4);
+				XMP_Uns16 * valuePtr = descrPtr;
+				while (*valuePtr != 0) ++valuePtr;
+				++valuePtr;
+
+				size_t descrBytes = 2 * (valuePtr - descrPtr - 1);
+				size_t valueBytes = 2 * ((XMP_Uns16*)frameEnd - valuePtr);
+
+				if (bigEndian) {
+					PrintOnlyASCII_16BE (descrPtr, descrBytes, "      ");
+					PrintOnlyASCII_16BE (valuePtr, valueBytes, "      ");
+				} else {
+					PrintOnlyASCII_16LE (descrPtr, descrBytes, "      ");
+					PrintOnlyASCII_16LE (valuePtr, valueBytes, "      ");
+				}
+
+			}
+
+		}
+
+		framePos += (sizeof(ID3_FrameHeader) + frameHead.size);
+
+	}
+
+	if (framePos < frameEnd) {
+		tree->addComment("   Padding assumed, offset %d (0x%X), size %d",
+			framePos, framePos, (frameEnd - framePos));
+	}
+
+	if (sXMPPtr != 0) DumpXMP ("ID3 'PRIV' \"XMP\" frame");
+
+
+}	// DumpMP3
+
+// =================================================================================================
+
+static void
+PacketScan (LFA_FileRef file, XMP_Int64 fileLen)
+{
+	try {
+
+		QEScanner scanner (fileLen);
+		LFA_Seek (file, 0, SEEK_SET);
+
+		XMP_Uns8 buffer [64*1024];
+		XMP_Uns32 filePos, readLen;
+
+		for (filePos = 0; filePos < fileLen; filePos += readLen) {
+			readLen = LFA_Read ( file, buffer, sizeof(buffer), false );
+			if (readLen == 0) throw std::logic_error ("Empty read");
+			scanner.Scan (buffer, filePos, readLen);
+		}
+
+		size_t snipCount = scanner.GetSnipCount();
+		QEScanner::SnipInfoVector snips (snipCount);
+		scanner.Report (snips);
+
+		size_t packetCount = 0;
+
+		for (size_t s = 0; s < snipCount; ++s) {
+			if (snips[s].fState == QEScanner::eValidPacketSnip) {
+				++packetCount;
+				CaptureXMPF (file, (XMP_Uns32)snips[s].fOffset, (XMP_Uns32)snips[s].fLength);
+				DumpXMP ("packet scan");
+			}
+		}
+
+		if (packetCount == 0) tree->addComment("   No packets found");
+
+	} catch (...) {
+
+		tree->addComment("** Scanner failure tree.");
+
+	}
+
+}	// PacketScan
+
+// =================================================================================================
+// External Routines
+
+namespace DumpFile_NS {
+	// ! Xcode compiler warns about normal offsetof macro.
+#define SafeOffsetOf(type,field)	((size_t)(&(((type*)1000)->field)) - 1000)
+
+	//assure that packing is 100% tight
+	//see above:
+	// - #pragma pack (1)
+	// - SafeOffsetOf  macro definition
+	//
+	// calling this at least once is an extremly good idea, 
+	// because among other reasons, the #pragma pack directive
+	// is not ANSI-C thus things could go wrong on one platform or another...
+	//
+	// returns nothing, but asserts will be triggered if something is wrong.
+	static bool selfTestDone=false;
+	void selfTest() {
+		//only very first call at each runtime runs the selfTest (mostly verify about structPacking etc...)
+		if (DumpFile_NS::selfTestDone) return;
+
+		assert (sizeof (ASF_GUID) == 16);
+		assert (SafeOffsetOf (ASF_GUID, part1) ==  0);
+
+		assert (SafeOffsetOf (ASF_GUID, part2) ==  4);
+		assert (SafeOffsetOf (ASF_GUID, part3) ==  6);
+		assert (SafeOffsetOf (ASF_GUID, part4) ==  8);
+		assert (SafeOffsetOf (ASF_GUID, part5) == 10);
+
+		assert (sizeof (ASF_ObjHeader) == (16 + 8));
+		assert (SafeOffsetOf (ASF_ObjHeader, guid) ==  0);
+		assert (SafeOffsetOf (ASF_ObjHeader, size) == 16);
+
+		assert (sizeof (ASF_FileProperties) == kASF_FilePropertiesSize);
+		assert (SafeOffsetOf (ASF_FileProperties, guid)              ==   0);
+		assert (SafeOffsetOf (ASF_FileProperties, size)              ==  16);
+		assert (SafeOffsetOf (ASF_FileProperties, fileID)            ==  24);
+		assert (SafeOffsetOf (ASF_FileProperties, fileSize)          ==  40);
+		assert (SafeOffsetOf (ASF_FileProperties, creationDate)      ==  48);
+		assert (SafeOffsetOf (ASF_FileProperties, dataPacketsCount)  ==  56);
+		assert (SafeOffsetOf (ASF_FileProperties, playDuration)      ==  64);
+		assert (SafeOffsetOf (ASF_FileProperties, sendDuration)      ==  72);
+		assert (SafeOffsetOf (ASF_FileProperties, preroll)           ==  80);
+		assert (SafeOffsetOf (ASF_FileProperties, flags)             ==  88);
+		assert (SafeOffsetOf (ASF_FileProperties, minDataPacketSize) ==  92);
+		assert (SafeOffsetOf (ASF_FileProperties, maxDataPacketSize) ==  96);
+		assert (SafeOffsetOf (ASF_FileProperties, maxBitrate)        == 100);
+
+		assert (sizeof (ASF_ContentDescription) == kASF_ContentDescriptionSize);
+		assert (SafeOffsetOf (ASF_ContentDescription, guid)           ==  0);
+		assert (SafeOffsetOf (ASF_ContentDescription, size)           == 16);
+		assert (SafeOffsetOf (ASF_ContentDescription, titleLen)       == 24);
+		assert (SafeOffsetOf (ASF_ContentDescription, authorLen)      == 26);
+		assert (SafeOffsetOf (ASF_ContentDescription, copyrightLen)   == 28);
+		assert (SafeOffsetOf (ASF_ContentDescription, descriptionLen) == 30);
+		assert (SafeOffsetOf (ASF_ContentDescription, ratingLen)      == 32);
+
+		assert (sizeof (InDesignMasterPage) == kINDD_PageSize);
+		assert (SafeOffsetOf (InDesignMasterPage, fGUID)               ==   0);
+		assert (SafeOffsetOf (InDesignMasterPage, fMagicBytes)         ==  16);
+		assert (SafeOffsetOf (InDesignMasterPage, fObjectStreamEndian) ==  24);
+		assert (SafeOffsetOf (InDesignMasterPage, fIrrelevant1)        ==  25);
+		assert (SafeOffsetOf (InDesignMasterPage, fSequenceNumber)     == 264);
+		assert (SafeOffsetOf (InDesignMasterPage, fIrrelevant2)        == 272);
+		assert (SafeOffsetOf (InDesignMasterPage, fFilePages)          == 280);
+		assert (SafeOffsetOf (InDesignMasterPage, fIrrelevant3)        == 284);
+
+		assert (sizeof (InDesignContigObjMarker) == 32);
+		assert (SafeOffsetOf (InDesignContigObjMarker, fGUID)          ==  0);
+		assert (SafeOffsetOf (InDesignContigObjMarker, fObjectUID)     == 16);
+		assert (SafeOffsetOf (InDesignContigObjMarker, fObjectClassID) == 20);
+		assert (SafeOffsetOf (InDesignContigObjMarker, fStreamLength)  == 24);
+		assert (SafeOffsetOf (InDesignContigObjMarker, fChecksum)      == 28);
+
+		selfTestDone=true;
+	} // selfTest
+
+} /*namespace DumpFile_NS*/
+
+// -------------------------------------------------------------------------------------------------
+
+void DumpFile::Scan (std::string filename, TagTree &tagTree)
+{
+	DumpFile_NS::selfTest(); //calls selftest (will happen only once per runtime, optimization done)
+	tree = &tagTree; // static "global" helper to avoid looping throug 'tree' 24x7
+
+	// Read the first 4K of the file into a local buffer and determine the file format.
+	// ! We're using ANSI C calls that don't handle files over 2GB.
+	// ! Should switch to copies of the "LFA" routines used inside XMP.
+
+	LFA_FileRef fileRef = LFA_Open( filename.c_str(), 'r' );
+
+	assertMsg ( std::string("can't open ")+filename, fileRef != 0 );
+
+	LFA_Seek( fileRef, 0, SEEK_END );
+	XMP_Int64 fileLen = LFA_Tell(fileRef);
+
+	XMP_Uns8 first4K [4096];
+
+	LFA_Seek ( fileRef, 0, SEEK_SET );
+	LFA_Read ( fileRef, first4K, 4096, false);
+
+	LFA_Seek ( fileRef, 0, SEEK_SET ); //rewinds
+					// (remains rewinded behind CheckFileDFormat, since that call does not get the fileRef handle)
+
+	XMP_FileFormat format = CheckFileFormat ( filename.c_str(), first4K, fileLen );
+
+	if ( sXMPPtr != 0) free(sXMPPtr);
+	sXMPPtr = 0;
+	sXMPMax = 0;
+	sXMPLen = 0;
+	sXMPPos = 0;
+
+	//TODO refactor-out
+	XMP_Uns8 * fileContent = 0;	// *** Hack for old file-in-RAM code.
+
+	if ( format == kXMP_JPEGFile ) {
+
+		tagTree.pushNode ( "Dumping JPEG file" );
+		tagTree.addComment ( "size %d(0x%X)", fileLen, fileLen );
+		{
+			fileContent = (XMP_Uns8*) malloc(fileLen);
+			LFA_Seek ( fileRef, 0, SEEK_SET );
+			LFA_Read ( fileRef, fileContent, fileLen, true );
+			DumpJPEG ( fileContent, fileLen );
+		}
+		tagTree.popNode();
+
+	} else if ( format == kXMP_PhotoshopFile ) {
+
+		tagTree.pushNode ( "Dumping Photoshop file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		{
+			fileContent = (XMP_Uns8*) malloc(fileLen);
+			LFA_Seek ( fileRef, 0, SEEK_SET );
+			LFA_Read ( fileRef,  fileContent, fileLen, true);
+			DumpPhotoshop ( fileContent, fileLen );
+		}
+		tagTree.popNode();
+
+	} else if ( format == kXMP_TIFFFile ) {
+
+		tagTree.pushNode ( "Dumping TIFF file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		{
+			fileContent = (XMP_Uns8*) malloc(fileLen);
+			LFA_Seek ( fileRef, 0, SEEK_SET );
+			LFA_Read ( fileRef,  fileContent, fileLen, true);
+			DumpTIFF ( fileContent, fileLen, 0, "TIFF file" );
+		}
+		tagTree.popNode();
+
+	} else if ( format == kXMP_JPEG2KFile ) {
+
+		tagTree.pushNode ( "Dumping JPEG 2000 file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpJPEG2000 (fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_WMAVFile ) {
+
+		tagTree.pushNode ( "Dumping ASF (WMA/WMV) file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpASF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_AVIFile ) {
+
+		tagTree.pushNode ( "Dumping AVI file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpRIFF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_WAVFile ) {
+
+		tagTree.pushNode ( "Dumping WAV file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpRIFF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_MPEG4File || format == kXMP_MOVFile ) {
+
+		bool isQT = (format == kXMP_MOVFile);
+
+		tagTree.pushNode ( "Dumping ISO (MPEG-4 or Quicktime) file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpISO( fileRef, fileLen, isQT );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_PNGFile ) {
+
+		tagTree.pushNode ( "Dumping PNG file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpPNG ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_InDesignFile ) {
+
+		tagTree.pushNode ( "Dumping InDesign file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpInDesign ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_SWFFile ) {
+
+		tagTree.pushNode ( "Dumping SWF file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpSWF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_FLVFile ) {
+
+		tagTree.pushNode ( "Dumping FLV file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpFLV ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_MP3File ) {
+
+		tagTree.pushNode ( "Dumping MP3 file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpMP3 ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_UCFFile ) {
+
+		tagTree.pushNode ( "Dumping UCF (Universal Container Format) file" );
+		tagTree.addComment ( "size %d (0x%X)", fileLen, fileLen );
+		DumpUCF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_MPEGFile ) {
+
+		tagTree.comment ( "** Recognized MPEG-2 file type, but this is a pure sidecar solution. No legacy dump available at this time." );
+
+	} else if ( format == kXMP_UnknownFile ) {
+
+		tagTree.pushNode ( "Unknown format. packet scanning, size %d (0x%X)", fileLen, fileLen );
+		PacketScan ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else {
+		tagTree.comment ( "** Recognized file type, '%.4s', but no smart dumper for it.", &format );
+	}
+
+	if ( fileContent != 0) free(fileContent);
+	LFA_Close(fileRef);
+
+}	// DumpFile
diff --git a/samples/source/common/DumpFile.h b/samples/source/common/DumpFile.h
new file mode 100644
index 0000000..05857f8
--- /dev/null
+++ b/samples/source/common/DumpFile.h
@@ -0,0 +1,21 @@
+// =================================================================================================
+// Copyright 2002-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+#ifndef XMPQE_DUMPFILE_H
+#define XMPQE_DUMPFILE_H
+
+#include "TagTree.h"
+
+class DumpFile {
+public:
+	static void Scan(std::string filename, TagTree &tagTree);
+};
+
+#endif
+
diff --git a/samples/source/common/Log.cpp b/samples/source/common/Log.cpp
new file mode 100644
index 0000000..fe132ba
--- /dev/null
+++ b/samples/source/common/Log.cpp
@@ -0,0 +1,209 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+/*
+*
+* a little set of functions for logging info, warnings, errors either to
+* stdout or a file (this is no class on purpose, to avoid having to pass
+* a particular instance on and on...)
+*
+* you can call the (static) log funcitons right away (resulting in stdout)
+* or create one (1!, singleton) instance first telling the outfile
+*  recommendation: do that as a scoped variable not using new, since ~destruction == proper file closure...
+* (following exception-safe RAII-philosophy http://en.wikipedia.org/wiki/Resource_Acquisition_Is_Initialization )
+*
+*/
+
+#ifdef WIN32
+	#pragma warning ( disable : 4996 )	// fopen was declared deprecated...
+#endif
+
+#include <stdio.h>
+#include <stdarg.h>
+#include "Log.h"
+
+using namespace std;
+
+//static variables ////////////////////////////////////////////////////////////////////
+FILE* Log::logfile=NULL;
+bool Log::noErrorsOrWarnings=true;
+bool Log::mute=false;
+bool Log::muteWarnings=false;
+//////////////////////////////////////////////////////////////////////////////////////
+
+/* standard log, use filename=NULL or filename="" or do not construct at all
+ * for logging to stdout only
+ * (otherwise stuff gets logged to stdout *and* to the logfile specified)
+ */ 
+Log::Log(const char* filename)
+{
+	if (Log::logfile) { //enfore singleton
+		printf("tried to create two logs (forbidden, singleton)");
+		throw LOG_Exception("tried to create two logs (forbidden, singleton)");
+	}
+	if (!filename)
+		logfile=NULL; //OLD: logfile=stdout;
+	else if (!strcmp(filename,""))
+		logfile=NULL; //empty string
+	else {
+		logfile=fopen(filename,"wt");
+		if (!logfile) {
+			printf("could not open output file %s for writing",filename); //do in addition to make sure it's output
+			throw LOG_Exception("could not open output file for writing");
+		}
+	}
+}
+
+Log::~Log()
+{
+	if(logfile) {
+		//info("logfile properly closed.");
+		fclose(logfile);
+		logfile=NULL; //BUGSOURCE: null out such that any possible following traces do not go to invalid file...
+	}
+}
+
+/* 
+* outputs to file and standardout
+* (Note: it would be wunderbar to group the essential output into one function,
+*  regretably that type for  "..."-paramter forwarding doesn't go down well with logging MACROS (__DATE etc...)
+*  thus this may be the best solution
+*/
+
+void Log::trace(const char* format, ...) {
+	if (Log::mute) return;
+	va_list args; va_start(args, format);
+	//stdout
+	vprintf( format, args);
+	printf( "\n");
+	//file
+	if(logfile) { 
+		vfprintf( logfile, format, args);
+		fprintf( logfile, "\n");
+	}
+	va_end(args);
+}
+
+void Log::info(const char* format, ...) {
+	// experience from TagTree, not encountered in Log.
+	//note: format and ... are somehow "used up", i.e. dumping them 
+	//      via vsprintf _and_ via printf brought up errors on Mac (only)
+	//      i.e. %d %X stuff looking odd (roughly like signed vs unsigned...)
+	//      buffer reuse as in (2) is fine, just dont use format/... twice.
+
+	if (Log::mute) return;
+	va_list args; va_start(args, format);
+	//stdout
+	vprintf( format, args);
+	printf( "\n");
+	//file
+	if(logfile) { 
+		vfprintf( logfile, format, args);
+		fprintf( logfile, "\n");
+	}
+	va_end(args);
+}
+
+void Log::important(const char* format, ...) {
+	va_list args; va_start(args, format);
+	//stdout
+	vprintf( format, args);
+	printf( "\n");
+	//file
+	if(logfile) { 
+		vfprintf( logfile, format, args);
+		fprintf( logfile, "\n");
+	}
+	va_end(args);
+}
+
+
+void Log::infoNoLF(const char* format, ...) {
+	if (Log::mute) return;
+	va_list args; va_start(args, format);
+	//stdout
+	vprintf( format, args);
+	//file
+	if(logfile) { 
+		vfprintf( logfile, format, args);
+	}
+	va_end(args);
+}
+
+void Log::warn(const char* format, ...){
+	if (Log::muteWarnings) return;  //bogus warnings or neither output nor do they 'count'
+
+	noErrorsOrWarnings=false; //too bad...
+	va_list args; va_start(args, format);
+	//stdout
+	printf( "warning:" );
+	vprintf( format, args);
+	printf( "\n");
+	//file
+	if(logfile) { 
+		fprintf( logfile, "warning:");
+		vfprintf( logfile, format, args);
+		fprintf( logfile, "\n");
+	}
+	va_end(args);
+}
+
+void Log::error(const char* format, ...){
+	noErrorsOrWarnings=false; //too bad...
+	va_list args; va_start(args, format);
+		//since many errors in test are caused by intend in testing
+		//(so you don't want to see them), do not output directly here,
+		//but leave that to a particular dump-Function
+		//(which should be part of any catch(LOG_Exception))
+		char buffer [XMPQE_MAX_ERROR_LENGTH];  //let's hope that fits (see .h file)
+		vsnprintf( buffer, XMPQE_MAX_ERROR_LENGTH, format, args);
+		//if not existing on sme unix consider going back to (minimally less secure vsprintf (w/o the n))
+	va_end(args);
+	throw LOG_Exception(buffer);
+	//may throw exception ONLY, no exit()-call, for cppunit's sake
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+//convenience overloads 
+
+void Log::info(std::string s1)
+{
+	if (Log::mute) return;
+	info(s1.c_str());
+}
+
+void Log::important(std::string s1)
+{
+	info(s1.c_str());
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+// mute vs. verbose
+
+void Log::setMute()
+{
+	Log::mute = true;
+}
+
+void Log::setVerbose()
+{
+	Log::mute = false;
+}
+
+void Log::setMuteWarnings()
+{
+	Log::muteWarnings = true;
+}
+
+void Log::setVerboseWarnings()
+{
+	Log::muteWarnings = false;
+}
+
diff --git a/samples/source/common/Log.h b/samples/source/common/Log.h
new file mode 100644
index 0000000..3bd370c
--- /dev/null
+++ b/samples/source/common/Log.h
@@ -0,0 +1,85 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+#ifndef __Log_h__
+#define __Log_h__ 1
+
+#include "XMP_Environment.h"
+
+#include <stdexcept> // (xcode needs stdexcept to accept class declaration below )
+#include <string>
+
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// Consider using _snprintf_s instead.
+	#define snprintf _snprintf
+	//#define assertMsg(msg,c)																				\
+	//if ( ! (c) ) {																							\
+	//	Log::error ( "- assert that failed: %s\n- message: %s\n- " __FILE__ ":%u", #c, std::string( msg ).c_str(), __LINE__ );		\
+	//	/* Log::error throws the exception which either fails the testcase resp. terminates dumpfile */	\
+	//	/* important to do it this way such that both testrunner and standalone use is possible */			\
+	//}
+#endif 
+
+//8K hopefully does for any type of error message
+#define XMPQE_MAX_ERROR_LENGTH 8*1048
+
+class LOG_Exception : public std::runtime_error {
+public:
+	LOG_Exception(const char* errorMsg) : std::runtime_error(errorMsg) { }
+};
+
+class Log {
+	public:
+		Log(const char* filename);
+		~Log(void);
+
+		// trace is identical to info, except that it can be turned of (soon)
+		// ==> use trace for any non-crucial information 
+		// i.e. bits and pieces in a test
+		// do not use for parts of known-good-output, essential summaries, etc...
+		static void trace(const char* format, ...);
+
+		// be aware of bug1741056, feeding 64bit numbers might not output correctly
+		static void info(const char* format, ...);
+		static void infoNoLF(const char* format, ...);
+		static void warn(const char* format, ...);
+		static void error(const char* format, ...);
+		static bool noErrorsOrWarnings; //set to true, if any warnings occured
+
+		//identical to info, but immune to "mute"
+		// be aware of bug1741056, feeding 64bit numbers might not output correctly
+		static void important(const char* format, ...);
+
+		//convenience overloads:
+		static void info(std::string s1);
+		static void important(std::string s1);
+
+		// mute vs. verbose
+		static void setMute();
+		static void setVerbose();
+
+		static void setMuteWarnings();
+		static void setVerboseWarnings();
+
+		static bool mute;
+		// NB: public on intend, such that i.e. copy commands can decide to
+		// send their output to nirvana accordingly on mute==true;
+		// (getter/setter on a static boolean var is fairly pointless)
+			
+	private:
+		static bool singletonInstanciated;
+		static FILE* logfile;
+		
+		//should only be temporarily used, i.e. on selftests that
+		//inevitable yield (during selftet: bogus) warnings
+		static bool muteWarnings;
+};
+
+#endif
diff --git a/samples/source/common/OutputUtils.cpp b/samples/source/common/OutputUtils.cpp
new file mode 100644
index 0000000..0c59339
--- /dev/null
+++ b/samples/source/common/OutputUtils.cpp
@@ -0,0 +1,227 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+#include <string>
+#include <stdarg.h>
+
+#include "OutputUtils.h"
+#include "Log.h"
+
+
+using namespace std;
+
+namespace Utils {
+	/* hand over the fileFormat and get a fileFormatName (2-3 Letters ie. PDF) 
+	* and a Description (i.e. "Portable Document Format") back.
+	* see also public/include/XMP_Const.h
+	*/
+	void fileFormatNameToString ( XMP_FileFormat fileFormat, std::string & fileFormatName, std::string & fileFormatDesc ) 
+	{
+		fileFormatName.erase();
+		fileFormatDesc.erase();
+		switch(fileFormat) {
+		case kXMP_PDFFile:
+			fileFormatName = "PDF ";fileFormatDesc = "Portable Document Format";break;
+		case kXMP_PostScriptFile:
+			fileFormatName = "PS  ";fileFormatDesc = "Post Script";break;
+		case kXMP_EPSFile:
+			fileFormatName = "EPS ";fileFormatDesc = "Encapsulated Post Script";break;
+		case kXMP_JPEGFile:
+			fileFormatName = "JPEG";fileFormatDesc = "Joint Photographic Experts Group";break;
+		case kXMP_JPEG2KFile:
+			fileFormatName = "JPX ";fileFormatDesc = "JPEG 2000";break;
+		case kXMP_TIFFFile:
+			fileFormatName = "TIFF";fileFormatDesc = "Tagged Image File Format";break;
+		case kXMP_GIFFile:
+			fileFormatName = "GIF ";fileFormatDesc = "Graphics Interchange Format";break;
+		case kXMP_PNGFile:
+			fileFormatName = "PNG ";fileFormatDesc = "Portable Network Graphic";break;
+		case kXMP_MOVFile:
+			fileFormatName = "MOV ";fileFormatDesc = "Quicktime";break;
+		case kXMP_AVIFile:
+			fileFormatName = "AVI ";fileFormatDesc = "Quicktime";break;
+		case kXMP_CINFile:
+			fileFormatName = "CIN ";fileFormatDesc = "Cineon";break;
+		case kXMP_WAVFile:
+			fileFormatName = "WAV ";fileFormatDesc = "WAVE Form Audio Format";break;
+		case kXMP_MP3File:
+			fileFormatName = "MP3 ";fileFormatDesc = "MPEG-1 Audio Layer 3";break;
+		case kXMP_SESFile:
+			fileFormatName = "SES ";fileFormatDesc = "Audition session";break;
+		case kXMP_CELFile:
+			fileFormatName = "CEL ";fileFormatDesc = "Audition loop";break;
+		case kXMP_MPEGFile:
+			fileFormatName = "MPEG";fileFormatDesc = "Motion Pictures Experts Group";break;
+		case kXMP_MPEG2File:
+			fileFormatName = "MP2 ";fileFormatDesc = "MPEG-2";break;
+		case kXMP_WMAVFile:
+			fileFormatName = "WMAV";fileFormatDesc = "Windows Media Audio and Video";break;
+		case kXMP_HTMLFile:
+			fileFormatName = "HTML";fileFormatDesc = "HyperText Markup Language";break;
+		case kXMP_XMLFile:
+			fileFormatName = "XML ";fileFormatDesc = "Extensible Markup Language";break;
+		case kXMP_TextFile:
+			fileFormatName = "TXT ";fileFormatDesc = "text";break;
+		case kXMP_PhotoshopFile:
+			fileFormatName = "PSD ";fileFormatDesc = "Photoshop Document";break;
+		case kXMP_IllustratorFile:
+			fileFormatName = "AI  ";fileFormatDesc = "Adobe Illustrator";break;
+		case kXMP_InDesignFile:
+			fileFormatName = "INDD";fileFormatDesc = "Adobe InDesign";break;
+		case kXMP_AEProjectFile:
+			fileFormatName = "AEP ";fileFormatDesc = "AfterEffects Project";break;
+		case kXMP_AEFilterPresetFile:
+			fileFormatName = "FFX ";fileFormatDesc = "AfterEffects Filter Preset";break;
+		case kXMP_EncoreProjectFile:
+			fileFormatName = "NCOR";fileFormatDesc = "Encore Project";break;
+		case kXMP_PremiereProjectFile:
+			fileFormatName = "PPRJ";fileFormatDesc = "Premier Project";break;
+		case kXMP_SWFFile:
+			fileFormatName = "SWF ";fileFormatDesc = "Shockwave Flash";break;
+		case kXMP_PremiereTitleFile:
+			fileFormatName = "PRTL";fileFormatDesc = "Premier Title";break;
+		default:
+			fileFormatName = "    ";fileFormatDesc = "Unkown file format";break;
+		}
+	} //fileFormatNameToString
+
+	/**
+	* GetFormatInfo-Flags  (aka Handler-Flags)
+	* find this in XMP_Const.h under "Options for GetFormatInfo"
+	*/
+	std::string XMPFiles_FormatInfoToString ( const XMP_OptionBits options) {
+		std::string outString;
+
+		if( options & kXMPFiles_CanInjectXMP )
+			outString.append(" CanInjectXMP");
+		if( options & kXMPFiles_CanExpand )
+			outString.append(" CanExpand");
+		if( options & kXMPFiles_CanRewrite )
+			outString.append(" CanRewrite");
+		if( options & kXMPFiles_PrefersInPlace )
+			outString.append(" PrefersInPlace");
+		if( options & kXMPFiles_CanReconcile )
+			outString.append(" CanReconcile");
+		if( options & kXMPFiles_AllowsOnlyXMP )
+			outString.append(" AllowsOnlyXMP");
+		if( options & kXMPFiles_ReturnsRawPacket )
+			outString.append(" ReturnsRawPacket");
+		if( options & kXMPFiles_ReturnsTNail )
+			outString.append(" ReturnsTNail");
+		if( options & kXMPFiles_HandlerOwnsFile )
+			outString.append(" HandlerOwnsFile");
+		if( options & kXMPFiles_AllowsSafeUpdate )
+			outString.append(" AllowsSafeUpdate");
+
+		if (outString.empty()) outString=" (none)";
+		return outString;
+	}
+
+	/**
+	* openOptions to String, find this in 
+	* XMP_Const.h under "Options for OpenFile"
+	*/
+	std::string XMPFiles_OpenOptionsToString ( const XMP_OptionBits options) {
+		std::string outString;
+		if( options & kXMPFiles_OpenForRead)
+			outString.append(" OpenForRead");
+		if( options & kXMPFiles_OpenForUpdate)
+			outString.append(" OpenForUpdate");
+		if( options & kXMPFiles_OpenOnlyXMP)
+			outString.append(" OpenOnlyXMP");
+		if( options & kXMPFiles_OpenCacheTNail)
+			outString.append(" OpenCacheTNail");
+		if( options & kXMPFiles_OpenStrictly)
+			outString.append(" OpenStrictly");
+		if( options & kXMPFiles_OpenUseSmartHandler)
+			outString.append(" OpenUseSmartHandler");
+		if( options & kXMPFiles_OpenUsePacketScanning)
+			outString.append(" OpenUsePacketScanning");
+		if( options & kXMPFiles_OpenLimitedScanning)
+			outString.append(" OpenLimitedScanning");
+
+		if (outString.empty()) outString=" (none)";
+		return outString;
+	}
+
+	
+
+	std::string fromArgs(const char* format, ...)
+	{
+		//note: format and ... are somehow "used up", i.e. dumping them 
+		//      via vsprintf _and_ via printf brought up errors on Mac (only)
+		//      i.e. %d %X stuff looking odd (roughly like signed vs unsigned...)
+		//      buffer reuse is fine, just dont use format/... twice.
+
+		char buffer[4096];  //should be big enough but no guarantees..
+		va_list args;
+		va_start(args, format);
+			vsprintf(buffer, format, args);
+		va_end(args);
+
+		return std::string(buffer);
+	}
+
+	
+
+	//just the callback-Function
+	XMP_Status DumpToString( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen )
+	{
+		XMP_Status status	= 0; 
+		std::string* dumpString = static_cast < std::string* > ( refCon );
+		dumpString->append (outStr, outLen); // less effective: ( std::string(outStr).substr(0,outLen) );
+		return status;
+	}
+
+	//full output to Log
+	void dumpXMP(SXMPMeta* xmpMeta){
+		std::string dump;
+		xmpMeta->Sort();
+		xmpMeta->DumpObject(DumpToString, &dump);
+		Log::info("%s",dump.c_str());
+	}
+
+	//same but with Comment
+	void dumpXMP(std::string comment, SXMPMeta* xmpMeta){
+		Log::info("%s",comment.c_str());
+		std::string dump;
+		xmpMeta->Sort();
+		xmpMeta->DumpObject(DumpToString, &dump);
+		Log::info("%s",dump.c_str());
+	}
+
+	// dump Aliases ****************************
+	//full output to Log
+	void dumpAliases()
+	{
+		std::string dump;
+		SXMPMeta::DumpAliases(DumpToString,&dump);
+		Log::info("List of aliases:");
+		Log::info("%s",dump.c_str());
+	}
+
+	void DumpXMP_DateTime( const XMP_DateTime & date ) {
+		static std::string tempStr;
+		tempStr.clear();
+		SXMPUtils::ConvertFromDate( date, &tempStr );
+		Log::info("%s\nYear: '%d' Month: '%d' Day: '%d' Hour: '%d' Min: '%d' Sec: '%d' Nanos: '%d' TZSign: '%d' TZHour: '%d' TZMinute: '%d'\n", tempStr.c_str(), date.year, date.month, date.day, date.hour, date.minute, date.second, date.nanoSecond, date.tzSign, date.tzHour, date.tzMinute );
+	}
+
+
+	
+
+	void removeNLines(std::string* s, int n){
+		for(int i=0;i<n;i++)
+			s->erase(0,s->find_first_of("\n")+1);
+	}
+
+	
+
+} /*namespace Utils*/
+
diff --git a/samples/source/common/OutputUtils.h b/samples/source/common/OutputUtils.h
new file mode 100644
index 0000000..6597ed8
--- /dev/null
+++ b/samples/source/common/OutputUtils.h
@@ -0,0 +1,50 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+#ifndef __XMPQE_QEOUTPUTUTILS_h__
+#define __XMPQE_QEOUTPUTUTILS_h__ 1
+
+//XMP related
+#define  TXMP_STRING_TYPE std::string
+
+#include "XMP.hpp"
+
+namespace Utils{	
+
+	
+	void fileFormatNameToString( XMP_FileFormat fileFormat, std::string &fileFormatName, std::string &fileFormatDesc );
+
+	std::string XMPFiles_FormatInfoToString ( const XMP_OptionBits options);
+	std::string XMPFiles_OpenOptionsToString ( const XMP_OptionBits options);
+
+	std::string fromArgs(const char* format, ...);
+
+	//just the DumpToString Callback routine
+	//   - (taken over from dfranzen resp. DevTestProto)
+	//   - /*outLen*/ ==> avoid unused warning
+	XMP_Status DumpToString ( void * refCon, XMP_StringPtr outStr, XMP_StringLen /*outLen*/ );
+
+	// dumps xmp (using Log::info())
+	// based on dfranzen's conglomerate of dump-functions in XMPTestCase.cpp
+	// no return value, will Log::error() on problems
+	void dumpXMP(SXMPMeta* xmpMeta);
+	void dumpXMP(std::string comment, SXMPMeta* xmpMeta);
+	void dumpAliases();
+
+	//remove n first lines from a string
+	// handy i.e. for first line of xmp-rdf packets prior to KGO,
+	// since firt line may contain -date- or actual date,
+	// (debug) or 7 spaces, etc...
+	void removeNLines(std::string* s, int n=1);
+
+	void DumpXMP_DateTime( const XMP_DateTime & date );
+
+} 
+
+#endif
diff --git a/samples/source/common/QEScanner.cpp b/samples/source/common/QEScanner.cpp
new file mode 100644
index 0000000..5553495
--- /dev/null
+++ b/samples/source/common/QEScanner.cpp
@@ -0,0 +1,1469 @@
+// =================================================================================================
+// Copyright 2002-2006 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// Adobe patent application tracking #P435, entitled 'Unique markers to simplify embedding data of
+// one format in a file with a different format', inventors: Sean Parent, Greg Gilley.
+// =================================================================================================
+
+#if WIN_ENV
+	#pragma warning ( disable : 4786 )	// The VC++ debugger can't handle long symbol names.
+	#pragma warning ( disable : 4127 )	// conditional expression is constant
+#endif
+
+
+#include "QEScanner.hpp"
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
+#include <cstdlib>
+
+
+#ifndef UseStringPushBack	// VC++ 6.x does not provide push_back for strings!
+	#define UseStringPushBack	0
+#endif
+
+
+using namespace std;
+
+
+// *** Consider Boyer-Moore style search for "<?xpacket begin=".  It isn't an obvious win, the
+// *** additional code might be slower than scanning every character.  Especially if we will
+// *** read every cache line anyway.
+
+
+// =================================================================================================
+// =================================================================================================
+// class PacketMachine
+// ===================
+//
+// This is the packet recognizer state machine.  The top of the machine is FindNextPacket, this
+// calls the specific state components and handles transitions.  The states are described by an
+// array of RecognizerInfo records, indexed by the RecognizerKind enumeration.  Each RecognizerInfo
+// record has a function that does that state's work, the success and failure transition states,
+// and a string literal that is passed to the state function.  The literal lets a common MatchChar
+// or MatchString function be used in several places.
+//
+// The state functions are responsible for consuming input to recognize their particular state.
+// This includes intervening nulls for 16 and 32 bit character forms.  For the simplicity, things
+// are treated as essentially little endian and the nulls are not actually checked.  The opening
+// '<' is found with a byte-by-byte search, then the number of bytes per character is determined
+// by counting the following nulls.  From then on, consuming a character means incrementing the
+// buffer pointer by the number of bytes per character.  Thus the buffer pointer only points to
+// the "real" bytes.  This also means that the pointer can go off the end of the buffer by a
+// variable amount.  The amount of overrun is saved so that the pointer can be positioned at the
+// right byte to start the next buffer.
+//
+// The state functions return a TriState value, eTriYes means the pattern was found, eTriNo means
+// the pattern was definitely not found, eTriMaybe means that the end of the buffer was reached
+// while working through the pattern.
+//
+// When eTriYes is returned, the fBufferPtr data member is left pointing to the "real" byte
+// following the last actual byte.  Which might not be addressable memory!  This also means that
+// a state function can be entered with nothing available in the buffer.  When eTriNo is returned,
+// the fBufferPtr data member is left pointing to the byte that caused the failure.  The state 
+// machine starts over from the failure byte.
+//
+// The state functions must preserve their internal micro-state before returning eTriMaybe, and
+// resume processing when called with the next buffer.  The fPosition data member is used to denote
+// how many actual characters have been consumed.  The fNullCount data member is used to denote how
+// many nulls are left before the next actual character.
+
+
+// =================================================================================================
+// PacketMachine
+// =============
+
+QEScanner::PacketMachine::PacketMachine ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength ) :
+
+	// Public members
+	fPacketStart ( 0 ),
+	fPacketLength ( 0 ),
+	fBytesAttr ( -1 ),
+	fCharForm ( eChar8Bit ),
+	fAccess ( ' ' ),
+	fBogusPacket ( false ),
+	
+	// Private members
+	fBufferOffset ( bufferOffset ),
+	fBufferOrigin ( (const char *) bufferOrigin ),
+	fBufferPtr ( fBufferOrigin ),
+	fBufferLimit ( fBufferOrigin + bufferLength ),
+	fRecognizer ( eLeadInRecognizer ),
+	fPosition ( 0 ),
+	fBytesPerChar ( 1 ),
+	fBufferOverrun ( 0 ),
+	fQuoteChar ( ' ' )
+
+{
+	/*
+	REVIEW NOTES : Should the buffer stuff be in a class?
+	*/
+	
+	assert ( bufferOrigin != NULL );
+	assert ( bufferLength != 0 );
+	
+}	// PacketMachine
+
+
+// =================================================================================================
+// ~PacketMachine
+// ==============
+
+QEScanner::PacketMachine::~PacketMachine ()
+{
+
+	// An empty placeholder.
+
+}	// ~PacketMachine
+
+
+// =================================================================================================
+// AssociateBuffer
+// ===============
+
+void
+QEScanner::PacketMachine::AssociateBuffer ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength )
+{
+
+	fBufferOffset = bufferOffset;
+	fBufferOrigin = (const char *) bufferOrigin;
+	fBufferPtr = fBufferOrigin + fBufferOverrun;
+	fBufferLimit = fBufferOrigin + bufferLength;
+		
+}	// AssociateBuffer
+
+
+// =================================================================================================
+// ResetMachine
+// ============
+
+void
+QEScanner::PacketMachine::ResetMachine ()
+{
+
+	fRecognizer = eLeadInRecognizer;
+	fPosition = 0;
+	fBufferOverrun = 0;
+	fCharForm = eChar8Bit;
+	fBytesPerChar = 1;
+	fAccess = ' ';
+	fBytesAttr = -1;
+	fBogusPacket = false;
+	
+	fAttrName.erase ( fAttrName.begin(), fAttrName.end() );
+	fAttrValue.erase ( fAttrValue.begin(), fAttrValue.end() );
+	fEncodingAttr.erase ( fEncodingAttr.begin(), fEncodingAttr.end() );
+		
+}	// ResetMachine
+
+
+// =================================================================================================
+// FindLessThan
+// ============
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::FindLessThan ( PacketMachine * ths, const char * which )
+{
+	
+	if ( *which == 'H' ) {
+	
+		// --------------------------------------------------------------------------------
+		// We're looking for the '<' of the header.  If we fail there is no packet in this
+		// part of the input, so return eTriNo.
+	
+		ths->fCharForm = eChar8Bit;	// We might have just failed from a bogus 16 or 32 bit case.
+		ths->fBytesPerChar = 1;
+
+		while ( ths->fBufferPtr < ths->fBufferLimit ) {	// Don't skip nulls for the header's '<'!
+			if ( *ths->fBufferPtr == '<' ) break;
+			ths->fBufferPtr++;
+		}
+		
+		if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriNo;
+		ths->fBufferPtr++;
+		return eTriYes;
+
+	} else {
+	
+		// --------------------------------------------------------------------------------
+		// We're looking for the '<' of the trailer.  We're already inside the packet body,
+		// looking for the trailer.  So here if we fail we must return eTriMaybe so that we
+		// keep looking for the trailer in the next buffer.
+
+		const int bytesPerChar = ths->fBytesPerChar;
+
+		while ( ths->fBufferPtr < ths->fBufferLimit ) {
+			if ( *ths->fBufferPtr == '<' ) break;
+			ths->fBufferPtr += bytesPerChar;
+		}
+		
+		if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+		ths->fBufferPtr += bytesPerChar;
+		return eTriYes;
+
+	}
+
+}	// FindLessThan
+
+
+// =================================================================================================
+// MatchString
+// ===========
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::MatchString ( PacketMachine * ths, const char * literal )
+{
+	const int		bytesPerChar	= ths->fBytesPerChar;
+	const char *	litPtr			= literal + ths->fPosition;
+	const size_t	charsToGo		= strlen ( literal ) - ths->fPosition;
+	size_t			charsDone		= 0;
+	
+	while ( (charsDone < charsToGo) && (ths->fBufferPtr < ths->fBufferLimit) ) {
+		if ( *litPtr != *ths->fBufferPtr ) return eTriNo;
+		charsDone++;
+		litPtr++;
+		ths->fBufferPtr += bytesPerChar;
+	}
+	
+	if ( charsDone == charsToGo ) return eTriYes;
+	ths->fPosition += charsDone;
+	return eTriMaybe;
+
+}	// MatchString
+
+
+// =================================================================================================
+// MatchChar
+// =========
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::MatchChar ( PacketMachine * ths, const char * literal )
+{
+	const int	bytesPerChar	= ths->fBytesPerChar;
+
+	if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+	
+	const char currChar = *ths->fBufferPtr;
+	if ( currChar != *literal ) return eTriNo;
+	ths->fBufferPtr += bytesPerChar;	
+	return eTriYes;
+
+}	// MatchChar
+
+
+// =================================================================================================
+// MatchOpenQuote
+// ==============
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::MatchOpenQuote ( PacketMachine * ths, const char * /* unused */ )
+{
+	const int	bytesPerChar	= ths->fBytesPerChar;
+
+	if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+	
+	const char currChar = *ths->fBufferPtr;
+	if ( (currChar != '\'') && (currChar != '"') ) return eTriNo;
+	ths->fQuoteChar = currChar;
+	ths->fBufferPtr += bytesPerChar;	
+	return eTriYes;
+
+}	// MatchOpenQuote
+
+
+// =================================================================================================
+// MatchCloseQuote
+// ===============
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::MatchCloseQuote ( PacketMachine * ths, const char * /* unused */ )
+{
+
+	return MatchChar ( ths, &ths->fQuoteChar );
+
+}	// MatchCloseQuote
+
+
+// =================================================================================================
+// CaptureAttrName
+// ===============
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::CaptureAttrName ( PacketMachine * ths, const char * /* unused */ )
+{
+	const int	bytesPerChar	= ths->fBytesPerChar;
+	char		currChar;
+
+	if ( ths->fPosition == 0 ) {	// Get the first character in the name.
+		
+		if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+
+		currChar = *ths->fBufferPtr;
+		if ( ths->fAttrName.size() == 0 ) {
+			if ( ! ( ( ('a' <= currChar) && (currChar <= 'z') ) ||
+					 ( ('A' <= currChar) && (currChar <= 'Z') ) ||
+					 (currChar == '_') || (currChar == ':') ) ) {
+				return eTriNo;
+			}
+		}
+
+		ths->fAttrName.erase ( ths->fAttrName.begin(), ths->fAttrName.end() );
+		#if UseStringPushBack
+			ths->fAttrName.push_back ( currChar );
+		#else
+			ths->fAttrName.insert ( ths->fAttrName.end(), currChar );
+		#endif
+		ths->fBufferPtr += bytesPerChar;
+	
+	}
+	
+	while ( ths->fBufferPtr < ths->fBufferLimit ) {	// Get the remainder of the name.
+
+		currChar = *ths->fBufferPtr;
+		if ( ! ( ( ('a' <= currChar) && (currChar <= 'z') ) ||
+				 ( ('A' <= currChar) && (currChar <= 'Z') ) ||
+				 ( ('0' <= currChar) && (currChar <= '9') ) ||
+				 (currChar == '-') || (currChar == '.') || (currChar == '_') || (currChar == ':') ) ) {
+			break;
+		}
+
+		#if UseStringPushBack
+			ths->fAttrName.push_back ( currChar );
+		#else
+			ths->fAttrName.insert ( ths->fAttrName.end(), currChar );
+		#endif
+		ths->fBufferPtr += bytesPerChar;
+
+	}
+	
+	if ( ths->fBufferPtr < ths->fBufferLimit ) return eTriYes;
+	ths->fPosition = ths->fAttrName.size();	// The name might span into the next buffer.
+	return eTriMaybe;
+
+}	// CaptureAttrName
+
+
+// =================================================================================================
+// CaptureAttrValue
+// ================
+//
+// Recognize the equal sign and the quoted string value, capture the value along the way.
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::CaptureAttrValue ( PacketMachine * ths, const char * /* unused */ )
+{
+	const int	bytesPerChar	= ths->fBytesPerChar;
+	char		currChar		= 0;
+	TriState	result			= eTriMaybe;
+	
+	if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+
+	switch ( ths->fPosition ) {
+	
+		case 0 :	// The name should haved ended at the '=', nulls already skipped.
+
+			if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+			if ( *ths->fBufferPtr != '=' ) return eTriNo;
+			ths->fBufferPtr += bytesPerChar;	
+			ths->fPosition = 1;
+			// fall through OK because MatchOpenQuote will check the buffer limit and nulls ...
+		
+		case 1 :	// Look for the open quote.
+
+			result = MatchOpenQuote ( ths, NULL );
+			if ( result != eTriYes ) return result;
+			ths->fPosition = 2;
+			// fall through OK because the buffer limit and nulls are checked below ...
+		
+		default :	// Look for the close quote, capturing the value along the way.
+			
+			assert ( ths->fPosition == 2 );
+			
+			const char quoteChar = ths->fQuoteChar;
+
+			while ( ths->fBufferPtr < ths->fBufferLimit ) {
+				currChar = *ths->fBufferPtr;
+				if ( currChar == quoteChar ) break;
+				#if UseStringPushBack
+					ths->fAttrValue.push_back ( currChar );
+				#else
+					ths->fAttrValue.insert ( ths->fAttrValue.end(), currChar );
+				#endif
+				ths->fBufferPtr += bytesPerChar;
+			}
+			
+			if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+			assert ( currChar == quoteChar );
+			ths->fBufferPtr += bytesPerChar;	// Advance past the closing quote.
+			return eTriYes;
+	
+	}
+
+}	// CaptureAttrValue
+
+
+// =================================================================================================
+// RecordStart
+// ===========
+//
+// Note that this routine looks at bytes, not logical characters.  It has to figure out how many
+// bytes per character there are so that the other recognizers can skip intervening nulls.
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::RecordStart ( PacketMachine * ths, const char * /* unused */ )
+{
+
+	while ( true ) {
+
+		if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+		
+		const char currByte = *ths->fBufferPtr;
+	
+		switch ( ths->fPosition ) {
+		
+			case 0 :	// Record the length.
+				assert ( ths->fCharForm == eChar8Bit );
+				assert ( ths->fBytesPerChar == 1 );
+				ths->fPacketStart = ths->fBufferOffset + ((ths->fBufferPtr - 1) - ths->fBufferOrigin);
+				ths->fPacketLength = 0;
+				ths->fPosition = 1;
+				// ! OK to fall through here, we didn't consume a byte in this step.
+
+			case 1 :	// Look for the first null byte.
+				if ( currByte != 0 ) return eTriYes;	// No nulls found.
+				ths->fCharForm = eChar16BitBig;			// Assume 16 bit big endian for now.
+				ths->fBytesPerChar = 2;
+				ths->fBufferPtr++;
+				ths->fPosition = 2;
+				break;	// ! Don't fall through, have to check for the end of the buffer between each byte.
+
+			case 2 :	// One null was found, look for a second.
+				if ( currByte != 0 ) return eTriYes;	// Just one null found.
+				ths->fBufferPtr++;
+				ths->fPosition = 3;
+				break;
+
+			case 3 :	// Two nulls were found, look for a third.
+				if ( currByte != 0 ) return eTriNo;	// Just two nulls is not valid.
+				ths->fCharForm = eChar32BitBig;		// Assume 32 bit big endian for now.
+				ths->fBytesPerChar = 4;
+				ths->fBufferPtr++;
+				return eTriYes;
+				break;
+
+		}
+	
+	}
+	
+}	// RecordStart
+
+
+// =================================================================================================
+// RecognizeBOM
+// ============
+//
+// Recognizing the byte order marker is a surprisingly messy thing to do.  It can't be done by the
+// normal string matcher, there are no intervening nulls.  There are 4 transitions after the opening
+// quote, the closing quote or one of the three encodings.  For the actual BOM there are then 1 or 2
+// following bytes that depend on which of the encodings we're in.  Not to mention that the buffer
+// might end at any point.
+//
+// The intervening null count done earlier determined 8, 16, or 32 bits per character, but not the
+// big or little endian nature for the 16/32 bit cases.  The BOM must be present for the 16 and 32
+// bit cases in order to determine the endian mode.  There are six possible byte sequences for the
+// quoted BOM string, ignoring the differences for quoting with ''' versus '"'.
+//
+// Keep in mind that for the 16 and 32 bit cases there will be nulls for the quote.  In the table
+// below the symbol <quote> means just the one byte containing the ''' or '"'.  The nulls for the
+// quote character are explicitly shown.
+//
+//	<quote> <quote>					- 1: No BOM, this must be an 8 bit case.
+//	<quote> \xEF \xBB \xBF <quote>	- 1.12-13: The 8 bit form.
+//
+//	<quote> \xFE \xFF \x00 <quote>	- 1.22-23: The 16 bit, big endian form
+//	<quote> \x00 \xFF \xFE <quote>	- 1.32-33: The 16 bit, little endian form.
+//
+//	<quote> \x00 \x00 \xFE \xFF \x00 \x00 \x00 <quote>	- 1.32.43-45.56-57: The 32 bit, big endian form.
+//	<quote> \x00 \x00 \x00 \xFF \xFE \x00 \x00 <quote>	- 1.32.43.54-57: The 32 bit, little endian form.
+
+enum {
+	eBOM_8_1		= 0xEF,
+	eBOM_8_2		= 0xBB,
+	eBOM_8_3		= 0xBF,
+	eBOM_Big_1		= 0xFE,
+	eBOM_Big_2		= 0xFF,
+	eBOM_Little_1	= eBOM_Big_2,
+	eBOM_Little_2	= eBOM_Big_1
+};
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::RecognizeBOM ( PacketMachine * ths, const char * /* unused */ )
+{
+	const int	bytesPerChar	= ths->fBytesPerChar;
+
+	while ( true ) {	// Handle one character at a time, the micro-state (fPosition) changes for each.
+	
+		if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+
+		const unsigned char currChar = *ths->fBufferPtr;	// ! The BOM bytes look like integers bigger than 127.
+		
+		switch ( ths->fPosition ) {
+		
+			case  0 :	// Look for the opening quote.
+				if ( (currChar != '\'') && (currChar != '"') ) return eTriNo;
+				ths->fQuoteChar = currChar;
+				ths->fBufferPtr++;
+				ths->fPosition = 1;
+				break;	// ! Don't fall through, have to check for the end of the buffer between each byte.
+			
+			case 1 :	// Look at the byte immediately following the opening quote.
+				if ( currChar == ths->fQuoteChar ) {	// Closing quote, no BOM character, must be 8 bit.
+					if ( ths->fCharForm != eChar8Bit ) return eTriNo;
+					ths->fBufferPtr += bytesPerChar;	// Skip the nulls after the closing quote.
+					return eTriYes;
+				} else if ( currChar == eBOM_8_1 ) {	// Start of the 8 bit form.
+					if ( ths->fCharForm != eChar8Bit ) return eTriNo;
+					ths->fBufferPtr++;
+					ths->fPosition = 12;
+				} else if ( currChar == eBOM_Big_1 ) {	// Start of the 16 bit big endian form.
+					if ( ths->fCharForm != eChar16BitBig ) return eTriNo;
+					ths->fBufferPtr++;
+					ths->fPosition = 22;
+				} else if ( currChar == 0 ) {	// Start of the 16 bit little endian or either 32 bit form.
+					if ( ths->fCharForm == eChar8Bit ) return eTriNo;
+					ths->fBufferPtr++;
+					ths->fPosition = 32;
+				} else {
+					return eTriNo;
+				}
+				break;
+			
+			case 12 :	// Look for the second byte of the 8 bit form.
+				if ( currChar != eBOM_8_2 ) return eTriNo;
+				ths->fPosition = 13;
+				ths->fBufferPtr++;
+				break;
+			
+			case 13 :	// Look for the third byte of the 8 bit form.
+				if ( currChar != eBOM_8_3 ) return eTriNo;
+				ths->fPosition = 99;
+				ths->fBufferPtr++;
+				break;
+			
+			case 22 :	// Look for the second byte of the 16 bit big endian form.
+				if ( currChar != eBOM_Big_2 ) return eTriNo;
+				ths->fPosition = 23;
+				ths->fBufferPtr++;
+				break;
+			
+			case 23 :	// Look for the null before the closing quote of the 16 bit big endian form.
+				if ( currChar != 0 ) return eTriNo;
+				ths->fBufferPtr++;
+				ths->fPosition = 99;
+				break;
+			
+			case 32 :	// Look at the second byte of the 16 bit little endian or either 32 bit form.
+				if ( currChar == eBOM_Little_1 ) {
+					ths->fPosition = 33;
+				} else if ( currChar == 0 ) {
+					ths->fPosition = 43;
+				} else {
+					return eTriNo;
+				}
+				ths->fBufferPtr++;
+				break;
+			
+			case 33 :	// Look for the third byte of the 16 bit little endian form.
+				if ( ths->fCharForm != eChar16BitBig ) return eTriNo;	// Null count before assumed big endian.
+				if ( currChar != eBOM_Little_2 ) return eTriNo;
+				ths->fCharForm = eChar16BitLittle;
+				ths->fPosition = 99;
+				ths->fBufferPtr++;
+				break;
+			
+			case 43 :	// Look at the third byte of either 32 bit form.
+				if ( ths->fCharForm != eChar32BitBig ) return eTriNo;	// Null count before assumed big endian.
+				if ( currChar == eBOM_Big_1 ) {
+					ths->fPosition = 44;
+				} else if ( currChar == 0 ) {
+					ths->fPosition = 54;
+				} else {
+					return eTriNo;
+				}
+				ths->fBufferPtr++;
+				break;
+			
+			case 44 :	// Look for the fourth byte of the 32 bit big endian form.
+				if ( currChar != eBOM_Big_2 ) return eTriNo;
+				ths->fPosition = 45;
+				ths->fBufferPtr++;
+				break;
+			
+			case 45 :	// Look for the first null before the closing quote of the 32 bit big endian form.
+				if ( currChar != 0 ) return eTriNo;
+				ths->fPosition = 56;
+				ths->fBufferPtr++;
+				break;
+			
+			case 54 :	// Look for the fourth byte of the 32 bit little endian form.
+				ths->fCharForm = eChar32BitLittle;
+				if ( currChar != eBOM_Little_1 ) return eTriNo;
+				ths->fPosition = 55;
+				ths->fBufferPtr++;
+				break;
+			
+			case 55 :	// Look for the fifth byte of the 32 bit little endian form.
+				if ( currChar != eBOM_Little_2 ) return eTriNo;
+				ths->fPosition = 56;
+				ths->fBufferPtr++;
+				break;
+			
+			case 56 :	// Look for the next to last null before the closing quote of the 32 bit forms.
+				if ( currChar != 0 ) return eTriNo;
+				ths->fPosition = 57;
+				ths->fBufferPtr++;
+				break;
+			
+			case 57 :	// Look for the last null before the closing quote of the 32 bit forms.
+				if ( currChar != 0 ) return eTriNo;
+				ths->fPosition = 99;
+				ths->fBufferPtr++;
+				break;
+			
+			default :	// Look for the closing quote.
+				assert ( ths->fPosition == 99 );
+				if ( currChar != ths->fQuoteChar ) return eTriNo;
+				ths->fBufferPtr += bytesPerChar;	// Skip the nulls after the closing quote.
+				return eTriYes;
+				break;
+
+		}
+	
+	}
+
+}	// RecognizeBOM
+
+
+// =================================================================================================
+// RecordHeadAttr
+// ==============
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::RecordHeadAttr ( PacketMachine * ths, const char * /* unused */ )
+{
+	
+	if ( ths->fAttrName == "encoding" ) {
+	
+		assert ( ths->fEncodingAttr.empty() );
+		ths->fEncodingAttr = ths->fAttrValue;
+	
+	} else if ( ths->fAttrName == "bytes" ) {
+			
+		long	value	= 0;
+		size_t	count	= ths->fAttrValue.size();
+		size_t	i;
+		
+		assert ( ths->fBytesAttr == -1 );
+		
+		if ( count > 0 ) {	// Allow bytes='' to be the same as no bytes attribute.
+
+			for ( i = 0; i < count; i++ ) {
+				const char	currChar	= ths->fAttrValue[i];
+				if ( ('0' <= currChar) && (currChar <= '9') ) {
+					value = (value * 10) + (currChar - '0');
+				} else {
+					ths->fBogusPacket = true;
+					value = -1;
+					break;
+				}
+			}
+			ths->fBytesAttr = value;
+			
+			if ( CharFormIs16Bit ( ths->fCharForm ) ) {
+				if ( (ths->fBytesAttr & 1) != 0 ) ths->fBogusPacket = true;
+			} else if ( CharFormIs32Bit ( ths->fCharForm ) ) {
+				if ( (ths->fBytesAttr & 3) != 0 ) ths->fBogusPacket = true;
+			}
+
+		}
+
+	}
+	
+	ths->fAttrName.erase ( ths->fAttrName.begin(), ths->fAttrName.end() );
+	ths->fAttrValue.erase ( ths->fAttrValue.begin(), ths->fAttrValue.end() );
+
+	return eTriYes;
+
+}	// RecordHeadAttr
+
+
+// =================================================================================================
+// CaptureAccess
+// =============
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::CaptureAccess ( PacketMachine * ths, const char * /* unused */ )
+{
+	const int	bytesPerChar	= ths->fBytesPerChar;
+
+	while ( true ) {
+
+		if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+		
+		const char currChar = *ths->fBufferPtr;
+		
+		switch ( ths->fPosition ) {
+		
+			case  0 :	// Look for the opening quote.
+				if ( (currChar != '\'') && (currChar != '"') ) return eTriNo;
+				ths->fQuoteChar = currChar;
+				ths->fBufferPtr += bytesPerChar;
+				ths->fPosition = 1;
+				break;	// ! Don't fall through, have to check for the end of the buffer between each byte.
+		
+			case  1 :	// Look for the 'r' or 'w'.
+				if ( (currChar != 'r') && (currChar != 'w') ) return eTriNo;
+				ths->fAccess = currChar;
+				ths->fBufferPtr += bytesPerChar;
+				ths->fPosition = 2;
+				break;
+			
+			default :	// Look for the closing quote.
+				assert ( ths->fPosition == 2 );
+				if ( currChar != ths->fQuoteChar ) return eTriNo;
+				ths->fBufferPtr += bytesPerChar;
+				return eTriYes;
+				break;
+
+		}
+
+	}
+
+}	// CaptureAccess
+
+
+// =================================================================================================
+// RecordTailAttr
+// ==============
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::RecordTailAttr ( PacketMachine * ths, const char * /* unused */ )
+{
+	
+	// There are no known "general" attributes for the packet trailer.
+	
+	ths->fAttrName.erase ( ths->fAttrName.begin(), ths->fAttrName.end() );
+	ths->fAttrValue.erase ( ths->fAttrValue.begin(), ths->fAttrValue.end() );
+
+	return eTriYes;
+
+
+}	// RecordTailAttr
+
+
+// =================================================================================================
+// CheckPacketEnd
+// ==============
+//
+// Check for trailing padding and record the packet length.  We have trailing padding if the bytes
+// attribute is present and has a value greater than the current length.
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::CheckPacketEnd ( PacketMachine * ths, const char * /* unused */ )
+{
+	const int	bytesPerChar	= ths->fBytesPerChar;
+
+	if ( ths->fPosition == 0 ) {	// First call, decide if there is trailing padding.
+	
+		const SInt64 currLength = (ths->fBufferOffset + (ths->fBufferPtr - ths->fBufferOrigin)) - ths->fPacketStart;
+
+		if ( (ths->fBytesAttr != -1) && (ths->fBytesAttr != currLength) ) {
+			if ( ths->fBytesAttr < currLength ) {
+				ths->fBogusPacket = true;	// The bytes attribute value is too small.
+			} else {
+				ths->fPosition = (signed long)(ths->fBytesAttr - currLength);
+				if ( (ths->fPosition % ths->fBytesPerChar) != 0 ) {
+					ths->fBogusPacket = true;	// The padding is not a multiple of the character size.
+					ths->fPosition = (ths->fPosition / ths->fBytesPerChar) * ths->fBytesPerChar;
+				}
+			}
+		}
+		
+	}
+	
+	while ( ths->fPosition > 0 ) {
+
+		if ( ths->fBufferPtr >= ths->fBufferLimit ) return eTriMaybe;
+
+		const char currChar = *ths->fBufferPtr;
+
+		if ( (currChar != ' ') && (currChar != '\t') && (currChar != '\n') && (currChar != '\r') ) {
+			ths->fBogusPacket = true;	// The padding is not whitespace.
+			break;						// Stop the packet here.
+		}
+
+		ths->fPosition -= bytesPerChar;
+		ths->fBufferPtr += bytesPerChar;
+
+	}
+	
+	ths->fPacketLength = (ths->fBufferOffset + (ths->fBufferPtr - ths->fBufferOrigin)) - ths->fPacketStart;
+	return eTriYes;
+
+}	// CheckPacketEnd
+
+
+// =================================================================================================
+// CheckFinalNulls
+// ===============
+//
+// Do some special case processing for little endian characters.  We have to make sure the presumed
+// nulls after the last character actually exist, i.e. that the stream does not end too soon.  Note
+// that the prior character scanning has moved the buffer pointer to the address following the last
+// byte of the last character.  I.e. we're already past the presumed nulls, so we can't check their
+// content.  All we can do is verify that the stream does not end too soon.
+//
+// Doing this check is simple yet subtle.  If we're still in the current buffer then the trailing
+// bytes obviously exist.  If we're exactly at the end of the buffer then the bytes also exist.
+// The only question is when we're actually past this buffer, partly into the next buffer.  This is
+// when "ths->fBufferPtr > ths->fBufferLimit" on entry.  For that case we have to wait until we've
+// actually seen enough extra bytes of input.
+//
+// Since the normal buffer processing is already adjusting for this partial character overrun, all
+// that needs to be done here is wait until "ths->fBufferPtr <= ths->fBufferLimit" on entry.  In
+// other words, if we're presently too far, ths->fBufferPtr will be adjusted by the amount of the
+// overflow the next time QEScanner::Scan is called.  This might still be too far, so just keep
+// waiting for enough data to pass by.
+//
+// Note that there is a corresponding special case for big endian characters, we must decrement the
+// starting offset by the number of leading nulls.  But we don't do that here, we leave it to the
+// outer code.  This is because the leading nulls might have been at the exact end of a previous
+// buffer, in which case we have to also decrement the length of that raw data snip.
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::CheckFinalNulls ( PacketMachine * ths, const char * /* unused */ )
+{
+
+	if ( (ths->fCharForm != eChar8Bit) && CharFormIsLittleEndian ( ths->fCharForm ) ) {
+		if ( ths->fBufferPtr > ths->fBufferLimit ) return eTriMaybe;
+	}
+	
+	return eTriYes;
+
+}	// CheckFinalNulls
+
+
+// =================================================================================================
+// SetNextRecognizer
+// =================
+
+void
+QEScanner::PacketMachine::SetNextRecognizer ( RecognizerKind nextRecognizer )
+{
+
+	fRecognizer = nextRecognizer;
+	fPosition = 0;
+	
+}	// SetNextRecognizer
+
+
+// =================================================================================================
+// FindNextPacket
+// ==============
+
+// *** When we start validating intervening nulls for 2 and 4 bytes characters, throw an exception
+// *** for errors.  Don't return eTriNo, that might skip at an optional point.
+
+QEScanner::PacketMachine::TriState
+QEScanner::PacketMachine::FindNextPacket ()
+{
+
+	TriState	status;
+		
+	#define kPacketHead		"?xpacket begin="
+	#define kPacketID		"W5M0MpCehiHzreSzNTczkc9d"
+	#define kPacketTail		"?xpacket end="
+	
+	static const RecognizerInfo	recognizerTable [eRecognizerCount]	= {		// ! Would be safer to assign these explicitly.
+
+		// proc				successNext					failureNext					literal
+
+		{ NULL,				eFailureRecognizer,			eFailureRecognizer,			NULL},			// eFailureRecognizer
+		{ NULL,				eSuccessRecognizer,			eSuccessRecognizer,			NULL},			// eSuccessRecognizer
+
+		{ FindLessThan,		eHeadStartRecorder,			eFailureRecognizer,			"H" },			// eLeadInRecognizer
+		{ RecordStart,	 	eHeadStartRecognizer,		eLeadInRecognizer,			NULL },			// eHeadStartRecorder
+		{ MatchString, 		eBOMRecognizer,				eLeadInRecognizer,			kPacketHead },	// eHeadStartRecognizer
+
+		{ RecognizeBOM, 	eIDTagRecognizer,			eLeadInRecognizer,			NULL },			// eBOMRecognizer
+
+		{ MatchString, 		eIDOpenRecognizer,			eLeadInRecognizer,			" id=" },		// eIDTagRecognizer
+		{ MatchOpenQuote,	eIDValueRecognizer,			eLeadInRecognizer,			NULL },			// eIDOpenRecognizer
+		{ MatchString, 		eIDCloseRecognizer,			eLeadInRecognizer,			kPacketID },	// eIDValueRecognizer
+		{ MatchCloseQuote,	eAttrSpaceRecognizer_1,		eLeadInRecognizer,			NULL },			// eIDCloseRecognizer
+
+		{ MatchChar, 		eAttrNameRecognizer_1,		eHeadEndRecognizer,			" " },			// eAttrSpaceRecognizer_1
+		{ CaptureAttrName,	eAttrValueRecognizer_1,		eLeadInRecognizer,			NULL },			// eAttrNameRecognizer_1
+		{ CaptureAttrValue,	eAttrValueRecorder_1,		eLeadInRecognizer,			NULL },			// eAttrValueRecognizer_1
+		{ RecordHeadAttr,	eAttrSpaceRecognizer_1,		eLeadInRecognizer,			NULL },			// eAttrValueRecorder_1
+
+		{ MatchString, 		eBodyRecognizer,			eLeadInRecognizer,			"?>" },			// eHeadEndRecognizer
+		
+		{ FindLessThan,		eTailStartRecognizer,		eBodyRecognizer,			"T"},			// eBodyRecognizer
+
+		{ MatchString, 		eAccessValueRecognizer,		eBodyRecognizer,			kPacketTail },	// eTailStartRecognizer
+		{ CaptureAccess,	eAttrSpaceRecognizer_2,		eBodyRecognizer,			NULL },			// eAccessValueRecognizer
+
+		{ MatchChar, 		eAttrNameRecognizer_2,		eTailEndRecognizer,			" " },			// eAttrSpaceRecognizer_2
+		{ CaptureAttrName,	eAttrValueRecognizer_2,		eBodyRecognizer,			NULL },			// eAttrNameRecognizer_2
+		{ CaptureAttrValue,	eAttrValueRecorder_2,		eBodyRecognizer,			NULL },			// eAttrValueRecognizer_2
+		{ RecordTailAttr,	eAttrSpaceRecognizer_2,		eBodyRecognizer,			NULL },			// eAttrValueRecorder_2
+
+		{ MatchString, 		ePacketEndRecognizer,		eBodyRecognizer,			"?>" },			// eTailEndRecognizer
+		{ CheckPacketEnd,	eCloseOutRecognizer,		eBodyRecognizer,			"" },			// ePacketEndRecognizer
+		{ CheckFinalNulls,	eSuccessRecognizer,			eBodyRecognizer,			"" }			// eCloseOutRecognizer
+
+	};
+	
+	while ( true ) {
+	
+		switch ( fRecognizer ) {
+		
+			case eFailureRecognizer :
+				return eTriNo;
+			
+			case eSuccessRecognizer :
+				return eTriYes;
+			
+			default :
+			
+				// -------------------------------------------------------------------
+				// For everything else, the normal cases, use the state machine table.
+				
+				const RecognizerInfo *	thisState	= &recognizerTable [fRecognizer];
+				
+				status = thisState->proc ( this, thisState->literal );
+				
+				switch ( status ) {
+				
+					case eTriNo :
+						SetNextRecognizer ( thisState->failureNext );
+						continue;
+					
+					case eTriYes :
+						SetNextRecognizer ( thisState->successNext );
+						continue;
+					
+					case eTriMaybe :
+						fBufferOverrun = (unsigned char)(fBufferPtr - fBufferLimit);
+						return eTriMaybe;	// Keep this recognizer intact, to be resumed later.
+				
+				}
+		
+		}	// switch ( fRecognizer ) { ...
+		
+	}	// while ( true ) { ...
+
+}	// FindNextPacket
+
+
+// =================================================================================================
+// =================================================================================================
+// class InternalSnip
+// ==================
+
+
+// =================================================================================================
+// InternalSnip
+// ============
+
+QEScanner::InternalSnip::InternalSnip ( SInt64 offset, SInt64 length )
+{
+
+	fInfo.fOffset = offset;
+	fInfo.fLength = length;
+	
+}	// InternalSnip
+
+
+// =================================================================================================
+// InternalSnip
+// ============
+
+QEScanner::InternalSnip::InternalSnip ( const InternalSnip & rhs ) :
+	fInfo ( rhs.fInfo ),
+	fMachine ( NULL )
+{
+
+	assert ( rhs.fMachine.get() == NULL );	// Don't copy a snip with a machine.
+	assert ( (rhs.fInfo.fEncodingAttr == 0) || (*rhs.fInfo.fEncodingAttr == 0) ); // Don't copy a snip with an encoding.
+
+}	// InternalSnip
+
+
+// =================================================================================================
+// ~InternalSnip
+// =============
+
+QEScanner::InternalSnip::~InternalSnip ()
+{
+}	// ~InternalSnip
+
+
+
+// =================================================================================================
+// =================================================================================================
+// class QEScanner
+// ================
+
+
+// =================================================================================================
+// DumpSnipList
+// ============
+
+static const char *	snipStateName [6] = { "not-seen", "pending", "raw-data", "good-packet", "partial", "bad-packet" };
+
+void
+QEScanner::DumpSnipList ( const char * title )
+{
+#if 1
+	InternalSnipIterator currPos = fInternalSnips.begin();
+	InternalSnipIterator endPos  = fInternalSnips.end();
+	
+	cout << endl << title << " snip list: " << fInternalSnips.size() << endl;
+	
+	for ( ; currPos != endPos; ++currPos ) {
+		SnipInfo * currSnip = &currPos->fInfo;
+		cout << '\t' << currSnip << ' ' << snipStateName[currSnip->fState] << ' '
+		     << currSnip->fOffset << ".." << (currSnip->fOffset + currSnip->fLength - 1)
+			 << ' ' << currSnip->fLength << ' ' << endl;
+	}
+#endif
+}	// DumpSnipList
+
+
+// =================================================================================================
+// PrevSnip and NextSnip
+// =====================
+
+QEScanner::InternalSnipIterator
+QEScanner::PrevSnip ( InternalSnipIterator snipPos )
+{
+
+	InternalSnipIterator prev = snipPos;
+	return --prev;
+
+}	// PrevSnip
+
+QEScanner::InternalSnipIterator
+QEScanner::NextSnip ( InternalSnipIterator snipPos )
+{
+
+	InternalSnipIterator next = snipPos;
+	return ++next;
+
+}	// NextSnip
+
+
+// =================================================================================================
+// QEScanner
+// ==========
+//
+// Initialize the scanner object with one "not seen" snip covering the whole stream.
+
+QEScanner::QEScanner ( SInt64 streamLength ) :
+
+	fStreamLength ( streamLength )
+	
+{
+	InternalSnip	rootSnip ( 0, streamLength );
+	
+	if ( streamLength > 0 ) fInternalSnips.push_front ( rootSnip );		// Be nice for empty files.
+	// DumpSnipList ( "New QEScanner" );
+	
+}	// QEScanner
+
+
+// =================================================================================================
+// ~QEScanner
+// ===========
+
+QEScanner::~QEScanner()
+{
+	
+}	// ~QEScanner
+
+
+// =================================================================================================
+// GetSnipCount
+// ============
+
+size_t
+QEScanner::GetSnipCount ()
+{
+
+	return fInternalSnips.size();
+
+}	// GetSnipCount
+
+
+// =================================================================================================
+// StreamAllScanned
+// ================
+
+bool
+QEScanner::StreamAllScanned ()
+{
+	InternalSnipIterator currPos = fInternalSnips.begin();
+	InternalSnipIterator endPos  = fInternalSnips.end();
+
+	for ( ; currPos != endPos; ++currPos ) {
+		if ( currPos->fInfo.fState == eNotSeenSnip ) return false;
+	}
+	return true;
+
+}	// StreamAllScanned
+
+
+// =================================================================================================
+// SplitInternalSnip
+// =================
+//
+// Split the given snip into up to 3 pieces.  The new pieces are inserted before and after this one
+// in the snip list.  The relOffset is the first byte to be kept, it is relative to this snip.  If
+// the preceeding or following snips have the same state as this one, just shift the boundaries.
+// I.e. move the contents from one snip to the other, don't create a new snip.
+
+// *** To be thread safe we ought to lock the entire list during manipulation.  Let data scanning
+// *** happen in parallel, serialize all mucking with the list.
+
+void
+QEScanner::SplitInternalSnip ( InternalSnipIterator snipPos, SInt64 relOffset, SInt64 newLength )
+{
+
+	assert ( (relOffset + newLength) > relOffset );	// Check for overflow.
+	assert ( (relOffset + newLength) <= snipPos->fInfo.fLength );
+	
+	// -----------------------------------
+	// First deal with the low offset end.
+	
+	if ( relOffset > 0 ) {
+
+		InternalSnipIterator prevPos;
+		if ( snipPos != fInternalSnips.begin() ) prevPos = PrevSnip ( snipPos );
+
+		if ( (snipPos != fInternalSnips.begin()) && (snipPos->fInfo.fState == prevPos->fInfo.fState) ) {
+			prevPos->fInfo.fLength += relOffset;	// Adjust the preceeding snip.
+		} else {
+			InternalSnip headExcess ( snipPos->fInfo.fOffset, relOffset );
+			headExcess.fInfo.fState = snipPos->fInfo.fState;
+			headExcess.fInfo.fOutOfOrder = snipPos->fInfo.fOutOfOrder;
+			fInternalSnips.insert ( snipPos, headExcess );	// Insert the head piece before the middle piece.
+		}
+
+		snipPos->fInfo.fOffset += relOffset;	// Adjust the remainder of this snip.
+		snipPos->fInfo.fLength -= relOffset;
+
+	}
+	
+	// ----------------------------------
+	// Now deal with the high offset end.
+	
+	if ( newLength < snipPos->fInfo.fLength ) {
+
+		InternalSnipIterator nextPos    = NextSnip ( snipPos );
+		const SInt64         tailLength = snipPos->fInfo.fLength - newLength;
+
+		if ( (nextPos != fInternalSnips.end()) && (snipPos->fInfo.fState == nextPos->fInfo.fState) ) {
+			nextPos->fInfo.fOffset -= tailLength;		// Adjust the following snip.
+			nextPos->fInfo.fLength += tailLength;
+		} else {
+			InternalSnip tailExcess ( (snipPos->fInfo.fOffset + newLength), tailLength );
+			tailExcess.fInfo.fState = snipPos->fInfo.fState;
+			tailExcess.fInfo.fOutOfOrder = snipPos->fInfo.fOutOfOrder;
+			fInternalSnips.insert ( nextPos, tailExcess );		// Insert the tail piece after the middle piece.
+		}
+
+		snipPos->fInfo.fLength = newLength;
+
+	}
+
+}	// SplitInternalSnip
+
+
+// =================================================================================================
+// MergeInternalSnips
+// ==================
+
+QEScanner::InternalSnipIterator
+QEScanner::MergeInternalSnips ( InternalSnipIterator firstPos, InternalSnipIterator secondPos )
+{
+
+	firstPos->fInfo.fLength += secondPos->fInfo.fLength;
+	fInternalSnips.erase ( secondPos );
+	return firstPos;
+
+}	// MergeInternalSnips
+
+
+// =================================================================================================
+// Scan
+// ====
+
+void
+QEScanner::Scan ( const void * bufferOrigin, SInt64 bufferOffset, SInt64 bufferLength )
+{
+	SInt64	relOffset;
+	
+	#if 0
+		cout << "Scan: @ " << bufferOrigin << ", " << bufferOffset << ", " << bufferLength << endl;
+	#endif
+	
+	if ( bufferLength == 0 ) return;
+	
+	// ----------------------------------------------------------------
+	// These comparisons are carefully done to avoid overflow problems.
+	
+	if ( (bufferOffset >= fStreamLength) ||
+		 (bufferLength > (fStreamLength - bufferOffset)) ||
+		 (bufferOrigin == 0) ) {
+		throw ScanError ( "Bad origin, offset, or length" );
+	}
+	
+	// ----------------------------------------------------------------------------------------------
+	// This buffer must be within a not-seen snip.  Find it and split it.  The first snip whose whose
+	// end is beyond the buffer must be the enclosing one.
+	
+	// *** It would be friendly for rescans for out of order problems to accept any buffer postion.
+	
+	const SInt64			endOffset	= bufferOffset + bufferLength - 1;
+	InternalSnipIterator	snipPos	= fInternalSnips.begin();
+	
+	while ( endOffset > (snipPos->fInfo.fOffset + snipPos->fInfo.fLength - 1) ) ++ snipPos;
+	if ( snipPos->fInfo.fState != eNotSeenSnip ) throw ScanError ( "Already seen" );
+	
+	relOffset = bufferOffset - snipPos->fInfo.fOffset;
+	if ( (relOffset + bufferLength) > snipPos->fInfo.fLength ) throw ScanError ( "Not within existing snip" );
+	
+	SplitInternalSnip ( snipPos, relOffset, bufferLength );		// *** If sequential & prev is partial, just tack on,
+	
+	// --------------------------------------------------------
+	// Merge this snip with the preceeding snip if appropriate.
+	
+	// *** When out of order I/O is supported we have to do something about buffers who's predecessor is not seen.
+	
+	if ( snipPos->fInfo.fOffset > 0 ) {
+		InternalSnipIterator prevPos = PrevSnip ( snipPos );
+		if ( prevPos->fInfo.fState == ePartialPacketSnip ) snipPos = MergeInternalSnips ( prevPos, snipPos );
+	}
+	
+	// ----------------------------------
+	// Look for packets within this snip.
+
+	snipPos->fInfo.fState = ePendingSnip;
+	PacketMachine* thisMachine = snipPos->fMachine.get();
+	// DumpSnipList ( "Before scan" );
+
+	if ( thisMachine != 0 ) {
+		thisMachine->AssociateBuffer ( bufferOffset, bufferOrigin, bufferLength );
+	} else {
+		// *** snipPos->fMachine.reset ( new PacketMachine ( bufferOffset, bufferOrigin, bufferLength ) );		VC++ lacks reset
+		#if 0
+			snipPos->fMachine = auto_ptr<PacketMachine> ( new PacketMachine ( bufferOffset, bufferOrigin, bufferLength ) );
+		#else
+			{
+				// Some versions of gcc complain about the assignment operator above.  This avoids the gcc bug.
+				PacketMachine *	pm	= new PacketMachine ( bufferOffset, bufferOrigin, bufferLength );
+				auto_ptr<PacketMachine>	ap ( pm );
+				snipPos->fMachine = ap;
+			}
+		#endif
+		thisMachine = snipPos->fMachine.get();
+	}
+	
+	bool	bufferDone	= false;
+	while ( ! bufferDone ) {
+
+		PacketMachine::TriState	foundPacket = thisMachine->FindNextPacket();
+		
+		if ( foundPacket == PacketMachine::eTriNo ) {
+		
+			// -----------------------------------------------------------------------
+			// No packet, mark the snip as raw data and get rid of the packet machine.
+			// We're done with this buffer.
+			
+			snipPos->fInfo.fState = eRawInputSnip;
+			#if 0
+				snipPos->fMachine = auto_ptr<PacketMachine>();	// *** snipPos->fMachine.reset();	VC++ lacks reset
+			#else
+				{
+					// Some versions of gcc complain about the assignment operator above.  This avoids the gcc bug.
+					auto_ptr<PacketMachine>	ap ( 0 );
+					snipPos->fMachine = ap;
+				}
+			#endif
+			bufferDone = true;
+		
+		} else {
+		
+			// ---------------------------------------------------------------------------------------------
+			// Either a full or partial packet.  First trim any excess off of the front as a raw input snip.
+			// If this is a partial packet mark the snip and keep the packet machine to be resumed later.
+			// We're done with this buffer, the partial packet by definition extends to the end.  If this is
+			// a complete packet first extract the additional information from the packet machine.  If there
+			// is leftover data split the snip and transfer the packet machine to the new trailing snip.
+			
+			if ( thisMachine->fPacketStart > snipPos->fInfo.fOffset ) {
+
+				// There is data at the front of the current snip that must be trimmed.
+				SnipState	savedState	= snipPos->fInfo.fState;
+				snipPos->fInfo.fState = eRawInputSnip;	// ! So it gets propagated to the trimmed front part.
+				relOffset = thisMachine->fPacketStart - snipPos->fInfo.fOffset;
+				SplitInternalSnip ( snipPos, relOffset, (snipPos->fInfo.fLength - relOffset) );
+				snipPos->fInfo.fState = savedState;
+
+			}
+		
+			if ( foundPacket == PacketMachine::eTriMaybe ) {
+				
+				// We have only found a partial packet.
+				snipPos->fInfo.fState = ePartialPacketSnip;
+				bufferDone = true;
+			
+			} else {
+			
+				// We have found a complete packet. Extract all the info for it and split any trailing data.
+				
+				InternalSnipIterator	packetSnip	= snipPos;
+				SnipState				packetState	= eValidPacketSnip;
+				
+				if ( thisMachine->fBogusPacket ) packetState = eBadPacketSnip;
+				
+				packetSnip->fInfo.fAccess = thisMachine->fAccess;
+				packetSnip->fInfo.fCharForm = thisMachine->fCharForm;
+				packetSnip->fInfo.fBytesAttr = thisMachine->fBytesAttr;
+				packetSnip->fInfo.fEncodingAttr = thisMachine->fEncodingAttr.c_str();
+				thisMachine->fEncodingAttr.erase ( thisMachine->fEncodingAttr.begin(), thisMachine->fEncodingAttr.end() );
+				
+				if ( (thisMachine->fCharForm != eChar8Bit) && CharFormIsBigEndian ( thisMachine->fCharForm ) ) {
+				
+					// ------------------------------------------------------------------------------
+					// Handle a special case for big endian characters.  The packet machine works as
+					// though things were little endian.  The packet starting offset points to the
+					// byte containing the opening '<', and the length includes presumed nulls that
+					// follow the last "real" byte.  If the characters are big endian we now have to
+					// decrement the starting offset of the packet, and also decrement the length of
+					// the previous snip.
+					//
+					// Note that we can't do this before the head trimming above in general.  The
+					// nulls might have been exactly at the end of a buffer and already in the
+					// previous snip.  We are doing this before trimming the tail from the raw snip
+					// containing the packet.  We adjust the raw snip's size because it ends with
+					// the input buffer.  We don't adjust the packet's size, it is already correct.
+					//
+					// The raw snip (the one before the packet) might entirely disappear.  A simple
+					// example of this is when the packet is at the start of the file.
+					
+					assert ( packetSnip != fInternalSnips.begin() );	// Leading nulls were trimmed!
+					
+					if ( packetSnip != fInternalSnips.begin() ) {	// ... but let's program defensibly.
+
+						InternalSnipIterator prevSnip  = PrevSnip ( packetSnip );
+						const unsigned int nullsToAdd = ( CharFormIs16Bit ( thisMachine->fCharForm ) ? 1 : 3 );
+
+						assert ( nullsToAdd <= prevSnip->fInfo.fLength );
+						prevSnip->fInfo.fLength -= nullsToAdd;
+						if ( prevSnip->fInfo.fLength == 0 ) (void) fInternalSnips.erase ( prevSnip );
+						
+						packetSnip->fInfo.fOffset	-= nullsToAdd;
+						packetSnip->fInfo.fLength	+= nullsToAdd;
+						thisMachine->fPacketStart	-= nullsToAdd;
+
+					}
+					
+				}
+				
+				if ( thisMachine->fPacketLength == snipPos->fInfo.fLength ) {
+				
+					// This packet ends exactly at the end of the current snip.
+					#if 0
+						snipPos->fMachine = auto_ptr<PacketMachine>();	// *** snipPos->fMachine.reset();	VC++ lacks reset
+					#else
+						{
+							// Some versions of gcc complain about the assignment operator above.  This avoids the gcc bug.
+							auto_ptr<PacketMachine>	ap ( 0 );
+							snipPos->fMachine = ap;
+						}
+					#endif
+					bufferDone = true;
+
+				} else {
+					
+					// There is trailing data to split from the just found packet.
+					SplitInternalSnip ( snipPos, 0, thisMachine->fPacketLength );
+			
+					InternalSnipIterator	tailPos	= NextSnip ( snipPos );
+					
+					tailPos->fMachine = snipPos->fMachine;	// auto_ptr assignment - taking ownership
+					thisMachine->ResetMachine ();
+					
+					snipPos = tailPos;
+				
+				}
+				
+				packetSnip->fInfo.fState = packetState;	// Do this last to avoid messing up the tail split.
+				// DumpSnipList ( "Found a packet" );
+
+				
+			}
+		
+		}
+	
+	}
+	
+	// --------------------------------------------------------
+	// Merge this snip with the preceeding snip if appropriate.
+	
+	// *** When out of order I/O is supported we have to check the following snip too.
+	
+	if ( (snipPos->fInfo.fOffset > 0) && (snipPos->fInfo.fState == eRawInputSnip) ) {
+		InternalSnipIterator prevPos = PrevSnip ( snipPos );
+		if ( prevPos->fInfo.fState == eRawInputSnip ) snipPos = MergeInternalSnips ( prevPos, snipPos );
+	}
+	
+	// DumpSnipList ( "After scan" );
+	
+}	// Scan
+
+
+// =================================================================================================
+// Report
+// ======
+
+void
+QEScanner::Report ( SnipInfoVector& snips )
+{
+	const size_t count	= fInternalSnips.size();
+	InternalSnipIterator	snipPos	= fInternalSnips.begin();
+	
+	size_t s;
+
+	// DumpSnipList ( "Report" );
+
+	snips.erase ( snips.begin(), snips.end() );		// ! Should use snips.clear, but VC++ doesn't have it.
+	snips.reserve ( count );
+	
+	for ( s = 0; s < count; s += 1 ) {
+		snips.push_back ( SnipInfo ( snipPos->fInfo.fState, snipPos->fInfo.fOffset, snipPos->fInfo.fLength ) );
+		snips[s] = snipPos->fInfo;	// Pick up all of the fields.
+		++ snipPos;
+	}
+
+}	// Report
diff --git a/samples/source/common/QEScanner.hpp b/samples/source/common/QEScanner.hpp
new file mode 100644
index 0000000..0c24dce
--- /dev/null
+++ b/samples/source/common/QEScanner.hpp
@@ -0,0 +1,331 @@
+#ifndef __QEScanner_hpp__
+#define __QEScanner_hpp__
+
+// =================================================================================================
+// Copyright 2002-2005 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// Adobe patent application tracking #P435, entitled 'Unique markers to simplify embedding data of
+// one format in a file with a different format', inventors: Sean Parent, Greg Gilley.
+// =================================================================================================
+
+#include <list>
+#include <vector>
+#include <string>
+#include <memory>
+#include <stdexcept>
+
+// =================================================================================================
+// The QEScanner class is used to scan a stream of input for XMP packets.  A scanner object is
+// constructed then fed the input through a series of calls to Scan.  Report may be called at any
+// time to get the current knowledge of the input.
+//
+// A packet starts when a valid header is found and ends when a valid trailer is found.  If the
+// header contains a "bytes" attribute, additional whitespace must follow.
+//
+// *** RESTRICTIONS: The current implementation of the scanner has the the following restrictions:
+//		- The input must be presented in order.
+//		- Not fully thread safe, don't make concurrent calls to the same QEScanner object.
+// =================================================================================================
+
+class QEScanner {
+public:
+
+	// =============================================================================================
+	// The entire input stream is represented as a series of snips.  Each snip defines one portion
+	// of the input stream that either has not been seen, has been seen and contains no packets, is
+	// exactly one packet, or contains the start of an unfinished packet.  Adjacent snips with the
+	// same state are merged, so the number of snips is always minimal.
+	//
+	// A newly constructed QEScanner object has one snip covering the whole input with a state
+	// of "not seen".  A block of input that contains a full XMP packet is split into 3 parts: a
+	// (possibly empty) raw input snip, the packet, and another (possibly empty) raw input snip.  A
+	// block of input that contains the start of an XMP packet is split into two snips, a (possibly
+	// empty) raw input snip and the packet start; the following snip must be a "not seen" snip.
+	//
+	// It is possible to have ill-formed packets.  These have a syntactically valid header and
+	// trailer, but some semantic error.  For example, if the "bytes" attribute length does not span
+	// to the end of the trailer, or if the following packet begins within trailing padding.
+
+	typedef unsigned char	UInt8;
+	typedef unsigned long	UInt32;
+	typedef long long		SInt64;
+	
+	enum {
+		eNotSeenSnip,		// This snip has not been seen yet.
+		ePendingSnip,		// This snip is an input buffer being processed.
+		eRawInputSnip,		// This snip is raw input, it doesn't contain any part of an XMP packet.
+		eValidPacketSnip,	// This snip is a complete, valid XMP packet.
+		ePartialPacketSnip,	// This snip contains the start of a possible XMP packet.
+		eBadPacketSnip		// This snip contains a complete, but semantically incorrect XMP packet.
+	};
+	typedef UInt8	SnipState;
+	
+	enum {	// The values allow easy testing for 16/32 bit and big/little endian.
+		eChar8Bit			= 0,
+		eChar16BitBig		= 2,
+		eChar16BitLittle	= 3,
+		eChar32BitBig		= 4,
+		eChar32BitLittle	= 5
+	};
+	typedef UInt8	CharacterForm;
+
+	enum {
+		eChar16BitMask			= 2,	// These constant shouldn't be used directly, they are mainly
+		eChar32BitMask			= 4,	// for the CharFormIsXyz macros below.
+		eCharLittleEndianMask	= 1
+	};
+	
+	#define CharFormIs16Bit(f)			( ((int)(f) & QEScanner::eChar16BitMask) != 0 )
+	#define CharFormIs32Bit(f)			( ((int)(f) & QEScanner::eChar32BitMask) != 0 )
+	
+	#define CharFormIsBigEndian(f)		( ((int)(f) & QEScanner::eCharLittleEndianMask) == 0 )
+	#define CharFormIsLittleEndian(f)	( ((int)(f) & QEScanner::eCharLittleEndianMask) != 0 )
+	
+	struct SnipInfo {
+
+		SInt64			fOffset;		// The byte offset of this snip within the input stream.
+		SInt64			fLength;		// The length in bytes of this snip.
+		SnipState		fState;			// The state of this snip.
+		bool			fOutOfOrder;	// If true, this snip was seen before the one in front of it.
+		char			fAccess;		// The read-only/read-write access from the end attribute.
+		CharacterForm	fCharForm;		// How the packet is divided into characters.
+		const char *	fEncodingAttr;	// The value of the encoding attribute, if any, with nulls removed.
+		SInt64			fBytesAttr;		// The value of the bytes attribute, -1 if not present.
+
+		SnipInfo() :
+			fOffset ( 0 ),
+			fLength ( 0 ),
+			fState ( eNotSeenSnip ),
+			fOutOfOrder ( false ),
+			fAccess ( ' ' ),
+			fCharForm ( eChar8Bit ),
+			fEncodingAttr ( "" ),
+			fBytesAttr( -1 )
+		{ }
+
+		SnipInfo ( SnipState state, SInt64 offset, SInt64 length ) :
+			fOffset ( offset ),
+			fLength ( length ),
+			fState ( state ),
+			fOutOfOrder ( false ),
+			fAccess ( ' ' ),
+			fCharForm ( eChar8Bit ),
+			fEncodingAttr ( "" ),
+			fBytesAttr( -1 )
+		{ }
+	
+	};
+	
+	typedef std::vector<SnipInfo>	SnipInfoVector;
+
+	QEScanner ( SInt64 streamLength );
+	// Constructs a new QEScanner object for a stream with the given length.
+	
+	~QEScanner();
+
+	size_t GetSnipCount();
+	// Returns the number of snips that the stream has been divided into.
+	
+ 	bool StreamAllScanned();
+ 	// Returns true if all of the stream has been seen.
+	
+	void Scan ( const void * bufferOrigin, SInt64 bufferOffset, SInt64 bufferLength );
+	// Scans the given part of the input, incorporating it in to the known snips.
+	// The bufferOffset is the offset of this block of input relative to the entire stream.
+	// The bufferLength is the length in bytes of this block of input.
+
+	void Report ( SnipInfoVector & snips );
+	// Produces a report of what is known about the input stream. 
+
+	class ScanError : public std::logic_error {
+	public:
+		ScanError() throw() : std::logic_error ( "" ) {}
+		explicit ScanError ( const char * message ) throw() : std::logic_error ( message ) {}
+		virtual ~ScanError() throw() {}
+	};
+
+private:	// QEScanner
+	
+	class PacketMachine;
+
+	class InternalSnip {
+	public:
+
+		SnipInfo	fInfo;							// The public info about this snip.
+		std::auto_ptr<PacketMachine>	fMachine;	// The state machine for "active" snips.
+		
+		InternalSnip() {};	// Let everything default.
+		InternalSnip ( SInt64 offset, SInt64 length );
+		InternalSnip ( const InternalSnip & );
+		~InternalSnip();
+
+	};	// InternalSnip
+
+	typedef std::list<InternalSnip>		InternalSnipList;
+	typedef InternalSnipList::iterator	InternalSnipIterator;
+
+	class PacketMachine {
+	public:
+		
+		SInt64			fPacketStart;	// Byte offset relative to the entire stream.
+		SInt64			fPacketLength;	// Length in bytes to the end of the trailer processing instruction.
+		SInt64			fBytesAttr;		// The value of the bytes attribute, -1 if not present.
+		std::string		fEncodingAttr;	// The value of the encoding attribute, if any, with nulls removed.
+		CharacterForm	fCharForm;		// How the packet is divided into characters.
+		char			fAccess;		// The read-only/read-write access from the end attribute.
+		bool			fBogusPacket;	// True if the packet has an error such as a bad "bytes" attribute value.
+		
+		void ResetMachine();
+
+		enum TriState {
+			eTriNo,
+			eTriMaybe,
+			eTriYes
+		};
+
+		TriState FindNextPacket();
+		
+		void AssociateBuffer ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength );
+		
+		PacketMachine ( SInt64 bufferOffset, const void * bufferOrigin, SInt64 bufferLength );
+		~PacketMachine();
+	
+	private:	// PacketMachine
+	
+		PacketMachine() {};	// ! Hide the default constructor.
+	
+		enum RecognizerKind {
+
+			eFailureRecognizer,			// Not really recognizers, special states to end one buffer's processing.
+			eSuccessRecognizer,
+
+			eLeadInRecognizer,			// Anything up to the next '<'.
+			eHeadStartRecorder,			// Save the starting offset, count intervening nulls.
+			eHeadStartRecognizer,		// The literal string "?xpacket begin=".
+
+			eBOMRecognizer,				// Recognize and record the quoted byte order marker.
+
+			eIDTagRecognizer,			// The literal string " id=".
+			eIDOpenRecognizer,			// The opening quote for the ID.
+			eIDValueRecognizer,			// The literal string "W5M0MpCehiHzreSzNTczkc9d".
+			eIDCloseRecognizer,			// The closing quote for the ID.
+
+			eAttrSpaceRecognizer_1, 	// The space before an attribute.
+			eAttrNameRecognizer_1,		// The name of an attribute.
+			eAttrValueRecognizer_1,		// The equal sign and quoted string value for an attribute.
+			eAttrValueRecorder_1,		// Record the value of an attribute.
+
+			eHeadEndRecognizer,			// The string literal "?>".			
+			
+			eBodyRecognizer,			// The packet body, anything up to the next '<'.
+
+			eTailStartRecognizer,		// The string literal "?xpacket end=".
+			eAccessValueRecognizer,		// Recognize and record the quoted r/w access mode.
+
+			eAttrSpaceRecognizer_2, 	// The space before an attribute.
+			eAttrNameRecognizer_2,		// The name of an attribute.
+			eAttrValueRecognizer_2,		// The equal sign and quoted string value for an attribute.
+			eAttrValueRecorder_2,		// Record the value of an attribute.
+
+			eTailEndRecognizer,			// The string literal "?>".
+			ePacketEndRecognizer,		// Look for trailing padding, check and record the packet size.
+			eCloseOutRecognizer,		// Look for final nulls for little endian multibyte characters.
+			
+			eRecognizerCount
+
+		};
+		
+		SInt64			fBufferOffset;	// The offset of the data buffer within the input stream.
+		const char *	fBufferOrigin;	// The starting address of the data buffer for this snip.
+		const char *	fBufferPtr;		// The current postion in the data buffer.
+		const char *	fBufferLimit;	// The address one past the last byte in the data buffer.
+
+		RecognizerKind	fRecognizer;	// Which recognizer is currently active.
+		/*signed long*/ size_t		fPosition;		// The internal position within a string literal, etc.
+		unsigned char	fBytesPerChar;	// The number of bytes per logical character, 1, 2, or 4.
+		unsigned char	fBufferOverrun;	// Non-zero if suspended while skipping intervening nulls.
+		char			fQuoteChar;		// The kind of quote seen at the start of a quoted value.
+		std::string		fAttrName;		// The name for an arbitrary attribute (other than "begin" and "id").
+		std::string		fAttrValue;		// The value for an arbitrary attribute (other than "begin" and "id").
+	
+		void SetNextRecognizer ( RecognizerKind nextRecognizer );
+				
+		typedef TriState (* RecognizerProc) ( PacketMachine *, const char * );
+	
+		static TriState
+		FindLessThan ( PacketMachine * ths, const char * which );
+	
+		static TriState
+		MatchString ( PacketMachine * ths, const char * literal );
+	
+		static TriState
+		MatchChar ( PacketMachine * ths, const char * literal );
+	
+		static TriState
+		MatchOpenQuote ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		MatchCloseQuote ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		CaptureAttrName ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		CaptureAttrValue ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		RecordStart ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		RecognizeBOM ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		RecordHeadAttr ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		CaptureAccess ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		RecordTailAttr ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		CheckPacketEnd ( PacketMachine * ths, const char * /* unused */ );
+	
+		static TriState
+		CheckFinalNulls ( PacketMachine * ths, const char * /* unused */ );
+		
+		struct RecognizerInfo {
+			RecognizerProc	proc;
+			RecognizerKind	successNext;
+			RecognizerKind	failureNext;
+			const char *	literal;
+		};
+		
+	};	// PacketMachine
+	
+	SInt64				fStreamLength;
+	InternalSnipList	fInternalSnips;
+
+	void
+	SplitInternalSnip ( InternalSnipIterator snipPos, SInt64 relOffset, SInt64 newLength );
+
+	InternalSnipIterator
+	MergeInternalSnips ( InternalSnipIterator firstPos, InternalSnipIterator secondPos );
+
+	void
+	DumpSnipList ( const char * title );
+
+	InternalSnipIterator
+	PrevSnip ( InternalSnipIterator snipPos );
+
+	InternalSnipIterator
+	NextSnip ( InternalSnipIterator snipPos );
+	
+};	// QEScanner
+
+
+#endif	// __QEScanner_hpp__
diff --git a/samples/source/common/TagTree.cpp b/samples/source/common/TagTree.cpp
new file mode 100644
index 0000000..2870057
--- /dev/null
+++ b/samples/source/common/TagTree.cpp
@@ -0,0 +1,615 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+/*
+* all legacy metadata comes in some hierarchical form
+* these routines help generate a tree, which is subsequently parseable (the "classic" dumpImage)
+
+* as well as queriable (primitive but workable solution)
+* having direct access to particluar legacy fields through unique keys (like "psir424")
+* enables efficient testing. tagMap is used for that.
+*
+* if keys are defined multiple times, the are named sameKey, sameKey-2, sameKey-3, sameKey-4
+* allowing also specific queries on those
+*
+*/
+
+#include "TagTree.h"
+#include <stdarg.h>
+
+
+#if WIN_ENV
+	//should preferably be within a #if XMP_WinBuild, not doable here... 
+	#pragma warning ( disable : 4996 )	// 'sprintf' was declared deprecated
+
+	#include <stdio.h>
+	#ifndef snprintf
+		#define snprintf _xmp_snprintf
+		#pragma warning ( disable : 4996 )	// Consider using _snprintf_s instead.
+
+		void _xmp_snprintf(char * buffer,size_t len,const char * format, ...)
+		{
+		va_list args; va_start(args, format);
+		   _snprintf( buffer, len, format, args); 
+				// using bad windows routine from stdio.h
+				// and indeed named, _snprintf, no such thing as snprintf
+		   buffer[len-1] = 0; //write that trailing zero..
+		va_end(args);
+		}
+	#endif
+#endif
+
+//private - duplicate of Utils routine
+std::string itos(int i)
+{
+	char cs[31]; //worst to come is 64 bit <=> 21 bytes (more likely will be 32 bit forever)
+	snprintf(cs,30,"%d",i); //snprintf does buffer overrun check which sprintf doesn't
+	return std::string(cs);
+}
+
+TagTree::TagTree()
+{
+	rootNode.key="rootkey";		//all never seen
+	rootNode.value="rootvalue";
+	rootNode.comment="rootcomment";
+	tagMap.clear();		// making extra sure it's clear, avoid OS X std:: issues
+	nodeStack.clear();
+	nodeStack.push_back(&rootNode);
+	lastNode=NULL;
+}
+
+TagTree::~TagTree()
+{
+	tagMap.clear();
+	nodeStack.clear();
+	nodeStack.push_back(&rootNode);
+	//any further cleanup needed?
+}
+
+void TagTree::setKeyValue(const std::string key,const std::string value, const std::string comment)
+{
+	Node* pCurNode=*nodeStack.rbegin(); //current Node
+	pCurNode->children.push_back(Node(key,value,comment));
+
+	if(key.size()==0) {		 // standalone comment?
+		if (value.size()!=0) // must have no value
+			Log::error("no key but value found.");
+		return;				// ==> do not add to tag-map
+	}
+
+	//find first free foo, foo-2, foo-3 (note: no foo-1)
+	int i=1;
+	std::string extkey=key;
+	while( tagMap.count(extkey) )
+	{
+		i++;
+		extkey = key + "-" + itos(i);
+	}
+
+	//add to Map -----------------------------------
+	lastNode=&*(pCurNode->children.rbegin());
+	tagMap[extkey]=lastNode;
+}
+
+void TagTree::digest(LFA_FileRef file,const std::string key /*=NULL*/,
+					   void* returnValue /*=""*/,
+					   XMP_Int32 numOfBytes /*=0*/ )
+{
+	if (numOfBytes==0) {
+		//0-byte requests *are* legitimate, reducing codeforks for the caller
+		if ( !key.empty() )
+			setKeyValue(key,"(0 bytes)");
+		return;
+	}
+
+	//do we need own space or will it be provided?
+	char* value;
+	if (returnValue)
+		value=(char*)returnValue;
+	else
+		value=new char[numOfBytes+1];
+
+	if (numOfBytes != LFA_Read ( file, value, numOfBytes, true))	// saying 1,4 guarantes read as ordered (4,1 would not)
+		Log::error("could not read %d number of files (End of File reached?)",numOfBytes);
+
+	char* out=new char[2 + numOfBytes*3 + 5]; //'0x12 34 45 78 '   length formula: 2 ("0x") + numOfBytes x 3 + 5 (padding)
+	
+	if (!key.empty()) {
+		snprintf(out,3,"0x");
+		XMP_Int64 i; // *)
+		for (i=0; i < numOfBytes; i++)
+			snprintf(&out[2+i*3],4,"%.2X ",value[i]); //always must allow that extra 0-byte on mac (overwritten again and again)
+		snprintf(&out[2+i*3],1,"\0"); // *) using i one more time (needed while bug 1613297 regarding snprintf not fixed)
+		setKeyValue(key,out);
+	}
+
+	delete out;
+	if (!returnValue) delete value; //if we own it, we delete it
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+// numeric digest routines
+//
+XMP_Int64 TagTree::digest64s(LFA_FileRef file,const std::string key /* ="" */ , bool BigEndian /*=false*/ )
+{
+	XMP_Int64 r;
+	if (8 != LFA_Read ( file, &r, 8, true))
+		Log::error("could not read 8-byte value from file (end of file?)");
+	if ( ((kBigEndianHost==1) &&  !BigEndian ) ||  ((kBigEndianHost==0) && BigEndian ))  // "XOR"
+		Flip8(&r);
+
+	if (!key.empty()) {
+		char out[25]; //longest is "18446744073709551615", 21 chars ==> 25
+		snprintf(out,24,"%d",r); //signed, mind the trailing \0 on Mac btw
+		setKeyValue(key,out);
+	}
+	return r;
+}
+
+XMP_Uns64 TagTree::digest64u(LFA_FileRef file,const std::string key /* ="" */, bool BigEndian /*=false*/,bool hexDisplay /*=false*/ )
+{
+	XMP_Uns64 r;
+	if (8 != LFA_Read ( file, &r, 8, true))
+		Log::error("could not read 8-byte value from file (end of file?)");
+	if ( ((kBigEndianHost==1) &&  !BigEndian ) ||  ((kBigEndianHost==0) && BigEndian ))  // "XOR"
+		Flip8(&r);
+	if (!key.empty()) {
+		char out[25]; //largets 64 bit no: 18446744073709551616 -1 (20 digits)
+		if (!hexDisplay)
+		{
+			//not working, 0x1244e7780 ==> 609122176 decimal (== 0x244e7780)
+			#if WIN_ENV
+				snprintf(out , 24 , "%I64u" , r);
+			#else 
+				// MAC, UNIX
+				snprintf(out , 24 , "%0xllu" , r);
+			#endif
+		}
+		else
+		{	
+			//not working, upper 32 bit empty:  			
+			#if WIN_ENV
+				snprintf( out , 24 , "0x%I64.16X" , r );
+			#else
+				snprintf( out , 24 , "0x%ll.16X" , r );
+			#endif
+		}
+		setKeyValue(key,out);
+	}
+	return r;
+}
+
+
+XMP_Int32 TagTree::digest32s(LFA_FileRef file,const std::string key /* ="" */ , bool BigEndian /*=false*/ )
+{
+	XMP_Int32 r;
+	if (4 != LFA_Read ( file, &r, 4, true))
+		Log::error("could not read 4-byte value from file (end of file?)");
+	if ( ((kBigEndianHost==1) &&  !BigEndian ) ||  ((kBigEndianHost==0) && BigEndian ))  // "XOR"
+		Flip4(&r);
+	if (!key.empty()) {
+		char out[15]; //longest signed int is "�2147483648", 11 chars 	
+		snprintf(out,14,"%d",r); //signed, mind the trailing \0 on Mac btw
+		setKeyValue(key,out);
+	}
+	return r;
+}
+
+XMP_Uns32 TagTree::digest32u(LFA_FileRef file,const std::string key /* ="" */, bool BigEndian /*=false*/,bool hexDisplay /*=false*/ )
+{
+	XMP_Uns32 r;
+	if (4 != LFA_Read ( file, &r, 4, true))
+		Log::error("could not read 4-byte value from file (end of file?)");
+	if ( ((kBigEndianHost==1) &&  !BigEndian ) ||  ((kBigEndianHost==0) && BigEndian ))  // "XOR"
+		Flip4(&r);
+	if (!key.empty()) {
+		char out[19]; //longest unsigned int is "2147483648", 10 chars resp. 0xFFFFFFFF 10 chars
+		if (!hexDisplay)
+			snprintf(out,18,"%u",r); //unsigned, mind the trailing \0 on Mac btw
+		else
+			snprintf(out,18,"0x%.8X",r); //unsigned, mind the trailing \0 on Mac btw
+		setKeyValue(key,out);
+	}
+	return r;
+}
+//////////////////
+XMP_Int16 TagTree::digest16s(LFA_FileRef file,const std::string key /* ="" */ , bool BigEndian /*=false*/ )
+{
+	XMP_Int16 r;
+	if (2 != LFA_Read ( file, &r, 2, true))
+		Log::error("could not read 2-byte value from file (end of file?)");
+	if ( ((kBigEndianHost==1) &&  !BigEndian ) ||  ((kBigEndianHost==0) && BigEndian ))  // "XOR"
+		Flip2(&r);
+	if (!key.empty()) {
+		char out[10]; //longest signed int is "�32768", 6 chars 	
+		snprintf(out,9,"%d",r);
+		setKeyValue(key,out);
+	}
+	return r;
+}
+
+XMP_Uns16 TagTree::digest16u(LFA_FileRef file,const std::string key /* ="" */, bool BigEndian /*=false*/,bool hexDisplay /*=false*/ )
+{
+	XMP_Uns16 r;
+	if (2 != LFA_Read ( file, &r, 2, true))
+		Log::error("could not read 2-byte value from file (end of file?)");
+	if ( ((kBigEndianHost==1) &&  !BigEndian ) ||  ((kBigEndianHost==0) && BigEndian ))  // "XOR"
+		Flip2(&r);
+	if (!key.empty()) {
+		char out[15]; //longest unsigned int is "65536", 5 chars resp.  0xFFFF = 6 chars
+		if (!hexDisplay)
+			snprintf(out,14,"%u",r);
+		else
+			snprintf(out,14,"0x%.4X",r);
+		setKeyValue(key,out);
+	}
+	return r;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// "expected" Overrides
+void TagTree::digest64s(XMP_Int64 expected, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/ )
+{
+	XMP_Int64 tmp=digest64s(file,"",BigEndian);
+	if ( expected != tmp )
+		throw DumpFileException("'%s' was %d, expected: %d",key.c_str(),tmp,expected);
+}
+
+void TagTree::digest64u(XMP_Uns64 expected, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/, bool hexDisplay /*=false*/)
+{
+	XMP_Uns64 tmp=digest64u( file,"",BigEndian, hexDisplay );
+	if (expected != tmp )
+		if (hexDisplay)
+			throw DumpFileException("'%s' was 0x%.16X, expected: 0x%.16X",key.c_str(),tmp,expected);
+		else
+			throw DumpFileException("'%s' was %d, expected: %d",key.c_str(),tmp,expected);
+}
+
+void TagTree::digest32s(XMP_Int32 expected, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/ )
+{
+	XMP_Int32 tmp=digest32s(file,"",BigEndian);
+	if ( expected != tmp )
+		throw DumpFileException("'%s' was %d, expected: %d",key.c_str(),tmp,expected);
+}
+
+void TagTree::digest32u(XMP_Uns32 expected, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/, bool hexDisplay /*=false*/)
+{
+	XMP_Uns32 tmp=digest32u( file,"",BigEndian, hexDisplay );
+	if (expected != tmp )
+		if (hexDisplay)
+			throw DumpFileException("'%s' was 0x%.8X, expected: 0x%.8X",key.c_str(),tmp,expected);
+		else
+			throw DumpFileException("'%s' was %d, expected: %d",key.c_str(),tmp,expected);
+}
+
+void TagTree::digest16s(XMP_Int16 expected, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/ )
+{
+	XMP_Int16 tmp=digest16s(file,key,BigEndian);
+	if ( expected != tmp )
+		throw DumpFileException("'%s' was %d, expected: %d",key.c_str(),tmp,expected);
+}
+
+void TagTree::digest16u(XMP_Uns16 expected, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/, bool hexDisplay /*=false*/)
+{
+	XMP_Uns16 tmp=digest16u( file,key,BigEndian, hexDisplay );
+	if (expected != tmp )
+		if (hexDisplay)
+			throw DumpFileException("'%s' was 0x%.4X, expected: 0x%.4X",key.c_str(),tmp,expected);
+		else
+			throw DumpFileException("'%s' was %d, expected: %d",key.c_str(),tmp,expected);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// CBR Overrides
+void TagTree::digest64s(XMP_Int64* returnValue, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/ )
+{
+	*returnValue = digest64s(file,key,BigEndian);
+}
+
+void TagTree::digest64u(XMP_Uns64* returnValue, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/, bool hexDisplay /*=false*/)
+{
+	*returnValue = digest64u( file, key,BigEndian, hexDisplay );
+}
+
+void TagTree::digest32s(XMP_Int32* returnValue, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/ )
+{
+	*returnValue = digest32s(file,key,BigEndian);
+}
+
+void TagTree::digest32u(XMP_Uns32* returnValue, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/, bool hexDisplay /*=false*/)
+{
+	*returnValue = digest32u( file, key,BigEndian, hexDisplay );
+}
+
+void TagTree::digest16s(XMP_Int16* returnValue, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/ )
+{
+	*returnValue = digest16s(file,key,BigEndian);
+}
+
+void TagTree::digest16u(XMP_Uns16* returnValue, LFA_FileRef file,const std::string key /*=""*/, bool BigEndian /*=false*/, bool hexDisplay /*=false*/)
+{
+	*returnValue = digest16u( file, key,BigEndian, hexDisplay );
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+std::string TagTree::digestString(LFA_FileRef file,const std::string key /*=""*/, size_t length /* =0 */, bool verifyZeroTerm /* =false */)
+{
+	std::string r(256,'\0');	//give some room in advance (performance)
+	r.clear();					// safety measure (may be needed on mac)
+
+	bool outside = false;	// toggle-flag: outside ASCII
+
+	for ( XMP_Uns32 i = 0; ( i<length ) || (length==0) ; i++ )
+	{
+		XMP_Uns8 ch = (XMP_Uns8)LFA_GetChar(file);
+		if ( (0x20 <= ch) && (ch <= 0x7E) ) 
+		{	//outside-case
+			if ( outside )
+				r.push_back('>');
+			r.push_back(ch);
+			outside = false;
+		} else {
+			if ( !outside ) 
+				r.push_back('<');	//first inside
+			else if (!((length==0) && (ch =='\0')))
+				r.push_back(' ');	//further inside (except very last)
+			outside = true;
+			if ( (length==0) && (ch == '\0' ) )
+				break; // lenght zero => watch for zero termination...
+			char tmp[4];
+			sprintf(tmp, "%.2X", ch ); 
+			r+=tmp;			
+		}
+	}
+
+	if ( outside ) r.push_back('>'); //last one
+
+	if ( verifyZeroTerm )
+	{
+		XMP_Uns8 ch = (XMP_Uns8)LFA_GetChar(file);
+		if ( ch != 0 )
+			Log::error("string for key %s not terminated with zero as requested but with 0x%.2X",key.c_str(),ch);
+	}
+
+
+	if (!key.empty())
+		setKeyValue(key,r);
+
+	return r;
+}
+
+void TagTree::comment(const std::string comment)
+{
+	setKeyValue("","",comment);
+}
+
+void TagTree::comment(const char* format, ...)
+{
+	char buffer[XMPQE_BUFFERSIZE];
+	va_list args;
+	va_start(args, format);
+		vsprintf(buffer, format, args);
+	va_end(args);
+
+	setKeyValue("","",buffer);
+}
+
+//adding a subnode to tagMap and current node
+//(do "go in", pushes onto nodeStack, making this the current node)
+void TagTree::pushNode(const std::string key)
+{
+	//TODO: adding fromArgs("offset:%s",LFA_Seek( file, offset_CD ,SEEK_SET )); <== requires file to be passed in
+	setKeyValue(key,"","");
+	//_and_ push reference to that one on stack
+	Node* pCurNode=*nodeStack.rbegin();
+	nodeStack.push_back( &*pCurNode->children.rbegin() );
+}
+
+//formatstring wrapper
+void TagTree::pushNode(const char* format, ...)
+{
+	char buffer[XMPQE_BUFFERSIZE];
+	va_list args;
+	va_start(args, format);
+		vsprintf(buffer, format, args);
+	va_end(args);
+
+	pushNode( std::string(buffer) );
+}
+
+void TagTree::addOffset(LFA_FileRef file)
+{
+	// 3 points for doing it here: shortness, convenience, 64bit forks needed 
+	#if WIN_ENV
+		addComment( "offset: 0x%I64X", LFA_Tell( file ) );
+	#else
+		addComment( "offset: 0x%ll.16X", LFA_Tell( file ) );
+	#endif
+}
+
+//takes a Node off the stack
+// - addTag()'s will now go to the prior Node
+void TagTree::popNode()
+{
+	if (nodeStack.size() <= 1)
+		Log::error("nodeStack underflow: %d",nodeStack.size());
+	nodeStack.pop_back();
+}
+
+// takes all Nodes from the stack
+// - the right thing to do after a parsing failure to at least dump
+//   the partial tree till there
+void TagTree::popAllNodes()
+{
+	while (nodeStack.size() > 1)
+		nodeStack.pop_back();
+}
+
+
+void TagTree::changeValue(const std::string value)
+{
+	if (!lastNode)
+		Log::error("lastnode NULL");
+	lastNode->value=value;
+}
+
+void TagTree::changeValue(const char* format, ...)
+{
+	char buffer[XMPQE_BUFFERSIZE];
+	va_list args;
+	va_start(args, format);
+		vsprintf(buffer, format, args);
+	va_end(args);
+
+	changeValue( std::string(buffer) );
+}
+
+
+void TagTree::addComment(const std::string comment)
+{
+	if (!lastNode)
+		Log::error("lastnode NULL");
+	lastNode->comment=lastNode->comment +
+		( (lastNode->comment.size())?",":"") //only add comma, if there already is...
+		+comment;
+}
+
+void TagTree::addComment(const char* format, ...)
+{
+	char buffer[4096];
+	va_list args;
+	va_start(args, format);
+		vsprintf(buffer, format, args);
+	va_end(args);
+
+	addComment( std::string(buffer) );
+}
+
+// ============================================================================
+// Output functions
+// ============================================================================
+
+// this is essentiall the last function to call...
+// - fileDump "end-users" should call it by just saying dumpTree()
+// - dumps tree to stdout (by way of Log::info)
+// - recursive calls, depth is used for indentation
+void TagTree::dumpTree(bool commentsFlag /*true*/,Node* pNode /*null*/ ,unsigned int depth /*=0*/)
+{
+	if (!pNode) { //NULL --> initial node is rootNode
+		//check (only needed on first==outermost call) that push and pop match...
+		if (nodeStack.size()>1)
+			Log::error("nodeStack not emptied: should be 1 but is %d",nodeStack.size());
+		//no need to iterate or dump rootnode itself, 
+		for( NodeList::iterator iter = rootNode.children.begin(); iter != rootNode.children.end(); iter++ )
+			dumpTree ( commentsFlag,&*iter, depth); //to not iterate on first level
+		return;							//...and then finally return
+	}
+
+	std::string indent(depth*2,' ');	//read: tab 4
+
+	if (commentsFlag) {
+		Log::info( "%s%s%s%s%s%s%s%s%s",	//fancy formatting  foo='bar' [re,do]
+						indent.c_str(),
+						pNode->key.c_str(),
+						pNode->value.size()?" = '":"",
+						pNode->value.c_str(),
+						pNode->value.size()?"'":"",
+						( pNode->key.size() + pNode->value.size() > 0 ) ? " ":"",
+						pNode->comment.size() && ( pNode->key.size() || pNode->value.size() )   ?"[":"", 
+							//standalone comments don't need brackets
+						pNode->comment.c_str(),
+						pNode->comment.size() && ( pNode->key.size() || pNode->value.size() ) ?"]":""
+					);	
+	} else {
+		//if "NoComments" mode, then make sure, there at least is a comment to avoid blankline
+		if ( pNode->key.size() || pNode->value.size())
+		{
+			Log::info( "%s%s%s%s%s",	//fancy formatting  foo='bar' [re,do]
+					indent.c_str(),
+					pNode->key.c_str(),
+					pNode->value.size()?" = '":"",
+					pNode->value.c_str(),
+					pNode->value.size()?"'":""
+				);
+		}
+	}
+	
+	//iterate over children  (gracefully covers no-children case)
+	for( NodeList::iterator iter = pNode->children.begin(); iter != pNode->children.end(); iter++ )
+		dumpTree ( commentsFlag, &*iter, depth+1);
+}
+
+void TagTree::dumpTagMap()
+{
+	for( TagMap::iterator iter = tagMap.begin(); iter != tagMap.end(); iter++ )
+	{
+		Node* pNode=((*iter).second);
+		if (!pNode->children.size())	//supress node with children
+			Log::info( "%s%s%s%s",	//(no index string this time)
+					pNode->key.c_str(),
+					pNode->value.size()?" = '":"",
+					pNode->value.c_str(),
+					pNode->value.size()?"'":""
+				);
+	}
+}
+
+// shrinked copy of dumpTree (which has faithfull order)
+// just no commenting, indenting,...)
+void TagTree::dumpTagList(Node* pNode,unsigned int depth /*=0*/)
+{
+	if (!pNode) { //NULL --> initial node is rootNode
+		//check (only needed on first==outermost call) that push and pop match...
+		if (nodeStack.size()>1)
+			Log::error("nodeStack not emptied: should be 1 but is %d",nodeStack.size());
+		//no need to iterate or dump rootnode itself, 
+		for( NodeList::iterator iter = rootNode.children.begin(); iter != rootNode.children.end(); iter++ )
+			dumpTagList ( &*iter, depth);
+		return;
+	}
+
+	//make sure, there at least is a comment to avoid blankline
+	if ( pNode->key.size() || pNode->value.size())
+	{
+		Log::info( "%s%s%s%s",	//fancy formatting  foo='bar' [re,do]
+				pNode->key.c_str(),
+				pNode->value.size()?" = '":"",
+				pNode->value.c_str(),
+				pNode->value.size()?"'":""
+			);
+	}
+	
+	for( NodeList::iterator iter = pNode->children.begin(); iter != pNode->children.end(); iter++ )
+		dumpTagList ( &*iter, depth+1);
+
+}
+
+std::string TagTree::getValue(const std::string key)
+{
+	if ( !hasNode(key) )
+		Log::error("key %s does not exist",key.c_str());
+	return tagMap[key]->value;
+}
+
+std::string TagTree::getComment(const std::string key)
+{
+	if ( !hasNode(key) )
+		Log::error("key %s does not exist",key.c_str());
+	return tagMap[key]->comment;
+}
+
+bool TagTree::hasNode(const std::string key)
+{
+	if ( tagMap.count(key)==0 )
+		return false; //no such node
+	return true;
+}
+
diff --git a/samples/source/common/TagTree.h b/samples/source/common/TagTree.h
new file mode 100644
index 0000000..7ec490c
--- /dev/null
+++ b/samples/source/common/TagTree.h
@@ -0,0 +1,186 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+#ifndef TagTree_H
+#define TagTree_H
+
+#include <map>
+#include <list>
+#include <string>
+#include "EndianUtils.hpp"
+#include "globals.h"
+#include "XMP_Const.h" //needed for setKV convenience functions
+#include "Log.h"
+
+#include "LargeFileAccess.hpp"
+void LFA_Throw ( const char* msg, int id );
+
+using namespace std;
+
+// TagTree routines must be able to throw these..
+class DumpFileException : public std::runtime_error {
+	public:
+		DumpFileException(const char* format, ...);
+
+		const char* what_dumpfile_reason(); //no override, but almost..
+	private:
+		static const unsigned int DUMPFILE_MAX_ERROR_LENGTH=2048;
+		char buffer [DUMPFILE_MAX_ERROR_LENGTH+1];
+};
+
+class TagTree {
+private:
+	struct Node; //forward-looking declaration
+	typedef std::list<Node> NodeList;
+
+	struct Node {
+		std::string key;		// node structure name resp. tag name
+		std::string value;		// value if applicable/of relevance
+		std::string comment;	// comment string, add-on as many as you like
+		NodeList children;		// children of this tag, if any
+	public:
+		//default-constructor is an std::container requirement. DO NOT ACTUALLY USE.
+		Node() {
+			key=std::string("unnamed"); // should be overridden at all times
+			value=std::string("no value");
+			comment=std::string("no comment");
+			children.clear();			// be safe (std::mac-issue..) clear beforehand
+		}
+
+		//the one to use
+		Node(std::string key, std::string value, std::string comment) {
+			this->key=key;
+			this->value=value;
+			this->comment=comment;
+			children.clear();
+		}
+	};
+
+	// the map (always alphabetic) to collect key-value pairs
+	// - Node* rather than string to have access to value and comment info
+	typedef std::map<std::string,Node*> TagMap;
+	TagMap tagMap;
+
+	//used for changeValue and addComment
+	//(NB: not null-ed or such on push+pop, thus stretches beyond)
+	Node* lastNode;
+
+	//we need a stack to iterate in and out
+	// during build-up and dump recursion
+	typedef std::list<Node*> NodeStack;
+
+	NodeStack nodeStack;
+	Node rootNode; //TODO: ("root","");
+	
+public:
+	TagTree();
+	~TagTree();
+
+	//input functions =========================================================
+
+	void pushNode(const std::string key);
+	void pushNode(const char* format, ...);
+
+	// add file offset as comment -> own routine to better output 64 bit offsets...
+	void addOffset(LFA_FileRef file);
+
+	void popNode();
+	void popAllNodes();
+
+	//sets a key-value pair and optinal comment. value is also optional and may be set at a later time
+	//can also be used to set pure, standalone comments (using key==value=="")
+	void setKeyValue(const std::string key,const std::string value="", const std::string comment="");
+	
+	// convenience functions //////////////////////////////////////////////////////////////////
+	// these functions read bytes (assert in file-length), dump them to screen (as hex or as number)
+	// and optionally return the values for further processing
+
+	//read, convert endianess, dump certain values all in one go:
+	// * key - may be NULL if you just want to obtain the values but not make a KV entry
+	// * returnValue - returns the bytes digested
+	// * numOfBytes - 0-byte requests *are* legitimate, as they may reduce codeforks for the client
+	void digest(LFA_FileRef file,const std::string key="",
+							void* returnValue=NULL,
+							XMP_Int32 numOfBytes=0);
+
+	////////////////////////////////////////////////////////////////////////////////////
+	// numeric digest routines
+	//
+	// same parameters as above, plus:
+	// * bigEndian -  set to false, if the number is in the file as little endian
+	//                ( correct return value according to machine type is taken care of for either setting)
+	// overload signed and unsigned, 32 and 16 bit
+	// Note, again: key may be NULL if you just want to obtain the values but not make a KV entry
+	XMP_Int64 digest64s(LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	XMP_Uns64 digest64u(LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+	XMP_Int32 digest32s(LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	XMP_Uns32 digest32u(LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+	XMP_Int16 digest16s(LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	XMP_Uns16 digest16u(LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+
+	// "expected" Overrides
+	void digest64s(XMP_Int64 expected, LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	void digest64u(XMP_Uns64 expected, LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+	void digest32s(XMP_Int32 expected, LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	void digest32u(XMP_Uns32 expected, LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+	void digest16s(XMP_Int16 expected, LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	void digest16u(XMP_Uns16 expected, LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+
+	//CBR Overrides
+	void digest64s(XMP_Int64* returnValue, LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	void digest64u(XMP_Uns64* returnValue, LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+	void digest32s(XMP_Int32* returnValue, LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	void digest32u(XMP_Uns32* returnValue, LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+	void digest16s(XMP_Int16* returnValue, LFA_FileRef file,const std::string key="", bool BigEndian=false);
+	void digest16u(XMP_Uns16* returnValue, LFA_FileRef file,const std::string key="", bool BigEndian=false,bool hexDisplay=false);
+
+
+	//8-bit string (whichever encoding -> "buginese") to std::string
+	//use length==0 to indicate zero-termination,
+	//otherwise indicated lenght will be grabbed also accross \0 's
+	//(length is counted w/o trailing zero termination, i.e. length("hans")==4 )
+	// TODO: length default = 0 not yet implemented
+	// verifyZeroTerm
+	//  - has an effect only if a length!=0 is given
+	//  - in this case, asserts that the string has a terminating zero 
+	//   (_after_ <length> bytes, otherwise that byte is not read which has an impact on the filepointer!)
+	//    would throw if any zero (\0) is encountered prior to that
+	std::string digestString(LFA_FileRef file,const std::string key="", size_t length=0, bool verifyZeroTerm=false );
+
+	// (wrappers)
+	// standalone comment
+	void comment(const std::string comment);
+	// standalone comment
+	// be aware of bug1741056, feeding 64bit numbers might not output correctly
+	void comment(const char* format, ...);
+
+	//sometimes its worth changing (or actually setting for the first time) they current
+	//(aka last set) key/value at a later time. includes correction in tagmap.
+	void changeValue(const std::string value);
+	void changeValue(const char* format, ...);
+
+	//adds a comment to last prior entry ( which could be KeyValue, Node or standalone comment...)
+	void addComment(const std::string comment);
+	//adds a comment to last prior entry ( which could be KeyValue, Node or standalone comment...)
+	void addComment(const char* format, ...);
+
+	//output functions ===========================================================
+	void dumpTree(bool commentsFlag=true, Node* pNode = NULL,unsigned int depth=0);
+
+	void dumpTagMap();
+	void dumpTagList(Node* pNode = NULL,unsigned int depth=0);
+
+	std::string getValue(const std::string key);
+	std::string getComment(const std::string key);
+
+	//returns true if there is such a node, false if not, error if it happens to be key-value pair
+	bool hasNode(const std::string key);
+};
+
+#endif
diff --git a/samples/source/common/globals.h b/samples/source/common/globals.h
new file mode 100644
index 0000000..291ceb3
--- /dev/null
+++ b/samples/source/common/globals.h
@@ -0,0 +1,43 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+//
+// =================================================================================================
+
+#ifndef XMPQE_GLOBALS_H
+#define XMPQE_GLOBALS_H
+
+	#include <string>
+
+	//sanity check platform/endianess
+	#if !defined(WIN_ENV) && !defined(MAC_ENV) && !defined(UNIX_ENV) 
+		#error "XMP environment error - must define one of MAC_ENV, WIN_ENV, or UNIX_ENV"
+	#endif
+
+	#ifdef WIN_ENV
+		#define XMPQE_LITTLE_ENDIAN
+	#elif (defined(MAC_ENV) || defined(UNIX_ENV))
+		#if __BIG_ENDIAN__
+			#define XMPQE_BIG_ENDIAN
+		#elif __LITTLE_ENDIAN__
+			#define XMPQE_LITTLE_ENDIAN
+		#else
+			#error "Neither __BIG_ENDIAN__ nor __LITTLE_ENDIAN__ is set"
+		#endif
+	#else
+		#error "Unknown build environment, neither WIN_ENV nor MAC_ENV nor UNIX_ENV"
+	#endif
+
+	const static unsigned int XMPQE_BUFFERSIZE=4096; //should do for all my buffer output, but you never now (stdarg dilemma)
+
+	const char OMNI_CSTRING[]={0x41,0xE4,0xB8,0x80,0x42,0xE4,0xBA,0x8C,0x43,0xC3,0x96,0x44,0xF0,0x90,0x81,0x91,0x45,'\0'};
+	const char BOM_CSTRING[]={0xEF,0xBB,0xBF,'\0'}; // nb: forgetting the '\0' is a very evil mistake.
+	const std::string OMNI_STRING(OMNI_CSTRING);
+	//if plain utf8 conversion, mac/win local encoding is a different story...
+	const std::string OMNI_BUGINESE("A<E4 B8 80>B<E4 BA 8C>C<C3 96>D<F0 90 81 91>E");
+
+#endif // XMPQE_GLOBALS_H
+
diff --git a/samples/source/dumpfile/main.cpp b/samples/source/dumpfile/main.cpp
new file mode 100644
index 0000000..d1541a6
--- /dev/null
+++ b/samples/source/dumpfile/main.cpp
@@ -0,0 +1,259 @@
+// =================================================================================================
+// Copyright 2004-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+//
+// 
+// Dumpfile is a dev utility to understand, and to a certain degree validate file structures, with 
+// specific focus on metadata related aspects, naturally. Dumpfile is NOT meant to extract
+// valid metadata from files. Dumpfile is NOT meant to be a production tool.
+// NO reconciliation, NO XMP logic, NO attention to encoding matters, etc.
+// 
+// Dumpfile gives developers a view on files just like a hex editor, 
+// slightly more readible but in no way more sophisticated.
+
+//sanity check platform/endianess
+#include "globals.h"
+
+#ifdef WIN_ENV
+#pragma warning ( disable : 4267 )	// suppress string conversion warning
+//	#pragma warning ( disable : 1234 )	// say what you do here
+#endif
+
+//only define in one non-public-source, non-header(.cpp) place
+
+const int DUMPFILEVERSION=2;
+#define EXENAME "dumpfile"
+
+//standard stuff
+#include <stdexcept>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <sstream>
+
+//XMPCore (only!)
+#define TXMP_STRING_TYPE std::string
+#include "XMP.hpp"			//NB: no XMP.incl_cpp here on purpose, gets compiled in main...
+#include "XMP.incl_cpp"		//include in EXACTLY one source file (i.e. main, in Action gets you trouble...)
+#include "XMP_Const.h"
+
+//QE related
+#include "Log.h"
+
+#include "LargeFileAccess.hpp"
+
+void LFA_Throw ( const char* msg, int id ) 
+{
+	switch(id)
+	{
+		case kLFAErr_InternalFailure:
+			Log::error("LFA User Abort:%s", msg);
+			break;
+		case kLFAErr_ExternalFailure:
+			Log::error("LFA External Failure:%s", msg);
+			break;
+		case kLFAErr_UserAbort:
+			Log::error("LFA User Abort:%s", msg);
+			break;
+		default:
+			Log::error("LFA unknown error:%s", msg); //should not occur
+			break;
+	}
+}
+
+#include "DumpFile.h"
+
+using namespace std;
+
+void printUsageShort() {
+	Log::info("%s -version",EXENAME);
+	Log::info("    Print version information for this utility");
+	Log::info("");
+	Log::info("%s -help",EXENAME);
+	Log::info("    Print descriptions of all available switches, including examples");
+	Log::info("");
+	Log::info("%s [ -help | -version | [-keys|-tree|-list] [-nocomments] <path> ]",EXENAME);
+	Log::info("");
+	Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved.");
+	Log::info("");
+}
+
+void printUsageLong() {
+	Log::info("%s -version",EXENAME);
+	Log::info("    Print version information for this utility");
+	Log::info("");
+	Log::info("%s -help",EXENAME);
+	Log::info("    Print descriptions of all available switches, including examples");
+	Log::info("");
+	Log::info("%s [ -help | -version | [-keys|-tree|-list] [-nocomments] <path> ]",EXENAME);
+	Log::info("");
+	Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved.");
+	Log::info("NOTICE:  Adobe permits you to use, modify, and distribute this file in");
+	Log::info("         accordance with the terms of the Adobe license agreement");
+	Log::info("         accompanying it.");
+	Log::info("");
+	Log::info("Switches:");
+	Log::info("-help    Prints usage information for the command.");
+	Log::info("");
+	Log::info("-version Prints version information for this tool, and for the version");
+	Log::info("         of XMPCore to which it is statically linked. (NB: Dumpfile does");
+	Log::info("         not use XMPFiles.");
+	Log::info("");
+	Log::info("-tree    Shows the tree structure of the file. (default)");
+	Log::info("");
+	Log::info("-keys    Shows only the key-value nodes found in the file, as a list with no");
+	Log::info("         hierarchical structure, in alphabetical order by key.");
+	Log::info("");
+	Log::info("-list    Shows only the key-value nodes found in the file, as a list with no");
+	Log::info("         hierarchical structure, in the order of parsing.");
+	Log::info("");
+	Log::info("-nocomments   Supresses the comment portion of key-value nodes.");
+	Log::info("");
+	
+	Log::info("");
+	Log::info("Examples:");
+	Log::info("%s -keys Sample.jpg",EXENAME);
+	Log::info("");
+	Log::info("dumpfile returns 0 if there are no errors. Note: Warnings and errors");
+	Log::info("are printed as part of the stdout output, not to stderr.");
+	Log::info("");
+}
+
+int
+main( int argc, char* argv[] )
+{
+	//if both not flagged will default to tree-only (below)
+	bool treeFlag=false;
+	bool keysFlag=false;
+	bool listFlag=false;
+	bool commentsFlag=true;	// true <=> do not supress comments (supressing them is better for kgo)
+
+	//NB: not logging to file since mostly pointless...
+	int returnValue=0; //assume all will be good
+
+	int i=1; //define outside scope to access in catch clause
+	try {
+		if ( ! SXMPMeta::Initialize( ) )
+		{
+			Log::info( "SXMPMeta::Initialize failed!" );
+			return -1;
+		}
+
+		//no parameters? print usage.
+		if ( argc == 1 )
+		{
+			printUsageShort();
+			return 0;
+		}
+
+		//one parameter? check...
+		if (
+			!strcmp("-help",argv[1]) ||
+			!strcmp("--help",argv[1]) ||
+			!strcmp("-h",argv[1])     ||
+			!strcmp("-?",argv[1])     ||
+			!strcmp("/?",argv[1]) )
+		{
+			printUsageLong();
+			return 0;
+		} 
+		else if ( !strcmp("-version",argv[1]) ) 
+		{
+			XMP_VersionInfo coreVersion;
+			SXMPMeta::GetVersionInfo ( &coreVersion );
+			Log::info("using XMPCore %s", coreVersion.message );
+			Log::info("dumpfile Version %d", DUMPFILEVERSION );
+			return 0;
+		}
+
+		//multiple parameters? all but last must be switches!
+		while (i < argc-1) //while not last parameter
+		{
+			if ( !strcmp("-keys",argv[i]) ) 
+				keysFlag=true;
+			else if ( !strcmp("-tree",argv[i]) ) 
+				treeFlag=true;
+			else if ( !strcmp("-list",argv[i]) ) 
+				listFlag=true;
+			else if ( !strcmp("-nocomments",argv[i]) ) 
+				commentsFlag=false;
+			else if (argv[i][0] == '-') //yet-another-switch?
+			{
+				Log::info("unknown switch %s",argv[i]);
+				printUsageShort();
+				return -1;
+			}
+			else
+			{
+				Log::info("only one image at a time: %s",argv[i]);
+				printUsageShort();
+				return -1;
+			}
+			i++;
+		} //while
+	
+		if (!treeFlag && !keysFlag && !listFlag) //if nothing request default to "-tree"
+			treeFlag=true;
+
+		TagTree tree;
+		std::string errMsg;
+		try  //parsing failures on incorrect files should still lead to partial dump
+		{
+			DumpFile::Scan(argv[i],tree);
+		}
+		catch (DumpFileException& d)
+		{
+			tree.popAllNodes();	
+			returnValue = -9; //earmark but keep going
+			errMsg=d.what_dumpfile_reason();
+		}
+
+		if (treeFlag)
+			tree.dumpTree(commentsFlag);
+		if (treeFlag && keysFlag) //separator if needed
+			Log::info("------------------------------------------------------------------------");
+		if (keysFlag)
+			tree.dumpTagMap();
+		if ( (treeFlag || keysFlag) && listFlag) //separator if needed
+			Log::info("------------------------------------------------------------------------");
+		if (listFlag)
+			tree.dumpTagList();	
+
+		//order appears more logical to print after the dumping happended:
+		if (returnValue != 0) {
+			Log::info("parsing failed. \n%s",errMsg.c_str());
+		}
+
+		SXMPMeta::Terminate();
+	}	
+	catch (XMP_Error& x ) {
+		Log::info("XMPError on file %s:\n%s", argv[i] , x.GetErrMsg() );
+		return -3;
+	}
+	catch (LOG_Exception& q) { 
+		//also used by assert which are very self-explanatory
+		//neutral wording for standalone app
+		Log::info("INTERNAL parsing error\n- file: %s\n%s", argv[i] , q.what() );
+		return -4;
+	}
+	catch ( std::exception &e )
+	{
+		Log::info("std:exception on file %s:\n%s", argv[i] , e.what() );
+		return -5;
+	}
+	catch (...)
+	{
+		Log::info("unknown (...) exception on file %s", argv[i] );
+		return -6;		
+	}
+
+	if (returnValue==0)
+		Log::info("OK");
+	else
+		Log::info("ERROR(s) encountered");
+	return returnValue;
+}
diff --git a/samples/source/xmpcommand/Actions.cpp b/samples/source/xmpcommand/Actions.cpp
new file mode 100644
index 0000000..2324b10
--- /dev/null
+++ b/samples/source/xmpcommand/Actions.cpp
@@ -0,0 +1,334 @@
+// =================================================================================================
+// Copyright 2004-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+// actions.cpp|h
+// performs one of the XMPFiles actions as indicated by the paramters (and evaluated in main)
+//
+
+const char * XMP_EXE_VERSION= "4.4";
+
+#include <stdexcept>
+#include <stdarg.h>
+
+//XMP related
+#define TXMP_STRING_TYPE std::string
+#define XMP_INCLUDE_XMPFILES 1
+#include "XMP.hpp"			//NB: no XMP.incl_cpp here on purpose, gets compiled in main...
+#include "XMP_Const.h"
+
+#include "globals.h"
+#include "Log.h"
+#include "OutputUtils.h"
+
+#include "Actions.h" //must come after XMP.hpp/XMP_Const.h
+
+// utility functions **************************************************************
+
+	/* does NOT include path fixing (unix vs wxp) on purpose
+	* being readable of course implies existing
+	*  - note: this utility is also used by cppunit sanity checks
+	*/
+	bool fileIsReadable(const std::string filename)
+	{
+		FILE* fp = NULL;
+		fp = fopen( filename.c_str(), "rb" );
+		if( fp != NULL )
+		{
+			fclose( fp );
+			return true;
+		}
+		return false;
+	}
+
+	bool fileIsWritable(const std::string filename)
+	{
+		FILE* fp = NULL;
+		fp = fopen( filename.c_str(), "rb+" );
+		if( fp != NULL )
+		{
+			fclose( fp );
+			return true;
+		}
+		return false;
+	}
+
+	void verifyFileIsReadable(const std::string filename)
+	{
+		if (! fileIsReadable(filename))
+			Log::error("file %s is not readable or not existing.",filename.c_str());
+
+	}
+
+	void verifyFileIsWritable(const std::string filename)
+	{
+		if (! fileIsWritable(filename))
+			Log::error("file %s is not readwritable or not existing.",filename.c_str());
+	}
+
+	
+	std::string getStringFromFile(const std::string& filename)
+	{
+		verifyFileIsReadable(filename);
+
+		//figure out length
+		FILE * file = fopen ( filename.c_str(), "rb" );
+		fseek ( file, 0, SEEK_END );
+		XMP_Uns32 length = ftell( file );
+		fseek ( file, 0, SEEK_SET );
+		
+		//write into string
+		std::string content;
+		content.reserve ( (XMP_Uns32) length );
+		content.append ( length, ' ' );
+		fread ( (char*)content.data(), 1, length, file );
+		fclose ( file );
+		return content;
+	}
+
+// ********************************************************************************
+
+void Actions::version() {
+	XMP_VersionInfo coreVersion, filesVersion;
+	SXMPMeta::GetVersionInfo ( &coreVersion );
+	SXMPFiles::GetVersionInfo ( &filesVersion );
+	Log::info("%s", coreVersion.message);
+	Log::info("%s", filesVersion.message);
+	Log::info("Executable Version:%s", XMP_EXE_VERSION);
+
+#ifdef WIN_ENV
+	Log::info("compiled on Windows on %s, %s",__DATE__,__TIME__);
+#endif
+#ifdef MAC_ENV
+	Log::info("compiled on Mac on %s, %s",__DATE__,__TIME__);
+#endif
+#ifndef NDEBUG
+	Log::info("Configuration: debug");
+#else
+	Log::info("Configuration: release");
+#endif
+	Log::info("Edition: Public SDK");
+#if defined(XMPQE_BIG_ENDIAN)
+	Log::info("Big endian machine");
+#elif defined(XMPQE_LITTLE_ENDIAN)
+	Log::info("Little endian machine");
+#else
+	Log::warn("unknown Endian !!!");
+#endif
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+void Actions::info() {
+	if(!this->switch_nocheck) verifyFileIsReadable(this->mediafile);
+	XMP_FileFormat xmpFileFormat=kXMP_UnknownFile;
+	SXMPFiles xmpFile;
+
+	if ( !xmpFile.OpenFile(this->mediafile,xmpFileFormat,generalOpenFlags) )
+		Log::error("error opening file %s",this->mediafile.c_str());
+
+	std::string out_filepath;
+	XMP_OptionBits out_openFlags;
+	XMP_FileFormat out_fileFormat;
+	XMP_OptionBits out_handlerFlags;
+
+	if (!xmpFile.GetFileInfo(&out_filepath,&out_openFlags,&out_fileFormat,&out_handlerFlags))
+		Log::error("error doing GetFileInfo %s",this->mediafile.c_str());
+
+	//FilePath (just verify that identical to what's been used)
+	if ( strcmp(out_filepath.c_str(),this->mediafile.c_str()) ) //that's if it NOT matches (!=0 ...)
+		Log::warn("media filepath %s does not matches filepath %s obtained from GetFileInfo",
+		out_filepath.c_str(),this->mediafile.c_str());
+
+	//openOptions (also verify that identical to what's been used)
+	std::string openFlagsString=Utils::XMPFiles_OpenOptionsToString(out_openFlags);
+	Log::info("openFlags: %s (%X)", openFlagsString.c_str(), out_openFlags);
+	if ( generalOpenFlags != out_openFlags )
+		Log::warn("out_openFlags (0x%X) differ from those used for open (0x%X)",
+		out_openFlags,generalOpenFlags);
+
+	//FileFormat (resolves, usually by way of extension unless specified)
+	std::string fileFormatName, fileFormatDescription;
+	Utils::fileFormatNameToString(out_fileFormat,fileFormatName,fileFormatDescription);
+	Log::info("fileFormat: %s (%s,0x%X)",
+		fileFormatDescription.c_str(),fileFormatName.c_str(),out_fileFormat);
+
+	//FormatInfo aka "HandlerFlags" (show what is possible with this format)
+	std::string formatInfoString=Utils::XMPFiles_FormatInfoToString(out_handlerFlags);
+	Log::info("formatInfo:%s (0x%X)", formatInfoString.c_str(), out_handlerFlags);
+
+	xmpFile.CloseFile(generalCloseFlags); //(enabled again now that bug 1352603 is fixed)
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+void Actions::get() {
+	if(!this->switch_nocheck) verifyFileIsReadable(this->mediafile);
+	XMP_FileFormat xmpFileFormat=kXMP_UnknownFile;
+
+	SXMPFiles xmpFile;
+	std::string xmpDump; //really just the raw string here
+
+	if ( !xmpFile.OpenFile(this->mediafile,xmpFileFormat,generalOpenFlags) )
+		Log::error("error opening file %s",this->mediafile.c_str());
+
+	if ( this->switch_compact ) {
+		if ( !xmpFile.GetXMP(0,&xmpDump,0))
+			Log::warn("file contains no XMP. - says xmpFile.GetXMP()");
+		else
+			Log::info("%s",xmpDump.c_str());
+	} else {
+		SXMPMeta xmpMeta; //get meta-object first, then get serialization
+		if ( !xmpFile.GetXMP(&xmpMeta,0,0))
+			Log::warn("file contains no XMP. - says xmpFile.GetXMP()");
+		else {
+			xmpMeta.SerializeToBuffer(&xmpDump,
+				0, //NOT using kXMP_UseCompactFormat - Use a highly compact RDF syntax and layout.
+				0);		//receiving string, options, 0(default) padding
+			Log::info("%s",xmpDump.c_str());
+		}
+	}
+
+	xmpFile.CloseFile(generalCloseFlags); //(enabled again now that bug 1352603 is fixed)
+}
+///////////////////////////////////////////////////////////////////////////////////////
+
+void Actions::dump() {
+	if(!this->switch_nocheck) verifyFileIsReadable(this->mediafile);
+	XMP_FileFormat xmpFileFormat=kXMP_UnknownFile;
+
+	SXMPFiles xmpFile;
+	std::string xmpDump; //really just the raw string here
+
+	if ( !xmpFile.OpenFile(this->mediafile,xmpFileFormat,generalOpenFlags) )
+		Log::error("error opening file %s",this->mediafile.c_str());
+
+	SXMPMeta xmpMeta; //get meta-object first, then get serialization
+	if ( !xmpFile.GetXMP(&xmpMeta,0,0))
+		Log::warn("file contains no XMP. - says xmpFile.GetXMP()");
+	else {
+		Utils::dumpXMP(&xmpMeta);
+	}
+	
+	xmpFile.CloseFile(generalCloseFlags); //(enabled again now that bug 1352603 is fixed)
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+void Actions::thumb() {
+	if(!this->switch_nocheck) verifyFileIsReadable(this->mediafile); //need readability
+	XMP_FileFormat xmpFileFormat=kXMP_UnknownFile;
+
+	SXMPFiles xmpFile;
+	XMP_ThumbnailInfo tnailInfo;
+	if ( !xmpFile.OpenFile(this->mediafile,
+							xmpFileFormat,
+							 generalOpenFlags | kXMPFiles_OpenCacheTNail) )
+		Log::error("error opening file %s",this->mediafile.c_str());
+
+	if ( !xmpFile.GetThumbnail(&tnailInfo)) {
+		Log::warn("no thumbnail found. - says xmpFile.GetThumbnail()");
+		//TODO: comment-in again once bug 1352603 fixed
+		//xmpFile.CloseFile(generalCloseFlags);
+		return;
+	}
+	else {
+		//FileFormat (resolves, usually by way of extension unless specified)
+		std::string fileFormatName, fileFormatDescription;
+		Utils::fileFormatNameToString(tnailInfo.fileFormat,fileFormatName,fileFormatDescription);
+		Log::info("fileFormat: %s (%s,0x%X)",
+			fileFormatDescription.c_str(),fileFormatName.c_str(),tnailInfo.fileFormat);
+
+		Log::info("full image size:%dx%d",tnailInfo.fullWidth,tnailInfo.fullHeight);
+		Log::info("full orientation:0x%X",tnailInfo.fullOrientation);
+		Log::info("thumbnail size:%dx%d (%d bytes)",tnailInfo.tnailWidth,tnailInfo.tnailHeight,tnailInfo.tnailSize);
+		Log::info("thumbnail orientation:0x%X",tnailInfo.tnailOrientation);
+		Log::info("thumbnail format 0x%X",tnailInfo.tnailFormat);
+	}
+
+	xmpFile.CloseFile(generalCloseFlags); //(enabled again now that bug 1352603 is fixed)
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+void Actions::put() {
+	//need read and write
+	if(!this->switch_nocheck) verifyFileIsWritable(this->mediafile);
+
+	//first open regular to see if injection possible
+	XMP_FileFormat xmpFileFormat=kXMP_UnknownFile;
+	SXMPFiles xmpFile;
+
+	if ( !xmpFile.OpenFile(this->mediafile,xmpFileFormat,generalOpenFlags | kXMPFiles_OpenForUpdate) )
+		Log::error("error opening file %s",this->mediafile.c_str());
+
+	std::string out_filepath;
+	XMP_FileFormat out_fileFormat;
+	XMP_OptionBits out_handlerFlags;
+
+	if (!xmpFile.GetFileInfo(0,0,&out_fileFormat,&out_handlerFlags))
+		Log::error("error doing GetFileInfo %s",this->mediafile.c_str());
+
+	bool foundXMP = xmpFile.GetXMP( 0, 0, 0);
+
+	//construct the to-be-injected snippet
+	std::string xmpMetaString=getStringFromFile(this->xmpsnippet);
+	SXMPMeta xmpMeta(xmpMetaString.c_str(),(XMP_StringLen)xmpMetaString.length());
+
+	// append metadata if we found XMP or if we didn't but can inject
+	if ( foundXMP == true || (out_handlerFlags & kXMPFiles_CanInjectXMP ) ) {
+
+		if ( !xmpFile.CanPutXMP(xmpMeta) )
+			Log::warn("canPutXMP denies I can inject: (xmpFile.CanPutXMP()==false)");
+
+		try {
+			xmpFile.PutXMP(xmpMeta); //void unfortunatley, must close file to figure out result...
+			xmpFile.CloseFile(generalCloseFlags); // close the file
+
+		} catch ( XMP_Error& e ) {
+			Log::error("puttingXMP failed: %s",e.GetErrMsg());
+		}
+	} else { //handle the error
+		//FileFormat (resolves, usually by way of extension unless specified TODO)
+		std::string fileFormatName, fileFormatDescription;
+		Utils::fileFormatNameToString(out_fileFormat,fileFormatName,fileFormatDescription);
+		Log::error("the File %s of type %s neither contains XMP nor can it be injected (at least kXMPFiles_CanInjectXMP not returned)",
+			this->mediafile.c_str(), fileFormatName.c_str());
+	};
+}
+
+void Actions::doAction() {
+	//do open and close-flags one for all (add ThumbFlag if needed above)
+	generalOpenFlags=kXMPFiles_OpenForRead;
+	if (this->switch_smart) generalOpenFlags|=kXMPFiles_OpenUseSmartHandler;
+	if (this->switch_scan) generalOpenFlags|=kXMPFiles_OpenUsePacketScanning;
+
+	generalCloseFlags=0;
+	if (this->switch_safe) generalOpenFlags|=kXMPFiles_UpdateSafely;
+
+	switch (this->actiontype){
+		case Actions::VERSION:
+			version();
+			break;
+		case Actions::INFO:
+			info();
+			break;
+		case Actions::THUMB: //GetThumbnail()
+			thumb();
+			break;
+		case Actions::PUT: //PutXMP()
+			put();
+			break;
+		case Actions::GET: //GetXMP()
+			get();
+			break;
+		case Actions::DUMP:
+			dump();
+			break;
+		default:
+			Log::error("unknown command or not implemented!!");
+			break;
+	}
+}
diff --git a/samples/source/xmpcommand/Actions.h b/samples/source/xmpcommand/Actions.h
new file mode 100644
index 0000000..084c260
--- /dev/null
+++ b/samples/source/xmpcommand/Actions.h
@@ -0,0 +1,49 @@
+// =================================================================================================
+// Copyright 2004-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+#ifndef __ACTIONS_h__
+#define __ACTIONS_h__ 1
+
+class Actions {
+	public:
+		enum ACTION_TYPE { NONE, VERSION, INFO, PUT, GET, DUMP, THUMB};
+
+		//the params to be set:
+		bool switch_safe;	//asking for closing file with kXMPFiles_UpdateSafely (safe+rename that is)
+
+		//these two mututally exclusive:
+		bool switch_smart;	/* Require the use of a smart handler. (kXMPFiles_OpenUseSmartHandler) */
+		bool switch_scan; /* Force packet scanning, don't use a smart handler. kXMPFiles_OpenUsePacketScanning */
+
+		bool switch_nocheck; /* no "sanity checks" on xmp-side i.e. for read/writeability, only usefull for testing "proper failure" */
+		bool switch_compact; /* ask extract to extract xmp in the compact (non-pretty) RDF-style (attributes rather than content of tags) */
+
+		std::string outfile;//output goes (besides stdout) to an output file...
+		std::string mediafile;		//relative path to XMP snippet (null if none)
+
+		ACTION_TYPE actiontype;			//inits with NONE
+
+		std::string xmpsnippet;		//relative path to XMP snippet (null if none)
+
+		//distributes the actions to the different routines...
+		void doAction();
+
+private:
+		void version(void);
+		void info(void);
+		void thumb(void);
+		void put();
+		void get(void);
+		void dump(void);
+
+		XMP_OptionBits generalOpenFlags;
+		XMP_OptionBits generalCloseFlags;
+
+};
+
+#endif
diff --git a/samples/source/xmpcommand/PrintUsage.cpp b/samples/source/xmpcommand/PrintUsage.cpp
new file mode 100644
index 0000000..3931e18
--- /dev/null
+++ b/samples/source/xmpcommand/PrintUsage.cpp
@@ -0,0 +1,84 @@
+// =================================================================================================
+// Copyright 2004-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+#include "globals.h"
+#include "PrintUsage.h"
+#include "Log.h"
+
+using namespace std;
+
+namespace XMPQE {
+
+	void PrintUsageShort(char* exename) {
+		Log::info("%s -version",exename);
+		Log::info("    Print version information for this utility");
+		Log::info("");
+		Log::info("%s -help",exename);
+		Log::info("    Print descriptions of all available switches, including examples");
+		Log::info("");
+		Log::info("%s [switch [switch]...] action mediafile",exename);
+		Log::info("");
+		Log::info("This command uses the XMPFiles component of the Adobe XMP toolkit. ");
+		Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved.");
+		Log::info("");
+	}
+
+	void PrintUsageLong(char* exename) {
+		Log::info("%s -version",exename);
+		Log::info("    Print version information for this utility");
+		Log::info("%s -help",exename);
+		Log::info("    Print descriptions of all available switches, including examples");
+		Log::info("%s [switch [switch]...] action mediafile",exename);
+		Log::info("This command uses the XMPFiles component of the Adobe XMP toolkit. ");
+		Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved.");
+		Log::info("NOTICE:  Adobe permits you to use, modify, and distribute this file in");
+		Log::info("         accordance with the terms of the Adobe license agreement");
+		Log::info("         accompanying it.");
+		Log::info("");
+		Log::info("Switches:");
+		Log::info("-out <outfile> Writes output and logs all warnings and errors both to ");
+		Log::info("            standard output, and also to the specified output file. ");
+		Log::info("            If you specify the output file without this switch, stdout is not used.");
+		Log::info("            You should check that there are no warnings or errors (return value is 0) ");
+		Log::info("            before using the output; stderr is not used.");
+		Log::info("-safe       Updates safely, writing to a temporary file then renaming ");
+		Log::info("         	 it to the original file name. See API documentation for ");
+		Log::info("         	 safeSave(kXMPFiles_UpdateSafely).");
+		Log::info("-smart      Requires the use of a smart file-format handler, does no packet scanning.");
+		Log::info("            Use of smart handlers is the default, if one is available.");
+		Log::info("-scan       Forces packet scanning, does not use a smart file-format handler.");
+		Log::info("-nocheck    Omits readability/writeability checks. Used internally. ");
+		Log::info("");
+		Log::info("-compact    Writes extracted XMP Packet in compact RDF-style, rather than");
+		Log::info("            pretty-printing attribute value for readability (which is the default).");
+
+		Log::info("");
+		Log::info("Actions:");
+		Log::info("  info <mediafile>	Prints basic information about the file.");
+		Log::info("  thumb <mediafile>	Prints information about the native thumbnail ");
+		Log::info("         	 	  		if one is included, or informs that none is available.");
+		Log::info("  put <xmpfile> <mediafile>	Injects the XMP contained in the specified xmpfile ");
+		Log::info("            					into the specified mediafile.");
+		Log::info("  get <mediafile> Retrieves the XMP Packet contained in the specified mediafile.");
+		Log::info("  dump <mediafile> Prints the XMP Packet contained in the specified mediafile to standard output. ");
+		Log::info("                <<??>> USE dump ONLY for known-good-output tests, do not use get. <<??>> ");
+		Log::info("");
+		Log::info("Examples:");
+		Log::info("%s info Sample.jpg",exename);
+		Log::info("%s get ../Sample.jpg  >onlyFileOut.txt",exename);
+		Log::info("%s -out alsoFileOut.txt get Sample.eps",exename);
+		Log::info("%s put xmp_mySnippet.xmp Sample.jpg",exename);
+		Log::info("%s -smart put xmp_mySnippet.xmp Sample.jpg",exename);
+		Log::info("(Smart handler would be used by default for a JPEG file even without the switch.)");
+		Log::info("");
+		Log::info("Returns 0 if there are no errors. Warnings and errors are printed as part of the output. ");
+		Log::info("You should check the return value before using the output.");
+		Log::info("  ");
+	}
+
+} // of namespace XMPQE
diff --git a/samples/source/xmpcommand/PrintUsage.h b/samples/source/xmpcommand/PrintUsage.h
new file mode 100644
index 0000000..a48b24a
--- /dev/null
+++ b/samples/source/xmpcommand/PrintUsage.h
@@ -0,0 +1,17 @@
+// =================================================================================================
+// Copyright 2004-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+#ifndef __XMPQE_PRINT_USAGE_h__
+#define __XMPQE_PRINT_USAGE_h__ 1
+
+namespace XMPQE {
+	void PrintUsageShort(char* exename);
+	void PrintUsageLong(char* exename);
+}
+
+#endif
diff --git a/samples/source/xmpcommand/main.cpp b/samples/source/xmpcommand/main.cpp
new file mode 100644
index 0000000..2dc4374
--- /dev/null
+++ b/samples/source/xmpcommand/main.cpp
@@ -0,0 +1,208 @@
+// =================================================================================================
+// Copyright 2005-2008 Adobe Systems Incorporated
+// All Rights Reserved.
+//
+// NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+// of the Adobe license agreement accompanying it.
+// =================================================================================================
+
+/**
+* A command-line tool for performing basic XMP actions such as get, put and dump. Can be used for testing 
+* and scripting automation.
+*/
+#ifdef WIN32
+	#pragma warning ( disable : 4267 )	// suppress string conversion warning
+#endif
+
+#include <stdexcept>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <sstream>
+
+//some global constants / sanity checking
+#include "globals.h"
+
+#define EXENAME "xmpcommand"
+
+//XMP related
+#define TXMP_STRING_TYPE std::string
+#define XMP_INCLUDE_XMPFILES 1
+#include "XMP.hpp"
+#include "XMP.incl_cpp"		//include in EXACTLY one source file (i.e. main, in Action gets you trouble...)
+
+//QE related
+#include "Actions.h"
+#include "Log.h"
+// -help output
+#include "PrintUsage.h"
+
+namespace XMPQE {
+	void InitDependencies()
+	{
+		if ( ! SXMPMeta::Initialize() )
+			Log::error( "XMPMeta::Initialize failed!" );
+
+		if ( ! SXMPFiles::Initialize() )
+			Log::error( "XMPFiles::Initialize failed!" );
+	}
+
+	void ShutdownDependencies()
+	{
+			SXMPFiles::Terminate();
+			SXMPMeta::Terminate();
+	}
+} //namespace XMPQE
+
+using namespace XMPQE;
+
+int main ( int argc, const char * argv[] )
+{
+	Actions action; //create Action (to fill up with parameters below...)
+
+	// ============================================================================================
+	// ============================================================================================
+	// ============================================================================================
+	try { // on try for all
+
+		//clean parameters (this is not elegant but might avoid some macPPC-side bus error bugs whatsoever
+		action.outfile="";
+		action.switch_safe=false;
+		action.switch_smart=false;
+		action.switch_scan=false;
+		action.switch_nocheck=false;
+		action.switch_compact=false;
+		action.mediafile="";
+		action.actiontype=Actions::NONE;
+		action.xmpsnippet="";
+
+		////////////////////////////////////////////
+		// parameter verification
+			if ( argc == 1 ) { //aka no parameters, just command itself.
+				XMPQE::PrintUsageShort(EXENAME);
+				return 0;
+			} else if ( argc == 2 ) //single-paramter-call?
+			{
+				if ( !strcmp("help",argv[1])  ||  //only "help" and "version" permitted, ...
+					!strcmp("-help",argv[1]) ||
+					!strcmp("--help",argv[1]) ||
+					!strcmp("-h",argv[1])     ||
+					!strcmp("-?",argv[1])     ||
+					!strcmp("/?",argv[1]) ) {
+						XMPQE::PrintUsageLong(EXENAME);
+						return 0;
+				} 
+				else if ( !strcmp("-version",argv[1]) || !strcmp("version",argv[1]) ) 
+				{
+					action.actiontype=Actions::VERSION;
+				}		
+				else 
+				{ //..thus fail anything else
+					Log::error("unknown parameter %s",argv[1]);
+				}
+
+			}
+			else //multi-argument parameters
+			{
+				int i=1; // "for (int i=1;i<argc;i++)" ....
+
+				while (true) {
+					if (argv[i][0] != '-') {
+						break; //apparently done parsing switches
+					}
+					if ( !strcmp("-safe",argv[i])) {
+						action.switch_safe=true;
+					}
+					else if ( !strcmp("-smart",argv[i])) {
+						action.switch_smart=true;
+					}
+					else if ( !strcmp("-nocheck",argv[i])) {
+						action.switch_nocheck=true;
+					}
+					else if ( !strcmp("-compact",argv[i])) {
+						action.switch_compact=true;
+					}
+					else if ( !strcmp("-scan",argv[i])) {
+						action.switch_scan=true;
+					} else if ( !strcmp("-out",argv[i])) {
+						i++;  //ok, so gimme that file
+						if (i>=argc) Log::error("missing output parameter, etc.");
+						action.outfile=argv[i];
+					} else
+						Log::error("unknown switch %s",argv[i]);
+					i++;
+					if (i>=argc) Log::error("missing action parameter, etc.");
+				}
+
+				//check mutually exclusive
+				if (action.switch_scan && action.switch_smart)
+					Log::error("use either -smart or -scan");
+
+				if ( !strcmp("info",argv[i])) {
+					action.actiontype= Actions::INFO;
+				} else if ( !strcmp("thumb",argv[i])) {
+					action.actiontype= Actions::THUMB;
+				} else if ( !strcmp("put",argv[i]) || !strcmp("inject",argv[i]) ) {
+					action.actiontype= Actions::PUT;
+				} else if ( !strcmp("get",argv[i]) || !strcmp("extract",argv[i]) ) {
+					action.actiontype= Actions::GET;
+				} else if ( !strcmp("dump",argv[i])) {
+					action.actiontype= Actions::DUMP;
+				} else
+					Log::error("_unknown action %s",argv[i]);
+				i++;
+
+				//only inject needs an in-file parameter really...
+				if ( action.actiontype== Actions::PUT) {
+					if (i>=argc) Log::error("missing <xmpfile> parameter");
+					action.xmpsnippet=argv[i];
+					i++;		
+				}
+
+				//last argument must be mediafile
+				if (i>=argc) Log::error("missing mediafile parameter");
+				action.mediafile=argv[i];
+
+				i++;
+				if (i!=argc) Log::error("too many parameters.");
+		}
+
+		//Init ===========================================================================
+		InitDependencies(); 
+
+		//Do Action //////////////////
+			Log log(action.outfile.c_str()); //will start logging to file (if filename given) or not ("")
+			action.doAction();
+
+		// Shutdown /////////////////////////////////////////////
+		ShutdownDependencies();
+	
+	}
+	catch (XMP_Error& e ) {
+		Log::info("Unexpected XMP_Error %s\n", e.GetErrMsg()); //throw no further, no Log::error.. !
+		return -2;
+	}
+	catch (LOG_Exception& q) {
+		Log::info("LOG_Exception:%s\n",q.what());
+		return -3;
+	}
+	catch (std::runtime_error& p) {
+		Log::info("caught std::runtime_error exception: %s\n",p.what());
+		return -4;
+	}
+	catch (...) {
+		Log::info("unidentified error on action execution\n");
+		return -5;
+	}
+
+	// ============================================================================================
+	// ============================================================================================
+	// ============================================================================================
+		
+	if (Log::noErrorsOrWarnings)
+		return 0;
+	//else
+	Log::info("%s finished with warnings",EXENAME);
+	return 10;
+}
+
diff --git a/samples/BlueSquares/BlueSquare.ai b/samples/testfiles/BlueSquare.ai
index 2391f02..2391f02 100644..100755
--- a/samples/BlueSquares/BlueSquare.ai
+++ b/samples/testfiles/BlueSquare.ai
diff --git a/samples/BlueSquares/BlueSquare.avi b/samples/testfiles/BlueSquare.avi
index f29de6d..f29de6d 100644..100755
--- a/samples/BlueSquares/BlueSquare.avi
+++ b/samples/testfiles/BlueSquare.avi
diff --git a/samples/BlueSquares/BlueSquare.eps b/samples/testfiles/BlueSquare.eps
index ea4f79c..ea4f79c 100644..100755
--- a/samples/BlueSquares/BlueSquare.eps
+++ b/samples/testfiles/BlueSquare.eps
diff --git a/samples/BlueSquares/BlueSquare.indd b/samples/testfiles/BlueSquare.indd
index c8b9680..c8b9680 100644..100755
--- a/samples/BlueSquares/BlueSquare.indd
+++ b/samples/testfiles/BlueSquare.indd
diff --git a/samples/BlueSquares/BlueSquare.jpg b/samples/testfiles/BlueSquare.jpg
index 81b8a22..81b8a22 100644..100755
--- a/samples/BlueSquares/BlueSquare.jpg
+++ b/samples/testfiles/BlueSquare.jpg
diff --git a/samples/BlueSquares/BlueSquare.mov b/samples/testfiles/BlueSquare.mov
index 2ee3885..2ee3885 100644..100755
--- a/samples/BlueSquares/BlueSquare.mov
+++ b/samples/testfiles/BlueSquare.mov
diff --git a/samples/BlueSquares/BlueSquare.mp3 b/samples/testfiles/BlueSquare.mp3
index 0b275b2..0b275b2 100644..100755
--- a/samples/BlueSquares/BlueSquare.mp3
+++ b/samples/testfiles/BlueSquare.mp3
diff --git a/samples/BlueSquares/BlueSquare.pdf b/samples/testfiles/BlueSquare.pdf
index 2498719..2498719 100644..100755
--- a/samples/BlueSquares/BlueSquare.pdf
+++ b/samples/testfiles/BlueSquare.pdf
diff --git a/samples/BlueSquares/BlueSquare.png b/samples/testfiles/BlueSquare.png
index 91589cd..91589cd 100755
--- a/samples/BlueSquares/BlueSquare.png
+++ b/samples/testfiles/BlueSquare.png
diff --git a/samples/BlueSquares/BlueSquare.psd b/samples/testfiles/BlueSquare.psd
index 1850b8f..1850b8f 100644..100755
--- a/samples/BlueSquares/BlueSquare.psd
+++ b/samples/testfiles/BlueSquare.psd
diff --git a/samples/BlueSquares/BlueSquare.tif b/samples/testfiles/BlueSquare.tif
index 3ae7b02..3ae7b02 100644..100755
--- a/samples/BlueSquares/BlueSquare.tif
+++ b/samples/testfiles/BlueSquare.tif
diff --git a/samples/BlueSquares/BlueSquare.wav b/samples/testfiles/BlueSquare.wav
index c9983ff..c9983ff 100644..100755
--- a/samples/BlueSquares/BlueSquare.wav
+++ b/samples/testfiles/BlueSquare.wav
diff --git a/samples/testfiles/Image1.jpg b/samples/testfiles/Image1.jpg
new file mode 100755
index 0000000..0da199f
--- /dev/null
+++ b/samples/testfiles/Image1.jpg
diff --git a/samples/testfiles/Image2.jpg b/samples/testfiles/Image2.jpg
new file mode 100755
index 0000000..17862cc
--- /dev/null
+++ b/samples/testfiles/Image2.jpg
author	Hubert Figuiere <hub@figuiere.net>	2008-11-17 23:42:00 -0500
committer	Hubert Figuiere <hub@figuiere.net>	2008-11-17 23:42:00 -0500
commit	88af812fde414aca8f9add90bc800ea3d8e9a281 (patch)
tree	0403dd1897c0b287d4d710dd422827683c59dfcb /samples
parent	9d7d7c3caac05db240692ad7e9196fcb7f5a1ce5 (diff)