From 5bf3ee8d0bab7568c4199df4a4af9cfe26272917 Mon Sep 17 00:00:00 2001
From: Packit <packit>
Date: Sep 18 2020 12:29:37 +0000
Subject: exempi-2.4.5 base


---

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..482c2f5
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,14 @@
+The package is based on Adobe XMP SDK CS6
+
+Maintainer:
+Hubert Figuiere <hub@figuiere.net>
+
+Original XMP code by:
+Adobe Systems Incorporated (XMP SDK)
+
+Contributions by:
+Ian Jacobi
+Jason Kivlighn
+Michael Biebl <biebl@debian.org>
+Tim Mooney
+Misty De Meo
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..e7439c9
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,32 @@
+This package is based off Adobe XMP SDK CD6, distributed
+under the BSD license reproduced thereafter for convenience
+and available in BSD-License.txt
+
+This package is licensed under the same license.
+
+
+The BSD License
+
+Copyright (c) 1999 - 2010, Adobe Systems Incorporated
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ 
+* Neither the name of Adobe Systems Incorporated, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..047887b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,339 @@
+2009-05-26  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/FileHandlers/UCF_Handler.cpp (UCF_CheckFormat): 
+	Mismatched new [] / delete. (Closes bug #21934)
+
+2009-05-15  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/exempi.cpp:
+	Catch unhandled exceptions in xmp_files_can_put_xmp()
+	(Closes bug #20622)
+
+2009-03-11  Hubert Figuiere  <hub@figuiere.net>
+
+	* configure.ac:
+	* exempi/Makefile.am:
+	* m4/ax_ld_check_flag.m4:
+	Detect proper ldflags. (Closes bug #20554)
+
+	* configure.ac: Bump to version 2.1.1
+
+2009-03-11  Lars Holm Nielsen <lnielsen@eso.org>
+
+	* source/XMPFiles/FileHandlers/Makefile.am:
+	* source/XMPFiles/FormatSupport/Makefile.am:
+	* configure.ac:
+	Some files missing when building on Mac
+	(Closes bug #20554)
+
+2009-02-24  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/exempi.cpp (xmp_set_property): 
+	If the value is struct or array, if the property value
+	is the empty string pass NULL.
+	(Closes bug #16030)
+
+2009-02-22  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/common/XMLParserAdapter.hpp: 
+	Remove an annoying warning.
+
+2009-02-20  Hubert Figuiere  <hub@figuiere.net>
+
+	* configure.in: 
+	* m4/shave.m4:
+	* shave-libtool.in:
+	* shave.in:
+	Add shave to make the build output saner.
+
+2008-12-28  Michael Biebl <biebl@debian.org>
+
+	* tests/utils.cpp
+	* samples/source/XMPFilesCoverage.cpp
+	* source/common/XML_Node.cpp
+	Fix build on gcc 4.4
+
+2008-12-24  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/FileHandlers/P2_Handler.cpp (SetStartTimecodeFromLegacyXML): 
+	Don't compare string pointers. (Closes: #19312)
+
+=== 2.1.0 ===
+
+2008-12-24  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/tests/test-bgo.cpp
+        * exempi/tests/test-xmpfiles.cpp
+	Remove serious warnings.
+
+2008-12-21  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/tests/Makefile.am
+        * exempi/tests/test-bgo.cpp
+	* exempi/tests/test-exempi-core.cpp
+	* exempi/tests/test-serialise.cpp
+	* exempi/tests/test-tiff-leak.cpp
+	* exempi/tests/test-write-new-prop.cpp
+	* exempi/tests/test-xmpfiles-write.cpp
+	* exempi/tests/test-xmpfiles.cpp
+	* exempi/tests/test3.cpp
+	* exempi/tests/testinit.cpp
+	Migrated to use boost/test/minimal
+	
+	* exempi/tests/test1.cpp
+	* exempi/tests/test2.cpp
+	Split out for the above change.
+
+2008-12-19  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/Makefile.am (EXTRA_DIST): Added libexempi.sym
+
+2008-11-26  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/tests/Makefile.am (TESTS_ENVIRONMENT): 
+	BOOST_TEST_CATCH_SYSTEM_ERRORS=no is set before running
+	the test. This avoid a failure because of system() on 
+	boost 1.35 and later.
+	See https://svn.boost.org/trac/boost/ticket/1723
+
+2008-11-24  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/FormatSupport/ReconcileTIFF.cpp (ImportSingleTIFF_ASCII): 
+	Re-enable the conversion for UNIX. Disabled in the original SDK.
+
+	* exempi/tests/Makefile.am:
+	* exempi/tests/fdo18635.jpg:
+	* exempi/tests/test-bgo.cpp
+	Don't crash on not so valid Exif. (Closes #18635)
+	And test case.
+
+2008-11-18  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/libexempi.sym, exempi/Makefile.am (libexempi_la_LDFLAGS): 
+	Use symbol file. (Closes #16139)
+
+	* samples/testfiles/BlueSquare.gif,
+	samples/testfiles/Makefile.am: Forgotten files.
+
+	* NEWS,	configure.ac, exempi/Makefile.am, 
+	exempi/tests/test2.cpp, exempi/tests/testcore.sh, 
+	samples/Makefile.am, samples/source/Makefile.am, 
+	source/XMPFiles/FileHandlers/Makefile.am,
+	source/XMPFiles/FormatSupport/Makefile.am,
+	source/XMPCore/Makefile.am, source/common/Makefile.am:
+	Fix the build system.
+	* source/XMPFiles/FileHandlers/AVCHD_Handler.cpp
+	source/XMPFiles/FileHandlers/MP3_Handler.cpp,
+	source/XMPFiles/FileHandlers/MP3_Handler.hpp,
+	source/XMPFiles/FileHandlers/P2_Handler.cpp,
+	source/XMPFiles/FileHandlers/SonyHDV_Handler.cpp,
+	source/XMPFiles/FileHandlers/WAV_Handler.cpp,
+	source/XMPFiles/FileHandlers/WAV_Handler.hpp,
+	source/XMPFiles/FileHandlers/XDCAMEX_Handler.cpp,
+	source/XMPFiles/FileHandlers/XDCAM_Handler.cpp,
+	source/XMPFiles/FormatSupport/ID3_Support.cpp,
+	source/XMPFiles/FormatSupport/ID3_Support.hpp,
+	source/XMPFiles/FormatSupport/RIFF_Support.cpp,
+	source/XMPFiles/FormatSupport/RIFF_Support.hpp,
+	source/XMPFiles/FormatSupport/ReconcileTIFF.cpp,
+	source/XMPFiles/FormatSupport/Reconcile_Impl.cpp,
+	source/XMPFiles/FormatSupport/Reconcile_Impl.hpp,
+	source/XMPFiles/FormatSupport/TIFF_Support.hpp:
+	Enable all the file formats that Adobe disabled on 
+	purpose.
+	* samples/source/ModifyingXMP.cpp,
+	source/common/EndianUtils.hpp,
+	source/common/LargeFileAccess.hpp,
+	source/common/XML_Node.cpp:
+	Other misc merge fixes.
+	
+	* Merge the XPM SDK 4.4.2
+
+2008-05-29  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/exempi.cpp, exempi/Makefile.am: don't define 
+	UNIX_ENV in the source code but use the CPPFLAGS.
+
+	* exempi/exempi.cpp (xmp_files_get_xmp): CHECK_PTR should 
+	return false and not NULL.
+
+2008-04-06  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/xmp.h, exempi/exempi.cpp: add new API
+	xmp_namespace_prefix(), xmp_prefix_namespace_uri().
+	* exempi/tests/test1.cpp: corresponding test.
+	(Closes #14962)
+
+2008-04-04  Hubert Figuiere  <hub@figuiere.net>
+
+	* Start 2.1.0
+
+=== 2.0.2 ===
+
+2008-08-12  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/exempi.cpp (set_error): Use pthread for the TLS 
+	if there is no compiler support.
+	(Closes #16598)
+
+	* configure.ac:
+	* m4/ax_tls.m4:
+	Check for TLS.
+
+=== 2.0.1 ===
+
+2008-04-28  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/tests/test1.cpp: Check that errors are unset.
+
+2008-04-24  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/exempi.cpp: RESET_ERROR is called
+	upon entry of any functions. 
+	error code is local thread storage.
+
+2008-04-05  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/FormatSupport/Reconcile_Impl.cpp, 
+	configure.ac: Check for iconv constness. (Closes #14613)
+
+2008-04-04  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/xmp.h: no stdbool.h on Sun compilers
+	(Closes #14612)
+
+=== 2.0.0 ===
+
+2008-04-01  Hubert Figuiere  <hub@figuiere.net>
+
+	* configure.ac: This is really 2.0.0
+
+	* exempi/tests/test1.cpp, exempi/tests/test1.xmp:
+	Add a test on "Rating:".
+
+2008-03-30  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/FormatSupport/EndianUtils.hpp,
+	configure.ac: Fix the endian detection. (Closes #15263)
+
+2008-02-22  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPCore/XMPMeta.cpp, 
+	source/XMPFiles/FormatSupport/GIF_Support.cpp,
+	source/XMPFiles/FormatSupport/ID3_Support.cpp,
+	source/XMPFiles/FormatSupport/PNG_Support.cpp,
+	source/XMPFiles/FormatSupport/PSIR_FileWriter.cpp,
+	source/XMPFiles/FormatSupport/PSIR_MemoryReader.cpp,
+	source/XMPFiles/FormatSupport/ReconcileIPTC.cpp,
+	source/XMPFiles/FormatSupport/TIFF_Support.hpp:
+	Add some missing includes. (Closes #14615)
+
+	* source/XMPFiles/FormatSupport/EndianUtils.hpp: endian
+	detection on Solaris. (Closes #14614)
+
+=== 1.99.9 ===
+
+2008-01-30  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/xmp.h (XMP_OPEN_OPNLYXMP): Bad API breakage fix (introduced
+	in 1.99.8)
+
+=== 1.99.8 ===
+
+2008-01-23  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/FormatSupport/GIF_Support.cpp (ReadHeader): Fix
+	a nasty buffer overflow. Closes Debian #454297. Closes Gnome #484105
+	Patch by Michael Biebl <biebl@debian.org>
+	(ReadBlock): Fix another possible overflow similar to the one in
+	ReadHeader()
+
+2008-01-22  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/xmp.h: Fix a typo. (Closes #14200)
+
+2008-01-18  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/Makefile.am: Disable strict aliasing. This fix
+	some nasty warning.
+
+2008-01-13  Hubert Figuiere  <hub@figuiere.net>
+
+	* configure.ac: Allow disabling unittest if you
+	don't have boost (Closes #13712)
+
+	* autogen.sh: Don't run autoheader. (Closes #14049)
+
+	* autogen.sh: re-order commands in autogens.sh
+
+=== 1.99.7 ===
+	
+2008-01-12  Hubert Figuiere  <hub@figuiere.net>
+
+	* configure.ac: Fix the soversion. A mix-up occured in the last
+	release.
+
+=== 1.99.6 ===
+
+2008-01-11  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/tests/test2.cpp (test_tiff_leak): Ensure that the file is
+	writable.
+
+2007-12-22  Hubert Figuiere  <hub@figuiere.net>
+
+	* configure.ac: make boost optional as it is only for 	
+	the unit tests. (Closes #13712)
+
+	* configure.ac, m4/boost.m4, exempi/test/Makefile.am: 
+	Change the BOOST detection macros.
+	(Closes #13713)
+
+2007-12-20  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPCore/XMPUtils.cpp (ConvertFromInt64): Fix format
+	for long long int that was causing a failure on ppc (big endian).
+
+2007-12-19  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/exempi.cpp, exempi/tests/test1.cpp, 
+	exempi/tests/test1.xmp, exempi/xmp.h: 
+	Add setter/getter for int32, int64, bool, float.
+
+	* exempi/xmpconsts.h, exempi/exempi.cpp: add ACR schema namespace
+	
+	* public/include/TXMPMeta.hpp, public/include/client-glue/TXMPMeta.incl_cpp,
+	samples/source/XMPCoreCoverage.cpp, 
+	source/XMPFiles/FormatSupport/ReconcileTIFF.cpp:
+	Some APIs use long and long long. Change that.
+
+	* source/XMPFiles/FormatSupport/TIFF_FileWriter.cpp, exempi/tests/*: 
+	Fix a memory leak. See http://www.adobeforums.com/webx/.3bc42b73
+	And test case.
+
+	* exempi/tests/*, configure.ac: detect valgrind.
+	Add leak detection support.
+
+2007-12-17  Hubert Figuiere  <hub@figuiere.net>
+
+	* autogen.sh: added for convenience for non-tarball builders.
+	(Closes #13707)
+
+2007-12-16  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/*: added new API for get/set datetime.
+
+	* exempi/tests/*: refactor the test preparation.
+
+2007-11-13  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/tests/*.c: Add a bunch of include deemed necessary 
+	by suse factory.
+	* Add a bunch of include deemed necessary by suse factory.
+
+2007-11-08  Hubert Figuiere  <hub@figuiere.net>
+
+	* source/XMPFiles/FormatSupport/Makefile.am: add
+	-Wno-multichar to remove warnings.
+	QuickTime_Support.cpp is in the dist as a noinst_HEADER
+
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..5458714
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,234 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..2fdee08
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,42 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = third-party source XMPCore XMPFiles samples exempi
+DIST_SUBDIRS = build third-party source XMPCore XMPFiles XMPFilesPlugins samples exempi public
+
+EXTRA_DIST = autogen.sh
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..71f3852
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,855 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
+	INSTALL NEWS README TODO compile config.guess config.sub \
+	depcomp install-sh ltmain.sh missing
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+DIST_TARGETS = dist-bzip2 dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = third-party source XMPCore XMPFiles samples exempi
+DIST_SUBDIRS = build third-party source XMPCore XMPFiles XMPFilesPlugins samples exempi public
+EXTRA_DIST = autogen.sh
+all: all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..dd45381
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,262 @@
+2.4.5 - 2018/03/07
+
+- Bug #105204: [CVE-2018-7730] fix a buffer overflow in the PSD parser.
+- Bug #105205: [CVE-2018-7728] fix a buffer overflow in the TIFF parser.
+- Bug #105206: [CVE-2018-7729] fix a buffer overflow in PostScript parser.
+- Bug #105247: [CVE-2018-7731] fix a null dereference in WEBP parser.
+
+2.4.4 - 2018/02/04
+
+- Bug #102197: Properly initialize pointers in WEBP.
+- Bug #102151: Fix an infinite loop in RIFF parser.
+- Bug #102483: Fix an infinite loop in QuickTime parser.
+- Bug #102484: Fix an infinite loop in ASF parser.
+- Bug #104885: Adjust minimum version for gcc in documentation.
+
+2.4.3 - 2017/08/03
+
+- Bug #100397: Fix a buffer overrun, memcpy() on overlapping
+  regions, use after free in the exception handling.
+- Bug #101913: Fix a fatal assert with corrupt WEBP.
+- Bug #101914: Fix a crash on a corrupt file.
+
+2.4.2 - 2017/01/29
+
+- Properly define BanAllEntityUsage.
+  See https://bugzilla.redhat.com/show_bug.cgi?id=888765
+
+2.4.1 - 2017/01/23
+
+- Bug #99494: Restore error reporting.
+
+Internal:
+
+- Added test for xmp_parse()
+- Renamed test3 to testiterator and more comprehensive test for
+  iterator to detect thing like bug 99480
+
+Release notes:
+
+- In 2.4.0 the XMP iterator corrected behaviour when used for
+  XMP_ITER_JUSTLEAFNAME: The returned values are now set to they
+  actual schema NS instead of the top level one.
+  This required fixed in third party packages:
+  https://github.com/python-xmp-toolkit/python-xmp-toolkit/issues/67
+  This changes is the result of a bug fix in Adobe SDK.
+  See bug #99480
+
+2.4.0 - 2017/01/07
+
+- Bug #89449: Upgrade XMPCore to Adobe XMP CC 2014.12.
+  - New flag to optimize layout on MPEG4 files.
+  - GoPro MPEG4 video files support.
+  - Improved JPEG support.
+  - iXML support in WAVE files.
+  - Several bugs and memory leaks fixes.
+  - Changes from Adobe XMP CC 2013.06.
+    - Pluggable file handlers (not exposed yet in Exempi)
+    - Support for Exif 2.3 properties
+    - New RIFF file handler
+    - Better Postscript support.
+    - Lot of bug fixes.
+- New API: added XMP_OPEN_OPTIMIZEFILELAYOUT for new SDK.
+- Now require (partial) C++11 support to compile (gcc 4.4.7 tested)
+- New: WebP format handler (contributed: Frankie Dintino, The Atlantic)
+
+Internal:
+
+- Exempi is now automatically build and the test run by Travis CI.
+
+2.3.0 - 2016/03/15
+
+- New: API xmp_datetime_compare().
+- New: API xmp_string_len() to get the length of the XmpString.
+- Bug #94065:
+  - New: API xmp_files_can_put_xmp_xmpstring() and xmp_files_can_put_xmp_cstr()
+    variants.
+  - New: API xmp_files_put_xmp_xmpstring() and xmp_files_put_xmp_cstr()
+    variants.
+  - New: API xmp_files_get_xmp_xmpstring() variant.
+  - Test: check the status of the PDF handler.
+- Bug #90380: Fix potential crash with corrupt TIFF file.
+- Bug #14612: Better Solaris compilation fix.
+- Fix header to pass -Wstrict-prototypes
+
+2.2.2 - 2014/08/31
+
+- Public header cleanup and documentation update.
+- Update Doxygen config.
+- Bug #73058: Add missing include for MacOS.
+- Bug #72810: Fix typo in date test in MP3 handler.
+- Bug #83313: Fix crash on invalid Exif (from Samsung)
+- Fix valgrind testing for xmpcore.sh
+- Fix delete / delete[] mismatch in ID3_Support.hpp
+
+2.2.1 - 2013/06/29
+
+- Bug #54011: Use POSIX API for files on MacOS. (Misty De Meo)
+- Bug #58175: Replace OS X FlatCarbon headers. (Misty De Meo)
+- Added a manpage for exempi(1).
+- Added the -n option to the command line for arbitrary namespaces.
+
+2.2.0 - 2012/02/21
+
+- New 'exempi' command line tool.
+- Upgrade XMPCore to Adobe XMP 5.1.2
+  - Quicktime support now works without Quicktime.
+  - Reconciliation with ID3v2.
+  - "Blessed" 64-bits support (we already had it in exempi).
+  - Slight change in the way XMP are written for MWG compliance.
+  - Fixed a serious bug with RIFF.
+  - Change in the way local text encoding is dealt with.
+  - Alternative languages behave slightly differently by changing
+    how the default language property is managed.
+  - Probably a bunch of bugs fixed that I don't know about.
+- Update unit tests.
+  - Refactor the fixtures.
+- Use automake silent rules instead of shave. (build only)
+- "make dist" generate a bzip2 archive as well. (build only)
+- Remove some obsolete warning flags. (build only)
+- Build xmpcommandtool
+- New: API xmp_files_get_format_info().
+- New: API xmp_files_check_file_format().
+- New: API xmp_files_get_file_info().
+- New: API XMP_PROP_ARRAY_INSERT_BEFORE, XMP_PROP_ARRAY_INSERT_AFTER array options.
+- New: C++ helpers in xmp++.hpp.
+
+Bug fixes:
+
+- Bug #37747: mismatch delete/delete[] and new/new[] (from Meego 
+  https://bugs.meego.com/show_bug.cgi?id=14661)
+
+2.1.1 - 2009/06/30
+
+New features:
+
+- Added shave to the build system for sane output. (build only)
+
+Bug fixes:
+
+- Bug #16030: if the property is an array or struct allow "" to be passed
+  as a value.
+- Bug #19312: source/XMPFiles/FileHandlers/P2_Handler.cpp was using 
+  an improper string comparison. (made rpmlint unhappy).
+- Bug #20554: Missing file on MacOS X.
+- Bug #20554: Detect ldflags properly.
+- Bug #20622: Catch unhandled exceptions in xmp_files_can_put_xmp().
+- Bug #21934: Mismatched new [] / delete.
+- Bug #22554: Fix a SIGFPE encountered on some invalid files. (Bug GNOME #586720)
+
+2.1.0
+
+- Upgrade XMPCore to Adobe XMP 4.4.2
+  - Handlers for additional file formats, including ASF (WMA, WMV), FLV; 
+    MPEG4; SWF; folder-based video formats AVCHD, P2, SonyHDV, and XDCAM; UCF
+  - Additional schemas to support document histories, composed documents, 
+    and temporal metadata
+- New: NS_PDF namespace for PDF.
+- New: API xmp_prefix_namespace_uri() and xmp_namespace_prefix(). Bug #14962.
+- Bug: make sure boost >1.35 does not fail test with system().
+- Bug: unit test now use boost/test/minimal.hpp to work with more boost
+  install. (known boost.test bug)
+- Bug: fix a typo in a CHECK_PTR call causing warnings on gcc < 4.
+- Bug: no longer define UNIX_ENV in exempi.cpp and let CPPFLAGS do it.
+- Bug #16139: the list of exported symbols was too large.
+- Bug #18635: fix crasher.
+
+2.0.2
+
+- Bug #16598: address the lack of TLS for some platforms.
+
+2.0.1
+
+- Bug #14612: no stdbool.h for Sun compilers.
+- Bug #14613: check for iconv() const-ness.
+- Make the error checking more robust.
+- Make error code thread-safe (ie local to the thread).
+
+2.0.0
+
+- Bug #14614, Bug #15263: endian detection in configure.
+- Bug #14615: missing includes for Solaris.
+
+1.99.9
+
+- Bug: fixed an API breakage introduced in 1.99.8
+
+1.99.8
+
+- Bug #14049: don't run autoheader.
+- Bug #13712: add --enable-unittest to disable tests.
+- Bug: Disable strict aliasing in XMPFiles due to bad casting.
+- Bug #14200: fix a typo.
+- Bug: fix a couple of buffer overflows in GIF support. Closes Debian #454297.
+  Closes Gnome #484105
+
+1.99.7
+
+- Bug: fix soversion.
+
+1.99.6
+
+- New: API xmp_get_property_date() / xmp_set_property_date() with tests.
+- New: API xmp_{get,set]_property_{float,bool,int32,int64}() with tests.
+- New: API add ACR schema namespaces.
+- Test: refactor a the tests preparation.
+- Test: add a test for multiple initializations.
+- Test: use valgrind is available.
+- Bug: fix configure to allow building on MacOS X. Closes bug #13596
+- Bug #13707: add autogen.sh
+- Bug #13713: fix boost macros to link boost.test statically (for 1.34).
+- Bug #13712: skip tests if no boost.
+
+1.99.5
+
+- ABI breakage: soversion is now 3
+- Change: API xmp_files_close(), xmp_files_put_xmp(), xmp_files_free(),
+  xmp_free(), xmp_iterator_free(), xmp_iterator_skip() now return bool.
+- Change: API xmp_get_property_and_bits() renamed xmp_get_property().
+- Change: API xmp_set_property2() renamed xmp_set_property().
+- Bug: all API should check about input and return an error if
+  passed NULL.
+- Bug: more exception handling and refactor set_error() use.
+- Bug: add AC_CONFIG_MACRO_DIR to configure.
+- Bug: Lower requirement for libboost to 1.33.0.
+- New: Doxygen API doc generation.
+
+1.99.4
+
+- New: GIF Files smart handlers
+- New: API xmp_append_array_item(), xmp_delete_property(),
+  xmp_has_property(), xmp_get_localized_text(), 
+  xmp_set_localized_text()
+- New: API xmp_delete_localized_text()
+- New: Exempi will be visible in the "generator" string of the XMP packet.
+- Bug: xmp_files_open_new() will handle exceptions properly
+
+1.99.3
+
+- New: API xmp_serialize{,_and_format}() and the
+  corresponding option bits
+- New API xmp_get_array_item()
+
+1.99.2
+
+- New: API xmp_copy()
+- New: API xmp_set_property2(), xmp_set_array_item()
+  and xmp_get_error()
+- New: API xmp_get_property_and_bits() 
+- Bug: xmp_files_get_xmp() handle exceptions properly.
+
+1.99.1
+
+- Bug: store the TIFF tag as BYTE and not UNDEFINED
+  to comply with the spec.
+- Bug: more exception catched.
+- New: added NS_CC namespace
+- New: API xmp_register_namespace()
+
+1.99.0
+
+Initial release of the 2.0 series. Based on Adobe XMP SDK 4.1.1
+
diff --git a/README b/README
new file mode 100644
index 0000000..97a8f53
--- /dev/null
+++ b/README
@@ -0,0 +1,16 @@
+exempi is a port of Adobe XMP SDK to work on UNIX and to be build with
+GNU automake.
+
+It includes XMPCore and XMPFiles, libexempi, a C-based API and exempi
+a command line tool.
+
+It require at least the gcc 4.6.0 C++ compiler or clang++ with some
+support for C++11.
+
+It is maintained by Hubert Figuiere <hub@figuiere.net>
+
+Contributors:
+  Frankie Dintino <fdintino@theatlantic.com>
+
+
+Homepage: http://libopenraw.freedesktop.org/wiki/Exempi
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..aa03630
--- /dev/null
+++ b/TODO
@@ -0,0 +1,9 @@
+Things to do:
+
+- allow providing your own IO
+- add handler for Ogg (need to be defined)
+- reconcile CC license from Ogg to XMP. Check for other media 
+format like MP3
+- add support for QuickTime without having quicktime
+- bug gna #10110
+- add support for PDF (using PoDoFo?)
diff --git a/XMPCore/Makefile.am b/XMPCore/Makefile.am
new file mode 100644
index 0000000..525e2e5
--- /dev/null
+++ b/XMPCore/Makefile.am
@@ -0,0 +1,3 @@
+
+
+SUBDIRS=source
diff --git a/XMPCore/Makefile.in b/XMPCore/Makefile.in
new file mode 100644
index 0000000..74de8ac
--- /dev/null
+++ b/XMPCore/Makefile.in
@@ -0,0 +1,642 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPCore
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = source
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPCore/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPCore/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPCore/source/ExpatAdapter.cpp b/XMPCore/source/ExpatAdapter.cpp
new file mode 100644
index 0000000..0951079
--- /dev/null
+++ b/XMPCore/source/ExpatAdapter.cpp
@@ -0,0 +1,522 @@
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! Must be the first #include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "source/ExpatAdapter.hpp"
+#include "XMPCore/source/XMPMeta.hpp"
+
+#include "third-party/expat/lib/expat.h"
+#include <string.h>
+
+using namespace std;
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+// *** Set memory handlers.
+
+#ifndef DumpXMLParseEvents
+	#define DumpXMLParseEvents	0
+#endif
+
+#define FullNameSeparator	'@'
+
+// =================================================================================================
+
+static void StartNamespaceDeclHandler    ( void * userData, XMP_StringPtr prefix, XMP_StringPtr uri );
+static void EndNamespaceDeclHandler      ( void * userData, XMP_StringPtr prefix );
+
+static void StartElementHandler          ( void * userData, XMP_StringPtr name, XMP_StringPtr* attrs );
+static void EndElementHandler            ( void * userData, XMP_StringPtr name );
+
+static void CharacterDataHandler         ( void * userData, XMP_StringPtr cData, int len );
+static void StartCdataSectionHandler     ( void * userData );
+static void EndCdataSectionHandler       ( void * userData );
+
+static void ProcessingInstructionHandler ( void * userData, XMP_StringPtr target, XMP_StringPtr data );
+static void CommentHandler               ( void * userData, XMP_StringPtr comment );
+
+#if BanAllEntityUsage
+
+	// For now we do this by banning DOCTYPE entirely. This is easy and consistent with what is
+	// available in recent Java XML parsers. Another, somewhat less drastic, approach would be to 
+	// ban all entity declarations. We can't allow declarations and ban references, Expat does not
+	// call the SkippedEntityHandler for references in attribute values.
+	
+	// ! Standard entities (&amp;, &lt;, &gt;, &quot;, &apos;, and numeric character references) are
+	// ! not banned. Expat handles them transparently no matter what.
+
+	static void StartDoctypeDeclHandler ( void * userData, XMP_StringPtr doctypeName,
+										  XMP_StringPtr sysid, XMP_StringPtr pubid, int has_internal_subset );
+
+#endif
+
+// =================================================================================================
+
+extern "C" ExpatAdapter * XMP_NewExpatAdapter ( bool useGlobalNamespaces )
+{
+
+	return new ExpatAdapter ( useGlobalNamespaces );
+
+}	// XMP_NewExpatAdapter
+
+// =================================================================================================
+
+ExpatAdapter::ExpatAdapter ( bool useGlobalNamespaces ) : parser(0), registeredNamespaces(0)
+{
+
+	#if XMP_DebugBuild
+		this->elemNesting = 0;
+		#if DumpXMLParseEvents
+			if ( this->parseLog == 0 ) this->parseLog = stdout;
+		#endif
+	#endif
+
+	this->parser = XML_ParserCreateNS ( 0, FullNameSeparator );
+	if ( this->parser == 0 ) {
+		XMP_Error error(kXMPErr_NoMemory, "Failure creating Expat parser" );
+		this->NotifyClient ( kXMPErrSev_ProcessFatal, error );
+	}else{
+		if ( useGlobalNamespaces ) {
+			this->registeredNamespaces = sRegisteredNamespaces;
+		} else {
+			this->registeredNamespaces = new XMP_NamespaceTable ( *sRegisteredNamespaces );
+		}
+	
+		XML_SetUserData ( this->parser, this );
+	
+		XML_SetNamespaceDeclHandler ( this->parser, StartNamespaceDeclHandler, EndNamespaceDeclHandler );
+		XML_SetElementHandler ( this->parser, StartElementHandler, EndElementHandler );
+
+		XML_SetCharacterDataHandler ( this->parser, CharacterDataHandler );
+		XML_SetCdataSectionHandler ( this->parser, StartCdataSectionHandler, EndCdataSectionHandler );
+
+		XML_SetProcessingInstructionHandler ( this->parser, ProcessingInstructionHandler );
+		XML_SetCommentHandler ( this->parser, CommentHandler );
+
+		#if BanAllEntityUsage
+			XML_SetStartDoctypeDeclHandler ( this->parser, StartDoctypeDeclHandler );
+			isAborted = false;
+		#endif
+
+		this->parseStack.push_back ( &this->tree );	// Push the XML root node.
+	}
+}	// ExpatAdapter::ExpatAdapter
+
+// =================================================================================================
+
+ExpatAdapter::~ExpatAdapter()
+{
+
+	if ( this->parser != 0 ) XML_ParserFree ( this->parser );
+	this->parser = 0;
+	
+	if ( this->registeredNamespaces != sRegisteredNamespaces ) delete ( this->registeredNamespaces );
+	this->registeredNamespaces = 0;
+
+}	// ExpatAdapter::~ExpatAdapter
+
+// =================================================================================================
+
+#if XMP_DebugBuild
+	static XMP_VarString sExpatMessage;
+#endif
+
+static const char * kOneSpace = " ";
+
+void ExpatAdapter::ParseBuffer ( const void * buffer, size_t length, bool last /* = true */ )
+{
+	enum XML_Status status;
+	
+	if ( length == 0 ) {	// Expat does not like empty buffers.
+		if ( ! last ) return;
+		buffer = kOneSpace;
+		length = 1;
+	}
+	
+	status = XML_Parse ( this->parser, (const char *)buffer, length, last );
+	
+	#if BanAllEntityUsage
+		if ( this->isAborted ) {
+			XMP_Error error(kXMPErr_BadXML, "DOCTYPE is not allowed" );
+			this->NotifyClient ( kXMPErrSev_Recoverable, error );
+		}
+	#endif
+
+	if ( status != XML_STATUS_OK ) {
+	
+		XMP_StringPtr errMsg = "XML parsing failure";
+
+		#if 0	// XMP_DebugBuild	// Disable for now to make test output uniform. Restore later with thread safety.
+		
+			// *** This is a good candidate for a callback error notification mechanism.
+			// *** This code is not thread safe, the sExpatMessage isn't locked. But that's OK for debug usage.
+
+			enum XML_Error expatErr = XML_GetErrorCode ( this->parser );
+			const char *   expatMsg = XML_ErrorString ( expatErr );
+			int errLine = XML_GetCurrentLineNumber ( this->parser );
+		
+			char msgBuffer[1000];
+			// AUDIT: Use of sizeof(msgBuffer) for snprintf length is safe.
+			snprintf ( msgBuffer, sizeof(msgBuffer), "# Expat error %d at line %d, \"%s\"", expatErr, errLine, expatMsg );
+			sExpatMessage = msgBuffer;
+			errMsg = sExpatMessage.c_str();
+
+			#if  DumpXMLParseEvents
+				if ( this->parseLog != 0 ) fprintf ( this->parseLog, "%s\n", errMsg, expatErr, errLine, expatMsg );
+			#endif
+
+		#endif
+
+		XMP_Error error(kXMPErr_BadXML, errMsg);
+		this->NotifyClient ( kXMPErrSev_Recoverable, error );
+
+	}
+	
+}	// ExpatAdapter::ParseBuffer
+
+// =================================================================================================
+// =================================================================================================
+
+#if XMP_DebugBuild & DumpXMLParseEvents
+
+	static inline void PrintIndent ( FILE * file, size_t count )
+	{
+		for ( ; count > 0; --count ) fprintf ( file, "  " );
+	}
+
+#endif
+
+// =================================================================================================
+
+static void SetQualName ( ExpatAdapter * thiz, XMP_StringPtr fullName, XML_Node * node )
+{
+	// Expat delivers the full name as a catenation of namespace URI, separator, and local name.
+
+	// As a compatibility hack, an "about" or "ID" attribute of an rdf:Description element is
+	// changed to "rdf:about" or rdf:ID. Easier done here than in the RDF recognizer.
+	
+	// As a bug fix hack, change a URI of "http://purl.org/dc/1.1/" to ""http://purl.org/dc/elements/1.1/.
+	// Early versions of Flash that put XMP in SWF used a bad URI for the dc: namespace.
+
+	// ! This code presumes the RDF namespace prefix is "rdf".
+
+	size_t sepPos = strlen(fullName);
+	for ( --sepPos; sepPos > 0; --sepPos ) {
+		if ( fullName[sepPos] == FullNameSeparator ) break;
+	}
+
+	if ( fullName[sepPos] == FullNameSeparator ) {
+
+		XMP_StringPtr prefix;
+		XMP_StringLen prefixLen;
+		XMP_StringPtr localPart = fullName + sepPos + 1;
+
+		node->ns.assign ( fullName, sepPos );
+		if ( node->ns == "http://purl.org/dc/1.1/" ) node->ns = "http://purl.org/dc/elements/1.1/";
+
+		bool found = thiz->registeredNamespaces->GetPrefix ( node->ns.c_str(), &prefix, &prefixLen );
+		if ( ! found ) {
+			XMP_Error error(kXMPErr_ExternalFailure, "Unknown URI in Expat full name" );
+			thiz->NotifyClient ( kXMPErrSev_OperationFatal, error );
+		}
+		node->nsPrefixLen = prefixLen;	// ! Includes the ':'.
+		
+		node->name = prefix;
+		node->name += localPart;
+
+	} else {
+
+		node->name = fullName;	// The name is not in a namespace.
+	
+		if ( node->parent->name == "rdf:Description" ) {
+			if ( node->name == "about" ) {
+				node->ns   = kXMP_NS_RDF;
+				node->name = "rdf:about";
+				node->nsPrefixLen = 4;	// ! Include the ':'.
+			} else if ( node->name == "ID" ) {
+				node->ns   = kXMP_NS_RDF;
+				node->name = "rdf:ID";
+				node->nsPrefixLen = 4;	// ! Include the ':'.
+			}
+		}
+		
+	}
+
+}	// SetQualName
+
+// =================================================================================================
+
+static void StartNamespaceDeclHandler ( void * userData, XMP_StringPtr prefix, XMP_StringPtr uri )
+{
+	IgnoreParam(userData);
+	
+	// As a bug fix hack, change a URI of "http://purl.org/dc/1.1/" to ""http://purl.org/dc/elements/1.1/.
+	// Early versions of Flash that put XMP in SWF used a bad URI for the dc: namespace.
+	
+	ExpatAdapter * thiz = (ExpatAdapter*)userData;
+
+	if ( prefix == 0 ) prefix = "_dflt_";	// Have default namespace.
+	if ( uri == 0 ) return;	// Ignore, have xmlns:pre="", no URI to register.
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "StartNamespace: %s - \"%s\"\n", prefix, uri );
+		}
+	#endif
+	
+	if ( XMP_LitMatch ( uri, "http://purl.org/dc/1.1/" ) ) uri = "http://purl.org/dc/elements/1.1/";
+	(void) thiz->registeredNamespaces->Define ( uri, prefix, 0, 0 );
+
+}	// StartNamespaceDeclHandler
+
+// =================================================================================================
+
+static void EndNamespaceDeclHandler ( void * userData, XMP_StringPtr prefix )
+{
+	IgnoreParam(userData);
+
+	#if XMP_DebugBuild & DumpXMLParseEvents		// Avoid unused variable warning.
+		ExpatAdapter * thiz = (ExpatAdapter*)userData;
+	#endif
+
+	if ( prefix == 0 ) prefix = "_dflt_";	// Have default namespace.
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "EndNamespace: %s\n", prefix );
+		}
+	#endif
+	
+	// ! Nothing to do, Expat has done all of the XML processing.
+
+}	// EndNamespaceDeclHandler
+
+// =================================================================================================
+
+static void StartElementHandler ( void * userData, XMP_StringPtr name, XMP_StringPtr* attrs )
+{
+	XMP_Assert ( attrs != 0 );
+	ExpatAdapter * thiz = (ExpatAdapter*)userData;
+	
+	size_t attrCount = 0;
+	for ( XMP_StringPtr* a = attrs; *a != 0; ++a ) ++attrCount;
+	if ( (attrCount & 1) != 0 ) {
+		XMP_Error error(kXMPErr_ExternalFailure, "Expat attribute info has odd length");
+		thiz->NotifyClient ( kXMPErrSev_OperationFatal, error );
+	}
+	attrCount = attrCount/2;	// They are name/value pairs.
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "StartElement: %s, %d attrs", name, attrCount );
+			for ( XMP_StringPtr* attr = attrs; *attr != 0; attr += 2 ) {
+				XMP_StringPtr attrName = *attr;
+				XMP_StringPtr attrValue = *(attr+1);
+				fprintf ( thiz->parseLog, ", %s = \"%s\"", attrName, attrValue );
+			}
+			fprintf ( thiz->parseLog, "\n" );
+		}
+	#endif
+
+	XML_Node * parentNode = thiz->parseStack.back();
+	XML_Node * elemNode   = new XML_Node ( parentNode, "", kElemNode );
+	
+	SetQualName ( thiz, name, elemNode );
+	
+	for ( XMP_StringPtr* attr = attrs; *attr != 0; attr += 2 ) {
+
+		XMP_StringPtr attrName = *attr;
+		XMP_StringPtr attrValue = *(attr+1);
+		XML_Node * attrNode = new XML_Node ( elemNode, "", kAttrNode );
+
+		SetQualName ( thiz, attrName, attrNode );
+		attrNode->value = attrValue;
+		if ( attrNode->name == "xml:lang" ) NormalizeLangValue ( &attrNode->value );
+		elemNode->attrs.push_back ( attrNode );
+
+	}
+	
+	parentNode->content.push_back ( elemNode );
+	thiz->parseStack.push_back ( elemNode );
+	
+	if ( elemNode->name == "rdf:RDF" ) {
+		thiz->rootNode = elemNode;
+		++thiz->rootCount;
+	}
+	#if XMP_DebugBuild
+		++thiz->elemNesting;
+	#endif
+
+}	// StartElementHandler
+
+// =================================================================================================
+
+static void EndElementHandler ( void * userData, XMP_StringPtr name )
+{
+	IgnoreParam(name);
+	
+	ExpatAdapter * thiz = (ExpatAdapter*)userData;
+
+	#if XMP_DebugBuild
+		--thiz->elemNesting;
+	#endif
+	(void) thiz->parseStack.pop_back();
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "EndElement: %s\n", name );
+		}
+	#endif
+
+}	// EndElementHandler
+
+// =================================================================================================
+
+static void CharacterDataHandler ( void * userData, XMP_StringPtr cData, int len )
+{
+	ExpatAdapter * thiz = (ExpatAdapter*)userData;
+	
+	if ( (cData == 0) || (len == 0) ) { cData = ""; len = 0; }
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "CharContent: \"" );
+			for ( int i = 0; i < len; ++i ) fprintf ( thiz->parseLog, "%c", cData[i] );
+			fprintf ( thiz->parseLog, "\"\n" );
+		}
+	#endif
+	
+	XML_Node * parentNode = thiz->parseStack.back();
+	XML_Node * cDataNode  = new XML_Node ( parentNode, "", kCDataNode );
+	
+	cDataNode->value.assign ( cData, len );
+	parentNode->content.push_back ( cDataNode );
+	
+}	// CharacterDataHandler
+
+// =================================================================================================
+
+static void StartCdataSectionHandler ( void * userData )
+{
+	IgnoreParam(userData);
+
+	#if XMP_DebugBuild & DumpXMLParseEvents		// Avoid unused variable warning.
+		ExpatAdapter * thiz = (ExpatAdapter*)userData;
+	#endif
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "StartCDATA\n" );
+		}
+	#endif
+	
+	// *** Since markup isn't recognized inside CDATA, this affects XMP's double escaping.
+	
+}	// StartCdataSectionHandler
+
+// =================================================================================================
+
+static void EndCdataSectionHandler ( void * userData )
+{
+	IgnoreParam(userData);
+
+	#if XMP_DebugBuild & DumpXMLParseEvents		// Avoid unused variable warning.
+		ExpatAdapter * thiz = (ExpatAdapter*)userData;
+	#endif
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "EndCDATA\n" );
+		}
+	#endif	
+
+}	// EndCdataSectionHandler
+
+// =================================================================================================
+
+static void ProcessingInstructionHandler ( void * userData, XMP_StringPtr target, XMP_StringPtr data )
+{
+	XMP_Assert ( target != 0 );
+	ExpatAdapter * thiz = (ExpatAdapter*)userData;
+
+	if ( ! XMP_LitMatch ( target, "xpacket" ) ) return;	// Ignore all PIs except the XMP packet wrapper.
+	if ( data == 0 ) data = "";
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "PI: %s - \"%s\"\n", target, data );
+		}
+	#endif
+	
+	XML_Node * parentNode = thiz->parseStack.back();
+	XML_Node * piNode  = new XML_Node ( parentNode, target, kPINode );
+	
+	piNode->value.assign ( data );
+	parentNode->content.push_back ( piNode );
+	
+}	// ProcessingInstructionHandler
+
+// =================================================================================================
+
+static void CommentHandler ( void * userData, XMP_StringPtr comment )
+{
+	IgnoreParam(userData);
+
+	#if XMP_DebugBuild & DumpXMLParseEvents		// Avoid unused variable warning.
+		ExpatAdapter * thiz = (ExpatAdapter*)userData;
+	#endif
+
+	if ( comment == 0 ) comment = "";
+	
+	#if XMP_DebugBuild & DumpXMLParseEvents
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "Comment: \"%s\"\n", comment );
+		}
+	#endif
+	
+	// ! Comments are ignored.
+	
+}	// CommentHandler
+
+// =================================================================================================
+
+#if BanAllEntityUsage
+static void StartDoctypeDeclHandler ( void * userData, XMP_StringPtr doctypeName,
+									  XMP_StringPtr sysid, XMP_StringPtr pubid, int has_internal_subset )
+{
+	IgnoreParam(userData);
+
+	ExpatAdapter * thiz = (ExpatAdapter*)userData;
+
+	#if XMP_DebugBuild & DumpXMLParseEvents		// Avoid unused variable warning.
+		if ( thiz->parseLog != 0 ) {
+			PrintIndent ( thiz->parseLog, thiz->elemNesting );
+			fprintf ( thiz->parseLog, "DocType: \"%s\"\n", doctypeName );
+		}
+	#endif
+	
+	thiz->isAborted = true;	// ! Can't throw an exception across the plain C Expat frames.
+	(void) XML_StopParser ( thiz->parser, XML_FALSE /* not resumable */ );
+
+}	// StartDoctypeDeclHandler
+#endif
+
+// =================================================================================================
diff --git a/XMPCore/source/Makefile.am b/XMPCore/source/Makefile.am
new file mode 100644
index 0000000..309d255
--- /dev/null
+++ b/XMPCore/source/Makefile.am
@@ -0,0 +1,64 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+
+noinst_LTLIBRARIES = libXMPCore.la
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_HEADERS =  \
+	XMPCore_Impl.hpp  XMPIterator.hpp \
+	XMPMeta.hpp  XMPUtils.hpp
+
+
+libXMPCore_la_SOURCES = ExpatAdapter.cpp  \
+	WXMPIterator.cpp  \
+	WXMPUtils.cpp     \
+	XMPIterator.cpp  \
+	XMPMeta-GetSet.cpp  \
+	XMPMeta-Serialize.cpp  \
+	XMPUtils-FileInfo.cpp \
+	ParseRDF.cpp      \
+	WXMPMeta.cpp     \
+	XMPCore_Impl.cpp  \
+	XMPMeta.cpp      \
+	XMPMeta-Parse.cpp   \
+	XMPUtils.cpp
+
diff --git a/XMPCore/source/Makefile.in b/XMPCore/source/Makefile.in
new file mode 100644
index 0000000..a90aa76
--- /dev/null
+++ b/XMPCore/source/Makefile.in
@@ -0,0 +1,690 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPCore/source
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libXMPCore_la_LIBADD =
+am_libXMPCore_la_OBJECTS = ExpatAdapter.lo WXMPIterator.lo \
+	WXMPUtils.lo XMPIterator.lo XMPMeta-GetSet.lo \
+	XMPMeta-Serialize.lo XMPUtils-FileInfo.lo ParseRDF.lo \
+	WXMPMeta.lo XMPCore_Impl.lo XMPMeta.lo XMPMeta-Parse.lo \
+	XMPUtils.lo
+libXMPCore_la_OBJECTS = $(am_libXMPCore_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libXMPCore_la_SOURCES)
+DIST_SOURCES = $(libXMPCore_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libXMPCore.la
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_HEADERS = \
+	XMPCore_Impl.hpp  XMPIterator.hpp \
+	XMPMeta.hpp  XMPUtils.hpp
+
+libXMPCore_la_SOURCES = ExpatAdapter.cpp  \
+	WXMPIterator.cpp  \
+	WXMPUtils.cpp     \
+	XMPIterator.cpp  \
+	XMPMeta-GetSet.cpp  \
+	XMPMeta-Serialize.cpp  \
+	XMPUtils-FileInfo.cpp \
+	ParseRDF.cpp      \
+	WXMPMeta.cpp     \
+	XMPCore_Impl.cpp  \
+	XMPMeta.cpp      \
+	XMPMeta-Parse.cpp   \
+	XMPUtils.cpp
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPCore/source/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPCore/source/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libXMPCore.la: $(libXMPCore_la_OBJECTS) $(libXMPCore_la_DEPENDENCIES) $(EXTRA_libXMPCore_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libXMPCore_la_OBJECTS) $(libXMPCore_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExpatAdapter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParseRDF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WXMPIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WXMPMeta.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WXMPUtils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPCore_Impl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPIterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPMeta-GetSet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPMeta-Parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPMeta-Serialize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPMeta.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPUtils-FileInfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPUtils.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPCore/source/ParseRDF.cpp b/XMPCore/source/ParseRDF.cpp
new file mode 100644
index 0000000..8ec0e87
--- /dev/null
+++ b/XMPCore/source/ParseRDF.cpp
@@ -0,0 +1,1407 @@
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+#include "XMPCore/source/XMPMeta.hpp"
+#include "source/ExpatAdapter.hpp"
+
+#include <cstring>
+
+#if DEBUG
+	#include <iostream>
+#endif
+
+using namespace std;
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4189 )	// local variable is initialized but not referenced
+	#pragma warning ( disable : 4505 )	// unreferenced local function has been removed
+#endif
+
+// =================================================================================================
+
+// *** This might be faster and use less memory as a state machine. A big advantage of building an
+// *** XML tree though is easy lookahead during the recursive descent processing.
+
+// *** It would be nice to give a line number or byte offset in the exception messages.
+
+
+// 7 RDF/XML Grammar (from http://www.w3.org/TR/rdf-syntax-grammar/#section-Infoset-Grammar)
+//
+// 7.1 Grammar summary
+//
+// 7.2.2 coreSyntaxTerms
+//		rdf:RDF | rdf:ID | rdf:about | rdf:parseType | rdf:resource | rdf:nodeID | rdf:datatype
+//
+// 7.2.3 syntaxTerms
+//		coreSyntaxTerms | rdf:Description | rdf:li
+//
+// 7.2.4 oldTerms
+//		rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID
+//
+// 7.2.5 nodeElementURIs
+//		anyURI - ( coreSyntaxTerms | rdf:li | oldTerms )
+//
+// 7.2.6 propertyElementURIs
+//		anyURI - ( coreSyntaxTerms | rdf:Description | oldTerms )
+//
+// 7.2.7 propertyAttributeURIs
+//		anyURI - ( coreSyntaxTerms | rdf:Description | rdf:li | oldTerms )
+//
+// 7.2.8 doc
+//		root ( document-element == RDF, children == list ( RDF ) )
+//
+// 7.2.9 RDF
+//		start-element ( URI == rdf:RDF, attributes == set() )
+//		nodeElementList
+//		end-element()
+//
+// 7.2.10 nodeElementList
+//		ws* ( nodeElement ws* )*
+//
+// 7.2.11 nodeElement
+//		start-element ( URI == nodeElementURIs,
+//						attributes == set ( ( idAttr | nodeIdAttr | aboutAttr )?, propertyAttr* ) )
+//		propertyEltList
+//		end-element()
+//
+// 7.2.12 ws
+//		A text event matching white space defined by [XML] definition White Space Rule [3] S in section Common Syntactic Constructs.
+//
+// 7.2.13 propertyEltList
+//		ws* ( propertyElt ws* )*
+//
+// 7.2.14 propertyElt
+//		resourcePropertyElt | literalPropertyElt | parseTypeLiteralPropertyElt |
+//		parseTypeResourcePropertyElt | parseTypeCollectionPropertyElt | parseTypeOtherPropertyElt | emptyPropertyElt
+//
+// 7.2.15 resourcePropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr? ) )
+//		ws* nodeElement ws*
+//		end-element()
+//
+// 7.2.16 literalPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, datatypeAttr?) )
+//		text()
+//		end-element()
+//
+// 7.2.17 parseTypeLiteralPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseLiteral ) )
+//		literal
+//		end-element()
+//
+// 7.2.18 parseTypeResourcePropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseResource ) )
+//		propertyEltList
+//		end-element()
+//
+// 7.2.19 parseTypeCollectionPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseCollection ) )
+//		nodeElementList
+//		end-element()
+//
+// 7.2.20 parseTypeOtherPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseOther ) )
+//		propertyEltList
+//		end-element()
+//
+// 7.2.21 emptyPropertyElt
+//		start-element ( URI == propertyElementURIs,
+//						attributes == set ( idAttr?, ( resourceAttr | nodeIdAttr )?, propertyAttr* ) )
+//		end-element()
+//
+// 7.2.22 idAttr
+//		attribute ( URI == rdf:ID, string-value == rdf-id )
+//
+// 7.2.23 nodeIdAttr
+//		attribute ( URI == rdf:nodeID, string-value == rdf-id )
+//
+// 7.2.24 aboutAttr
+//		attribute ( URI == rdf:about, string-value == URI-reference )
+//
+// 7.2.25 propertyAttr
+//		attribute ( URI == propertyAttributeURIs, string-value == anyString )
+//
+// 7.2.26 resourceAttr
+//		attribute ( URI == rdf:resource, string-value == URI-reference )
+//
+// 7.2.27 datatypeAttr
+//		attribute ( URI == rdf:datatype, string-value == URI-reference )
+//
+// 7.2.28 parseLiteral
+//		attribute ( URI == rdf:parseType, string-value == "Literal")
+//
+// 7.2.29 parseResource
+//		attribute ( URI == rdf:parseType, string-value == "Resource")
+//
+// 7.2.30 parseCollection
+//		attribute ( URI == rdf:parseType, string-value == "Collection")
+//
+// 7.2.31 parseOther
+//		attribute ( URI == rdf:parseType, string-value == anyString - ("Resource" | "Literal" | "Collection") )
+//
+// 7.2.32 URI-reference
+//		An RDF URI Reference.
+//
+// 7.2.33 literal
+//		Any XML element content that is allowed according to [XML] definition Content of Elements Rule [43] content
+//		in section 3.1 Start-Tags, End-Tags, and Empty-Element Tags.
+//
+// 7.2.34 rdf-id
+//		An attribute string-value matching any legal [XML-NS] token NCName.
+
+
+// =================================================================================================
+// Primary Parsing Functions
+// =========================
+//
+// Each of these is responsible for recognizing an RDF syntax production and adding the appropriate
+// structure to the XMP tree. They simply return for success, failures will throw an exception. The
+// class exists only to provide access to the error notification object.
+
+class RDF_Parser {
+public:
+
+	void RDF ( XMP_Node * xmpTree, const XML_Node & xmlNode );
+
+	void NodeElementList ( XMP_Node * xmpParent, const XML_Node & xmlParent, bool isTopLevel );
+
+	void NodeElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void NodeElementAttrs ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void PropertyElementList ( XMP_Node * xmpParent, const XML_Node & xmlParent, bool isTopLevel );
+
+	void PropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void ResourcePropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void LiteralPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void ParseTypeLiteralPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void ParseTypeResourcePropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void ParseTypeCollectionPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void ParseTypeOtherPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	void EmptyPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel );
+
+	RDF_Parser ( XMPMeta::ErrorCallbackInfo * ec ) : errorCallback(ec) {};
+
+private:
+
+	RDF_Parser() { 
+
+		errorCallback = NULL;
+
+	};	// Hidden on purpose.
+	
+	XMPMeta::ErrorCallbackInfo * errorCallback;
+
+	XMP_Node * AddChildNode ( XMP_Node * xmpParent, const XML_Node & xmlNode, const XMP_StringPtr value, bool isTopLevel );
+
+	XMP_Node * AddQualifierNode ( XMP_Node * xmpParent, const XMP_VarString & name, const XMP_VarString & value );
+
+	XMP_Node * AddQualifierNode ( XMP_Node * xmpParent, const XML_Node & attr );
+	
+	void FixupQualifiedNode ( XMP_Node * xmpParent );
+
+};
+
+enum { kIsTopLevel = true, kNotTopLevel = false };
+
+// =================================================================================================
+
+typedef XMP_Uns8 RDFTermKind;
+
+// *** Logic might be safer with just masks.
+
+enum {
+	kRDFTerm_Other				=  0,
+	kRDFTerm_RDF				=  1,	// Start of coreSyntaxTerms.
+	kRDFTerm_ID					=  2,
+	kRDFTerm_about				=  3,
+	kRDFTerm_parseType			=  4,
+	kRDFTerm_resource			=  5,
+	kRDFTerm_nodeID				=  6,
+	kRDFTerm_datatype			=  7,	// End of coreSyntaxTerms.
+	kRDFTerm_Description		=  8,	// Start of additions for syntaxTerms.
+	kRDFTerm_li					=  9,	// End of of additions for syntaxTerms.
+	kRDFTerm_aboutEach			= 10,	// Start of oldTerms.
+	kRDFTerm_aboutEachPrefix	= 11,
+	kRDFTerm_bagID				= 12,	// End of oldTerms.
+	
+	kRDFTerm_FirstCore          = kRDFTerm_RDF,
+	kRDFTerm_LastCore           = kRDFTerm_datatype,
+	kRDFTerm_FirstSyntax        = kRDFTerm_FirstCore,	// ! Yes, the syntax terms include the core terms.
+	kRDFTerm_LastSyntax         = kRDFTerm_li,
+	kRDFTerm_FirstOld           = kRDFTerm_aboutEach,
+	kRDFTerm_LastOld            = kRDFTerm_bagID
+};
+
+enum {
+	kRDFMask_Other				= 1 << kRDFTerm_Other,
+	kRDFMask_RDF				= 1 << kRDFTerm_RDF,
+	kRDFMask_ID					= 1 << kRDFTerm_ID,
+	kRDFMask_about				= 1 << kRDFTerm_about,
+	kRDFMask_parseType			= 1 << kRDFTerm_parseType,
+	kRDFMask_resource			= 1 << kRDFTerm_resource,
+	kRDFMask_nodeID				= 1 << kRDFTerm_nodeID,
+	kRDFMask_datatype			= 1 << kRDFTerm_datatype,
+	kRDFMask_Description		= 1 << kRDFTerm_Description,
+	kRDFMask_li					= 1 << kRDFTerm_li,
+	kRDFMask_aboutEach			= 1 << kRDFTerm_aboutEach,
+	kRDFMask_aboutEachPrefix	= 1 << kRDFTerm_aboutEachPrefix,
+	kRDFMask_bagID				= 1 << kRDFTerm_bagID
+};
+
+enum {
+	kRDF_HasValueElem = 0x10000000UL	// ! Contains rdf:value child. Must fit within kXMP_ImplReservedMask!
+};
+
+// -------------------------------------------------------------------------------------------------
+// GetRDFTermKind
+// --------------
+
+static RDFTermKind
+GetRDFTermKind ( const XMP_VarString & name )
+{
+	RDFTermKind term = kRDFTerm_Other;
+
+	// Arranged to hopefully minimize the parse time for large XMP.
+
+	if ( (name.size() > 4) && (strncmp ( name.c_str(), "rdf:", 4 ) == 0) ) {
+
+		if ( name == "rdf:li" ) {
+			term = kRDFTerm_li;
+		} else if ( name == "rdf:parseType" ) {
+			term = kRDFTerm_parseType;
+		} else if ( name == "rdf:Description" ) {
+			term = kRDFTerm_Description;
+		} else if ( name == "rdf:about" ) {
+			term = kRDFTerm_about;
+		} else if ( name == "rdf:resource" ) {
+			term = kRDFTerm_resource;
+		} else if ( name == "rdf:RDF" ) {
+			term = kRDFTerm_RDF;
+		} else if ( name == "rdf:ID" ) {
+			term = kRDFTerm_ID;
+		} else if ( name == "rdf:nodeID" ) {
+			term = kRDFTerm_nodeID;
+		} else if ( name == "rdf:datatype" ) {
+			term = kRDFTerm_datatype;
+		} else if ( name == "rdf:aboutEach" ) {
+			term = kRDFTerm_aboutEach;
+		} else if ( name == "rdf:aboutEachPrefix" ) {
+			term = kRDFTerm_aboutEachPrefix;
+		} else if ( name == "rdf:bagID" ) {
+			term = kRDFTerm_bagID;
+		}
+
+	}
+
+	return term;
+
+}	// GetRDFTermKind
+
+// =================================================================================================
+
+static void
+RemoveQualifier ( XMP_Node * xmpParent, size_t index )
+{
+	XMP_Node * qualifier = xmpParent->qualifiers[index];
+	xmpParent->qualifiers.erase ( xmpParent->qualifiers.begin() + index );
+	delete qualifier;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static void
+RemoveQualifier ( XMP_Node * xmpParent, XMP_NodePtrPos pos )
+{
+	XMP_Node * qualifier = *pos;
+	xmpParent->qualifiers.erase ( pos );
+	delete qualifier;
+}
+
+// =================================================================================================
+
+// -------------------------------------------------------------------------------------------------
+// IsCoreSyntaxTerm
+// ----------------
+//
+// 7.2.2 coreSyntaxTerms
+//		rdf:RDF | rdf:ID | rdf:about | rdf:parseType | rdf:resource | rdf:nodeID | rdf:datatype
+
+static bool
+IsCoreSyntaxTerm ( RDFTermKind term )
+{
+	if 	( (kRDFTerm_FirstCore <= term) && (term <= kRDFTerm_LastCore) ) return true;
+	return false;
+}
+
+// -------------------------------------------------------------------------------------------------
+// IsOldTerm
+// ---------
+//
+// 7.2.4 oldTerms
+//		rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID
+
+static bool
+IsOldTerm ( RDFTermKind term )
+{
+	if 	( (kRDFTerm_FirstOld <= term) && (term <= kRDFTerm_LastOld) ) return true;
+	return false;
+}
+
+// -------------------------------------------------------------------------------------------------
+// IsPropertyElementName
+// ---------------------
+//
+// 7.2.6 propertyElementURIs
+//		anyURI - ( coreSyntaxTerms | rdf:Description | oldTerms )
+
+static bool
+IsPropertyElementName ( RDFTermKind term )
+{
+	if 	( (term == kRDFTerm_Description) || IsOldTerm ( term ) ) return false;
+	return (! IsCoreSyntaxTerm ( term ));
+}
+
+// -------------------------------------------------------------------------------------------------
+// IsNumberedArrayItemName
+// -----------------------
+//
+// Return true for a name of the form "rdf:_n", where n is a decimal integer. We're not strict about
+// the integer part, it just has to be characters in the range '0'..'9'.
+
+static bool
+IsNumberedArrayItemName ( const std::string & name )
+{
+	if ( name.size() <= 5 ) return false;
+	if ( strncmp ( name.c_str(), "rdf:_", 5 ) != 0 ) return false;
+	for ( size_t i = 5; i < name.size(); ++i ) {
+		if ( (name[i] < '0') | (name[i] > '9') ) return false;
+	}
+	return true;
+}
+
+// =================================================================================================
+// RDF_Parser::AddChildNode
+// ========================
+
+XMP_Node * RDF_Parser::AddChildNode ( XMP_Node * xmpParent, const XML_Node & xmlNode, const XMP_StringPtr value, bool isTopLevel )
+{
+	
+	if ( xmlNode.ns.empty() ) {
+		XMP_Error error ( kXMPErr_BadRDF, "XML namespace required for all elements and attributes" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+		return 0;
+	}
+		
+	bool isArrayParent = (xmpParent->options & kXMP_PropValueIsArray) !=0;
+	bool isArrayItem   = (xmlNode.name == "rdf:li");
+	bool isValueNode   = (xmlNode.name == "rdf:value");
+	XMP_OptionBits childOptions = 0;
+	XMP_StringPtr  childName = xmlNode.name.c_str();
+
+	if ( isTopLevel ) {
+
+		// Lookup the schema node, adjust the XMP parent pointer.
+		XMP_Assert ( xmpParent->parent == 0 );	// Incoming parent must be the tree root.
+		XMP_Node * schemaNode = FindSchemaNode ( xmpParent, xmlNode.ns.c_str(), kXMP_CreateNodes );
+		if ( schemaNode->options & kXMP_NewImplicitNode ) schemaNode->options ^= kXMP_NewImplicitNode;	// Clear the implicit node bit.
+			// *** Should use "opt &= ~flag" (no conditional), need runtime check for proper 32 bit code.
+		xmpParent = schemaNode;
+		
+		// If this is an alias set the isAlias flag in the node and the hasAliases flag in the tree.
+		if ( sRegisteredAliasMap->find ( xmlNode.name ) != sRegisteredAliasMap->end() ) {
+			childOptions |= kXMP_PropIsAlias;
+			schemaNode->parent->options |= kXMP_PropHasAliases;
+		}
+		
+	}
+	
+	// Check use of rdf:li and rdf:_n names. Must be done before calling FindChildNode!
+	if ( isArrayItem ) {
+
+		// rdf:li can only be used for array children.
+		if ( ! isArrayParent ) {
+			XMP_Error error ( kXMPErr_BadRDF, "Misplaced rdf:li element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			return 0;
+		}
+		childName = kXMP_ArrayItemName;
+
+	} else if ( isArrayParent ) {
+
+		// Tolerate use of rdf:_n, don't verify order.
+		if ( IsNumberedArrayItemName ( xmlNode.name ) ) {
+			childName = kXMP_ArrayItemName;
+			isArrayItem = true;
+		} else {
+			XMP_Error error ( kXMPErr_BadRDF, "Array items cannot have arbitrary child names" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			return 0;
+		}
+
+	}
+
+	// Make sure that this is not a duplicate of a named node.
+	if ( ! (isArrayItem | isValueNode) ) {
+		if ( FindChildNode ( xmpParent, childName, kXMP_ExistingOnly ) != 0 ) {
+			XMP_Error error ( kXMPErr_BadXMP, "Duplicate property or field node" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			return 0;
+		}
+	}
+
+	// Make sure an rdf:value node is used properly.
+	if ( isValueNode ) {
+		if ( isTopLevel || (! (xmpParent->options & kXMP_PropValueIsStruct)) ) {
+			XMP_Error error ( kXMPErr_BadRDF, "Misplaced rdf:value element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			return 0;
+		}
+		xmpParent->options |= kRDF_HasValueElem;
+	}
+	
+	// Add the new child to the XMP parent node.
+	XMP_Node * newChild = new XMP_Node ( xmpParent, childName, value, childOptions );
+	if ( (! isValueNode) || xmpParent->children.empty() ) {
+		 xmpParent->children.push_back ( newChild );
+	} else {
+		 xmpParent->children.insert ( xmpParent->children.begin(), newChild );
+	}
+	
+	return newChild;
+
+}	// RDF_Parser::AddChildNode
+
+// =================================================================================================
+// RDF_Parser::AddQualifierNode
+// ============================
+
+XMP_Node * RDF_Parser::AddQualifierNode ( XMP_Node * xmpParent, const XMP_VarString & name, const XMP_VarString & value )
+{
+	
+	const bool isLang = (name == "xml:lang");
+	const bool isType = (name == "rdf:type");
+
+	XMP_Node * newQual = 0;
+
+	newQual = new XMP_Node ( xmpParent, name, value, kXMP_PropIsQualifier );
+
+	if ( ! (isLang | isType) ) {
+		xmpParent->qualifiers.push_back ( newQual );
+	} else if ( isLang ) {
+		if ( xmpParent->qualifiers.empty() ) {
+			xmpParent->qualifiers.push_back ( newQual );
+		} else {
+			xmpParent->qualifiers.insert ( xmpParent->qualifiers.begin(), newQual );
+		}
+		xmpParent->options |= kXMP_PropHasLang;
+	} else {
+		XMP_Assert ( isType );
+		if ( xmpParent->qualifiers.empty() ) {
+			xmpParent->qualifiers.push_back ( newQual );
+		} else {
+			size_t offset = 0;
+			if ( XMP_PropHasLang ( xmpParent->options ) ) offset = 1;
+			xmpParent->qualifiers.insert ( xmpParent->qualifiers.begin()+offset, newQual );
+		}
+		xmpParent->options |= kXMP_PropHasType;
+	}
+
+	xmpParent->options |= kXMP_PropHasQualifiers;
+
+	return newQual;
+
+}	// RDF_Parser::AddQualifierNode
+
+// =================================================================================================
+// RDF_Parser::AddQualifierNode
+// ============================
+
+XMP_Node * RDF_Parser::AddQualifierNode ( XMP_Node * xmpParent, const XML_Node & attr )
+{
+	if ( attr.ns.empty() ) {
+		XMP_Error error ( kXMPErr_BadRDF, "XML namespace required for all elements and attributes" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+		return 0;
+	}
+	
+	return this->AddQualifierNode ( xmpParent, attr.name, attr.value );
+
+}	// RDF_Parser::AddQualifierNode
+
+// =================================================================================================
+// RDF_Parser::FixupQualifiedNode
+// ==============================
+//
+// The parent is an RDF pseudo-struct containing an rdf:value field. Fix the XMP data model. The
+// rdf:value node must be the first child, the other children are qualifiers. The form, value, and
+// children of the rdf:value node are the real ones. The rdf:value node's qualifiers must be added
+// to the others.
+	
+void RDF_Parser::FixupQualifiedNode ( XMP_Node * xmpParent )
+{
+	size_t qualNum, qualLim;
+	size_t childNum, childLim;
+
+	XMP_Enforce ( (xmpParent->options & kXMP_PropValueIsStruct) && (! xmpParent->children.empty()) );
+
+	XMP_Node * valueNode = xmpParent->children[0];
+	XMP_Enforce ( valueNode->name == "rdf:value" );
+	
+	xmpParent->qualifiers.reserve ( xmpParent->qualifiers.size() + xmpParent->children.size() + valueNode->qualifiers.size() );
+	
+	// Move the qualifiers on the value node to the parent. Make sure an xml:lang qualifier stays at
+	// the front.
+	
+	qualNum = 0;
+	qualLim = valueNode->qualifiers.size();
+	
+	if ( valueNode->options & kXMP_PropHasLang ) {
+
+		if ( xmpParent->options & kXMP_PropHasLang ) {
+			XMP_Error error ( kXMPErr_BadXMP, "Duplicate xml:lang for rdf:value element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			XMP_Assert ( xmpParent->qualifiers[0]->name == "xml:lang" );
+			RemoveQualifier ( xmpParent, 0 );	// Use the rdf:value node's language.
+		}
+
+		XMP_Node * langQual = valueNode->qualifiers[0];
+		
+		XMP_Assert ( langQual->name == "xml:lang" );
+		langQual->parent = xmpParent;
+		xmpParent->options |= kXMP_PropHasLang;
+		XMP_ClearOption ( valueNode->options, kXMP_PropHasLang );
+
+		if ( xmpParent->qualifiers.empty() ) {
+			xmpParent->qualifiers.push_back ( langQual );	// *** Should use utilities to add qual & set parent.
+		} else {
+			xmpParent->qualifiers.insert ( xmpParent->qualifiers.begin(), langQual );
+		}
+		valueNode->qualifiers[0] = 0;	// We just moved it to the parent.
+
+		qualNum = 1;	// Start the remaining copy after the xml:lang qualifier.
+
+	}
+	
+	for ( ; qualNum != qualLim; ++qualNum ) {
+
+		XMP_Node * currQual = valueNode->qualifiers[qualNum];
+		XMP_NodePtrPos existingPos;
+		XMP_Node * existingQual = FindQualifierNode ( xmpParent, currQual->name.c_str(), kXMP_ExistingOnly, &existingPos );
+
+		if ( existingQual != 0 ) {
+			XMP_Error error ( kXMPErr_BadXMP, "Duplicate qualifier node" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			RemoveQualifier ( xmpParent, existingPos );	// Use the rdf:value node's qualifier.
+		}
+
+		currQual->parent = xmpParent;
+		xmpParent->qualifiers.push_back ( currQual );
+		valueNode->qualifiers[qualNum] = 0;	// We just moved it to the parent.
+
+	}
+	
+	valueNode->qualifiers.clear();	// ! There should be nothing but null pointers.
+	
+	// Change the parent's other children into qualifiers. This loop starts at 1, child 0 is the
+	// rdf:value node. Put xml:lang at the front, append all others.
+	
+	for ( childNum = 1, childLim = xmpParent->children.size(); childNum != childLim; ++childNum ) {
+
+		XMP_Node * currQual = xmpParent->children[childNum];
+		bool isLang = (currQual->name == "xml:lang");
+		
+		if ( FindQualifierNode ( xmpParent, currQual->name.c_str(), kXMP_ExistingOnly ) != 0 ) {
+			XMP_Error error ( kXMPErr_BadXMP, "Duplicate qualifier" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			delete currQual;
+
+		} else {
+		
+			currQual->options |= kXMP_PropIsQualifier;
+			currQual->parent = xmpParent;
+	
+			if ( isLang ) {
+				xmpParent->options |= kXMP_PropHasLang;
+			} else if ( currQual->name == "rdf:type" ) {
+				xmpParent->options |= kXMP_PropHasType;
+			}
+	
+			if ( (! isLang) || xmpParent->qualifiers.empty() ) {
+				xmpParent->qualifiers.push_back ( currQual );
+			} else {
+				xmpParent->qualifiers.insert ( xmpParent->qualifiers.begin(), currQual );
+			}
+			
+		}
+		
+		xmpParent->children[childNum] = 0;	// We just moved it to the qualifers, or ignored it.
+
+	}
+	
+	if ( ! xmpParent->qualifiers.empty() ) xmpParent->options |= kXMP_PropHasQualifiers;
+	
+	// Move the options and value last, other checks need the parent's original options. Move the
+	// value node's children to be the parent's children. Delete the now useless value node.
+	
+	XMP_Assert ( xmpParent->options & (kXMP_PropValueIsStruct | kRDF_HasValueElem) );
+	xmpParent->options &= ~ (kXMP_PropValueIsStruct | kRDF_HasValueElem);
+	xmpParent->options |= valueNode->options;
+	
+	xmpParent->value.swap ( valueNode->value );
+
+	xmpParent->children[0] = 0;	// ! Remove the value node itself before the swap.
+	xmpParent->children.swap ( valueNode->children );
+	
+	for ( childNum = 0, childLim = xmpParent->children.size(); childNum != childLim; ++childNum ) {
+		XMP_Node * currChild = xmpParent->children[childNum];
+		currChild->parent = xmpParent;
+	}
+
+	delete valueNode;
+	
+}	// RDF_Parser::FixupQualifiedNode
+
+// =================================================================================================
+// RDF_Parser::RDF
+// ===============
+//
+// 7.2.9 RDF
+//		start-element ( URI == rdf:RDF, attributes == set() )
+//		nodeElementList
+//		end-element()
+//
+// The top level rdf:RDF node. It can only have xmlns attributes, which have already been removed
+// during construction of the XML tree.
+
+void RDF_Parser::RDF ( XMP_Node * xmpTree, const XML_Node & xmlNode )
+{
+
+	if ( ! xmlNode.attrs.empty() ) {
+		XMP_Error error ( kXMPErr_BadRDF, "Invalid attributes of rdf:RDF element" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+	}
+	this->NodeElementList ( xmpTree, xmlNode, kIsTopLevel );	// ! Attributes are ignored.
+
+}	// RDF_Parser::RDF
+
+// =================================================================================================
+// RDF_Parser::NodeElementList
+// ===========================
+//
+// 7.2.10 nodeElementList
+//		ws* ( nodeElement ws* )*
+
+void RDF_Parser::NodeElementList ( XMP_Node * xmpParent, const XML_Node & xmlParent, bool isTopLevel )
+{
+	XMP_Assert ( isTopLevel );
+	
+	XML_cNodePos currChild = xmlParent.content.begin();	// *** Change these loops to the indexed pattern.
+	XML_cNodePos endChild  = xmlParent.content.end();
+
+	for ( ; currChild != endChild; ++currChild ) {
+		if ( (*currChild)->IsWhitespaceNode() ) continue;
+		this->NodeElement ( xmpParent, **currChild, isTopLevel );
+	}
+
+}	// RDF_Parser::NodeElementList
+
+// =================================================================================================
+// RDF_Parser::NodeElement
+// =======================
+//
+// 7.2.5 nodeElementURIs
+//		anyURI - ( coreSyntaxTerms | rdf:li | oldTerms )
+//
+// 7.2.11 nodeElement
+//		start-element ( URI == nodeElementURIs,
+//						attributes == set ( ( idAttr | nodeIdAttr | aboutAttr )?, propertyAttr* ) )
+//		propertyEltList
+//		end-element()
+//
+// A node element URI is rdf:Description or anything else that is not an RDF term.
+
+void RDF_Parser::NodeElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	RDFTermKind nodeTerm = GetRDFTermKind ( xmlNode.name );
+	if ( (nodeTerm != kRDFTerm_Description) && (nodeTerm != kRDFTerm_Other) ) {
+		XMP_Error error ( kXMPErr_BadRDF, "Node element must be rdf:Description or typedNode" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+	} else if ( isTopLevel && (nodeTerm == kRDFTerm_Other) ) {
+		XMP_Error error ( kXMPErr_BadXMP, "Top level typedNode not allowed" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+	} else {
+		this->NodeElementAttrs ( xmpParent, xmlNode, isTopLevel );
+		this->PropertyElementList ( xmpParent, xmlNode, isTopLevel );
+	}
+
+}	// RDF_Parser::NodeElement
+
+// =================================================================================================
+// RDF_Parser::NodeElementAttrs
+// ============================
+//
+// 7.2.7 propertyAttributeURIs
+//		anyURI - ( coreSyntaxTerms | rdf:Description | rdf:li | oldTerms )
+//
+// 7.2.11 nodeElement
+//		start-element ( URI == nodeElementURIs,
+//						attributes == set ( ( idAttr | nodeIdAttr | aboutAttr )?, propertyAttr* ) )
+//		propertyEltList
+//		end-element()
+//
+// Process the attribute list for an RDF node element. A property attribute URI is anything other
+// than an RDF term. The rdf:ID and rdf:nodeID attributes are simply ignored, as are rdf:about
+// attributes on inner nodes.
+
+static const XMP_OptionBits kExclusiveAttrMask = (kRDFMask_ID | kRDFMask_nodeID | kRDFMask_about);
+
+void RDF_Parser::NodeElementAttrs ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	XMP_OptionBits exclusiveAttrs = 0;	// Used to detect attributes that are mutually exclusive.
+
+	XML_cNodePos currAttr = xmlNode.attrs.begin();
+	XML_cNodePos endAttr  = xmlNode.attrs.end();
+
+	for ( ; currAttr != endAttr; ++currAttr ) {
+
+		RDFTermKind attrTerm = GetRDFTermKind ( (*currAttr)->name );
+
+		switch ( attrTerm ) {
+
+			case kRDFTerm_ID     :
+			case kRDFTerm_nodeID :
+			case kRDFTerm_about  :
+
+				if ( exclusiveAttrs & kExclusiveAttrMask ) {
+					XMP_Error error ( kXMPErr_BadRDF, "Mutally exclusive about, ID, nodeID attributes" );
+					this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+					continue;	// Skip the later mutually exclusive attributes.
+				}
+				exclusiveAttrs |= (1 << attrTerm);
+
+				if ( isTopLevel && (attrTerm == kRDFTerm_about) ) {
+					// This is the rdf:about attribute on a top level node. Set the XMP tree name if
+					// it doesn't have a name yet. Make sure this name matches the XMP tree name.
+					XMP_Assert ( xmpParent->parent == 0 );	// Must be the tree root node.
+					if ( xmpParent->name.empty() ) {
+						xmpParent->name = (*currAttr)->value;
+					} else if ( ! (*currAttr)->value.empty() ) {
+						if ( xmpParent->name != (*currAttr)->value ) {
+							XMP_Error error ( kXMPErr_BadXMP, "Mismatched top level rdf:about values" );
+							this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+						}
+					}
+				}
+
+				break;
+
+			case kRDFTerm_Other :
+				this->AddChildNode ( xmpParent, **currAttr, (*currAttr)->value.c_str(), isTopLevel );
+				break;
+
+			default :
+				{
+					XMP_Error error ( kXMPErr_BadRDF, "Invalid nodeElement attribute" );
+					this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+				}
+				continue;
+
+		}
+
+	}
+
+}	// RDF_Parser::NodeElementAttrs
+
+// =================================================================================================
+// RDF_Parser::PropertyElementList
+// ===============================
+//
+// 7.2.13 propertyEltList
+//		ws* ( propertyElt ws* )*
+
+void RDF_Parser::PropertyElementList ( XMP_Node * xmpParent, const XML_Node & xmlParent, bool isTopLevel )
+{
+	XML_cNodePos currChild = xmlParent.content.begin();
+	XML_cNodePos endChild  = xmlParent.content.end();
+
+	for ( ; currChild != endChild; ++currChild ) {
+		if ( (*currChild)->IsWhitespaceNode() ) continue;
+		if ( (*currChild)->kind != kElemNode ) {
+			XMP_Error error ( kXMPErr_BadRDF, "Expected property element node not found" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			continue;
+		}
+		this->PropertyElement ( xmpParent, **currChild, isTopLevel );
+	}
+
+}	// RDF_Parser::PropertyElementList
+
+// =================================================================================================
+// RDF_Parser::PropertyElement
+// ===========================
+//
+// 7.2.14 propertyElt
+//		resourcePropertyElt | literalPropertyElt | parseTypeLiteralPropertyElt |
+//		parseTypeResourcePropertyElt | parseTypeCollectionPropertyElt | parseTypeOtherPropertyElt | emptyPropertyElt
+//
+// 7.2.15 resourcePropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr? ) )
+//		ws* nodeElement ws*
+//		end-element()
+//
+// 7.2.16 literalPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, datatypeAttr?) )
+//		text()
+//		end-element()
+//
+// 7.2.17 parseTypeLiteralPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseLiteral ) )
+//		literal
+//		end-element()
+//
+// 7.2.18 parseTypeResourcePropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseResource ) )
+//		propertyEltList
+//		end-element()
+//
+// 7.2.19 parseTypeCollectionPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseCollection ) )
+//		nodeElementList
+//		end-element()
+//
+// 7.2.20 parseTypeOtherPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseOther ) )
+//		propertyEltList
+//		end-element()
+//
+// 7.2.21 emptyPropertyElt
+//		start-element ( URI == propertyElementURIs,
+//						attributes == set ( idAttr?, ( resourceAttr | nodeIdAttr )?, propertyAttr* ) )
+//		end-element()
+//
+// The various property element forms are not distinguished by the XML element name, but by their
+// attributes for the most part. The exceptions are resourcePropertyElt and literalPropertyElt. They
+// are distinguished by their XML element content.
+//
+// NOTE: The RDF syntax does not explicitly include the xml:lang attribute although it can appear in
+// many of these. We have to allow for it in the attibute counts below.
+
+void RDF_Parser::PropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	RDFTermKind nodeTerm = GetRDFTermKind ( xmlNode.name );
+	if ( ! IsPropertyElementName ( nodeTerm ) ) {
+		XMP_Error error ( kXMPErr_BadRDF, "Invalid property element name" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+		return;
+	}
+	
+	if ( xmlNode.attrs.size() > 3 ) {
+
+		// Only an emptyPropertyElt can have more than 3 attributes.
+		this->EmptyPropertyElement ( xmpParent, xmlNode, isTopLevel );
+
+	} else {
+
+		// Look through the attributes for one that isn't rdf:ID or xml:lang, it will usually tell
+		// what we should be dealing with. The called routines must verify their specific syntax!
+
+		XML_cNodePos currAttr = xmlNode.attrs.begin();
+		XML_cNodePos endAttr  = xmlNode.attrs.end();
+		XMP_VarString * attrName = 0;
+
+		for ( ; currAttr != endAttr; ++currAttr ) {
+			attrName = &((*currAttr)->name);
+			if ( (*attrName != "xml:lang") && (*attrName != "rdf:ID") ) break;
+		}
+
+		if ( currAttr != endAttr ) {
+
+			XMP_Assert ( attrName != 0 );
+			XMP_VarString& attrValue = (*currAttr)->value;
+
+			if ( *attrName == "rdf:datatype" ) {
+				this->LiteralPropertyElement ( xmpParent, xmlNode, isTopLevel );
+			} else if ( *attrName != "rdf:parseType" ) {
+				this->EmptyPropertyElement ( xmpParent, xmlNode, isTopLevel );
+			} else if ( attrValue == "Literal" ) {
+				this->ParseTypeLiteralPropertyElement ( xmpParent, xmlNode, isTopLevel );
+			} else if ( attrValue == "Resource" ) {
+				this->ParseTypeResourcePropertyElement ( xmpParent, xmlNode, isTopLevel );
+			} else if ( attrValue == "Collection" ) {
+				this->ParseTypeCollectionPropertyElement ( xmpParent, xmlNode, isTopLevel );
+			} else {
+				this->ParseTypeOtherPropertyElement ( xmpParent, xmlNode, isTopLevel );
+			}
+
+		} else {
+
+			// Only rdf:ID and xml:lang, could be a resourcePropertyElt, a literalPropertyElt, or an.
+			// emptyPropertyElt. Look at the child XML nodes to decide which.
+
+			if ( xmlNode.content.empty() ) {
+
+				this->EmptyPropertyElement ( xmpParent, xmlNode, isTopLevel );
+
+			} else {
+			
+				XML_cNodePos currChild = xmlNode.content.begin();
+				XML_cNodePos endChild  = xmlNode.content.end();
+
+				for ( ; currChild != endChild; ++currChild ) {
+					if ( (*currChild)->kind != kCDataNode ) break;
+				}
+				
+				if ( currChild == endChild ) {
+					this->LiteralPropertyElement ( xmpParent, xmlNode, isTopLevel );
+				} else {
+					this->ResourcePropertyElement ( xmpParent, xmlNode, isTopLevel );
+				}
+			
+			}
+
+		}
+		
+	}
+
+}	// RDF_Parser::PropertyElement
+
+// =================================================================================================
+// RDF_Parser::ResourcePropertyElement
+// ===================================
+//
+// 7.2.15 resourcePropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr? ) )
+//		ws* nodeElement ws*
+//		end-element()
+//
+// This handles structs using an rdf:Description node, arrays using rdf:Bag/Seq/Alt, and Typed Nodes.
+// It also catches and cleans up qualified properties written with rdf:Description and rdf:value.
+
+void RDF_Parser::ResourcePropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	if ( isTopLevel && (xmlNode.name == "iX:changes") ) return;	// Strip old "punchcard" chaff.
+	
+	XMP_Node * newCompound = this->AddChildNode ( xmpParent, xmlNode, "", isTopLevel );
+	if ( newCompound == 0 ) return;	// Ignore lower level errors.
+	
+	XML_cNodePos currAttr = xmlNode.attrs.begin();
+	XML_cNodePos endAttr  = xmlNode.attrs.end();
+
+	for ( ; currAttr != endAttr; ++currAttr ) {
+		XMP_VarString & attrName = (*currAttr)->name;
+		if ( attrName == "xml:lang" ) {
+			this->AddQualifierNode ( newCompound, **currAttr );
+		} else if ( attrName == "rdf:ID" ) {
+			continue;	// Ignore all rdf:ID attributes.
+		} else {
+			XMP_Error error ( kXMPErr_BadRDF, "Invalid attribute for resource property element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			continue;
+		}
+	}
+	
+	XML_cNodePos currChild = xmlNode.content.begin();
+	XML_cNodePos endChild  = xmlNode.content.end();
+
+	for ( ; currChild != endChild; ++currChild ) {
+		if ( ! (*currChild)->IsWhitespaceNode() ) break;
+	}
+	if ( currChild == endChild ) {
+		XMP_Error error ( kXMPErr_BadRDF, "Missing child of resource property element" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+		return;
+	}
+	if ( (*currChild)->kind != kElemNode ) {
+		XMP_Error error ( kXMPErr_BadRDF, "Children of resource property element must be XML elements" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+		return;
+	}
+
+	if ( (*currChild)->name == "rdf:Bag" ) {
+		newCompound->options |= kXMP_PropValueIsArray;
+	} else if ( (*currChild)->name == "rdf:Seq" ) {
+		newCompound->options |= kXMP_PropValueIsArray | kXMP_PropArrayIsOrdered;
+	} else if ( (*currChild)->name == "rdf:Alt" ) {
+		newCompound->options |= kXMP_PropValueIsArray | kXMP_PropArrayIsOrdered | kXMP_PropArrayIsAlternate;
+	} else {
+		// This is the Typed Node case. Add an rdf:type qualifier with a URI value.
+		if ( (*currChild)->name != "rdf:Description" ) {
+			XMP_VarString typeName ( (*currChild)->ns );
+			size_t colonPos = (*currChild)->name.find_first_of(':');
+			if ( colonPos == XMP_VarString::npos ) {
+				XMP_Error error ( kXMPErr_BadXMP, "All XML elements must be in a namespace" );
+				this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+				return;
+			}
+			typeName.append ( (*currChild)->name, colonPos+1, XMP_VarString::npos );	// Append just the local name.
+			XMP_Node * typeQual = this->AddQualifierNode ( newCompound, XMP_VarString("rdf:type"), typeName );
+			if ( typeQual != 0 ) typeQual->options |= kXMP_PropValueIsURI;
+		}
+		newCompound->options |= kXMP_PropValueIsStruct;
+	}
+
+	this->NodeElement ( newCompound, **currChild, kNotTopLevel );
+	if ( newCompound->options & kRDF_HasValueElem ) {
+		this->FixupQualifiedNode ( newCompound );
+	} else if ( newCompound->options & kXMP_PropArrayIsAlternate ) {
+		DetectAltText ( newCompound );
+	}
+
+	for ( ++currChild; currChild != endChild; ++currChild ) {
+		if ( ! (*currChild)->IsWhitespaceNode() ) {
+			XMP_Error error ( kXMPErr_BadRDF, "Invalid child of resource property element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			break;	// Don't bother looking for more trailing errors.
+		}
+	}
+
+}	// RDF_Parser::ResourcePropertyElement
+
+// =================================================================================================
+// RDF_Parser::LiteralPropertyElement
+// ==================================
+//
+// 7.2.16 literalPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, datatypeAttr?) )
+//		text()
+//		end-element()
+//
+// Add a leaf node with the text value and qualifiers for the attributes.
+
+void RDF_Parser::LiteralPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	XMP_Node * newChild = this->AddChildNode ( xmpParent, xmlNode, "", isTopLevel );
+	if ( newChild == 0 ) return;	// Ignore lower level errors.
+	
+	XML_cNodePos currAttr = xmlNode.attrs.begin();
+	XML_cNodePos endAttr  = xmlNode.attrs.end();
+
+	for ( ; currAttr != endAttr; ++currAttr ) {
+		XMP_VarString & attrName = (*currAttr)->name;
+		if ( attrName == "xml:lang" ) {
+			this->AddQualifierNode ( newChild, **currAttr );
+		} else if ( (attrName == "rdf:ID") || (attrName == "rdf:datatype") ) {
+			continue; 	// Ignore all rdf:ID and rdf:datatype attributes.
+		} else {
+			XMP_Error error ( kXMPErr_BadRDF, "Invalid attribute for literal property element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			continue;
+		}
+	}
+	
+	XML_cNodePos currChild = xmlNode.content.begin();
+	XML_cNodePos endChild  = xmlNode.content.end();
+	size_t textSize = 0;
+
+	for ( ; currChild != endChild; ++currChild ) {
+		if ( (*currChild)->kind == kCDataNode ) {
+			textSize += (*currChild)->value.size();
+		} else {
+			XMP_Error error ( kXMPErr_BadRDF, "Invalid child of literal property element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+		}
+	}
+	
+	newChild->value.reserve ( textSize );
+
+	for ( currChild = xmlNode.content.begin(); currChild != endChild; ++currChild ) {
+		newChild->value += (*currChild)->value;
+	}
+
+}	// RDF_Parser::LiteralPropertyElement
+
+// =================================================================================================
+// RDF_Parser::ParseTypeLiteralPropertyElement
+// ===========================================
+//
+// 7.2.17 parseTypeLiteralPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseLiteral ) )
+//		literal
+//		end-element()
+
+void RDF_Parser::ParseTypeLiteralPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	IgnoreParam(xmpParent); IgnoreParam(xmlNode); IgnoreParam(isTopLevel); 
+	XMP_Error error ( kXMPErr_BadXMP, "ParseTypeLiteral property element not allowed" );
+	this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+
+}	// RDF_Parser::ParseTypeLiteralPropertyElement
+
+// =================================================================================================
+// RDF_Parser::ParseTypeResourcePropertyElement
+// ============================================
+//
+// 7.2.18 parseTypeResourcePropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseResource ) )
+//		propertyEltList
+//		end-element()
+//
+// Add a new struct node with a qualifier for the possible rdf:ID attribute. Then process the XML
+// child nodes to get the struct fields.
+
+void RDF_Parser::ParseTypeResourcePropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	XMP_Node * newStruct = this->AddChildNode ( xmpParent, xmlNode, "", isTopLevel );
+	if ( newStruct == 0 ) return;	// Ignore lower level errors.
+	newStruct->options  |= kXMP_PropValueIsStruct;
+	
+	XML_cNodePos currAttr = xmlNode.attrs.begin();
+	XML_cNodePos endAttr  = xmlNode.attrs.end();
+
+	for ( ; currAttr != endAttr; ++currAttr ) {
+		XMP_VarString & attrName = (*currAttr)->name;
+		if ( attrName == "rdf:parseType" ) {
+			continue;	// ! The caller ensured the value is "Resource".
+		} else if ( attrName == "xml:lang" ) {
+			this->AddQualifierNode ( newStruct, **currAttr );
+		} else if ( attrName == "rdf:ID" ) {
+			continue;	// Ignore all rdf:ID attributes.
+		} else {
+			XMP_Error error ( kXMPErr_BadRDF, "Invalid attribute for ParseTypeResource property element" );
+			this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+			continue;
+		}
+	}
+
+	this->PropertyElementList ( newStruct, xmlNode, kNotTopLevel );
+
+	if ( newStruct->options & kRDF_HasValueElem ) this->FixupQualifiedNode ( newStruct );
+	
+	// *** Need to look for arrays using rdf:Description and rdf:type.
+
+}	// RDF_Parser::ParseTypeResourcePropertyElement
+
+// =================================================================================================
+// RDF_Parser::ParseTypeCollectionPropertyElement
+// ==============================================
+//
+// 7.2.19 parseTypeCollectionPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseCollection ) )
+//		nodeElementList
+//		end-element()
+
+void RDF_Parser::ParseTypeCollectionPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	IgnoreParam(xmpParent); IgnoreParam(xmlNode); IgnoreParam(isTopLevel); 
+	XMP_Error error ( kXMPErr_BadXMP, "ParseTypeCollection property element not allowed" );
+	this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+
+}	// RDF_Parser::ParseTypeCollectionPropertyElement
+
+// =================================================================================================
+// RDF_Parser::ParseTypeOtherPropertyElement
+// =========================================
+//
+// 7.2.20 parseTypeOtherPropertyElt
+//		start-element ( URI == propertyElementURIs, attributes == set ( idAttr?, parseOther ) )
+//		propertyEltList
+//		end-element()
+
+void RDF_Parser::ParseTypeOtherPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	IgnoreParam(xmpParent); IgnoreParam(xmlNode); IgnoreParam(isTopLevel); 
+	XMP_Error error ( kXMPErr_BadXMP, "ParseTypeOther property element not allowed" );
+	this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+
+}	// RDF_Parser::ParseTypeOtherPropertyElement
+
+// =================================================================================================
+// RDF_Parser::EmptyPropertyElement
+// ================================
+//
+// 7.2.21 emptyPropertyElt
+//		start-element ( URI == propertyElementURIs,
+//						attributes == set ( idAttr?, ( resourceAttr | nodeIdAttr )?, propertyAttr* ) )
+//		end-element()
+//
+//	<ns:Prop1/>  <!-- a simple property with an empty value --> 
+//	<ns:Prop2 rdf:resource="http://www.adobe.com/"/> <!-- a URI value --> 
+//	<ns:Prop3 rdf:value="..." ns:Qual="..."/> <!-- a simple qualified property --> 
+//	<ns:Prop4 ns:Field1="..." ns:Field2="..."/> <!-- a struct with simple fields -->
+//
+// An emptyPropertyElt is an element with no contained content, just a possibly empty set of
+// attributes. An emptyPropertyElt can represent three special cases of simple XMP properties: a
+// simple property with an empty value (ns:Prop1), a simple property whose value is a URI
+// (ns:Prop2), or a simple property with simple qualifiers (ns:Prop3). An emptyPropertyElt can also
+// represent an XMP struct whose fields are all simple and unqualified (ns:Prop4).
+//
+// It is an error to use both rdf:value and rdf:resource - that can lead to invalid  RDF in the
+// verbose form written using a literalPropertyElt.
+//
+// The XMP mapping for an emptyPropertyElt is a bit different from generic RDF, partly for 
+// design reasons and partly for historical reasons. The XMP mapping rules are: 
+//	1. If there is an rdf:value attribute then this is a simple property with a text value.
+//		All other attributes are qualifiers.
+//	2. If there is an rdf:resource attribute then this is a simple property with a URI value. 
+//		All other attributes are qualifiers.
+//	3. If there are no attributes other than xml:lang, rdf:ID, or rdf:nodeID then this is a simple 
+//		property with an empty value. 
+//	4. Otherwise this is a struct, the attributes other than xml:lang, rdf:ID, or rdf:nodeID are fields. 
+
+void RDF_Parser::EmptyPropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
+{
+	bool hasPropertyAttrs = false;
+	bool hasResourceAttr  = false;
+	bool hasNodeIDAttr    = false;
+	bool hasValueAttr     = false;
+	
+	const XML_Node * valueNode = 0;	// ! Can come from rdf:value or rdf:resource.
+	
+	if ( ! xmlNode.content.empty() ) {
+		XMP_Error error ( kXMPErr_BadRDF, "Nested content not allowed with rdf:resource or property attributes" );
+		this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+		return;
+	}
+	
+	// First figure out what XMP this maps to and remember the XML node for a simple value.
+	
+	XML_cNodePos currAttr = xmlNode.attrs.begin();
+	XML_cNodePos endAttr  = xmlNode.attrs.end();
+
+	for ( ; currAttr != endAttr; ++currAttr ) {
+
+		RDFTermKind attrTerm = GetRDFTermKind ( (*currAttr)->name );
+
+		switch ( attrTerm ) {
+
+			case kRDFTerm_ID :
+				// Nothing to do.
+				break;
+
+			case kRDFTerm_resource :
+				if ( hasNodeIDAttr ) {
+					XMP_Error error ( kXMPErr_BadRDF, "Empty property element can't have both rdf:resource and rdf:nodeID" );
+					this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+					return;
+				}
+				if ( hasValueAttr ) {
+					XMP_Error error ( kXMPErr_BadXMP, "Empty property element can't have both rdf:value and rdf:resource" );
+					this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+					return;
+				}
+				hasResourceAttr = true;
+				if ( ! hasValueAttr ) valueNode = *currAttr;
+				break;
+
+			case kRDFTerm_nodeID :
+				if ( hasResourceAttr ) {
+					XMP_Error error ( kXMPErr_BadRDF, "Empty property element can't have both rdf:resource and rdf:nodeID" );
+					this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+					return;
+				}
+				hasNodeIDAttr = true;
+				break;
+
+			case kRDFTerm_Other :
+				if ( (*currAttr)->name == "rdf:value" ) {
+					if ( hasResourceAttr ) {
+						XMP_Error error ( kXMPErr_BadXMP, "Empty property element can't have both rdf:value and rdf:resource" );
+						this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+						return;
+					}
+					hasValueAttr = true;
+					valueNode = *currAttr;
+				} else if ( (*currAttr)->name != "xml:lang" ) {
+					hasPropertyAttrs = true;
+				}
+				break;
+
+			default :
+				{
+					XMP_Error error ( kXMPErr_BadRDF, "Unrecognized attribute of empty property element" );
+					this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+				}
+				
+				return;
+
+		}
+
+	}
+	
+	// Create the right kind of child node and visit the attributes again to add the fields or qualifiers.
+	// ! Because of implementation vagaries, the xmpParent is the tree root for top level properties.
+	// ! The schema is found, created if necessary, by AddChildNode.
+	
+	XMP_Node * childNode = this->AddChildNode ( xmpParent, xmlNode, "", isTopLevel );
+	if ( childNode == 0 ) return;	// Ignore lower level errors.
+	bool childIsStruct = false;
+	
+	if ( hasValueAttr | hasResourceAttr ) {
+		childNode->value = valueNode->value;
+		if ( ! hasValueAttr ) childNode->options |= kXMP_PropValueIsURI;	// ! Might have both rdf:value and rdf:resource.
+	} else if ( hasPropertyAttrs ) {
+		childNode->options |= kXMP_PropValueIsStruct;
+		childIsStruct = true;
+	}
+		
+	currAttr = xmlNode.attrs.begin();
+	endAttr  = xmlNode.attrs.end();
+
+	for ( ; currAttr != endAttr; ++currAttr ) {
+
+		if ( *currAttr == valueNode ) continue;	// Skip the rdf:value or rdf:resource attribute holding the value.
+		RDFTermKind attrTerm = GetRDFTermKind ( (*currAttr)->name );
+
+		switch ( attrTerm ) {
+
+			case kRDFTerm_ID       :
+			case kRDFTerm_nodeID   :
+				break;	// Ignore all rdf:ID and rdf:nodeID attributes.
+				
+			case kRDFTerm_resource :
+				this->AddQualifierNode ( childNode, **currAttr );
+				break;
+
+			case kRDFTerm_Other :
+				if ( (! childIsStruct) || (*currAttr)->name == "xml:lang" ) {
+					this->AddQualifierNode ( childNode, **currAttr );
+				} else {
+					this->AddChildNode ( childNode, **currAttr, (*currAttr)->value.c_str(), false );
+				}
+				break;
+
+			default :
+				{
+					XMP_Error error ( kXMPErr_BadRDF, "Unrecognized attribute of empty property element" );
+					this->errorCallback->NotifyClient ( kXMPErrSev_Recoverable, error );
+				}
+				continue;
+
+		}
+
+	}
+
+}	// RDF_Parser::EmptyPropertyElement
+
+// =================================================================================================
+// XMPMeta::ProcessRDF
+// ===================
+//
+// Parse the XML tree of the RDF and build the corresponding XMP tree.
+
+void XMPMeta::ProcessRDF ( const XML_Node & rdfNode, XMP_OptionBits options )
+{
+	IgnoreParam(options);
+	
+	RDF_Parser parser ( &this->errorCallback );
+	
+	parser.RDF ( &this->tree, rdfNode );
+
+}	// XMPMeta::ProcessRDF
+
+// =================================================================================================
diff --git a/XMPCore/source/WXMPIterator.cpp b/XMPCore/source/WXMPIterator.cpp
new file mode 100644
index 0000000..401b468
--- /dev/null
+++ b/XMPCore/source/WXMPIterator.cpp
@@ -0,0 +1,170 @@
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "public/include/XMP_Const.h"
+
+#include "public/include/client-glue/WXMPIterator.hpp"
+
+#include "XMPCore/source/XMPCore_Impl.hpp"
+#include "XMPCore/source/XMPIterator.hpp"
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4101 ) // unreferenced local variable
+	#pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+	#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+	#if XMP_DebugBuild
+		#pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+	#endif
+#endif
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+// CTor/DTor Wrappers
+// ==================
+
+void
+WXMPIterator_PropCTor_1 ( XMPMetaRef     xmpRef,
+                          XMP_StringPtr  schemaNS,
+                          XMP_StringPtr  propName,
+                          XMP_OptionBits options,
+                          WXMP_Result *  wResult )
+{
+    XMP_ENTER_Static ( "WXMPIterator_PropCTor_1" )	// No lib object yet, use the static entry.
+
+		if ( schemaNS == 0 ) schemaNS = "";
+		if ( propName == 0 ) propName = "";
+
+		const XMPMeta & xmpObj = WtoXMPMeta_Ref ( xmpRef );
+		XMP_AutoLock metaLock ( &xmpObj.lock, kXMP_ReadLock );
+		
+		XMPIterator * iter = new XMPIterator ( xmpObj, schemaNS, propName, options );
+		++iter->clientRefs;
+		XMP_Assert ( iter->clientRefs == 1 );
+		wResult->ptrResult = XMPIteratorRef ( iter );
+
+    XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPIterator_TableCTor_1 ( XMP_StringPtr  schemaNS,
+                           XMP_StringPtr  propName,
+                           XMP_OptionBits options,
+                           WXMP_Result *  wResult )
+{
+    XMP_ENTER_Static ( "WXMPIterator_TableCTor_1" )	// No lib object yet, use the static entry.
+
+		if ( schemaNS == 0 ) schemaNS = "";
+		if ( propName == 0 ) propName = "";
+
+		XMPIterator * iter = new XMPIterator ( schemaNS, propName, options );
+		++iter->clientRefs;
+		XMP_Assert ( iter->clientRefs == 1 );
+		wResult->ptrResult = XMPIteratorRef ( iter );
+
+    XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPIterator_IncrementRefCount_1 ( XMPIteratorRef xmpObjRef )
+{
+	WXMP_Result * wResult = &void_wResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_ObjWrite ( XMPIterator, "WXMPIterator_IncrementRefCount_1" )
+
+		++thiz->clientRefs;
+		XMP_Assert ( thiz->clientRefs > 1 );
+
+	XMP_EXIT_NoThrow
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPIterator_DecrementRefCount_1 ( XMPIteratorRef xmpObjRef )
+{
+	WXMP_Result * wResult = &void_wResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_ObjWrite ( XMPIterator, "WXMPIterator_DecrementRefCount_1" )
+
+		XMP_Assert ( thiz->clientRefs > 0 );
+		--thiz->clientRefs;
+		if ( thiz->clientRefs <= 0 ) {
+			objLock.Release();
+			delete ( thiz );
+		}
+
+	XMP_EXIT_NoThrow
+}
+
+// =================================================================================================
+// Class Method Wrappers
+// =====================
+
+void
+WXMPIterator_Next_1 ( XMPIteratorRef   xmpObjRef,
+                      void *           schemaNS,
+                      void *           propPath,
+                      void *           propValue,
+                      XMP_OptionBits * propOptions,
+                      SetClientStringProc SetClientString,
+                      WXMP_Result *    wResult )
+{
+    XMP_ENTER_ObjWrite ( XMPIterator, "WXMPIterator_Next_1" )
+
+		XMP_StringPtr schemaPtr = 0;
+		XMP_StringLen schemaLen = 0;
+		XMP_StringPtr pathPtr = 0;
+		XMP_StringLen pathLen = 0;
+		XMP_StringPtr valuePtr = 0;
+		XMP_StringLen valueLen = 0;
+		
+		if ( propOptions == 0 ) propOptions = &voidOptionBits;
+
+		XMP_Assert( thiz->info.xmpObj != NULL );
+		XMP_AutoLock metaLock ( &thiz->info.xmpObj->lock, kXMP_ReadLock, (thiz->info.xmpObj != 0) );
+
+		XMP_Bool found = thiz->Next ( &schemaPtr, &schemaLen, &pathPtr, &pathLen, &valuePtr, &valueLen, propOptions );
+		wResult->int32Result = found;
+		
+		if ( found ) {
+			if ( schemaNS != 0 ) (*SetClientString) ( schemaNS, schemaPtr, schemaLen );
+			if ( propPath != 0 ) (*SetClientString) ( propPath, pathPtr, pathLen );
+			if ( propValue != 0 ) (*SetClientString) ( propValue, valuePtr, valueLen );
+		}
+
+    XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPIterator_Skip_1 ( XMPIteratorRef xmpObjRef,
+                      XMP_OptionBits options,
+                      WXMP_Result *  wResult )
+{
+    XMP_ENTER_ObjWrite ( XMPIterator, "WXMPIterator_Skip_1" )
+
+		XMP_Assert( thiz->info.xmpObj != NULL );
+		XMP_AutoLock metaLock ( &thiz->info.xmpObj->lock, kXMP_ReadLock, (thiz->info.xmpObj != 0) );
+
+		thiz->Skip ( options );
+
+    XMP_EXIT
+}
+
+// =================================================================================================
+
+#if __cplusplus
+} /* extern "C" */
+#endif
diff --git a/XMPCore/source/WXMPMeta.cpp b/XMPCore/source/WXMPMeta.cpp
new file mode 100644
index 0000000..61f13f1
--- /dev/null
+++ b/XMPCore/source/WXMPMeta.cpp
@@ -0,0 +1,1191 @@
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "public/include/XMP_Const.h"
+
+#include "public/include/client-glue/WXMPMeta.hpp"
+
+#include "XMPCore/source/XMPCore_Impl.hpp"
+#include "XMPCore/source/XMPMeta.hpp"
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4101 ) // unreferenced local variable
+	#pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+	#pragma warning ( disable : 4702 ) // unreachable code
+	#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+	#if XMP_DebugBuild
+		#pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+	#endif
+#endif
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+// Init/Term Wrappers
+// ==================
+
+/* class static */ void
+WXMPMeta_GetVersionInfo_1 ( XMP_VersionInfo * info )
+{
+	WXMP_Result * wResult = &void_wResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_NoLock ( "WXMPMeta_GetVersionInfo_1" )
+
+		XMPMeta::GetVersionInfo ( info );
+
+	XMP_EXIT_NoThrow
+}
+
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_Initialize_1 ( WXMP_Result * wResult )
+{
+	XMP_ENTER_NoLock ( "WXMPMeta_Initialize_1" )
+
+		wResult->int32Result = XMPMeta::Initialize();
+
+	XMP_EXIT
+}
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_Terminate_1()
+{
+	WXMP_Result * wResult = &void_wResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_NoLock ( "WXMPMeta_Terminate_1" )
+
+		XMPMeta::Terminate();
+
+	XMP_EXIT_NoThrow
+}
+
+// =================================================================================================
+// CTor/DTor Wrappers
+// ==================
+
+void
+WXMPMeta_CTor_1 ( WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_CTor_1" )	// No lib object yet, use the static entry.
+
+		XMPMeta * xmpObj = new XMPMeta();
+		++xmpObj->clientRefs;
+		XMP_Assert ( xmpObj->clientRefs == 1 );
+		wResult->ptrResult = XMPMetaRef ( xmpObj );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_IncrementRefCount_1 ( XMPMetaRef xmpObjRef )
+{
+	WXMP_Result * wResult = &void_wResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_IncrementRefCount_1" )
+
+		++thiz->clientRefs;
+		XMP_Assert ( thiz->clientRefs > 0 );
+
+	XMP_EXIT_NoThrow
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DecrementRefCount_1 ( XMPMetaRef xmpObjRef )
+{
+	WXMP_Result * wResult = &void_wResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_DecrementRefCount_1" )
+
+		XMP_Assert ( thiz->clientRefs > 0 );
+		--thiz->clientRefs;
+		if ( thiz->clientRefs <= 0 ) {
+			objLock.Release();
+			delete ( thiz );
+		}
+
+	XMP_EXIT_NoThrow
+}
+
+// =================================================================================================
+// Class Static Wrappers
+// =====================
+
+/* class static */ void
+WXMPMeta_GetGlobalOptions_1 ( WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_GetGlobalOptions_1" )
+
+		XMP_OptionBits options = XMPMeta::GetGlobalOptions();
+		wResult->int32Result = options;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_SetGlobalOptions_1 ( XMP_OptionBits options,
+							  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_SetGlobalOptions_1" )
+
+		XMPMeta::SetGlobalOptions ( options );
+
+	XMP_EXIT
+}
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_DumpNamespaces_1 ( XMP_TextOutputProc outProc,
+							void *			   refCon,
+							WXMP_Result *	   wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_DumpNamespaces_1" )
+
+		if ( outProc == 0 ) XMP_Throw ( "Null client output routine", kXMPErr_BadParam );
+		
+		XMP_Status status = XMPMeta::DumpNamespaces ( outProc, refCon );
+		wResult->int32Result = status;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_RegisterNamespace_1 ( XMP_StringPtr namespaceURI,
+							   XMP_StringPtr suggestedPrefix,
+							   void *        actualPrefix,
+							   SetClientStringProc SetClientString,
+							   WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_RegisterNamespace_1" )
+
+		if ( (namespaceURI == 0) || (*namespaceURI == 0) ) XMP_Throw ( "Empty namespace URI", kXMPErr_BadSchema );
+		if ( (suggestedPrefix == 0) || (*suggestedPrefix == 0) ) XMP_Throw ( "Empty suggested prefix", kXMPErr_BadSchema );
+
+		XMP_StringPtr prefixPtr = 0;
+		XMP_StringLen prefixSize = 0;
+
+		bool prefixMatch = XMPMeta::RegisterNamespace ( namespaceURI, suggestedPrefix, &prefixPtr, &prefixSize );
+		wResult->int32Result = prefixMatch;
+		
+		if ( actualPrefix != 0 ) (*SetClientString) ( actualPrefix, prefixPtr, prefixSize );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_GetNamespacePrefix_1 ( XMP_StringPtr namespaceURI,
+								void *        namespacePrefix,
+								SetClientStringProc SetClientString,
+								WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_GetNamespacePrefix_1" )
+
+		if ( (namespaceURI == 0) || (*namespaceURI == 0) ) XMP_Throw ( "Empty namespace URI", kXMPErr_BadSchema );
+
+		XMP_StringPtr prefixPtr = 0;
+		XMP_StringLen prefixSize = 0;
+
+		bool found = XMPMeta::GetNamespacePrefix ( namespaceURI, &prefixPtr, &prefixSize );
+		wResult->int32Result = found;
+		
+		if ( found && (namespacePrefix != 0) ) (*SetClientString) ( namespacePrefix, prefixPtr, prefixSize );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_GetNamespaceURI_1 ( XMP_StringPtr namespacePrefix,
+							 void *        namespaceURI,
+							 SetClientStringProc SetClientString,
+							 WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_GetNamespaceURI_1" )
+
+		if ( (namespacePrefix == 0) || (*namespacePrefix == 0) ) XMP_Throw ( "Empty namespace prefix", kXMPErr_BadSchema );
+
+		XMP_StringPtr uriPtr = 0;
+		XMP_StringLen uriSize = 0;
+	   
+		bool found = XMPMeta::GetNamespaceURI ( namespacePrefix, &uriPtr, &uriSize );
+		wResult->int32Result = found;
+		
+		if ( found && (namespaceURI != 0) ) (*SetClientString) ( namespaceURI, uriPtr, uriSize );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+/* class static */ void
+WXMPMeta_DeleteNamespace_1 ( XMP_StringPtr namespaceURI,
+							 WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_DeleteNamespace_1" )
+
+		if ( (namespaceURI == 0) || (*namespaceURI == 0) ) XMP_Throw ( "Empty namespace URI", kXMPErr_BadSchema );
+
+		XMPMeta::DeleteNamespace ( namespaceURI );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+// Class Method Wrappers
+// =====================
+
+void
+WXMPMeta_GetProperty_1 ( XMPMetaRef		  xmpObjRef,
+						 XMP_StringPtr	  schemaNS,
+						 XMP_StringPtr	  propName,
+						 void *           propValue,
+						 XMP_OptionBits * options,
+						 SetClientStringProc SetClientString,
+						 WXMP_Result *	  wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetProperty_1" )
+	
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+		
+		XMP_StringPtr valuePtr = 0;
+		XMP_StringLen valueSize = 0;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetProperty ( schemaNS, propName, &valuePtr, &valueSize, options );
+		wResult->int32Result = found;
+		
+		if ( found && (propValue != 0) ) (*SetClientString) ( propValue, valuePtr, valueSize );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetArrayItem_1 ( XMPMetaRef	   xmpObjRef,
+						  XMP_StringPtr	   schemaNS,
+						  XMP_StringPtr	   arrayName,
+						  XMP_Index		   itemIndex,
+						  void *           itemValue,
+						  XMP_OptionBits * options,
+						  SetClientStringProc SetClientString,
+						  WXMP_Result *	   wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetArrayItem_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+		
+		XMP_StringPtr valuePtr = 0;
+		XMP_StringLen valueSize = 0;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetArrayItem ( schemaNS, arrayName, itemIndex, &valuePtr, &valueSize, options );
+		wResult->int32Result = found;
+		
+		if ( found && (itemValue != 0) ) (*SetClientString) ( itemValue, valuePtr, valueSize );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetStructField_1 ( XMPMetaRef		 xmpObjRef,
+							XMP_StringPtr	 schemaNS,
+							XMP_StringPtr	 structName,
+							XMP_StringPtr	 fieldNS,
+							XMP_StringPtr	 fieldName,
+							void *	         fieldValue,
+							XMP_OptionBits * options,
+							SetClientStringProc SetClientString,
+							WXMP_Result *	 wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetStructField_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (structName == 0) || (*structName == 0) ) XMP_Throw ( "Empty struct name", kXMPErr_BadXPath );
+		if ( (fieldNS == 0) || (*fieldNS == 0) ) XMP_Throw ( "Empty field namespace URI", kXMPErr_BadSchema );
+		if ( (fieldName == 0) || (*fieldName == 0) ) XMP_Throw ( "Empty field name", kXMPErr_BadXPath );
+		
+		XMP_StringPtr valuePtr = 0;
+		XMP_StringLen valueSize = 0;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetStructField ( schemaNS, structName, fieldNS, fieldName, &valuePtr, &valueSize, options );
+		wResult->int32Result = found;
+		
+		if ( found && (fieldValue != 0) ) (*SetClientString) ( fieldValue, valuePtr, valueSize );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetQualifier_1 ( XMPMetaRef	   xmpObjRef,
+						  XMP_StringPtr	   schemaNS,
+						  XMP_StringPtr	   propName,
+						  XMP_StringPtr	   qualNS,
+						  XMP_StringPtr	   qualName,
+						  void *           qualValue,
+						  XMP_OptionBits * options,
+						  SetClientStringProc SetClientString,
+						  WXMP_Result *	   wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetQualifier_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+		if ( (qualNS == 0) || (*qualNS == 0) ) XMP_Throw ( "Empty qualifier namespace URI", kXMPErr_BadSchema );
+		if ( (qualName == 0) || (*qualName == 0) ) XMP_Throw ( "Empty qualifier name", kXMPErr_BadXPath );
+		
+		XMP_StringPtr valuePtr = 0;
+		XMP_StringLen valueSize = 0;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetQualifier ( schemaNS, propName, qualNS, qualName, &valuePtr, &valueSize, options );
+		wResult->int32Result = found;
+		
+		if ( found && (qualValue != 0) ) (*SetClientString) ( qualValue, valuePtr, valueSize );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetProperty_1 ( XMPMetaRef		xmpObjRef,
+						 XMP_StringPtr	schemaNS,
+						 XMP_StringPtr	propName,
+						 XMP_StringPtr	propValue,
+						 XMP_OptionBits options,
+						 WXMP_Result *	wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetProperty_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		thiz->SetProperty ( schemaNS, propName, propValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetArrayItem_1 ( XMPMetaRef	 xmpObjRef,
+						  XMP_StringPtr	 schemaNS,
+						  XMP_StringPtr	 arrayName,
+						  XMP_Index		 itemIndex,
+						  XMP_StringPtr	 itemValue,
+						  XMP_OptionBits options,
+						  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetArrayItem_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+
+		thiz->SetArrayItem ( schemaNS, arrayName, itemIndex, itemValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_AppendArrayItem_1 ( XMPMetaRef		xmpObjRef,
+							 XMP_StringPtr	schemaNS,
+							 XMP_StringPtr	arrayName,
+							 XMP_OptionBits arrayOptions,
+							 XMP_StringPtr	itemValue,
+							 XMP_OptionBits options,
+							 WXMP_Result *	wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_AppendArrayItem_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+
+		thiz->AppendArrayItem ( schemaNS, arrayName, arrayOptions, itemValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetStructField_1 ( XMPMetaRef	   xmpObjRef,
+							XMP_StringPtr  schemaNS,
+							XMP_StringPtr  structName,
+							XMP_StringPtr  fieldNS,
+							XMP_StringPtr  fieldName,
+							XMP_StringPtr  fieldValue,
+							XMP_OptionBits options,
+							WXMP_Result *  wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetStructField_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (structName == 0) || (*structName == 0) ) XMP_Throw ( "Empty struct name", kXMPErr_BadXPath );
+		if ( (fieldNS == 0) || (*fieldNS == 0) ) XMP_Throw ( "Empty field namespace URI", kXMPErr_BadSchema );
+		if ( (fieldName == 0) || (*fieldName == 0) ) XMP_Throw ( "Empty field name", kXMPErr_BadXPath );
+
+		thiz->SetStructField ( schemaNS, structName, fieldNS, fieldName, fieldValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetQualifier_1 ( XMPMetaRef	 xmpObjRef,
+						  XMP_StringPtr	 schemaNS,
+						  XMP_StringPtr	 propName,
+						  XMP_StringPtr	 qualNS,
+						  XMP_StringPtr	 qualName,
+						  XMP_StringPtr	 qualValue,
+						  XMP_OptionBits options,
+						  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetQualifier_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+		if ( (qualNS == 0) || (*qualNS == 0) ) XMP_Throw ( "Empty qualifier namespace URI", kXMPErr_BadSchema );
+		if ( (qualName == 0) || (*qualName == 0) ) XMP_Throw ( "Empty qualifier name", kXMPErr_BadXPath );
+
+		thiz->SetQualifier ( schemaNS, propName, qualNS, qualName, qualValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DeleteProperty_1 ( XMPMetaRef	  xmpObjRef,
+							XMP_StringPtr schemaNS,
+							XMP_StringPtr propName,
+							WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_DeleteProperty_1" )
+ 
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		thiz->DeleteProperty ( schemaNS, propName );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DeleteArrayItem_1 ( XMPMetaRef	   xmpObjRef,
+							 XMP_StringPtr schemaNS,
+							 XMP_StringPtr arrayName,
+							 XMP_Index	   itemIndex,
+							 WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_DeleteArrayItem_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+
+		thiz->DeleteArrayItem ( schemaNS, arrayName, itemIndex );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DeleteStructField_1 ( XMPMetaRef	 xmpObjRef,
+							   XMP_StringPtr schemaNS,
+							   XMP_StringPtr structName,
+							   XMP_StringPtr fieldNS,
+							   XMP_StringPtr fieldName,
+							   WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_DeleteStructField_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (structName == 0) || (*structName == 0) ) XMP_Throw ( "Empty struct name", kXMPErr_BadXPath );
+		if ( (fieldNS == 0) || (*fieldNS == 0) ) XMP_Throw ( "Empty field namespace URI", kXMPErr_BadSchema );
+		if ( (fieldName == 0) || (*fieldName == 0) ) XMP_Throw ( "Empty field name", kXMPErr_BadXPath );
+
+		thiz->DeleteStructField ( schemaNS, structName, fieldNS, fieldName );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DeleteQualifier_1 ( XMPMetaRef	   xmpObjRef,
+							 XMP_StringPtr schemaNS,
+							 XMP_StringPtr propName,
+							 XMP_StringPtr qualNS,
+							 XMP_StringPtr qualName,
+							 WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_DeleteQualifier_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+		if ( (qualNS == 0) || (*qualNS == 0) ) XMP_Throw ( "Empty qualifier namespace URI", kXMPErr_BadSchema );
+		if ( (qualName == 0) || (*qualName == 0) ) XMP_Throw ( "Empty qualifier name", kXMPErr_BadXPath );
+
+		thiz->DeleteQualifier ( schemaNS, propName, qualNS, qualName );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DoesPropertyExist_1 ( XMPMetaRef	 xmpObjRef,
+							   XMP_StringPtr schemaNS,
+							   XMP_StringPtr propName,
+							   WXMP_Result * wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_DoesPropertyExist_1" )
+	
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		bool found = thiz.DoesPropertyExist ( schemaNS, propName );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DoesArrayItemExist_1 ( XMPMetaRef	  xmpObjRef,
+								XMP_StringPtr schemaNS,
+								XMP_StringPtr arrayName,
+								XMP_Index	  itemIndex,
+								WXMP_Result * wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_DoesArrayItemExist_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+
+		bool found = thiz.DoesArrayItemExist ( schemaNS, arrayName, itemIndex );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DoesStructFieldExist_1 ( XMPMetaRef	xmpObjRef,
+								  XMP_StringPtr schemaNS,
+								  XMP_StringPtr structName,
+								  XMP_StringPtr fieldNS,
+								  XMP_StringPtr fieldName,
+								  WXMP_Result * wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_DoesStructFieldExist_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (structName == 0) || (*structName == 0) ) XMP_Throw ( "Empty struct name", kXMPErr_BadXPath );
+		if ( (fieldNS == 0) || (*fieldNS == 0) ) XMP_Throw ( "Empty field namespace URI", kXMPErr_BadSchema );
+		if ( (fieldName == 0) || (*fieldName == 0) ) XMP_Throw ( "Empty field name", kXMPErr_BadXPath );
+
+		bool found = thiz.DoesStructFieldExist ( schemaNS, structName, fieldNS, fieldName );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DoesQualifierExist_1 ( XMPMetaRef	  xmpObjRef,
+								XMP_StringPtr schemaNS,
+								XMP_StringPtr propName,
+								XMP_StringPtr qualNS,
+								XMP_StringPtr qualName,
+								WXMP_Result * wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_DoesQualifierExist_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+		if ( (qualNS == 0) || (*qualNS == 0) ) XMP_Throw ( "Empty qualifier namespace URI", kXMPErr_BadSchema );
+		if ( (qualName == 0) || (*qualName == 0) ) XMP_Throw ( "Empty qualifier name", kXMPErr_BadXPath );
+
+		bool found = thiz.DoesQualifierExist ( schemaNS, propName, qualNS, qualName );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetLocalizedText_1 ( XMPMetaRef	   xmpObjRef,
+							  XMP_StringPtr	   schemaNS,
+							  XMP_StringPtr	   arrayName,
+							  XMP_StringPtr	   genericLang,
+							  XMP_StringPtr	   specificLang,
+							  void *           actualLang,
+							  void *           itemValue,
+							  XMP_OptionBits * options,
+							  SetClientStringProc SetClientString,
+							  WXMP_Result *	   wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetLocalizedText_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+		if ( genericLang == 0 ) genericLang = "";
+		if ( (specificLang == 0) ||(*specificLang == 0) ) XMP_Throw ( "Empty specific language", kXMPErr_BadParam );
+		
+		XMP_StringPtr langPtr = 0;
+		XMP_StringLen langSize = 0;
+		XMP_StringPtr valuePtr = 0;
+		XMP_StringLen valueSize = 0;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetLocalizedText ( schemaNS, arrayName, genericLang, specificLang,
+											 &langPtr, &langSize, &valuePtr, &valueSize, options );
+		wResult->int32Result = found;
+		
+		if ( found ) {
+			if ( actualLang != 0 ) (*SetClientString) ( actualLang, langPtr, langSize );
+			if ( itemValue != 0 ) (*SetClientString) ( itemValue, valuePtr, valueSize );
+		}
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetLocalizedText_1 ( XMPMetaRef	 xmpObjRef,
+							  XMP_StringPtr	 schemaNS,
+							  XMP_StringPtr	 arrayName,
+							  XMP_StringPtr	 genericLang,
+							  XMP_StringPtr	 specificLang,
+							  XMP_StringPtr	 itemValue,
+							  XMP_OptionBits options,
+							  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetLocalizedText_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+		if ( genericLang == 0 ) genericLang = "";
+		if ( (specificLang == 0) ||(*specificLang == 0) ) XMP_Throw ( "Empty specific language", kXMPErr_BadParam );
+		if ( itemValue == 0 ) itemValue = "";
+
+		thiz->SetLocalizedText ( schemaNS, arrayName, genericLang, specificLang, itemValue, options );
+		
+	XMP_EXIT
+}
+
+void
+WXMPMeta_DeleteLocalizedText_1 ( XMPMetaRef	   xmpObjRef,
+                                 XMP_StringPtr schemaNS,
+                                 XMP_StringPtr arrayName,
+                                 XMP_StringPtr genericLang,
+                                 XMP_StringPtr specificLang,
+                                 WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_DeleteLocalizedText_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+		if ( genericLang == 0 ) genericLang = "";
+		if ( (specificLang == 0) ||(*specificLang == 0) ) XMP_Throw ( "Empty specific language", kXMPErr_BadParam );
+		
+		thiz->DeleteLocalizedText ( schemaNS, arrayName, genericLang, specificLang );
+
+	XMP_EXIT
+}
+
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetProperty_Bool_1 ( XMPMetaRef	   xmpObjRef,
+							  XMP_StringPtr	   schemaNS,
+							  XMP_StringPtr	   propName,
+							  XMP_Bool *	   propValue,
+							  XMP_OptionBits * options,
+							  WXMP_Result *	   wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetProperty_Bool_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		if ( propValue == 0 ) propValue = &voidByte;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool value;
+		bool found = thiz.GetProperty_Bool ( schemaNS, propName, &value, options );
+		if ( propValue != 0 ) *propValue = value;
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetProperty_Int_1 ( XMPMetaRef		  xmpObjRef,
+							 XMP_StringPtr	  schemaNS,
+							 XMP_StringPtr	  propName,
+							 XMP_Int32 *	  propValue,
+							 XMP_OptionBits * options,
+							 WXMP_Result *	  wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetProperty_Int_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		if ( propValue == 0 ) propValue = &voidInt32;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetProperty_Int ( schemaNS, propName, propValue, options );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetProperty_Int64_1 ( XMPMetaRef		xmpObjRef,
+							   XMP_StringPtr	schemaNS,
+							   XMP_StringPtr	propName,
+							   XMP_Int64 *	    propValue,
+							   XMP_OptionBits * options,
+							   WXMP_Result *	wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetProperty_Int64_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		if ( propValue == 0 ) propValue = &voidInt64;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetProperty_Int64 ( schemaNS, propName, propValue, options );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetProperty_Float_1 ( XMPMetaRef		xmpObjRef,
+							   XMP_StringPtr	schemaNS,
+							   XMP_StringPtr	propName,
+							   double *			propValue,
+							   XMP_OptionBits * options,
+							   WXMP_Result *	wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetProperty_Float_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		if ( propValue == 0 ) propValue = &voidDouble;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetProperty_Float ( schemaNS, propName, propValue, options );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetProperty_Date_1 ( XMPMetaRef	   xmpObjRef,
+							  XMP_StringPtr	   schemaNS,
+							  XMP_StringPtr	   propName,
+							  XMP_DateTime *   propValue,
+							  XMP_OptionBits * options,
+							  WXMP_Result *	   wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetProperty_Date_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		if ( propValue == 0 ) propValue = &voidDateTime;
+		if ( options == 0 ) options = &voidOptionBits;
+
+		bool found = thiz.GetProperty_Date ( schemaNS, propName, propValue, options );
+		wResult->int32Result = found;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetProperty_Bool_1 ( XMPMetaRef	 xmpObjRef,
+							  XMP_StringPtr	 schemaNS,
+							  XMP_StringPtr	 propName,
+							  XMP_Bool		 propValue,
+							  XMP_OptionBits options,
+							  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetProperty_Bool_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		thiz->SetProperty_Bool ( schemaNS, propName, propValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetProperty_Int_1 ( XMPMetaRef		xmpObjRef,
+							 XMP_StringPtr	schemaNS,
+							 XMP_StringPtr	propName,
+							 XMP_Int32		propValue,
+							 XMP_OptionBits options,
+							 WXMP_Result *	wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetProperty_Int_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		thiz->SetProperty_Int ( schemaNS, propName, propValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetProperty_Int64_1 ( XMPMetaRef	  xmpObjRef,
+							   XMP_StringPtr  schemaNS,
+							   XMP_StringPtr  propName,
+							   XMP_Int64	  propValue,
+							   XMP_OptionBits options,
+							   WXMP_Result *  wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetProperty_Int64_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		thiz->SetProperty_Int64 ( schemaNS, propName, propValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetProperty_Float_1 ( XMPMetaRef	  xmpObjRef,
+							   XMP_StringPtr  schemaNS,
+							   XMP_StringPtr  propName,
+							   double		  propValue,
+							   XMP_OptionBits options,
+							   WXMP_Result *  wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetProperty_Float_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		thiz->SetProperty_Float ( schemaNS, propName, propValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetProperty_Date_1 ( XMPMetaRef		   xmpObjRef,
+							  XMP_StringPtr		   schemaNS,
+							  XMP_StringPtr		   propName,
+							  const XMP_DateTime & propValue,
+							  XMP_OptionBits	   options,
+							  WXMP_Result *		   wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetProperty_Date_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+
+		thiz->SetProperty_Date ( schemaNS, propName, propValue, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_DumpObject_1 ( XMPMetaRef		   xmpObjRef,
+						XMP_TextOutputProc outProc,
+						void *			   refCon,
+						WXMP_Result *	   wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_DumpObject_1" )
+
+		if ( outProc == 0 ) XMP_Throw ( "Null client output routine", kXMPErr_BadParam );
+		
+		thiz.DumpObject ( outProc, refCon );
+		wResult->int32Result = 0;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_Sort_1 ( XMPMetaRef	xmpObjRef,
+				  WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_Sort_1" )
+
+		thiz->Sort();
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_Erase_1 ( XMPMetaRef	 xmpObjRef,
+				   WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_Erase_1" )
+
+		thiz->Erase();
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_Clone_1 ( XMPMetaRef	  xmpObjRef,
+				   XMP_OptionBits options,
+				   WXMP_Result *  wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_Clone_1" )
+
+		XMPMeta * xClone = new XMPMeta;	// ! Don't need an output lock, final ref assignment in client glue.
+		thiz.Clone ( xClone, options );
+		XMP_Assert ( xClone->clientRefs == 0 );	// ! Gets incremented in TXMPMeta::Clone.
+		wResult->ptrResult = xClone;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_CountArrayItems_1 ( XMPMetaRef	   xmpObjRef,
+							 XMP_StringPtr schemaNS,
+							 XMP_StringPtr arrayName,
+							 WXMP_Result * wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_CountArrayItems_1" )
+		
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+
+		XMP_Index count = thiz.CountArrayItems ( schemaNS, arrayName );
+		wResult->int32Result = count;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetObjectName_1 ( XMPMetaRef	 xmpObjRef,
+						   void *        objName,
+						   SetClientStringProc SetClientString,
+						   WXMP_Result * wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetObjectName_1" )
+
+		XMP_StringPtr namePtr = 0;
+	    XMP_StringLen nameSize = 0;
+
+		thiz.GetObjectName ( &namePtr, &nameSize );
+		if ( objName != 0 ) (*SetClientString) ( objName, namePtr, nameSize );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetObjectName_1 ( XMPMetaRef	 xmpObjRef,
+						   XMP_StringPtr name,
+						   WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetObjectName_1" )
+
+		if ( name == 0 ) name = "";
+
+		thiz->SetObjectName ( name );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_GetObjectOptions_1 ( XMPMetaRef    xmpObjRef,
+							  WXMP_Result * wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_GetObjectOptions_1" )
+
+		XMP_OptionBits options = thiz.GetObjectOptions();
+		wResult->int32Result = options;
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetObjectOptions_1 ( XMPMetaRef	 xmpObjRef,
+							  XMP_OptionBits options,
+							  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetObjectOptions_1" )
+	
+		thiz->SetObjectOptions ( options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_ParseFromBuffer_1 ( XMPMetaRef		xmpObjRef,
+							 XMP_StringPtr	buffer,
+							 XMP_StringLen	bufferSize,
+							 XMP_OptionBits options,
+							 WXMP_Result *	wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_ParseFromBuffer_1" )
+
+		thiz->ParseFromBuffer ( buffer, bufferSize, options );
+		
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SerializeToBuffer_1 ( XMPMetaRef	  xmpObjRef,
+							   void *         pktString,
+							   XMP_OptionBits options,
+							   XMP_StringLen  padding,
+							   XMP_StringPtr  newline,
+							   XMP_StringPtr  indent,
+							   XMP_Index	  baseIndent,
+							   SetClientStringProc SetClientString,
+							   WXMP_Result *  wResult ) /* const */
+{
+	XMP_ENTER_ObjRead ( XMPMeta, "WXMPMeta_SerializeToBuffer_1" )
+
+		XMP_VarString localStr;
+		
+		if ( newline == 0 ) newline = "";
+		if ( indent == 0 ) indent = "";
+		
+		thiz.SerializeToBuffer ( &localStr, options, padding, newline, indent, baseIndent );
+		if ( pktString != 0 ) (*SetClientString) ( pktString, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetDefaultErrorCallback_1 ( XMPMeta_ErrorCallbackWrapper wrapperProc,
+									 XMPMeta_ErrorCallbackProc    clientProc,
+									 void *        context,
+									 XMP_Uns32     limit,
+									 WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPMeta_SetDefaultErrorCallback_1" )
+
+		XMPMeta::SetDefaultErrorCallback ( wrapperProc, clientProc, context, limit );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_SetErrorCallback_1 ( XMPMetaRef    xmpObjRef,
+                              XMPMeta_ErrorCallbackWrapper wrapperProc,
+							  XMPMeta_ErrorCallbackProc    clientProc,
+							  void *        context,
+							  XMP_Uns32     limit,
+							  WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_SetErrorCallback_1" )
+
+		thiz->SetErrorCallback ( wrapperProc, clientProc, context, limit );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPMeta_ResetErrorCallbackLimit_1 ( XMPMetaRef    xmpObjRef,
+                          			 XMP_Uns32     limit,
+									 WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPMeta, "WXMPMeta_ResetErrorCallbackLimit_1" )
+
+		thiz->ResetErrorCallbackLimit ( limit );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+#if __cplusplus
+} /* extern "C" */
+#endif
diff --git a/XMPCore/source/WXMPUtils.cpp b/XMPCore/source/WXMPUtils.cpp
new file mode 100644
index 0000000..6d8f995
--- /dev/null
+++ b/XMPCore/source/WXMPUtils.cpp
@@ -0,0 +1,634 @@
+// =================================================================================================
+// Copyright 2004 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.
+// =================================================================================================
+
+// *** Should change "type * inParam" to "type & inParam"
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "public/include/XMP_Const.h"
+
+#include "public/include/client-glue/WXMPUtils.hpp"
+
+#include "XMPCore/source/XMPCore_Impl.hpp"
+#include "XMPCore/source/XMPUtils.hpp"
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4101 ) // unreferenced local variable
+	#pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+	#if XMP_DebugBuild
+		#pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+	#endif
+#endif
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+// Class Static Wrappers
+// =====================
+
+void
+WXMPUtils_ComposeArrayItemPath_1 ( XMP_StringPtr   schemaNS,
+								   XMP_StringPtr   arrayName,
+								   XMP_Index	   itemIndex,
+								   void *          itemPath,
+								   SetClientStringProc SetClientString,
+								   WXMP_Result *   wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ComposeArrayItemPath_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+
+		XMP_VarString localStr;
+
+		XMPUtils::ComposeArrayItemPath ( schemaNS, arrayName, itemIndex, &localStr );
+		if ( itemPath != 0 ) (*SetClientString) ( itemPath, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ComposeStructFieldPath_1 ( XMP_StringPtr	 schemaNS,
+									 XMP_StringPtr	 structName,
+									 XMP_StringPtr	 fieldNS,
+									 XMP_StringPtr	 fieldName,
+									 void *          fieldPath,
+									 SetClientStringProc SetClientString,
+									 WXMP_Result *	 wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ComposeStructFieldPath_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (structName == 0) || (*structName == 0) ) XMP_Throw ( "Empty struct name", kXMPErr_BadXPath );
+		if ( (fieldNS == 0) || (*fieldNS == 0) ) XMP_Throw ( "Empty field namespace URI", kXMPErr_BadSchema );
+		if ( (fieldName == 0) || (*fieldName == 0) ) XMP_Throw ( "Empty field name", kXMPErr_BadXPath );
+
+		XMP_VarString localStr;
+
+		XMPUtils::ComposeStructFieldPath ( schemaNS, structName, fieldNS, fieldName, &localStr );
+		if ( fieldPath != 0 ) (*SetClientString) ( fieldPath, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ComposeQualifierPath_1 ( XMP_StringPtr   schemaNS,
+								   XMP_StringPtr   propName,
+								   XMP_StringPtr   qualNS,
+								   XMP_StringPtr   qualName,
+								   void *          qualPath,
+								   SetClientStringProc SetClientString,
+								   WXMP_Result *   wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ComposeQualifierPath_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (propName == 0) || (*propName == 0) ) XMP_Throw ( "Empty property name", kXMPErr_BadXPath );
+		if ( (qualNS == 0) || (*qualNS == 0) ) XMP_Throw ( "Empty qualifier namespace URI", kXMPErr_BadSchema );
+		if ( (qualName == 0) || (*qualName == 0) ) XMP_Throw ( "Empty qualifier name", kXMPErr_BadXPath );
+
+		XMP_VarString localStr;
+
+		XMPUtils::ComposeQualifierPath ( schemaNS, propName, qualNS, qualName, &localStr );
+		if ( qualPath != 0 ) (*SetClientString) ( qualPath, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ComposeLangSelector_1 ( XMP_StringPtr	  schemaNS,
+								  XMP_StringPtr	  arrayName,
+								  XMP_StringPtr	  langName,
+								  void *          selPath,
+								  SetClientStringProc SetClientString,
+								  WXMP_Result *	  wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ComposeLangSelector_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+		if ( (langName == 0) || (*langName == 0) ) XMP_Throw ( "Empty language name", kXMPErr_BadParam );
+
+		XMP_VarString localStr;
+
+		XMPUtils::ComposeLangSelector ( schemaNS, arrayName, langName, &localStr );
+		if ( selPath != 0 ) (*SetClientString) ( selPath, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ComposeFieldSelector_1 ( XMP_StringPtr   schemaNS,
+								   XMP_StringPtr   arrayName,
+								   XMP_StringPtr   fieldNS,
+								   XMP_StringPtr   fieldName,
+								   XMP_StringPtr   fieldValue,
+								   void *          selPath,
+								   SetClientStringProc SetClientString,
+								   WXMP_Result *   wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ComposeFieldSelector_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+		if ( (fieldNS == 0) || (*fieldNS == 0) ) XMP_Throw ( "Empty field namespace URI", kXMPErr_BadSchema );
+		if ( (fieldName == 0) || (*fieldName == 0) ) XMP_Throw ( "Empty field name", kXMPErr_BadXPath );
+		if ( fieldValue == 0 ) fieldValue = "";
+
+		XMP_VarString localStr;
+
+		XMPUtils::ComposeFieldSelector ( schemaNS, arrayName, fieldNS, fieldName, fieldValue, &localStr );
+		if ( selPath != 0 ) (*SetClientString) ( selPath, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+void
+WXMPUtils_ConvertFromBool_1 ( XMP_Bool		binValue,
+							  void *        strValue,
+							  SetClientStringProc SetClientString,
+							  WXMP_Result *	wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertFromBool_1" )
+
+		XMP_VarString localStr;
+
+		XMPUtils::ConvertFromBool ( binValue, &localStr );
+		if ( strValue != 0 ) (*SetClientString) ( strValue, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertFromInt_1 ( XMP_Int32	   binValue,
+							 XMP_StringPtr format,
+							 void *        strValue,
+							 SetClientStringProc SetClientString,
+							 WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertFromInt_1" )
+
+		if ( format == 0 ) format = "";
+
+		XMP_VarString localStr;
+
+		XMPUtils::ConvertFromInt ( binValue, format, &localStr );
+		if ( strValue != 0 ) (*SetClientString) ( strValue, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertFromInt64_1 ( XMP_Int64	 binValue,
+							   XMP_StringPtr format,
+							   void *        strValue,
+							   SetClientStringProc SetClientString,
+							   WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertFromInt64_1" )
+
+		if ( format == 0 ) format = "";
+
+		XMP_VarString localStr;
+
+		XMPUtils::ConvertFromInt64 ( binValue, format, &localStr );
+		if ( strValue != 0 ) (*SetClientString) ( strValue, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertFromFloat_1 ( double		 binValue,
+							   XMP_StringPtr format,
+							   void *        strValue,
+							   SetClientStringProc SetClientString,
+							   WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertFromFloat_1" )
+
+		if ( format == 0 ) format = "";
+
+		XMP_VarString localStr;
+
+		XMPUtils::ConvertFromFloat ( binValue, format, &localStr );
+		if ( strValue != 0 ) (*SetClientString) ( strValue, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertFromDate_1 ( const XMP_DateTime & binValue,
+							  void *               strValue,
+							  SetClientStringProc SetClientString,
+							  WXMP_Result *		   wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertFromDate_1" )
+
+		XMP_VarString localStr;
+
+		XMPUtils::ConvertFromDate( binValue, &localStr );
+		if ( strValue != 0 ) (*SetClientString) ( strValue, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+void
+WXMPUtils_ConvertToBool_1 ( XMP_StringPtr strValue,
+							WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertToBool_1" )
+
+		if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty string value", kXMPErr_BadParam);
+		XMP_Bool result = XMPUtils::ConvertToBool ( strValue );
+		wResult->int32Result = result;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertToInt_1 ( XMP_StringPtr strValue,
+						   WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertToInt_1" )
+
+		if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty string value", kXMPErr_BadParam);
+		XMP_Int32 result = XMPUtils::ConvertToInt ( strValue );
+		wResult->int32Result = result;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertToInt64_1 ( XMP_StringPtr strValue,
+						     WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertToInt64_1" )
+
+		if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty string value", kXMPErr_BadParam);
+		XMP_Int64 result = XMPUtils::ConvertToInt64 ( strValue );
+		wResult->int64Result = result;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertToFloat_1 ( XMP_StringPtr strValue,
+							 WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertToFloat_1")
+
+		if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty string value", kXMPErr_BadParam);
+		double result = XMPUtils::ConvertToFloat ( strValue );
+		wResult->floatResult = result;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertToDate_1 ( XMP_StringPtr  strValue,
+							XMP_DateTime * binValue,
+							WXMP_Result *  wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertToDate_1" )
+
+		if ( binValue == 0 ) XMP_Throw ( "Null output date", kXMPErr_BadParam); // ! Pointer is from the client.
+		XMPUtils::ConvertToDate ( strValue, binValue );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+void
+WXMPUtils_CurrentDateTime_1 ( XMP_DateTime * time,
+							  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_CurrentDateTime_1" )
+
+		if ( time == 0 ) XMP_Throw ( "Null output date", kXMPErr_BadParam);
+		XMPUtils::CurrentDateTime ( time );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_SetTimeZone_1 ( XMP_DateTime * time,
+						  WXMP_Result *	 wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_SetTimeZone_1" )
+
+		if ( time == 0 ) XMP_Throw ( "Null output date", kXMPErr_BadParam);
+		XMPUtils::SetTimeZone ( time );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertToUTCTime_1 ( XMP_DateTime * time,
+							   WXMP_Result *  wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertToUTCTime_1" )
+
+		if ( time == 0 ) XMP_Throw ( "Null output date", kXMPErr_BadParam);
+		XMPUtils::ConvertToUTCTime ( time );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ConvertToLocalTime_1 ( XMP_DateTime * time,
+								 WXMP_Result *	wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ConvertToLocalTime_1" )
+
+		if ( time == 0 ) XMP_Throw ( "Null output date", kXMPErr_BadParam);
+		XMPUtils::ConvertToLocalTime ( time );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_CompareDateTime_1 ( const XMP_DateTime & left,
+							  const XMP_DateTime & right,
+							  WXMP_Result *		   wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_CompareDateTime_1" )
+
+		int result = XMPUtils::CompareDateTime ( left, right );
+		wResult->int32Result = result;
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+void
+WXMPUtils_EncodeToBase64_1 ( XMP_StringPtr rawStr,
+							 XMP_StringLen rawLen,
+							 void *        encodedStr,
+							 SetClientStringProc SetClientString,
+							 WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_EncodeToBase64_1" )
+
+		XMP_VarString localStr;
+
+		XMPUtils::EncodeToBase64 ( rawStr, rawLen, &localStr );
+		if ( encodedStr != 0 ) (*SetClientString) ( encodedStr, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_DecodeFromBase64_1 ( XMP_StringPtr encodedStr,
+							   XMP_StringLen encodedLen,
+							   void *        rawStr,
+							   SetClientStringProc SetClientString,
+							   WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_DecodeFromBase64_1" )
+
+		XMP_VarString localStr;
+
+		XMPUtils::DecodeFromBase64 ( encodedStr, encodedLen, &localStr );
+		if ( rawStr != 0 ) (*SetClientString) ( rawStr, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+void
+WXMPUtils_PackageForJPEG_1 ( XMPMetaRef    wxmpObj,
+                             void *        stdStr,
+                             void *        extStr,
+                             void *        digestStr,
+                             SetClientStringProc SetClientString,
+                             WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_PackageForJPEG_1" )
+
+		XMP_VarString localStdStr;
+		XMP_VarString localExtStr;
+		XMP_VarString localDigestStr;
+
+		const XMPMeta & xmpObj = WtoXMPMeta_Ref ( wxmpObj );
+		XMP_AutoLock metaLock ( &xmpObj.lock, kXMP_ReadLock );
+
+		XMPUtils::PackageForJPEG ( xmpObj, &localStdStr, &localExtStr, &localDigestStr );
+		if ( stdStr != 0 ) (*SetClientString) ( stdStr, localStdStr.c_str(), localStdStr.size() );
+		if ( extStr != 0 ) (*SetClientString) ( extStr, localExtStr.c_str(), localExtStr.size() );
+		if ( digestStr != 0 ) (*SetClientString) ( digestStr, localDigestStr.c_str(), localDigestStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_MergeFromJPEG_1 ( XMPMetaRef    wfullXMP,
+                            XMPMetaRef    wextendedXMP,
+                            WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_MergeFromJPEG_1" )
+
+		if ( wfullXMP == 0 ) XMP_Throw ( "Output XMP pointer is null", kXMPErr_BadParam );
+		if ( wfullXMP == wextendedXMP ) XMP_Throw ( "Full and extended XMP pointers match", kXMPErr_BadParam );
+
+		XMPMeta * fullXMP = WtoXMPMeta_Ptr ( wfullXMP );
+		XMP_AutoLock fullXMPLock ( &fullXMP->lock, kXMP_WriteLock );
+
+		const XMPMeta & extendedXMP = WtoXMPMeta_Ref ( wextendedXMP );
+		XMP_AutoLock extendedXMPLock ( &extendedXMP.lock, kXMP_ReadLock );
+
+		XMPUtils::MergeFromJPEG ( fullXMP, extendedXMP );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+void
+WXMPUtils_CatenateArrayItems_1 ( XMPMetaRef 	wxmpObj,
+								 XMP_StringPtr	schemaNS,
+								 XMP_StringPtr	arrayName,
+								 XMP_StringPtr	separator,
+								 XMP_StringPtr	quotes,
+								 XMP_OptionBits	options,
+								 void *         catedStr,
+								 SetClientStringProc SetClientString,
+								 WXMP_Result *	wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_CatenateArrayItems_1" )
+
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+
+		if ( separator == 0 ) separator = "; ";
+		if ( quotes == 0 ) quotes = "\"";
+
+		XMP_VarString localStr;
+
+		const XMPMeta & xmpObj = WtoXMPMeta_Ref ( wxmpObj );
+		XMP_AutoLock metaLock ( &xmpObj.lock, kXMP_ReadLock );
+
+		XMPUtils::CatenateArrayItems ( xmpObj, schemaNS, arrayName, separator, quotes, options, &localStr );
+		if ( catedStr != 0 ) (*SetClientString) ( catedStr, localStr.c_str(), localStr.size() );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_SeparateArrayItems_1 ( XMPMetaRef 	wxmpObj,
+								 XMP_StringPtr	schemaNS,
+								 XMP_StringPtr	arrayName,
+								 XMP_OptionBits options,
+								 XMP_StringPtr	catedStr,
+								 WXMP_Result *	wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_SeparateArrayItems_1" )
+
+		if ( wxmpObj == 0 ) XMP_Throw ( "Output XMP pointer is null", kXMPErr_BadParam );
+		if ( (schemaNS == 0) || (*schemaNS == 0) ) XMP_Throw ( "Empty schema namespace URI", kXMPErr_BadSchema );
+		if ( (arrayName == 0) || (*arrayName == 0) ) XMP_Throw ( "Empty array name", kXMPErr_BadXPath );
+		if ( catedStr == 0 ) catedStr = "";
+
+		XMPMeta * xmpObj = WtoXMPMeta_Ptr ( wxmpObj );
+		XMP_AutoLock metaLock ( &xmpObj->lock, kXMP_WriteLock );
+
+		XMPUtils::SeparateArrayItems ( xmpObj, schemaNS, arrayName, options, catedStr );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_ApplyTemplate_1 ( XMPMetaRef     wWorkingXMP,
+							XMPMetaRef 	   wTemplateXMP,
+							XMP_OptionBits actions,
+							WXMP_Result *  wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_ApplyTemplate_1" )
+
+		XMP_Assert ( (wWorkingXMP != 0) && (wTemplateXMP != 0) );	// Client glue enforced.
+
+		XMPMeta * workingXMP = WtoXMPMeta_Ptr ( wWorkingXMP );
+		XMP_AutoLock workingLock ( &workingXMP->lock, kXMP_WriteLock );
+
+		const XMPMeta & templateXMP = WtoXMPMeta_Ref ( wTemplateXMP );
+		XMP_AutoLock templateLock ( &templateXMP.lock, kXMP_ReadLock );
+
+		XMPUtils::ApplyTemplate ( workingXMP, templateXMP, actions );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_RemoveProperties_1 ( XMPMetaRef 	  wxmpObj,
+							   XMP_StringPtr  schemaNS,
+							   XMP_StringPtr  propName,
+							   XMP_OptionBits options,
+							   WXMP_Result *  wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_RemoveProperties_1" )
+
+		if ( wxmpObj == 0 ) XMP_Throw ( "Output XMP pointer is null", kXMPErr_BadParam );
+		if ( schemaNS == 0 ) schemaNS = "";
+		if ( propName == 0 ) propName = "";
+
+		XMPMeta * xmpObj = WtoXMPMeta_Ptr ( wxmpObj );
+		XMP_AutoLock metaLock ( &xmpObj->lock, kXMP_WriteLock );
+
+		XMPUtils::RemoveProperties ( xmpObj, schemaNS, propName, options );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+
+void
+WXMPUtils_DuplicateSubtree_1 ( XMPMetaRef     wSource,
+							   XMPMetaRef 	  wDest,
+							   XMP_StringPtr  sourceNS,
+							   XMP_StringPtr  sourceRoot,
+							   XMP_StringPtr  destNS,
+							   XMP_StringPtr  destRoot,
+							   XMP_OptionBits options,
+							   WXMP_Result *  wResult )
+{
+	XMP_ENTER_Static ( "WXMPUtils_DuplicateSubtree_1" )
+
+		if ( wDest == 0 ) XMP_Throw ( "Output XMP pointer is null", kXMPErr_BadParam );
+		if ( (sourceNS == 0) || (*sourceNS == 0) ) XMP_Throw ( "Empty source schema URI", kXMPErr_BadSchema );
+		if ( (sourceRoot == 0) || (*sourceRoot == 0) ) XMP_Throw ( "Empty source root name", kXMPErr_BadXPath );
+		if ( destNS == 0 ) destNS = sourceNS;
+		if ( destRoot == 0 ) destRoot = sourceRoot;
+
+		const XMPMeta & source = WtoXMPMeta_Ref ( wSource );
+		XMP_AutoLock sourceLock ( &source.lock, kXMP_ReadLock, (wSource != wDest) );
+
+		XMPMeta * dest = WtoXMPMeta_Ptr ( wDest );
+		XMP_AutoLock destLock ( &dest->lock, kXMP_WriteLock );
+
+		XMPUtils::DuplicateSubtree ( source, dest, sourceNS, sourceRoot, destNS, destRoot, options );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+#if __cplusplus
+} /* extern "C" */
+#endif
diff --git a/XMPCore/source/XMPCore_Impl.cpp b/XMPCore/source/XMPCore_Impl.cpp
new file mode 100644
index 0000000..4da130d
--- /dev/null
+++ b/XMPCore/source/XMPCore_Impl.cpp
@@ -0,0 +1,1418 @@
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "public/include/XMP_Version.h"
+#include "XMPCore/source/XMPCore_Impl.hpp"
+#include "XMPCore/source/XMPMeta.hpp"	// *** For use of GetNamespacePrefix in FindSchemaNode.
+
+#include "source/UnicodeInlines.incl_cpp"
+
+#include <algorithm>
+
+using namespace std;
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4290 )	// C++ exception specification ignored except ... not __declspec(nothrow)
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+// *** Add debug codegen checks, e.g. that typical masking operations really work
+// *** Make option constants 0x...UL.
+
+// Internal code should be using #if with XMP_MacBuild, XMP_WinBuild, XMP_UNIXBuild or XMP_iOSBuild.
+// This is a sanity check in case of accidental use of *_ENV. Some clients use the poor
+// practice of defining the *_ENV macro with an empty value.
+#if defined ( MAC_ENV )
+	#if ! MAC_ENV
+		#error "MAC_ENV must be defined so that \"#if MAC_ENV\" is true"
+	#endif
+#elif defined ( WIN_ENV )
+	#if ! WIN_ENV
+		#error "WIN_ENV must be defined so that \"#if WIN_ENV\" is true"
+	#endif
+#elif defined ( UNIX_ENV )
+	#if ! UNIX_ENV
+		#error "UNIX_ENV must be defined so that \"#if UNIX_ENV\" is true"
+	#endif
+#elif defined ( IOS_ENV )
+    #if ! IOS_ENV
+        #error "IOS_ENV must be defined so that \"#if IOS_ENV\" is true"
+    #endif
+#endif
+
+// =================================================================================================
+// Static Variables
+// ================
+
+XMP_Int32 sXMP_InitCount = 0;
+
+XMP_NamespaceTable * sRegisteredNamespaces = 0;
+
+XMP_AliasMap * sRegisteredAliasMap = 0;
+
+void *              voidVoidPtr    = 0;	// Used to backfill null output parameters.
+XMP_StringPtr		voidStringPtr  = 0;
+XMP_StringLen		voidStringLen  = 0;
+XMP_OptionBits		voidOptionBits = 0;
+XMP_Uns8			voidByte       = 0;
+bool				voidBool       = 0;
+XMP_Int32			voidInt32      = 0;
+XMP_Int64			voidInt64      = 0;
+double				voidDouble     = 0.0;
+XMP_DateTime		voidDateTime;
+WXMP_Result 		void_wResult;
+
+// =================================================================================================
+// Local Utilities
+// ===============
+
+// -------------------------------------------------------------------------------------------------
+// VerifyXPathRoot
+// ---------------
+//
+// Set up the first 2 components of the expanded XPath. Normalizes the various cases of using the
+// full schema URI and/or a qualified root property name. Returns true for normal processing. If
+// allowUnknownSchemaNS is true and the schema namespace is not registered, false is returned. If
+// allowUnknownSchemaNS is false and the schema namespace is not registered, an exception is thrown.
+
+// *** Should someday check the full syntax.
+
+static void
+VerifyXPathRoot	( XMP_StringPtr			schemaURI,
+				  XMP_StringPtr			propName,
+				  XMP_ExpandedXPath *	expandedXPath )
+{
+	// Do some basic checks on the URI and name. Try to lookup the URI. See if the name is qualified.
+	
+	XMP_Assert ( (schemaURI != 0) && (propName != 0) && (*propName != 0) );
+	XMP_Assert ( (expandedXPath != 0) && (expandedXPath->empty()) );
+
+	if ( *schemaURI == 0 ) XMP_Throw ( "Schema namespace URI is required", kXMPErr_BadSchema );
+
+	if ( (*propName == '?') || (*propName == '@') ) {
+		XMP_Throw ( "Top level name must not be a qualifier", kXMPErr_BadXPath );
+	}
+	for ( XMP_StringPtr ch = propName; *ch != 0; ++ch ) {
+		if ( (*ch == '/') || (*ch == '[') ) {
+			XMP_Throw ( "Top level name must be simple", kXMPErr_BadXPath );
+		}
+	}
+
+	XMP_StringPtr schemaPrefix;
+	bool nsFound = sRegisteredNamespaces->GetPrefix ( schemaURI, &schemaPrefix, 0 );
+	if ( ! nsFound ) XMP_Throw ( "Unregistered schema namespace URI", kXMPErr_BadSchema );
+
+	XMP_StringPtr colonPos = propName;
+	while ( (*colonPos != 0) && (*colonPos != ':') ) ++colonPos;
+	VerifySimpleXMLName ( propName, colonPos );	// Verify the part before any colon.
+
+	// Verify the various URI and prefix combinations. Initialize the expanded XPath.
+	
+	if ( *colonPos == 0 ) {
+	
+		// The propName is unqualified, use the schemaURI and associated prefix.
+		
+		expandedXPath->push_back ( XPathStepInfo ( schemaURI, kXMP_SchemaNode ) );
+		expandedXPath->push_back ( XPathStepInfo ( schemaPrefix, 0 ) );
+		(*expandedXPath)[kRootPropStep].step += propName;
+	
+	} else {
+
+		// The propName is qualified. Make sure the prefix is legit. Use the associated URI and qualified name.
+
+		size_t prefixLen = colonPos - propName + 1;	// ! Include the colon.
+		VerifySimpleXMLName ( colonPos+1, colonPos+strlen(colonPos) );
+
+		XMP_VarString prefix ( propName, prefixLen );
+		if ( prefix != schemaPrefix ) XMP_Throw ( "Schema namespace URI and prefix mismatch", kXMPErr_BadSchema );
+
+		expandedXPath->push_back ( XPathStepInfo ( schemaURI, kXMP_SchemaNode ) );
+		expandedXPath->push_back ( XPathStepInfo ( propName, 0 ) );
+	
+	}
+
+}	// VerifyXPathRoot
+
+// -------------------------------------------------------------------------------------------------
+// VerifyQualName
+// --------------
+
+static void
+VerifyQualName ( XMP_StringPtr qualName, XMP_StringPtr nameEnd )
+{
+	if ( qualName >= nameEnd ) XMP_Throw ( "Empty qualified name", kXMPErr_BadXPath );
+
+	XMP_StringPtr colonPos = qualName;
+	while ( (colonPos < nameEnd) && (*colonPos != ':') ) ++colonPos;
+	if ( (colonPos == qualName) || (colonPos >= nameEnd) ) XMP_Throw ( "Ill-formed qualified name", kXMPErr_BadXPath );
+
+	VerifySimpleXMLName ( qualName, colonPos );
+	VerifySimpleXMLName ( colonPos+1, nameEnd );
+
+	size_t prefixLen = colonPos - qualName + 1;	// ! Include the colon.
+	XMP_VarString prefix ( qualName, prefixLen );
+	bool nsFound = sRegisteredNamespaces->GetURI ( prefix.c_str(), 0, 0 );
+	if ( ! nsFound ) XMP_Throw ( "Unknown namespace prefix for qualified name", kXMPErr_BadXPath );
+
+}	// VerifyQualName
+
+// -------------------------------------------------------------------------------------------------
+// FindIndexedItem
+// ---------------
+//
+//	[index]	An element of an array.
+//
+// Support the implicit creation of a new last item.
+
+static XMP_Index
+FindIndexedItem ( XMP_Node * arrayNode, const XMP_VarString & indexStep, bool createNodes )
+{
+	XMP_Index index = 0;
+	size_t    chLim = indexStep.size() - 1;
+
+	XMP_Assert ( (chLim >= 2) && (indexStep[0] == '[') && (indexStep[chLim] == ']') );
+	
+	for ( size_t chNum = 1; chNum != chLim; ++chNum ) {
+		XMP_Assert ( ('0' <= indexStep[chNum]) && (indexStep[chNum] <= '9') );
+		index = (index * 10) + (indexStep[chNum] - '0');
+		if ( index < 0 ) {
+			XMP_Throw ( "Array index overflow", kXMPErr_BadXPath );	// ! Overflow, not truly negative.
+		}
+	}
+
+	--index;	// Change to a C-style, zero based index.
+	if ( index < 0 ) XMP_Throw ( "Array index must be larger than zero", kXMPErr_BadXPath );
+
+	if ( (index == (XMP_Index)arrayNode->children.size()) && createNodes ) {	// Append a new last+1 node.
+		XMP_Node * newItem = new XMP_Node ( arrayNode, kXMP_ArrayItemName, kXMP_NewImplicitNode );
+		arrayNode->children.push_back ( newItem );
+	}
+
+	// ! Don't throw here for a too large index. SetProperty will throw, GetProperty will not.
+	if ( index >= (XMP_Index)arrayNode->children.size() ) index = -1;
+	return index;
+	
+}	// FindIndexedItem
+
+// -------------------------------------------------------------------------------------------------
+// SplitNameAndValue
+// -----------------
+//
+// Split the name and value parts for field and qualifier selectors:
+//
+//	[qualName="value"]	An element in an array of structs, chosen by a field value.
+//	[?qualName="value"]	An element in an array, chosen by a qualifier value.
+//
+// The value portion is a string quoted by ''' or '"'. The value may contain any character including
+// a doubled quoting character. The value may be empty.
+
+static void
+SplitNameAndValue ( const XMP_VarString & selStep, XMP_VarString * nameStr, XMP_VarString * valueStr )
+{
+	XMP_StringPtr partBegin = selStep.c_str();
+	XMP_StringPtr partEnd;
+	
+	const XMP_StringPtr valueEnd = partBegin + (selStep.size() - 2);
+	const char          quote    = *valueEnd;
+	
+	XMP_Assert ( (*partBegin == '[') && (*(valueEnd+1) == ']') );
+	XMP_Assert ( (selStep.size() >= 6) && ((quote == '"') || (quote == '\'')) );
+
+	// Extract the name part.
+	
+	++partBegin;	// Skip the opening '['.
+	if ( *partBegin == '?' ) ++partBegin;
+	for ( partEnd = partBegin+1; *partEnd != '='; ++partEnd ) {};
+	
+	nameStr->assign ( partBegin, (partEnd - partBegin) );
+	
+	// Extract the value part, reducing doubled quotes.
+	
+	XMP_Assert ( *(partEnd+1) == quote );
+	
+	partBegin = partEnd + 2;
+	valueStr->erase();
+	valueStr->reserve ( valueEnd - partBegin );	// Maximum length, don't optimize doubled quotes.
+	
+	for ( partEnd = partBegin; partEnd < valueEnd; ++partEnd ) {
+		if ( (*partEnd == quote) && (*(partEnd+1) == quote) ) {
+			++partEnd;
+			valueStr->append ( partBegin, (partEnd - partBegin) );
+			partBegin = partEnd+1;	// ! Loop will increment partEnd again.
+		}
+	}
+
+	valueStr->append ( partBegin, (partEnd - partBegin) );	// ! The loop does not add the last part.
+
+}	// SplitNameAndValue
+
+// -------------------------------------------------------------------------------------------------
+// LookupQualSelector
+// ------------------
+//
+//	[?qualName="value"]	An element in an array, chosen by a qualifier value.
+//
+// Note that we don't create implicit nodes for qualifier selectors, so no CreateNodes parameter.
+
+static XMP_Index
+LookupQualSelector ( XMP_Node * arrayNode, const XMP_VarString & qualName, XMP_VarString & qualValue )
+{
+	XMP_Index index;
+		
+	if ( qualName == "xml:lang" ) {
+	
+		// *** Should check that the value is legit RFC 1766/3066.
+		NormalizeLangValue ( &qualValue );
+		index = LookupLangItem ( arrayNode, qualValue ) ;
+	
+	} else {
+
+		XMP_Index itemLim;
+		for ( index = 0, itemLim = arrayNode->children.size(); index != itemLim; ++index ) {
+
+			const XMP_Node * currItem = arrayNode->children[index];
+			XMP_Assert ( currItem->parent == arrayNode );
+			
+			size_t q, qualLim;
+			for ( q = 0, qualLim = currItem->qualifiers.size(); q != qualLim; ++q ) {
+				const XMP_Node * currQual = currItem->qualifiers[q];
+				XMP_Assert ( currQual->parent == currItem );
+				if ( currQual->name != qualName ) continue;
+				if ( currQual->value == qualValue ) break;	// Exit qual loop.
+			}
+			if ( q != qualLim ) break;	// Exit child loop, found an item with a matching qualifier.
+
+		}
+		if ( index == itemLim ) index = -1;
+
+	}
+	
+	return index;
+	
+}	// LookupQualSelector
+
+// -------------------------------------------------------------------------------------------------
+// FollowXPathStep
+// ---------------
+//
+// After processing by ExpandXPath, a step can be of these forms:
+//	qualName			A top level property or struct field.
+//	[index]				An element of an array.
+//	[last()]			The last element of an array.
+//	[qualName="value"]	An element in an array of structs, chosen by a field value.
+//	[?qualName="value"]	An element in an array, chosen by a qualifier value.
+//	?qualName			A general qualifier.
+//
+// Find the appropriate child node, resolving aliases, and optionally creating nodes.
+
+static XMP_Node *
+FollowXPathStep	( XMP_Node *	   parentNode,
+				  const XMP_ExpandedXPath & fullPath,
+				  size_t		   stepNum,
+				  bool			   createNodes,
+				  XMP_NodePtrPos * ptrPos,
+				  bool			   aliasedArrayItem = false )
+{
+	XMP_Node * nextNode = 0;
+	const XPathStepInfo & nextStep = fullPath[stepNum];
+	XMP_Index      index    = 0;
+	XMP_OptionBits stepKind = nextStep.options & kXMP_StepKindMask;
+	
+	XMP_Assert ( (kXMP_StructFieldStep <= stepKind) && (stepKind <= kXMP_FieldSelectorStep) );
+
+	if ( stepKind == kXMP_StructFieldStep ) {
+
+		nextNode = FindChildNode ( parentNode, nextStep.step.c_str(), createNodes, ptrPos );
+
+	} else if ( stepKind == kXMP_QualifierStep ) {
+	
+		XMP_StringPtr qualStep = nextStep.step.c_str();
+		XMP_Assert ( *qualStep == '?' );
+		++qualStep;
+		nextNode = FindQualifierNode ( parentNode, qualStep, createNodes, ptrPos );
+
+	} else {
+	
+		// This is an array indexing step. First get the index, then get the node.
+
+		if ( ! (parentNode->options & kXMP_PropValueIsArray) ) {
+			XMP_Throw ( "Indexing applied to non-array", kXMPErr_BadXPath );
+		}
+		
+		if ( stepKind == kXMP_ArrayIndexStep ) {
+			index = FindIndexedItem ( parentNode, nextStep.step, createNodes );
+		} else if ( stepKind == kXMP_ArrayLastStep ) {
+			index = parentNode->children.size() - 1;
+		} else if ( stepKind == kXMP_FieldSelectorStep ) {
+			XMP_VarString fieldName, fieldValue;
+			SplitNameAndValue ( nextStep.step, &fieldName, &fieldValue );
+			index = LookupFieldSelector ( parentNode, fieldName.c_str(), fieldValue.c_str() );
+		} else if ( stepKind == kXMP_QualSelectorStep ) {
+			XMP_VarString qualName, qualValue;
+			SplitNameAndValue ( nextStep.step, &qualName, &qualValue );
+			index = LookupQualSelector ( parentNode, qualName, qualValue );
+		} else {
+			XMP_Throw ( "Unknown array indexing step in FollowXPathStep", kXMPErr_InternalFailure );
+		}
+		
+		if ( (0 <= index) && (index <= (XMP_Index)parentNode->children.size()) ) nextNode = parentNode->children[index];
+
+		if ( (index == -1) && createNodes && aliasedArrayItem && (stepKind == kXMP_QualSelectorStep) ) {
+		
+			// An ugly special case without an obvious better place to be. We have an alias to the
+			// x-default item of an alt-text array. A simple reference via SetProperty must create
+			// the x-default item if it does not yet exist.
+			
+			XMP_Assert ( parentNode->options & kXMP_PropArrayIsAltText );
+			XMP_Assert ( (stepNum == 2) && (nextStep.step == "[?xml:lang=\"x-default\"]") );
+
+			nextNode = new XMP_Node ( parentNode, kXMP_ArrayItemName,
+									  (kXMP_PropHasQualifiers | kXMP_PropHasLang | kXMP_NewImplicitNode) );
+
+			XMP_Node * langQual = new XMP_Node ( nextNode, "xml:lang", "x-default", kXMP_PropIsQualifier );
+			nextNode->qualifiers.push_back ( langQual );
+
+			if ( parentNode->children.empty() ) {
+				parentNode->children.push_back ( nextNode );
+			} else {
+				parentNode->children.insert ( parentNode->children.begin(), nextNode );
+			}
+
+			index = 0;	// ! C-style index! The x-default item is always first.
+
+		}
+		
+		if ( (nextNode != 0) && (ptrPos != 0) ) *ptrPos = parentNode->children.begin() + index;
+	
+	}
+
+	if ( (nextNode != 0) && (nextNode->options & kXMP_NewImplicitNode) ) {
+		nextNode->options |= (nextStep.options & kXMP_PropArrayFormMask);
+	}
+	
+	XMP_Assert ( (ptrPos == 0) || (nextNode == 0) || (nextNode == **ptrPos) );
+	XMP_Assert ( (nextNode != 0) || (! createNodes) );
+	return nextNode;
+	
+}	// FollowXPathStep
+
+// -------------------------------------------------------------------------------------------------
+// CheckImplicitStruct
+// -------------------
+
+static inline void
+CheckImplicitStruct	( XMP_Node * node,
+					  const XMP_ExpandedXPath &	expandedXPath,
+					  size_t	 stepNum,
+					  size_t	 stepLim )
+{
+
+	if ( (stepNum < stepLim) &&
+		 ((node->options & kXMP_PropCompositeMask) == 0) &&
+		 (GetStepKind ( expandedXPath[stepNum].options ) == kXMP_StructFieldStep) ) {
+
+		node->options |= kXMP_PropValueIsStruct;
+
+	}
+
+}	// CheckImplicitStruct
+
+// -------------------------------------------------------------------------------------------------
+// DeleteSubtree
+// -------------
+
+void
+DeleteSubtree ( XMP_NodePtrPos rootNodePos )
+{
+	XMP_Node * rootNode   = *rootNodePos;
+	XMP_Node * rootParent = rootNode->parent;
+
+	if ( ! (rootNode->options & kXMP_PropIsQualifier) ) {
+
+		rootParent->children.erase ( rootNodePos );
+
+	} else {
+
+		rootParent->qualifiers.erase ( rootNodePos );
+
+		XMP_Assert ( rootParent->options & kXMP_PropHasQualifiers);
+		if ( rootParent->qualifiers.empty() ) rootParent->options ^= kXMP_PropHasQualifiers;
+
+		if ( rootNode->name == "xml:lang" ) {
+			XMP_Assert ( rootParent->options & kXMP_PropHasLang);
+			rootParent->options ^= kXMP_PropHasLang;
+		} else if ( rootNode->name == "rdf:type" ) {
+			XMP_Assert ( rootParent->options & kXMP_PropHasType);
+			rootParent->options ^= kXMP_PropHasType;
+		}
+
+	}
+
+	delete rootNode;
+
+}	// DeleteSubtree
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// VerifySetOptions
+// ================
+//
+// Normalize and verify the option flags for SetProperty and similar functions. The allowed options
+// here are just those that apply to the property, that would be kept in the XMP_Node. Others that
+// affect the selection of the node or other processing must be removed by now. These are:
+//	kXMP_InsertBeforeItem
+//	kXMP_InsertAfterItem
+//	kXMP_KeepQualifiers
+//	kXMPUtil_AllowCommas
+
+enum {
+	kXMP_AllSetOptionsMask	= (kXMP_PropValueIsURI       |
+							   kXMP_PropValueIsStruct    |
+							   kXMP_PropValueIsArray     |
+							   kXMP_PropArrayIsOrdered   |
+							   kXMP_PropArrayIsAlternate |
+							   kXMP_PropArrayIsAltText   |
+							   kXMP_DeleteExisting)
+};
+
+XMP_OptionBits
+VerifySetOptions ( XMP_OptionBits options, XMP_StringPtr propValue )
+{
+
+	if ( options & kXMP_PropArrayIsAltText )   options |= kXMP_PropArrayIsAlternate;
+	if ( options & kXMP_PropArrayIsAlternate ) options |= kXMP_PropArrayIsOrdered;
+	if ( options & kXMP_PropArrayIsOrdered )   options |= kXMP_PropValueIsArray;
+	
+	if ( options & ~kXMP_AllSetOptionsMask ) {
+		XMP_Throw ( "Unrecognized option flags", kXMPErr_BadOptions );
+	}
+	
+	if ( (options & kXMP_PropValueIsStruct) && (options & kXMP_PropValueIsArray) ) {
+		XMP_Throw ( "IsStruct and IsArray options are mutually exclusive", kXMPErr_BadOptions );
+	}
+	
+	if ( (options & kXMP_PropValueOptionsMask) && (options & kXMP_PropCompositeMask) ) {
+		XMP_Throw ( "Structs and arrays can't have \"value\" options", kXMPErr_BadOptions );
+	}
+	
+	if ( (propValue != 0) && (options & kXMP_PropCompositeMask) ) {
+		XMP_Throw ( "Structs and arrays can't have string values", kXMPErr_BadOptions );
+	}
+
+	return options;
+
+}	// VerifySetOptions
+
+// =================================================================================================
+// ComposeXPath
+// ============
+//
+// Compose the canonical string form of an expanded XPath expression.
+
+extern void
+ComposeXPath ( const XMP_ExpandedXPath & expandedXPath,
+			   XMP_VarString * stringXPath )
+{
+	*stringXPath = expandedXPath[kRootPropStep].step;
+
+	for ( size_t index = kRootPropStep+1; index < expandedXPath.size(); ++index ) {
+		const XPathStepInfo & currStep = expandedXPath[index];
+
+		switch ( currStep.options & kXMP_StepKindMask ) {
+
+			case kXMP_StructFieldStep :
+			case kXMP_QualifierStep :
+				*stringXPath += '/';
+				*stringXPath += currStep.step;
+				break;
+
+			case kXMP_ArrayIndexStep :
+			case kXMP_ArrayLastStep :
+			case kXMP_QualSelectorStep :
+			case kXMP_FieldSelectorStep :
+				*stringXPath += currStep.step;
+				break;
+
+			default:
+				XMP_Throw ( "Unexpected", kXMPErr_InternalFailure );
+
+		}
+
+	}
+
+}	// ComposeXPath
+
+// =================================================================================================
+// ExpandXPath
+// ===========
+//
+// Split an XPath expression apart at the conceptual steps, adding the root namespace prefix to the
+// first property component. The schema URI is put in the first (0th) slot in the expanded XPath.
+// Check if the top level component is an alias, but don't resolve it.
+//
+// In the most verbose case steps are separated by '/', and each step can be of these forms:
+//
+//	qualName				A top level property or struct field.
+//	*[index]				An element of an array.
+//	*[last()]				The last element of an array.
+//	*[fieldName="value"]	An element in an array of structs, chosen by a field value.
+//	*[@xml:lang="value"]	An element in an alt-text array, chosen by the xml:lang qualifier.
+//	*[?qualName="value"]	An element in an array, chosen by a qualifier value.
+//	@xml:lang				An xml:lang qualifier.
+//	?qualName				A general qualifier.
+//
+// The logic is complicated though by shorthand for arrays, the separating '/' and leading '*'
+// are optional. These are all equivalent:  array/*[2]  array/[2]  array*[2]  array[2]
+// All of these are broken into the 2 steps "array" and "[2]".
+//
+// The value portion in the array selector forms is a string quoted by ''' or '"'. The value
+// may contain any character including a doubled quoting character. The value may be empty.
+//
+// The syntax isn't checked, but an XML name begins with a letter or '_', and contains letters,
+// digits, '.', '-', '_', and a bunch of special non-ASCII Unicode characters. An XML qualified
+// name is a pair of names separated by a colon.
+
+void
+ExpandXPath	( XMP_StringPtr			schemaNS,
+			  XMP_StringPtr			propPath,
+			  XMP_ExpandedXPath *	expandedXPath )
+{
+	XMP_Assert ( (schemaNS != 0) && (propPath != 0) && (*propPath != 0) && (expandedXPath != 0) );
+	
+	XMP_StringPtr	stepBegin, stepEnd;
+	XMP_StringPtr	qualName, nameEnd;
+	XMP_VarString	currStep;
+		
+	qualName = nameEnd = NULL;
+	size_t resCount = 2;	// Guess at the number of steps. At least 2, plus 1 for each '/' or '['.
+	for ( stepEnd = propPath; *stepEnd != 0; ++stepEnd ) {
+		if ( (*stepEnd == '/') || (*stepEnd == '[') ) ++resCount;
+	}
+	
+	expandedXPath->clear();
+	expandedXPath->reserve ( resCount );
+	
+	// -------------------------------------------------------------------------------------------
+	// Pull out the first component and do some special processing on it: add the schema namespace
+	// prefix and see if it is an alias. The start must be a qualName.
+	
+	stepBegin = propPath;
+	stepEnd = stepBegin;
+	while ( (*stepEnd != 0) && (*stepEnd != '/') && (*stepEnd != '[') && (*stepEnd != '*') ) ++stepEnd;
+	if ( stepEnd == stepBegin ) XMP_Throw ( "Empty initial XPath step", kXMPErr_BadXPath );
+	currStep.assign ( stepBegin, (stepEnd - stepBegin) );
+	
+	VerifyXPathRoot ( schemaNS, currStep.c_str(), expandedXPath );
+
+	XMP_OptionBits stepFlags = kXMP_StructFieldStep;	
+	if ( sRegisteredAliasMap->find ( (*expandedXPath)[kRootPropStep].step ) != sRegisteredAliasMap->end() ) {
+		stepFlags |= kXMP_StepIsAlias;
+	}
+	(*expandedXPath)[kRootPropStep].options |= stepFlags;
+		
+	// -----------------------------------------------------
+	// Now continue to process the rest of the XPath string.
+
+	while ( *stepEnd != 0 ) {
+
+		stepBegin = stepEnd;
+		if ( *stepBegin == '/' ) ++stepBegin;
+		if ( *stepBegin == '*' ) {
+			++stepBegin;
+			if ( *stepBegin != '[' ) XMP_Throw ( "Missing '[' after '*'", kXMPErr_BadXPath );
+		}
+		stepEnd = stepBegin;
+
+		if ( *stepBegin != '[' ) {
+		
+			// A struct field or qualifier.
+			qualName = stepBegin;
+			while ( (*stepEnd != 0) && (*stepEnd != '/') && (*stepEnd != '[') && (*stepEnd != '*') ) ++stepEnd;
+			nameEnd = stepEnd;
+			stepFlags = kXMP_StructFieldStep;	// ! Touch up later, also changing '@' to '?'.
+			
+		} else {
+		
+			// One of the array forms.
+		
+			++stepEnd;	// Look at the character after the leading '['.
+			
+			if ( ('0' <= *stepEnd) && (*stepEnd <= '9') ) {
+
+				// A numeric (decimal integer) array index.
+				while ( (*stepEnd != 0) && ('0' <= *stepEnd) && (*stepEnd <= '9') ) ++stepEnd;
+				if ( *stepEnd != ']' ) XMP_Throw ( "Missing ']' for integer array index", kXMPErr_BadXPath );
+				stepFlags = kXMP_ArrayIndexStep;
+
+			} else {
+
+				// Could be "[last()]" or one of the selector forms. Find the ']' or '='.
+				
+				while ( (*stepEnd != 0) && (*stepEnd != ']') && (*stepEnd != '=') ) ++stepEnd;
+				if ( *stepEnd == 0 ) XMP_Throw ( "Missing ']' or '=' for array index", kXMPErr_BadXPath );
+
+				if ( *stepEnd == ']' ) {
+
+					if ( strncmp ( "[last()", stepBegin, (stepEnd - stepBegin) ) != 0 ) {
+						XMP_Throw ( "Invalid non-numeric array index", kXMPErr_BadXPath );
+					}
+					stepFlags = kXMP_ArrayLastStep;
+
+				} else {
+
+					qualName = stepBegin+1;
+					nameEnd = stepEnd;
+					++stepEnd;	// Absorb the '=', remember the quote.
+					const char quote = *stepEnd;
+					if ( (quote != '\'') && (quote != '"') ) {
+						XMP_Throw ( "Invalid quote in array selector", kXMPErr_BadXPath );
+					}
+
+					++stepEnd;	// Absorb the leading quote.
+					while ( *stepEnd != 0 ) {
+						if ( *stepEnd == quote ) {
+							if ( *(stepEnd+1) != quote ) break;
+							++stepEnd;
+						}
+						++stepEnd;
+					}
+					if ( *stepEnd == 0 ) {
+						XMP_Throw ( "No terminating quote for array selector", kXMPErr_BadXPath );
+					}
+					++stepEnd;	// Absorb the trailing quote.
+					
+					stepFlags = kXMP_FieldSelectorStep;	// ! Touch up later, also changing '@' to '?'.
+
+				}
+
+			}
+
+			if ( *stepEnd != ']' ) XMP_Throw ( "Missing ']' for array index", kXMPErr_BadXPath );
+			++stepEnd;
+			
+		}
+
+		if ( stepEnd == stepBegin ) XMP_Throw ( "Empty XPath step", kXMPErr_BadXPath );
+		currStep.assign ( stepBegin, (stepEnd - stepBegin) );
+
+		if ( GetStepKind ( stepFlags ) == kXMP_StructFieldStep ) {
+
+			if ( currStep[0] == '@' ) {
+				currStep[0] = '?';
+				if ( currStep != "?xml:lang" ) XMP_Throw ( "Only xml:lang allowed with '@'", kXMPErr_BadXPath );
+			}
+			if ( currStep[0] == '?' ) {
+				++qualName;
+				stepFlags = kXMP_QualifierStep;
+			}
+			VerifyQualName ( qualName, nameEnd );
+
+		} else if ( GetStepKind ( stepFlags ) == kXMP_FieldSelectorStep ) {
+
+			if ( currStep[1] == '@' ) {
+				currStep[1] = '?';
+				if ( strncmp ( currStep.c_str(), "[?xml:lang=", 11 ) != 0 ) {
+					XMP_Throw ( "Only xml:lang allowed with '@'", kXMPErr_BadXPath );
+				}
+			}
+			if ( currStep[1] == '?' ) {
+				++qualName;
+				stepFlags = kXMP_QualSelectorStep;
+			}
+			VerifyQualName ( qualName, nameEnd );
+
+		}
+
+		expandedXPath->push_back ( XPathStepInfo ( currStep, stepFlags ) );
+
+	}
+
+}	// ExpandXPath
+
+// =================================================================================================
+// FindSchemaNode
+// ==============
+//
+// Find or create a schema node. Returns a pointer to the node, and optionally an iterator for the
+// node's position in the top level vector of schema nodes. The iterator is unchanged if no schema
+// node (null) is returned.
+
+XMP_Node *
+FindSchemaNode	( XMP_Node *		xmpTree,
+				  XMP_StringPtr		nsURI,
+				  bool				createNodes,
+				  XMP_NodePtrPos *	ptrPos /* = 0 */ )
+{
+	XMP_Node * schemaNode = 0;
+	
+	XMP_Assert ( xmpTree->parent == 0 );
+	
+	for ( size_t schemaNum = 0, schemaLim = xmpTree->children.size(); schemaNum != schemaLim; ++schemaNum ) {
+		XMP_Node * currSchema = xmpTree->children[schemaNum];
+		XMP_Assert ( currSchema->parent == xmpTree );
+		if ( currSchema->name == nsURI ) {
+			schemaNode = currSchema;
+			if ( ptrPos != 0 ) *ptrPos = xmpTree->children.begin() + schemaNum;
+			break;
+		}
+	}
+	
+	if ( (schemaNode == 0) && createNodes ) {
+
+		schemaNode = new XMP_Node ( xmpTree, nsURI, (kXMP_SchemaNode | kXMP_NewImplicitNode) );
+
+		try {
+			XMP_StringPtr prefixPtr;
+			XMP_StringLen prefixLen;
+#if XMP_DebugBuild
+			bool found =
+#endif
+                          XMPMeta::GetNamespacePrefix ( nsURI, &prefixPtr, &prefixLen );	// *** Use map directly?
+			XMP_Assert ( found );
+			schemaNode->value.assign ( prefixPtr, prefixLen );
+		} catch (...) {	// Don't leak schemaNode in case of an exception before adding it to the children vector.
+			delete schemaNode;
+			throw;
+		}
+
+		xmpTree->children.push_back ( schemaNode );
+		if ( ptrPos != 0 ) *ptrPos = xmpTree->children.end() - 1;
+
+		#if 0	// *** XMP_DebugBuild
+			schemaNode->_valuePtr = schemaNode->value.c_str();
+		#endif
+
+	}
+	
+	XMP_Assert ( (ptrPos == 0) || (schemaNode == 0) || (schemaNode == **ptrPos) );
+	XMP_Assert ( (schemaNode != 0) || (! createNodes) );
+	return schemaNode;
+	
+}	// FindSchemaNode
+
+// =================================================================================================
+// FindChildNode
+// =============
+//
+// Find or create a child node under a given parent node. Returns a pointer to the child node, and
+// optionally an iterator for the node's position in the parent's vector of children. The iterator
+// is unchanged if no child node (null) is returned.
+
+XMP_Node *
+FindChildNode	( XMP_Node *		parent,
+				  XMP_StringPtr		childName,
+				  bool				createNodes,
+				  XMP_NodePtrPos *	ptrPos /* = 0 */ )
+{
+	XMP_Node * childNode = 0;
+
+	if ( ! (parent->options & (kXMP_SchemaNode | kXMP_PropValueIsStruct)) ) {
+		if ( ! (parent->options & kXMP_NewImplicitNode) ) {
+			XMP_Throw ( "Named children only allowed for schemas and structs", kXMPErr_BadXPath );
+		}
+		if ( parent->options & kXMP_PropValueIsArray ) {
+			XMP_Throw ( "Named children not allowed for arrays", kXMPErr_BadXPath );
+		}
+		if ( ! createNodes ) {	// *** Should be assert? If !createNodes, why is the parent a new implicit node?
+			XMP_Throw ( "Parent is new implicit node, but createNodes is false", kXMPErr_InternalFailure );
+		}
+		parent->options |= kXMP_PropValueIsStruct;
+	}
+	
+	for ( size_t childNum = 0, childLim = parent->children.size(); childNum != childLim; ++childNum ) {
+		XMP_Node * currChild = parent->children[childNum];
+		XMP_Assert ( currChild->parent == parent );
+		if ( currChild->name == childName ) {
+			childNode = currChild;
+			if ( ptrPos != 0 ) *ptrPos = parent->children.begin() + childNum;
+			break;
+		}
+	}
+	
+	if ( (childNode == 0) && createNodes ) {
+		childNode = new XMP_Node ( parent, childName, kXMP_NewImplicitNode );
+		parent->children.push_back ( childNode );
+		if ( ptrPos != 0 ) *ptrPos = parent->children.end() - 1;
+	}
+	
+	XMP_Assert ( (ptrPos == 0) || (childNode == 0) || (childNode == **ptrPos) );
+	XMP_Assert ( (childNode != 0) || (! createNodes) );
+	return childNode;
+	
+}	// FindChildNode
+
+// =================================================================================================
+// FindQualifierNode
+// =================
+//
+// Find or create a qualifier node under a given parent node. Returns a pointer to the qualifier node,
+// and optionally an iterator for the node's position in the parent's vector of qualifiers. The iterator
+// is unchanged if no qualifier node (null) is returned.
+//
+// ! On entry, the qualName parameter must not have the leading '?' from the XPath step.
+
+XMP_Node *
+FindQualifierNode	( XMP_Node *		parent,
+					  XMP_StringPtr		qualName,
+					  bool				createNodes,
+					  XMP_NodePtrPos *	ptrPos /* = 0 */ )	// *** Require ptrPos internally & remove checks?
+{
+	XMP_Node * qualNode = 0;
+	
+	XMP_Assert ( *qualName != '?' );
+	
+	for ( size_t qualNum = 0, qualLim = parent->qualifiers.size(); qualNum != qualLim; ++qualNum ) {
+		XMP_Node * currQual = parent->qualifiers[qualNum];
+		XMP_Assert ( currQual->parent == parent );
+		if ( currQual->name == qualName ) {
+			qualNode = currQual;
+			if ( ptrPos != 0 ) *ptrPos = parent->qualifiers.begin() + qualNum;
+			break;
+		}
+	}
+	
+	if ( (qualNode == 0) && createNodes ) {
+
+		qualNode = new XMP_Node ( parent, qualName, (kXMP_PropIsQualifier | kXMP_NewImplicitNode) );
+		parent->options |= kXMP_PropHasQualifiers;
+
+		const bool isLang 	 = XMP_LitMatch ( qualName, "xml:lang" );
+		const bool isType 	 = XMP_LitMatch ( qualName, "rdf:type" );
+		const bool isSpecial = isLang | isType;
+
+		if ( isLang ) {
+			parent->options |= kXMP_PropHasLang;
+		} else if ( isType ) {
+			parent->options |= kXMP_PropHasType;
+		}
+		
+		if ( parent->qualifiers.empty() || (! isSpecial) ) {
+			parent->qualifiers.push_back ( qualNode );
+			if ( ptrPos != 0 ) *ptrPos = parent->qualifiers.end() - 1;
+		} else {
+			XMP_NodePtrPos insertPos = parent->qualifiers.begin();	// ! Lang goes first, type after.
+			if ( isType && (parent->options & kXMP_PropHasLang) ) ++insertPos;	// *** Does insert at end() work?
+			insertPos = parent->qualifiers.insert ( insertPos, qualNode );
+			if ( ptrPos != 0 ) *ptrPos = insertPos;
+		}
+
+	}
+	
+	XMP_Assert ( (ptrPos == 0) || (qualNode == 0) || (qualNode == **ptrPos) );
+	XMP_Assert ( (qualNode != 0) || (! createNodes) );
+	return qualNode;
+	
+}	// FindQualifierNode
+
+// =================================================================================================
+// LookupFieldSelector
+// ===================
+//
+//	[fieldName="value"]	An element in an array of structs, chosen by a field value.
+//
+// Note that we don't create implicit nodes for field selectors, so no CreateNodes parameter.
+
+XMP_Index
+LookupFieldSelector ( const XMP_Node * arrayNode, XMP_StringPtr fieldName, XMP_StringPtr fieldValue )
+{
+	XMP_Index index, itemLim;
+	
+	for ( index = 0, itemLim = arrayNode->children.size(); index != itemLim; ++index ) {
+
+		const XMP_Node * currItem = arrayNode->children[index];
+		XMP_Assert ( currItem->parent == arrayNode );
+
+		if ( ! (currItem->options & kXMP_PropValueIsStruct) ) {
+			XMP_Throw ( "Field selector must be used on array of struct", kXMPErr_BadXPath );
+		}
+
+		size_t f, fieldLim;
+		for ( f = 0, fieldLim = currItem->children.size(); f != fieldLim; ++f ) {
+			const XMP_Node * currField = currItem->children[f];
+			XMP_Assert ( currField->parent == currItem );
+			if ( currField->name != fieldName ) continue;
+			if ( currField->value == fieldValue ) break;	// Exit qual loop.
+		}
+		if ( f != fieldLim ) break;	// Exit child loop, found an item with a matching qualifier.
+
+	}
+	
+	if ( index == itemLim ) index = -1;
+	return index;
+	
+}	// LookupFieldSelector
+
+// =================================================================================================
+// LookupLangItem
+// ==============
+//
+// ! Assumes that the language value is already normalized.
+
+XMP_Index
+LookupLangItem ( const XMP_Node * arrayNode, XMP_VarString & lang )
+{
+	if ( ! (arrayNode->options & kXMP_PropValueIsArray) ) {	// *** Check for alt-text?
+		XMP_Throw ( "Language item must be used on array", kXMPErr_BadXPath );
+	}
+
+	XMP_Index index   = 0;
+	XMP_Index itemLim = arrayNode->children.size();
+	
+	for ( ; index != itemLim; ++index ) {
+		const XMP_Node * currItem = arrayNode->children[index];
+		XMP_Assert ( currItem->parent == arrayNode );
+		if ( currItem->qualifiers.empty() || (currItem->qualifiers[0]->name != "xml:lang") ) continue;
+		if ( currItem->qualifiers[0]->value == lang ) break;
+	}
+	
+	if ( index == itemLim ) index = -1;
+	return index;
+	
+}	// LookupLangItem
+
+// =================================================================================================
+// FindNode
+// ========
+//
+// Follow an expanded path expression to find or create a node. Returns a pointer to the node, and
+// optionally an iterator for the node's position in the parent's vector of children or qualifiers.
+// The iterator is unchanged if no child node (null) is returned.
+
+XMP_Node *
+FindNode ( XMP_Node *		xmpTree,
+		   const XMP_ExpandedXPath & expandedXPath,
+		   bool				createNodes,
+		   XMP_OptionBits	leafOptions /* = 0 */,
+	 	   XMP_NodePtrPos * ptrPos /* = 0 */ )
+{
+	XMP_Node *     currNode = 0;
+	XMP_NodePtrPos currPos;
+	XMP_NodePtrPos newSubPos;	// Root of implicitly created subtree. Valid only if leaf is new.
+	bool           leafIsNew = false;
+	
+	XMP_Assert ( (leafOptions == 0) || createNodes );
+
+	if ( expandedXPath.empty() ) XMP_Throw ( "Empty XPath", kXMPErr_BadXPath );
+	
+	size_t stepNum = 1;	// By default start calling FollowXPathStep for the top level property step.
+	size_t stepLim = expandedXPath.size();
+	
+	// The start of processing deals with the schema node and top level alias. If the top level step
+	// is not an alias, lookup the expanded path's schema URI. Otherwise, lookup the expanded path
+	// for the actual. While tempting, don't substitute the actual's path into the local one, don't
+	// risk messing with the caller's use of that. Also don't call FindNode recursively, we need to
+	// keep track of the root of the implicitly created subtree as we move down the path.
+	
+	if ( ! (expandedXPath[kRootPropStep].options & kXMP_StepIsAlias) ) {
+		
+		currNode = FindSchemaNode ( xmpTree, expandedXPath[kSchemaStep].step.c_str(), createNodes, &currPos );
+		if ( currNode == 0 ) return 0;
+
+		if ( currNode->options & kXMP_NewImplicitNode ) {
+			currNode->options ^= kXMP_NewImplicitNode;	// Clear the implicit node bit.
+			if ( ! leafIsNew ) newSubPos = currPos;	// Save the top most implicit node.
+			leafIsNew = true;	// If any parent is new, the leaf will be new also.
+		}
+
+	} else {
+
+		stepNum = 2;	// ! Continue processing the original path at the second level step.
+
+		XMP_AliasMapPos aliasPos = sRegisteredAliasMap->find ( expandedXPath[kRootPropStep].step );
+		XMP_Assert ( aliasPos != sRegisteredAliasMap->end() );
+		
+		currNode = FindSchemaNode ( xmpTree, aliasPos->second[kSchemaStep].step.c_str(), createNodes, &currPos );
+		if ( currNode == 0 ) goto EXIT;
+		if ( currNode->options & kXMP_NewImplicitNode ) {
+			currNode->options ^= kXMP_NewImplicitNode;	// Clear the implicit node bit.
+			if ( ! leafIsNew ) newSubPos = currPos;	// Save the top most implicit node.
+			leafIsNew = true;	// If any parent is new, the leaf will be new also.
+		}
+
+		currNode = FollowXPathStep ( currNode, aliasPos->second, 1, createNodes, &currPos );
+		if ( currNode == 0 ) goto EXIT;
+		if ( currNode->options & kXMP_NewImplicitNode ) {
+			currNode->options ^= kXMP_NewImplicitNode;	// Clear the implicit node bit.
+			CheckImplicitStruct ( currNode, expandedXPath, 2, stepLim );
+			if ( ! leafIsNew ) newSubPos = currPos;	// Save the top most implicit node.
+			leafIsNew = true;	// If any parent is new, the leaf will be new also.
+		}
+		
+		XMP_OptionBits arrayForm = aliasPos->second[kRootPropStep].options & kXMP_PropArrayFormMask;
+		XMP_Assert ( (arrayForm == 0) || (arrayForm & kXMP_PropValueIsArray) );
+		XMP_Assert ( (arrayForm == 0) ? (aliasPos->second.size() == 2) : (aliasPos->second.size() == 3) );
+		
+		if ( arrayForm != 0 ) { 
+			currNode = FollowXPathStep ( currNode, aliasPos->second, 2, createNodes, &currPos, true );
+			if ( currNode == 0 ) goto EXIT;
+			if ( currNode->options & kXMP_NewImplicitNode ) {
+				currNode->options ^= kXMP_NewImplicitNode;	// Clear the implicit node bit.
+				CheckImplicitStruct ( currNode, expandedXPath, 2, stepLim );
+				if ( ! leafIsNew ) newSubPos = currPos;	// Save the top most implicit node.
+				leafIsNew = true;	// If any parent is new, the leaf will be new also.
+			}
+		}
+		
+	}
+	
+	// Now follow the remaining steps of the original XPath.
+	
+	// *** ??? Change all the num/lim loops back to num<lim? Probably safer.
+	
+	try {
+		for ( ; stepNum < stepLim; ++stepNum ) {
+			currNode = FollowXPathStep ( currNode, expandedXPath, stepNum, createNodes, &currPos );
+			if ( currNode == 0 ) goto EXIT;
+			if ( currNode->options & kXMP_NewImplicitNode ) {
+				currNode->options ^= kXMP_NewImplicitNode;	// Clear the implicit node bit.
+				CheckImplicitStruct ( currNode, expandedXPath, stepNum+1, stepLim );
+				if ( ! leafIsNew ) newSubPos = currPos;	// Save the top most implicit node.
+				leafIsNew = true;	// If any parent is new, the leaf will be new also.
+			}
+		}
+	} catch ( ... ) {
+		if ( leafIsNew ) DeleteSubtree ( newSubPos );
+		throw;
+	}
+	
+	// Done. Delete the implicitly created subtree if the eventual node was not found.
+
+EXIT:
+
+	XMP_Assert ( (currNode == 0) || (currNode == *currPos) );
+	XMP_Assert ( (currNode != 0) || (! createNodes) );
+
+	if ( leafIsNew ) {
+		if ( currNode != 0 ) {
+			currNode->options |= leafOptions;
+		} else {
+			DeleteSubtree ( newSubPos );
+		}
+	}
+
+	if ( (currNode != 0) && (ptrPos != 0) ) *ptrPos = currPos;
+	return currNode;
+	
+}	// FindNode
+
+// =================================================================================================
+// CloneOffspring
+// ==============
+
+void
+CloneOffspring ( const XMP_Node * origParent, XMP_Node * cloneParent, bool skipEmpty /* = false */ )
+{
+	size_t qualCount  = origParent->qualifiers.size();
+	size_t childCount = origParent->children.size();
+
+	if ( qualCount > 0 ) {
+
+		cloneParent->qualifiers.reserve ( qualCount );
+
+		for ( size_t qualNum = 0, qualLim = qualCount; qualNum != qualLim; ++qualNum ) {
+			const XMP_Node * origQual  = origParent->qualifiers[qualNum];
+			if ( skipEmpty && origQual->value.empty() && origQual->children.empty() ) continue;
+			XMP_Node * cloneQual = new XMP_Node ( cloneParent, origQual->name, origQual->value, origQual->options );
+			CloneOffspring ( origQual, cloneQual, skipEmpty );
+			if ( skipEmpty && cloneQual->value.empty() && cloneQual->children.empty() ) {
+				// Check again, might have had an array or struct with all empty children.
+				delete cloneQual;
+				continue;
+			}
+			cloneParent->qualifiers.push_back ( cloneQual );
+		}
+
+	}
+	
+	if ( childCount > 0 ) {
+
+		cloneParent->children.reserve ( childCount );
+
+		for ( size_t childNum = 0, childLim = childCount; childNum != childLim; ++childNum ) {
+			const XMP_Node * origChild  = origParent->children[childNum];
+			if ( skipEmpty && origChild->value.empty() && origChild->children.empty() ) continue;
+			XMP_Node * cloneChild = new XMP_Node ( cloneParent, origChild->name, origChild->value, origChild->options );
+			CloneOffspring ( origChild, cloneChild, skipEmpty );
+			if ( skipEmpty && cloneChild->value.empty() && cloneChild->children.empty() ) {
+				// Check again, might have had an array or struct with all empty children.
+				delete cloneChild;
+				continue;
+			}
+			cloneParent->children.push_back ( cloneChild );
+		}
+
+	}
+	
+}	// CloneOffspring
+
+// =================================================================================================
+// CloneSubtree
+// ============
+
+XMP_Node *
+CloneSubtree ( const XMP_Node * origRoot, XMP_Node * cloneParent, bool skipEmpty /* = false */ )
+{
+	#if XMP_DebugBuild
+		if ( cloneParent->parent == 0 ) {
+			XMP_Assert ( origRoot->options & kXMP_SchemaNode );
+			XMP_Assert ( FindConstSchema ( cloneParent, origRoot->name.c_str() ) == 0 );
+		} else {
+			XMP_Assert ( ! (origRoot->options & kXMP_SchemaNode) );
+			if ( cloneParent->options & kXMP_PropValueIsStruct ) {	// Might be an array.
+				XMP_Assert ( FindConstChild ( cloneParent, origRoot->name.c_str() ) == 0 );
+			}
+		}
+	#endif
+	
+	XMP_Node * cloneRoot = new XMP_Node ( cloneParent, origRoot->name, origRoot->value, origRoot->options );
+	CloneOffspring ( origRoot, cloneRoot, skipEmpty ) ;
+
+	if ( skipEmpty && cloneRoot->value.empty() && cloneRoot->children.empty() ) {
+		// ! Can't do earlier, CloneOffspring might be skipping empty children.
+		delete cloneRoot;
+		return 0;
+	}
+
+	cloneParent->children.push_back ( cloneRoot );
+	return cloneRoot;
+	
+}	// CloneSubtree
+
+// =================================================================================================
+// CompareSubtrees
+// ===============
+//
+// Compare 2 subtrees for semantic equality. The comparison includes value, qualifiers, and form.
+// Schemas, top level properties, struct fields, and qualifiers are allowed to have differing order,
+// the appropriate right node is found from the left node's name. Alt-text arrays are allowed to be
+// in differing language order, other arrays are compared in order.
+
+// *** Might someday consider sorting unordered arrays.
+// *** Should expose this through XMPUtils.
+
+bool
+CompareSubtrees ( const XMP_Node & leftNode, const XMP_Node & rightNode )
+{
+	// Don't compare the names here, we want to allow the outermost roots to have different names.
+	if ( (leftNode.value != rightNode.value) ||
+	     (leftNode.options != rightNode.options) ||
+	     (leftNode.children.size() != rightNode.children.size()) ||
+	     (leftNode.qualifiers.size() != rightNode.qualifiers.size()) ) return false;
+	
+	// Compare the qualifiers, allowing them to be out of order.
+	for ( size_t qualNum = 0, qualLim = leftNode.qualifiers.size(); qualNum != qualLim; ++qualNum ) {
+		const XMP_Node * leftQual  = leftNode.qualifiers[qualNum];
+		const XMP_Node * rightQual = FindConstQualifier ( &rightNode, leftQual->name.c_str() );
+		if ( (rightQual == 0) || (! CompareSubtrees ( *leftQual, *rightQual )) ) return false;
+	}
+	
+	if ( (leftNode.parent == 0) || (leftNode.options & (kXMP_SchemaNode | kXMP_PropValueIsStruct)) ) {
+
+		// The parent node is a tree root, a schema, or a struct.
+		for ( size_t childNum = 0, childLim = leftNode.children.size(); childNum != childLim; ++childNum ) {
+			const XMP_Node * leftChild  = leftNode.children[childNum];
+			const XMP_Node * rightChild = FindConstChild ( &rightNode, leftChild->name.c_str() );
+			if ( (rightChild == 0) || (! CompareSubtrees ( *leftChild, *rightChild )) ) return false;
+		}
+
+	} else if ( leftNode.options & kXMP_PropArrayIsAltText ) {
+
+		// The parent node is an alt-text array.
+		for ( size_t childNum = 0, childLim = leftNode.children.size(); childNum != childLim; ++childNum ) {
+			const XMP_Node * leftChild = leftNode.children[childNum];
+			XMP_Assert ( (! leftChild->qualifiers.empty()) && (leftChild->qualifiers[0]->name == "xml:lang") );
+			XMP_Index rightIndex = LookupLangItem ( &rightNode, leftChild->qualifiers[0]->value );
+			if ( rightIndex == -1 ) return false;
+			const XMP_Node * rightChild = rightNode.children[rightIndex];
+			if ( ! CompareSubtrees ( *leftChild, *rightChild ) ) return false;
+		}
+
+	} else {
+
+		// The parent must be simple or some other (not alt-text) kind of array.
+		XMP_Assert ( (! (leftNode.options & kXMP_PropCompositeMask)) || (leftNode.options & kXMP_PropValueIsArray) );
+		for ( size_t childNum = 0, childLim = leftNode.children.size(); childNum != childLim; ++childNum ) {
+			const XMP_Node * leftChild  = leftNode.children[childNum];
+			const XMP_Node * rightChild = rightNode.children[childNum];
+			if ( ! CompareSubtrees ( *leftChild, *rightChild ) ) return false;
+		}
+
+	}
+	
+	return true;
+	
+}	// CompareSubtrees
+
+// =================================================================================================
+// DeleteEmptySchema
+// =================
+
+void
+DeleteEmptySchema ( XMP_Node * schemaNode )
+{
+
+	if ( XMP_NodeIsSchema ( schemaNode->options ) && schemaNode->children.empty() ) {
+
+		XMP_Node * xmpTree = schemaNode->parent;
+
+		size_t schemaNum = 0;
+		size_t schemaLim = xmpTree->children.size();
+		while ( (schemaNum < schemaLim) && (xmpTree->children[schemaNum] != schemaNode) ) ++schemaNum;
+		XMP_Assert ( schemaNum < schemaLim );
+
+		XMP_NodePtrPos schemaPos = xmpTree->children.begin() + schemaNum;
+		XMP_Assert ( *schemaPos == schemaNode );
+
+		xmpTree->children.erase ( schemaPos );
+		delete schemaNode;
+
+	}
+
+}	// DeleteEmptySchema
+
+// =================================================================================================
+// NormalizeLangValue
+// ==================
+//
+// Normalize an xml:lang value so that comparisons are effectively case insensitive as required by
+// RFC 3066 (which superceeds RFC 1766). The normalization rules:
+//
+//	- The primary subtag is lower case, the suggested practice of ISO 639.
+//	- All 2 letter secondary subtags are upper case, the suggested practice of ISO 3166.
+//	- All other subtags are lower case.
+
+void
+NormalizeLangValue ( XMP_VarString * value )
+{
+	char * tagStart;
+	char * tagEnd;
+
+	// Find and process the primary subtag.
+	
+	tagStart = (char*) value->c_str();
+	for ( tagEnd = tagStart; (*tagEnd != 0) && (*tagEnd != '-'); ++tagEnd ) {
+		if ( ('A' <= *tagEnd) && (*tagEnd <= 'Z') ) *tagEnd += 0x20;
+	}
+	
+	// Find and process the secondary subtag.
+	
+	tagStart = tagEnd;
+	if ( *tagStart == '-' ) ++tagStart;
+	for ( tagEnd = tagStart; (*tagEnd != 0) && (*tagEnd != '-'); ++tagEnd ) {
+		if ( ('A' <= *tagEnd) && (*tagEnd <= 'Z') ) *tagEnd += 0x20;
+	}
+	if ( tagEnd == tagStart+2 ) {
+		if ( ('a' <= *tagStart) && (*tagStart <= 'z') ) *tagStart -= 0x20;
+		++tagStart;
+		if ( ('a' <= *tagStart) && (*tagStart <= 'z') ) *tagStart -= 0x20;
+	}
+	
+	// Find and process the remaining subtags.
+	
+	while ( true ) {
+		tagStart = tagEnd;
+		if ( *tagStart == '-' ) ++tagStart;
+		if ( *tagStart == 0 ) break;
+		for ( tagEnd = tagStart; (*tagEnd != 0) && (*tagEnd != '-'); ++tagEnd ) {
+			if ( ('A' <= *tagEnd) && (*tagEnd <= 'Z') ) *tagEnd += 0x20;
+		}
+	}
+	
+}	// NormalizeLangValue
+
+// =================================================================================================
+// NormalizeLangArray
+// ==================
+//
+// Make sure the x-default item is first. Touch up "single value" arrays that have a default plus
+// one real language. This case should have the same value for both items. Older Adobe apps were
+// hardwired to only use the 'x-default' item, so we copy that value to the other item.
+
+void
+NormalizeLangArray ( XMP_Node * array )
+{
+	XMP_Assert ( XMP_ArrayIsAltText(array->options) );
+	
+	size_t itemNum;
+	size_t itemLim = array->children.size();
+	bool   hasDefault = false;
+	
+	for ( itemNum = 0; itemNum < itemLim; ++itemNum ) {
+	
+		if ( array->children[itemNum]->qualifiers.empty() ||
+			 (array->children[itemNum]->qualifiers[0]->name != "xml:lang") ) {
+			XMP_Throw ( "AltText array items must have an xml:lang qualifier", kXMPErr_BadXMP );
+		}
+
+		if ( array->children[itemNum]->qualifiers[0]->value == "x-default" ) {
+			hasDefault = true;
+			break;
+		}
+
+	}
+
+	if ( hasDefault ) {
+
+		if ( itemNum != 0 ) {
+			XMP_Node * temp = array->children[0];
+			array->children[0] = array->children[itemNum];
+			array->children[itemNum] = temp;
+		}
+
+		if ( itemLim == 2 ) array->children[1]->value = array->children[0]->value;
+
+	}
+	
+}	// NormalizeLangArray
+
+// =================================================================================================
+// DetectAltText
+// =============
+//
+// See if an array is an alt-text array. If so, make sure the x-default item is first.
+
+void
+DetectAltText ( XMP_Node * xmpParent )
+{
+	XMP_Assert ( XMP_ArrayIsAlternate(xmpParent->options) );
+
+	size_t itemNum, itemLim;
+	
+	for ( itemNum = 0, itemLim = xmpParent->children.size(); itemNum < itemLim; ++itemNum ) {
+		XMP_OptionBits currOptions = xmpParent->children[itemNum]->options;
+		if ( (currOptions & kXMP_PropCompositeMask) || (! (currOptions & kXMP_PropHasLang)) ) break;
+	}
+	
+	if ( (itemLim != 0) && (itemNum == itemLim) ) {
+		xmpParent->options |= kXMP_PropArrayIsAltText;
+		NormalizeLangArray ( xmpParent );
+	}
+
+}	// DetectAltText
+
+// =================================================================================================
+// SortNamedNodes
+// ==============
+//
+// Sort the pointers in an XMP_NodeOffspring vector by name.
+
+static inline bool Compare ( const XMP_Node * left, const XMP_Node * right )
+{
+	return (left->name < right->name);
+}
+
+void
+SortNamedNodes ( XMP_NodeOffspring & nodeVector )
+{
+	sort ( nodeVector.begin(), nodeVector.end(), Compare );
+}	// SortNamedNodes
+
+// =================================================================================================
diff --git a/XMPCore/source/XMPCore_Impl.hpp b/XMPCore/source/XMPCore_Impl.hpp
new file mode 100644
index 0000000..c9fdec6
--- /dev/null
+++ b/XMPCore/source/XMPCore_Impl.hpp
@@ -0,0 +1,392 @@
+#ifndef __XMPCore_Impl_hpp__
+#define __XMPCore_Impl_hpp__ 1
+
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! Must be the first #include!
+#include "public/include/XMP_Const.h"
+#include "build/XMP_BuildInfo.h"
+#include "source/XMP_LibUtils.hpp"
+
+// #include "XMPCore/source/XMPMeta.hpp"
+
+#include "public/include/client-glue/WXMP_Common.hpp"
+
+#include <vector>
+#include <string>
+#include <map>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4244 )	// possible loss of data (temporary for 64 bit builds)
+	#pragma warning ( disable : 4267 )	// possible loss of data (temporary for 64 bit builds)
+#endif
+
+// =================================================================================================
+// Primary internal types
+
+class XMP_Node;
+class XML_Node;
+class XPathStepInfo;
+
+typedef XMP_Node *	XMP_NodePtr;
+
+typedef std::vector<XMP_Node*>		XMP_NodeOffspring;
+typedef XMP_NodeOffspring::iterator	XMP_NodePtrPos;
+
+typedef XMP_VarString::iterator			XMP_VarStringPos;
+typedef XMP_VarString::const_iterator	XMP_cVarStringPos;
+
+typedef std::vector < XPathStepInfo >		XMP_ExpandedXPath;
+typedef XMP_ExpandedXPath::iterator			XMP_ExpandedXPathPos;
+typedef XMP_ExpandedXPath::const_iterator	XMP_cExpandedXPathPos;
+
+typedef std::map < XMP_VarString, XMP_ExpandedXPath > XMP_AliasMap;	// Alias name to actual path.
+typedef XMP_AliasMap::iterator			XMP_AliasMapPos;
+typedef XMP_AliasMap::const_iterator	XMP_cAliasMapPos;
+
+// =================================================================================================
+// General global variables and macros
+
+extern XMP_Int32 sXMP_InitCount;
+
+extern XMP_NamespaceTable * sRegisteredNamespaces;
+
+extern XMP_AliasMap * sRegisteredAliasMap;
+
+#define WtoXMPMeta_Ref(xmpRef)	(const XMPMeta &) (*((XMPMeta*)(xmpRef)))
+#define WtoXMPMeta_Ptr(xmpRef)	((XMPMeta*)(xmpRef))
+
+#define WtoXMPDocOps_Ptr(docRef)	((XMPDocOps*)(docRef))
+
+extern void *			voidVoidPtr;	// Used to backfill null output parameters.
+extern XMP_StringPtr	voidStringPtr;
+extern XMP_StringLen	voidStringLen;
+extern XMP_OptionBits	voidOptionBits;
+extern XMP_Bool			voidByte;
+extern bool				voidBool;
+extern XMP_Int32		voidInt32;
+extern XMP_Int64		voidInt64;
+extern double			voidDouble;
+extern XMP_DateTime		voidDateTime;
+extern WXMP_Result		void_wResult;
+
+#define kHexDigits "0123456789ABCDEF"
+
+#define XMP_LitMatch(s,l)		(strcmp((s),(l)) == 0)
+#define XMP_LitNMatch(s,l,n)	(strncmp((s),(l),(n)) == 0)
+	// *** Use the above macros!
+
+#if XMP_WinBuild
+	#define snprintf _snprintf
+#endif
+
+// =================================================================================================
+// Version info
+
+#if XMP_DebugBuild
+	#define kXMPCore_DebugFlag 1
+#else
+	#define kXMPCore_DebugFlag 0
+#endif
+
+#define kXMPCore_VersionNumber	( (kXMPCore_DebugFlag << 31)    |	\
+                                  (XMP_API_VERSION_MAJOR << 24) |	\
+						          (XMP_API_VERSION_MINOR << 16) |	\
+						          (XMP_API_VERSION_MICRO << 8) )
+
+	#define kXMPCoreName "Exempi + XMP Core"
+	#define kXMPCore_VersionMessage	kXMPCoreName " " XMPCORE_API_VERSION_STRING
+// =================================================================================================
+// Support for call tracing
+
+#ifndef XMP_TraceCoreCalls
+	#define XMP_TraceCoreCalls			0
+	#define XMP_TraceCoreCallsToFile	0
+#endif
+
+#if XMP_TraceCoreCalls
+
+	#undef AnnounceThrow
+	#undef AnnounceCatch
+
+	#undef AnnounceEntry
+	#undef AnnounceNoLock
+	#undef AnnounceExit
+
+	extern FILE * xmpCoreLog;
+
+	#define AnnounceThrow(msg)	\
+		fprintf ( xmpCoreLog, "XMP_Throw: %s\n", msg ); fflush ( xmpCoreLog )
+	#define AnnounceCatch(msg)	\
+		fprintf ( xmpCoreLog, "Catch in %s: %s\n", procName, msg ); fflush ( xmpCoreLog )
+
+	#define AnnounceEntry(proc)			\
+		const char * procName = proc;	\
+		fprintf ( xmpCoreLog, "Entering %s\n", procName ); fflush ( xmpCoreLog )
+	#define AnnounceNoLock(proc)		\
+		const char * procName = proc;	\
+		fprintf ( xmpCoreLog, "Entering %s (no lock)\n", procName ); fflush ( xmpCoreLog )
+	#define AnnounceExit()	\
+		fprintf ( xmpCoreLog, "Exiting %s\n", procName ); fflush ( xmpCoreLog )
+
+#endif
+
+// =================================================================================================
+// ExpandXPath, FindNode, and related support
+
+// *** Normalize the use of "const xx &" for input params
+
+#define kXMP_ArrayItemName	"[]"
+
+#define kXMP_CreateNodes	true
+#define kXMP_ExistingOnly	false
+
+#define FindConstSchema(t,u)	FindSchemaNode ( const_cast<XMP_Node*>(t), u, kXMP_ExistingOnly, 0 )
+#define FindConstChild(p,c)		FindChildNode ( const_cast<XMP_Node*>(p), c, kXMP_ExistingOnly, 0 )
+#define FindConstQualifier(p,c)	FindQualifierNode ( const_cast<XMP_Node*>(p), c, kXMP_ExistingOnly, 0 )
+#define FindConstNode(t,p)		FindNode ( const_cast<XMP_Node*>(t), p, kXMP_ExistingOnly, 0 )
+
+extern XMP_OptionBits
+VerifySetOptions ( XMP_OptionBits options, XMP_StringPtr propValue );
+
+extern void
+ComposeXPath ( const XMP_ExpandedXPath & expandedXPath,
+			   XMP_VarString * stringXPath );
+
+extern void
+ExpandXPath	( XMP_StringPtr			schemaNS,
+			  XMP_StringPtr			propPath,
+			  XMP_ExpandedXPath *	expandedXPath );
+
+extern XMP_Node *
+FindSchemaNode ( XMP_Node *		  xmpTree,
+				 XMP_StringPtr	  nsURI,
+				 bool			  createNodes,
+				 XMP_NodePtrPos * ptrPos = 0 );
+
+extern XMP_Node *
+FindChildNode ( XMP_Node *		 parent,
+				XMP_StringPtr	 childName,
+				bool			 createNodes,
+				XMP_NodePtrPos * ptrPos = 0 );
+
+extern XMP_Node *
+FindQualifierNode ( XMP_Node *		 parent,
+					XMP_StringPtr	 qualName,
+					bool			 createNodes,
+					XMP_NodePtrPos * ptrPos = 0 );
+
+extern XMP_Node *
+FindNode ( XMP_Node *		xmpTree,
+		   const XMP_ExpandedXPath & expandedXPath,
+		   bool				createNodes,
+		   XMP_OptionBits	leafOptions = 0,
+		   XMP_NodePtrPos * ptrPos = 0 );
+
+extern XMP_Index
+LookupLangItem ( const XMP_Node * arrayNode, XMP_VarString & lang );	// ! Lang must be normalized!
+
+extern XMP_Index
+LookupFieldSelector ( const XMP_Node * arrayNode, XMP_StringPtr fieldName, XMP_StringPtr fieldValue );
+
+extern void
+CloneOffspring ( const XMP_Node * origParent, XMP_Node * cloneParent, bool skipEmpty = false );
+
+extern XMP_Node *
+CloneSubtree ( const XMP_Node * origRoot, XMP_Node * cloneParent, bool skipEmpty = false );
+
+extern bool
+CompareSubtrees ( const XMP_Node & leftNode, const XMP_Node & rightNode );
+
+extern void
+DeleteSubtree ( XMP_NodePtrPos rootNodePos );
+
+extern void
+DeleteEmptySchema ( XMP_Node * schemaNode );
+
+extern void
+NormalizeLangValue ( XMP_VarString * value );
+
+extern void
+NormalizeLangArray ( XMP_Node * array );
+
+extern void
+DetectAltText ( XMP_Node * xmpParent );
+
+extern void
+SortNamedNodes ( XMP_NodeOffspring & nodeVector );
+
+static inline bool
+IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix )
+{
+	bool isPrefix = false;
+	XMP_StringLen prefixLen = strlen(prefix);
+	if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) {
+		char separator = fullPath[prefixLen];
+		if ( (separator == 0) || (separator == '/') ||
+			 (separator == '[') || (separator == '*') ) isPrefix = true;
+	}
+	return isPrefix;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+class XPathStepInfo {
+public:
+	XMP_VarString	step;
+	XMP_OptionBits	options;
+	XPathStepInfo ( XMP_StringPtr _step, XMP_OptionBits _options ) : step(_step), options(_options) {};
+	XPathStepInfo ( XMP_VarString _step, XMP_OptionBits _options ) : step(_step), options(_options) {};
+private:
+	XPathStepInfo() : options(0) {};	// ! Hide the default constructor.
+};
+
+enum { kSchemaStep = 0, kRootPropStep = 1, kAliasIndexStep = 2 };
+
+enum {	// Bits for XPathStepInfo options.	// *** Add mask check to init code.
+	kXMP_StepKindMask		= 0x0F,	// ! The step kinds are mutually exclusive numbers.
+	kXMP_StructFieldStep	= 0x01,	// Also for top level nodes (schema "fields").
+	kXMP_QualifierStep		= 0x02,	// ! Order is significant to separate struct/qual from array kinds!
+	kXMP_ArrayIndexStep		= 0x03,	// ! The kinds must not overlay array form bits!
+	kXMP_ArrayLastStep		= 0x04,
+	kXMP_QualSelectorStep	= 0x05,
+	kXMP_FieldSelectorStep	= 0x06,
+	kXMP_StepIsAlias        = 0x10
+};
+
+#define GetStepKind(f)	((f) & kXMP_StepKindMask)
+
+#define kXMP_NewImplicitNode	kXMP_InsertAfterItem
+
+// =================================================================================================
+// XMP_Node details
+
+#if 0	// Pattern for iterating over the children or qualifiers:
+	for ( size_t xxNum = 0, xxLim = _node_->_offspring_.size(); xxNum < xxLim; ++xxNum ) {
+		const XMP_Node * _curr_ = _node_->_offspring_[xxNum];
+	}
+#endif
+
+class XMP_Node {
+public:
+
+	XMP_OptionBits		options;
+	XMP_VarString		name, value;
+	XMP_Node *			parent;
+	XMP_NodeOffspring	children;
+	XMP_NodeOffspring	qualifiers;
+	#if XMP_DebugBuild
+		// *** XMP_StringPtr	_namePtr, _valuePtr;	// *** Not working, need operator=?
+	#endif
+
+	XMP_Node ( XMP_Node * _parent, XMP_StringPtr _name, XMP_OptionBits _options )
+		: options(_options), name(_name), parent(_parent)
+	{
+		#if XMP_DebugBuild
+			XMP_Assert ( (name.find ( ':' ) != XMP_VarString::npos) || (name == kXMP_ArrayItemName) ||
+			             (options & kXMP_SchemaNode) || (parent == 0) );
+			// *** _namePtr  = name.c_str();
+			// *** _valuePtr = value.c_str();
+		#endif
+	};
+
+	XMP_Node ( XMP_Node * _parent, const XMP_VarString & _name, XMP_OptionBits _options )
+		: options(_options), name(_name), parent(_parent)
+	{
+		#if XMP_DebugBuild
+			XMP_Assert ( (name.find ( ':' ) != XMP_VarString::npos) || (name == kXMP_ArrayItemName) ||
+			             (options & kXMP_SchemaNode) || (parent == 0) );
+			// *** _namePtr  = name.c_str();
+			// *** _valuePtr = value.c_str();
+		#endif
+	};
+
+	XMP_Node ( XMP_Node * _parent, XMP_StringPtr _name, XMP_StringPtr _value, XMP_OptionBits _options )
+		: options(_options), name(_name), value(_value), parent(_parent)
+	{
+		#if XMP_DebugBuild
+			XMP_Assert ( (name.find ( ':' ) != XMP_VarString::npos) || (name == kXMP_ArrayItemName) ||
+			             (options & kXMP_SchemaNode) || (parent == 0) );
+			// *** _namePtr  = name.c_str();
+			// *** _valuePtr = value.c_str();
+		#endif
+	};
+
+	XMP_Node ( XMP_Node * _parent, const XMP_VarString & _name, const XMP_VarString & _value, XMP_OptionBits _options )
+		: options(_options), name(_name), value(_value), parent(_parent)
+	{
+		#if XMP_DebugBuild
+			XMP_Assert ( (name.find ( ':' ) != XMP_VarString::npos) || (name == kXMP_ArrayItemName) ||
+			             (options & kXMP_SchemaNode) || (parent == 0) );
+			// *** _namePtr  = name.c_str();
+			// *** _valuePtr = value.c_str();
+		#endif
+	};
+
+	void GetLocalURI ( XMP_StringPtr * uriStr, XMP_StringLen * uriSize ) const;
+
+	void RemoveChildren()
+	{
+		for ( size_t i = 0, vLim = children.size(); i < vLim; ++i ) {
+			if ( children[i] != 0 ) delete children[i];
+		}
+		children.clear();
+	}
+
+	void RemoveQualifiers()
+	{
+		for ( size_t i = 0, vLim = qualifiers.size(); i < vLim; ++i ) {
+			if ( qualifiers[i] != 0 ) delete qualifiers[i];
+		}
+		qualifiers.clear();
+	}
+
+	void ClearNode()
+	{
+		options = 0;
+		name.erase();
+		value.erase();
+		this->RemoveChildren();
+		this->RemoveQualifiers();
+	}
+
+	virtual ~XMP_Node() { RemoveChildren(); RemoveQualifiers(); };
+
+private:
+	XMP_Node() : options(0), parent(0)	// ! Make sure parent pointer is always set.
+	{
+		#if XMP_DebugBuild
+			// *** _namePtr  = name.c_str();
+			// *** _valuePtr = value.c_str();
+		#endif
+	};
+
+};
+
+class XMP_AutoNode {	// Used to hold a child during subtree construction.
+public:
+	XMP_Node * nodePtr;
+	XMP_AutoNode() : nodePtr(0) {};
+	~XMP_AutoNode() { if ( nodePtr != 0 ) delete ( nodePtr ); nodePtr = 0; };
+	XMP_AutoNode ( XMP_Node * _parent, XMP_StringPtr _name, XMP_OptionBits _options )
+		: nodePtr ( new XMP_Node ( _parent, _name, _options ) ) {};
+	XMP_AutoNode ( XMP_Node * _parent, const XMP_VarString & _name, XMP_OptionBits _options )
+		: nodePtr ( new XMP_Node ( _parent, _name, _options ) ) {};
+	XMP_AutoNode ( XMP_Node * _parent, XMP_StringPtr _name, XMP_StringPtr _value, XMP_OptionBits _options )
+		: nodePtr ( new XMP_Node ( _parent, _name, _value, _options ) ) {};
+	XMP_AutoNode ( XMP_Node * _parent, const XMP_VarString & _name, const XMP_VarString & _value, XMP_OptionBits _options )
+		: nodePtr ( new XMP_Node ( _parent, _name, _value, _options ) ) {};
+};
+
+// =================================================================================================
+
+#endif	// __XMPCore_Impl_hpp__
diff --git a/XMPCore/source/XMPIterator.cpp b/XMPCore/source/XMPIterator.cpp
new file mode 100644
index 0000000..b857365
--- /dev/null
+++ b/XMPCore/source/XMPIterator.cpp
@@ -0,0 +1,636 @@
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "XMPCore/source/XMPIterator.hpp"
+
+#include <string>
+#include <stdio.h>	// For snprintf.
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4702 )	// unreachable code
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+// =================================================================================================
+// Support Routines
+// =================================================================================================
+
+
+#ifndef TraceIterators
+	#define TraceIterators 0
+#endif
+
+#if TraceIterators
+	static const char * sStageNames[] = { "before", "self", "qualifiers", "children" };
+#endif
+
+static XMP_Node * sDummySchema = 0;	// ! Used for some ugliness with aliases.
+
+// -------------------------------------------------------------------------------------------------
+// AddSchemaProps
+// --------------
+//
+// Add the top level properties to the IterNode for a schema.
+
+static void
+AddSchemaProps ( IterInfo & info, IterNode & iterSchema, const XMP_Node * xmpSchema )
+{
+	#if TraceIterators
+		printf ( "    Adding properties of %s\n", xmpSchema->name.c_str() );
+	#endif
+
+	for ( size_t propNum = 0, propLim = xmpSchema->children.size(); propNum != propLim; ++propNum ) {
+		const XMP_Node * xmpProp = xmpSchema->children[propNum];
+		// *** set the has-aliases bit when appropriate
+		iterSchema.children.push_back ( IterNode ( xmpProp->options, xmpProp->name, 0 ) );
+		#if TraceIterators
+			printf ( "        %s\n", xmpProp->name.c_str() );
+		#endif
+	}
+
+}	// AddSchemaProps
+
+// -------------------------------------------------------------------------------------------------
+// AddNodeOffspring
+// ----------------
+//
+// Add the immediate children and qualifiers to an IterNode.
+
+static void
+AddNodeOffspring ( IterInfo & info, IterNode & iterParent, const XMP_Node * xmpParent )
+{
+	XMP_VarString currPath ( iterParent.fullPath );
+	size_t        leafOffset = iterParent.fullPath.size();
+	
+	if ( (! xmpParent->qualifiers.empty()) && (! (info.options & kXMP_IterOmitQualifiers)) ) {
+
+		#if TraceIterators
+			printf ( "    Adding qualifiers of %s\n", currPath.c_str() );
+		#endif
+
+		currPath += "/?";	// All qualifiers are named and use paths like "Prop/?Qual".
+		leafOffset += 2;
+		
+		for ( size_t qualNum = 0, qualLim = xmpParent->qualifiers.size(); qualNum != qualLim; ++qualNum ) {
+			const XMP_Node * xmpQual = xmpParent->qualifiers[qualNum];
+			currPath += xmpQual->name;
+			iterParent.qualifiers.push_back ( IterNode ( xmpQual->options, currPath, leafOffset ) );
+			currPath.erase ( leafOffset );
+			#if TraceIterators
+				printf ( "        %s\n", xmpQual->name.c_str() );
+			#endif
+		}
+		
+		leafOffset -= 2;
+		currPath.erase ( leafOffset );
+
+	}
+
+	if ( ! xmpParent->children.empty() ) {
+	
+		#if TraceIterators
+			printf ( "    Adding children of %s\n", currPath.c_str() );
+		#endif
+
+		XMP_Assert ( xmpParent->options & kXMP_PropCompositeMask );
+		
+		if ( xmpParent->options & kXMP_PropValueIsStruct ) {
+			currPath += '/';
+			leafOffset += 1;
+		}
+		
+		for ( size_t childNum = 0, childLim = xmpParent->children.size(); childNum != childLim; ++childNum ) {
+			const XMP_Node * xmpChild = xmpParent->children[childNum];
+			if ( ! (xmpParent->options & kXMP_PropValueIsArray) ) {
+				currPath += xmpChild->name;
+			} else {
+				char buffer [32];	// AUDIT: Using sizeof(buffer) below for snprintf length is safe.
+				snprintf ( buffer, sizeof(buffer), "[%lu]", childNum+1 );	// ! XPath indices are one-based.
+				currPath += buffer;
+			}
+			iterParent.children.push_back ( IterNode ( xmpChild->options, currPath, leafOffset ) );
+			currPath.erase ( leafOffset );
+			#if TraceIterators
+				printf ( "        %s\n", (iterParent.children.back().fullPath.c_str() + leafOffset) );
+			#endif
+		}
+	
+	}
+
+}	// AddNodeOffspring
+
+// -------------------------------------------------------------------------------------------------
+// SetCurrSchema
+// -------------
+
+static inline void
+SetCurrSchema ( IterInfo & info, XMP_StringPtr schemaName )
+{
+
+	info.currSchema = schemaName;
+	#if 0	// *** XMP_DebugBuild
+		info._schemaPtr = info.currSchema.c_str();
+	#endif
+
+}	// SetCurrSchema
+
+static inline void
+SetCurrSchema ( IterInfo & info, XMP_VarString & schemaName )
+{
+
+	info.currSchema = schemaName;
+	#if 0	// *** XMP_DebugBuild
+		info._schemaPtr = info.currSchema.c_str();
+	#endif
+
+}	// SetCurrSchema
+
+// -------------------------------------------------------------------------------------------------
+// AdvanceIterPos
+// --------------
+//
+// Adjust currPos and possibly endPos for the next step in a pre-order depth-first traversal. The
+// current node has just been visited, move on to its qualifiers, children, then siblings, or back
+// up to an ancestor. AdvanceIterPos either moves to a property or qualifier node that can be
+// visited, or to the end of the entire iteration.
+
+static void
+AdvanceIterPos ( IterInfo & info )
+{
+	// -------------------------------------------------------------------------------------------
+	// Keep looking until we find a node to visit or the end of everything. The first time through
+	// the current node will exist, we just visited it. But we have to keep looking if the current
+	// node was the last of its siblings or is an empty schema.
+	
+	// ! It is possible that info.currPos == info.endPos on entry. Don't dereference info.currPos yet!
+
+	while ( true ) {
+	
+		if ( info.currPos == info.endPos ) {
+		
+			// ------------------------------------------------------------------------------------
+			// At the end of a set of siblings, move up to an ancestor. We've either just finished
+			// the qualifiers and will move to the children, or have just finished the children and
+			// will move on to the next sibling.
+			
+			if ( info.ancestors.empty() ) break;	// We're at the end of the schema list.
+
+			IterPosPair & parent = info.ancestors.back();
+			info.currPos = parent.first;
+			info.endPos  = parent.second;
+			info.ancestors.pop_back();
+			
+			#if TraceIterators
+				printf ( "    Moved up to %s, stage = %s\n",
+				         info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage] );
+			#endif
+		
+		} else {
+			
+			// -------------------------------------------------------------------------------------------
+			// Decide what to do with this iteration node based on its state. Don't use a switch statment,
+			// some of the cases want to break from the loop. A break in a switch just exits the case.
+			
+			#if TraceIterators
+				printf ( "    Moving from %s, stage = %s\n",
+				         info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage] );
+			#endif
+			
+			if ( info.currPos->visitStage == kIter_BeforeVisit ) {		// Visit this node now.
+				if ( info.currPos->options & kXMP_SchemaNode ) SetCurrSchema ( info, info.currPos->fullPath );
+				break;
+			}
+
+			if ( info.currPos->visitStage == kIter_VisitSelf ) {		// Just finished visiting the value portion.
+				info.currPos->visitStage = kIter_VisitQualifiers;		// Start visiting the qualifiers.
+				if ( ! info.currPos->qualifiers.empty() ) {
+					info.ancestors.push_back ( IterPosPair ( info.currPos, info.endPos ) );
+					info.endPos  = info.currPos->qualifiers.end();		// ! Set the parent's endPos before changing currPos!
+					info.currPos = info.currPos->qualifiers.begin();
+					break;
+				}
+			}
+
+			if ( info.currPos->visitStage == kIter_VisitQualifiers ) {	// Just finished visiting the qualifiers.
+				info.currPos->qualifiers.clear();
+				info.currPos->visitStage = kIter_VisitChildren;			// Start visiting the children.
+				if ( ! info.currPos->children.empty() ) {
+					info.ancestors.push_back ( IterPosPair ( info.currPos, info.endPos ) );
+					info.endPos  = info.currPos->children.end();		// ! Set the parent's endPos before changing currPos!
+					info.currPos = info.currPos->children.begin();
+					break;
+				}
+			}
+
+			if ( info.currPos->visitStage == kIter_VisitChildren ) {	// Just finished visiting the children.
+				info.currPos->children.clear();
+				++info.currPos;											// Move to the next sibling.
+				continue;
+			}
+			
+			#if TraceIterators
+				if ( info.currPos != info.endPos ) {
+					printf ( "    Moved to %s, stage = %s\n",
+					         info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage] );
+				}
+			#endif
+			
+		}
+
+	}	// Loop to find the next node.
+	
+	XMP_Assert ( (info.currPos == info.endPos) || (info.currPos->visitStage == kIter_BeforeVisit) );
+
+}	// AdvanceIterPos
+
+// -------------------------------------------------------------------------------------------------
+// GetNextXMPNode
+// --------------
+//
+// Used by XMPIterator::Next to obtain the next XMP node, ignoring the kXMP_IterJustLeafNodes flag.
+// This isolates some messy code, allowing a clean loop in Next if kXMP_IterJustLeafNodes is set.
+
+static const XMP_Node *
+GetNextXMPNode ( IterInfo & info )
+{
+	const XMP_Node * xmpNode = 0;
+
+	// ----------------------------------------------------------------------------------------------
+	// On entry currPos points to an iteration node whose state is either before-visit or visit-self.
+	// If it is before-visit then we will return that node's value part now. If it is visit-self it
+	// means the previous iteration returned the value portion of that node, so we can advance to the
+	// next node in the iteration tree. Then we find the corresponding XMP node, allowing for the XMP
+	// tree to have been modified since that part of the iteration tree was constructed.
+	
+	// ! NOTE: Supporting aliases throws in some nastiness with schemas. There might not be any XMP
+	// ! node for the schema, but we still have to visit it because of possible aliases. The static
+	// ! sDummySchema is returned if there is no real schema node.
+
+	if ( info.currPos->visitStage != kIter_BeforeVisit ) AdvanceIterPos ( info );
+	
+	bool isSchemaNode = false;
+	XMP_ExpandedXPath expPath;	// Keep outside the loop to avoid constant construct/destruct.
+	
+	while ( info.currPos != info.endPos ) {
+
+		isSchemaNode = XMP_NodeIsSchema ( info.currPos->options );
+		if ( isSchemaNode ) {
+			SetCurrSchema ( info, info.currPos->fullPath );
+			xmpNode = FindConstSchema ( &info.xmpObj->tree, info.currPos->fullPath.c_str() );
+			if ( xmpNode == 0 ) xmpNode = sDummySchema;
+		} else {
+			ExpandXPath ( info.currSchema.c_str(), info.currPos->fullPath.c_str(), &expPath );
+			xmpNode = FindConstNode ( &info.xmpObj->tree, expPath );
+		}
+		if ( xmpNode != 0 ) break;	// Exit the loop, we found a live XMP node.
+
+		info.currPos->visitStage = kIter_VisitChildren;	// Make AdvanceIterPos move to the next sibling.
+		info.currPos->children.clear();
+		info.currPos->qualifiers.clear();
+		AdvanceIterPos ( info );
+
+	}
+
+	if ( info.currPos == info.endPos ) return 0;
+	
+	// -------------------------------------------------------------------------------------------
+	// Now we've got the iteration node and corresponding XMP node. Add the iteration children for
+	// structs and arrays. The children of schema were added when the iterator was constructed.
+
+	XMP_Assert ( info.currPos->visitStage == kIter_BeforeVisit );
+
+	if ( info.currPos->visitStage == kIter_BeforeVisit ) {
+		if ( (! isSchemaNode) && (! (info.options & kXMP_IterJustChildren)) ) {
+			AddNodeOffspring ( info, *info.currPos, xmpNode );
+		}
+		info.currPos->visitStage = kIter_VisitSelf;
+	}
+	
+	return xmpNode;
+
+}	// GetNextXMPNode
+
+// =================================================================================================
+// Init/Term
+// =================================================================================================
+
+// -------------------------------------------------------------------------------------------------
+// Initialize
+// ----------
+
+/* class static */ bool
+XMPIterator::Initialize()
+{
+	sDummySchema = new XMP_Node ( 0, "dummy:schema/", kXMP_SchemaNode);
+	return true;
+	
+}	// Initialize
+
+// -------------------------------------------------------------------------------------------------
+// Terminate
+// ----------
+
+/* class static */ void
+XMPIterator::Terminate() RELEASE_NO_THROW
+{
+	delete ( sDummySchema );
+	sDummySchema = 0;
+	return;
+	
+}	// Terminate
+
+// =================================================================================================
+// Constructors
+// =================================================================================================
+
+// -------------------------------------------------------------------------------------------------
+// XMPIterator
+// -----------
+//
+// Constructor for iterations over the nodes in an XMPMeta object. This builds a tree of iteration
+// nodes that caches the existing node names of the XMPMeta object. The iteration tree is a partial
+// replica of the XMPMeta tree. The initial iteration tree normally has just the root node, all of
+// the schema nodes for a full object iteration. Lower level nodes (children and qualifiers) are 
+// added when the parent is visited. If the kXMP_IterJustChildren option is passed then the initial
+// iterator includes the children and the parent is marked as done. The iteration tree nodes are
+// pruned when they are no longer needed. 
+
+XMPIterator::XMPIterator ( const XMPMeta & xmpObj,
+						   XMP_StringPtr   schemaNS,
+						   XMP_StringPtr   propName,
+						   XMP_OptionBits  options ) : clientRefs(0), info(IterInfo(options,&xmpObj))
+{
+	if ( (options & kXMP_IterClassMask) != kXMP_IterProperties ) {
+		XMP_Throw ( "Unsupported iteration kind", kXMPErr_BadOptions );
+	}
+	
+	// *** Lock the XMPMeta object if we ever stop using a full DLL lock.
+
+	if ( *propName != 0 ) {
+
+		// An iterator rooted at a specific node.
+
+		#if TraceIterators
+			printf ( "\nNew XMP property iterator for \"%s\", options = %X\n    Schema = %s, root = %s\n",
+			         xmpObj.tree.name.c_str(), options, schemaNS, propName );
+		#endif
+		
+		XMP_ExpandedXPath propPath;
+		ExpandXPath ( schemaNS, propName, &propPath );
+		XMP_Node * propNode = FindConstNode ( &xmpObj.tree, propPath );	// If not found get empty iteration.
+		
+		if ( propNode != 0 ) {
+
+			XMP_VarString rootName ( propPath[1].step );	// The schema is [0].
+			for ( size_t i = 2; i < propPath.size(); ++i ) {
+				XMP_OptionBits stepKind = GetStepKind ( propPath[i].options );
+				if ( stepKind <= kXMP_QualifierStep ) rootName += '/';
+				rootName += propPath[i].step;
+			}
+
+			propName = rootName.c_str();
+			size_t leafOffset = rootName.size();
+			while ( (leafOffset > 0) && (propName[leafOffset] != '/') && (propName[leafOffset] != '[') ) --leafOffset;
+			if ( propName[leafOffset] == '/' ) ++leafOffset;
+
+			info.tree.children.push_back ( IterNode ( propNode->options, propName, leafOffset ) );
+			SetCurrSchema ( info, propPath[kSchemaStep].step.c_str() );
+			if ( info.options & kXMP_IterJustChildren ) {
+				AddNodeOffspring ( info, info.tree.children.back(), propNode );
+			}
+
+		}
+	
+	} else if ( *schemaNS != 0 ) {
+
+		// An iterator for all properties in one schema.
+		
+		#if TraceIterators
+			printf ( "\nNew XMP schema iterator for \"%s\", options = %X\n    Schema = %s\n",
+			         xmpObj.tree.name.c_str(), options, schemaNS );
+		#endif
+		
+		info.tree.children.push_back ( IterNode ( kXMP_SchemaNode, schemaNS, 0 ) );
+		IterNode & iterSchema = info.tree.children.back();
+		
+		XMP_Node * xmpSchema = FindConstSchema ( &xmpObj.tree, schemaNS );
+		if ( xmpSchema != 0 ) AddSchemaProps ( info, iterSchema, xmpSchema );
+		
+		if ( iterSchema.children.empty() ) {
+			info.tree.children.pop_back();	// No properties, remove the schema node.
+		} else {
+			SetCurrSchema ( info, schemaNS );
+		}
+	
+	} else {
+
+		// An iterator for all properties in all schema. First add schema that exist (have children),
+		// adding aliases from them if appropriate. Then add schema that have no actual properties
+		// but do have aliases to existing properties, if we're including aliases in the iteration.
+		
+		#if TraceIterators
+			printf ( "\nNew XMP tree iterator for \"%s\", options = %X\n",
+			         xmpObj.tree.name.c_str(), options );
+		#endif
+		
+		// First pick up the schema that exist.
+		
+		for ( size_t schemaNum = 0, schemaLim = xmpObj.tree.children.size(); schemaNum != schemaLim; ++schemaNum ) {
+
+			const XMP_Node * xmpSchema = xmpObj.tree.children[schemaNum];
+			info.tree.children.push_back ( IterNode ( kXMP_SchemaNode, xmpSchema->name, 0 ) );
+			IterNode & iterSchema = info.tree.children.back();
+
+			if ( ! (info.options & kXMP_IterJustChildren) ) {
+				AddSchemaProps ( info, iterSchema, xmpSchema );
+				if ( iterSchema.children.empty() ) info.tree.children.pop_back();	// No properties, remove the schema node.
+			}
+
+		}
+
+	}
+	
+	// Set the current iteration position to the first node to be visited.
+	
+	info.currPos = info.tree.children.begin();
+	info.endPos  = info.tree.children.end();
+	
+	if ( (info.options & kXMP_IterJustChildren) && (info.currPos != info.endPos) && (*schemaNS != 0) ) {
+		info.currPos->visitStage = kIter_VisitSelf;
+	}
+
+	#if TraceIterators
+		if ( info.currPos == info.endPos ) {
+			printf ( "    ** Empty iteration **\n" );
+		} else {
+			printf ( "    Initial node %s, stage = %s, iterator @ %.8X\n",
+			         info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage], this );
+		}
+	#endif
+	
+}	// XMPIterator for XMPMeta objects
+
+// -------------------------------------------------------------------------------------------------
+// XMPIterator
+// -----------
+//
+// Constructor for iterations over global tables such as registered namespaces or aliases.
+
+XMPIterator::XMPIterator ( XMP_StringPtr  /*schemaNS*/,
+                             XMP_StringPtr  /*propName*/,
+						   XMP_OptionBits options ) : clientRefs(0), info(IterInfo(options,0))
+{
+
+	XMP_Throw ( "Unimplemented XMPIterator constructor for global tables", kXMPErr_Unimplemented );
+
+}	// XMPIterator for global tables
+
+// -------------------------------------------------------------------------------------------------
+// ~XMPIterator
+// -----------
+
+XMPIterator::~XMPIterator() RELEASE_NO_THROW
+{
+	XMP_Assert ( this->clientRefs <= 0 );
+	// Let everything else default.
+	
+}	// ~XMPIterator
+
+// =================================================================================================
+// Iteration Methods
+// =================================================================================================
+
+// -------------------------------------------------------------------------------------------------
+// Next
+// ----
+//
+// Do a preorder traversal of the cached nodes.
+
+// *** Need to document the relationships between currPos, endPos, and visitStage.
+
+bool
+XMPIterator::Next ( XMP_StringPtr *	 schemaNS,
+					XMP_StringLen *	 nsSize,
+					XMP_StringPtr *	 propPath,
+					XMP_StringLen *	 pathSize,
+					XMP_StringPtr *	 propValue,
+					XMP_StringLen *	 valueSize,
+					XMP_OptionBits * propOptions )
+{
+	// *** Lock the XMPMeta object if we ever stop using a full DLL lock.
+	
+	// ! NOTE: Supporting aliases throws in some nastiness with schemas. There might not be any XMP
+	// ! node for the schema, but we still have to visit it because of possible aliases.
+	
+	if ( info.currPos == info.endPos ) return false;	// Happens at the start of an empty iteration.
+	
+	#if TraceIterators
+		printf ( "Next iteration from %s, stage = %s, iterator @ %.8X\n",
+			     info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage], this );
+	#endif
+	
+	const XMP_Node * xmpNode = GetNextXMPNode ( info );
+	if ( xmpNode == 0 ) return false;
+	bool isSchemaNode = XMP_NodeIsSchema ( info.currPos->options );
+	
+	if ( info.options & kXMP_IterJustLeafNodes ) {
+		while ( isSchemaNode || (! xmpNode->children.empty()) ) {
+			info.currPos->visitStage = kIter_VisitQualifiers;	// Skip to this node's children.
+			xmpNode = GetNextXMPNode ( info );
+			if ( xmpNode == 0 ) return false;
+			isSchemaNode = XMP_NodeIsSchema ( info.currPos->options );
+		}
+	}
+	
+	*schemaNS = info.currSchema.c_str();
+	*nsSize   = info.currSchema.size();
+
+	*propOptions = info.currPos->options;
+
+	*propPath  = "";
+	*pathSize  = 0;
+	*propValue = "";
+	*valueSize = 0;
+	
+	if ( ! (*propOptions & kXMP_SchemaNode) ) {
+
+		*propPath = info.currPos->fullPath.c_str();
+		*pathSize = info.currPos->fullPath.size();
+
+		if ( info.options & kXMP_IterJustLeafName ) {
+			*propPath += info.currPos->leafOffset;
+			*pathSize -= info.currPos->leafOffset;
+			xmpNode->GetLocalURI ( schemaNS, nsSize );	// Use the leaf namespace, not the top namespace.
+		}
+		
+		if ( ! (*propOptions & kXMP_PropCompositeMask) ) {
+			*propValue = xmpNode->value.c_str();
+			*valueSize = xmpNode->value.size();
+		}
+
+	}
+	
+	#if TraceIterators
+		printf ( "    Next node %s, stage = %s\n",
+			     info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage] );
+	#endif
+	
+	return true;
+
+}	// Next
+
+// -------------------------------------------------------------------------------------------------
+// Skip
+// ----
+//
+// Skip some portion of the traversal related to the last visited node. We skip either that node's
+// children, or those children and the previous node's siblings. The implementation might look a bit
+// awkward because info.currNode always points to the next node to be visited. We might already have
+// moved past the things to skip, e.g. if the previous node was simple and the last of its siblings.
+
+enum {
+	kXMP_ValidIterSkipOptions	= kXMP_IterSkipSubtree | kXMP_IterSkipSiblings
+};
+
+void
+XMPIterator::Skip ( XMP_OptionBits iterOptions )
+{
+//	if ( (info.currPos == kIter_NullPos) )  XMP_Throw ( "No prior postion to skip from", kXMPErr_BadIterPosition );
+	if ( iterOptions == 0 ) XMP_Throw ( "Must specify what to skip", kXMPErr_BadOptions );
+	if ( (iterOptions & ~kXMP_ValidIterSkipOptions) != 0 ) XMP_Throw ( "Undefined options", kXMPErr_BadOptions );
+
+	#if TraceIterators
+		printf ( "Skipping from %s, stage = %s, iterator @ %.8X",
+			     info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage], this );
+	#endif
+	
+	if ( iterOptions & kXMP_IterSkipSubtree ) {
+		#if TraceIterators
+			printf ( ", mode = subtree\n" );
+		#endif
+		info.currPos->visitStage = kIter_VisitChildren;
+	} else if ( iterOptions & kXMP_IterSkipSiblings ) {
+		#if TraceIterators
+			printf ( ", mode = siblings\n" );
+		#endif
+		info.currPos = info.endPos;
+		AdvanceIterPos ( info );
+	}
+	#if TraceIterators
+		printf ( "    Skipped to %s, stage = %s\n",
+			     info.currPos->fullPath.c_str(), sStageNames[info.currPos->visitStage] );
+	#endif
+	
+
+}	// Skip
+
+// =================================================================================================
diff --git a/XMPCore/source/XMPIterator.hpp b/XMPCore/source/XMPIterator.hpp
new file mode 100644
index 0000000..1bdc1f3
--- /dev/null
+++ b/XMPCore/source/XMPIterator.hpp
@@ -0,0 +1,144 @@
+#ifndef __XMPIterator_hpp__
+#define __XMPIterator_hpp__
+
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"
+#include "public/include/XMP_Const.h"
+#include "XMPCore/source/XMPMeta.hpp"
+
+// =================================================================================================
+
+struct IterNode;
+typedef std::vector < IterNode >	IterOffspring;
+typedef IterOffspring::iterator		IterPos;
+
+typedef std::pair < IterPos, IterPos > IterPosPair;
+typedef std::vector < IterPosPair >	IterPosStack;
+
+enum {	// Values for the visitStage field, used to decide how to proceed past a node.
+	kIter_BeforeVisit		= 0,	// Have not visited this node at all.
+	kIter_VisitSelf			= 1,	// Have visited this node and returned its value/options portion.
+	kIter_VisitQualifiers	= 2,	// In the midst of visiting this node's qualifiers.
+	kIter_VisitChildren		= 3		// In the midst of visiting this node's children.
+};
+
+struct IterNode {
+
+	XMP_OptionBits	options;
+	XMP_VarString	fullPath;
+	size_t			leafOffset;
+	IterOffspring	children, qualifiers;
+	XMP_Uns8		visitStage;
+	#if 0	// *** XMP_DebugBuild
+		XMP_StringPtr	_pathPtr, _leafPtr;	// *** Not working, need operator=?
+	#endif
+
+	IterNode() : options(0), leafOffset(0), visitStage(kIter_BeforeVisit)
+	{
+		#if 0	// *** XMP_DebugBuild
+			_pathPtr = _leafPtr = 0;
+		#endif
+	};
+
+	IterNode ( XMP_OptionBits _options, const XMP_VarString& _fullPath, size_t _leafOffset )
+			 : options(_options), fullPath(_fullPath), leafOffset(_leafOffset), visitStage(kIter_BeforeVisit)
+	{
+		#if 0	// *** XMP_DebugBuild
+			_pathPtr = fullPath.c_str();
+			_leafPtr = _pathPtr + leafOffset;
+		#endif
+	};
+
+};
+
+struct IterInfo {
+
+	XMP_OptionBits	options;
+	const XMPMeta *	xmpObj;
+	XMP_VarString	currSchema;
+	IterPos			currPos, endPos;
+	IterPosStack	ancestors;
+	IterNode 		tree;
+	#if 0	// *** XMP_DebugBuild
+		XMP_StringPtr	_schemaPtr;	// *** Not working, need operator=?
+	#endif
+
+	IterInfo() : options(0), xmpObj(0)
+	{
+		#if 0	// *** XMP_DebugBuild
+			_schemaPtr = 0;
+		#endif
+	};
+
+	IterInfo ( XMP_OptionBits _options, const XMPMeta * _xmpObj ) : options(_options), xmpObj(_xmpObj)
+	{
+		#if 0	// *** XMP_DebugBuild
+			_schemaPtr = 0;
+		#endif
+	};
+
+};
+
+// =================================================================================================
+
+class XMPIterator {
+public:
+	
+	static bool
+	Initialize();	// ! For internal use only!
+	
+	static void
+	Terminate() RELEASE_NO_THROW;	// ! For internal use only!
+
+	XMPIterator ( const XMPMeta & xmpObj,	// Construct a property iterator.
+				  XMP_StringPtr	  schemaNS,
+				  XMP_StringPtr	  propName,
+				  XMP_OptionBits  options );
+
+	XMPIterator	( XMP_StringPtr	 schemaNS,	// Construct a table iterator.
+				  XMP_StringPtr	 propName,
+				  XMP_OptionBits options );
+
+	virtual ~XMPIterator() RELEASE_NO_THROW;
+
+	bool
+	Next ( XMP_StringPtr *  schemaNS,
+		   XMP_StringLen *  nsSize,
+		   XMP_StringPtr *  propPath,
+		   XMP_StringLen *  pathSize,
+		   XMP_StringPtr *  propValue,
+		   XMP_StringLen *  valueSize,
+		   XMP_OptionBits * propOptions );
+
+	void
+	Skip ( XMP_OptionBits options );
+
+	// ! Expose so that wrappers and file static functions can see the data.
+
+	XMP_Int32 clientRefs;	// ! Must be signed to allow decrement from 0.
+	XMP_ReadWriteLock lock;
+
+	IterInfo info;
+
+private:
+
+	// ! These are hidden on purpose:
+	XMPIterator() : clientRefs(0)
+		{ XMP_Throw ( "Call to hidden constructor", kXMPErr_InternalFailure ); };
+	XMPIterator ( const XMPIterator & /* original */ ) : clientRefs(0)
+		{ XMP_Throw ( "Call to hidden constructor", kXMPErr_InternalFailure ); };
+	void operator= ( const XMPIterator & /* rhs */ )
+		{ XMP_Throw ( "Call to hidden operator=", kXMPErr_InternalFailure ); };
+
+};
+
+// =================================================================================================
+
+#endif	// __XMPIterator_hpp__
diff --git a/XMPCore/source/XMPMeta-GetSet.cpp b/XMPCore/source/XMPMeta-GetSet.cpp
new file mode 100644
index 0000000..e37ceb9
--- /dev/null
+++ b/XMPCore/source/XMPMeta-GetSet.cpp
@@ -0,0 +1,1307 @@
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "XMPCore/source/XMPMeta.hpp"
+#include "XMPCore/source/XMPIterator.hpp"
+#include "XMPCore/source/XMPUtils.hpp"
+
+#include "public/include/XMP_Version.h"
+#include "source/UnicodeInlines.incl_cpp"
+#include "source/UnicodeConversions.hpp"
+#include "source/ExpatAdapter.hpp"
+
+#if XMP_DebugBuild
+	#include <iostream>
+#endif
+
+using namespace std;
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
+	#pragma warning ( disable : 4702 )	// unreachable code
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+
+// *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
+// *** Add debug codegen checks, e.g. that typical masking operations really work
+// *** Change all uses of strcmp and strncmp to XMP_LitMatch and XMP_LitNMatch
+
+
+// =================================================================================================
+// Local Types and Constants
+// =========================
+
+typedef unsigned char XMP_CLTMatch;
+
+enum {	// Values for XMP_CLTMatch.
+	kXMP_CLT_NoValues,
+	kXMP_CLT_SpecificMatch,
+	kXMP_CLT_SingleGeneric,
+	kXMP_CLT_MultipleGeneric,
+	kXMP_CLT_XDefault,
+	kXMP_CLT_FirstItem
+};
+
+
+// =================================================================================================
+// Static Variables
+// ================
+
+
+// =================================================================================================
+// Local Utilities
+// ===============
+
+
+// -------------------------------------------------------------------------------------------------
+// SetNodeValue
+// ------------
+
+static inline void
+SetNodeValue ( XMP_Node * node, XMP_StringPtr value )
+{
+
+	#if XMP_DebugBuild	// ! Hack to force an assert.
+		if ( (node->name == "xmp:TestAssertNotify") && XMP_LitMatch ( value, "DoIt!" ) ) {
+			XMP_Assert ( node->name != "xmp:TestAssertNotify" );
+		}
+	#endif
+	
+	std::string newValue = value;	// Need a local copy to tweak and not change node.value for errors.
+	
+	XMP_Uns8* chPtr = (XMP_Uns8*) newValue.c_str();	// Check for valid UTF-8, replace ASCII controls with a space.
+	while ( *chPtr != 0 ) {
+
+		while ( (*chPtr != 0) && (*chPtr < 0x80) ) {
+			if ( *chPtr < 0x20 ) {
+				if ( (*chPtr != kTab) && (*chPtr != kLF) && (*chPtr != kCR) ) *chPtr = 0x20;
+			} else if (*chPtr == 0x7F ) {
+				*chPtr = 0x20;
+			}
+			++chPtr;
+		}
+
+		XMP_Assert ( (*chPtr == 0) || (*chPtr >= 0x80) );
+
+		if ( *chPtr != 0 ) {
+			XMP_Uns32 cp = GetCodePoint ( (const XMP_Uns8 **) &chPtr );	// Throws for bad UTF-8.
+			if ( (cp == 0xFFFE) || (cp == 0xFFFF) ) {
+				XMP_Throw ( "U+FFFE and U+FFFF are not allowed in XML", kXMPErr_BadXML );
+			}
+		}
+
+	}
+
+	if ( XMP_PropIsQualifier(node->options) && (node->name == "xml:lang") ) NormalizeLangValue ( &newValue );
+
+	node->value.swap ( newValue );
+
+	#if 0	// *** XMP_DebugBuild
+		node->_valuePtr = node->value.c_str();
+	#endif
+	
+}	// SetNodeValue
+
+
+// -------------------------------------------------------------------------------------------------
+// SetNode
+// -------
+//
+// The internals for SetProperty and related calls, used after the node is found or created.
+
+static void
+SetNode	( XMP_Node * node, XMP_StringPtr value, XMP_OptionBits options )
+{
+	if ( options & kXMP_DeleteExisting ) {
+		XMP_ClearOption ( options, kXMP_DeleteExisting );
+		node->options = options;
+		node->value.erase();
+		node->RemoveChildren();
+		node->RemoveQualifiers();
+	}
+	
+	node->options |= options;	// Keep options set by FindNode when creating a new node.
+
+	if ( value != 0 ) {
+	
+		// This is setting the value of a leaf node.
+		if ( node->options & kXMP_PropCompositeMask ) XMP_Throw ( "Composite nodes can't have values", kXMPErr_BadXPath );
+		XMP_Assert ( node->children.empty() );
+		SetNodeValue ( node, value );
+	
+	} else {
+	
+		// This is setting up an array or struct.
+		if ( ! node->value.empty() ) XMP_Throw ( "Composite nodes can't have values", kXMPErr_BadXPath );
+		if ( node->options & kXMP_PropCompositeMask ) {	// Can't change an array to a struct, or vice versa.
+			if ( (options & kXMP_PropCompositeMask) != (node->options & kXMP_PropCompositeMask) ) {
+				XMP_Throw ( "Requested and existing composite form mismatch", kXMPErr_BadXPath );
+			}
+		}
+		node->RemoveChildren();
+	
+	}
+	
+}	// SetNode
+
+
+// -------------------------------------------------------------------------------------------------
+// DoSetArrayItem
+// --------------
+
+static void
+DoSetArrayItem ( XMP_Node *		arrayNode,
+				 XMP_Index		itemIndex,
+				 XMP_StringPtr	itemValue,
+				 XMP_OptionBits options )
+{
+	XMP_OptionBits itemLoc = options & kXMP_PropArrayLocationMask;
+	XMP_Index      arraySize = arrayNode->children.size();
+	
+	options &= ~kXMP_PropArrayLocationMask;
+	options = VerifySetOptions ( options, itemValue );
+	
+	// Now locate or create the item node and set the value. Note the index parameter is one-based!
+	// The index can be in the range [0..size+1] or "last", normalize it and check the insert flags.
+	// The order of the normalization checks is important. If the array is empty we end up with an
+	// index and location to set item size+1.
+	
+	XMP_Node * itemNode = 0;
+	
+	if ( itemIndex == kXMP_ArrayLastItem ) itemIndex = arraySize;
+	if ( (itemIndex == 0) && (itemLoc == kXMP_InsertAfterItem) ) {
+		itemIndex = 1;
+		itemLoc = kXMP_InsertBeforeItem;
+	}
+	if ( (itemIndex == arraySize) && (itemLoc == kXMP_InsertAfterItem) ) {
+		itemIndex += 1;
+		itemLoc = 0;
+	}
+	if ( (itemIndex == arraySize+1) && (itemLoc == kXMP_InsertBeforeItem) ) itemLoc = 0;
+	
+	if ( itemIndex == arraySize+1 ) {
+
+		if ( itemLoc != 0 ) XMP_Throw ( "Can't insert before or after implicit new item", kXMPErr_BadIndex );
+		itemNode = new XMP_Node ( arrayNode, kXMP_ArrayItemName, 0 );
+		arrayNode->children.push_back ( itemNode );
+
+	} else {
+
+		if ( (itemIndex < 1) || (itemIndex > arraySize) ) XMP_Throw ( "Array index out of bounds", kXMPErr_BadIndex );
+		--itemIndex;	// ! Convert the index to a C zero-based value!
+		if ( itemLoc == 0 ) {
+			itemNode = arrayNode->children[itemIndex];
+		} else {
+			XMP_NodePtrPos itemPos = arrayNode->children.begin() + itemIndex;
+			if ( itemLoc == kXMP_InsertAfterItem ) ++itemPos;
+			itemNode = new XMP_Node ( arrayNode, kXMP_ArrayItemName, 0 );
+			itemPos = arrayNode->children.insert ( itemPos, itemNode );
+		}
+
+	}
+	
+	SetNode ( itemNode, itemValue, options );
+	
+}	// DoSetArrayItem
+
+
+// -------------------------------------------------------------------------------------------------
+// ChooseLocalizedText
+// -------------------
+//
+// 1. Look for an exact match with the specific language.
+// 2. If a generic language is given, look for partial matches.
+// 3. Look for an "x-default" item.
+// 4. Choose the first item.
+
+static XMP_CLTMatch
+ChooseLocalizedText ( const XMP_Node *	 arrayNode,
+					  XMP_StringPtr		 genericLang,
+					  XMP_StringPtr		 specificLang,
+					  const XMP_Node * * itemNode )
+{
+	const XMP_Node * currItem = 0;
+	const size_t itemLim = arrayNode->children.size();
+	size_t itemNum;
+	
+	// See if the array has the right form. Allow empty alt arrays, that is what parsing returns.
+	// *** Should check alt-text bit when that is reliably maintained.
+
+	if ( ! ( XMP_ArrayIsAltText(arrayNode->options) ||
+	         (arrayNode->children.empty() && XMP_ArrayIsAlternate(arrayNode->options)) ) ) {
+		XMP_Throw ( "Localized text array is not alt-text", kXMPErr_BadXPath );
+	}
+	if ( arrayNode->children.empty() ) {
+		*itemNode = 0;
+		return kXMP_CLT_NoValues;
+	}
+
+	for ( itemNum = 0; itemNum < itemLim; ++itemNum ) {
+		currItem = arrayNode->children[itemNum];
+		if ( currItem->options & kXMP_PropCompositeMask ) {
+			XMP_Throw ( "Alt-text array item is not simple", kXMPErr_BadXPath );
+		}
+		if ( currItem->qualifiers.empty() || (currItem->qualifiers[0]->name != "xml:lang") ) {
+			XMP_Throw ( "Alt-text array item has no language qualifier", kXMPErr_BadXPath );
+		}
+	}
+
+	// Look for an exact match with the specific language.
+	for ( itemNum = 0; itemNum < itemLim; ++itemNum ) {
+		currItem = arrayNode->children[itemNum];
+		if ( currItem->qualifiers[0]->value == specificLang ) {
+			*itemNode = currItem;
+			return kXMP_CLT_SpecificMatch;
+		}
+	}
+	
+	if ( *genericLang != 0 ) {
+
+		// Look for the first partial match with the generic language.
+		const size_t genericLen = strlen ( genericLang );
+		for ( itemNum = 0; itemNum < itemLim; ++itemNum ) {
+			currItem = arrayNode->children[itemNum];
+			XMP_StringPtr currLang = currItem->qualifiers[0]->value.c_str();
+			const size_t currLangSize = currItem->qualifiers[0]->value.size();
+			if ( (currLangSize >= genericLen) &&
+				 XMP_LitNMatch ( currLang, genericLang, genericLen ) &&
+				 ((currLangSize == genericLen) || (currLang[genericLen] == '-')) ) {
+				*itemNode = currItem;
+				break;	// ! Don't return, need to look for other matches.
+			}
+		}
+
+		if ( itemNum < itemLim ) {
+			
+			// Look for a second partial match with the generic language.
+			for ( ++itemNum; itemNum < itemLim; ++itemNum ) {
+				currItem = arrayNode->children[itemNum];
+				XMP_StringPtr currLang = currItem->qualifiers[0]->value.c_str();
+				const size_t currLangSize = currItem->qualifiers[0]->value.size();
+				if ( (currLangSize >= genericLen) &&
+					 XMP_LitNMatch ( currLang, genericLang, genericLen ) &&
+					 ((currLangSize == genericLen) || (currLang[genericLen] == '-')) ) {
+					return kXMP_CLT_MultipleGeneric;	// ! Leave itemNode with the first partial match.
+				}
+			}
+			return kXMP_CLT_SingleGeneric;	// No second partial match was found.
+
+		}
+		
+	}
+	
+	// Look for an 'x-default' item.
+	for ( itemNum = 0; itemNum < itemLim; ++itemNum ) {
+		currItem = arrayNode->children[itemNum];
+		if ( currItem->qualifiers[0]->value == "x-default" ) {
+			*itemNode = currItem;
+			return kXMP_CLT_XDefault;
+		}
+	}
+	
+	// Everything failed, choose the first item.
+	*itemNode = arrayNode->children[0];
+	return kXMP_CLT_FirstItem;
+	
+}	// ChooseLocalizedText
+
+
+// -------------------------------------------------------------------------------------------------
+// AppendLangItem
+// --------------
+
+static void
+AppendLangItem ( XMP_Node * arrayNode, XMP_StringPtr itemLang, XMP_StringPtr itemValue )
+{
+	XMP_Node * newItem  = new XMP_Node ( arrayNode, kXMP_ArrayItemName, (kXMP_PropHasQualifiers | kXMP_PropHasLang) );
+	XMP_Node * langQual = new XMP_Node ( newItem, "xml:lang", kXMP_PropIsQualifier );
+	
+	try {	// ! Use SetNodeValue, not constructors above, to get the character checks.
+		SetNodeValue ( newItem, itemValue );
+		SetNodeValue ( langQual, itemLang );
+	} catch (...) {
+		delete newItem;
+		delete langQual;
+		throw;
+	}
+	
+	newItem->qualifiers.push_back ( langQual );
+
+	if ( (arrayNode->children.empty()) || (langQual->value != "x-default") ) {
+		arrayNode->children.push_back ( newItem );
+	} else {
+		arrayNode->children.insert ( arrayNode->children.begin(), newItem );
+	}
+
+}	// AppendLangItem
+
+
+// =================================================================================================
+// Class Methods
+// =============
+//
+//
+// =================================================================================================
+
+
+// -------------------------------------------------------------------------------------------------
+// GetProperty
+// -----------
+
+bool
+XMPMeta::GetProperty ( XMP_StringPtr	schemaNS,
+					   XMP_StringPtr	propName,
+					   XMP_StringPtr *	propValue,
+					   XMP_StringLen *	valueSize,
+					   XMP_OptionBits *	options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (propValue != 0) && (valueSize != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath expPath;
+	ExpandXPath ( schemaNS, propName, &expPath );
+	
+	XMP_Node * propNode = FindConstNode ( &tree, expPath );
+	if ( propNode == 0 ) return false;
+	
+	*propValue = propNode->value.c_str();
+	*valueSize = propNode->value.size();
+	*options   = propNode->options;
+	
+	return true;
+	
+}	// GetProperty
+
+
+// -------------------------------------------------------------------------------------------------
+// GetArrayItem
+// ------------
+
+bool
+XMPMeta::GetArrayItem ( XMP_StringPtr	 schemaNS,
+						XMP_StringPtr	 arrayName,
+						XMP_Index		 itemIndex,
+						XMP_StringPtr *	 itemValue,
+						XMP_StringLen *  valueSize,
+						XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (itemValue != 0) && (options != 0) );	// Enforced by wrapper.
+
+	// ! Special case check to make errors consistent if the array does not exist. The other array
+	// ! functions and existing array here (empty or not) already throw.
+	if ( (itemIndex <= 0) && (itemIndex != kXMP_ArrayLastItem) ) XMP_Throw ( "Array index must be larger than zero", kXMPErr_BadXPath );
+
+	XMP_VarString itemPath;
+	XMPUtils::ComposeArrayItemPath ( schemaNS, arrayName, itemIndex, &itemPath );
+	return GetProperty ( schemaNS, itemPath.c_str(), itemValue, valueSize, options );
+
+}	// GetArrayItem
+
+
+// -------------------------------------------------------------------------------------------------
+// GetStructField
+// --------------
+
+bool
+XMPMeta::GetStructField	( XMP_StringPtr	   schemaNS,
+						  XMP_StringPtr	   structName,
+						  XMP_StringPtr	   fieldNS,
+						  XMP_StringPtr	   fieldName,
+						  XMP_StringPtr *  fieldValue,
+						  XMP_StringLen *  valueSize,
+						  XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (structName != 0) && (fieldNS != 0) && (fieldName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (fieldValue != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_VarString fieldPath;
+	XMPUtils::ComposeStructFieldPath ( schemaNS, structName, fieldNS, fieldName, &fieldPath );
+	return GetProperty ( schemaNS, fieldPath.c_str(), fieldValue, valueSize, options );
+
+}	// GetStructField
+
+
+// -------------------------------------------------------------------------------------------------
+// GetQualifier
+// ------------
+
+bool
+XMPMeta::GetQualifier ( XMP_StringPtr	 schemaNS,
+						XMP_StringPtr	 propName,
+						XMP_StringPtr	 qualNS,
+						XMP_StringPtr	 qualName,
+						XMP_StringPtr *	 qualValue,
+						XMP_StringLen *  valueSize,
+						XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) && (qualNS != 0) && (qualName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (qualValue != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_VarString qualPath;
+	XMPUtils::ComposeQualifierPath ( schemaNS, propName, qualNS, qualName, &qualPath );
+	return GetProperty ( schemaNS, qualPath.c_str(), qualValue, valueSize, options );
+
+}	// GetQualifier
+
+
+// -------------------------------------------------------------------------------------------------
+// SetProperty
+// -----------
+
+// *** Should handle array items specially, calling SetArrayItem.
+
+void
+XMPMeta::SetProperty ( XMP_StringPtr  schemaNS,
+					   XMP_StringPtr  propName,
+					   XMP_StringPtr  propValue,
+					   XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	options = VerifySetOptions ( options, propValue );
+
+	XMP_ExpandedXPath expPath;
+	ExpandXPath ( schemaNS, propName, &expPath );
+
+	XMP_Node * propNode = FindNode ( &tree, expPath, kXMP_CreateNodes, options );
+	if ( propNode == 0 ) XMP_Throw ( "Specified property does not exist", kXMPErr_BadXPath );
+	
+	SetNode ( propNode, propValue, options );
+	
+}	// SetProperty
+
+
+// -------------------------------------------------------------------------------------------------
+// SetArrayItem
+// ------------
+
+void
+XMPMeta::SetArrayItem ( XMP_StringPtr  schemaNS,
+						XMP_StringPtr  arrayName,
+						XMP_Index	   itemIndex,
+						XMP_StringPtr  itemValue,
+						XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath arrayPath;
+	ExpandXPath ( schemaNS, arrayName, &arrayPath );
+	XMP_Node * arrayNode = FindNode ( &tree, arrayPath, kXMP_ExistingOnly );	// Just lookup, don't try to create.
+	if ( arrayNode == 0 ) XMP_Throw ( "Specified array does not exist", kXMPErr_BadXPath );
+	
+	DoSetArrayItem ( arrayNode, itemIndex, itemValue, options );
+	
+}	// SetArrayItem
+
+
+// -------------------------------------------------------------------------------------------------
+// AppendArrayItem
+// ---------------
+
+void
+XMPMeta::AppendArrayItem ( XMP_StringPtr  schemaNS,
+						   XMP_StringPtr  arrayName,
+						   XMP_OptionBits arrayOptions,
+						   XMP_StringPtr  itemValue,
+						   XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) );	// Enforced by wrapper.
+
+	arrayOptions = VerifySetOptions ( arrayOptions, 0 );
+	if ( (arrayOptions & ~kXMP_PropArrayFormMask) != 0 ) {
+		XMP_Throw ( "Only array form flags allowed for arrayOptions", kXMPErr_BadOptions );
+	}
+	
+	// Locate or create the array. If it already exists, make sure the array form from the options
+	// parameter is compatible with the current state.
+	
+	XMP_ExpandedXPath arrayPath;
+	ExpandXPath ( schemaNS, arrayName, &arrayPath );
+	XMP_Node * arrayNode = FindNode ( &tree, arrayPath, kXMP_ExistingOnly );	// Just lookup, don't try to create.
+	
+	if ( arrayNode != 0 ) {
+		// The array exists, make sure the form is compatible. Zero arrayForm means take what exists.
+		if ( ! (arrayNode->options & kXMP_PropValueIsArray) ) {
+			XMP_Throw ( "The named property is not an array", kXMPErr_BadXPath );
+		}
+		#if 0
+			// *** Disable for now. Need to do some general rethinking of semantic checks.
+			if ( (arrayOptions != 0) && (arrayOptions != (arrayNode->options & kXMP_PropArrayFormMask)) ) {
+				XMP_Throw ( "Mismatch of existing and specified array form", kXMPErr_BadOptions );
+			}
+		#endif
+	} else {
+		// The array does not exist, try to create it.
+		if ( arrayOptions == 0 ) XMP_Throw ( "Explicit arrayOptions required to create new array", kXMPErr_BadOptions );
+		arrayNode = FindNode ( &tree, arrayPath, kXMP_CreateNodes, arrayOptions );
+		if ( arrayNode == 0 ) XMP_Throw ( "Failure creating array node", kXMPErr_BadXPath );
+	}
+	
+	DoSetArrayItem ( arrayNode, kXMP_ArrayLastItem, itemValue, (options | kXMP_InsertAfterItem) );
+	
+}	// AppendArrayItem
+
+
+// -------------------------------------------------------------------------------------------------
+// SetStructField
+// --------------
+
+void
+XMPMeta::SetStructField	( XMP_StringPtr	 schemaNS,
+						  XMP_StringPtr	 structName,
+						  XMP_StringPtr	 fieldNS,
+						  XMP_StringPtr	 fieldName,
+						  XMP_StringPtr	 fieldValue,
+						  XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (structName != 0) && (fieldNS != 0) && (fieldName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString fieldPath;
+	XMPUtils::ComposeStructFieldPath ( schemaNS, structName, fieldNS, fieldName, &fieldPath );
+	SetProperty ( schemaNS, fieldPath.c_str(), fieldValue, options );
+
+}	// SetStructField
+
+
+// -------------------------------------------------------------------------------------------------
+// SetQualifier
+// ------------
+
+void
+XMPMeta::SetQualifier ( XMP_StringPtr  schemaNS,
+						XMP_StringPtr  propName,
+						XMP_StringPtr  qualNS,
+						XMP_StringPtr  qualName,
+						XMP_StringPtr  qualValue,
+						XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) && (qualNS != 0) && (qualName != 0) );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath expPath;
+	ExpandXPath ( schemaNS, propName, &expPath );
+	XMP_Node * propNode = FindNode ( &tree, expPath, kXMP_ExistingOnly );
+	if ( propNode == 0 ) XMP_Throw ( "Specified property does not exist", kXMPErr_BadXPath );
+
+	XMP_VarString qualPath;
+	XMPUtils::ComposeQualifierPath ( schemaNS, propName, qualNS, qualName, &qualPath );
+	SetProperty ( schemaNS, qualPath.c_str(), qualValue, options );
+
+}	// SetQualifier
+
+
+// -------------------------------------------------------------------------------------------------
+// DeleteProperty
+// --------------
+
+void
+XMPMeta::DeleteProperty	( XMP_StringPtr	schemaNS,
+						  XMP_StringPtr	propName )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath	expPath;
+	ExpandXPath ( schemaNS, propName, &expPath );
+	
+	XMP_NodePtrPos ptrPos;
+	XMP_Node * propNode = FindNode ( &tree, expPath, kXMP_ExistingOnly, kXMP_NoOptions, &ptrPos );
+	if ( propNode == 0 ) return;
+	XMP_Node * parentNode = propNode->parent;
+	
+	// Erase the pointer from the parent's vector, then delete the node and all below it.
+	
+	if ( ! (propNode->options & kXMP_PropIsQualifier) ) {
+
+		parentNode->children.erase ( ptrPos );
+		DeleteEmptySchema ( parentNode );
+
+	} else {
+
+		if ( propNode->name == "xml:lang" ) {
+			XMP_Assert ( parentNode->options & kXMP_PropHasLang );	// *** &= ~flag would be safer
+			parentNode->options ^= kXMP_PropHasLang;
+		} else if ( propNode->name == "rdf:type" ) {
+			XMP_Assert ( parentNode->options & kXMP_PropHasType );
+			parentNode->options ^= kXMP_PropHasType;
+		}
+
+		parentNode->qualifiers.erase ( ptrPos );
+		XMP_Assert ( parentNode->options & kXMP_PropHasQualifiers );
+		if ( parentNode->qualifiers.empty() ) parentNode->options ^= kXMP_PropHasQualifiers;
+
+	}
+	
+	delete propNode;	// ! The destructor takes care of the whole subtree.
+	
+}	// DeleteProperty
+
+
+// -------------------------------------------------------------------------------------------------
+// DeleteArrayItem
+// ---------------
+
+void
+XMPMeta::DeleteArrayItem ( XMP_StringPtr schemaNS,
+						   XMP_StringPtr arrayName,
+						   XMP_Index	 itemIndex )
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString itemPath;
+	XMPUtils::ComposeArrayItemPath ( schemaNS, arrayName, itemIndex, &itemPath );
+	DeleteProperty ( schemaNS, itemPath.c_str() );
+
+}	// DeleteArrayItem
+
+
+// -------------------------------------------------------------------------------------------------
+// DeleteStructField
+// -----------------
+
+void
+XMPMeta::DeleteStructField ( XMP_StringPtr schemaNS,
+							 XMP_StringPtr structName,
+							 XMP_StringPtr fieldNS,
+							 XMP_StringPtr fieldName )
+{
+	XMP_Assert ( (schemaNS != 0) && (structName != 0) && (fieldNS != 0) && (fieldName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString fieldPath;
+	XMPUtils::ComposeStructFieldPath ( schemaNS, structName, fieldNS, fieldName, &fieldPath );
+	DeleteProperty ( schemaNS, fieldPath.c_str() );
+
+}	// DeleteStructField
+
+
+// -------------------------------------------------------------------------------------------------
+// DeleteQualifier
+// ---------------
+
+void
+XMPMeta::DeleteQualifier ( XMP_StringPtr schemaNS,
+						   XMP_StringPtr propName,
+						   XMP_StringPtr qualNS,
+						   XMP_StringPtr qualName )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) && (qualNS != 0) && (qualName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString qualPath;
+	XMPUtils::ComposeQualifierPath ( schemaNS, propName, qualNS, qualName, &qualPath );
+	DeleteProperty ( schemaNS, qualPath.c_str() );
+
+}	// DeleteQualifier
+
+
+// -------------------------------------------------------------------------------------------------
+// DoesPropertyExist
+// -----------------
+
+bool
+XMPMeta::DoesPropertyExist ( XMP_StringPtr schemaNS,
+							 XMP_StringPtr propName ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath	expPath;
+	ExpandXPath ( schemaNS, propName, &expPath );
+
+	XMP_Node * propNode = FindConstNode ( &tree, expPath );
+	return (propNode != 0);
+	
+}	// DoesPropertyExist
+
+
+// -------------------------------------------------------------------------------------------------
+// DoesArrayItemExist
+// ------------------
+
+bool
+XMPMeta::DoesArrayItemExist	( XMP_StringPtr	schemaNS,
+							  XMP_StringPtr	arrayName,
+							  XMP_Index		itemIndex ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString itemPath;
+	XMPUtils::ComposeArrayItemPath ( schemaNS, arrayName, itemIndex, &itemPath );
+	return DoesPropertyExist ( schemaNS, itemPath.c_str() );
+
+}	// DoesArrayItemExist
+
+
+// -------------------------------------------------------------------------------------------------
+// DoesStructFieldExist
+// --------------------
+
+bool
+XMPMeta::DoesStructFieldExist ( XMP_StringPtr schemaNS,
+								XMP_StringPtr structName,
+								XMP_StringPtr fieldNS,
+								XMP_StringPtr fieldName ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (structName != 0) && (fieldNS != 0) && (fieldName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString fieldPath;
+	XMPUtils::ComposeStructFieldPath ( schemaNS, structName, fieldNS, fieldName, &fieldPath );
+	return DoesPropertyExist ( schemaNS, fieldPath.c_str() );
+
+}	// DoesStructFieldExist
+
+
+// -------------------------------------------------------------------------------------------------
+// DoesQualifierExist
+// ------------------
+
+bool
+XMPMeta::DoesQualifierExist	( XMP_StringPtr	schemaNS,
+							  XMP_StringPtr	propName,
+							  XMP_StringPtr	qualNS,
+							  XMP_StringPtr	qualName ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) && (qualNS != 0) && (qualName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString qualPath;
+	XMPUtils::ComposeQualifierPath ( schemaNS, propName, qualNS, qualName, &qualPath );
+	return DoesPropertyExist ( schemaNS, qualPath.c_str() );
+
+}	// DoesQualifierExist
+
+
+// -------------------------------------------------------------------------------------------------
+// GetLocalizedText
+// ----------------
+
+bool
+XMPMeta::GetLocalizedText ( XMP_StringPtr	 schemaNS,
+							XMP_StringPtr	 arrayName,
+							XMP_StringPtr	 _genericLang,
+							XMP_StringPtr	 _specificLang,
+							XMP_StringPtr *	 actualLang,
+							XMP_StringLen *	 langSize,
+							XMP_StringPtr *	 itemValue,
+							XMP_StringLen *	 valueSize,
+							XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) && (_genericLang != 0) && (_specificLang != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (actualLang != 0) && (langSize != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (itemValue != 0) && (valueSize != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_VarString zGenericLang  ( _genericLang );
+	XMP_VarString zSpecificLang ( _specificLang );
+	NormalizeLangValue ( &zGenericLang );
+	NormalizeLangValue ( &zSpecificLang );
+	
+	XMP_StringPtr genericLang  = zGenericLang.c_str();
+	XMP_StringPtr specificLang = zSpecificLang.c_str();
+	
+	XMP_ExpandedXPath arrayPath;
+	ExpandXPath ( schemaNS, arrayName, &arrayPath );
+	
+	const XMP_Node * arrayNode = FindConstNode ( &tree, arrayPath );	// *** This expand/find idiom is used in 3 Getters.
+	if ( arrayNode == 0 ) return false;			// *** Should extract it into a local utility.
+	
+	XMP_CLTMatch match;
+	const XMP_Node * itemNode;
+	
+	match = ChooseLocalizedText ( arrayNode, genericLang, specificLang, &itemNode );
+	if ( match == kXMP_CLT_NoValues ) return false;
+	
+	*actualLang = itemNode->qualifiers[0]->value.c_str();
+	*langSize   = itemNode->qualifiers[0]->value.size();
+	*itemValue  = itemNode->value.c_str();
+	*valueSize  = itemNode->value.size();
+	*options    = itemNode->options;
+
+	return true;
+	
+}	// GetLocalizedText
+
+
+// -------------------------------------------------------------------------------------------------
+// SetLocalizedText
+// ----------------
+
+void
+XMPMeta::SetLocalizedText ( XMP_StringPtr  schemaNS,
+							XMP_StringPtr  arrayName,
+							XMP_StringPtr  _genericLang,
+							XMP_StringPtr  _specificLang,
+							XMP_StringPtr  itemValue,
+							XMP_OptionBits options )
+{
+	IgnoreParam(options);
+
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) && (_genericLang != 0) && (_specificLang != 0) );	// Enforced by wrapper.
+
+	XMP_VarString zGenericLang  ( _genericLang );
+	XMP_VarString zSpecificLang ( _specificLang );
+	NormalizeLangValue ( &zGenericLang );
+	NormalizeLangValue ( &zSpecificLang );
+	
+	XMP_StringPtr genericLang  = zGenericLang.c_str();
+	XMP_StringPtr specificLang = zSpecificLang.c_str();
+	
+	XMP_ExpandedXPath arrayPath;
+	ExpandXPath ( schemaNS, arrayName, &arrayPath );
+	
+	// Find the array node and set the options if it was just created.
+	XMP_Node * arrayNode = FindNode ( &tree, arrayPath, kXMP_CreateNodes,
+									  (kXMP_PropValueIsArray | kXMP_PropArrayIsOrdered | kXMP_PropArrayIsAlternate) );
+	if ( arrayNode == 0 ) XMP_Throw ( "Failed to find or create array node", kXMPErr_BadXPath );
+	if ( ! XMP_ArrayIsAltText(arrayNode->options) ) {
+		if ( arrayNode->children.empty() && XMP_ArrayIsAlternate(arrayNode->options) ) {
+			arrayNode->options |= kXMP_PropArrayIsAltText;
+		} else {
+			XMP_Throw ( "Localized text array is not alt-text", kXMPErr_BadXPath );
+		}
+	}
+	
+	// Make sure the x-default item, if any, is first.
+	
+	size_t itemNum, itemLim;
+	XMP_Node * xdItem = 0;
+	bool haveXDefault = false;
+	
+	for ( itemNum = 0, itemLim = arrayNode->children.size(); itemNum < itemLim; ++itemNum ) {
+		XMP_Node * currItem = arrayNode->children[itemNum];
+		XMP_Assert ( XMP_PropHasLang(currItem->options) );
+		if ( currItem->qualifiers.empty() || (currItem->qualifiers[0]->name != "xml:lang") ) {
+			XMP_Throw ( "Language qualifier must be first", kXMPErr_BadXPath );
+		}
+		if ( currItem->qualifiers[0]->value == "x-default" ) {
+			xdItem = currItem;
+			haveXDefault = true;
+			break;
+		}
+	}
+	
+	if ( haveXDefault && (itemNum != 0) ) {
+		XMP_Assert ( arrayNode->children[itemNum]->qualifiers[0]->value == "x-default" );
+		XMP_Node * temp = arrayNode->children[0];
+		arrayNode->children[0] = arrayNode->children[itemNum];
+		arrayNode->children[itemNum] = temp;
+	}
+	
+	// Find the appropriate item. ChooseLocalizedText will make sure the array is a language alternative.
+		
+	const XMP_Node * cItemNode;	// ! ChooseLocalizedText returns a pointer to a const node.
+	XMP_CLTMatch match = ChooseLocalizedText ( arrayNode, genericLang, specificLang, &cItemNode );
+	XMP_Node * itemNode = const_cast<XMP_Node*> ( cItemNode );
+
+	const bool specificXDefault = XMP_LitMatch ( specificLang, "x-default" );
+	
+	switch ( match ) {
+
+		case kXMP_CLT_NoValues :
+
+			// Create the array items for the specificLang and x-default, with x-default first.
+			AppendLangItem ( arrayNode, "x-default", itemValue );
+			haveXDefault = true;
+			if ( ! specificXDefault ) AppendLangItem ( arrayNode, specificLang, itemValue );
+			break;
+			
+		case kXMP_CLT_SpecificMatch :
+		
+			if ( ! specificXDefault ) {
+				// Update the specific item, update x-default if it matches the old value.
+				if ( xdItem != NULL && haveXDefault && (xdItem != itemNode) && (xdItem->value == itemNode->value) ) {
+					SetNodeValue ( xdItem, itemValue );
+				}
+				SetNodeValue ( itemNode, itemValue );	// ! Do this after the x-default check!
+			} else {
+				// Update all items whose values match the old x-default value.
+				XMP_Assert ( xdItem != NULL && haveXDefault && (xdItem == itemNode) );
+				for ( itemNum = 0, itemLim = arrayNode->children.size(); itemNum < itemLim; ++itemNum ) {
+					XMP_Node * currItem = arrayNode->children[itemNum];
+					if ( (currItem == xdItem) || (currItem->value != xdItem->value) ) continue;
+					SetNodeValue ( currItem, itemValue );
+				}
+				SetNodeValue ( xdItem, itemValue );	// And finally do the x-default item.
+			}
+			break;
+
+		case kXMP_CLT_SingleGeneric :
+		
+			// Update the generic item, update x-default if it matches the old value.
+			if (  xdItem != NULL && haveXDefault && (xdItem != itemNode) && (xdItem->value == itemNode->value) ) {
+				SetNodeValue ( xdItem, itemValue );
+			}
+			SetNodeValue ( itemNode, itemValue );	// ! Do this after the x-default check!
+			break;
+
+		case kXMP_CLT_MultipleGeneric :
+		
+			// Create the specific language, ignore x-default.
+			AppendLangItem ( arrayNode, specificLang, itemValue );
+			if ( specificXDefault ) haveXDefault = true;
+			break;
+			
+		case kXMP_CLT_XDefault :
+
+			// Create the specific language, update x-default if it was the only item.
+			if ( arrayNode->children.size() == 1 ) SetNodeValue ( xdItem, itemValue );
+			AppendLangItem ( arrayNode, specificLang, itemValue );
+			break;
+
+		case kXMP_CLT_FirstItem	:
+
+			// Create the specific language, don't add an x-default item.
+			AppendLangItem ( arrayNode, specificLang, itemValue );
+			if ( specificXDefault ) haveXDefault = true;
+			break;
+			
+		default :
+			XMP_Throw ( "Unexpected result from ChooseLocalizedText", kXMPErr_InternalFailure );
+
+	}
+
+	// Add an x-default at the front if needed.
+	if ( (! haveXDefault) && (arrayNode->children.size() == 1) ) {
+		AppendLangItem ( arrayNode, "x-default", itemValue );
+	}
+
+}	// SetLocalizedText
+
+// -------------------------------------------------------------------------------------------------
+// DeleteLocalizedText
+// -------------------
+
+void
+XMPMeta::DeleteLocalizedText ( XMP_StringPtr schemaNS,
+                               XMP_StringPtr arrayName,
+                               XMP_StringPtr _genericLang,
+                               XMP_StringPtr _specificLang )
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) && (_genericLang != 0) && (_specificLang != 0) );	// Enforced by wrapper.
+
+	XMP_VarString zGenericLang  ( _genericLang );
+	XMP_VarString zSpecificLang ( _specificLang );
+	NormalizeLangValue ( &zGenericLang );
+	NormalizeLangValue ( &zSpecificLang );
+
+	XMP_StringPtr genericLang  = zGenericLang.c_str();
+	XMP_StringPtr specificLang = zSpecificLang.c_str();
+
+	XMP_ExpandedXPath arrayPath;
+	ExpandXPath ( schemaNS, arrayName, &arrayPath );
+	
+	// Find the LangAlt array and the selected array item.
+
+	XMP_Node * arrayNode = FindNode ( &tree, arrayPath, kXMP_ExistingOnly );
+	if ( arrayNode == 0 ) return;
+	size_t arraySize = arrayNode->children.size();
+
+	XMP_CLTMatch match;
+	XMP_Node * itemNode;
+
+	match = ChooseLocalizedText ( arrayNode, genericLang, specificLang, (const XMP_Node **) &itemNode );
+	if ( match != kXMP_CLT_SpecificMatch ) return;
+
+	size_t itemIndex = 0;
+	for ( ; itemIndex < arraySize; ++itemIndex ) {
+		if ( arrayNode->children[itemIndex] == itemNode ) break;
+	}
+	XMP_Enforce ( itemIndex < arraySize );
+	
+	// Decide if the selected item is x-default or not, find relevant matching item.
+	
+	bool itemIsXDefault = false;
+	if ( ! itemNode->qualifiers.empty() ) {
+		XMP_Node * qualNode = itemNode->qualifiers[0];
+		if ( (qualNode->name == "xml:lang") && (qualNode->value == "x-default") ) itemIsXDefault = true;
+	}
+	
+	if ( itemIsXDefault && (itemIndex != 0) ) {	// Enforce the x-default is first policy.
+		XMP_Node * temp = arrayNode->children[0];
+		arrayNode->children[0] = arrayNode->children[itemIndex];
+		arrayNode->children[itemIndex] = temp;
+		itemIndex = 0;
+	}
+	
+	XMP_Node * assocNode = 0;
+	size_t assocIndex;
+	
+	if ( itemIsXDefault ) {
+
+		for ( assocIndex = 1; assocIndex < arraySize; ++assocIndex ) {
+			if ( arrayNode->children[assocIndex]->value == itemNode->value ) {
+				assocNode = arrayNode->children[assocIndex];
+				break;
+			}
+		}
+
+	} else if ( itemIndex > 0 ) {
+
+		XMP_Node * itemZero = arrayNode->children[0];
+		if ( itemZero->value == itemNode->value ) {
+			XMP_Node * qualNode = itemZero->qualifiers[0];
+			if ( (qualNode->name == "xml:lang") && (qualNode->value == "x-default") ) {
+				assocNode = arrayNode->children[0];
+				assocIndex = 0;
+			}
+		}
+
+	}
+	
+	// Delete the appropriate nodes.
+	
+	XMP_NodePtrPos arrayBegin = arrayNode->children.begin();
+	
+	if ( assocNode == 0 ) {
+		arrayNode->children.erase ( arrayBegin + itemIndex );
+	} else if ( itemIndex < assocIndex ) {
+		arrayNode->children.erase ( arrayBegin + assocIndex );
+		arrayNode->children.erase ( arrayBegin + itemIndex );
+	} else {
+		arrayNode->children.erase ( arrayBegin + itemIndex );
+		arrayNode->children.erase ( arrayBegin + assocIndex );
+	}
+
+	delete itemNode;
+	if ( assocNode != 0 ) delete assocNode;
+
+}	// DeleteLocalizedText
+
+// -------------------------------------------------------------------------------------------------
+// GetProperty_Bool
+// ----------------
+
+bool
+XMPMeta::GetProperty_Bool ( XMP_StringPtr	 schemaNS,
+							XMP_StringPtr	 propName,
+							bool *			 propValue,
+							XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (propValue != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_StringPtr	valueStr;
+	XMP_StringLen	valueLen;
+	
+	bool found = GetProperty ( schemaNS, propName, &valueStr, &valueLen, options );
+	if ( found ) {
+		if ( ! XMP_PropIsSimple ( *options ) ) XMP_Throw ( "Property must be simple", kXMPErr_BadXPath );
+		*propValue = XMPUtils::ConvertToBool ( valueStr );
+	}
+	return found;
+	
+}	// GetProperty_Bool
+
+
+// -------------------------------------------------------------------------------------------------
+// GetProperty_Int
+// ---------------
+
+bool
+XMPMeta::GetProperty_Int ( XMP_StringPtr	schemaNS,
+						   XMP_StringPtr	propName,
+						   XMP_Int32 *		propValue,
+						   XMP_OptionBits *	options ) const
+{
+	XMP_Int64 tempValue64 = 0;
+	if ( GetProperty_Int64( schemaNS, propName, &tempValue64, options ) ) {
+		if ( tempValue64 < (XMP_Int64) Min_XMP_Int32 || tempValue64 > (XMP_Int64) Max_XMP_Int32 ) {
+			// overflow condition
+			XMP_Throw ( "Overflow condition", kXMPErr_BadValue );
+		} else {
+			*propValue = (XMP_Int32) tempValue64;
+			return true;
+		}
+	}
+	return false;
+
+}	// GetProperty_Int
+
+
+// -------------------------------------------------------------------------------------------------
+// GetProperty_Int64
+// -----------------
+
+bool
+XMPMeta::GetProperty_Int64 ( XMP_StringPtr	  schemaNS,
+						     XMP_StringPtr	  propName,
+						     XMP_Int64 *	  propValue,
+						     XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (propValue != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_StringPtr	valueStr;
+	XMP_StringLen	valueLen;
+	
+	bool found = GetProperty ( schemaNS, propName, &valueStr, &valueLen, options );
+	if ( found ) {
+		if ( ! XMP_PropIsSimple ( *options ) ) XMP_Throw ( "Property must be simple", kXMPErr_BadXPath );
+		std::string propValueStr;
+		propValueStr.append( valueStr, valueLen );
+		XMPUtils::Trim( propValueStr );
+		*propValue = XMPUtils::ConvertToInt64 ( propValueStr.c_str() );
+	}
+	return found;
+	
+}	// GetProperty_Int64
+
+
+// -------------------------------------------------------------------------------------------------
+// GetProperty_Float
+// -----------------
+
+bool
+XMPMeta::GetProperty_Float ( XMP_StringPtr	  schemaNS,
+							 XMP_StringPtr	  propName,
+							 double *		  propValue,
+							 XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (propValue != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_StringPtr	valueStr;
+	XMP_StringLen	valueLen;
+	
+	bool found = GetProperty ( schemaNS, propName, &valueStr, &valueLen, options );
+	if ( found ) {
+		if ( ! XMP_PropIsSimple ( *options ) ) XMP_Throw ( "Property must be simple", kXMPErr_BadXPath );
+		std::string propValueStr;
+		propValueStr.append( valueStr, valueLen );
+		XMPUtils::Trim( propValueStr );
+		*propValue = XMPUtils::ConvertToFloat ( propValueStr.c_str() );
+	}
+	return found;
+	
+}	// GetProperty_Float
+
+
+// -------------------------------------------------------------------------------------------------
+// GetProperty_Date
+// ----------------
+
+bool
+XMPMeta::GetProperty_Date ( XMP_StringPtr	 schemaNS,
+							XMP_StringPtr	 propName,
+							XMP_DateTime *	 propValue,
+							XMP_OptionBits * options ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (propValue != 0) && (options != 0) );	// Enforced by wrapper.
+
+	XMP_StringPtr	valueStr;
+	XMP_StringLen	valueLen;
+	
+	bool found = GetProperty ( schemaNS, propName, &valueStr, &valueLen, options );
+	if ( found )  {
+		if ( ! XMP_PropIsSimple ( *options ) ) XMP_Throw ( "Property must be simple", kXMPErr_BadXPath );
+		XMPUtils::ConvertToDate ( valueStr, propValue );
+	}
+	return found;
+	
+}	// GetProperty_Date
+
+
+// -------------------------------------------------------------------------------------------------
+// SetProperty_Bool
+// ----------------
+
+void
+XMPMeta::SetProperty_Bool ( XMP_StringPtr  schemaNS,
+							XMP_StringPtr  propName,
+							bool		   propValue,
+							XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString valueStr;
+	XMPUtils::ConvertFromBool ( propValue, &valueStr );
+	SetProperty ( schemaNS, propName, valueStr.c_str(), options );
+	
+}	// SetProperty_Bool
+
+
+// -------------------------------------------------------------------------------------------------
+// SetProperty_Int
+// ---------------
+
+void
+XMPMeta::SetProperty_Int ( XMP_StringPtr  schemaNS,
+						   XMP_StringPtr  propName,
+						   XMP_Int32	  propValue,
+						   XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString valueStr;
+	XMPUtils::ConvertFromInt ( propValue, "", &valueStr );
+	SetProperty ( schemaNS, propName, valueStr.c_str(), options );
+	
+}	// SetProperty_Int
+
+
+// -------------------------------------------------------------------------------------------------
+// SetProperty_Int64
+// -----------------
+
+void
+XMPMeta::SetProperty_Int64 ( XMP_StringPtr  schemaNS,
+						     XMP_StringPtr  propName,
+						     XMP_Int64	    propValue,
+						     XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString valueStr;
+	XMPUtils::ConvertFromInt64 ( propValue, "", &valueStr );
+	SetProperty ( schemaNS, propName, valueStr.c_str(), options );
+	
+}	// SetProperty_Int64
+
+
+// -------------------------------------------------------------------------------------------------
+// SetProperty_Float
+// -----------------
+
+void
+XMPMeta::SetProperty_Float ( XMP_StringPtr	schemaNS,
+							 XMP_StringPtr	propName,
+							 double			propValue,
+							 XMP_OptionBits	options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString valueStr;
+	XMPUtils::ConvertFromFloat ( propValue, "", &valueStr );
+	SetProperty ( schemaNS, propName, valueStr.c_str(), options );
+	
+}	// SetProperty_Float
+
+
+// -------------------------------------------------------------------------------------------------
+// SetProperty_Date
+// ----------------
+
+void
+XMPMeta::SetProperty_Date ( XMP_StringPtr		   schemaNS,
+							XMP_StringPtr		   propName,
+							const	XMP_DateTime & propValue,
+							XMP_OptionBits		   options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// Enforced by wrapper.
+
+	XMP_VarString valueStr;
+	XMPUtils::ConvertFromDate ( propValue, &valueStr );
+	SetProperty ( schemaNS, propName, valueStr.c_str(), options );
+	
+}	// SetProperty_Date
+
+// =================================================================================================
+
diff --git a/XMPCore/source/XMPMeta-Parse.cpp b/XMPCore/source/XMPMeta-Parse.cpp
new file mode 100644
index 0000000..62b9404
--- /dev/null
+++ b/XMPCore/source/XMPMeta-Parse.cpp
@@ -0,0 +1,1277 @@
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "XMPCore/source/XMPMeta.hpp"
+#include "XMPCore/source/XMPUtils.hpp"
+
+#include "source/UnicodeInlines.incl_cpp"
+#include "source/UnicodeConversions.hpp"
+#include "source/ExpatAdapter.hpp"
+
+#if XMP_DebugBuild
+	#include <iostream>
+#endif
+
+using namespace std;
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
+	#pragma warning ( disable : 4702 )	// unreachable code
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+
+// *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
+// *** Add debug codegen checks, e.g. that typical masking operations really work
+// *** Change all uses of strcmp and strncmp to XMP_LitMatch and XMP_LitNMatch
+
+
+// =================================================================================================
+// Local Types and Constants
+// =========================
+
+
+// =================================================================================================
+// Static Variables
+// ================
+
+#ifndef Trace_ParsingHackery
+	#define Trace_ParsingHackery 0
+#endif
+
+static const char * kReplaceLatin1[128] =
+	{
+
+		// The 0x80..0x9F range is undefined in Latin-1, but is defined in Windows code page 1252.
+		// The bytes 0x81, 0x8D, 0x8F, 0x90, and 0x9D are formally undefined by Windows 1252, but
+		// their conversion API maps them to U+0081, etc. These are in XML's RestrictedChar set, so
+		// we map them to a space.
+		
+		"\xE2\x82\xAC", " ",            "\xE2\x80\x9A", "\xC6\x92",		// 0x80 .. 0x83
+		"\xE2\x80\x9E", "\xE2\x80\xA6", "\xE2\x80\xA0", "\xE2\x80\xA1",	// 0x84 .. 0x87
+		"\xCB\x86",     "\xE2\x80\xB0", "\xC5\xA0",     "\xE2\x80\xB9",	// 0x88 .. 0x8B
+		"\xC5\x92",     " ",            "\xC5\xBD",     " ",			// 0x8C .. 0x8F
+
+		" ",            "\xE2\x80\x98", "\xE2\x80\x99", "\xE2\x80\x9C",	// 0x90 .. 0x93
+		"\xE2\x80\x9D", "\xE2\x80\xA2", "\xE2\x80\x93", "\xE2\x80\x94",	// 0x94 .. 0x97
+		"\xCB\x9C",     "\xE2\x84\xA2", "\xC5\xA1",     "\xE2\x80\xBA",	// 0x98 .. 0x9B
+		"\xC5\x93",     " ",            "\xC5\xBE",     "\xC5\xB8",		// 0x9C .. 0x9F
+
+		// These are the UTF-8 forms of the official Latin-1 characters in the range 0xA0..0xFF. Not
+		// too surprisingly these map to U+00A0, etc. Which is the Unicode Latin Supplement range.
+		
+		"\xC2\xA0", "\xC2\xA1", "\xC2\xA2", "\xC2\xA3", "\xC2\xA4", "\xC2\xA5", "\xC2\xA6", "\xC2\xA7",	// 0xA0 .. 0xA7
+		"\xC2\xA8", "\xC2\xA9", "\xC2\xAA", "\xC2\xAB", "\xC2\xAC", "\xC2\xAD", "\xC2\xAE", "\xC2\xAF",	// 0xA8 .. 0xAF
+
+		"\xC2\xB0", "\xC2\xB1", "\xC2\xB2", "\xC2\xB3", "\xC2\xB4", "\xC2\xB5", "\xC2\xB6", "\xC2\xB7",	// 0xB0 .. 0xB7
+		"\xC2\xB8", "\xC2\xB9", "\xC2\xBA", "\xC2\xBB", "\xC2\xBC", "\xC2\xBD", "\xC2\xBE", "\xC2\xBF",	// 0xB8 .. 0xBF
+
+		"\xC3\x80", "\xC3\x81", "\xC3\x82", "\xC3\x83", "\xC3\x84", "\xC3\x85", "\xC3\x86", "\xC3\x87",	// 0xC0 .. 0xC7
+		"\xC3\x88", "\xC3\x89", "\xC3\x8A", "\xC3\x8B", "\xC3\x8C", "\xC3\x8D", "\xC3\x8E", "\xC3\x8F",	// 0xC8 .. 0xCF
+
+		"\xC3\x90", "\xC3\x91", "\xC3\x92", "\xC3\x93", "\xC3\x94", "\xC3\x95", "\xC3\x96", "\xC3\x97",	// 0xD0 .. 0xD7
+		"\xC3\x98", "\xC3\x99", "\xC3\x9A", "\xC3\x9B", "\xC3\x9C", "\xC3\x9D", "\xC3\x9E", "\xC3\x9F",	// 0xD8 .. 0xDF
+
+		"\xC3\xA0", "\xC3\xA1", "\xC3\xA2", "\xC3\xA3", "\xC3\xA4", "\xC3\xA5", "\xC3\xA6", "\xC3\xA7",	// 0xE0 .. 0xE7
+		"\xC3\xA8", "\xC3\xA9", "\xC3\xAA", "\xC3\xAB", "\xC3\xAC", "\xC3\xAD", "\xC3\xAE", "\xC3\xAF",	// 0xE8 .. 0xEF
+
+		"\xC3\xB0", "\xC3\xB1", "\xC3\xB2", "\xC3\xB3", "\xC3\xB4", "\xC3\xB5", "\xC3\xB6", "\xC3\xB7",	// 0xF0 .. 0xF7
+		"\xC3\xB8", "\xC3\xB9", "\xC3\xBA", "\xC3\xBB", "\xC3\xBC", "\xC3\xBD", "\xC3\xBE", "\xC3\xBF",	// 0xF8 .. 0xFF
+
+	};
+
+
+// =================================================================================================
+// Local Utilities
+// ===============
+
+
+#define IsHexDigit(ch)		( (('0' <= (ch)) && ((ch) <= '9')) || (('A' <= (ch)) && ((ch) <= 'F')) )
+#define HexDigitValue(ch)	( (((ch) - '0') < 10) ? ((ch) - '0') : ((ch) - 'A' + 10) )
+
+
+// -------------------------------------------------------------------------------------------------
+// PickBestRoot
+// ------------
+//
+// Pick the first x:xmpmeta among multiple root candidates. If there aren't any, pick the first bare
+// rdf:RDF if that is allowed. The returned root is the rdf:RDF child if an x:xmpmeta element was
+// chosen.  The search is breadth first, so a higher level candiate is chosen over a lower level one
+// that was textually earlier in the serialized XML.
+
+static const XML_Node * PickBestRoot ( const XML_Node & xmlParent, XMP_OptionBits options )
+{
+
+	// Look among this parent's content for x:xmpmeta. The recursion for x:xmpmeta is broader than
+	// the strictly defined choice, but gives us smaller code.
+	for ( size_t childNum = 0, childLim = xmlParent.content.size(); childNum < childLim; ++childNum ) {
+		const XML_Node * childNode = xmlParent.content[childNum];
+		if ( childNode->kind != kElemNode ) continue;
+		if ( (childNode->name == "x:xmpmeta") || (childNode->name == "x:xapmeta") ) return PickBestRoot ( *childNode, 0 );
+	}
+	// Look among this parent's content for a bare rdf:RDF if that is allowed.
+	if ( ! (options & kXMP_RequireXMPMeta) ) {
+		for ( size_t childNum = 0, childLim = xmlParent.content.size(); childNum < childLim; ++childNum ) {
+			const XML_Node * childNode = xmlParent.content[childNum];
+			if ( childNode->kind != kElemNode ) continue;
+			if ( childNode->name == "rdf:RDF" ) return childNode;
+		}
+	}
+	
+	// Recurse into the content.
+	for ( size_t childNum = 0, childLim = xmlParent.content.size(); childNum < childLim; ++childNum ) {
+		const XML_Node * foundRoot = PickBestRoot ( *xmlParent.content[childNum], options );
+		if ( foundRoot != 0 ) return foundRoot;
+	}
+	
+	return 0;
+
+}	// PickBestRoot
+
+// -------------------------------------------------------------------------------------------------
+// FindRootNode
+// ------------
+//
+// Find the XML node that is the root of the XMP data tree. Generally this will be an outer node,
+// but it could be anywhere if a general XML document is parsed (e.g. SVG). The XML parser counted
+// all possible root nodes, and kept a pointer to the last one. If there is more than one possible
+// root use PickBestRoot to choose among them.
+//
+// If there is a root node, try to extract the version of the previous XMP toolkit.
+
+static const XML_Node * FindRootNode ( const XMLParserAdapter & xmlParser, XMP_OptionBits options )
+{
+	const XML_Node * rootNode = xmlParser.rootNode;
+	
+	if ( xmlParser.rootCount > 1 ) rootNode = PickBestRoot ( xmlParser.tree, options );
+	if ( rootNode == 0 ) return 0;
+
+		XMP_Assert ( rootNode->name == "rdf:RDF" );
+	
+		if ( (options & kXMP_RequireXMPMeta) &&
+		     ((rootNode->parent == 0) ||
+		      ((rootNode->parent->name != "x:xmpmeta") && (rootNode->parent->name != "x:xapmeta"))) ) return 0;
+		
+	return rootNode;
+	
+}	// FindRootNode
+
+// -------------------------------------------------------------------------------------------------
+// NormalizeDCArrays
+// -----------------
+//
+// Undo the denormalization performed by the XMP used in Acrobat 5. If a Dublin Core array had only
+// one item, it was serialized as a simple property. The xml:lang attribute was dropped from an
+// alt-text item if the language was x-default.
+
+// *** This depends on the dc: namespace prefix.
+
+static void
+NormalizeDCArrays ( XMP_Node * xmpTree )
+{
+	XMP_Node * dcSchema = FindSchemaNode ( xmpTree, kXMP_NS_DC, kXMP_ExistingOnly );
+	if ( dcSchema == 0 ) return;
+	
+	for ( size_t propNum = 0, propLimit = dcSchema->children.size(); propNum < propLimit; ++propNum ) {
+		XMP_Node *     currProp  = dcSchema->children[propNum];
+		XMP_OptionBits arrayForm = 0;
+		
+		if ( ! XMP_PropIsSimple ( currProp->options ) ) continue;	// Nothing to do if not simple.
+		
+		if ( (currProp->name == "dc:creator" )     ||	// See if it is supposed to be an array.
+		     (currProp->name == "dc:date" ) ) {			// *** Think about an array of char* and a loop.
+			arrayForm = kXMP_PropArrayIsOrdered;
+		} else if (
+		     (currProp->name == "dc:description" ) ||
+		     (currProp->name == "dc:rights" )      ||
+		     (currProp->name == "dc:title" ) ) {
+			arrayForm = kXMP_PropArrayIsAltText;
+		} else if (
+		     (currProp->name == "dc:contributor" ) ||
+		     (currProp->name == "dc:language" )    ||
+		     (currProp->name == "dc:publisher" )   ||
+		     (currProp->name == "dc:relation" )    ||
+		     (currProp->name == "dc:subject" )     ||
+		     (currProp->name == "dc:type" ) ) {
+			arrayForm = kXMP_PropValueIsArray;
+		}
+		if ( arrayForm == 0 ) continue;	// Nothing to do if it isn't supposed to be an array.
+		
+		arrayForm = VerifySetOptions ( arrayForm, 0 );	// Set the implicit array bits.
+		XMP_Node * newArray = new XMP_Node ( dcSchema, currProp->name.c_str(), arrayForm );
+		dcSchema->children[propNum] = newArray;
+		
+		if ( currProp->value.empty() ) {	// Don't add an empty item, leave the array empty.
+		
+			delete ( currProp );
+		
+		} else {
+		
+			newArray->children.push_back ( currProp );
+			currProp->parent = newArray;
+			currProp->name = kXMP_ArrayItemName;
+			
+			if ( XMP_ArrayIsAltText ( arrayForm ) && (! (currProp->options & kXMP_PropHasLang)) ) {
+				XMP_Node * newLang = new XMP_Node ( currProp, "xml:lang", "x-default", kXMP_PropIsQualifier );
+				currProp->options |= (kXMP_PropHasQualifiers | kXMP_PropHasLang);
+				if ( currProp->qualifiers.empty() ) {	// *** Need a util?
+					currProp->qualifiers.push_back ( newLang );
+				} else {
+					currProp->qualifiers.insert ( currProp->qualifiers.begin(), newLang );
+				}
+			}
+		
+		}
+
+	}
+	
+}	// NormalizeDCArrays
+
+
+// -------------------------------------------------------------------------------------------------
+// CompareAliasedSubtrees
+// ----------------------
+
+// *** Change to do some alias-specific setup, then use CompareSubtrees. One special case for
+// *** aliases is a simple to x-default alias, the options and qualifiers obviously differ.
+
+static void
+CompareAliasedSubtrees ( XMP_Node * aliasNode, XMP_Node * baseNode,
+						 XMPMeta::ErrorCallbackInfo & errorCallback, bool outerCall = true )
+{
+	// ! The outermost call is special. The names almost certainly differ. The qualifiers (and
+	// ! hence options) will differ for an alias to the x-default item of a langAlt array.
+
+	if ( (aliasNode->value != baseNode->value) ||
+	     (aliasNode->children.size() != baseNode->children.size()) ) {
+	    // Keep things simple for now. Aliases are virtually unused, so this is very unlikely to
+	    // happen. Recovery can be added later if it becomes important.
+	    XMP_Error error(kXMPErr_BadXMP, "Mismatch between alias and base nodes");
+	    errorCallback.NotifyClient ( kXMPErrSev_OperationFatal, error );
+	}
+
+	if ( ! outerCall ) {
+		if ( (aliasNode->name != baseNode->name) ||
+		     (aliasNode->options != baseNode->options) ||
+		     (aliasNode->qualifiers.size() != baseNode->qualifiers.size()) ) {
+			// Keep things simple for now. Aliases are virtually unused, so this is very unlikely to
+			// happen. Recovery can be added later if it becomes important.
+			XMP_Error error(kXMPErr_BadXMP, "Mismatch between alias and base nodes");
+			errorCallback.NotifyClient ( kXMPErrSev_OperationFatal, error );
+		}
+	}
+	
+	for ( size_t childNum = 0, childLim = aliasNode->children.size(); childNum < childLim; ++childNum ) {
+		XMP_Node * aliasChild = aliasNode->children[childNum];
+		XMP_Node * baseChild  = baseNode->children[childNum];
+		CompareAliasedSubtrees ( aliasChild, baseChild, errorCallback, false );
+	}
+	
+	for ( size_t qualNum = 0, qualLim = aliasNode->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+		XMP_Node * aliasQual = aliasNode->qualifiers[qualNum];
+		XMP_Node * baseQual  = baseNode->qualifiers[qualNum];
+		CompareAliasedSubtrees ( aliasQual, baseQual, errorCallback, false );
+	}
+	
+}	// CompareAliasedSubtrees
+
+
+// -------------------------------------------------------------------------------------------------
+// TransplantArrayItemAlias
+// ------------------------
+
+static void
+TransplantArrayItemAlias ( XMP_Node * oldParent, size_t oldNum, XMP_Node * newParent,
+						   XMPMeta::ErrorCallbackInfo & errorCallback )
+{
+	XMP_Node * childNode = oldParent->children[oldNum];
+
+	if ( newParent->options & kXMP_PropArrayIsAltText ) {
+		if ( childNode->options & kXMP_PropHasLang ) {
+		    // Keep things simple for now. Aliases are virtually unused, so this is very unlikely to
+		    // happen. Recovery can be added later if it becomes important.
+		    XMP_Error error(kXMPErr_BadXMP, "Alias to x-default already has a language qualifier");
+		    errorCallback.NotifyClient ( kXMPErrSev_OperationFatal, error );	// *** Allow x-default.
+		}
+		childNode->options |= (kXMP_PropHasQualifiers | kXMP_PropHasLang);
+		XMP_Node * langQual = new XMP_Node ( childNode, "xml:lang", "x-default", kXMP_PropIsQualifier );	// *** AddLangQual util?
+		if ( childNode->qualifiers.empty() ) {
+			childNode->qualifiers.push_back ( langQual );
+		} else {
+			childNode->qualifiers.insert ( childNode->qualifiers.begin(), langQual );
+		}
+	}
+
+	oldParent->children.erase ( oldParent->children.begin() + oldNum );
+	childNode->name = kXMP_ArrayItemName;
+	childNode->parent = newParent;
+	if ( newParent->children.empty() ) {
+		newParent->children.push_back ( childNode );
+	} else {
+		newParent->children.insert ( newParent->children.begin(), childNode );
+	}
+
+}	// TransplantArrayItemAlias
+
+
+// -------------------------------------------------------------------------------------------------
+// TransplantNamedAlias
+// --------------------
+
+static void
+TransplantNamedAlias ( XMP_Node * oldParent, size_t oldNum, XMP_Node * newParent, XMP_VarString & newName )
+{
+	XMP_Node * childNode = oldParent->children[oldNum];
+
+	oldParent->children.erase ( oldParent->children.begin() + oldNum );
+	childNode->name = newName;
+	childNode->parent = newParent;
+	newParent->children.push_back ( childNode );
+
+}	// TransplantNamedAlias
+
+
+// -------------------------------------------------------------------------------------------------
+// MoveExplicitAliases
+// -------------------
+
+static void
+MoveExplicitAliases ( XMP_Node * tree, XMP_OptionBits parseOptions, XMPMeta::ErrorCallbackInfo & errorCallback )
+{
+	tree->options ^= kXMP_PropHasAliases;
+	const bool strictAliasing = ((parseOptions & kXMP_StrictAliasing) != 0);
+	
+	// Visit all of the top level nodes looking for aliases. If there is no base, transplant the
+	// alias subtree. If there is a base and strict aliasing is on, make sure the alias and base 
+	// subtrees match.
+	
+	// ! Use "while" loops not "for" loops since both the schema and property loops can remove the
+	// ! current item from the vector being traversed. And don't increment the counter for a delete.
+	
+	size_t schemaNum = 0;
+	while ( schemaNum < tree->children.size() ) {
+		XMP_Node * currSchema = tree->children[schemaNum];
+		
+		size_t propNum = 0;
+		while ( propNum < currSchema->children.size() ) {
+			XMP_Node * currProp = currSchema->children[propNum];
+			if ( ! (currProp->options & kXMP_PropIsAlias) ) {
+				++propNum;
+				continue;
+			}
+			currProp->options ^= kXMP_PropIsAlias;
+
+			// Find the base path, look for the base schema and root node.
+
+			XMP_AliasMapPos aliasPos = sRegisteredAliasMap->find ( currProp->name );
+			XMP_Assert ( aliasPos != sRegisteredAliasMap->end() );
+			XMP_ExpandedXPath & basePath = aliasPos->second;
+			XMP_OptionBits arrayOptions = (basePath[kRootPropStep].options & kXMP_PropArrayFormMask);
+
+			XMP_Node * baseSchema = FindSchemaNode ( tree, basePath[kSchemaStep].step.c_str(), kXMP_CreateNodes );
+			if ( baseSchema->options & kXMP_NewImplicitNode ) baseSchema->options ^= kXMP_NewImplicitNode;
+			XMP_Node * baseNode = FindChildNode ( baseSchema, basePath[kRootPropStep].step.c_str(), kXMP_ExistingOnly );
+
+			if ( baseNode == 0 ) {
+			
+				if ( basePath.size() == 2 ) {
+					// A top-to-top alias, transplant the property.
+					TransplantNamedAlias ( currSchema, propNum, baseSchema, basePath[kRootPropStep].step );
+				} else {
+					// An alias to an array item, create the array and transplant the property.
+					baseNode = new XMP_Node ( baseSchema, basePath[kRootPropStep].step.c_str(), arrayOptions );
+					baseSchema->children.push_back ( baseNode );
+					TransplantArrayItemAlias ( currSchema, propNum, baseNode, errorCallback );
+				}
+			
+			} else if ( basePath.size() == 2 ) {
+			
+				// The base node does exist and this is a top-to-top alias. Check for conflicts if
+				// strict aliasing is on. Remove and delete the alias subtree.
+				if ( strictAliasing ) CompareAliasedSubtrees ( currProp, baseNode, errorCallback );
+				currSchema->children.erase ( currSchema->children.begin() + propNum );
+				delete currProp;
+			
+			} else {
+			
+				// This is an alias to an array item and the array exists. Look for the aliased item.
+				// Then transplant or check & delete as appropriate.
+				
+				XMP_Node * itemNode = 0;
+				if ( arrayOptions & kXMP_PropArrayIsAltText ) {
+					XMP_Index xdIndex = LookupLangItem ( baseNode, *xdefaultName );
+					if ( xdIndex != -1 ) itemNode = baseNode->children[xdIndex];
+				} else if ( ! baseNode->children.empty() ) {
+					itemNode = baseNode->children[0];
+				}
+				
+				if ( itemNode == 0 ) {
+					TransplantArrayItemAlias ( currSchema, propNum, baseNode, errorCallback );
+				} else {
+					if ( strictAliasing ) CompareAliasedSubtrees ( currProp, itemNode, errorCallback );
+					currSchema->children.erase ( currSchema->children.begin() + propNum );
+					delete currProp;
+				}
+
+			}
+
+		}	// Property loop
+		
+		// Increment the counter or remove an empty schema node.
+		if ( currSchema->children.size() > 0 ) {
+			++schemaNum;
+		} else {
+			delete tree->children[schemaNum];	// ! Delete the schema node itself.
+			tree->children.erase ( tree->children.begin() + schemaNum );
+		}
+		
+	}	// Schema loop
+	
+}	// MoveExplicitAliases
+
+
+// -------------------------------------------------------------------------------------------------
+// FixGPSTimeStamp
+// ---------------
+
+static void
+FixGPSTimeStamp ( XMP_Node * exifSchema, XMP_Node * gpsDateTime )
+{
+	XMP_DateTime binGPSStamp;
+	try {
+		XMPUtils::ConvertToDate ( gpsDateTime->value.c_str(), &binGPSStamp );
+	} catch ( ... ) {
+		return;	// Don't let a bad date stop other things.
+	}
+	if ( (binGPSStamp.year != 0) || (binGPSStamp.month != 0) || (binGPSStamp.day != 0) ) return;
+	
+	XMP_Node * otherDate = FindChildNode ( exifSchema, "exif:DateTimeOriginal", kXMP_ExistingOnly );
+	if ( otherDate == 0 ) otherDate = FindChildNode ( exifSchema, "exif:DateTimeDigitized", kXMP_ExistingOnly );
+	if ( otherDate == 0 ) return;
+
+	XMP_DateTime binOtherDate;
+	try {
+		XMPUtils::ConvertToDate ( otherDate->value.c_str(), &binOtherDate );
+	} catch ( ... ) {
+		return;	// Don't let a bad date stop other things.
+	}
+	
+	binGPSStamp.year  = binOtherDate.year;
+	binGPSStamp.month = binOtherDate.month;
+	binGPSStamp.day   = binOtherDate.day;
+
+	XMPUtils::ConvertFromDate ( binGPSStamp, &gpsDateTime->value );
+
+}	// FixGPSTimeStamp
+
+
+// -------------------------------------------------------------------------------------------------
+// MigrateAudioCopyright
+// ---------------------
+//
+// The initial support for WAV files mapped a legacy ID3 audio copyright into a new xmpDM:copyright
+// property. This is special case code to migrate that into dc:rights['x-default']. The rules:
+//
+//   1. If there is no dc:rights array, or an empty array -
+//      Create one with dc:rights['x-default'] set from double linefeed and xmpDM:copyright.
+//
+//   2. If there is a dc:rights array but it has no x-default item -
+//      Create an x-default item as a copy of the first item then apply rule #3.
+//
+//   3. If there is a dc:rights array with an x-default item, look for a double linefeed in the value.
+//      A. If no double linefeed, compare the x-default value to the xmpDM:copyright value.
+//         A1. If they match then leave the x-default value alone.
+//         A2. Otherwise, append a double linefeed and the xmpDM:copyright value to the x-default value.
+//      B. If there is a double linefeed, compare the trailing text to the xmpDM:copyright value.
+//         B1. If they match then leave the x-default value alone.
+//         B2. Otherwise, replace the trailing x-default text with the xmpDM:copyright value.
+//
+//   4. In all cases, delete the xmpDM:copyright property.
+
+static void
+MigrateAudioCopyright ( XMPMeta * xmp, XMP_Node * dmCopyright )
+{
+
+	try {
+	
+		std::string & dmValue = dmCopyright->value;
+		static const char * kDoubleLF = "\xA\xA";
+		
+		XMP_Node * dcSchema = FindSchemaNode ( &xmp->tree, kXMP_NS_DC, kXMP_CreateNodes );
+		XMP_Node * dcRightsArray = FindChildNode ( dcSchema, "dc:rights", kXMP_ExistingOnly );
+		
+		if ( (dcRightsArray == 0) || dcRightsArray->children.empty() ) {
+		
+			// 1. No dc:rights array, create from double linefeed and xmpDM:copyright.
+			dmValue.insert ( 0, kDoubleLF );
+			xmp->SetLocalizedText ( kXMP_NS_DC, "rights", "", "x-default",  dmValue.c_str(), 0 );
+		
+		} else {
+
+			std::string xdefaultStr ( "x-default" );
+			
+			XMP_Index xdIndex = LookupLangItem ( dcRightsArray, xdefaultStr );
+			
+			if ( xdIndex < 0 ) {
+				// 2. No x-default item, create from the first item.
+				XMP_StringPtr firstValue = dcRightsArray->children[0]->value.c_str();
+				xmp->SetLocalizedText ( kXMP_NS_DC, "rights", "", "x-default",  firstValue, 0 );
+				xdIndex = LookupLangItem ( dcRightsArray, xdefaultStr );
+			}
+						
+			// 3. Look for a double linefeed in the x-default value.
+			XMP_Assert ( xdIndex == 0 );
+			std::string & defaultValue = dcRightsArray->children[xdIndex]->value;
+			XMP_Index lfPos = defaultValue.find ( kDoubleLF );
+			
+			if ( lfPos < 0 ) {
+			
+				// 3A. No double LF, compare whole values.
+				if ( dmValue != defaultValue ) {
+					// 3A2. Append the xmpDM:copyright to the x-default item.
+					defaultValue += kDoubleLF;
+					defaultValue += dmValue;
+				}
+			
+			} else {
+			
+				// 3B. Has double LF, compare the tail.
+				if ( defaultValue.compare ( lfPos+2, std::string::npos, dmValue ) != 0 ) {
+					// 3B2. Replace the x-default tail.
+					defaultValue.replace ( lfPos+2, std::string::npos, dmValue );
+				}
+			
+			}
+
+		}
+		
+		// 4. Get rid of the xmpDM:copyright.
+		xmp->DeleteProperty ( kXMP_NS_DM, "copyright" );
+	
+	} catch ( ... ) {
+		// Don't let failures (like a bad dc:rights form) stop other cleanup.
+	}
+
+}	// MigrateAudioCopyright
+
+
+// -------------------------------------------------------------------------------------------------
+// RepairAltText
+// -------------
+//
+// Make sure that the array is well-formed AltText. Each item must be simple and have an xml:lang
+// qualifier. If repairs are needed, keep simple non-empty items by adding the xml:lang.
+
+static void
+RepairAltText ( XMP_Node & tree, XMP_StringPtr schemaNS, XMP_StringPtr arrayName )
+{
+	XMP_Node * schemaNode = FindSchemaNode ( &tree, schemaNS, kXMP_ExistingOnly );
+	if ( schemaNode == 0 ) return;
+	
+	XMP_Node * arrayNode = FindChildNode ( schemaNode, arrayName, kXMP_ExistingOnly );
+	if ( (arrayNode == 0) || XMP_ArrayIsAltText ( arrayNode->options ) ) return;	// Already OK.
+	
+	if ( ! XMP_PropIsArray ( arrayNode->options ) ) return;	// ! Not even an array, leave it alone.
+	// *** Should probably change simple values to LangAlt with 'x-default' item.
+	
+	arrayNode->options |= (kXMP_PropArrayIsOrdered | kXMP_PropArrayIsAlternate | kXMP_PropArrayIsAltText);
+	
+	for ( int i = arrayNode->children.size()-1; i >= 0; --i ) {	// ! Need a signed index type.
+
+		XMP_Node * currChild = arrayNode->children[i];
+
+		if ( ! XMP_PropIsSimple ( currChild->options ) ) {
+
+			// Delete non-simple children.
+			delete ( currChild );
+			arrayNode->children.erase ( arrayNode->children.begin() + i );
+
+		} else if ( ! XMP_PropHasLang ( currChild->options ) ) {
+		
+			if ( currChild->value.empty() ) {
+
+				// Delete empty valued children that have no xml:lang.
+				delete ( currChild );
+				arrayNode->children.erase ( arrayNode->children.begin() + i );
+
+			} else {
+
+				// Add an xml:lang qualifier with the value "x-repair".
+				XMP_Node * repairLang = new XMP_Node ( currChild, "xml:lang", "x-repair", kXMP_PropIsQualifier );
+				if ( currChild->qualifiers.empty() ) {
+					currChild->qualifiers.push_back ( repairLang );
+				} else {
+					currChild->qualifiers.insert ( currChild->qualifiers.begin(), repairLang );
+				}
+				currChild->options |= (kXMP_PropHasQualifiers | kXMP_PropHasLang);
+
+			}
+
+		}
+
+	}
+
+}	// RepairAltText
+
+
+// -------------------------------------------------------------------------------------------------
+// TouchUpDataModel
+// ----------------
+
+static void
+TouchUpDataModel ( XMPMeta * xmp, XMPMeta::ErrorCallbackInfo & errorCallback )
+{
+	XMP_Node & tree = xmp->tree;
+	
+	// Do special case touch ups for certain schema.
+
+	XMP_Node * currSchema = 0;
+
+	currSchema = FindSchemaNode ( &tree, kXMP_NS_EXIF, kXMP_ExistingOnly );
+	if ( currSchema != 0 ) {
+
+		// Do a special case fix for exif:GPSTimeStamp.
+		XMP_Node * gpsDateTime = FindChildNode ( currSchema, "exif:GPSTimeStamp", kXMP_ExistingOnly );
+		if ( gpsDateTime != 0 ) FixGPSTimeStamp ( currSchema, gpsDateTime );
+	
+		// *** Should probably have RepairAltText change simple values to LangAlt with 'x-default' item.
+		// *** For now just do this for exif:UserComment, the one case we know about, late in cycle fix.
+		XMP_Node * userComment = FindChildNode ( currSchema, "exif:UserComment", kXMP_ExistingOnly );
+		if ( (userComment != 0) && XMP_PropIsSimple ( userComment->options ) ) {
+			XMP_Node * newChild = new XMP_Node ( userComment, kXMP_ArrayItemName,
+												 userComment->value.c_str(), userComment->options );
+			newChild->qualifiers.swap ( userComment->qualifiers );
+			if ( ! XMP_PropHasLang ( newChild->options ) ) {
+				XMP_Node * langQual = new XMP_Node ( newChild, "xml:lang", "x-default", kXMP_PropIsQualifier );
+				newChild->qualifiers.insert ( newChild->qualifiers.begin(), langQual );
+				newChild->options |= (kXMP_PropHasQualifiers | kXMP_PropHasLang);
+			}
+			userComment->value.erase();
+			userComment->options = kXMP_PropArrayFormMask;	// ! Happens to have all the right bits.
+			userComment->children.push_back ( newChild );
+		}
+
+	}
+
+	currSchema = FindSchemaNode ( &tree, kXMP_NS_DM, kXMP_ExistingOnly );
+	if ( currSchema != 0 ) {
+		// Do a special case migration of xmpDM:copyright to dc:rights['x-default']. Do this before
+		// the dc: touch up since it can affect the dc: schema.
+		XMP_Node * dmCopyright = FindChildNode ( currSchema, "xmpDM:copyright", kXMP_ExistingOnly );
+		if ( dmCopyright != 0 ) MigrateAudioCopyright ( xmp, dmCopyright );
+	}
+
+	currSchema = FindSchemaNode ( &tree, kXMP_NS_DC, kXMP_ExistingOnly );
+	if ( currSchema != 0 ) {
+		// Do a special case fix for dc:subject, make sure it is an unordered array.
+		XMP_Node * dcSubject = FindChildNode ( currSchema, "dc:subject", kXMP_ExistingOnly );
+		if ( dcSubject != 0 ) {
+			XMP_OptionBits keepMask = ~(kXMP_PropArrayIsOrdered | kXMP_PropArrayIsAlternate | kXMP_PropArrayIsAltText);
+			dcSubject->options &= keepMask;	// Make sure any ordered array bits are clear.
+		}
+	}
+	
+	// Fix any broken AltText arrays that we know about.
+	
+	RepairAltText ( tree, kXMP_NS_DC, "dc:description" );	// ! Note inclusion of prefixes for direct node lookup!
+	RepairAltText ( tree, kXMP_NS_DC, "dc:rights" );
+	RepairAltText ( tree, kXMP_NS_DC, "dc:title" );
+	RepairAltText ( tree, kXMP_NS_XMP_Rights, "xmpRights:UsageTerms" );
+	RepairAltText ( tree, kXMP_NS_EXIF, "exif:UserComment" );
+	
+	// Tweak old XMP: Move an instance ID from rdf:about to the xmpMM:InstanceID property. An old
+	// instance ID usually looks like "uuid:bac965c4-9d87-11d9-9a30-000d936b79c4", plus InDesign
+	// 3.0 wrote them like "bac965c4-9d87-11d9-9a30-000d936b79c4". If the name looks like a UUID
+	// simply move it to xmpMM:InstanceID, don't worry about any existing xmpMM:InstanceID. Both
+	// will only be present when a newer file with the xmpMM:InstanceID property is updated by an
+	// old app that uses rdf:about.
+	
+	if ( ! tree.name.empty() ) {
+
+		bool nameIsUUID = false;
+		XMP_StringPtr nameStr = tree.name.c_str();
+
+		if ( XMP_LitNMatch ( nameStr, "uuid:", 5 ) ) {
+
+			nameIsUUID = true;
+
+		} else if ( tree.name.size() == 36 ) {
+
+			nameIsUUID = true;	// ! Assume true, we'll set it to false below if not.
+			for ( int i = 0;  i < 36; ++i ) {
+				char ch = nameStr[i];
+				if ( ch == '-' ) {
+					if ( (i == 8) || (i == 13) || (i == 18) || (i == 23) ) continue;
+					nameIsUUID = false;
+					break;
+				} else {
+					if ( (('0' <= ch) && (ch <= '9')) || (('a' <= ch) && (ch <= 'z')) ) continue;
+					nameIsUUID = false;
+					break;
+				}
+			}
+
+		}
+		
+		if ( nameIsUUID ) {
+
+			XMP_ExpandedXPath expPath;
+			ExpandXPath ( kXMP_NS_XMP_MM, "InstanceID", &expPath );
+			XMP_Node * idNode = FindNode ( &tree, expPath, kXMP_CreateNodes, 0 );
+			if ( idNode == 0 ) XMP_Throw ( "Failure creating xmpMM:InstanceID", kXMPErr_InternalFailure );
+
+			idNode->options = 0;	// Clobber any existing xmpMM:InstanceID.
+			idNode->value = tree.name;
+			idNode->RemoveChildren();
+			idNode->RemoveQualifiers();
+
+			tree.name.erase();
+
+		}
+
+	}
+
+}	// TouchUpDataModel
+
+
+// -------------------------------------------------------------------------------------------------
+// DetermineInputEncoding
+// ----------------------
+//
+// Try to determine the character encoding, making a guess if the input is too short. We make some
+// simplifying assumtions: the first character must be U+FEFF or ASCII, U+0000 is not allowed. The
+// XML 1.1 spec is even more strict, UTF-16 XML documents must begin with U+FEFF, and the first
+// "real" character must be '<'. Ignoring the XML declaration, the first XML character could be '<',
+// space, tab, CR, or LF.
+//
+// The possible input sequences are:
+//
+//   Cases with U+FEFF
+//      EF BB BF -- - UTF-8
+//      FE FF -- -- - Big endian UTF-16
+//      00 00 FE FF - Big endian UTF 32
+//      FF FE 00 00 - Little endian UTF-32
+//      FF FE -- -- - Little endian UTF-16
+//
+//   Cases with ASCII
+//      nn mm -- -- - UTF-8 -
+//      00 00 00 nn - Big endian UTF-32
+//      00 nn -- -- - Big endian UTF-16
+//      nn 00 00 00 - Little endian UTF-32
+//      nn 00 -- -- - Little endian UTF-16
+//
+// ! We don't check for full patterns, or for errors. We just check enough to determine what the
+// ! only possible (or reasonable) case would be.
+
+static XMP_OptionBits
+DetermineInputEncoding ( const XMP_Uns8 * buffer, size_t length )
+{
+	if ( length < 2 ) return kXMP_EncodeUTF8;
+	
+	XMP_Uns8 * uniChar = (XMP_Uns8*)buffer;	// ! Make sure comparisons are unsigned.
+	
+	if ( uniChar[0] == 0 ) {
+	
+		// These cases are:
+		//   00 nn -- -- - Big endian UTF-16
+		//   00 00 00 nn - Big endian UTF-32
+		//   00 00 FE FF - Big endian UTF 32
+
+		if ( (length < 4) || (uniChar[1] != 0) ) return kXMP_EncodeUTF16Big;
+		return kXMP_EncodeUTF32Big;
+		
+	} else if ( uniChar[0] < 0x80 ) {
+	
+		// These cases are:
+		//   nn mm -- -- - UTF-8, includes EF BB BF case
+		//   nn 00 00 00 - Little endian UTF-32
+		//   nn 00 -- -- - Little endian UTF-16
+
+		if ( uniChar[1] != 0 )  return kXMP_EncodeUTF8;
+		if ( (length < 4) || (uniChar[2] != 0) ) return kXMP_EncodeUTF16Little;
+		return kXMP_EncodeUTF32Little;
+
+	} else {
+	
+		// These cases are:
+		//   EF BB BF -- - UTF-8
+		//   FE FF -- -- - Big endian UTF-16
+		//   FF FE 00 00 - Little endian UTF-32
+		//   FF FE -- -- - Little endian UTF-16
+
+		if ( uniChar[0] == 0xEF ) return kXMP_EncodeUTF8;
+		if ( uniChar[0] == 0xFE ) return kXMP_EncodeUTF16Big;
+		if ( (length < 4) || (uniChar[2] != 0) ) return kXMP_EncodeUTF16Little;
+		return kXMP_EncodeUTF32Little;
+
+	}
+		
+}	// DetermineInputEncoding
+
+
+// -------------------------------------------------------------------------------------------------
+// CountUTF8
+// ---------
+//
+// Look for a valid multi-byte UTF-8 sequence and return its length. Returns 0 for an invalid UTF-8
+// sequence. Returns a negative value for a partial valid sequence at the end of the buffer.
+//
+// The checking is not strict. We simply count the number of high order 1 bits in the first byte,
+// then look for n-1 following bytes whose high order 2 bits are 1 and 0. We do not check for a
+// minimal length representation of the codepoint, or that the codepoint is defined by Unicode.
+
+static int
+CountUTF8 ( const XMP_Uns8 * charStart, const XMP_Uns8 * bufEnd )
+{
+	XMP_Assert ( charStart < bufEnd );		// Catch this in debug builds.
+	if ( charStart >= bufEnd ) return 0;	// Don't run-on in release builds.
+	if ( (*charStart & 0xC0) != 0xC0 ) return 0;	// Must have at least 2 high bits set.
+	
+	int byteCount = 2;
+	XMP_Uns8 firstByte = *charStart;
+	for ( firstByte = firstByte << 2; (firstByte & 0x80) != 0; firstByte = firstByte << 1 ) ++byteCount;
+	
+	if ( (charStart + byteCount) > bufEnd ) return -byteCount;
+
+	for ( int i = 1; i < byteCount; ++i ) {
+		if ( (charStart[i] & 0xC0) != 0x80 ) return 0;
+	}
+	
+	return byteCount;
+	
+}	// CountUTF8
+
+
+// -------------------------------------------------------------------------------------------------
+// CountControlEscape
+// ------------------
+//
+// Look for a numeric escape sequence for a "prohibited" ASCII control character. These are 0x7F,
+// and the range 0x00..0x1F except for tab/LF/CR. Return 0 if this is definitely not a numeric
+// escape, the length of the escape if found, or a negative value for a partial escape.
+
+static int
+CountControlEscape ( const XMP_Uns8 * escStart, const XMP_Uns8 * bufEnd )
+{
+	XMP_Assert ( escStart < bufEnd );	// Catch this in debug builds.
+	if ( escStart >= bufEnd ) return 0;	// Don't run-on in release builds.
+	XMP_Assert ( *escStart == '&' );
+	
+	size_t tailLen = bufEnd - escStart;
+	if ( tailLen < 5 ) return -1;	// Don't need a more thorough check, we'll catch it on the next pass.
+	
+	if ( strncmp ( (char*)escStart, "&#x", 3 ) != 0 ) return 0;
+	
+	XMP_Uns8 escValue = 0;
+	const XMP_Uns8 * escPos = escStart + 3;
+	
+	if ( ('0' <= *escPos) && (*escPos <= '9') ) {
+		escValue = *escPos - '0';
+		++escPos;
+	} else if ( ('A' <= *escPos) && (*escPos <= 'F') ) {
+		escValue = *escPos - 'A' + 10;
+		++escPos;
+	} else if ( ('a' <= *escPos) && (*escPos <= 'f') ) {
+		escValue = *escPos - 'a' + 10;
+		++escPos;
+	}
+	
+	if ( ('0' <= *escPos) && (*escPos <= '9') ) {
+		escValue = (escValue << 4) + (*escPos - '0');
+		++escPos;
+	} else if ( ('A' <= *escPos) && (*escPos <= 'F') ) {
+		escValue = (escValue << 4) + (*escPos - 'A' + 10);
+		++escPos;
+	} else if ( ('a' <= *escPos) && (*escPos <= 'f') ) {
+		escValue = (escValue << 4) + (*escPos - 'a' + 10);
+		++escPos;
+	}
+	
+	if ( escPos == bufEnd ) return -1;	// Partial escape.
+	if ( *escPos != ';' ) return 0;
+	
+	size_t escLen = escPos - escStart + 1;
+	if ( escLen < 5 ) return 0;	// ! Catch "&#x;".
+	
+	if ( (escValue == kTab) || (escValue == kLF) || (escValue == kCR) ) return 0;	// An allowed escape.
+	
+	return escLen;	// Found a full "prohibited" numeric escape.
+	
+}	// CountControlEscape
+
+
+// -------------------------------------------------------------------------------------------------
+// ProcessUTF8Portion
+// ------------------
+//
+// Early versions of the XMP spec mentioned allowing ISO Latin-1 input. There are also problems with
+// some clients placing ASCII control characters within XMP values. This is an XML problem, the XML
+// spec only allows tab (0x09), LF (0x0A), and CR (0x0D) from the 0x00..0x1F range. As a concession
+// to this we scan 8-bit input for byte sequences that are not valid UTF-8 or in the 0x00..0x1F
+// range and replace each byte as follows:
+//   0x00..0x1F - Replace with a space, except for tab, CR, and LF.
+//   0x7F       - Replace with a space. This is ASCII Delete, not allowed by ISO Latin-1.
+//   0x80..0x9F - Replace with the UTF-8 for a corresponding Unicode character.
+//   0xA0..0XFF - Replace with the UTF-8 for a corresponding Unicode character.
+//
+// The 0x80..0x9F range is not defined by Latin-1. But the Windows 1252 code page defines these and
+// is otherwise the same as Latin-1.
+//
+// For at least historical compatibility reasons we also find and replace singly escaped ASCII
+// control characters. The Expat parser we're using does not allow numeric escapes like "&#x10;".
+// The XML spec is clear that raw controls are not allowed (in the RestrictedChar set), but it isn't
+// as clear about numeric escapes for them. At any rate, Expat complains, so we treat the numeric
+// escapes like raw characters and replace them with a space.
+//
+// We check for 1 or 2 hex digits ("&#x9;" or "&#x09;") and upper or lower case ("&#xA;" or "&#xa;").
+// The full escape sequence is 5 or 6 bytes.
+
+static size_t
+ProcessUTF8Portion ( XMLParserAdapter * xmlParser,
+					 const XMP_Uns8 *   buffer,
+					 size_t				length,
+					 bool				last )
+{
+	const XMP_Uns8 * bufEnd = buffer + length;
+	
+	const XMP_Uns8 * spanStart = buffer;
+	const XMP_Uns8 * spanEnd;
+		
+	for ( spanEnd = spanStart; spanEnd < bufEnd; ++spanEnd ) {
+
+		if ( (0x20 <= *spanEnd) && (*spanEnd <= 0x7E) && (*spanEnd != '&') ) continue;	// A regular ASCII character.
+
+		if ( *spanEnd >= 0x80 ) {
+		
+			// See if this is a multi-byte UTF-8 sequence, or a Latin-1 character to replace.
+
+			int uniLen = CountUTF8 ( spanEnd, bufEnd );
+
+			if ( uniLen > 0 ) {
+
+				// A valid UTF-8 character, keep it as-is.
+				spanEnd += uniLen - 1;	// ! The loop increment will put back the +1.
+
+			} else if ( (uniLen < 0) && (! last) ) {
+
+				// Have a partial UTF-8 character at the end of the buffer and more input coming.
+				xmlParser->ParseBuffer ( spanStart, (spanEnd - spanStart), false );
+				return (spanEnd - buffer);
+
+			} else {
+
+				// Not a valid UTF-8 sequence. Replace the first byte with the Latin-1 equivalent.
+				xmlParser->ParseBuffer ( spanStart, (spanEnd - spanStart), false );
+				const char * replacement = kReplaceLatin1 [ *spanEnd - 0x80 ];
+				xmlParser->ParseBuffer ( replacement, strlen ( replacement ), false );
+				spanStart = spanEnd + 1;	// ! The loop increment will do "spanEnd = spanStart".
+
+			}
+		
+		} else if ( (*spanEnd < 0x20) || (*spanEnd == 0x7F) ) {
+
+			// Replace ASCII controls other than tab, LF, and CR with a space.
+
+			if ( (*spanEnd == kTab) || (*spanEnd == kLF) || (*spanEnd == kCR) ) continue;
+
+			xmlParser->ParseBuffer ( spanStart, (spanEnd - spanStart), false );
+			xmlParser->ParseBuffer ( " ", 1, false );
+			spanStart = spanEnd + 1;	// ! The loop increment will do "spanEnd = spanStart".
+		
+		} else {
+		
+			// See if this is a numeric escape sequence for a prohibited ASCII control.
+			
+			XMP_Assert ( *spanEnd == '&' );
+			int escLen = CountControlEscape ( spanEnd, bufEnd );
+			
+			if ( escLen < 0 ) {
+
+				// Have a partial numeric escape in this buffer, wait for more input.
+				if ( last ) continue;	// No more buffers, not an escape, absorb as normal input.
+				xmlParser->ParseBuffer ( spanStart, (spanEnd - spanStart), false );
+				return (spanEnd - buffer);
+
+			} else if ( escLen > 0 ) {
+
+				// Have a complete numeric escape to replace.
+				xmlParser->ParseBuffer ( spanStart, (spanEnd - spanStart), false );
+				xmlParser->ParseBuffer ( " ", 1, false );
+				spanStart = spanEnd + escLen;
+				spanEnd = spanStart - 1;	// ! The loop continuation will increment spanEnd!
+
+			}
+
+		}
+		
+	}
+	
+	XMP_Assert ( spanEnd == bufEnd );
+
+	if ( spanStart < bufEnd ) xmlParser->ParseBuffer ( spanStart, (spanEnd - spanStart), false );
+	if ( last ) xmlParser->ParseBuffer ( " ", 1, true );
+	
+	return length;
+
+}	// ProcessUTF8Portion
+
+
+// -------------------------------------------------------------------------------------------------
+// ProcessXMLBuffer
+// ----------------
+//
+// Process one buffer of XML. Returns false if this input is put into the pending input buffer.
+
+bool XMPMeta::ProcessXMLBuffer ( XMP_StringPtr buffer, XMP_StringLen xmpSize, bool lastClientCall )
+{
+
+	// Determine the character encoding before doing any real parsing. This is needed to do the
+	// 8-bit special processing. This has to be checked on every call, not just the first, in
+	// order to handle the edge case of single byte buffers.
+
+	XMLParserAdapter & parser = *this->xmlParser;
+		
+	if ( parser.charEncoding == XMP_OptionBits(-1) ) {
+
+		if ( (parser.pendingCount == 0) && (xmpSize >= kXMLPendingInputMax) ) {
+
+			// This ought to be the common case, the first buffer is big enough.
+			parser.charEncoding = DetermineInputEncoding ( (XMP_Uns8*)buffer, xmpSize );
+
+		} else {
+		
+			// Try to fill the pendingInput buffer before calling DetermineInputEncoding.
+
+			size_t pendingOverlap = kXMLPendingInputMax - parser.pendingCount;
+			if ( pendingOverlap > xmpSize ) pendingOverlap = xmpSize;
+
+			memcpy ( &parser.pendingInput[parser.pendingCount], buffer, pendingOverlap );	// AUDIT: Count is safe.
+			buffer += pendingOverlap;
+			xmpSize -= pendingOverlap;
+			parser.pendingCount += pendingOverlap;
+
+			if ( (! lastClientCall) && (parser.pendingCount < kXMLPendingInputMax) ) return false;	// Wait for the next buffer.
+			parser.charEncoding = DetermineInputEncoding ( parser.pendingInput, parser.pendingCount );
+			
+			#if Trace_ParsingHackery
+				fprintf ( stderr, "XMP Character encoding is %d\n", parser.charEncoding );
+			#endif
+		
+		}
+
+	}
+	
+	// We have the character encoding. Process UTF-16 and UTF-32 as is. UTF-8 needs special
+	// handling to take care of things like ISO Latin-1 or unescaped ASCII controls.
+
+	XMP_Assert ( parser.charEncoding != XMP_OptionBits(-1) );
+
+	if ( parser.charEncoding != kXMP_EncodeUTF8 ) {
+	
+		if ( parser.pendingCount > 0 ) {
+			// Might have pendingInput from the above portion to determine the character encoding.
+			parser.ParseBuffer ( parser.pendingInput, parser.pendingCount, false );
+		}
+		parser.ParseBuffer ( buffer, xmpSize, lastClientCall );
+		
+	} else {
+
+		#if Trace_ParsingHackery
+			fprintf ( stderr, "Parsing %d bytes @ %.8X, %s, %d pending, context: %.8s\n",
+					  xmpSize, buffer, (lastClientCall ? "last" : "not last"), parser.pendingCount, buffer );
+		#endif
+
+		// The UTF-8 processing is a bit complex due to the need to tolerate ISO Latin-1 input.
+		// This is done by scanning the input for byte sequences that are not valid UTF-8,
+		// assuming they are Latin-1 characters in the range 0x80..0xFF. This requires saving a
+		// pending input buffer to handle partial UTF-8 sequences at the end of a buffer.
+		
+		while ( parser.pendingCount > 0 ) {
+		
+			// We've got some leftover input, process it first then continue with the current
+			// buffer. Try to fill the pendingInput buffer before parsing further. We use a loop
+			// for wierd edge cases like a 2 byte input buffer, using 1 byte for pendingInput,
+			// then having a partial UTF-8 end and need to absorb more.
+			
+			size_t pendingOverlap = kXMLPendingInputMax - parser.pendingCount;
+			if ( pendingOverlap > xmpSize ) pendingOverlap = xmpSize;
+			
+			memcpy ( &parser.pendingInput[parser.pendingCount], buffer, pendingOverlap );	// AUDIT: Count is safe.
+			parser.pendingCount += pendingOverlap;
+			buffer += pendingOverlap;
+			xmpSize -= pendingOverlap;
+
+			if ( (! lastClientCall) && (parser.pendingCount < kXMLPendingInputMax) ) return false;	// Wait for the next buffer.
+			size_t bytesDone = ProcessUTF8Portion ( xmlParser, parser.pendingInput, parser.pendingCount, lastClientCall );
+			size_t bytesLeft = parser.pendingCount - bytesDone;
+
+			#if Trace_ParsingHackery
+				fprintf ( stderr, "   ProcessUTF8Portion handled %d pending bytes\n", bytesDone );
+			#endif
+			
+			if ( bytesDone == parser.pendingCount ) {
+
+				// Done with all of the pending input, move on to the current buffer.
+				parser.pendingCount = 0;
+
+			} else if ( bytesLeft <= pendingOverlap ) {
+
+				// The leftover pending input all came from the current buffer. Exit this loop.
+				buffer -= bytesLeft;
+				xmpSize += bytesLeft;
+				parser.pendingCount = 0;
+
+			} else if ( xmpSize > 0 ) {
+
+				// Pull more of the current buffer into the pending input and try again.
+				// Backup by this pass's overlap so the loop entry code runs OK.
+				parser.pendingCount -= pendingOverlap;
+				buffer -= pendingOverlap;
+				xmpSize += pendingOverlap;
+
+			} else {
+
+				// There is no more of the current buffer. Wait for more. Partial sequences at
+				// the end of the last buffer should be treated as Latin-1 by ProcessUTF8Portion.
+				XMP_Assert ( ! lastClientCall );
+				parser.pendingCount = bytesLeft;
+				memcpy ( &parser.pendingInput[0], &parser.pendingInput[bytesDone], bytesLeft );	// AUDIT: Count is safe.
+				return false;	// Wait for the next buffer.
+
+			}
+		
+		}
+		
+		// Done with the pending input, process the current buffer.
+
+		size_t bytesDone = ProcessUTF8Portion ( xmlParser, (XMP_Uns8*)buffer, xmpSize, lastClientCall );
+
+		#if Trace_ParsingHackery
+			fprintf ( stderr, "   ProcessUTF8Portion handled %d additional bytes\n", bytesDone );
+		#endif
+		
+		if ( bytesDone < xmpSize ) {
+
+			XMP_Assert ( ! lastClientCall );
+			size_t bytesLeft = xmpSize - bytesDone;
+			if ( bytesLeft > kXMLPendingInputMax ) XMP_Throw ( "Parser bytesLeft too large", kXMPErr_InternalFailure );
+
+			memcpy ( parser.pendingInput, &buffer[bytesDone], bytesLeft );	// AUDIT: Count is safe.
+			parser.pendingCount = bytesLeft;
+			return false;	// Wait for the next buffer.
+
+		}
+
+	}
+	
+	return true;	// This buffer has been processed.
+
+}	// ProcessXMLBuffer
+
+
+// -------------------------------------------------------------------------------------------------
+// ProcessXMLTree
+// --------------
+
+void XMPMeta::ProcessXMLTree ( XMP_OptionBits options )
+{
+		
+	#if XMP_DebugBuild && DumpXMLParseTree
+		if ( this->xmlParser->parseLog == 0 ) this->xmlParser->parseLog = stdout;
+		DumpXMLTree ( this->xmlParser->parseLog, this->xmlParser->tree, 0 );
+	#endif
+
+	const XML_Node * xmlRoot = FindRootNode ( *this->xmlParser, options );
+
+	if ( xmlRoot != 0 ) {
+
+		this->ProcessRDF ( *xmlRoot, options );
+
+		NormalizeDCArrays ( &this->tree );
+		if ( this->tree.options & kXMP_PropHasAliases ) MoveExplicitAliases ( &this->tree, options, this->errorCallback );
+		TouchUpDataModel ( this, this->errorCallback );
+		
+		// Delete empty schema nodes. Do this last, other cleanup can make empty schema.
+		size_t schemaNum = 0;
+		while ( schemaNum < this->tree.children.size() ) {
+			XMP_Node * currSchema = this->tree.children[schemaNum];
+			if ( currSchema->children.size() > 0 ) {
+				++schemaNum;
+			} else {
+				delete this->tree.children[schemaNum];	// ! Delete the schema node itself.
+				this->tree.children.erase ( this->tree.children.begin() + schemaNum );
+			}
+		}
+		
+	}
+
+}	// ProcessXMLTree
+
+
+// -------------------------------------------------------------------------------------------------
+// ParseFromBuffer
+// ---------------
+//
+// Although most clients will probably parse everything in one call, we have a buffered API model
+// and need to support even the extreme case of 1 byte at a time parsing. This is considerably
+// complicated by some special cases for 8-bit input. Because of this, the first thing we do is
+// determine whether the input is 8-bit, UTF-16, or UTF-32.
+//
+// Both the 8-bit special cases and the encoding determination are easier to do with 8 bytes or more
+// of input. The XMLParserAdapter class has a pending-input buffer for this. At the start of parsing
+// we (might) try to fill this buffer before determining the input character encoding. After that,
+// we (might) use this buffer with the current input to simplify the logic in Process8BitInput. The
+// "(might)" part means that we don't actually use the pending-input buffer unless we have to. In
+// particular, the common case of single-buffer parsing won't use it.
+
+void
+XMPMeta::ParseFromBuffer ( XMP_StringPtr  buffer,
+						   XMP_StringLen  xmpSize,
+						   XMP_OptionBits options )
+{
+	if ( (buffer == 0) && (xmpSize != 0) ) XMP_Throw ( "Null parse buffer", kXMPErr_BadParam );
+	if ( xmpSize == kXMP_UseNullTermination ) xmpSize = strlen ( buffer );
+	
+	const bool lastClientCall = ((options & kXMP_ParseMoreBuffers) == 0);	// *** Could use FlagIsSet & FlagIsClear macros.
+	
+	if ( this->xmlParser == 0 ) {
+		this->tree.ClearNode();	// Make sure the target XMP object is totally empty.
+		if ( (xmpSize == 0) && lastClientCall ) return;	// Tolerate empty parse. Expat complains if there are no XML elements.
+		this->xmlParser = XMP_NewExpatAdapter ( ExpatAdapter::kUseGlobalNamespaces );
+		this->xmlParser->SetErrorCallback ( &this->errorCallback );
+	}
+	
+	try {	// Cleanup the tree and xmlParser if anything fails.
+	
+		bool done = this->ProcessXMLBuffer ( buffer, xmpSize, lastClientCall );
+		if ( ! done ) return;	// Wait for the next buffer.
+		
+		if ( lastClientCall ) {
+			this->ProcessXMLTree ( options );
+			delete this->xmlParser;
+			this->xmlParser = 0;
+		}
+		
+	} catch ( ... ) {
+
+		delete this->xmlParser;
+		this->xmlParser = 0;
+		throw;
+
+	}
+	
+}	// ParseFromBuffer
+
+// =================================================================================================
diff --git a/XMPCore/source/XMPMeta-Serialize.cpp b/XMPCore/source/XMPMeta-Serialize.cpp
new file mode 100644
index 0000000..ef30789
--- /dev/null
+++ b/XMPCore/source/XMPMeta-Serialize.cpp
@@ -0,0 +1,1388 @@
+// =================================================================================================
+// Copyright 2003-2009 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "XMPCore/source/XMPMeta.hpp"
+
+#include "public/include/XMP_Version.h"
+#include "source/UnicodeInlines.incl_cpp"
+#include "source/UnicodeConversions.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+
+#if XMP_DebugBuild
+	#include <iostream>
+#endif
+
+using namespace std;
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
+	#pragma warning ( disable : 4702 )	// unreachable code
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+
+// *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
+// *** Add debug codegen checks, e.g. that typical masking operations really work
+// *** Change all uses of strcmp and strncmp to XMP_LitMatch and XMP_LitNMatch
+
+
+// =================================================================================================
+// Local Types and Constants
+// =========================
+
+static const char * kPacketHeader  = "<?xpacket begin=\"\xEF\xBB\xBF\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>";
+static const char * kPacketTrailer = "<?xpacket end=\"w\"?>";	// ! The w/r is at [size-4].
+
+//static const char * kTXMP_SchemaGroup = "XMP_SchemaGroup";
+
+static const char * kRDF_XMPMetaStart = "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"";
+static const char * kRDF_XMPMetaEnd   = "</x:xmpmeta>";
+
+static const char * kRDF_RDFStart     = "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">";
+static const char * kRDF_RDFEnd       = "</rdf:RDF>";
+
+static const char * kRDF_SchemaStart  = "<rdf:Description rdf:about=";
+static const char * kRDF_SchemaEnd    = "</rdf:Description>";
+
+static const char * kRDF_StructStart  = "<rdf:Description>";
+static const char * kRDF_StructEnd    = "</rdf:Description>";
+
+static const char * kRDF_BagStart     = "<rdf:Bag>";
+//static const char * kRDF_BagEnd       = "</rdf:Bag>";
+
+//static const char * kRDF_SeqStart     = "<rdf:Seq>";
+//static const char * kRDF_SeqEnd       = "</rdf:Seq>";
+
+//static const char * kRDF_AltStart     = "<rdf:Alt>";
+//static const char * kRDF_AltEnd       = "</rdf:Alt>";
+
+static const char * kRDF_ItemStart    = "<rdf:li>";
+//static const char * kRDF_ItemEnd      = "</rdf:li>";
+
+static const char * kRDF_ValueStart   = "<rdf:value>";
+//static const char * kRDF_ValueEnd     = "</rdf:value>";
+
+
+// =================================================================================================
+// Static Variables
+// ================
+
+
+// =================================================================================================
+// Local Utilities
+// ===============
+
+
+// -------------------------------------------------------------------------------------------------
+// EstimateRDFSize
+// ---------------
+
+//  *** Pull the strlen(kXyz) calls into constants.
+
+static size_t
+EstimateRDFSize ( const XMP_Node * currNode, XMP_Index indent, size_t indentLen )
+{
+	size_t outputLen = 2 * (indent*indentLen + currNode->name.size() + 4);	// The property element tags.
+	
+	if ( ! currNode->qualifiers.empty() ) {
+		// This node has qualifiers, assume it is written using rdf:value and estimate the qualifiers.
+
+		indent += 2;	// Everything else is indented inside the rdf:Description element.
+		outputLen += 2 * ((indent-1)*indentLen + strlen(kRDF_StructStart) + 2);	// The rdf:Description tags.
+		outputLen += 2 * (indent*indentLen + strlen(kRDF_ValueStart) + 2);		// The rdf:value tags.
+
+		for ( size_t qualNum = 0, qualLim = currNode->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+			const XMP_Node * currQual = currNode->qualifiers[qualNum];
+			outputLen += EstimateRDFSize ( currQual, indent, indentLen );
+		}
+
+	}
+	
+	if ( currNode->options & kXMP_PropValueIsStruct ) {
+		indent += 1;
+		outputLen += 2 * (indent*indentLen + strlen(kRDF_StructStart) + 2);	// The rdf:Description tags.
+	} else if ( currNode->options & kXMP_PropValueIsArray ) {
+		indent += 2;
+		outputLen += 2 * ((indent-1)*indentLen + strlen(kRDF_BagStart) + 2);		// The rdf:Bag/Seq/Alt tags.
+		outputLen += 2 * currNode->children.size() * (strlen(kRDF_ItemStart) + 2);	// The rdf:li tags, indent counted in children.
+	} else if ( ! (currNode->options & kXMP_SchemaNode) ) {
+		outputLen += currNode->value.size();	// This is a leaf value node.
+	}
+
+	for ( size_t childNum = 0, childLim = currNode->children.size(); childNum < childLim; ++childNum ) {
+		const XMP_Node * currChild = currNode->children[childNum];
+		outputLen += EstimateRDFSize ( currChild, indent+1, indentLen );
+	}
+
+	return outputLen;
+	
+}	// EstimateRDFSize
+
+
+// -------------------------------------------------------------------------------------------------
+// DeclareOneNamespace
+// -------------------
+
+static void
+DeclareOneNamespace	( XMP_StringPtr   nsPrefix,
+					  XMP_StringPtr   nsURI,
+					  XMP_VarString	& usedNS,		// ! A catenation of the prefixes with colons.
+					  XMP_VarString & outputStr,
+					  XMP_StringPtr   newline,
+					  XMP_StringPtr   indentStr,
+					  XMP_Index       indent )
+{
+	XMP_VarString boundedPrefix = ":";
+	boundedPrefix += nsPrefix;
+	size_t nsPos = usedNS.find ( boundedPrefix );
+
+	if ( nsPos == XMP_VarString::npos ) {
+		
+		outputStr += newline;
+		for ( ; indent > 0; --indent ) outputStr += indentStr;
+		outputStr += "xmlns:";
+		outputStr += nsPrefix;
+		outputStr[outputStr.size()-1] = '=';	// Change the colon to =.
+		outputStr += '"';
+		outputStr += nsURI;
+		outputStr += '"';
+
+		usedNS += nsPrefix;
+
+	}
+
+}	// DeclareOneNamespace
+
+
+// -------------------------------------------------------------------------------------------------
+// DeclareElemNamespace
+// --------------------
+
+static void
+DeclareElemNamespace ( const XMP_VarString & elemName,
+					   XMP_VarString &		 usedNS,
+					   XMP_VarString &		 outputStr,
+					   XMP_StringPtr		 newline,
+					   XMP_StringPtr		 indentStr,
+					   XMP_Index			 indent )
+{
+	size_t colonPos = elemName.find ( ':' );
+
+	if ( colonPos != XMP_VarString::npos ) {
+		XMP_VarString nsPrefix ( elemName.substr ( 0, colonPos+1 ) );
+		XMP_StringPtr nsURI;
+		bool nsFound = sRegisteredNamespaces->GetURI ( nsPrefix.c_str(), &nsURI, 0 );
+		XMP_Enforce ( nsFound );
+		DeclareOneNamespace ( nsPrefix.c_str(), nsURI, usedNS, outputStr, newline, indentStr, indent );
+	}
+
+}	// DeclareElemNamespace
+
+
+// -------------------------------------------------------------------------------------------------
+// DeclareUsedNamespaces
+// ---------------------
+
+static void
+DeclareUsedNamespaces ( const XMP_Node * currNode,
+						XMP_VarString &  usedNS,
+						XMP_VarString &	 outputStr,
+						XMP_StringPtr	 newline,
+						XMP_StringPtr	 indentStr,
+						XMP_Index		 indent )
+{
+
+	if ( currNode->options & kXMP_SchemaNode ) {
+		// The schema node name is the URI, the value is the prefix.
+		DeclareOneNamespace ( currNode->value.c_str(), currNode->name.c_str(), usedNS, outputStr, newline, indentStr, indent );
+	} else if ( currNode->options & kXMP_PropValueIsStruct ) {
+		for ( size_t fieldNum = 0, fieldLim = currNode->children.size(); fieldNum < fieldLim; ++fieldNum ) {
+			const XMP_Node * currField = currNode->children[fieldNum];
+			DeclareElemNamespace ( currField->name, usedNS, outputStr, newline, indentStr, indent );
+		}
+	}
+
+	for ( size_t childNum = 0, childLim = currNode->children.size(); childNum < childLim; ++childNum ) {
+		const XMP_Node * currChild = currNode->children[childNum];
+		DeclareUsedNamespaces ( currChild, usedNS, outputStr, newline, indentStr, indent );
+	}
+
+	for ( size_t qualNum = 0, qualLim = currNode->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+		const XMP_Node * currQual = currNode->qualifiers[qualNum];
+		DeclareElemNamespace ( currQual->name, usedNS, outputStr, newline, indentStr, indent );
+		DeclareUsedNamespaces ( currQual, usedNS, outputStr, newline, indentStr, indent );
+	}
+	
+}	// DeclareUsedNamespaces
+
+// -------------------------------------------------------------------------------------------------
+// EmitRDFArrayTag
+// ---------------
+
+enum {
+	kIsStartTag = true,
+	kIsEndTag   = false
+};
+
+static void
+EmitRDFArrayTag	( XMP_OptionBits  arrayForm,
+				  XMP_VarString & outputStr,
+				  XMP_StringPtr	  newline,
+				  XMP_StringPtr	  indentStr,
+				  XMP_Index		  indent,
+				  XMP_Index		  arraySize,
+				  bool			  isStartTag )
+{
+	if ( (! isStartTag) && (arraySize == 0) ) return;
+	
+	for ( XMP_Index level = indent; level > 0; --level ) outputStr += indentStr;
+	if ( isStartTag ) {
+		outputStr += "<rdf:";
+	} else {
+		outputStr += "</rdf:";
+	}
+
+	if ( arrayForm & kXMP_PropArrayIsAlternate ) {
+		outputStr += "Alt";
+	} else if ( arrayForm & kXMP_PropArrayIsOrdered ) {
+		outputStr += "Seq";
+	} else {
+		outputStr += "Bag";
+	}
+	
+	if ( isStartTag && (arraySize == 0) ) outputStr += '/';
+	outputStr += '>';
+	outputStr += newline;
+
+}	// EmitRDFArrayTag
+
+
+// -------------------------------------------------------------------------------------------------
+// AppendNodeValue
+// ---------------
+//
+// Append a property or qualifier value to the output with appropriate XML escaping. The escaped
+// characters for elements and attributes are '&', '<', '>', and ASCII controls (tab, LF, CR). In
+// addition, '"' is escaped for attributes. For efficiency, this is done in a double loop. The outer
+// loop makes sure the whole value is processed. The inner loop does a contiguous unescaped run
+// followed by one escaped character (if we're not at the end).
+//
+// We depend on parsing and SetProperty logic to make sure there are no invalid ASCII controls in
+// the XMP values. The XML spec only allows tab, LF, and CR. Others are not even allowed as
+// numeric escape sequences.
+
+enum {
+	kForAttribute = true,
+	kForElement   = false
+};
+
+static void
+AppendNodeValue ( XMP_VarString & outputStr, const XMP_VarString & value, bool forAttribute )
+{
+
+	unsigned char * runStart = (unsigned char *) value.c_str();
+	unsigned char * runLimit  = runStart + value.size();
+	unsigned char * runEnd;
+	unsigned char   ch;
+	
+	while ( runStart < runLimit ) {
+	
+		for ( runEnd = runStart; runEnd < runLimit; ++runEnd ) {
+			ch = *runEnd;
+			if ( forAttribute && (ch == '"') ) break;
+			if ( (ch < 0x20) || (ch == '&') || (ch == '<') || (ch == '>') ) break;
+		}
+		
+		outputStr.append ( (char *) runStart, (runEnd - runStart) );
+		
+		if ( runEnd < runLimit ) {
+
+			if ( ch < 0x20 ) {
+			
+				XMP_Assert ( (ch == kTab) || (ch == kLF) || (ch == kCR) );
+
+				char hexBuf[16];
+				memcpy ( hexBuf, "&#xn;", 6 );	// AUDIT: Length of "&#xn;" is 5, hexBuf size is 16.
+				hexBuf[3] = kHexDigits[ch&0xF];
+				outputStr.append ( hexBuf, 5 );
+
+			} else {
+
+				if ( ch == '"' ) {
+					outputStr += "&quot;";
+				} else if ( ch == '<' ) {
+					outputStr += "&lt;";
+				} else if ( ch == '>' ) {
+					outputStr += "&gt;";
+				} else {
+					XMP_Assert ( ch == '&' );
+					outputStr += "&amp;";
+				}
+
+			}
+
+			++runEnd;
+
+		}
+		
+		runStart = runEnd;
+	
+	}
+
+}	// AppendNodeValue
+
+
+// -------------------------------------------------------------------------------------------------
+// CanBeRDFAttrProp
+// ----------------
+
+static bool
+CanBeRDFAttrProp ( const XMP_Node * propNode )
+{
+	
+	if ( propNode->name[0] == '[' ) return false;
+	if ( ! propNode->qualifiers.empty() ) return false;
+	if ( propNode->options & kXMP_PropValueIsURI ) return false;
+	if ( propNode->options & kXMP_PropCompositeMask ) return false;
+	
+	return true;
+	
+}	// CanBeRDFAttrProp
+
+
+// -------------------------------------------------------------------------------------------------
+// IsRDFAttrQualifier
+// ------------------
+
+static XMP_StringPtr sAttrQualifiers[] = { "xml:lang", "rdf:resource", "rdf:ID", "rdf:bagID", "rdf:nodeID", "" };
+
+static bool
+IsRDFAttrQualifier ( XMP_VarString qualName )
+{
+
+	for ( size_t i = 0; *sAttrQualifiers[i] != 0; ++i ) {
+		if ( qualName == sAttrQualifiers[i] ) return true;
+	}
+
+	return false;
+	
+}	// IsRDFAttrQualifier
+
+
+// -------------------------------------------------------------------------------------------------
+// StartOuterRDFDescription
+// ------------------------
+//
+// Start the outer rdf:Description element, including all needed xmlns attributes. Leave the element
+// open so that the compact form can add proprtty attributes.
+
+static void
+StartOuterRDFDescription ( const XMP_Node & xmpTree,
+						   XMP_VarString &  outputStr,
+						   XMP_StringPtr	newline,
+						   XMP_StringPtr	indentStr,
+						   XMP_Index		baseIndent )
+{
+	
+	// Begin the outer rdf:Description start tag.
+	
+	for ( XMP_Index level = baseIndent+2; level > 0; --level ) outputStr += indentStr;
+	outputStr += kRDF_SchemaStart;
+	outputStr += '"';
+	outputStr += xmpTree.name;
+	outputStr += '"';
+	
+	// Write all necessary xmlns attributes.
+
+	XMP_VarString usedNS;
+	usedNS.reserve ( 400 );	// The predefined prefixes add up to about 320 bytes.
+	usedNS = ":xml:rdf:";
+
+	for ( size_t schema = 0, schemaLim = xmpTree.children.size(); schema != schemaLim; ++schema ) {
+		const XMP_Node * currSchema = xmpTree.children[schema];
+		DeclareUsedNamespaces ( currSchema, usedNS, outputStr, newline, indentStr, baseIndent+4 );
+	}
+
+}	// StartOuterRDFDescription
+
+// -------------------------------------------------------------------------------------------------
+// SerializeCanonicalRDFProperty
+// -----------------------------
+//
+// Recursively handles the "value" for a node. It does not matter if it is a top level property, a
+// field of a struct, or an item of an array.  The indent is that for the property element. An
+// xml:lang qualifier is written as an attribute of the property start tag, not by itself forcing
+// the qualified property form. The patterns below mostly ignore attribute qualifiers like xml:lang.
+// Except for the one struct case, attribute qualifiers don't affect the output form.
+//
+//	<ns:UnqualifiedSimpleProperty>value</ns:UnqualifiedSimpleProperty>
+//
+//	<ns:UnqualifiedStructProperty>	(If no rdf:resource qualifier)
+//		<rdf:Description>
+//			... Fields, same forms as top level properties
+//		</rdf:Description>
+//	</ns:UnqualifiedStructProperty>
+//
+//	<ns:ResourceStructProperty rdf:resource="URI"
+//		... Fields as attributes
+//	>
+//
+//	<ns:UnqualifiedArrayProperty>
+//		<rdf:Bag> or Seq or Alt
+//			... Array items as rdf:li elements, same forms as top level properties
+//		</rdf:Bag>
+//	</ns:UnqualifiedArrayProperty>
+//
+//	<ns:QualifiedProperty>
+//		<rdf:Description>
+//			<rdf:value> ... Property "value" following the unqualified forms ... </rdf:value>
+//			... Qualifiers looking like named struct fields
+//		</rdf:Description>
+//	</ns:QualifiedProperty>
+
+enum { kUseCanonicalRDF = true, kUseAdobeVerboseRDF = false };
+enum { kEmitAsRDFValue = true, kEmitAsNormalValue = false };
+
+static void
+SerializeCanonicalRDFProperty ( const XMP_Node * propNode,
+								XMP_VarString &  outputStr,
+								XMP_StringPtr	 newline,
+								XMP_StringPtr	 indentStr,
+								XMP_Index		 indent,
+								bool			 useCanonicalRDF,
+								bool			 emitAsRDFValue )
+{
+	XMP_Index level;
+	bool emitEndTag   = true;
+	bool indentEndTag = true;
+
+	XMP_OptionBits propForm = propNode->options & kXMP_PropCompositeMask;
+
+	// ------------------------------------------------------------------------------------------
+	// Determine the XML element name. Open the start tag with the name and attribute qualifiers.
+	
+	XMP_StringPtr elemName = propNode->name.c_str();
+	if ( emitAsRDFValue ) {
+		elemName= "rdf:value";
+	} else if ( *elemName == '[' ) {
+		elemName = "rdf:li";
+	}
+
+	for ( level = indent; level > 0; --level ) outputStr += indentStr;
+	outputStr += '<';
+	outputStr += elemName;
+
+	bool hasGeneralQualifiers = false;
+	bool hasRDFResourceQual   = false;
+	
+	for ( size_t qualNum = 0, qualLim = propNode->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+		const XMP_Node * currQual = propNode->qualifiers[qualNum];
+		if ( ! IsRDFAttrQualifier ( currQual->name ) ) {
+			hasGeneralQualifiers = true;
+		} else {
+			if ( currQual->name == "rdf:resource" ) hasRDFResourceQual = true;
+			if ( ! emitAsRDFValue ) {
+				outputStr += ' ';
+				outputStr += currQual->name;
+				outputStr += "=\"";
+				AppendNodeValue ( outputStr, currQual->value, kForAttribute );
+				outputStr += '"';
+			}
+		}
+	}
+	
+	// --------------------------------------------------------
+	// Process the property according to the standard patterns.
+	
+	if ( hasGeneralQualifiers && (! emitAsRDFValue) ) {
+	
+		// -----------------------------------------------------------------------------------------
+		// This node has general, non-attribute, qualifiers. Emit using the qualified property form.
+		// ! The value is output by a recursive call ON THE SAME NODE with emitAsRDFValue set.
+
+		if ( hasRDFResourceQual ) {
+			XMP_Throw ( "Can't mix rdf:resource and general qualifiers", kXMPErr_BadRDF );
+		}
+
+		if ( ! useCanonicalRDF ) {
+			outputStr += " rdf:parseType=\"Resource\">";
+			outputStr += newline;
+		} else {
+			outputStr += '>';
+			outputStr += newline;
+			indent += 1;
+			for ( level = indent; level > 0; --level ) outputStr += indentStr;
+			outputStr += "<rdf:Description>";
+			outputStr += newline;
+		}
+
+		SerializeCanonicalRDFProperty ( propNode, outputStr, newline, indentStr, indent+1,
+										useCanonicalRDF, kEmitAsRDFValue );
+
+		for ( size_t qualNum = 0, qualLim = propNode->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+			const XMP_Node * currQual = propNode->qualifiers[qualNum];
+			if ( IsRDFAttrQualifier ( currQual->name ) ) continue;
+			SerializeCanonicalRDFProperty ( currQual, outputStr, newline, indentStr, indent+1,
+											useCanonicalRDF, kEmitAsNormalValue );
+		}
+		
+		if ( useCanonicalRDF ) {
+			for ( level = indent; level > 0; --level ) outputStr += indentStr;
+			outputStr += "</rdf:Description>";
+			outputStr += newline;
+			indent -= 1;
+		}
+		
+	} else {
+
+		// --------------------------------------------------------------------
+		// This node has no general qualifiers. Emit using an unqualified form.
+		
+		if ( propForm == 0 ) {
+		
+			// --------------------------
+			// This is a simple property.
+			
+			if ( propNode->options & kXMP_PropValueIsURI ) {
+				outputStr += " rdf:resource=\"";
+				AppendNodeValue ( outputStr, propNode->value, kForAttribute );
+				outputStr += "\"/>";
+				outputStr += newline;
+				emitEndTag = false;
+			} else if ( propNode->value.empty() ) {
+				outputStr += "/>";
+				outputStr += newline;
+				emitEndTag = false;
+			} else {
+				outputStr += '>';
+				AppendNodeValue ( outputStr, propNode->value, kForElement );
+				indentEndTag = false;
+			}
+			
+		} else if ( propForm & kXMP_PropValueIsArray ) {
+		
+			// This is an array.
+			outputStr += '>';
+			outputStr += newline;
+			EmitRDFArrayTag ( propForm, outputStr, newline, indentStr, indent+1, propNode->children.size(), kIsStartTag );
+			if ( XMP_ArrayIsAltText(propNode->options) ) NormalizeLangArray ( (XMP_Node*)propNode );
+			for ( size_t childNum = 0, childLim = propNode->children.size(); childNum < childLim; ++childNum ) {
+				const XMP_Node * currChild = propNode->children[childNum];
+				SerializeCanonicalRDFProperty ( currChild, outputStr, newline, indentStr, indent+2,
+												useCanonicalRDF, kEmitAsNormalValue );
+			}
+			EmitRDFArrayTag ( propForm, outputStr, newline, indentStr, indent+1, propNode->children.size(), kIsEndTag );
+		
+		
+		} else if ( ! hasRDFResourceQual ) {
+		
+			// This is a "normal" struct, use the nested field element form form.
+			XMP_Assert ( propForm & kXMP_PropValueIsStruct );
+			if ( propNode->children.size() == 0 ) {
+				if ( ! useCanonicalRDF ) {
+					outputStr += " rdf:parseType=\"Resource\"/>";
+					outputStr += newline;
+					emitEndTag = false;
+				} else {
+					outputStr += '>';
+					outputStr += newline;
+					for ( level = indent+1; level > 0; --level ) outputStr += indentStr;
+					outputStr += "<rdf:Description/>";
+					outputStr += newline;
+				}
+			} else {
+				if ( ! useCanonicalRDF ) {
+					outputStr += " rdf:parseType=\"Resource\">";
+					outputStr += newline;
+				} else {
+					outputStr += '>';
+					outputStr += newline;
+					indent += 1;
+					for ( level = indent; level > 0; --level ) outputStr += indentStr;
+					outputStr += "<rdf:Description>";
+					outputStr += newline;
+				}
+				for ( size_t childNum = 0, childLim = propNode->children.size(); childNum < childLim; ++childNum ) {
+					const XMP_Node * currChild = propNode->children[childNum];
+					SerializeCanonicalRDFProperty ( currChild, outputStr, newline, indentStr, indent+1,
+													useCanonicalRDF, kEmitAsNormalValue );
+				}
+				if ( useCanonicalRDF ) {
+					for ( level = indent; level > 0; --level ) outputStr += indentStr;
+					outputStr += "</rdf:Description>";
+					outputStr += newline;
+					indent -= 1;
+				}
+			}
+		
+		} else {
+		
+			// This is a struct with an rdf:resource attribute, use the "empty property element" form.
+			XMP_Assert ( propForm & kXMP_PropValueIsStruct );
+			for ( size_t childNum = 0, childLim = propNode->children.size(); childNum < childLim; ++childNum ) {
+				const XMP_Node * currChild = propNode->children[childNum];
+				if ( ! CanBeRDFAttrProp ( currChild ) ) {
+					XMP_Throw ( "Can't mix rdf:resource and complex fields", kXMPErr_BadRDF );
+				}
+				outputStr += newline;
+				for ( level = indent+1; level > 0; --level ) outputStr += indentStr;
+				outputStr += ' ';
+				outputStr += currChild->name;
+				outputStr += "=\"";
+				outputStr += currChild->value;
+				outputStr += '"';
+			}
+			outputStr += "/>";
+			outputStr += newline;
+			emitEndTag = false;
+		
+		}
+		
+	}
+	
+	// ----------------------------------
+	// Emit the property element end tag.
+	
+	if ( emitEndTag ) {
+		if ( indentEndTag ) for ( level = indent; level > 0; --level ) outputStr += indentStr;
+		outputStr += "</";
+		outputStr += elemName;
+		outputStr += '>';
+		outputStr += newline;
+	}
+	
+}	// SerializeCanonicalRDFProperty
+
+
+// -------------------------------------------------------------------------------------------------
+// SerializeCanonicalRDFSchemas
+// ----------------------------
+//
+// Each schema's properties are written to the single rdf:Description element. All of the necessary
+// namespaces are declared in the rdf:Description element. The baseIndent is the base level for the
+// entire serialization, that of the x:xmpmeta element. An xml:lang qualifier is written as an
+// attribute of the property start tag, not by itself forcing the qualified property form.
+//
+//	<rdf:Description rdf:about="TreeName"
+//			xmlns:ns="URI" ... >
+//
+//		... The actual properties of the schema, see SerializeCanonicalRDFProperty
+//
+//		<!-- ns1:Alias is aliased to ns2:Actual -->  ... If alias comments are wanted
+//
+//	</rdf:Description>
+
+static void
+SerializeCanonicalRDFSchemas ( const XMP_Node & xmpTree,
+							   XMP_VarString &	outputStr,
+							   XMP_StringPtr	newline,
+							   XMP_StringPtr	indentStr,
+							   XMP_Index		baseIndent,
+							   bool				useCanonicalRDF )
+{
+
+	StartOuterRDFDescription ( xmpTree, outputStr, newline, indentStr, baseIndent );
+	
+	if ( xmpTree.children.size() > 0 ) {
+		outputStr += ">";
+		outputStr += newline;
+	} else {
+		outputStr += "/>";
+		outputStr += newline;
+		return;	// ! Done if there are no XMP properties.
+	}
+
+	for ( size_t schemaNum = 0, schemaLim = xmpTree.children.size(); schemaNum < schemaLim; ++schemaNum ) {
+		const XMP_Node * currSchema = xmpTree.children[schemaNum];
+		for ( size_t propNum = 0, propLim = currSchema->children.size(); propNum < propLim; ++propNum ) {
+			const XMP_Node * currProp = currSchema->children[propNum];
+			SerializeCanonicalRDFProperty ( currProp, outputStr, newline, indentStr, baseIndent+3,
+											useCanonicalRDF, kEmitAsNormalValue );
+		}
+	}
+	
+	// Write the rdf:Description end tag.
+	for ( XMP_Index level = baseIndent+2; level > 0; --level ) outputStr += indentStr;
+	outputStr += kRDF_SchemaEnd;
+	outputStr += newline;
+
+}	// SerializeCanonicalRDFSchemas
+
+
+// -------------------------------------------------------------------------------------------------
+// SerializeCompactRDFAttrProps
+// ----------------------------
+//
+// Write each of the parent's simple unqualified properties as an attribute. Returns true if all
+// of the properties are written as attributes.
+
+static bool
+SerializeCompactRDFAttrProps ( const XMP_Node *	parentNode,
+							   XMP_VarString &	outputStr,
+							   XMP_StringPtr	newline,
+							   XMP_StringPtr	indentStr,
+							   XMP_Index		indent )
+{
+	size_t prop, propLim;
+	bool allAreAttrs = true;
+
+	for ( prop = 0, propLim = parentNode->children.size(); prop != propLim; ++prop ) {
+
+		const XMP_Node * currProp = parentNode->children[prop];
+		if ( ! CanBeRDFAttrProp ( currProp ) ) {
+			allAreAttrs = false;
+			continue;
+		}
+		
+		outputStr += newline;
+		for ( XMP_Index level = indent; level > 0; --level ) outputStr += indentStr;
+		outputStr += currProp->name;
+		outputStr += "=\"";
+		AppendNodeValue ( outputStr, currProp->value, kForAttribute );
+		outputStr += '"';
+
+	}
+	
+	return allAreAttrs;
+
+}	// SerializeCompactRDFAttrProps
+
+
+// -------------------------------------------------------------------------------------------------
+// SerializeCompactRDFElemProps
+// ----------------------------
+//
+// Recursively handles the "value" for a node that must be written as an RDF property element. It
+// does not matter if it is a top level property, a field of a struct, or an item of an array.  The
+// indent is that for the property element. The patterns bwlow ignore attribute qualifiers such as
+// xml:lang, they don't affect the output form.
+//
+//	<ns:UnqualifiedStructProperty-1
+//		... The fields as attributes, if all are simple and unqualified
+//	/>
+//
+//	<ns:UnqualifiedStructProperty-2 rdf:parseType="Resource">
+//		... The fields as elements, if none are simple and unqualified
+//	</ns:UnqualifiedStructProperty-2>
+//
+//	<ns:UnqualifiedStructProperty-3>
+//		<rdf:Description
+//			... The simple and unqualified fields as attributes
+//		>
+//			... The compound or qualified fields as elements
+//		</rdf:Description>
+//	</ns:UnqualifiedStructProperty-3>
+//
+//	<ns:UnqualifiedArrayProperty>
+//		<rdf:Bag> or Seq or Alt
+//			... Array items as rdf:li elements, same forms as top level properties
+//		</rdf:Bag>
+//	</ns:UnqualifiedArrayProperty>
+//
+//	<ns:QualifiedProperty rdf:parseType="Resource">
+//		<rdf:value> ... Property "value" following the unqualified forms ... </rdf:value>
+//		... Qualifiers looking like named struct fields
+//	</ns:QualifiedProperty>
+
+// *** Consider numbered array items, but has compatibility problems.
+// *** Consider qualified form with rdf:Description and attributes.
+
+static void
+SerializeCompactRDFElemProps ( const XMP_Node *	parentNode,
+							   XMP_VarString &	outputStr,
+							   XMP_StringPtr	newline,
+							   XMP_StringPtr	indentStr,
+							   XMP_Index		indent )
+{
+	XMP_Index level;
+
+	for ( size_t prop = 0, propLim = parentNode->children.size(); prop != propLim; ++prop ) {
+
+		const XMP_Node * propNode = parentNode->children[prop];
+		if ( CanBeRDFAttrProp ( propNode ) ) continue;
+
+		bool emitEndTag = true;
+		bool indentEndTag = true;
+
+		XMP_OptionBits propForm = propNode->options & kXMP_PropCompositeMask;
+
+		// -----------------------------------------------------------------------------------
+		// Determine the XML element name, write the name part of the start tag. Look over the
+		// qualifiers to decide on "normal" versus "rdf:value" form. Emit the attribute
+		// qualifiers at the same time.
+		
+		XMP_StringPtr elemName = propNode->name.c_str();
+		if ( *elemName == '[' ) elemName = "rdf:li";
+
+		for ( level = indent; level > 0; --level ) outputStr += indentStr;
+		outputStr += '<';
+		outputStr += elemName;
+	
+		bool hasGeneralQualifiers = false;
+		bool hasRDFResourceQual   = false;
+
+		for ( size_t qualNum = 0, qualLim = propNode->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+			const XMP_Node * currQual = propNode->qualifiers[qualNum];
+			if ( ! IsRDFAttrQualifier ( currQual->name ) ) {
+				hasGeneralQualifiers = true;
+			} else {
+				if ( currQual->name == "rdf:resource" ) hasRDFResourceQual = true;
+				outputStr += ' ';
+				outputStr += currQual->name;
+				outputStr += "=\"";
+				AppendNodeValue ( outputStr, currQual->value, kForAttribute );
+				outputStr += '"';
+			}
+		}
+		
+		// --------------------------------------------------------
+		// Process the property according to the standard patterns.
+	
+		if ( hasGeneralQualifiers ) {
+		
+			// -------------------------------------------------------------------------------------
+			// The node has general qualifiers, ones that can't be attributes on a property element.
+			// Emit using the qualified property pseudo-struct form. The value is output by a call
+			// to SerializeCanonicalRDFProperty with emitAsRDFValue set.
+			
+			// *** We're losing compactness in the calls to SerializeCanonicalRDFProperty.
+			// *** Should refactor to have SerializeCompactRDFProperty that does one node.
+
+			outputStr += " rdf:parseType=\"Resource\">";
+			outputStr += newline;
+
+			SerializeCanonicalRDFProperty ( propNode, outputStr, newline, indentStr, indent+1,
+											kUseAdobeVerboseRDF, kEmitAsRDFValue );
+
+			size_t qualNum = 0;
+			size_t qualLim = propNode->qualifiers.size();
+			if ( propNode->options & kXMP_PropHasLang ) ++qualNum;
+			
+			for ( ; qualNum < qualLim; ++qualNum ) {
+				const XMP_Node * currQual = propNode->qualifiers[qualNum];
+				SerializeCanonicalRDFProperty ( currQual, outputStr, newline, indentStr, indent+1,
+												kUseAdobeVerboseRDF, kEmitAsNormalValue );
+			}
+			
+		} else {
+
+			// --------------------------------------------------------------------
+			// This node has only attribute qualifiers. Emit as a property element.
+			
+			if ( propForm == 0 ) {
+			
+				// --------------------------
+				// This is a simple property.
+				
+				if ( propNode->options & kXMP_PropValueIsURI ) {
+					outputStr += " rdf:resource=\"";
+					AppendNodeValue ( outputStr, propNode->value, kForAttribute );
+					outputStr += "\"/>";
+					outputStr += newline;
+					emitEndTag = false;
+				} else if ( propNode->value.empty() ) {
+					outputStr += "/>";
+					outputStr += newline;
+					emitEndTag = false;
+				} else {
+					outputStr += '>';
+					AppendNodeValue ( outputStr, propNode->value, kForElement );
+					indentEndTag = false;
+				}
+				
+			} else if ( propForm & kXMP_PropValueIsArray ) {
+
+				// -----------------
+				// This is an array.
+				
+				outputStr += '>';
+				outputStr += newline;
+				EmitRDFArrayTag ( propForm, outputStr, newline, indentStr, indent+1, propNode->children.size(), kIsStartTag );
+			
+				if ( XMP_ArrayIsAltText(propNode->options) ) NormalizeLangArray ( (XMP_Node*)propNode );
+				SerializeCompactRDFElemProps ( propNode, outputStr, newline, indentStr, indent+2 );
+
+				EmitRDFArrayTag ( propForm, outputStr, newline, indentStr, indent+1, propNode->children.size(), kIsEndTag );
+
+			} else {
+
+				// ----------------------
+				// This must be a struct.
+				
+				XMP_Assert ( propForm & kXMP_PropValueIsStruct );
+
+				bool hasAttrFields = false;
+				bool hasElemFields = false;
+			
+				size_t field, fieldLim;
+				for ( field = 0, fieldLim = propNode->children.size(); field != fieldLim; ++field ) {
+					XMP_Node * currField = propNode->children[field];
+					if ( CanBeRDFAttrProp ( currField ) ) {
+						hasAttrFields = true;
+						if ( hasElemFields ) break;	// No sense looking further.
+					} else {
+						hasElemFields = true;
+						if ( hasAttrFields ) break;	// No sense looking further.
+					}
+				}
+				
+				if ( hasRDFResourceQual && hasElemFields ) {
+					XMP_Throw ( "Can't mix rdf:resource qualifier and element fields", kXMPErr_BadRDF );
+				}
+				
+				if ( propNode->children.size() == 0 ) {
+				
+					// Catch an empty struct as a special case. The case below would emit an empty
+					// XML element, which gets reparsed as a simple property with an empty value.
+					outputStr += " rdf:parseType=\"Resource\"/>";
+					outputStr += newline;
+					emitEndTag = false;
+				
+				} else if ( ! hasElemFields ) {
+
+					// All fields can be attributes, use the emptyPropertyElt form.
+					SerializeCompactRDFAttrProps ( propNode, outputStr, newline, indentStr, indent+1 );
+					outputStr += "/>";
+					outputStr += newline;
+					emitEndTag = false;
+
+				} else if ( ! hasAttrFields ) {
+				
+					// All fields must be elements, use the parseTypeResourcePropertyElt form.
+					outputStr += " rdf:parseType=\"Resource\">";
+					outputStr += newline;
+					SerializeCompactRDFElemProps ( propNode, outputStr, newline, indentStr, indent+1 );
+				
+				} else {
+				
+					// Have a mix of attributes and elements, use an inner rdf:Description.
+					outputStr += '>';
+					outputStr += newline;
+					for ( level = indent+1; level > 0; --level ) outputStr += indentStr;
+					outputStr += "<rdf:Description";
+					SerializeCompactRDFAttrProps ( propNode, outputStr, newline, indentStr, indent+2 );
+					outputStr += ">";
+					outputStr += newline;
+					SerializeCompactRDFElemProps ( propNode, outputStr, newline, indentStr, indent+1 );
+					for ( level = indent+1; level > 0; --level ) outputStr += indentStr;
+					outputStr += kRDF_StructEnd;
+					outputStr += newline;
+
+				}
+
+			}
+
+		}
+		
+		// ----------------------------------
+		// Emit the property element end tag.
+		
+		if ( emitEndTag ) {
+			if ( indentEndTag ) for ( level = indent; level > 0; --level ) outputStr += indentStr;
+			outputStr += "</";
+			outputStr += elemName;
+			outputStr += '>';
+			outputStr += newline;
+		}
+
+	}
+	
+}	// SerializeCompactRDFElemProps
+
+
+// -------------------------------------------------------------------------------------------------
+// SerializeCompactRDFSchemas
+// --------------------------
+//
+// All properties from all schema are written in a single rdf:Description element, as are all of the
+// necessary namespace declarations. The baseIndent is the base level for the entire serialization,
+// that of the x:xmpmeta element. The x:xmpmeta and rdf:RDF elements have already been written.
+//
+// Top level simple unqualified properties are written as attributes of the (only) rdf:Description
+// element. Structs, arrays, and qualified properties are written by SerializeCompactRDFElemProp. An
+// xml:lang qualifier on a simple property prevents the attribute form.
+//
+//	<rdf:Description rdf:about="TreeName"
+//			xmlns:ns="URI" ...
+//		ns:UnqualifiedSimpleProperty="value" ... >
+//		... The remaining properties of the schema, see SerializeCompactRDFElemProps
+//	</rdf:Description>
+
+static void
+SerializeCompactRDFSchemas ( const XMP_Node & xmpTree,
+							 XMP_VarString &  outputStr,
+							 XMP_StringPtr	  newline,
+							 XMP_StringPtr	  indentStr,
+							 XMP_Index		  baseIndent )
+{
+	XMP_Index level;
+	size_t schema, schemaLim;
+	
+	StartOuterRDFDescription ( xmpTree, outputStr, newline, indentStr, baseIndent );
+	
+	// Write the top level "attrProps" and close the rdf:Description start tag.
+	bool allAreAttrs = true;
+	for ( schema = 0, schemaLim = xmpTree.children.size(); schema != schemaLim; ++schema ) {
+		const XMP_Node * currSchema = xmpTree.children[schema];
+		allAreAttrs &= SerializeCompactRDFAttrProps ( currSchema, outputStr, newline, indentStr, baseIndent+3 );
+	}
+	if ( ! allAreAttrs ) {
+		outputStr += ">";
+		outputStr += newline;
+	} else {
+		outputStr += "/>";
+		outputStr += newline;
+		return;	// ! Done if all properties in all schema are written as attributes.
+	}
+
+	// Write the remaining properties for each schema.
+	for ( schema = 0, schemaLim = xmpTree.children.size(); schema != schemaLim; ++schema ) {
+		const XMP_Node * currSchema = xmpTree.children[schema];
+		SerializeCompactRDFElemProps ( currSchema, outputStr, newline, indentStr, baseIndent+3 );
+	}
+	
+	// Write the rdf:Description end tag.
+	for ( level = baseIndent+2; level > 0; --level ) outputStr += indentStr;
+	outputStr += kRDF_SchemaEnd;
+	outputStr += newline;
+
+}	// SerializeCompactRDFSchemas
+
+// -------------------------------------------------------------------------------------------------
+// SerializeAsRDF
+// --------------
+//
+//	<?xpacket begin... ?>
+//	<x:xmpmeta xmlns:x=... >
+//		<rdf:RDF xmlns:rdf=... >
+//
+//			... The properties, see SerializeCanonicalRDFSchema or SerializeCompactRDFSchemas
+//
+//		</rdf:RDF>
+//	</x:xmpmeta>
+//	<?xpacket end... ?>
+
+// *** Need to strip empty arrays?
+// *** Option to strip/keep empty structs?
+// *** Need to verify handling of rdf:type qualifiers in canonical and compact.
+// *** Need to verify round tripping of rdf:ID and similar qualifiers, see RDF 7.2.21.
+// *** Check cases of rdf:resource plus explicit attr qualifiers (like xml:lang).
+
+static void
+SerializeAsRDF ( const XMPMeta & xmpObj,
+				 XMP_VarString & headStr,	// Everything up to the padding.
+				 XMP_VarString & tailStr,	// Everything after the padding.
+				 XMP_OptionBits	 options,
+				 XMP_StringPtr	 newline,
+				 XMP_StringPtr	 indentStr,
+				 XMP_Index		 baseIndent )
+{
+	const size_t treeNameLen = xmpObj.tree.name.size();
+	const size_t indentLen   = strlen ( indentStr );
+
+	// First estimate the worst case space and reserve room in the output string. This optimization
+	// avoids reallocating and copying the output as it grows. The initial count does not look at
+	// the values of properties, so it does not account for character entities, e.g. &#xA; for newline.
+	// Since there can be a lot of these in things like the base 64 encoding of a large thumbnail,
+	// inflate the count by 1/4 (easy to do) to accommodate.
+	
+	// *** Need to include estimate for alias comments.
+	
+	size_t outputLen = 2 * (strlen(kPacketHeader) + strlen(kRDF_XMPMetaStart) + strlen(kRDF_RDFStart) + 3*baseIndent*indentLen);
+
+	for ( size_t schemaNum = 0, schemaLim = xmpObj.tree.children.size(); schemaNum < schemaLim; ++schemaNum ) {
+		const XMP_Node * currSchema = xmpObj.tree.children[schemaNum];
+		outputLen += 2*(baseIndent+2)*indentLen + strlen(kRDF_SchemaStart) + treeNameLen + strlen(kRDF_SchemaEnd) + 2;
+		outputLen += EstimateRDFSize ( currSchema, baseIndent+2, indentLen );
+	}
+	
+	outputLen += (outputLen >> 2);	// Inflate by 1/4, an empirical fudge factor.
+	
+	// Now generate the RDF into the head string as UTF-8.
+	
+	XMP_Index level;
+	
+	std::string rdfstring;
+	headStr.erase();
+	rdfstring.reserve ( outputLen );
+
+	// Write the rdf:RDF start tag.
+	rdfstring += kRDF_RDFStart;
+	rdfstring += newline;
+	
+	// Write all of the properties.
+	if ( options & kXMP_UseCompactFormat ) {
+		SerializeCompactRDFSchemas ( xmpObj.tree, rdfstring, newline, indentStr, baseIndent );
+	} else {
+		bool useCanonicalRDF = XMP_OptionIsSet ( options, kXMP_UseCanonicalFormat );
+		SerializeCanonicalRDFSchemas ( xmpObj.tree, rdfstring, newline, indentStr, baseIndent, useCanonicalRDF );
+	}
+
+	// Write the rdf:RDF end tag.
+	for ( level = baseIndent+1; level > 0; --level ) rdfstring += indentStr;
+	rdfstring += kRDF_RDFEnd;
+	// Write the packet header PI.
+	if ( ! (options & kXMP_OmitPacketWrapper) ) {
+		for ( level = baseIndent; level > 0; --level ) headStr += indentStr;
+		headStr += kPacketHeader;
+		headStr += newline;
+	}
+
+	// Write the xmpmeta element's start tag.
+	if ( ! (options & kXMP_OmitXMPMetaElement) ) {
+		for ( level = baseIndent; level > 0; --level ) headStr += indentStr;
+		headStr += kRDF_XMPMetaStart;
+		headStr += kXMPCore_VersionMessage  "\"";
+		std::string digestStr;
+		unsigned char digestBin [16];
+		if (options & kXMP_IncludeRDFHash)
+		{
+			std::string hashrdf;	
+			MD5_CTX    context;
+			MD5Init ( &context );
+			MD5Update ( &context, (XMP_Uns8*)rdfstring.c_str(), (unsigned int)rdfstring.size() );
+			MD5Final ( digestBin, &context );
+			char buffer [40];
+			for ( int in = 0, out = 0; in < 16; in += 1, out += 2 ) {
+				XMP_Uns8 byte = digestBin[in];
+				buffer[out]   = kHexDigits [ byte >> 4 ];
+				buffer[out+1] = kHexDigits [ byte & 0xF ];
+			}
+			buffer[32] = 0;
+			digestStr.append ( buffer );
+			headStr += " rdfhash=\"";
+			headStr += digestStr + "\"";
+			headStr += " merged=\"0\"";
+		}
+		headStr += ">";
+		headStr += newline;
+	}
+
+	for ( level = baseIndent+1; level > 0; --level ) headStr += indentStr;
+	headStr+= rdfstring ;
+	headStr += newline;
+
+	// Write the xmpmeta end tag.
+	if ( ! (options & kXMP_OmitXMPMetaElement) ) {
+		for ( level = baseIndent; level > 0; --level ) headStr += indentStr;
+		headStr += kRDF_XMPMetaEnd;
+		headStr += newline;
+	}
+	
+	// Write the packet trailer PI into the tail string as UTF-8.
+	tailStr.erase();
+	if ( ! (options & kXMP_OmitPacketWrapper) ) {
+		tailStr.reserve ( strlen(kPacketTrailer) + (strlen(indentStr) * baseIndent) );
+		for ( level = baseIndent; level > 0; --level ) tailStr += indentStr;
+		tailStr += kPacketTrailer;
+		if ( options & kXMP_ReadOnlyPacket ) tailStr[tailStr.size()-4] = 'r';
+	}
+	
+}	// SerializeAsRDF
+
+
+// -------------------------------------------------------------------------------------------------
+// SerializeToBuffer
+// -----------------
+
+void
+XMPMeta::SerializeToBuffer ( XMP_VarString * rdfString,
+							 XMP_OptionBits	 options,
+							 XMP_StringLen	 padding,
+							 XMP_StringPtr	 newline,
+							 XMP_StringPtr	 indentStr,
+							 XMP_Index		 baseIndent ) const
+{
+	XMP_Enforce( rdfString != 0 );
+	XMP_Assert ( (newline != 0) && (indentStr != 0) );
+	rdfString->erase();
+	
+	// Fix up some default parameters.
+	
+	enum { kDefaultPad = 2048 };
+	size_t unicodeUnitSize = 1;
+	XMP_OptionBits charEncoding = options & kXMP_EncodingMask;
+
+	if ( charEncoding != kXMP_EncodeUTF8 ) {
+		if ( options & _XMP_UTF16_Bit ) {
+			if ( options & _XMP_UTF32_Bit ) XMP_Throw ( "Can't use both _XMP_UTF16_Bit and _XMP_UTF32_Bit", kXMPErr_BadOptions );
+			unicodeUnitSize = 2;
+		} else if ( options & _XMP_UTF32_Bit ) {
+			unicodeUnitSize = 4;
+		} else {
+			XMP_Throw ( "Can't use _XMP_LittleEndian_Bit by itself", kXMPErr_BadOptions );
+		}
+	}
+	
+	if ( options & kXMP_OmitAllFormatting ) {
+		newline = " ";	// ! Yes, a space for "newline". This ensures token separation.
+		indentStr = "";
+	} else {
+		if ( *newline == 0 ) newline = "\xA";	// Linefeed
+		if ( *indentStr == 0 ) {
+			indentStr = " ";
+			if ( ! (options & kXMP_UseCompactFormat) ) indentStr  = "   ";
+		}
+	}
+	
+	if ( options & kXMP_ExactPacketLength ) {
+		if ( options & (kXMP_OmitPacketWrapper | kXMP_IncludeThumbnailPad) ) {
+			XMP_Throw ( "Inconsistent options for exact size serialize", kXMPErr_BadOptions );
+		}
+		if ( (padding & (unicodeUnitSize-1)) != 0 ) {
+			XMP_Throw ( "Exact size must be a multiple of the Unicode element", kXMPErr_BadOptions );
+		}
+	} else if ( options & kXMP_ReadOnlyPacket ) {
+		if ( options & (kXMP_OmitPacketWrapper | kXMP_IncludeThumbnailPad) ) {
+			XMP_Throw ( "Inconsistent options for read-only packet", kXMPErr_BadOptions );
+		}
+		padding = 0;
+	} else if ( options & kXMP_OmitPacketWrapper ) {
+		if ( options & kXMP_IncludeThumbnailPad ) {
+			XMP_Throw ( "Inconsistent options for non-packet serialize", kXMPErr_BadOptions );
+		}
+		padding = 0;
+	} else if ( options & kXMP_OmitXMPMetaElement ) {
+		if ( options & kXMP_IncludeRDFHash ) {
+			XMP_Throw ( "Inconsistent options for x:xmpmeta serialize", kXMPErr_BadOptions );
+		}
+		padding = 0;
+	} else {
+		if ( padding == 0 ) {
+			padding = kDefaultPad * unicodeUnitSize;
+		} else if ( (padding >> 28) != 0 ) {
+			XMP_Throw ( "Outrageously large padding size", kXMPErr_BadOptions );	// Bigger than 256 MB.
+		}
+		if ( options & kXMP_IncludeThumbnailPad ) {
+			if ( ! this->DoesPropertyExist ( kXMP_NS_XMP, "Thumbnails" ) ) padding += (10000 * unicodeUnitSize);	// *** Need a better estimate.
+		}
+	}
+
+	// Serialize as UTF-8, then convert to UTF-16 or UTF-32 if necessary, and assemble with the padding and tail.
+	
+	std::string tailStr;
+
+	SerializeAsRDF ( *this, *rdfString, tailStr, options, newline, indentStr, baseIndent );
+
+	if ( charEncoding == kXMP_EncodeUTF8 ) {
+
+		if ( options & kXMP_ExactPacketLength ) {
+			size_t minSize = rdfString->size() + tailStr.size();
+			if ( minSize > padding ) XMP_Throw ( "Can't fit into specified packet size", kXMPErr_BadSerialize );
+			padding -= minSize;	// Now the actual amount of padding to add.
+		}
+		
+		size_t newlineLen = strlen ( newline );
+	
+		if ( padding < newlineLen ) {
+			rdfString->append ( padding, ' ' );
+		} else {
+			padding -= newlineLen;	// Write this newline last.
+			while ( padding >= (100 + newlineLen) ) {
+				rdfString->append ( 100, ' ' );
+				*rdfString += newline;
+				padding -= (100 + newlineLen);
+			}
+			rdfString->append ( padding, ' ' );
+			*rdfString += newline;
+		}
+
+		*rdfString += tailStr;
+	
+	} else {
+	
+		// Need to convert the encoding. Swap the UTF-8 into a local string and convert back. Assemble everything.
+		
+		XMP_VarString utf8Str, newlineStr;
+		bool bigEndian = ((charEncoding & _XMP_LittleEndian_Bit) == 0);
+		
+		if ( charEncoding & _XMP_UTF16_Bit ) {
+
+			std::string padStr ( "  " );  padStr[0] = 0;	// Assume big endian.
+			
+			utf8Str.swap ( *rdfString );
+			ToUTF16 ( (UTF8Unit*)utf8Str.c_str(), utf8Str.size(), rdfString, bigEndian );
+			utf8Str.swap ( tailStr );
+			ToUTF16 ( (UTF8Unit*)utf8Str.c_str(), utf8Str.size(), &tailStr, bigEndian );
+
+			if ( options & kXMP_ExactPacketLength ) {
+				size_t minSize = rdfString->size() + tailStr.size();
+				if ( minSize > padding ) XMP_Throw ( "Can't fit into specified packet size", kXMPErr_BadSerialize );
+				padding -= minSize;	// Now the actual amount of padding to add (in bytes).
+			}
+
+			utf8Str.assign ( newline );
+			ToUTF16 ( (UTF8Unit*)utf8Str.c_str(), utf8Str.size(), &newlineStr, bigEndian );
+			size_t newlineLen = newlineStr.size();
+	
+			if ( padding < newlineLen ) {
+				for ( int i = padding/2; i > 0; --i ) *rdfString += padStr;
+			} else {
+				padding -= newlineLen;	// Write this newline last.
+				while ( padding >= (200 + newlineLen) ) {
+					for ( int i = 100; i > 0; --i ) *rdfString += padStr;
+					*rdfString += newlineStr;
+					padding -= (200 + newlineLen);
+				}
+				for ( int i = padding/2; i > 0; --i ) *rdfString += padStr;
+				*rdfString += newlineStr;
+			}
+
+			*rdfString += tailStr;
+
+		} else {
+
+			std::string padStr ( "    " );  padStr[0] = padStr[1] = padStr[2] = 0;	// Assume big endian.
+
+			if ( charEncoding & _XMP_LittleEndian_Bit ) {
+				padStr[0] = ' '; padStr[1] = padStr[2] = padStr[3] = 0;
+			}
+			
+			utf8Str.swap ( *rdfString );
+			ToUTF32 ( (UTF8Unit*)utf8Str.c_str(), utf8Str.size(), rdfString, bigEndian );
+			utf8Str.swap ( tailStr );
+			ToUTF32 ( (UTF8Unit*)utf8Str.c_str(), utf8Str.size(), &tailStr, bigEndian );
+
+			if ( options & kXMP_ExactPacketLength ) {
+				size_t minSize = rdfString->size() + tailStr.size();
+				if ( minSize > padding ) XMP_Throw ( "Can't fit into specified packet size", kXMPErr_BadSerialize );
+				padding -= minSize;	// Now the actual amount of padding to add (in bytes).
+			}
+
+			utf8Str.assign ( newline );
+			ToUTF32 ( (UTF8Unit*)utf8Str.c_str(), utf8Str.size(), &newlineStr, bigEndian );
+			size_t newlineLen = newlineStr.size();
+	
+			if ( padding < newlineLen ) {
+				for ( int i = padding/4; i > 0; --i ) *rdfString += padStr;
+			} else {
+				padding -= newlineLen;	// Write this newline last.
+				while ( padding >= (400 + newlineLen) ) {
+					for ( int i = 100; i > 0; --i ) *rdfString += padStr;
+					*rdfString += newlineStr;
+					padding -= (400 + newlineLen);
+				}
+				for ( int i = padding/4; i > 0; --i ) *rdfString += padStr;
+				*rdfString += newlineStr;
+			}
+
+			*rdfString += tailStr;
+
+		}
+	
+	}
+
+}	// SerializeToBuffer
+
+// =================================================================================================
diff --git a/XMPCore/source/XMPMeta.cpp b/XMPCore/source/XMPMeta.cpp
new file mode 100644
index 0000000..eab85e9
--- /dev/null
+++ b/XMPCore/source/XMPMeta.cpp
@@ -0,0 +1,1380 @@
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "XMPCore/source/XMPMeta.hpp"
+#include "XMPCore/source/XMPIterator.hpp"
+#include "XMPCore/source/XMPUtils.hpp"
+#include "public/include/XMP_Version.h"
+#include "source/UnicodeInlines.incl_cpp"
+#include "source/UnicodeConversions.hpp"
+
+#include <algorithm>	// For sort and stable_sort.
+#include <cstdio>		// For snprintf.
+
+#if XMP_DebugBuild
+	#include <iostream>
+#endif
+
+using namespace std;
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
+	#pragma warning ( disable : 4702 )	// unreachable code
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+
+// *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
+// *** Add debug codegen checks, e.g. that typical masking operations really work
+// *** Change all uses of strcmp and strncmp to XMP_LitMatch and XMP_LitNMatch
+
+
+// =================================================================================================
+// Local Types and Constants
+// =========================
+
+
+// =================================================================================================
+// Static Variables
+// ================
+
+XMP_VarString * xdefaultName = 0;	// Needed in XMPMeta-Parse.cpp, MoveExplicitAliases.
+
+static XMPMeta::ErrorCallbackInfo sDefaultErrorCallback;
+
+// These are embedded version strings.
+
+const char * kXMPCore_EmbeddedVersion   = kXMPCore_VersionMessage;
+const char * kXMPCore_EmbeddedCopyright = kXMPCoreName " " kXMP_CopyrightStr;
+
+// =================================================================================================
+// Local Utilities
+// ===============
+
+
+// -------------------------------------------------------------------------------------------------
+// DumpNodeOptions
+// ---------------
+
+static void
+DumpNodeOptions	( XMP_OptionBits	 options,
+				  XMP_TextOutputProc outProc,
+				  void *			 refCon )
+{
+	char		buffer [32];	// Decimal of a 64 bit int is at most about 20 digits.
+	memset(buffer, 0, 32);
+
+	static const char * optNames[] = { " schema",		// 0x8000_0000
+									   " ?30",
+									   " ?29",
+									   " -COMMAS-",
+									   " ?27",			// 0x0800_0000
+									   " ?26",
+									   " ?25",
+									   " ?24",
+									   " ?23",			// 0x0080_0000
+									   " isStale",
+									   " isDerived",
+									   " isStable",
+									   " ?19",			// 0x0008_0000
+									   " isInternal",
+									   " hasAliases",
+									   " isAlias",
+									   " -AFTER-",		// 0x0000_8000
+									   " -BEFORE-",
+									   " isCompact",
+									   " isLangAlt",
+									   " isAlt",		// 0x0000_0800
+									   " isOrdered",
+									   " isArray",
+									   " isStruct",
+									   " hasType",		// 0x0000_0080
+									   " hasLang",
+									   " isQual",
+									   " hasQual",
+									   " ?3",			// 0x0000_0008
+									   " ?2",
+									   " URI",
+									   " ?0" };
+
+	if ( options == 0 ) {
+
+		OutProcNChars ( "(0x0)", 5 );
+
+	} else {
+
+		OutProcNChars ( "(0x", 3 );
+		OutProcHexInt ( options );
+		OutProcNChars ( " :", 2 );
+
+		XMP_OptionBits mask = 0x80000000;
+		for ( int b = 0; b < 32; ++b ) {
+			if ( options & mask ) OutProcLiteral ( optNames[b] );
+			mask = mask >> 1;
+		}
+		OutProcNChars ( ")", 1 );
+
+	}
+
+}	// DumpNodeOptions
+
+
+// -------------------------------------------------------------------------------------------------
+// DumpPropertyTree
+// ----------------
+
+// *** Extract the validation code into a separate routine to call on exit in debug builds.
+
+static void
+DumpPropertyTree ( const XMP_Node *	  currNode,
+				   int				  indent,
+				   size_t			  itemIndex,
+				   XMP_TextOutputProc outProc,
+				   void *			  refCon )
+{
+	char buffer [32];	// Decimal of a 64 bit int is at most about 20 digits.
+
+	OutProcIndent ( (size_t)indent );
+	if ( itemIndex == 0 ) {
+		if ( currNode->options & kXMP_PropIsQualifier ) OutProcNChars ( "? ", 2 );
+		DumpClearString ( currNode->name, outProc, refCon );
+	} else {
+		OutProcNChars ( "[", 1 );
+		OutProcDecInt ( itemIndex );
+		OutProcNChars ( "]", 1 );
+	}
+
+	if ( ! (currNode->options & kXMP_PropCompositeMask) ) {
+		OutProcNChars ( " = \"", 4 );
+		DumpClearString ( currNode->value, outProc, refCon );
+		OutProcNChars ( "\"", 1 );
+	}
+
+	if ( currNode->options != 0 ) {
+		OutProcNChars ( "  ", 2 );
+		DumpNodeOptions ( currNode->options, outProc, refCon );
+	}
+
+	if ( currNode->options & kXMP_PropHasLang ) {
+		if ( currNode->qualifiers.empty() || (currNode->qualifiers[0]->name != "xml:lang") ) {
+			OutProcLiteral ( "  ** bad lang flag **" );
+		}
+	}
+	// *** Check rdf:type also.
+
+	if ( ! (currNode->options & kXMP_PropCompositeMask) ) {
+		if ( ! currNode->children.empty() ) OutProcLiteral ( "  ** bad children **" );
+	} else if ( currNode->options & kXMP_PropValueIsArray ) {
+		if ( currNode->options & kXMP_PropValueIsStruct ) OutProcLiteral ( "  ** bad comp flags **" );
+	} else if ( (currNode->options & kXMP_PropCompositeMask) != kXMP_PropValueIsStruct ) {
+		OutProcLiteral ( "  ** bad comp flags **" );
+	}
+
+	#if 0	// *** XMP_DebugBuild
+		if ( (currNode->_namePtr != currNode->name.c_str()) ||
+			 (currNode->_valuePtr != currNode->value.c_str()) ) OutProcLiteral ( "  ** bad debug string **" );
+	#endif
+
+	OutProcNewline();
+
+	for ( size_t qualNum = 0, qualLim = currNode->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+
+		const XMP_Node * currQual = currNode->qualifiers[qualNum];
+
+		if ( currQual->parent != currNode ) OutProcLiteral ( "** bad parent link => " );
+		if ( currQual->name == kXMP_ArrayItemName ) OutProcLiteral ( "** bad qual name => " );
+		if ( ! (currQual->options & kXMP_PropIsQualifier) ) OutProcLiteral ( "** bad qual flag => " );
+		if ( currQual->name == "xml:lang" ) {
+			if ( (qualNum != 0) || (! (currNode->options & kXMP_PropHasLang)) ) OutProcLiteral ( "** bad lang qual => " );
+		}
+
+		DumpPropertyTree ( currQual, indent+2, 0, outProc, refCon );
+
+	}
+
+	for ( size_t childNum = 0, childLim = currNode->children.size(); childNum < childLim; ++childNum ) {
+
+		const XMP_Node * currChild = currNode->children[childNum];
+
+		if ( currChild->parent != currNode ) OutProcLiteral ( "** bad parent link => " );
+		if ( currChild->options & kXMP_PropIsQualifier ) OutProcLiteral ( "** bad qual flag => " );
+
+		if ( currNode->options & kXMP_PropValueIsArray ) {
+			itemIndex = childNum+1;
+			if ( currChild->name != kXMP_ArrayItemName ) OutProcLiteral ( "** bad item name => " );
+		} else {
+			itemIndex = 0;
+			if ( currChild->name == kXMP_ArrayItemName ) OutProcLiteral ( "** bad field name => " );
+		}
+
+		DumpPropertyTree ( currChild, indent+1, itemIndex, outProc, refCon );
+
+	}
+
+}	// DumpPropertyTree
+
+
+// -------------------------------------------------------------------------------------------------
+// DumpXMLTree
+// -----------
+
+#if DumpXMLParseTree
+
+static inline void PutHexByte ( FILE * log, unsigned char ch )
+{
+
+	fprintf ( log, "\\x" );
+	if ( ch < 0x10 ) {
+		fprintf ( log, "%c", kHexDigits[ch] );
+	} else {
+		fprintf ( log, "%c%c", kHexDigits[ch>>4], kHexDigits[ch&0xF] );
+	}
+
+}	// PutHexByte
+
+// -------------------------------------------------------------------------------------------------
+
+static void PutClearString ( FILE * log, const std::string & str )
+{
+
+	for ( size_t i = 0; i != str.size(); ++i ) {
+		unsigned char ch = str[i];
+		if ( (0x20 <= ch) && (ch <= 0x7F) ) {
+			fprintf ( log, "%c", ch );
+		} else {
+			PutHexByte ( log, ch );
+		}
+	}
+
+}	// PutClearString
+
+// -------------------------------------------------------------------------------------------------
+
+static void DumpXMLTree ( FILE * log, const XML_Node & node, int indent )
+{
+	size_t i;
+
+	#if 0	// *** XMP_DebugBuild
+		if ( (node._namePtr != node.name.c_str()) ||
+			 (node._valuePtr != node.value.c_str()) ) fprintf ( log, "*** bad debug string ***\n" );
+	#endif
+
+	for ( i = 0; i != (size_t)indent; ++i ) fprintf ( log, "  " );
+
+	switch ( node.kind ) {
+
+		case kRootNode :
+			fprintf ( log, "\nStart of XML tree dump\n\n" );
+			if ( (indent != 0) || (! node.attrs.empty()) ||
+				 (! node.ns.empty()) || (! node.name.empty()) || (!node.value.empty()) ) fprintf ( log, " ** invalid root ** \n" );
+			for ( i = 0; i < node.children.size(); ++i ) {
+				XMP_Uns8 kind = node.children[i]->kind;
+				if ( (kind == kRootNode) || (kind == kAttrNode) ) fprintf ( log, " ** invalid child ** \n" );
+				DumpXMLTree ( log, *node.children[i], indent+1 );
+			}
+			fprintf ( log, "\nEnd of XML tree dump\n" );
+			break;
+
+		case kElemNode :
+			fprintf ( log, "Elem %s", node.name.c_str() );
+			if ( indent == 0 ) fprintf ( log, " ** invalid elem ** " );
+			if ( ! node.ns.empty() ) fprintf ( log, " @ %s", node.ns.c_str() );
+			fprintf ( log, "\n" );
+			for ( i = 0; i < node.attrs.size(); ++i ) {
+				XMP_Uns8 kind = node.attrs[i]->kind;
+				if ( kind != kAttrNode ) fprintf ( log, " ** invalid attr ** \n" );
+				DumpXMLTree ( log, *node.attrs[i], indent+2 );
+			}
+			for ( i = 0; i < node.children.size(); ++i ) {
+				XMP_Uns8 kind = node.children[i]->kind;
+				if ( (kind == kRootNode) || (kind == kAttrNode) ) fprintf ( log, " ** invalid child ** \n" );
+				DumpXMLTree ( log, *node.children[i], indent+1 );
+			}
+			break;
+
+		case kAttrNode :
+			fprintf ( log, "Attr %s", node.name.c_str() );
+			if ( (indent == 0) || node.name.empty() || (! node.attrs.empty()) || (! node.children.empty()) ) fprintf ( log, " ** invalid attr ** " );
+			fprintf ( log, " = \"" );
+			PutClearString ( log, node.value );
+			fprintf ( log, "\"" );
+			if ( ! node.ns.empty() ) fprintf ( log, " @ %s", node.ns.c_str() );
+			fprintf ( log, "\n" );
+			break;
+
+		case kCDataNode :
+			if ( (indent == 0) || (! node.ns.empty()) || (! node.name.empty()) ||
+				 (! node.attrs.empty()) || (! node.children.empty()) ) fprintf ( log, " ** invalid cdata ** \n" );
+			fprintf ( log, "\"" );
+			PutClearString ( log, node.value );
+			fprintf ( log, "\"\n" );
+			break;
+
+		case kPINode :
+			fprintf ( log, "PI %s", node.name.c_str() );
+			if ( (indent == 0) || node.name.empty() || (! node.children.empty()) ) fprintf ( log, " ** invalid pi ** \n" );
+			if ( ! node.value.empty() ) {
+				fprintf ( log, " <? " );
+				PutClearString ( log, node.value );
+				fprintf ( log, " ?>" );
+			}
+			fprintf ( log, "\n" );
+			break;
+
+	}
+
+}	// DumpXMLTree
+
+#endif	// DumpXMLParseTree
+
+
+// -------------------------------------------------------------------------------------------------
+// CompareNodeNames
+// ----------------
+//
+// Comparison routine for sorting XMP nodes by name. The name "xml:lang" is less than anything else,
+// and "rdf:type" is less than anything except "xml:lang". This preserves special rules for qualifiers.
+
+static bool
+CompareNodeNames ( XMP_Node * left, XMP_Node * right )
+{
+
+	if ( left->name  == "xml:lang" ) return true;
+	if ( right->name == "xml:lang" ) return false;
+
+	if ( left->name  == "rdf:type" ) return true;
+	if ( right->name == "rdf:type" ) return false;
+
+	return ( left->name < right->name );
+
+}	// CompareNodeNames
+
+
+// -------------------------------------------------------------------------------------------------
+// CompareNodeValues
+// -----------------
+//
+// Comparison routine for sorting XMP nodes by value.
+
+static bool
+CompareNodeValues ( XMP_Node * left, XMP_Node * right )
+{
+
+	if ( XMP_PropIsSimple ( left->options ) && XMP_PropIsSimple ( right->options ) ) {
+		return ( left->value < right->value );
+	}
+
+	XMP_OptionBits leftForm  = left->options & kXMP_PropCompositeMask;
+	XMP_OptionBits rightForm = right->options & kXMP_PropCompositeMask;
+
+	return ( leftForm < rightForm );
+
+}	// CompareNodeValues
+
+
+// -------------------------------------------------------------------------------------------------
+// CompareNodeLangs
+// ----------------
+//
+// Comparison routine for sorting XMP nodes by xml:lang qualifier. An "x-default" value is less than
+// any other language.
+
+static bool
+CompareNodeLangs ( XMP_Node * left, XMP_Node * right )
+{
+
+	if ( left->qualifiers.empty()  || (left->qualifiers[0]->name  != "xml:lang") ) return false;
+	if ( right->qualifiers.empty() || (right->qualifiers[0]->name != "xml:lang") ) return false;
+
+	if ( left->qualifiers[0]->value  == "x-default" ) return true;
+	if ( right->qualifiers[0]->value == "x-default" ) return false;
+
+	return ( left->qualifiers[0]->value < right->qualifiers[0]->value );
+
+}	// CompareNodeLangs
+
+
+// -------------------------------------------------------------------------------------------------
+// SortWithinOffspring
+// -------------------
+//
+// Sort one level down, within the elements of a node vector. This sorts the qualifiers of each
+// node. If the node is a struct it sorts the fields by names. If the node is an unordered array it
+// sorts the elements by value. If the node is an AltText array it sorts the elements by language.
+
+static void
+SortWithinOffspring ( XMP_NodeOffspring & nodeVec )
+{
+
+	for ( size_t i = 0, limit = nodeVec.size(); i < limit; ++i ) {
+
+		XMP_Node * currPos = nodeVec[i];
+
+		if ( ! currPos->qualifiers.empty() ) {
+			sort ( currPos->qualifiers.begin(), currPos->qualifiers.end(), CompareNodeNames );
+			SortWithinOffspring ( currPos->qualifiers );
+		}
+
+		if ( ! currPos->children.empty() ) {
+
+			if ( XMP_PropIsStruct ( currPos->options ) || XMP_NodeIsSchema ( currPos->options ) ) {
+				sort ( currPos->children.begin(), currPos->children.end(), CompareNodeNames );
+			} else if ( XMP_PropIsArray ( currPos->options ) ) {
+				if ( XMP_ArrayIsUnordered ( currPos->options ) ) {
+					stable_sort ( currPos->children.begin(), currPos->children.end(), CompareNodeValues );
+				} else if ( XMP_ArrayIsAltText ( currPos->options ) ) {
+					sort ( currPos->children.begin(), currPos->children.end(), CompareNodeLangs );
+				}
+			}
+
+			SortWithinOffspring ( currPos->children );
+
+		}
+
+	}
+
+}	// SortWithinOffspring
+
+
+// -------------------------------------------------------------------------------------------------
+// RegisterAlias
+// -------------
+//
+// Allow 3 kinds of alias:
+//	TopProp => TopProp
+//	TopProp => TopArray[1]
+//	TopProp => TopArray[@xml:lang='x-default']
+//
+// A new alias can be made to something that is already aliased, as long as the net result is one of
+// the legitimate forms. The new alias can already have aliases to it, also as long as result of
+// adjusting all of the exiting aliases leaves them legal.
+//
+// ! The caller assumes all risk that new aliases do not invalidate existing XMPMeta objects. Any
+// ! conflicts will result in later references throwing bad XPath exceptions.
+
+static void
+RegisterAlias ( XMP_StringPtr  aliasNS,
+				XMP_StringPtr  aliasProp,
+				XMP_StringPtr  actualNS,
+				XMP_StringPtr  actualProp,
+				XMP_OptionBits arrayForm )
+{
+	XMP_ExpandedXPath	expAlias, expActual;
+	XMP_AliasMapPos		mapPos;
+	XMP_ExpandedXPath *	regActual = 0;
+
+	XMP_Assert ( (aliasNS != 0) && (aliasProp != 0) && (actualNS != 0) && (actualProp != 0) );	// Enforced by wrapper.
+
+	// Expand the alias and actual names, make sure they are one of the basic 3 forms. When counting
+	// the expanded XPath size remember that the schema URI is the first component. We don't have to
+	// compare the schema URIs though, the (unique) prefix is part of the top property name.
+
+	ExpandXPath ( aliasNS, aliasProp, &expAlias );
+	ExpandXPath ( actualNS, actualProp, &expActual );
+	if ( (expAlias.size() != 2) || (expActual.size() != 2) ) {
+		XMP_Throw ( "Alias and actual property names must be simple", kXMPErr_BadXPath );
+	}
+
+	arrayForm = VerifySetOptions ( arrayForm, 0 );
+	if ( arrayForm != 0 ) {
+		if ( (arrayForm & ~kXMP_PropArrayFormMask) != 0 ) XMP_Throw ( "Only array form flags are allowed", kXMPErr_BadOptions );
+		expActual[1].options |= arrayForm;	// Set the array form for the top level step.
+		if ( ! (arrayForm & kXMP_PropArrayIsAltText) ) {
+			expActual.push_back ( XPathStepInfo ( "[1]", kXMP_ArrayIndexStep ) );
+		} else {
+			expActual.push_back ( XPathStepInfo ( "[?xml:lang=\"x-default\"]", kXMP_QualSelectorStep ) );
+		}
+	}
+
+	// See if there are any conflicts with existing aliases. A couple of the checks are easy. If the
+	// alias is already aliased it is only OK to reregister an identical alias. If the actual is
+	// already aliased to something else and the new chain is legal, just swap in the old base.
+
+	mapPos = sRegisteredAliasMap->find ( expAlias[kRootPropStep].step );
+	if ( mapPos != sRegisteredAliasMap->end() ) {
+
+		// This alias is already registered to something, make sure it is the same something.
+
+		regActual = &mapPos->second;
+		if ( arrayForm != (mapPos->second[1].options & kXMP_PropArrayFormMask) ) {
+			XMP_Throw ( "Mismatch with existing alias array form", kXMPErr_BadParam );
+		}
+		if ( expActual.size() != regActual->size() ) {
+			XMP_Throw ( "Mismatch with existing actual path", kXMPErr_BadParam );
+		}
+		if ( expActual[kRootPropStep].step != (*regActual)[kRootPropStep].step ) {
+			XMP_Throw ( "Mismatch with existing actual name", kXMPErr_BadParam );
+		}
+		if ( (expActual.size() == 3) && (expActual[kAliasIndexStep].step != (*regActual)[kAliasIndexStep].step) ) {
+			XMP_Throw ( "Mismatch with existing actual array item", kXMPErr_BadParam );
+		}
+		return;
+
+	}
+
+	mapPos = sRegisteredAliasMap->find ( expActual[kRootPropStep].step );
+	if ( mapPos != sRegisteredAliasMap->end() ) {
+
+		// The actual is already aliased to something else.
+
+		regActual = &mapPos->second;
+		if ( expActual.size() == 2 ) {
+			expActual = *regActual;	// TopProp => TopProp => anything : substitute the entire old base.
+		} else if ( regActual->size() != 2 ) {
+			XMP_Throw ( "Can't alias an array item to an array item", kXMPErr_BadParam );	// TopProp => TopArray[] => TopArray[] : nope.
+		} else {
+			expActual[kSchemaStep].step = (*regActual)[kSchemaStep].step;		// TopProp => TopArray[] => TopProp :
+			expActual[kRootPropStep].step   = (*regActual)[kRootPropStep].step;	//	substitute the old base name.
+		}
+
+	}
+
+	// Checking for existing aliases to this one is touchier. This involves updating the alias map,
+	// which must not be done unless all of the changes are legal. So we need 2 loops, one to verify
+	// that everything is OK, and one to make the changes. The bad case is:
+	//	TopProp => TopArray[] => TopArray[]
+	// In the valid cases we back substitute the new base.
+
+	for ( mapPos = sRegisteredAliasMap->begin(); mapPos != sRegisteredAliasMap->end(); ++mapPos ) {
+		regActual = &mapPos->second;
+		if ( expAlias[kRootPropStep].step == (*regActual)[kRootPropStep].step ) {
+			if ( (regActual->size() == 2) && (expAlias.size() == 2) ) {
+				XMP_Throw ( "Can't alias an array item to an array item", kXMPErr_BadParam );
+			}
+		}
+	}
+
+	for ( mapPos = sRegisteredAliasMap->begin(); mapPos != sRegisteredAliasMap->end(); ++mapPos ) {
+		regActual = &mapPos->second;
+		if ( expAlias[kRootPropStep].step == (*regActual)[kRootPropStep].step ) {
+
+			if ( regActual->size() == 1 ) {
+				*regActual = expActual;	// TopProp => TopProp => anything : substitute the entire new base.
+			} else {
+				(*regActual)[kSchemaStep].step = expActual[kSchemaStep].step;	// TopProp => TopArray[] => TopProp :
+				(*regActual)[kRootPropStep].step   = expActual[kRootPropStep].step;		//	substitute the new base name.
+			}
+
+		}
+	}
+
+	// Finally, all is OK to register the new alias.
+
+	(void) sRegisteredAliasMap->insert ( XMP_AliasMap::value_type ( expAlias[kRootPropStep].step, expActual ) );
+
+}	// RegisterAlias
+
+
+// -------------------------------------------------------------------------------------------------
+// RegisterStandardAliases
+// -----------------------
+
+static void
+RegisterStandardAliases()
+{
+
+	// Aliases from XMP to DC.
+	RegisterAlias ( kXMP_NS_XMP, "Author",       kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered );
+	RegisterAlias ( kXMP_NS_XMP, "Authors",      kXMP_NS_DC, "creator", 0 );
+	RegisterAlias ( kXMP_NS_XMP, "Description",  kXMP_NS_DC, "description", 0 );
+	RegisterAlias ( kXMP_NS_XMP, "Format",       kXMP_NS_DC, "format", 0 );
+	RegisterAlias ( kXMP_NS_XMP, "Keywords",     kXMP_NS_DC, "subject", 0 );
+	RegisterAlias ( kXMP_NS_XMP, "Locale",       kXMP_NS_DC, "language", 0 );
+	RegisterAlias ( kXMP_NS_XMP, "Title",        kXMP_NS_DC, "title", 0 );
+	RegisterAlias ( kXMP_NS_XMP_Rights, "Copyright", kXMP_NS_DC, "rights", 0 );
+
+	// Aliases from PDF to DC and XMP.
+	RegisterAlias ( kXMP_NS_PDF, "Author",       kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered );
+	RegisterAlias ( kXMP_NS_PDF, "BaseURL",      kXMP_NS_XMP, "BaseURL", 0 );
+	RegisterAlias ( kXMP_NS_PDF, "CreationDate", kXMP_NS_XMP, "CreateDate", 0 );
+	RegisterAlias ( kXMP_NS_PDF, "Creator",      kXMP_NS_XMP, "CreatorTool", 0 );
+	RegisterAlias ( kXMP_NS_PDF, "ModDate",      kXMP_NS_XMP, "ModifyDate", 0 );
+	RegisterAlias ( kXMP_NS_PDF, "Subject",      kXMP_NS_DC,  "description", kXMP_PropArrayIsAltText );
+	RegisterAlias ( kXMP_NS_PDF, "Title",        kXMP_NS_DC,  "title", kXMP_PropArrayIsAltText );
+
+	// Aliases from Photoshop to DC and XMP.
+	RegisterAlias ( kXMP_NS_Photoshop, "Author",       kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered );
+	RegisterAlias ( kXMP_NS_Photoshop, "Caption",      kXMP_NS_DC, "description", kXMP_PropArrayIsAltText );
+	RegisterAlias ( kXMP_NS_Photoshop, "Copyright",    kXMP_NS_DC, "rights", kXMP_PropArrayIsAltText );
+	RegisterAlias ( kXMP_NS_Photoshop, "Keywords",     kXMP_NS_DC, "subject", 0 );
+	RegisterAlias ( kXMP_NS_Photoshop, "Marked",       kXMP_NS_XMP_Rights, "Marked", 0 );
+	RegisterAlias ( kXMP_NS_Photoshop, "Title",        kXMP_NS_DC, "title", kXMP_PropArrayIsAltText );
+	RegisterAlias ( kXMP_NS_Photoshop, "WebStatement", kXMP_NS_XMP_Rights, "WebStatement", 0 );
+
+	// Aliases from TIFF and EXIF to DC and XMP.
+	RegisterAlias ( kXMP_NS_TIFF, "Artist",            kXMP_NS_DC,  "creator", kXMP_PropArrayIsOrdered);
+	RegisterAlias ( kXMP_NS_TIFF, "Copyright",         kXMP_NS_DC,  "rights", 0 );
+	RegisterAlias ( kXMP_NS_TIFF, "DateTime",          kXMP_NS_XMP, "ModifyDate", 0 );
+	RegisterAlias ( kXMP_NS_EXIF, "DateTimeDigitized", kXMP_NS_XMP, "CreateDate", 0 );
+	RegisterAlias ( kXMP_NS_TIFF, "ImageDescription",  kXMP_NS_DC,  "description", 0 );
+	RegisterAlias ( kXMP_NS_TIFF, "Software",          kXMP_NS_XMP, "CreatorTool", 0 );
+
+	// Aliases from PNG to DC and XMP.
+	RegisterAlias ( kXMP_NS_PNG, "Author",           kXMP_NS_DC,  "creator", kXMP_PropArrayIsOrdered);
+	RegisterAlias ( kXMP_NS_PNG, "Copyright",        kXMP_NS_DC,  "rights", kXMP_PropArrayIsAltText);
+	RegisterAlias ( kXMP_NS_PNG, "CreationTime",     kXMP_NS_XMP, "CreateDate", 0 );
+	RegisterAlias ( kXMP_NS_PNG, "Description",      kXMP_NS_DC,  "description", kXMP_PropArrayIsAltText);
+	RegisterAlias ( kXMP_NS_PNG, "ModificationTime", kXMP_NS_XMP, "ModifyDate", 0 );
+	RegisterAlias ( kXMP_NS_PNG, "Software",         kXMP_NS_XMP, "CreatorTool", 0 );
+	RegisterAlias ( kXMP_NS_PNG, "Title",            kXMP_NS_DC,  "title", kXMP_PropArrayIsAltText);
+
+}	// RegisterStandardAliases
+
+
+// =================================================================================================
+// Constructors
+// ============
+
+
+XMPMeta::XMPMeta() : clientRefs(0), tree(XMP_Node(0,"",0)), xmlParser(0)
+{
+	#if XMP_TraceCTorDTor
+		printf ( "Default construct XMPMeta @ %.8X\n", this );
+	#endif
+
+	if ( sDefaultErrorCallback.clientProc != 0 ) {
+		this->errorCallback.wrapperProc = sDefaultErrorCallback.wrapperProc;
+		this->errorCallback.clientProc = sDefaultErrorCallback.clientProc;
+		this->errorCallback.context = sDefaultErrorCallback.context;
+		this->errorCallback.limit = sDefaultErrorCallback.limit;
+	}
+
+}	// XMPMeta
+
+// -------------------------------------------------------------------------------------------------
+
+XMPMeta::~XMPMeta() RELEASE_NO_THROW
+{
+	#if XMP_TraceCTorDTor
+		printf ( "Destruct XMPMeta @ %.8X\n", this );
+	#endif
+
+	XMP_Assert ( this->clientRefs <= 0 );
+	if ( xmlParser != 0 ) delete ( xmlParser );
+	xmlParser = 0;
+
+}	// ~XMPMeta
+
+
+// =================================================================================================
+// Class Static Functions
+// ======================
+//
+//
+// =================================================================================================
+
+// -------------------------------------------------------------------------------------------------
+// GetVersionInfo
+// --------------
+
+/* class-static */ void
+XMPMeta::GetVersionInfo ( XMP_VersionInfo * info )
+{
+
+	memset ( info, 0, sizeof(*info) );	// AUDIT: Safe, using sizeof the destination.
+	XMP_Assert ( sizeof(*info) == sizeof(XMP_VersionInfo) );
+
+	info->major   = XMPCORE_API_VERSION_MAJOR;
+	info->minor   = XMPCORE_API_VERSION_MINOR;
+	info->micro   = 0; //no longer used
+	info->isDebug = kXMPCore_DebugFlag;
+	info->flags   = 0;	// ! None defined yet.
+	info->message = kXMPCore_VersionMessage;
+
+}	// GetVersionInfo
+
+// -------------------------------------------------------------------------------------------------
+// Initialize
+// ----------
+
+#if XMP_TraceCoreCalls
+	FILE * xmpCoreLog = stderr;
+#endif
+
+#if UseGlobalLibraryLock
+	XMP_BasicMutex sLibraryLock;
+#endif
+
+/* class-static */ bool
+XMPMeta::Initialize()
+{
+	// Allocate and initialize static objects.
+
+	++sXMP_InitCount;
+	if ( sXMP_InitCount > 1 ) return true;
+
+	#if XMP_TraceCoreCallsToFile
+		xmpCoreLog = fopen ( "XMPCoreLog.txt", "w" );
+		if ( xmpCoreLog == 0 ) xmpCoreLog = stderr;
+	#endif
+
+	#if UseGlobalLibraryLock
+		InitializeBasicMutex ( sLibraryLock );
+	#endif
+
+	if ( ! Initialize_LibUtils() ) return false;
+	xdefaultName = new XMP_VarString ( "x-default" );
+
+	sRegisteredNamespaces = new XMP_NamespaceTable;
+	sRegisteredAliasMap   = new XMP_AliasMap;
+
+	InitializeUnicodeConversions();
+
+
+	// Register standard namespaces and aliases.
+
+	XMP_StringPtr	voidPtr;
+	XMP_StringLen	voidLen;
+
+	(void) RegisterNamespace ( kXMP_NS_XML, "xml", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_RDF, "rdf", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_DC, "dc", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_XMP, "xmp", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PDF, "pdf", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_Photoshop, "photoshop", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PSAlbum, "album", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_EXIF, "exif", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_EXIF_Aux, "aux", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_ExifEX, "exifEX", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_TIFF, "tiff", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PNG, "png", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_JPEG, "jpeg", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_JP2K, "jp2k", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_CameraRaw, "crs", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_ASF, "asf", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_WAV, "wav", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_AdobeStockPhoto, "bmsp", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_CreatorAtom, "creatorAtom", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_XMP_Rights, "xmpRights", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_MM, "xmpMM", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_BJ, "xmpBJ", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_Note, "xmpNote", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_DM, "xmpDM", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_Script, "xmpScript", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_BWF, "bext", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_AEScart, "AEScart", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_RIFFINFO, "riffinfo", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_Text, "xmpT", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_PagedFile, "xmpTPg", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_Graphics, "xmpG", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_Image, "xmpGImg", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_XMP_Font, "stFnt", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_Dimensions, "stDim", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_ResourceEvent, "stEvt", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_ResourceRef, "stRef", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_ST_Version, "stVer", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_ST_Job, "stJob", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_XMP_ManifestItem, "stMfs", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_XMP_IdentifierQual, "xmpidq", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_IPTCCore, "Iptc4xmpCore", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_IPTCExt, "Iptc4xmpExt", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_DICOM, "DICOM", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PLUS, "plus", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_PDFA_Schema, "pdfaSchema", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PDFA_Property, "pdfaProperty", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PDFA_Type, "pdfaType", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PDFA_Field, "pdfaField", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PDFA_ID, "pdfaid", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PDFA_Extension, "pdfaExtension", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( kXMP_NS_PDFX, "pdfx", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( kXMP_NS_PDFX_ID, "pdfxid", &voidPtr, &voidLen );
+
+	(void) RegisterNamespace ( "adobe:ns:meta/", "x", &voidPtr, &voidLen );
+	(void) RegisterNamespace ( "http://ns.adobe.com/iX/1.0/", "iX", &voidPtr, &voidLen );
+
+	RegisterStandardAliases();
+
+	// Initialize the other core classes.
+
+	if ( ! XMPIterator::Initialize() ) XMP_Throw ( "Failure from XMPIterator::Initialize", kXMPErr_InternalFailure );
+	if ( ! XMPUtils::Initialize() ) XMP_Throw ( "Failure from XMPUtils::Initialize", kXMPErr_InternalFailure );
+	// Do miscelaneous semantic checks of types and arithmetic.
+
+	XMP_Assert ( sizeof(XMP_Int8) == 1 );
+	XMP_Assert ( sizeof(XMP_Int16) == 2 );
+	XMP_Assert ( sizeof(XMP_Int32) == 4 );
+	XMP_Assert ( sizeof(XMP_Int64) == 8 );
+	XMP_Assert ( sizeof(XMP_Uns8) == 1 );
+	XMP_Assert ( sizeof(XMP_Uns16) == 2 );
+	XMP_Assert ( sizeof(XMP_Uns32) == 4 );
+	XMP_Assert ( sizeof(XMP_Uns64) == 8 );
+	XMP_Assert ( sizeof(XMP_Bool) == 1 );
+
+	XMP_Assert ( sizeof(XMP_OptionBits) == 4 );	// Check that option masking work on all 32 bits.
+#if XMP_DebugBuild
+	XMP_OptionBits flag = (XMP_OptionBits) (~0UL);
+#endif
+	XMP_Assert ( flag == (XMP_OptionBits)(-1L) );
+	XMP_Assert ( (flag ^ kXMP_PropHasLang) == 0xFFFFFFBFUL );
+	XMP_Assert ( (flag & ~kXMP_PropHasLang) == 0xFFFFFFBFUL );
+
+	XMP_OptionBits opt1 = 0;	// Check the general option bit macros.
+	XMP_OptionBits opt2 = (XMP_OptionBits)~0UL;
+	XMP_SetOption ( opt1, kXMP_PropValueIsArray );
+	XMP_ClearOption ( opt2, kXMP_PropValueIsArray );
+	XMP_Assert ( opt1 == ~opt2 );
+	XMP_Assert ( XMP_TestOption ( opt1, kXMP_PropValueIsArray ) );
+	XMP_Assert ( ! XMP_TestOption ( opt2, kXMP_PropValueIsArray ) );
+
+	XMP_Assert ( XMP_PropIsSimple ( ~kXMP_PropCompositeMask ) );	// Check the special option bit macros.
+	XMP_Assert ( ! XMP_PropIsSimple ( kXMP_PropValueIsStruct ) );
+	XMP_Assert ( ! XMP_PropIsSimple ( kXMP_PropValueIsArray ) );
+
+	XMP_Assert ( XMP_PropIsStruct ( kXMP_PropValueIsStruct ) );
+	XMP_Assert ( XMP_PropIsArray  ( kXMP_PropValueIsArray ) );
+	XMP_Assert ( ! XMP_PropIsStruct ( ~kXMP_PropValueIsStruct ) );
+	XMP_Assert ( ! XMP_PropIsArray  ( ~kXMP_PropValueIsArray ) );
+
+	XMP_Assert ( XMP_ArrayIsUnordered ( ~kXMP_PropArrayIsOrdered ) );
+	XMP_Assert ( XMP_ArrayIsOrdered   ( kXMP_PropArrayIsOrdered ) );
+	XMP_Assert ( XMP_ArrayIsAlternate ( kXMP_PropArrayIsAlternate ) );
+	XMP_Assert ( XMP_ArrayIsAltText   ( kXMP_PropArrayIsAltText ) );
+	XMP_Assert ( ! XMP_ArrayIsUnordered ( kXMP_PropArrayIsOrdered ) );
+	XMP_Assert ( ! XMP_ArrayIsOrdered   ( ~kXMP_PropArrayIsOrdered ) );
+	XMP_Assert ( ! XMP_ArrayIsAlternate ( ~kXMP_PropArrayIsAlternate ) );
+	XMP_Assert ( ! XMP_ArrayIsAltText   ( ~kXMP_PropArrayIsAltText ) );
+
+	XMP_Assert ( XMP_PropHasQualifiers ( kXMP_PropHasQualifiers ) );
+	XMP_Assert ( XMP_PropIsQualifier   ( kXMP_PropIsQualifier ) );
+	XMP_Assert ( XMP_PropHasLang       ( kXMP_PropHasLang ) );
+	XMP_Assert ( ! XMP_PropHasQualifiers ( ~kXMP_PropHasQualifiers ) );
+	XMP_Assert ( ! XMP_PropIsQualifier   ( ~kXMP_PropIsQualifier ) );
+	XMP_Assert ( ! XMP_PropHasLang       ( ~kXMP_PropHasLang ) );
+
+	XMP_Assert ( XMP_NodeIsSchema ( kXMP_SchemaNode ) );
+	XMP_Assert ( XMP_PropIsAlias  ( kXMP_PropIsAlias ) );
+	XMP_Assert ( ! XMP_NodeIsSchema ( ~kXMP_SchemaNode ) );
+	XMP_Assert ( ! XMP_PropIsAlias  ( ~kXMP_PropIsAlias ) );
+
+	#if 0	// Generally off, enable to hand check generated code.
+		extern XMP_OptionBits opt3, opt4;
+		if ( XMP_TestOption ( opt3, kXMP_PropValueIsArray ) ) opt4 = opt3;
+		if ( ! XMP_TestOption ( opt3, kXMP_PropValueIsStruct ) ) opt4 = opt3;
+		static bool ok1 = XMP_TestOption ( opt4, kXMP_PropValueIsArray );
+		static bool ok2 = ! XMP_TestOption ( opt4, kXMP_PropValueIsStruct );
+	#endif
+
+	// Make sure the embedded info strings are referenced and kept.
+	if ( (kXMPCore_EmbeddedVersion[0] == 0) || (kXMPCore_EmbeddedCopyright[0] == 0) ) return false;
+	return true;
+
+}	// Initialize
+
+
+// -------------------------------------------------------------------------------------------------
+// Terminate
+// ---------
+
+/* class-static */ void
+XMPMeta::Terminate() RELEASE_NO_THROW
+{
+	--sXMP_InitCount;
+	if ( sXMP_InitCount != 0 ) return;	// Not ready to terminate, or already terminated.
+
+	XMPIterator::Terminate();
+	XMPUtils::Terminate();
+#if ENABLE_NEW_DOM_MODEL
+	NS_XMPCOMMON::ITSingleton< NS_INT_XMPCORE::IXMPCoreObjectFactory >::DestroyInstance();
+	NS_INT_XMPCOMMON::TerminateXMPCommonFramework();
+#endif
+
+	EliminateGlobal ( sRegisteredNamespaces );
+	EliminateGlobal ( sRegisteredAliasMap );
+
+	EliminateGlobal ( xdefaultName );
+
+	Terminate_LibUtils();
+
+	#if UseGlobalLibraryLock
+		TerminateBasicMutex ( sLibraryLock );
+	#endif
+
+	#if XMP_TraceCoreCallsToFile
+		if ( xmpCoreLog != stderr ) fclose ( xmpCoreLog );
+		xmpCoreLog = stderr;
+	#endif
+
+	// reset static variables
+	sDefaultErrorCallback.Clear();
+}	// Terminate
+
+
+// -------------------------------------------------------------------------------------------------
+// DumpNamespaces
+// --------------
+//
+// Dump the prefix to URI map (easier to read) and verify that both are consistent and legit.
+
+// *** Should put checks in a separate routine for regular calling in debug builds.
+
+/* class-static */ XMP_Status
+XMPMeta::DumpNamespaces ( XMP_TextOutputProc outProc,
+                          void *             refCon )
+{
+
+	sRegisteredNamespaces->Dump ( outProc, refCon );
+	return 0;
+
+}	// DumpNamespaces
+
+
+// -------------------------------------------------------------------------------------------------
+// GetGlobalOptions
+// ----------------
+
+/* class-static */ XMP_OptionBits
+XMPMeta::GetGlobalOptions()
+{
+	XMP_OptionBits	options = 0;
+
+	return options;
+
+}	// GetGlobalOptions
+
+
+// -------------------------------------------------------------------------------------------------
+// SetGlobalOptions
+// ----------------
+
+/* class-static */ void
+XMPMeta::SetGlobalOptions ( XMP_OptionBits /*options*/ )
+{
+
+	XMP_Throw ( "Unimplemented method XMPMeta::SetGlobalOptions", kXMPErr_Unimplemented );
+
+}	// SetGlobalOptions
+
+
+// -------------------------------------------------------------------------------------------------
+// RegisterNamespace
+// -----------------
+
+/* class-static */ bool
+XMPMeta::RegisterNamespace ( XMP_StringPtr	 namespaceURI,
+							 XMP_StringPtr	 suggestedPrefix,
+							 XMP_StringPtr * registeredPrefix,
+							 XMP_StringLen * prefixSize )
+{
+
+	return sRegisteredNamespaces->Define ( namespaceURI, suggestedPrefix, registeredPrefix, prefixSize );
+
+}	// RegisterNamespace
+
+
+// -------------------------------------------------------------------------------------------------
+// GetNamespacePrefix
+// ------------------
+
+/* class-static */ bool
+XMPMeta::GetNamespacePrefix	( XMP_StringPtr   namespaceURI,
+							  XMP_StringPtr * namespacePrefix,
+							  XMP_StringLen * prefixSize )
+{
+
+	return sRegisteredNamespaces->GetPrefix ( namespaceURI, namespacePrefix, prefixSize );
+
+}	// GetNamespacePrefix
+
+
+// -------------------------------------------------------------------------------------------------
+// GetNamespaceURI
+// ---------------
+
+/* class-static */ bool
+XMPMeta::GetNamespaceURI ( XMP_StringPtr   namespacePrefix,
+						   XMP_StringPtr * namespaceURI,
+						   XMP_StringLen * uriSize )
+{
+
+	return sRegisteredNamespaces->GetURI ( namespacePrefix, namespaceURI, uriSize );
+
+}	// GetNamespaceURI
+
+
+// -------------------------------------------------------------------------------------------------
+// DeleteNamespace
+// ---------------
+
+// *** Don't allow standard namespaces to be deleted.
+// *** We would be better off not having this. Instead, have local namespaces from parsing be
+// *** restricted to the object that introduced them.
+
+/* class-static */ void
+XMPMeta::DeleteNamespace ( XMP_StringPtr namespaceURI )
+{
+
+	XMP_Throw ( "Unimplemented method XMPMeta::DeleteNamespace", kXMPErr_Unimplemented );
+
+}	// DeleteNamespace
+
+
+// =================================================================================================
+// Class Methods
+// =============
+//
+//
+// =================================================================================================
+
+
+// -------------------------------------------------------------------------------------------------
+// DumpObject
+// ----------
+
+void
+XMPMeta::DumpObject ( XMP_TextOutputProc outProc,
+                      void *             refCon ) const
+{
+	XMP_Assert ( outProc != 0 );	// ! Enforced by wrapper.
+
+	OutProcLiteral ( "Dumping XMPMeta object \"" );
+	DumpClearString ( tree.name, outProc, refCon );
+	OutProcNChars ( "\"  ", 3 );
+	DumpNodeOptions ( tree.options, outProc, refCon );
+	#if 0	// *** XMP_DebugBuild
+		if ( (tree._namePtr != tree.name.c_str()) ||
+			 (tree._valuePtr != tree.value.c_str()) ) OutProcLiteral ( "  ** bad debug string **" );
+	#endif
+	OutProcNewline();
+
+	if ( ! tree.value.empty() ) {
+		OutProcLiteral ( "** bad root value **  \"" );
+		DumpClearString ( tree.value, outProc, refCon );
+		OutProcNChars ( "\"", 1 );
+		OutProcNewline();
+	}
+
+	if ( ! tree.qualifiers.empty() ) {
+		OutProcLiteral ( "** bad root qualifiers **" );
+		OutProcNewline();
+		for ( size_t qualNum = 0, qualLim = tree.qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+			DumpPropertyTree ( tree.qualifiers[qualNum], 3, 0, outProc, refCon );
+		}
+	}
+
+	if ( ! tree.children.empty() ) {
+
+		for ( size_t childNum = 0, childLim = tree.children.size(); childNum < childLim; ++childNum ) {
+
+			const XMP_Node * currSchema = tree.children[childNum];
+
+			OutProcNewline();
+			OutProcIndent ( 1 );
+			DumpClearString ( currSchema->value, outProc, refCon );
+			OutProcNChars ( "  ", 2 );
+			DumpClearString ( currSchema->name, outProc, refCon );
+			OutProcNChars ( "  ", 2 );
+			DumpNodeOptions ( currSchema->options, outProc, refCon );
+			#if 0	// *** XMP_DebugBuild
+				if ( (currSchema->_namePtr != currSchema->name.c_str()) ||
+					 (currSchema->_valuePtr != currSchema->value.c_str()) ) OutProcLiteral ( "  ** bad debug string **" );
+			#endif
+			OutProcNewline();
+
+			if ( ! (currSchema->options & kXMP_SchemaNode) ) {
+				OutProcLiteral ( "** bad schema options **" );
+				OutProcNewline();
+			}
+
+			if ( ! currSchema->qualifiers.empty() ) {
+				OutProcLiteral ( "** bad schema qualifiers **" );
+				OutProcNewline();
+				for ( size_t qualNum = 0, qualLim = currSchema->qualifiers.size(); qualNum < qualLim; ++qualNum ) {
+					DumpPropertyTree ( currSchema->qualifiers[qualNum], 3, 0, outProc, refCon );
+				}
+			}
+
+			for ( size_t numChild = 0, childLimit = currSchema->children.size(); numChild < childLimit; ++numChild ) {
+				DumpPropertyTree ( currSchema->children[numChild], 2, 0, outProc, refCon );
+			}
+
+		}
+
+	}
+
+}	// DumpObject
+
+
+// -------------------------------------------------------------------------------------------------
+// CountArrayItems
+// ---------------
+
+XMP_Index
+XMPMeta::CountArrayItems ( XMP_StringPtr schemaNS,
+						   XMP_StringPtr arrayName ) const
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath	expPath;
+	ExpandXPath ( schemaNS, arrayName, &expPath );
+
+	const XMP_Node * arrayNode = FindConstNode ( &tree, expPath );
+
+	if ( arrayNode == 0 ) return 0;
+	if ( ! (arrayNode->options & kXMP_PropValueIsArray) ) XMP_Throw ( "The named property is not an array", kXMPErr_BadXPath );
+	return arrayNode->children.size();
+
+}	// CountArrayItems
+
+
+// -------------------------------------------------------------------------------------------------
+// GetObjectName
+// -------------
+
+void
+XMPMeta::GetObjectName ( XMP_StringPtr * namePtr,
+						 XMP_StringLen * nameLen ) const
+{
+
+	*namePtr = tree.name.c_str();
+	*nameLen = tree.name.size();
+
+}	// GetObjectName
+
+
+// -------------------------------------------------------------------------------------------------
+// SetObjectName
+// -------------
+
+void
+XMPMeta::SetObjectName ( XMP_StringPtr name )
+{
+	VerifyUTF8 ( name );	// Throws if the string is not legit UTF-8.
+	tree.name = name;
+
+}	// SetObjectName
+
+
+// -------------------------------------------------------------------------------------------------
+// GetObjectOptions
+// ----------------
+
+XMP_OptionBits
+XMPMeta::GetObjectOptions() const
+{
+	XMP_OptionBits	options	= 0;
+
+	return options;
+
+}	// GetObjectOptions
+
+
+// -------------------------------------------------------------------------------------------------
+// SetObjectOptions
+// ----------------
+
+void
+XMPMeta::SetObjectOptions ( XMP_OptionBits /*options*/ )
+{
+
+	XMP_Throw ( "Unimplemented method XMPMeta::SetObjectOptions", kXMPErr_Unimplemented );
+
+}	// SetObjectOptions
+
+
+// -------------------------------------------------------------------------------------------------
+// Sort
+// ----
+//
+// At the top level the namespaces are sorted by their prefixes. Within a namespace, the top level
+// properties are sorted by name. Within a struct, the fields are sorted by their qualified name,
+// i.e. their XML prefix:local form. Unordered arrays of simple items are sorted by value. Language
+// Alternative arrays are sorted by the xml:lang qualifiers, with the "x-default" item placed first.
+
+void
+XMPMeta::Sort()
+{
+
+	if ( ! this->tree.qualifiers.empty() ) {
+		sort ( this->tree.qualifiers.begin(), this->tree.qualifiers.end(), CompareNodeNames );
+		SortWithinOffspring ( this->tree.qualifiers );
+	}
+
+	if ( ! this->tree.children.empty() ) {
+		// The schema prefixes are the node's value, the name is the URI, so we sort schemas by value.
+		sort ( this->tree.children.begin(), this->tree.children.end(), CompareNodeValues );
+		SortWithinOffspring ( this->tree.children );
+	}
+
+}	// Sort
+
+
+// -------------------------------------------------------------------------------------------------
+// Erase
+// -----
+//
+// Clear everything except for clientRefs.
+
+void
+XMPMeta::Erase()
+{
+
+	if ( this->xmlParser != 0 ) {
+		delete ( this->xmlParser );
+		this->xmlParser = 0;
+	}
+	this->tree.ClearNode();
+
+}	// Erase
+
+
+// -------------------------------------------------------------------------------------------------
+// Clone
+// -----
+
+void
+XMPMeta::Clone ( XMPMeta * clone, XMP_OptionBits options ) const
+{
+	if ( clone == 0 ) XMP_Throw ( "Null clone pointer", kXMPErr_BadParam );
+	if ( options != 0 ) XMP_Throw ( "No options are defined yet", kXMPErr_BadOptions );
+	XMP_Assert ( this->tree.parent == 0 );
+
+	clone->tree.ClearNode();
+
+	clone->tree.options = this->tree.options;
+	clone->tree.name    = this->tree.name;
+	clone->tree.value   = this->tree.value;
+	clone->errorCallback = this->errorCallback;
+
+	#if 0	// *** XMP_DebugBuild
+		clone->tree._namePtr = clone->tree.name.c_str();
+		clone->tree._valuePtr = clone->tree.value.c_str();
+	#endif
+
+	CloneOffspring ( &this->tree, &clone->tree );
+
+}	// Clone
+
+// =================================================================================================
+// XMP_Node::GetLocalURI
+// =====================
+//
+// This has to be someplace where XMPMeta::GetNamespaceURI is visible.
+
+void XMP_Node::GetLocalURI ( XMP_StringPtr * uriStr, XMP_StringLen * uriSize ) const
+{
+
+	if ( uriStr != 0 ) *uriStr = "";	// Set up empty defaults.
+	if ( uriSize != 0 ) *uriSize = 0;
+
+	if ( this->name.empty() ) return;
+
+	if ( XMP_NodeIsSchema ( this->options ) ) {
+
+		if ( uriStr != 0 ) *uriStr = this->name.c_str();
+		if ( uriSize != 0 ) *uriSize = this->name.size();
+
+	} else {
+
+		size_t colonPos = this->name.find_first_of(':');
+		if ( colonPos == XMP_VarString::npos ) return;	// ! Name of array items is "[]".
+
+		XMP_VarString prefix ( this->name, 0, colonPos );
+		XMPMeta::GetNamespaceURI ( prefix.c_str(), uriStr, uriSize );
+
+	}
+
+}
+
+// =================================================================================================
+// Error notifications
+// ===================
+
+// -------------------------------------------------------------------------------------------------
+// SetDefaultErrorCallback
+// -----------------------
+
+/* class-static */ void
+XMPMeta::SetDefaultErrorCallback ( XMPMeta_ErrorCallbackWrapper wrapperProc,
+								   XMPMeta_ErrorCallbackProc    clientProc,
+								   void *    context,
+								   XMP_Uns32 limit )
+{
+	XMP_Assert ( wrapperProc != 0 );	// Must always be set by the glue;
+
+	sDefaultErrorCallback.wrapperProc = wrapperProc;
+	sDefaultErrorCallback.clientProc = clientProc;
+	sDefaultErrorCallback.context = context;
+	sDefaultErrorCallback.limit = limit;
+
+}	// SetDefaultErrorCallback
+
+// -------------------------------------------------------------------------------------------------
+// SetErrorCallback
+// ----------------
+
+void
+XMPMeta::SetErrorCallback ( XMPMeta_ErrorCallbackWrapper wrapperProc,
+							XMPMeta_ErrorCallbackProc    clientProc,
+							void *    context,
+							XMP_Uns32 limit )
+{
+	XMP_Assert ( wrapperProc != 0 );	// Must always be set by the glue;
+	
+	this->errorCallback.Clear();
+	this->errorCallback.wrapperProc = wrapperProc;
+	this->errorCallback.clientProc = clientProc;
+	this->errorCallback.context = context;
+	this->errorCallback.limit = limit;
+	
+}	// SetErrorCallback
+
+// -------------------------------------------------------------------------------------------------
+// ResetErrorCallbackLimit
+// -----------------------
+
+void
+XMPMeta::ResetErrorCallbackLimit ( XMP_Uns32 limit )
+{
+
+	this->errorCallback.limit = limit;
+	this->errorCallback.notifications = 0;
+	this->errorCallback.topSeverity = kXMPErrSev_Recoverable;
+
+}	// ResetErrorCallbackLimit
+
+// -------------------------------------------------------------------------------------------------
+// ErrorCallbackInfo::CanNotify
+// -------------------------------
+//
+// This is const just to be usable from const XMPMeta functions.
+
+bool XMPMeta::ErrorCallbackInfo::CanNotify() const
+{
+	XMP_Assert ( (this->clientProc == 0) || (this->wrapperProc != 0) );
+	return ( this->clientProc != 0);
+}
+
+// -------------------------------------------------------------------------------------------------
+// ErrorCallbackInfo::ClientCallbackWrapper
+// -------------------------------
+//
+// This is const just to be usable from const XMPMeta functions.
+
+bool XMPMeta::ErrorCallbackInfo::ClientCallbackWrapper ( XMP_StringPtr filePath, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr messsage ) const
+{
+	XMP_Bool retValue = (*this->wrapperProc) ( this->clientProc, this->context, severity, cause, messsage );
+	return ConvertXMP_BoolToBool(retValue);
+}
+
+// =================================================================================================
diff --git a/XMPCore/source/XMPMeta.hpp b/XMPCore/source/XMPMeta.hpp
new file mode 100644
index 0000000..1e5f479
--- /dev/null
+++ b/XMPCore/source/XMPMeta.hpp
@@ -0,0 +1,428 @@
+#ifndef __XMPMeta_hpp__
+#define __XMPMeta_hpp__
+
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"
+#include "public/include/XMP_Const.h"
+#include "XMPCore/source/XMPCore_Impl.hpp"
+#include "source/XMLParserAdapter.hpp"
+
+// -------------------------------------------------------------------------------------------------
+
+#ifndef DumpXMLParseTree
+	#define DumpXMLParseTree 0
+#endif
+
+extern XMP_VarString * xdefaultName;	// Needed in XMPMeta-Parse.cpp, MoveExplicitAliases.
+
+class XMPIterator;
+class XMPUtils;
+
+// -------------------------------------------------------------------------------------------------
+
+class XMPMeta {
+public:
+
+	static void
+	GetVersionInfo ( XMP_VersionInfo * info );
+	
+	static bool
+	Initialize();
+	static void
+	Terminate() RELEASE_NO_THROW;
+
+	// ---------------------------------------------------------------------------------------------
+
+	XMPMeta();
+	
+	virtual ~XMPMeta() RELEASE_NO_THROW;
+
+	// ---------------------------------------------------------------------------------------------
+	
+	static XMP_OptionBits
+	GetGlobalOptions();
+	
+	static void
+	SetGlobalOptions ( XMP_OptionBits options );
+
+	// ---------------------------------------------------------------------------------------------
+
+	static XMP_Status
+	DumpNamespaces ( XMP_TextOutputProc outProc,
+					 void *				refCon );
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	static bool
+	RegisterNamespace ( XMP_StringPtr	namespaceURI,
+						XMP_StringPtr	suggestedPrefix,
+						XMP_StringPtr * registeredPrefix,
+						XMP_StringLen * prefixSize );
+	
+	static bool
+	GetNamespacePrefix ( XMP_StringPtr	 namespaceURI,
+						 XMP_StringPtr * namespacePrefix,
+						 XMP_StringLen * prefixSize );
+	
+	static bool
+	GetNamespaceURI ( XMP_StringPtr	  namespacePrefix,
+					  XMP_StringPtr * namespaceURI,
+					  XMP_StringLen * uriSize );
+	
+	static void
+	DeleteNamespace ( XMP_StringPtr namespaceURI );
+
+	// ---------------------------------------------------------------------------------------------
+	
+	bool
+	GetProperty ( XMP_StringPtr	   schemaNS,
+				  XMP_StringPtr	   propName,
+				  XMP_StringPtr *  propValue,
+				  XMP_StringLen *  valueSize,
+				  XMP_OptionBits * options ) const;
+	
+	bool
+	GetArrayItem ( XMP_StringPtr	schemaNS,
+				   XMP_StringPtr	arrayName,
+				   XMP_Index		itemIndex,
+				   XMP_StringPtr *	itemValue,
+				   XMP_StringLen *	valueSize,
+				   XMP_OptionBits * options ) const;
+	
+	bool
+	GetStructField ( XMP_StringPtr	  schemaNS,
+					 XMP_StringPtr	  structName,
+					 XMP_StringPtr	  fieldNS,
+					 XMP_StringPtr	  fieldName,
+					 XMP_StringPtr *  fieldValue,
+					 XMP_StringLen *  valueSize,
+					 XMP_OptionBits * options ) const;
+	
+	bool
+	GetQualifier ( XMP_StringPtr	schemaNS,
+				   XMP_StringPtr	propName,
+				   XMP_StringPtr	qualNS,
+				   XMP_StringPtr	qualName,
+				   XMP_StringPtr *	qualValue,
+				   XMP_StringLen *	valueSize,
+				   XMP_OptionBits * options ) const;
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	void
+	SetProperty ( XMP_StringPtr	 schemaNS,
+				  XMP_StringPtr	 propName,
+				  XMP_StringPtr	 propValue,
+				  XMP_OptionBits options );
+	
+	void
+	SetArrayItem ( XMP_StringPtr  schemaNS,
+				   XMP_StringPtr  arrayName,
+				   XMP_Index	  itemIndex,
+				   XMP_StringPtr  itemValue,
+				   XMP_OptionBits options );
+	
+	void
+	AppendArrayItem ( XMP_StringPtr	 schemaNS,
+					  XMP_StringPtr	 arrayName,
+					  XMP_OptionBits arrayOptions,
+					  XMP_StringPtr	 itemValue,
+					  XMP_OptionBits options );
+	
+	void
+	SetStructField ( XMP_StringPtr	schemaNS,
+					 XMP_StringPtr	structName,
+					 XMP_StringPtr	fieldNS,
+					 XMP_StringPtr	fieldName,
+					 XMP_StringPtr	fieldValue,
+					 XMP_OptionBits options );
+	
+	void
+	SetQualifier ( XMP_StringPtr  schemaNS,
+				   XMP_StringPtr  propName,
+				   XMP_StringPtr  qualNS,
+				   XMP_StringPtr  qualName,
+				   XMP_StringPtr  qualValue,
+				   XMP_OptionBits options );
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	void
+	DeleteProperty ( XMP_StringPtr schemaNS,
+					 XMP_StringPtr propName );
+	
+	void
+	DeleteArrayItem ( XMP_StringPtr schemaNS,
+					  XMP_StringPtr arrayName,
+					  XMP_Index		itemIndex );
+	
+	void
+	DeleteStructField ( XMP_StringPtr schemaNS,
+						XMP_StringPtr structName,
+						XMP_StringPtr fieldNS,
+						XMP_StringPtr fieldName );
+	
+	void
+	DeleteQualifier ( XMP_StringPtr schemaNS,
+					  XMP_StringPtr propName,
+					  XMP_StringPtr qualNS,
+					  XMP_StringPtr qualName );
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	bool
+	DoesPropertyExist ( XMP_StringPtr schemaNS,
+						XMP_StringPtr propName ) const;
+	
+	bool
+	DoesArrayItemExist ( XMP_StringPtr schemaNS,
+						 XMP_StringPtr arrayName,
+						 XMP_Index	   itemIndex ) const;
+	
+	bool
+	DoesStructFieldExist ( XMP_StringPtr schemaNS,
+						   XMP_StringPtr structName,
+						   XMP_StringPtr fieldNS,
+						   XMP_StringPtr fieldName ) const;
+	
+	bool
+	DoesQualifierExist ( XMP_StringPtr schemaNS,
+						 XMP_StringPtr propName,
+						 XMP_StringPtr qualNS,
+						 XMP_StringPtr qualName ) const;
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	bool
+	GetLocalizedText ( XMP_StringPtr	schemaNS,
+					   XMP_StringPtr	altTextName,
+					   XMP_StringPtr	genericLang,
+					   XMP_StringPtr	specificLang,
+					   XMP_StringPtr *	actualLang,
+					   XMP_StringLen *	langSize,
+					   XMP_StringPtr *	itemValue,
+					   XMP_StringLen *	valueSize,
+					   XMP_OptionBits * options ) const;
+	
+	void
+	SetLocalizedText ( XMP_StringPtr  schemaNS,
+					   XMP_StringPtr  altTextName,
+					   XMP_StringPtr  genericLang,
+					   XMP_StringPtr  specificLang,
+					   XMP_StringPtr  itemValue,
+					   XMP_OptionBits options );
+	
+	void
+	DeleteLocalizedText (	XMP_StringPtr	schemaNS,
+							XMP_StringPtr	altTextName,
+							XMP_StringPtr	genericLang,
+							XMP_StringPtr	specificLang);
+
+	// ---------------------------------------------------------------------------------------------
+	
+	bool
+	GetProperty_Bool ( XMP_StringPtr	schemaNS,
+					   XMP_StringPtr	propName,
+					   bool *			propValue,
+					   XMP_OptionBits * options ) const;
+	
+	bool
+	GetProperty_Int ( XMP_StringPtr	   schemaNS,
+					  XMP_StringPtr	   propName,
+					  XMP_Int32 *	   propValue,
+					  XMP_OptionBits * options ) const;
+	
+	bool
+	GetProperty_Int64 ( XMP_StringPtr	 schemaNS,
+					    XMP_StringPtr	 propName,
+					    XMP_Int64 *	     propValue,
+					    XMP_OptionBits * options ) const;
+	
+	bool
+	GetProperty_Float ( XMP_StringPtr	 schemaNS,
+						XMP_StringPtr	 propName,
+						double *		 propValue,
+						XMP_OptionBits * options ) const;
+	
+	bool
+	GetProperty_Date ( XMP_StringPtr	schemaNS,
+					   XMP_StringPtr	propName,
+					   XMP_DateTime *	propValue,
+					   XMP_OptionBits * options ) const;
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	void
+	SetProperty_Bool ( XMP_StringPtr  schemaNS,
+					   XMP_StringPtr  propName,
+					   bool			  propValue,
+					   XMP_OptionBits options );
+	
+	void
+	SetProperty_Int ( XMP_StringPtr	 schemaNS,
+					  XMP_StringPtr	 propName,
+					  XMP_Int32		 propValue,
+					  XMP_OptionBits options );
+	
+	void
+	SetProperty_Int64 ( XMP_StringPtr  schemaNS,
+					    XMP_StringPtr  propName,
+					    XMP_Int64	   propValue,
+					    XMP_OptionBits options );
+	
+	void
+	SetProperty_Float ( XMP_StringPtr  schemaNS,
+						XMP_StringPtr  propName,
+						double		   propValue,
+						XMP_OptionBits options );
+	
+	void
+	SetProperty_Date ( XMP_StringPtr		schemaNS,
+					   XMP_StringPtr		propName,
+					   const XMP_DateTime & propValue,
+					   XMP_OptionBits		options );
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	void
+	GetObjectName ( XMP_StringPtr * namePtr,
+					XMP_StringLen * nameLen ) const;
+
+	void
+	SetObjectName ( XMP_StringPtr name );
+
+	XMP_OptionBits
+	GetObjectOptions() const;
+	
+	void
+	SetObjectOptions ( XMP_OptionBits options );
+
+	void
+	Sort();
+
+	void
+	Erase();
+
+	void
+	Clone ( XMPMeta * clone, XMP_OptionBits options ) const;
+	
+	XMP_Index
+	CountArrayItems ( XMP_StringPtr schemaNS,
+					  XMP_StringPtr arrayName ) const;
+	
+	void
+	DumpObject ( XMP_TextOutputProc outProc,
+				 void *				refCon ) const;
+	
+	// ---------------------------------------------------------------------------------------------
+	
+	void
+	ParseFromBuffer ( XMP_StringPtr	 buffer,
+					  XMP_StringLen	 bufferSize,
+					  XMP_OptionBits options );
+	
+	void
+	SerializeToBuffer ( XMP_VarString * rdfString,
+						XMP_OptionBits	options,
+						XMP_StringLen	padding,
+						XMP_StringPtr	newline,
+						XMP_StringPtr	indent,
+						XMP_Index		baseIndent ) const;
+	
+	// ---------------------------------------------------------------------------------------------
+
+	static void
+	SetDefaultErrorCallback ( XMPMeta_ErrorCallbackWrapper wrapperProc,
+							  XMPMeta_ErrorCallbackProc    clientProc,
+							  void *    context,
+							  XMP_Uns32 limit );
+
+	void
+	SetErrorCallback ( XMPMeta_ErrorCallbackWrapper wrapperProc,
+					   XMPMeta_ErrorCallbackProc    clientProc,
+					   void *    context,
+					   XMP_Uns32 limit );
+
+	void
+	ResetErrorCallbackLimit ( XMP_Uns32 limit );
+	
+	class ErrorCallbackInfo : public GenericErrorCallback {
+	public:
+
+		XMPMeta_ErrorCallbackWrapper wrapperProc;
+		XMPMeta_ErrorCallbackProc    clientProc;
+		void * context;
+
+		ErrorCallbackInfo() : wrapperProc(0), clientProc(0), context(0) {};
+		
+		void Clear() { this->wrapperProc = 0; this->clientProc = 0; this->context = 0;
+					   GenericErrorCallback::Clear(); };
+
+		bool CanNotify() const;
+		bool ClientCallbackWrapper ( XMP_StringPtr filePath, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr messsage ) const;
+	};
+
+	// =============================================================================================
+
+	// ---------------------------------------------------------------------------------------------
+	// - Everything is built out of standard nodes. Each node has a name, value, option flags, a
+	// vector of child nodes, and a vector of qualifier nodes.
+	//
+	// - The option flags are those passed to SetProperty and returned from GetProperty. They tell
+	// if the node is simple, a struct or an array; whether it has qualifiers, etc.
+	//
+	// - The name of the node is an XML qualified name, of the form "prefix:simple-name". Since we
+	// force all namespaces to be known and to have unique prefixes, this is semantically equivalent
+	// to using a URI and simple name pair.
+	//
+	// - Although the value part is only for leaf properties and the children part is only for
+	// structs and arrays, it is easier to simply have them in every node. This keeps things visible
+	// so that debugging is easier
+	//
+	// - The top level node children are the namespaces that contain properties, the next level are
+	// the top level properties, lower levels are the fields of structs or items of arrays. The name
+	// of the top level nodes is just the namespace prefix, with the colon terminator. The name of
+	// top level properties includes the namespace prefix.
+	//
+	// - Any property node, at any level, can have qualifiers. These are themselves general property
+	// nodes. And could in fact themselves have qualifiers!
+
+	// ! Expose the implementation so that file static functions can see the data.
+
+	XMP_Int32 clientRefs;	// ! Must be signed to allow decrement from 0.
+	XMP_ReadWriteLock lock;
+
+	// ! Any data member changes must be propagted to the Clone function!
+
+	XMP_Node tree;
+	XMLParserAdapter * xmlParser;
+	ErrorCallbackInfo errorCallback;
+	
+	friend class XMPIterator;
+	friend class XMPUtils;
+
+private:
+  
+	// ! These are hidden on purpose:
+	XMPMeta ( const XMPMeta & /* original */ ) : clientRefs(0), tree(XMP_Node(0,"",0)), xmlParser(0)
+		{ XMP_Throw ( "Call to hidden constructor", kXMPErr_InternalFailure ); };
+	void operator= ( const XMPMeta & /* rhs */ )  
+		{ XMP_Throw ( "Call to hidden operator=", kXMPErr_InternalFailure ); };
+
+	// Special support routines for parsing, here to be able to access the errorCallback.
+	void ProcessXMLTree ( XMP_OptionBits options );
+	bool ProcessXMLBuffer ( XMP_StringPtr buffer, XMP_StringLen xmpSize, bool lastClientCall );
+	void ProcessRDF ( const XML_Node & xmlTree, XMP_OptionBits options );
+
+};	// class XMPMeta
+
+// =================================================================================================
+
+#endif	// __XMPMeta_hpp__
diff --git a/XMPCore/source/XMPUtils-FileInfo.cpp b/XMPCore/source/XMPUtils-FileInfo.cpp
new file mode 100644
index 0000000..107fa58
--- /dev/null
+++ b/XMPCore/source/XMPUtils-FileInfo.cpp
@@ -0,0 +1,1493 @@
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "XMPCore/source/XMPUtils.hpp"
+
+#include <algorithm>	// For binary_search.
+
+#include <time.h>
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <errno.h>
+
+#include <stdio.h>	// For snprintf.
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+// =================================================================================================
+// Local Types and Constants
+// ========================= 
+
+typedef unsigned long	UniCodePoint;
+
+enum UniCharKind {
+	UCK_normal,
+	UCK_space,
+	UCK_comma,
+	UCK_semicolon,
+	UCK_quote,
+	UCK_control
+};
+typedef enum UniCharKind	UniCharKind;
+
+#define UnsByte(c)	((unsigned char)(c))
+#define UCP(u)		((UniCodePoint)(u))
+	// ! Needed on Windows (& PC Linux?) for inequalities with literals ito avoid sign extension.
+
+#ifndef TraceMultiFile
+	#define TraceMultiFile	0
+#endif
+
+// =================================================================================================
+// Static Variables
+// ================
+
+// =================================================================================================
+// Local Utilities
+// ===============
+
+// -------------------------------------------------------------------------------------------------
+// ClassifyCharacter
+// -----------------
+
+static void
+ClassifyCharacter ( XMP_StringPtr fullString, size_t offset,
+					UniCharKind * charKind, size_t * charSize, UniCodePoint * uniChar )
+{
+	*charKind = UCK_normal; // Assume typical case.
+	
+	unsigned char	currByte = UnsByte ( fullString[offset] );
+	
+	if ( currByte < UnsByte(0x80) ) {
+	
+		// ----------------------------------------
+		// We've got a single byte ASCII character.
+
+		*charSize = 1;
+		*uniChar = currByte;
+
+		if ( currByte > UnsByte(0x22) ) {
+
+			if ( currByte == UnsByte(0x2C) ) {
+				*charKind = UCK_comma;
+			} else if ( currByte == UnsByte(0x3B) ) {
+				*charKind = UCK_semicolon;
+			}
+			// [2674672] Discontinue to interpret square brackets 
+			//           as Asian quotes in XMPUtils::SeparateArrayItems(..))
+			// *** else if ( (currByte == UnsByte(0x5B)) || (currByte == UnsByte(0x5D)) ) {
+			// ***	*charKind = UCK_quote;	// ! ASCII '[' and ']' are used as quotes in Chinese and Korean.
+			// *** }
+
+		} else {	// currByte <= 0x22
+
+			if ( currByte == UnsByte(0x22) ) {
+				*charKind = UCK_quote;
+			} else if ( currByte == UnsByte(0x21) ) {
+				*charKind = UCK_normal;
+			} else if ( currByte == UnsByte(0x20) ) {
+				*charKind = UCK_space;
+			} else {
+				*charKind = UCK_control;
+			}
+
+		}
+
+	} else {	// currByte >= 0x80
+	
+		// ---------------------------------------------------------------------------------------
+		// We've got a multibyte Unicode character. The first byte has the number of bytes and the
+		// highest order bits. The other bytes each add 6 more bits. Compose the UTF-32 form so we
+		// can classify directly with the Unicode code points. Order the upperBits tests to be
+		// fastest for Japan, probably the most common non-ASCII usage.
+		
+		*charSize = 0;
+		*uniChar = currByte;
+		while ( (*uniChar & 0x80) != 0 ) {	// Count the leading 1 bits in the byte.
+			++(*charSize);
+			*uniChar = *uniChar << 1;
+		}
+		XMP_Assert ( (offset + *charSize) <= strlen(fullString) );
+		
+		*uniChar = *uniChar & 0x7F;			// Put the character bits in the bottom of uniChar.
+		*uniChar = *uniChar >> *charSize;
+		
+		for ( size_t i = (offset + 1); i < (offset + *charSize); ++i ) {
+			*uniChar = (*uniChar << 6) | (UnsByte(fullString[i]) & 0x3F);
+		}
+		
+		XMP_Uns32 upperBits = *uniChar >> 8;	// First filter on just the high order 24 bits.
+
+		if ( upperBits == 0xFF ) {			// U+FFxx
+
+			if ( *uniChar == UCP(0xFF0C) ) {
+				*charKind = UCK_comma;			// U+FF0C, full width comma.
+			} else if ( *uniChar == UCP(0xFF1B) ) {
+				*charKind = UCK_semicolon;		// U+FF1B, full width semicolon.
+			} else if ( *uniChar == UCP(0xFF64) ) {
+				*charKind = UCK_comma;			// U+FF64, half width ideographic comma.
+			}
+
+		} else if ( upperBits == 0xFE ) {	// U+FE--
+
+			if ( *uniChar == UCP(0xFE50) ) {
+				*charKind = UCK_comma;			// U+FE50, small comma.
+			} else if ( *uniChar == UCP(0xFE51) ) {
+				*charKind = UCK_comma;			// U+FE51, small ideographic comma.
+			} else if ( *uniChar == UCP(0xFE54) ) {
+				*charKind = UCK_semicolon;		// U+FE54, small semicolon.
+			}
+
+		} else if ( upperBits == 0x30 ) {	// U+30--
+
+			if ( *uniChar == UCP(0x3000) ) {
+				*charKind = UCK_space;			// U+3000, ideographic space.
+			} else if ( *uniChar == UCP(0x3001) ) {
+				*charKind = UCK_comma;			// U+3001, ideographic comma.
+			} else if ( (UCP(0x3008) <= *uniChar) && (*uniChar <= UCP(0x300F)) ) {
+				*charKind = UCK_quote;			// U+3008..U+300F, various quotes.
+			} else if ( *uniChar == UCP(0x303F) ) {
+				*charKind = UCK_space;			// U+303F, ideographic half fill space.
+			} else if ( (UCP(0x301D) <= *uniChar) && (*uniChar <= UCP(0x301F)) ) {
+				*charKind = UCK_quote;			// U+301D..U+301F, double prime quotes.
+			}
+
+		} else if ( upperBits == 0x20 ) {	// U+20--
+
+			if ( (UCP(0x2000) <= *uniChar) && (*uniChar <= UCP(0x200B)) ) {
+				*charKind = UCK_space;			// U+2000..U+200B, en quad through zero width space.
+			} else if ( *uniChar == UCP(0x2015) ) {
+				*charKind = UCK_quote;			// U+2015, dash quote.
+			} else if ( (UCP(0x2018) <= *uniChar) && (*uniChar <= UCP(0x201F)) ) {
+				*charKind = UCK_quote;			// U+2018..U+201F, various quotes.
+			} else if ( *uniChar == UCP(0x2028) ) {
+				*charKind = UCK_control;			// U+2028, line separator.
+			} else if ( *uniChar == UCP(0x2029) ) {
+				*charKind = UCK_control;			// U+2029, paragraph separator.
+			} else if ( (*uniChar == UCP(0x2039)) || (*uniChar == UCP(0x203A)) ) {
+				*charKind = UCK_quote;			// U+2039 and U+203A, guillemet quotes.
+			}
+
+		} else if ( upperBits == 0x06 ) {	// U+06--
+
+			if ( *uniChar == UCP(0x060C) ) {
+				*charKind = UCK_comma;			// U+060C, Arabic comma.
+			} else if ( *uniChar == UCP(0x061B) ) {
+				*charKind = UCK_semicolon;		// U+061B, Arabic semicolon.
+			}
+
+		} else if ( upperBits == 0x05 ) {	// U+05--
+
+			if ( *uniChar == UCP(0x055D) ) {
+				*charKind = UCK_comma;			// U+055D, Armenian comma.
+			}
+
+		} else if ( upperBits == 0x03 ) {	// U+03--
+
+			if ( *uniChar == UCP(0x037E) ) {
+				*charKind = UCK_semicolon;		// U+037E, Greek "semicolon" (really a question mark).
+			}
+
+		} else if ( upperBits == 0x00 ) {	// U+00--
+
+			if ( (*uniChar == UCP(0x00AB)) || (*uniChar == UCP(0x00BB)) ) {
+				*charKind = UCK_quote;			// U+00AB and U+00BB, guillemet quotes.
+			}
+
+		}
+				
+	}
+
+}	// ClassifyCharacter
+
+
+// -------------------------------------------------------------------------------------------------
+// IsClosingingQuote
+// -----------------
+
+static inline bool
+IsClosingingQuote ( UniCodePoint uniChar, UniCodePoint openQuote, UniCodePoint closeQuote )
+{
+
+	if ( (uniChar == closeQuote) ||
+		 ( (openQuote == UCP(0x301D)) && ((uniChar == UCP(0x301E)) || (uniChar == UCP(0x301F))) ) ) {
+		return true;
+	} else {
+		return false;
+	}
+
+}	// IsClosingingQuote
+
+
+// -------------------------------------------------------------------------------------------------
+// IsSurroundingQuote
+// ------------------
+
+static inline bool
+IsSurroundingQuote ( UniCodePoint uniChar, UniCodePoint openQuote, UniCodePoint closeQuote )
+{
+
+	if ( (uniChar == openQuote) || IsClosingingQuote ( uniChar, openQuote, closeQuote ) ) {
+		return true;
+	} else {
+		return false;
+	}
+
+}	// IsSurroundingQuote
+
+
+// -------------------------------------------------------------------------------------------------
+// GetClosingQuote
+// ---------------
+
+static UniCodePoint
+GetClosingQuote ( UniCodePoint openQuote )
+{
+	UniCodePoint	closeQuote;
+	
+	switch ( openQuote ) {
+
+		case UCP(0x0022) : closeQuote = UCP(0x0022);	// ! U+0022 is both opening and closing.
+						   break;
+		// *** [2674672] Discontinue to interpret square brackets 
+		// *** as Asian quotes in XMPUtils::SeparateArrayItems(..))
+		// *** case UCP(0x005B) : closeQuote = UCP(0x005D);
+		// ***				   break;
+		case UCP(0x00AB) : closeQuote = UCP(0x00BB);	// ! U+00AB and U+00BB are reversible.
+						   break;
+		case UCP(0x00BB) : closeQuote = UCP(0x00AB);
+						   break;
+		case UCP(0x2015) : closeQuote = UCP(0x2015);	// ! U+2015 is both opening and closing.
+						   break;
+		case UCP(0x2018) : closeQuote = UCP(0x2019);
+						   break;
+		case UCP(0x201A) : closeQuote = UCP(0x201B);
+						   break;
+		case UCP(0x201C) : closeQuote = UCP(0x201D);
+						   break;
+		case UCP(0x201E) : closeQuote = UCP(0x201F);
+						   break;
+		case UCP(0x2039) : closeQuote = UCP(0x203A);	// ! U+2039 and U+203A are reversible.
+						   break;
+		case UCP(0x203A) : closeQuote = UCP(0x2039);
+						   break;
+		case UCP(0x3008) : closeQuote = UCP(0x3009);
+						   break;
+		case UCP(0x300A) : closeQuote = UCP(0x300B);
+						   break;
+		case UCP(0x300C) : closeQuote = UCP(0x300D);
+						   break;
+		case UCP(0x300E) : closeQuote = UCP(0x300F);
+						   break;
+		case UCP(0x301D) : closeQuote = UCP(0x301F);	// ! U+301E also closes U+301D.
+						   break;
+		default			 : closeQuote = 0;
+						   break;
+
+	}
+	
+	return closeQuote;
+	
+}	// GetClosingQuote
+
+
+// -------------------------------------------------------------------------------------------------
+// CodePointToUTF8
+// ---------------
+
+static void
+CodePointToUTF8 ( UniCodePoint uniChar, XMP_VarString & utf8Str )
+{
+	size_t i, byteCount;
+	XMP_Uns8 buffer [8];
+	UniCodePoint cpTemp;
+	
+	if ( uniChar <= 0x7F ) {
+
+		i = 7;
+		byteCount = 1;
+		buffer[7] = char(uniChar);
+	
+	} else {
+
+		// ---------------------------------------------------------------------------------------
+		// Copy the data bits from the low order end to the high order end, include the 0x80 mask.
+		
+		i = 8;
+		cpTemp = uniChar;
+		while ( cpTemp != 0 ) {
+			-- i;	// Exit with i pointing to the last byte stored.
+			buffer[i] = UnsByte(0x80) | (UnsByte(cpTemp) & 0x3F);
+			cpTemp = cpTemp >> 6;
+		}
+		byteCount = 8 - i;	// The total number of bytes needed.
+		XMP_Assert ( (2 <= byteCount) && (byteCount <= 6) );
+
+		// -------------------------------------------------------------------------------------
+		// Make sure the high order byte can hold the byte count mask, compute and set the mask.
+		
+		size_t bitCount = 0;	// The number of data bits in the first byte.
+		for ( cpTemp = (buffer[i] & UnsByte(0x3F)); cpTemp != 0; cpTemp = cpTemp >> 1 ) bitCount += 1;
+		if ( bitCount > (8 - (byteCount + 1)) ) byteCount += 1;
+		
+		i = 8 - byteCount;	// First byte index and mask shift count.
+		XMP_Assert ( (0 <= i) && (i <= 6) );
+		buffer[i] |= (UnsByte(0xFF) << i) & UnsByte(0xFF);	// AUDIT: Safe, i is between 0 and 6.
+	
+	}
+	
+	utf8Str.assign ( (char*)(&buffer[i]), byteCount );
+	
+}	// CodePointToUTF8
+
+
+// -------------------------------------------------------------------------------------------------
+// ApplyQuotes
+// -----------
+
+static void
+ApplyQuotes ( XMP_VarString * item, UniCodePoint openQuote, UniCodePoint closeQuote, bool allowCommas )
+{
+	bool	prevSpace	= false;
+	size_t	charOffset, charLen;
+	UniCharKind		charKind;
+	UniCodePoint	uniChar;
+	
+	// -----------------------------------------------------------------------------------------
+	// See if there are any separators in the value. Stop at the first occurrance. This is a bit
+	// tricky in order to make typical typing work conveniently. The purpose of applying quotes
+	// is to preserve the values when splitting them back apart. That is CatenateContainerItems
+	// and SeparateContainerItems must round trip properly. For the most part we only look for
+	// separators here. Internal quotes, as in -- Irving "Bud" Jones -- won't cause problems in
+	// the separation. An initial quote will though, it will make the value look quoted.
+
+	charOffset = 0;
+	ClassifyCharacter ( item->c_str(), charOffset, &charKind, &charLen, &uniChar );
+	
+	if ( charKind != UCK_quote ) {
+	
+	for ( charOffset = 0; size_t(charOffset) < item->size(); charOffset += charLen ) {
+
+			ClassifyCharacter ( item->c_str(), charOffset, &charKind, &charLen, &uniChar );
+
+			if ( charKind == UCK_space ) {
+				if ( prevSpace ) break; // Multiple spaces are a separator.
+				prevSpace = true;
+			} else {
+				prevSpace = false;
+				if ( (charKind == UCK_semicolon) || (charKind == UCK_control) ) break;
+				if ( (charKind == UCK_comma) && (! allowCommas) ) break;
+			}
+
+		}
+	
+	}
+	
+	if ( size_t(charOffset) < item->size() ) {
+	
+		// --------------------------------------------------------------------------------------
+		// Create a quoted copy, doubling any internal quotes that match the outer ones. Internal
+		// quotes did not stop the "needs quoting" search, but they do need doubling. So we have
+		// to rescan the front of the string for quotes. Handle the special case of U+301D being
+		// closed by either U+301E or U+301F.
+		
+		XMP_VarString	newItem;
+		size_t			splitPoint;
+		
+		for ( splitPoint = 0; splitPoint <= charOffset; ++splitPoint ) {
+			ClassifyCharacter ( item->c_str(), splitPoint, &charKind, &charLen, &uniChar );
+			if ( charKind == UCK_quote ) break;
+		}
+		
+		CodePointToUTF8 ( openQuote, newItem );
+		newItem.append ( *item, 0, splitPoint );	// Copy the leading "normal" portion.
+
+		for ( charOffset = splitPoint; size_t(charOffset) < item->size(); charOffset += charLen ) {
+			ClassifyCharacter ( item->c_str(), charOffset, &charKind, &charLen, &uniChar );
+			newItem.append ( *item, charOffset, charLen );
+			if ( (charKind == UCK_quote) && IsSurroundingQuote ( uniChar, openQuote, closeQuote ) ) {
+				newItem.append ( *item, charOffset, charLen );
+			}
+		}
+		
+		XMP_VarString closeStr;
+		CodePointToUTF8 ( closeQuote, closeStr );
+		newItem.append ( closeStr );
+		
+		*item = newItem;
+	
+	}
+	
+}	// ApplyQuotes
+
+
+// -------------------------------------------------------------------------------------------------
+// IsInternalProperty
+// ------------------
+
+// *** Need static checks of the schema prefixes!
+
+static const char * kExternalxmpDM[] =
+	{ "xmpDM:album",
+	  "xmpDM:altTapeName",
+	  "xmpDM:altTimecode",
+	  "xmpDM:artist",
+	  "xmpDM:cameraAngle",
+	  "xmpDM:cameraLabel",
+	  "xmpDM:cameraModel",
+	  "xmpDM:cameraMove",
+	  "xmpDM:client",
+	  "xmpDM:comment",
+	  "xmpDM:composer",
+	  "xmpDM:director",
+	  "xmpDM:directorPhotography",
+	  "xmpDM:engineer",
+	  "xmpDM:genre",
+	  "xmpDM:good",
+	  "xmpDM:instrument",
+	  "xmpDM:logComment",
+	  "xmpDM:projectName",
+	  "xmpDM:releaseDate",
+	  "xmpDM:scene",
+	  "xmpDM:shotDate",
+	  "xmpDM:shotDay",
+	  "xmpDM:shotLocation",
+	  "xmpDM:shotName",
+	  "xmpDM:shotNumber",
+	  "xmpDM:shotSize",
+	  "xmpDM:speakerPlacement",
+	  "xmpDM:takeNumber",
+	  "xmpDM:tapeName",
+	  "xmpDM:trackNumber",
+	  "xmpDM:videoAlphaMode",
+	  "xmpDM:videoAlphaPremultipleColor",
+	  0 };	// ! Must have zero sentinel!
+
+typedef const char ** CharStarIterator;	// Used for binary search of kExternalxmpDM;
+static const char ** kLastExternalxmpDM = 0;	// Set on first use.
+static int CharStarLess (const char * left, const char * right )
+	{ return (strcmp ( left, right ) < 0); }
+
+#define IsExternalProperty(s,p) (! IsInternalProperty ( s, p ))
+
+static bool
+IsInternalProperty ( const XMP_VarString & schema, const XMP_VarString & prop )
+{
+	bool isInternal = false;
+
+	if ( schema == kXMP_NS_DC ) {
+	
+		if ( (prop == "dc:format")	||
+			 (prop == "dc:language") ) {
+			isInternal = true;
+		}
+	
+	} else if ( schema == kXMP_NS_XMP ) {
+	
+		if ( (prop == "xmp:BaseURL")		||
+			 (prop == "xmp:CreatorTool")	||
+			 (prop == "xmp:Format")			||
+			 (prop == "xmp:Locale")			||
+			 (prop == "xmp:MetadataDate")	||
+			 (prop == "xmp:ModifyDate") ) {
+			isInternal = true;
+		}
+	
+	} else if ( schema == kXMP_NS_PDF ) {
+	
+		if ( (prop == "pdf:BaseURL")	||
+			 (prop == "pdf:Creator")	||
+			 (prop == "pdf:ModDate")	||
+			 (prop == "pdf:PDFVersion") ||
+			 (prop == "pdf:Producer") ) {
+			isInternal = true;
+		}
+	
+	} else if ( schema == kXMP_NS_TIFF ) {
+		
+		isInternal = true;	// ! The TIFF properties are internal by default.
+		if ( (prop == "tiff:ImageDescription")	||	// ! ImageDescription, Artist, and Copyright are aliased.
+			 (prop == "tiff:Artist")			||
+			 (prop == "tiff:Copyright") ) {
+			isInternal = false;
+		}
+
+	} else if ( schema == kXMP_NS_EXIF ) {
+	
+		isInternal = true;	// ! The EXIF properties are internal by default.
+		if ( prop == "exif:UserComment" ) isInternal = false;
+
+	} else if ( schema == kXMP_NS_EXIF_Aux ) {
+	
+		isInternal = true;	// ! The EXIF Aux properties are internal by default.
+	
+	} else if ( schema == kXMP_NS_Photoshop ) {
+	
+		if ( (prop == "photoshop:ICCProfile")  ||
+			 (prop == "photoshop:TextLayers") ) isInternal = true;
+	
+	} else if ( schema == kXMP_NS_CameraRaw ) {
+	
+		isInternal = true;	// All of crs: is internal, they are processing settings.
+
+	} else if ( schema == kXMP_NS_DM ) {
+	
+		// ! Most of the xmpDM schema is internal, and unknown properties default to internal.
+		if ( kLastExternalxmpDM == 0 ) {
+			for ( kLastExternalxmpDM = &kExternalxmpDM[0]; *kLastExternalxmpDM != 0; ++kLastExternalxmpDM ) {}
+		}
+		isInternal = (! std::binary_search ( &kExternalxmpDM[0], kLastExternalxmpDM, prop.c_str(), CharStarLess ));
+
+	} else if ( schema == kXMP_NS_Script ) {
+	
+		isInternal = true;	// ! Most of the xmpScript schema is internal, and unknown properties default to internal.
+		if ( (prop == "xmpScript:action") || (prop == "xmpScript:character") || (prop == "xmpScript:dialog") || 
+			 (prop == "xmpScript:sceneSetting") || (prop == "xmpScript:sceneTimeOfDay") ) {
+			isInternal = false;
+		}
+	
+	} else if ( schema == kXMP_NS_BWF ) {
+	
+		if ( prop == "bext:version" ) isInternal = true;
+
+	} else if ( schema == kXMP_NS_AdobeStockPhoto ) {
+	
+		isInternal = true;	// ! The bmsp schema has only internal properties.
+
+	} else if ( schema == kXMP_NS_XMP_MM ) {
+	
+		isInternal = true;	// ! The xmpMM schema has only internal properties.
+	
+	} else if ( schema == kXMP_NS_XMP_Text ) {
+	
+		isInternal = true;	// ! The xmpT schema has only internal properties.
+	
+	} else if ( schema == kXMP_NS_XMP_PagedFile ) {
+	
+		isInternal = true;	// ! The xmpTPg schema has only internal properties.
+	
+	} else if ( schema == kXMP_NS_XMP_Graphics ) {
+	
+		isInternal = true;	// ! The xmpG schema has only internal properties.
+	
+	} else if ( schema == kXMP_NS_XMP_Image ) {
+	
+		isInternal = true;	// ! The xmpGImg schema has only internal properties.
+	
+	} else if ( schema == kXMP_NS_XMP_Font ) {
+	
+		isInternal = true;	// ! The stFNT schema has only internal properties.
+	
+	}
+	
+	return isInternal;
+
+}	// IsInternalProperty
+
+
+// -------------------------------------------------------------------------------------------------
+// RemoveSchemaChildren
+// --------------------
+
+static void
+RemoveSchemaChildren ( XMP_NodePtrPos schemaPos, bool doAll )
+{
+	XMP_Node * schemaNode = *schemaPos;
+	XMP_Assert ( XMP_NodeIsSchema ( schemaNode->options ) );
+		
+	// ! Iterate backwards to reduce shuffling as children are erased and to simplify the logic for
+	// ! denoting the current child. (Erasing child n makes the old n+1 now be n.)
+
+	size_t		   propCount = schemaNode->children.size();
+	XMP_NodePtrPos beginPos	 = schemaNode->children.begin();
+	
+	for ( size_t propNum = propCount-1, propLim = (size_t)(-1); propNum != propLim; --propNum ) {
+		XMP_NodePtrPos currProp = beginPos + propNum;
+		if ( doAll || IsExternalProperty ( schemaNode->name, (*currProp)->name ) ) {
+			delete *currProp;	// ! Both delete the node and erase the pointer from the parent.
+			schemaNode->children.erase ( currProp );
+		}
+	}
+	
+	if ( schemaNode->children.empty() ) {
+		XMP_Node * tree = schemaNode->parent;
+		tree->children.erase ( schemaPos );
+		delete schemaNode;
+	}
+
+}	// RemoveSchemaChildren
+
+
+// -------------------------------------------------------------------------------------------------
+// ItemValuesMatch
+// ---------------
+//
+// Does the value comparisons for array merging as part of XMPUtils::AppendProperties.
+
+static bool
+ItemValuesMatch ( const XMP_Node * leftNode, const XMP_Node * rightNode )
+{
+	const XMP_OptionBits leftForm  = leftNode->options & kXMP_PropCompositeMask;
+	const XMP_OptionBits rightForm = leftNode->options & kXMP_PropCompositeMask;
+	
+	if ( leftForm != rightForm ) return false;
+	
+	if ( leftForm == 0 ) {
+	
+		// Simple nodes, check the values and xml:lang qualifiers.
+		
+		if ( leftNode->value != rightNode->value ) return false;
+		if ( (leftNode->options & kXMP_PropHasLang) != (rightNode->options & kXMP_PropHasLang) ) return false;
+		if ( leftNode->options & kXMP_PropHasLang ) {
+			if ( leftNode->qualifiers[0]->value != rightNode->qualifiers[0]->value ) return false;
+		}
+	
+	} else if ( leftForm == kXMP_PropValueIsStruct ) {
+	
+		// Struct nodes, see if all fields match, ignoring order.
+		
+		if ( leftNode->children.size() != rightNode->children.size() ) return false;
+
+		for ( size_t leftNum = 0, leftLim = leftNode->children.size(); leftNum != leftLim; ++leftNum ) {
+			const XMP_Node * leftField	= leftNode->children[leftNum];
+			const XMP_Node * rightField = FindConstChild ( rightNode, leftField->name.c_str() );
+			if ( (rightField == 0) || (! ItemValuesMatch ( leftField, rightField )) ) return false;
+		}
+		
+	} else {
+	
+		// Array nodes, see if the "leftNode" values are present in the "rightNode", ignoring order, duplicates,
+		// and extra values in the rightNode-> The rightNode is the destination for AppendProperties.
+
+		XMP_Assert ( leftForm & kXMP_PropValueIsArray );
+		
+		for ( size_t leftNum = 0, leftLim = leftNode->children.size(); leftNum != leftLim; ++leftNum ) {
+
+			const XMP_Node * leftItem = leftNode->children[leftNum];
+
+			size_t rightNum, rightLim;
+			for ( rightNum = 0, rightLim = rightNode->children.size(); rightNum != rightLim; ++rightNum ) {
+				const XMP_Node * rightItem = rightNode->children[rightNum];
+				if ( ItemValuesMatch ( leftItem, rightItem ) ) break;
+			}
+			if ( rightNum == rightLim ) return false;
+
+		}
+	
+	}
+
+	return true;	// All of the checks passed.
+	
+}	// ItemValuesMatch
+
+
+// -------------------------------------------------------------------------------------------------
+// AppendSubtree
+// -------------
+//
+// The main implementation of XMPUtils::AppendProperties. See the description in TXMPMeta.hpp.
+
+static void
+AppendSubtree ( const XMP_Node * sourceNode, XMP_Node * destParent,
+				const bool mergeCompound, const bool replaceOld, const bool deleteEmpty )
+{
+	XMP_NodePtrPos destPos;
+	XMP_Node * destNode = FindChildNode ( destParent, sourceNode->name.c_str(), kXMP_ExistingOnly, &destPos );
+	
+	bool valueIsEmpty = false;
+	if ( XMP_PropIsSimple ( sourceNode->options ) ) {
+		valueIsEmpty = sourceNode->value.empty();
+	} else {
+		valueIsEmpty = sourceNode->children.empty();
+	}
+
+	if ( valueIsEmpty ) {
+		if ( deleteEmpty && (destNode != 0) ) {
+			delete ( destNode );
+			destParent->children.erase ( destPos );
+		}
+		return;	// ! Done, empty values are either ignored or cause deletions.
+	}
+	
+	if ( destNode == 0 ) {
+		// The one easy case, the destination does not exist.
+		destNode = CloneSubtree ( sourceNode, destParent, true /* skipEmpty */ );
+		XMP_Assert ( (destNode == 0) || (! destNode->value.empty()) || (! destNode->children.empty()) );
+		return;
+	}
+	
+	// If we get here we're going to modify an existing property, either replacing or merging.
+	
+	XMP_Assert ( (! valueIsEmpty) && (destNode != 0) );
+
+	XMP_OptionBits sourceForm = sourceNode->options & kXMP_PropCompositeMask;
+	XMP_OptionBits destForm	  = destNode->options & kXMP_PropCompositeMask;
+	
+	bool replaceThis = replaceOld;	// ! Don't modify replaceOld, it gets passed to inner calls.
+	if ( mergeCompound && (! XMP_PropIsSimple ( sourceForm )) ) replaceThis = false;
+
+	if ( replaceThis ) {
+
+		destNode->value	  = sourceNode->value;	// *** Should use SetNode.
+		destNode->options = sourceNode->options;
+		destNode->RemoveChildren();
+		destNode->RemoveQualifiers();
+		CloneOffspring ( sourceNode, destNode, true /* skipEmpty */ );
+		
+		if ( (! XMP_PropIsSimple ( destNode->options )) && destNode->children.empty() ) {
+			// Don't keep an empty array or struct. The source might be implicitly empty due to
+			// all children being empty. In this case CloneOffspring should skip them.
+			DeleteSubtree ( destPos );
+		}
+
+		return;
+
+	}
+	
+	// From here on are cases for merging arrays or structs.
+	
+	if ( XMP_PropIsSimple ( sourceForm ) || (sourceForm != destForm) ) return;
+	
+	if ( sourceForm == kXMP_PropValueIsStruct ) {
+	
+		// To merge a struct process the fields recursively. E.g. add simple missing fields. The
+		// recursive call to AppendSubtree will handle deletion for fields with empty values.
+
+		for ( size_t sourceNum = 0, sourceLim = sourceNode->children.size(); sourceNum != sourceLim && destNode!= NULL; ++sourceNum ) {
+			const XMP_Node * sourceField = sourceNode->children[sourceNum];
+			AppendSubtree ( sourceField, destNode, mergeCompound, replaceOld, deleteEmpty );
+			if ( deleteEmpty && destNode->children.empty() ) {
+				delete ( destNode );
+				destParent->children.erase ( destPos );
+			}
+		}
+		
+	} else if ( sourceForm & kXMP_PropArrayIsAltText ) {
+	
+		// Merge AltText arrays by the xml:lang qualifiers. Make sure x-default is first. Make a
+		// special check for deletion of empty values. Meaningful in AltText arrays because the
+		// xml:lang qualifier provides unambiguous source/dest correspondence.
+	
+		XMP_Assert ( mergeCompound );
+
+		for ( size_t sourceNum = 0, sourceLim = sourceNode->children.size(); sourceNum != sourceLim && destNode!= NULL; ++sourceNum ) {
+
+			const XMP_Node * sourceItem = sourceNode->children[sourceNum];
+			if ( sourceItem->qualifiers.empty() || (sourceItem->qualifiers[0]->name != "xml:lang") ) continue;
+			
+			XMP_Index destIndex = LookupLangItem ( destNode, sourceItem->qualifiers[0]->value );
+			
+			if ( sourceItem->value.empty() ) {
+
+				if ( deleteEmpty && (destIndex != -1) ) {
+					delete ( destNode->children[destIndex] );
+					destNode->children.erase ( destNode->children.begin() + destIndex );
+					if ( destNode->children.empty() ) {
+						delete ( destNode );
+						destParent->children.erase ( destPos );
+					}
+				}
+
+			} else {
+			
+				if ( destIndex != -1 ) {
+				
+					// The source and dest arrays both have this language item.
+					
+					if ( replaceOld ) {	// ! Yes, check replaceOld not replaceThis!
+						destNode->children[destIndex]->value = sourceItem->value;
+					}
+				
+				} else {
+				
+					// The dest array does not have this language item, add it.
+					
+					if ( (sourceItem->qualifiers[0]->value != "x-default") || destNode->children.empty() ) {
+						// Typical case, empty dest array or not "x-default". Non-empty should always have "x-default".
+						CloneSubtree ( sourceItem, destNode, true /* skipEmpty */ );
+					} else {
+						// Edge case, non-empty dest array had no "x-default", insert that at the beginning.
+						XMP_Node * destItem = new XMP_Node ( destNode, sourceItem->name, sourceItem->value, sourceItem->options );
+						CloneOffspring ( sourceItem, destItem, true /* skipEmpty */ );
+						destNode->children.insert ( destNode->children.begin(), destItem );
+					}
+				
+				}
+			
+			}
+
+		}
+	
+	} else if ( sourceForm & kXMP_PropValueIsArray ) {
+	
+		// Merge other arrays by item values. Don't worry about order or duplicates. Source 
+		// items with empty values do not cause deletion, that conflicts horribly with merging.
+
+		for ( size_t sourceNum = 0, sourceLim = sourceNode->children.size(); sourceNum != sourceLim; ++sourceNum ) {
+			const XMP_Node * sourceItem = sourceNode->children[sourceNum];
+
+			size_t	destNum, destLim;
+			for ( destNum = 0, destLim = destNode->children.size(); destNum != destLim; ++destNum ) {
+				const XMP_Node * destItem = destNode->children[destNum];
+				if ( ItemValuesMatch ( sourceItem, destItem ) ) break;
+			}
+			if ( destNum == destLim ) CloneSubtree ( sourceItem, destNode, true /* skipEmpty */ );
+
+		}
+		
+	}
+
+}	// AppendSubtree
+
+
+// =================================================================================================
+// Class Static Functions
+// ======================
+
+// -------------------------------------------------------------------------------------------------
+// CatenateArrayItems
+// ------------------
+
+/* class static */ void
+XMPUtils::CatenateArrayItems ( const XMPMeta & xmpObj,
+							   XMP_StringPtr   schemaNS,
+							   XMP_StringPtr   arrayName,
+							   XMP_StringPtr   separator,
+							   XMP_StringPtr   quotes,
+							   XMP_OptionBits  options,
+							   XMP_VarString * catedStr )
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) ); // ! Enforced by wrapper.
+	XMP_Assert ( (separator != 0) && (quotes != 0) && (catedStr != 0) ); // ! Enforced by wrapper.
+	
+	size_t		 strLen, strPos, charLen;
+	UniCharKind	 charKind;
+	UniCodePoint currUCP, openQuote, closeQuote;
+	
+	const bool allowCommas = ((options & kXMPUtil_AllowCommas) != 0);
+	
+	const XMP_Node * arrayNode = 0; // ! Move up to avoid gcc complaints.
+	XMP_OptionBits	 arrayForm = 0;
+	const XMP_Node * currItem  = 0;
+
+	// Make sure the separator is OK. It must be one semicolon surrounded by zero or more spaces.
+	// Any of the recognized semicolons or spaces are allowed.
+	
+	strPos = 0;
+	strLen = strlen ( separator );
+	bool haveSemicolon = false;
+	
+	while ( strPos < strLen ) {
+		ClassifyCharacter ( separator, strPos, &charKind, &charLen, &currUCP );
+		strPos += charLen;
+		if ( charKind == UCK_semicolon ) {
+			if ( haveSemicolon ) XMP_Throw ( "Separator can have only one semicolon",  kXMPErr_BadParam );
+			haveSemicolon = true;
+		} else if ( charKind != UCK_space ) {
+			XMP_Throw ( "Separator can have only spaces and one semicolon",	 kXMPErr_BadParam );
+		}
+	};
+	if ( ! haveSemicolon ) XMP_Throw ( "Separator must have one semicolon",	 kXMPErr_BadParam );
+	
+	// Make sure the open and close quotes are a legitimate pair.
+
+	strLen = strlen ( quotes );
+	ClassifyCharacter ( quotes, 0, &charKind, &charLen, &openQuote );
+	if ( charKind != UCK_quote ) XMP_Throw ( "Invalid quoting character", kXMPErr_BadParam );
+
+	if ( charLen == strLen ) {
+		closeQuote = openQuote;
+	} else {
+		strPos = charLen;
+		ClassifyCharacter ( quotes, strPos, &charKind, &charLen, &closeQuote );
+		if ( charKind != UCK_quote ) XMP_Throw ( "Invalid quoting character", kXMPErr_BadParam );
+		if ( (strPos + charLen) != strLen ) XMP_Throw ( "Quoting string too long", kXMPErr_BadParam );
+	}
+	if ( closeQuote != GetClosingQuote ( openQuote ) ) XMP_Throw ( "Mismatched quote pair", kXMPErr_BadParam );
+
+	// Return an empty result if the array does not exist, hurl if it isn't the right form.
+	
+	catedStr->erase();
+
+	XMP_ExpandedXPath arrayPath;
+	ExpandXPath ( schemaNS, arrayName, &arrayPath );
+
+	arrayNode = FindConstNode ( &xmpObj.tree, arrayPath );
+	if ( arrayNode == 0 ) return;
+
+	arrayForm = arrayNode->options & kXMP_PropCompositeMask;
+	if ( (! (arrayForm & kXMP_PropValueIsArray)) || (arrayForm & kXMP_PropArrayIsAlternate) ) {
+		XMP_Throw ( "Named property must be non-alternate array", kXMPErr_BadParam );
+	}
+	if ( arrayNode->children.empty() ) return;
+	
+	// Build the result, quoting the array items, adding separators. Hurl if any item isn't simple.
+	// Start the result with the first value, then add the rest with a preceeding separator.
+	
+	currItem = arrayNode->children[0];
+	
+	if ( (currItem->options & kXMP_PropCompositeMask) != 0 ) XMP_Throw ( "Array items must be simple", kXMPErr_BadParam );
+	*catedStr = currItem->value;
+	ApplyQuotes ( catedStr, openQuote, closeQuote, allowCommas );
+	
+	for ( size_t itemNum = 1, itemLim = arrayNode->children.size(); itemNum != itemLim; ++itemNum ) {
+		const XMP_Node * item = arrayNode->children[itemNum];
+		if ( (item->options & kXMP_PropCompositeMask) != 0 ) XMP_Throw ( "Array items must be simple", kXMPErr_BadParam );
+		XMP_VarString tempStr ( item->value );
+		ApplyQuotes ( &tempStr, openQuote, closeQuote, allowCommas );
+		*catedStr += separator;
+		*catedStr += tempStr;
+	}
+
+}	// CatenateArrayItems
+
+
+// -------------------------------------------------------------------------------------------------
+// SeparateArrayItems
+// ------------------
+
+/* class static */ void
+XMPUtils::SeparateArrayItems ( XMPMeta *	  xmpObj,
+							   XMP_StringPtr  schemaNS,
+							   XMP_StringPtr  arrayName,
+							   XMP_OptionBits options,
+							   XMP_StringPtr  catedStr )
+{
+	XMP_Assert ( (schemaNS != 0) && (arrayName != 0) && (catedStr != 0) );	// ! Enforced by wrapper.
+	
+	XMP_VarString itemValue;
+	size_t itemStart, itemEnd;
+	size_t nextSize, charSize = 0;	// Avoid VS uninit var warnings.
+	UniCharKind	  nextKind, charKind = UCK_normal;
+	UniCodePoint  nextChar, uniChar = 0;
+	
+	// Extract "special" option bits, verify and normalize the others.
+	
+	bool preserveCommas = false;
+	if ( options & kXMPUtil_AllowCommas ) {
+		preserveCommas = true;
+		options ^= kXMPUtil_AllowCommas;
+	}
+
+	options = VerifySetOptions ( options, 0 );	// Keep a zero value, has special meaning below.
+	if ( options & ~kXMP_PropArrayFormMask ) XMP_Throw ( "Options can only provide array form", kXMPErr_BadOptions );
+	
+	// Find the array node, make sure it is OK. Move the current children aside, to be readded later if kept.
+	
+	XMP_ExpandedXPath arrayPath;
+	ExpandXPath ( schemaNS, arrayName, &arrayPath );
+	XMP_Node * arrayNode = FindNode ( &xmpObj->tree, arrayPath, kXMP_ExistingOnly );
+	
+	if ( arrayNode != 0 ) {
+		// The array exists, make sure the form is compatible. Zero arrayForm means take what exists.
+		XMP_OptionBits arrayForm = arrayNode->options & kXMP_PropArrayFormMask;
+		if ( (arrayForm == 0) || (arrayForm & kXMP_PropArrayIsAlternate) ) {
+			XMP_Throw ( "Named property must be non-alternate array", kXMPErr_BadXPath );
+		}
+		if ( (options != 0) && (options != arrayForm) ) XMP_Throw ( "Mismatch of specified and existing array form", kXMPErr_BadXPath );	// *** Right error?
+	} else {
+		// The array does not exist, try to create it.
+		arrayNode = FindNode ( &xmpObj->tree, arrayPath, kXMP_CreateNodes, (options | kXMP_PropValueIsArray) );
+		if ( arrayNode == 0 ) XMP_Throw ( "Failed to create named array", kXMPErr_BadXPath );
+	}
+
+	XMP_NodeOffspring oldChildren ( arrayNode->children );
+	size_t oldChildCount = oldChildren.size();
+	arrayNode->children.clear();
+	
+	// Extract the item values one at a time, until the whole input string is done. Be very careful
+	// in the extraction about the string positions. They are essentially byte pointers, while the
+	// contents are UTF-8. Adding or subtracting 1 does not necessarily move 1 Unicode character!
+	
+	size_t endPos = strlen ( catedStr );
+	
+	itemEnd = 0;
+	while ( itemEnd < endPos ) {
+		
+		// Skip any leading spaces and separation characters. Always skip commas here. They can be
+		// kept when within a value, but not when alone between values.
+		
+		for ( itemStart = itemEnd; itemStart < endPos; itemStart += charSize ) {
+			ClassifyCharacter ( catedStr, itemStart, &charKind, &charSize, &uniChar );
+			if ( (charKind == UCK_normal) || (charKind == UCK_quote) ) break;
+		}
+		if ( itemStart >= endPos ) break;
+		
+		if ( charKind != UCK_quote ) {
+		
+			// This is not a quoted value. Scan for the end, create an array item from the substring.
+
+			for ( itemEnd = itemStart; itemEnd < endPos; itemEnd += charSize ) {
+
+				ClassifyCharacter ( catedStr, itemEnd, &charKind, &charSize, &uniChar );
+
+				if ( (charKind == UCK_normal) || (charKind == UCK_quote) ) continue;
+				if ( (charKind == UCK_comma) && preserveCommas ) continue;
+				if ( charKind != UCK_space ) break;
+
+				if ( (itemEnd + charSize) >= endPos ) break;	// Anything left?
+				ClassifyCharacter ( catedStr, (itemEnd+charSize), &nextKind, &nextSize, &nextChar );
+				if ( (nextKind == UCK_normal) || (nextKind == UCK_quote) ) continue;
+				if ( (nextKind == UCK_comma) && preserveCommas ) continue;
+				break;	// Have multiple spaces, or a space followed by a separator.
+
+			}		
+
+			itemValue.assign ( catedStr, itemStart, (itemEnd - itemStart) );
+		
+		} else {
+		
+			// Accumulate quoted values into a local string, undoubling internal quotes that
+			// match the surrounding quotes. Do not undouble "unmatching" quotes.
+		
+			UniCodePoint openQuote = uniChar;
+			UniCodePoint closeQuote = GetClosingQuote ( openQuote );
+
+			itemStart += charSize;	// Skip the opening quote;
+			itemValue.erase();
+			
+			for ( itemEnd = itemStart; itemEnd < endPos; itemEnd += charSize ) {
+
+				ClassifyCharacter ( catedStr, itemEnd, &charKind, &charSize, &uniChar );
+
+				if ( (charKind != UCK_quote) || (! IsSurroundingQuote ( uniChar, openQuote, closeQuote)) ) {
+				
+					// This is not a matching quote, just append it to the item value.
+					itemValue.append ( catedStr, itemEnd, charSize );
+					
+				} else {
+				
+					// This is a "matching" quote. Is it doubled, or the final closing quote? Tolerate
+					// various edge cases like undoubled opening (non-closing) quotes, or end of input.
+					
+					if ( (itemEnd + charSize) < endPos ) {
+						ClassifyCharacter ( catedStr, itemEnd+charSize, &nextKind, &nextSize, &nextChar );
+					} else {
+						nextKind = UCK_semicolon; nextSize = 0; nextChar = 0x3B;
+					}
+					
+					if ( uniChar == nextChar ) {
+						// This is doubled, copy it and skip the double.
+						itemValue.append ( catedStr, itemEnd, charSize );
+						itemEnd += nextSize;	// Loop will add in charSize.
+					} else if ( ! IsClosingingQuote ( uniChar, openQuote, closeQuote ) ) {
+						// This is an undoubled, non-closing quote, copy it.
+						itemValue.append ( catedStr, itemEnd, charSize );
+					} else {
+						// This is an undoubled closing quote, skip it and exit the loop.
+						itemEnd += charSize;
+						break;
+					}
+
+				}
+
+			}	// Loop to accumulate the quoted value.
+		
+		}
+
+		// Add the separated item to the array. Keep a matching old value in case it had separators.
+		
+		size_t oldChild;
+		for ( oldChild = 0; oldChild < oldChildCount; ++oldChild ) {
+			if ( (oldChildren[oldChild] != 0) && (itemValue == oldChildren[oldChild]->value) ) break;
+		}
+		
+		XMP_Node * newItem = 0;
+		if ( oldChild == oldChildCount ) {
+			newItem = new XMP_Node ( arrayNode, kXMP_ArrayItemName, itemValue.c_str(), 0 );
+		} else {
+			newItem = oldChildren[oldChild];
+			oldChildren[oldChild] = 0;	// ! Don't match again, let duplicates be seen.
+		}
+		arrayNode->children.push_back ( newItem );
+		
+	}	// Loop through all of the returned items.
+
+	// Delete any of the old children that were not kept.
+	for ( size_t i = 0; i < oldChildCount; ++i ) {
+		if ( oldChildren[i] != 0 ) delete oldChildren[i];
+	}
+	
+}	// SeparateArrayItems
+
+
+// -------------------------------------------------------------------------------------------------
+// ApplyTemplate
+// -------------
+
+/* class static */ void
+XMPUtils::ApplyTemplate ( XMPMeta *	      workingXMP,
+						  const XMPMeta & templateXMP,
+						  XMP_OptionBits  actions )
+{
+	bool doClear   = XMP_OptionIsSet ( actions, kXMPTemplate_ClearUnnamedProperties );
+	bool doAdd     = XMP_OptionIsSet ( actions, kXMPTemplate_AddNewProperties );
+	bool doReplace = XMP_OptionIsSet ( actions, kXMPTemplate_ReplaceExistingProperties );
+	
+	bool deleteEmpty = XMP_OptionIsSet ( actions, kXMPTemplate_ReplaceWithDeleteEmpty );
+	doReplace |= deleteEmpty;	// Delete-empty implies Replace.
+	deleteEmpty &= (! doClear);	// Clear implies not delete-empty, but keep the implicit Replace. 
+
+	bool doAll = XMP_OptionIsSet ( actions, kXMPTemplate_IncludeInternalProperties );
+	
+	// ! In several places we do loops backwards so that deletions do not perturb the remaining indices.
+	// ! These loops use ordinals (size .. 1), we must use a zero based index inside the loop.
+	
+	if ( doClear ) {
+	
+		// Visit the top level working properties, delete if not in the template.
+
+		for ( size_t schemaOrdinal = workingXMP->tree.children.size(); schemaOrdinal > 0; --schemaOrdinal ) {
+	
+			size_t schemaNum = schemaOrdinal-1;	// ! Convert ordinal to index!
+			XMP_Node * workingSchema = workingXMP->tree.children[schemaNum];
+			const XMP_Node * templateSchema = FindConstSchema ( &templateXMP.tree, workingSchema->name.c_str() );
+			
+			if ( templateSchema == 0 ) {
+			
+				// The schema is not in the template, delete all properties or just all external ones.
+
+				if ( doAll ) {
+
+					workingSchema->RemoveChildren();	// Remove the properties here, delete the schema below.
+
+				} else {
+
+					for ( size_t propOrdinal = workingSchema->children.size(); propOrdinal > 0; --propOrdinal ) {
+						size_t propNum = propOrdinal-1;	// ! Convert ordinal to index!
+						XMP_Node * workingProp = workingSchema->children[propNum];
+						if ( IsExternalProperty ( workingSchema->name, workingProp->name ) ) {
+							delete ( workingProp );
+							workingSchema->children.erase ( workingSchema->children.begin() + propNum );
+						}
+					}
+
+				}
+
+			} else {
+			
+				// Check each of the working XMP's properties to see if it is in the template.
+
+				for ( size_t propOrdinal = workingSchema->children.size(); propOrdinal > 0; --propOrdinal ) {
+					size_t propNum = propOrdinal-1;	// ! Convert ordinal to index!
+					XMP_Node * workingProp = workingSchema->children[propNum];
+					if ( (doAll || IsExternalProperty ( workingSchema->name, workingProp->name )) && 
+						 (FindConstChild ( templateSchema, workingProp->name.c_str() ) == 0) ) {
+						delete ( workingProp );
+						workingSchema->children.erase ( workingSchema->children.begin() + propNum );
+					}
+				}
+
+			}
+			
+			if ( workingSchema->children.empty() ) {
+				delete ( workingSchema );
+				workingXMP->tree.children.erase ( workingXMP->tree.children.begin() + schemaNum );
+			}
+	
+		}
+		
+	}
+	
+	if ( doAdd | doReplace ) {
+
+		for ( size_t schemaNum = 0, schemaLim = templateXMP.tree.children.size(); schemaNum < schemaLim; ++schemaNum ) {
+	
+			const XMP_Node * templateSchema = templateXMP.tree.children[schemaNum];
+	
+			// Make sure we have an output schema node, then process the top level template properties.
+			
+			XMP_NodePtrPos workingSchemaPos;
+			XMP_Node * workingSchema = FindSchemaNode ( &workingXMP->tree, templateSchema->name.c_str(),
+														kXMP_ExistingOnly, &workingSchemaPos );
+			if ( workingSchema == 0 ) {
+				workingSchema = new XMP_Node ( &workingXMP->tree, templateSchema->name, templateSchema->value, kXMP_SchemaNode );
+				workingXMP->tree.children.push_back ( workingSchema );
+				workingSchemaPos = workingXMP->tree.children.end() - 1;
+			}
+			
+			for ( size_t propNum = 0, propLim = templateSchema->children.size(); propNum < propLim; ++propNum ) {
+				const XMP_Node * templateProp = templateSchema->children[propNum];
+				if ( doAll || IsExternalProperty ( templateSchema->name, templateProp->name ) ) {
+					AppendSubtree ( templateProp, workingSchema, doAdd, doReplace, deleteEmpty );
+				}
+			}
+			
+			if ( workingSchema->children.empty() ) {
+				delete ( workingSchema );
+				workingXMP->tree.children.erase ( workingSchemaPos );
+			}
+			
+		}
+
+	}
+
+}	// ApplyTemplate
+
+
+// -------------------------------------------------------------------------------------------------
+// RemoveProperties
+// ----------------
+
+/* class static */ void
+XMPUtils::RemoveProperties ( XMPMeta *		xmpObj,
+							 XMP_StringPtr	schemaNS,
+							 XMP_StringPtr	propName,
+							 XMP_OptionBits options )
+{
+	XMP_Assert ( (schemaNS != 0) && (propName != 0) );	// ! Enforced by wrapper.
+	
+	const bool doAll = XMP_TestOption (options, kXMPUtil_DoAllProperties );
+	const bool includeAliases = XMP_TestOption ( options, kXMPUtil_IncludeAliases );
+	
+	if ( *propName != 0 ) {
+	
+		// Remove just the one indicated property. This might be an alias, the named schema might
+		// not actually exist. So don't lookup the schema node.
+		
+		if ( *schemaNS == 0 ) XMP_Throw ( "Property name requires schema namespace", kXMPErr_BadParam );
+		
+		XMP_ExpandedXPath expPath;
+		ExpandXPath ( schemaNS, propName, &expPath );
+		
+		XMP_NodePtrPos propPos;
+		XMP_Node * propNode = FindNode ( &(xmpObj->tree), expPath, kXMP_ExistingOnly, kXMP_NoOptions, &propPos );
+		if ( propNode != 0 ) {
+			if ( doAll || IsExternalProperty ( expPath[kSchemaStep].step, expPath[kRootPropStep].step ) ) {
+				XMP_Node * parent = propNode->parent;	// *** Should have XMP_Node::RemoveChild(pos).
+				delete propNode;	// ! Both delete the node and erase the pointer from the parent.
+				parent->children.erase ( propPos );
+				DeleteEmptySchema ( parent );
+			}
+		}
+	
+	} else if ( *schemaNS != 0 ) {
+	
+		// Remove all properties from the named schema. Optionally include aliases, in which case
+		// there might not be an actual schema node. 
+
+		XMP_NodePtrPos schemaPos;
+		XMP_Node * schemaNode = FindSchemaNode ( &xmpObj->tree, schemaNS, kXMP_ExistingOnly, &schemaPos );
+		if ( schemaNode != 0 ) RemoveSchemaChildren ( schemaPos, doAll );
+		
+		if ( includeAliases ) {
+		
+			// We're removing the aliases also. Look them up by their namespace prefix. Yes, the
+			// alias map is sorted so we could process just that portion. But that takes more code
+			// and the extra speed isn't worth it. (Plus this way we avoid a dependence on the map
+			// implementation.) Lookup the XMP node from the alias, to make sure the actual exists.
+
+			XMP_StringPtr nsPrefix;
+			XMP_StringLen nsLen;
+			(void) XMPMeta::GetNamespacePrefix ( schemaNS, &nsPrefix, &nsLen );
+			
+			XMP_AliasMapPos currAlias = sRegisteredAliasMap->begin();
+			XMP_AliasMapPos endAlias  = sRegisteredAliasMap->end();
+			
+			for ( ; currAlias != endAlias; ++currAlias ) {
+				if ( strncmp ( currAlias->first.c_str(), nsPrefix, nsLen ) == 0 ) {
+					XMP_NodePtrPos actualPos;
+					XMP_Node * actualProp = FindNode ( &xmpObj->tree, currAlias->second, kXMP_ExistingOnly, kXMP_NoOptions, &actualPos );
+					if ( actualProp != 0 ) {
+						XMP_Node * rootProp = actualProp;
+						while ( ! XMP_NodeIsSchema ( rootProp->parent->options ) ) rootProp = rootProp->parent;
+						if ( doAll || IsExternalProperty ( rootProp->parent->name, rootProp->name ) ) {
+							XMP_Node * parent = actualProp->parent;
+							delete actualProp;	// ! Both delete the node and erase the pointer from the parent.
+							parent->children.erase ( actualPos );
+							DeleteEmptySchema ( parent );
+						}
+					}
+				}
+			}
+
+		}
+
+	} else {
+		
+		// Remove all appropriate properties from all schema. In this case we don't have to be
+		// concerned with aliases, they are handled implicitly from the actual properties.
+
+		// ! Iterate backwards to reduce shuffling if schema are erased and to simplify the logic
+		// ! for denoting the current schema. (Erasing schema n makes the old n+1 now be n.)
+
+		size_t		   schemaCount = xmpObj->tree.children.size();
+		XMP_NodePtrPos beginPos	   = xmpObj->tree.children.begin();
+		
+		for ( size_t schemaNum = schemaCount-1, schemaLim = (size_t)(-1); schemaNum != schemaLim; --schemaNum ) {
+			XMP_NodePtrPos currSchema = beginPos + schemaNum;
+			RemoveSchemaChildren ( currSchema, doAll );
+		}
+	
+	}
+
+}	// RemoveProperties
+
+
+// -------------------------------------------------------------------------------------------------
+// DuplicateSubtree
+// ----------------
+
+/* class static */ void
+XMPUtils::DuplicateSubtree ( const XMPMeta & source,
+							 XMPMeta *		 dest,
+							 XMP_StringPtr	 sourceNS,
+							 XMP_StringPtr	 sourceRoot,
+							 XMP_StringPtr	 destNS,
+							 XMP_StringPtr	 destRoot,
+							 XMP_OptionBits	 options )
+{
+	IgnoreParam(options);
+	
+	bool fullSourceTree = false;
+	bool fullDestTree   = false;
+	
+	XMP_ExpandedXPath sourcePath, destPath; 
+
+	const XMP_Node * sourceNode = 0;
+	XMP_Node * destNode = 0;
+	
+	XMP_Assert ( (sourceNS != 0) && (*sourceNS != 0) );
+	XMP_Assert ( (sourceRoot != 0) && (*sourceRoot != 0) );
+	XMP_Assert ( (dest != 0) && (destNS != 0) && (destRoot != 0) );
+
+	if ( *destNS == 0 )	  destNS   = sourceNS;
+	if ( *destRoot == 0 ) destRoot = sourceRoot;
+	
+	if ( XMP_LitMatch ( sourceNS, "*" ) ) fullSourceTree = true;
+	if ( XMP_LitMatch ( destNS, "*" ) )   fullDestTree   = true;
+	
+	if ( (&source == dest) && (fullSourceTree | fullDestTree) ) {
+		XMP_Throw ( "Can't duplicate tree onto itself", kXMPErr_BadParam );
+	}
+	
+	if ( fullSourceTree & fullDestTree ) XMP_Throw ( "Use Clone for full tree to full tree", kXMPErr_BadParam );
+
+	if ( fullSourceTree ) {
+	
+		// The destination must be an existing empty struct, copy all of the source top level as fields.
+
+		ExpandXPath ( destNS, destRoot, &destPath );
+		destNode = FindNode ( &dest->tree, destPath, kXMP_ExistingOnly );
+
+		if ( (destNode == 0) || (! XMP_PropIsStruct ( destNode->options )) ) {
+			XMP_Throw ( "Destination must be an existing struct", kXMPErr_BadXPath );
+		}
+		
+		if ( ! destNode->children.empty() ) {
+			if ( options & kXMP_DeleteExisting ) {
+				destNode->RemoveChildren();
+			} else {
+				XMP_Throw ( "Destination must be an empty struct", kXMPErr_BadXPath );
+			}
+		}
+		
+		for ( size_t schemaNum = 0, schemaLim = source.tree.children.size(); schemaNum < schemaLim; ++schemaNum ) {
+
+			const XMP_Node * currSchema = source.tree.children[schemaNum];
+
+			for ( size_t propNum = 0, propLim = currSchema->children.size(); propNum < propLim; ++propNum ) {
+				sourceNode = currSchema->children[propNum];
+				XMP_Node * copyNode = new XMP_Node ( destNode, sourceNode->name, sourceNode->value, sourceNode->options );
+				destNode->children.push_back ( copyNode );
+				CloneOffspring ( sourceNode, copyNode );
+			}
+
+		}
+	
+	} else if ( fullDestTree ) {
+
+		// The source node must be an existing struct, copy all of the fields to the dest top level.
+
+		XMP_ExpandedXPath srcPath; 
+		ExpandXPath ( sourceNS, sourceRoot, &srcPath );
+		sourceNode = FindConstNode ( &source.tree, srcPath );
+
+		if ( (sourceNode == 0) || (! XMP_PropIsStruct ( sourceNode->options )) ) {
+			XMP_Throw ( "Source must be an existing struct", kXMPErr_BadXPath );
+		}
+		
+		destNode = &dest->tree;
+		
+		if ( ! destNode->children.empty() ) {
+			if ( options & kXMP_DeleteExisting ) {
+				destNode->RemoveChildren();
+			} else {
+				XMP_Throw ( "Destination tree must be empty", kXMPErr_BadXPath );
+			}
+		}
+		
+		std::string   nsPrefix;
+		XMP_StringPtr nsURI;
+		XMP_StringLen nsLen;
+		
+		for ( size_t fieldNum = 0, fieldLim = sourceNode->children.size(); fieldNum < fieldLim; ++fieldNum ) {
+
+			const XMP_Node * currField = sourceNode->children[fieldNum];
+
+			size_t colonPos = currField->name.find ( ':' );
+			if (  colonPos == std::string::npos ) continue;
+			nsPrefix.assign ( currField->name.c_str(), colonPos );
+			bool nsOK = XMPMeta::GetNamespaceURI ( nsPrefix.c_str(), &nsURI, &nsLen );
+			if ( ! nsOK ) XMP_Throw ( "Source field namespace is not global", kXMPErr_BadSchema );
+			
+			XMP_Node * destSchema = FindSchemaNode ( &dest->tree, nsURI, kXMP_CreateNodes );
+			if ( destSchema == 0 ) XMP_Throw ( "Failed to find destination schema", kXMPErr_BadSchema );
+
+			XMP_Node * copyNode = new XMP_Node ( destSchema, currField->name, currField->value, currField->options );
+			destSchema->children.push_back ( copyNode );
+			CloneOffspring ( currField, copyNode );
+
+		}
+		
+	} else {
+
+		// Find the root nodes for the source and destination subtrees.
+		
+		ExpandXPath ( sourceNS, sourceRoot, &sourcePath );
+		ExpandXPath ( destNS, destRoot, &destPath );
+	
+		sourceNode = FindConstNode ( &source.tree, sourcePath );
+		if ( sourceNode == 0 ) XMP_Throw ( "Can't find source subtree", kXMPErr_BadXPath );
+		
+		destNode = FindNode ( &dest->tree, destPath, kXMP_ExistingOnly );	// Dest must not yet exist.
+		if ( destNode != 0 ) XMP_Throw ( "Destination subtree must not exist", kXMPErr_BadXPath );
+		
+		destNode = FindNode ( &dest->tree, destPath, kXMP_CreateNodes );	// Now create the dest.
+		if ( destNode == 0 ) XMP_Throw ( "Can't create destination root node", kXMPErr_BadXPath );
+		
+		// Make sure the destination is not within the source! The source can't be inside the destination
+		// because the source already existed and the destination was just created.
+		
+		if ( &source == dest ) {
+			for ( XMP_Node * testNode = destNode; testNode != 0; testNode = testNode->parent ) {
+				if ( testNode == sourceNode ) {
+					// *** delete the just-created dest root node
+					XMP_Throw ( "Destination subtree is within the source subtree", kXMPErr_BadXPath );
+				}
+			}
+		}
+	
+		// *** Could use a CloneTree util here and maybe elsewhere.
+		
+		destNode->value	  = sourceNode->value;	// *** Should use SetNode.
+		destNode->options = sourceNode->options;
+		CloneOffspring ( sourceNode, destNode );
+
+	}
+
+}	// DuplicateSubtree
+
+
+// =================================================================================================
diff --git a/XMPCore/source/XMPUtils.cpp b/XMPCore/source/XMPUtils.cpp
new file mode 100644
index 0000000..8004dd1
--- /dev/null
+++ b/XMPCore/source/XMPUtils.cpp
@@ -0,0 +1,2002 @@
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"	// ! This must be the first include!
+#include "XMPCore/source/XMPCore_Impl.hpp"
+
+#include "XMPCore/source/XMPUtils.hpp"
+
+#include "third-party/zuid/interfaces/MD5.h"
+
+
+#include <map>
+
+#include <time.h>
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <errno.h>
+
+#include <stdio.h>	// For snprintf.
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+// =================================================================================================
+// Local Types and Constants
+// =========================
+
+static const char * sBase64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+// =================================================================================================
+// Local Utilities
+// ===============
+
+// -------------------------------------------------------------------------------------------------
+// ANSI Time Functions
+// -------------------
+//
+// A bit of hackery to use the best available time functions. Mac, UNIX and iOS have thread safe versions
+// of gmtime and localtime.
+
+#if XMP_MacBuild | XMP_UNIXBuild | XMP_iOSBuild
+
+	typedef time_t			ansi_tt;
+	typedef struct tm		ansi_tm;
+
+	#define ansi_time		time
+	#define ansi_mktime		mktime
+	#define ansi_difftime	difftime
+
+	#define ansi_gmtime		gmtime_r
+	#define ansi_localtime	localtime_r
+
+#elif XMP_WinBuild
+
+	// ! VS.Net 2003 (VC7) does not provide thread safe versions of gmtime and localtime.
+	// ! VS.Net 2005 (VC8) inverts the parameters for the safe versions of gmtime and localtime.
+
+	typedef time_t			ansi_tt;
+	typedef struct tm		ansi_tm;
+
+	#define ansi_time		time
+	#define ansi_mktime		mktime
+	#define ansi_difftime	difftime
+
+	#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+		#define ansi_gmtime(tt,tm)		gmtime_s ( tm, tt )
+		#define ansi_localtime(tt,tm)	localtime_s ( tm, tt )
+	#else
+		static inline void ansi_gmtime ( const ansi_tt * ttTime, ansi_tm * tmTime )
+		{
+			ansi_tm * tmx = gmtime ( ttTime );	// ! Hope that there is no race!
+			if ( tmx == 0 ) XMP_Throw ( "Failure from ANSI C gmtime function", kXMPErr_ExternalFailure );
+			*tmTime = *tmx;
+		}
+		static inline void ansi_localtime ( const ansi_tt * ttTime, ansi_tm * tmTime )
+		{
+			ansi_tm * tmx = localtime ( ttTime );	// ! Hope that there is no race!
+			if ( tmx == 0 ) XMP_Throw ( "Failure from ANSI C localtime function", kXMPErr_ExternalFailure );
+			*tmTime = *tmx;
+		}
+	#endif
+
+#endif
+
+// -------------------------------------------------------------------------------------------------
+// VerifyDateTimeFlags
+// -------------------
+
+static void
+VerifyDateTimeFlags ( XMP_DateTime * dt )
+{
+
+	if ( (dt->year != 0) || (dt->month != 0) || (dt->day != 0) ) dt->hasDate = true;
+	if ( (dt->hour != 0) || (dt->minute != 0) || (dt->second != 0) || (dt->nanoSecond != 0) ) dt->hasTime = true;
+	if ( (dt->tzSign != 0) || (dt->tzHour != 0) || (dt->tzMinute != 0) ) dt->hasTimeZone = true;
+	if ( dt->hasTimeZone ) dt->hasTime = true;	// ! Don't combine with above line, UTC has zero values.
+
+}	// VerifyDateTimeFlags
+
+// -------------------------------------------------------------------------------------------------
+// IsLeapYear
+// ----------
+
+static bool
+IsLeapYear ( long year )
+{
+
+	if ( year < 0 ) year = -year + 1;		// Fold the negative years, assuming there is a year 0.
+
+	if ( (year % 4) != 0 ) return false;	// Not a multiple of 4.
+	if ( (year % 100) != 0 ) return true;	// A multiple of 4 but not a multiple of 100.
+	if ( (year % 400) == 0 ) return true;	// A multiple of 400.
+
+	return false;							// A multiple of 100 but not a multiple of 400.
+
+}	// IsLeapYear
+
+// -------------------------------------------------------------------------------------------------
+// DaysInMonth
+// -----------
+
+static int
+DaysInMonth ( XMP_Int32 year, XMP_Int32 month )
+{
+
+	static short	daysInMonth[13] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+									   // Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec
+
+	int days = daysInMonth [ month ];
+	if ( (month == 2) && IsLeapYear ( year ) ) days += 1;
+
+	return days;
+
+}	// DaysInMonth
+
+// -------------------------------------------------------------------------------------------------
+// AdjustTimeOverflow
+// ------------------
+
+static void
+AdjustTimeOverflow ( XMP_DateTime * time )
+{
+	enum { kBillion = 1000*1000*1000L };
+
+	// ----------------------------------------------------------------------------------------------
+	// To be safe against pathalogical overflow we first adjust from month to second, then from
+	// nanosecond back up to month. This leaves each value closer to zero before propagating into it.
+	// For example if the hour and minute are both near max, adjusting minutes first can cause the
+	// hour to overflow.
+
+	// ! Photoshop 8 creates "time only" values with zeros for year, month, and day.
+
+	if ( (time->year != 0) || (time->month != 0) || (time->day != 0) ) {
+
+		while ( time->month < 1 ) {
+			time->year -= 1;
+			time->month += 12;
+		}
+
+		while ( time->month > 12 ) {
+			time->year += 1;
+			time->month -= 12;
+		}
+
+		while ( time->day < 1 ) {
+			time->month -= 1;
+			if ( time->month < 1 ) {	// ! Keep the months in range for indexing daysInMonth!
+				time->year -= 1;
+				time->month += 12;
+			}
+			time->day += DaysInMonth ( time->year, time->month );	// ! Decrement month before so index here is right!
+		}
+
+		while ( time->day > DaysInMonth ( time->year, time->month ) ) {
+			time->day -= DaysInMonth ( time->year, time->month );	// ! Increment month after so index here is right!
+			time->month += 1;
+			if ( time->month > 12 ) {
+				time->year += 1;
+				time->month -= 12;
+			}
+		}
+
+	}
+
+	while ( time->hour < 0 ) {
+		time->day -= 1;
+		time->hour += 24;
+	}
+
+	while ( time->hour >= 24 ) {
+		time->day += 1;
+		time->hour -= 24;
+	}
+
+	while ( time->minute < 0 ) {
+		time->hour -= 1;
+		time->minute += 60;
+	}
+
+	while ( time->minute >= 60 ) {
+		time->hour += 1;
+		time->minute -= 60;
+	}
+
+	while ( time->second < 0 ) {
+		time->minute -= 1;
+		time->second += 60;
+	}
+
+	while ( time->second >= 60 ) {
+		time->minute += 1;
+		time->second -= 60;
+	}
+
+	while ( time->nanoSecond < 0 ) {
+		time->second -= 1;
+		time->nanoSecond += kBillion;
+	}
+
+	while ( time->nanoSecond >= kBillion ) {
+		time->second += 1;
+		time->nanoSecond -= kBillion;
+	}
+
+	while ( time->second < 0 ) {
+		time->minute -= 1;
+		time->second += 60;
+	}
+
+	while ( time->second >= 60 ) {
+		time->minute += 1;
+		time->second -= 60;
+	}
+
+	while ( time->minute < 0 ) {
+		time->hour -= 1;
+		time->minute += 60;
+	}
+
+	while ( time->minute >= 60 ) {
+		time->hour += 1;
+		time->minute -= 60;
+	}
+
+	while ( time->hour < 0 ) {
+		time->day -= 1;
+		time->hour += 24;
+	}
+
+	while ( time->hour >= 24 ) {
+		time->day += 1;
+		time->hour -= 24;
+	}
+
+	if ( (time->year != 0) || (time->month != 0) || (time->day != 0) ) {
+
+		while ( time->month < 1 ) { // Make sure the months are OK first, for DaysInMonth.
+			time->year -= 1;
+			time->month += 12;
+		}
+
+		while ( time->month > 12 ) {
+			time->year += 1;
+			time->month -= 12;
+		}
+
+		while ( time->day < 1 ) {
+			time->month -= 1;
+			if ( time->month < 1 ) {
+				time->year -= 1;
+				time->month += 12;
+			}
+			time->day += DaysInMonth ( time->year, time->month );
+		}
+
+		while ( time->day > DaysInMonth ( time->year, time->month ) ) {
+			time->day -= DaysInMonth ( time->year, time->month );
+			time->month += 1;
+			if ( time->month > 12 ) {
+				time->year += 1;
+				time->month -= 12;
+			}
+		}
+
+	}
+
+}	// AdjustTimeOverflow
+
+// -------------------------------------------------------------------------------------------------
+// GatherInt
+// ---------
+//
+// Gather into a 64-bit value in order to easily check for overflow. Using a 32-bit value and
+// checking for negative isn't reliable, the "*10" part can wrap around to a low positive value.
+
+static XMP_Int32
+GatherInt ( XMP_StringPtr strValue, size_t * _pos, const char * errMsg )
+{
+	size_t	 pos   = *_pos;
+	XMP_Int64 value = 0;
+
+	enum { kMaxSInt32 = 0x7FFFFFFF };
+
+	for ( char ch = strValue[pos]; ('0' <= ch) && (ch <= '9'); ++pos, ch = strValue[pos] ) {
+		value = (value * 10) + (ch - '0');
+		if ( value > kMaxSInt32 ) XMP_Throw ( errMsg, kXMPErr_BadValue );
+	}
+
+	if ( pos == *_pos ) XMP_Throw ( errMsg, kXMPErr_BadParam );
+	*_pos = pos;
+	return (XMP_Int32)value;
+
+}	// GatherInt
+
+// -------------------------------------------------------------------------------------------------
+
+static void FormatFullDateTime ( XMP_DateTime & tempDate, char * buffer, size_t bufferLen )
+{
+
+	AdjustTimeOverflow ( &tempDate );	// Make sure all time parts are in range.
+
+	if ( (tempDate.second == 0) && (tempDate.nanoSecond == 0) ) {
+
+		// Output YYYY-MM-DDThh:mmTZD.
+		snprintf ( buffer, bufferLen, "%.4d-%02d-%02dT%02d:%02d",	// AUDIT: Callers pass sizeof(buffer).
+				   tempDate.year, tempDate.month, tempDate.day, tempDate.hour, tempDate.minute );
+
+	} else if ( tempDate.nanoSecond == 0  ) {
+
+		// Output YYYY-MM-DDThh:mm:ssTZD.
+		snprintf ( buffer, bufferLen, "%.4d-%02d-%02dT%02d:%02d:%02d",	// AUDIT: Callers pass sizeof(buffer).
+				   tempDate.year, tempDate.month, tempDate.day,
+				   tempDate.hour, tempDate.minute, tempDate.second );
+
+	} else {
+
+		// Output YYYY-MM-DDThh:mm:ss.sTZD.
+		snprintf ( buffer, bufferLen, "%.4d-%02d-%02dT%02d:%02d:%02d.%09d", // AUDIT: Callers pass sizeof(buffer).
+				   tempDate.year, tempDate.month, tempDate.day,
+				   tempDate.hour, tempDate.minute, tempDate.second, tempDate.nanoSecond );
+		buffer[bufferLen - 1] = 0; // AUDIT warning C6053: make sure string is terminated. buffer is already filled with 0 from caller
+		for ( size_t i = strlen(buffer)-1; buffer[i] == '0'; --i ) buffer[i] = 0;	// Trim excess digits.
+	}
+
+}	// FormatFullDateTime
+
+// -------------------------------------------------------------------------------------------------
+// DecodeBase64Char
+// ----------------
+
+// The decode mapping:
+//
+//	encoded		encoded			raw
+//	char		value			value
+//	-------		-------			-----
+//	A .. Z		0x41 .. 0x5A	 0 .. 25
+//	a .. z		0x61 .. 0x7A	26 .. 51
+//	0 .. 9		0x30 .. 0x39	52 .. 61
+//	+			0x2B			62
+//	/			0x2F			63
+
+static unsigned char
+DecodeBase64Char ( XMP_Uns8 ch )
+{
+
+	if ( ('A' <= ch) && (ch <= 'Z') ) {
+		ch = ch - 'A';
+	} else if ( ('a' <= ch) && (ch <= 'z') ) {
+		ch = ch - 'a' + 26;
+	} else if ( ('0' <= ch) && (ch <= '9') ) {
+		ch = ch - '0' + 52;
+	} else if ( ch == '+' ) {
+		ch = 62;
+	} else if ( ch == '/' ) {
+		ch = 63;
+	} else if ( (ch == ' ') || (ch == kTab) || (ch == kLF) || (ch == kCR) ) {
+		ch = 0xFF;	// Will be ignored by the caller.
+	} else {
+		XMP_Throw ( "Invalid base-64 encoded character", kXMPErr_BadParam );
+	}
+
+	return ch;
+
+}	// DecodeBase64Char ();
+
+// -------------------------------------------------------------------------------------------------
+// EstimateSizeForJPEG
+// -------------------
+//
+// Estimate the serialized size for the subtree of an XMP_Node. Support for PackageForJPEG.
+
+static size_t
+EstimateSizeForJPEG ( const XMP_Node * xmpNode )
+{
+
+	size_t estSize = 0;
+	size_t nameSize = xmpNode->name.size();
+	bool   includeName = (! XMP_PropIsArray ( xmpNode->parent->options ));
+
+	if ( XMP_PropIsSimple ( xmpNode->options ) ) {
+
+		if ( includeName ) estSize += (nameSize + 3);	// Assume attribute form.
+		estSize += xmpNode->value.size();
+
+	} else if ( XMP_PropIsArray ( xmpNode->options ) ) {
+
+		// The form of the value portion is: <rdf:Xyz><rdf:li>...</rdf:li>...</rdf:Xyx>
+		if ( includeName ) estSize += (2*nameSize + 5);
+		size_t arraySize = xmpNode->children.size();
+		estSize += 9 + 10;	// The rdf:Xyz tags.
+		estSize += arraySize * (8 + 9);	// The rdf:li tags.
+		for ( size_t i = 0; i < arraySize; ++i ) {
+			estSize += EstimateSizeForJPEG ( xmpNode->children[i] );
+		}
+
+	} else {
+
+		// The form is: <headTag rdf:parseType="Resource">...fields...</tailTag>
+		if ( includeName ) estSize += (2*nameSize + 5);
+		estSize += 25;	// The rdf:parseType="Resource" attribute.
+		size_t fieldCount = xmpNode->children.size();
+		for ( size_t i = 0; i < fieldCount; ++i ) {
+			estSize += EstimateSizeForJPEG ( xmpNode->children[i] );
+		}
+
+	}
+
+	return estSize;
+
+}	// EstimateSizeForJPEG
+
+// -------------------------------------------------------------------------------------------------
+// MoveOneProperty
+// ---------------
+
+static bool MoveOneProperty ( XMPMeta & stdXMP, XMPMeta * extXMP,
+							  XMP_StringPtr schemaURI, XMP_StringPtr propName )
+{
+
+	XMP_Node * propNode = 0;
+	XMP_NodePtrPos stdPropPos;
+
+	XMP_Node * stdSchema = FindSchemaNode ( &stdXMP.tree, schemaURI, kXMP_ExistingOnly, 0 );
+	if ( stdSchema != 0 ) {
+		propNode = FindChildNode ( stdSchema, propName, kXMP_ExistingOnly, &stdPropPos );
+	}
+	if ( propNode == 0 ) return false;
+
+	XMP_Node * extSchema = FindSchemaNode ( &extXMP->tree, schemaURI, kXMP_CreateNodes );
+
+	propNode->parent = extSchema;
+
+	extSchema->options &= ~kXMP_NewImplicitNode;
+	extSchema->children.push_back ( propNode );
+
+	stdSchema->children.erase ( stdPropPos );
+	DeleteEmptySchema ( stdSchema );
+
+	return true;
+
+}	// MoveOneProperty
+
+// -------------------------------------------------------------------------------------------------
+// CreateEstimatedSizeMap
+// ----------------------
+
+#ifndef Trace_PackageForJPEG
+	#define Trace_PackageForJPEG 0
+#endif
+
+typedef std::pair < XMP_VarString*, XMP_VarString* > StringPtrPair;
+typedef std::multimap < size_t, StringPtrPair > PropSizeMap;
+
+static void CreateEstimatedSizeMap ( XMPMeta & stdXMP, PropSizeMap * propSizes )
+{
+	#if Trace_PackageForJPEG
+		printf ( "  Creating top level property map:\n" );
+	#endif
+
+	for ( size_t s = stdXMP.tree.children.size(); s > 0; --s ) {
+
+		XMP_Node * stdSchema = stdXMP.tree.children[s-1];
+
+		for ( size_t p = stdSchema->children.size(); p > 0; --p ) {
+
+			XMP_Node * stdProp = stdSchema->children[p-1];
+			if ( (stdSchema->name == kXMP_NS_XMP_Note) &&
+				 (stdProp->name == "xmpNote:HasExtendedXMP") ) continue;	// ! Don't move xmpNote:HasExtendedXMP.
+
+			size_t propSize = EstimateSizeForJPEG ( stdProp );
+			StringPtrPair namePair ( &stdSchema->name, &stdProp->name );
+			PropSizeMap::value_type mapValue ( propSize, namePair );
+
+			(void) propSizes->insert ( propSizes->upper_bound ( propSize ), mapValue );
+			#if Trace_PackageForJPEG
+				printf ( "    %d bytes, %s in %s\n", propSize, stdProp->name.c_str(), stdSchema->name.c_str() );
+			#endif
+
+		}
+
+	}
+
+}	// CreateEstimatedSizeMap
+
+// -------------------------------------------------------------------------------------------------
+// MoveLargestProperty
+// -------------------
+
+static size_t MoveLargestProperty ( XMPMeta & stdXMP, XMPMeta * extXMP, PropSizeMap & propSizes )
+{
+	XMP_Assert ( ! propSizes.empty() );
+
+	#if 0
+		// *** Xocde 2.3 on Mac OS X 10.4.7 seems to have a bug where this does not pick the last
+		// *** item in the map. We'll just avoid it on all platforms until thoroughly tested.
+		PropSizeMap::iterator lastPos = propSizes.end();
+		--lastPos;	// Move to the actual last item.
+	#else
+		PropSizeMap::iterator lastPos = propSizes.begin();
+		PropSizeMap::iterator nextPos = lastPos;
+		for ( ++nextPos; nextPos != propSizes.end(); ++nextPos ) lastPos = nextPos;
+	#endif
+
+	size_t propSize = lastPos->first;
+	const char * schemaURI = lastPos->second.first->c_str();
+	const char * propName  = lastPos->second.second->c_str();
+
+	#if Trace_PackageForJPEG
+		printf ( "  Move %s, %d bytes\n", propName, propSize );
+	#endif
+
+#if XMP_DebugBuild
+	bool moved =
+#endif
+          MoveOneProperty ( stdXMP, extXMP, schemaURI, propName );
+	XMP_Assert ( moved );
+
+	propSizes.erase ( lastPos );
+	return propSize;
+
+}	// MoveLargestProperty
+
+// =================================================================================================
+// Class Static Functions
+// ======================
+
+// -------------------------------------------------------------------------------------------------
+// Initialize
+// ----------
+
+/* class static */ bool
+XMPUtils::Initialize()
+{
+
+	if ( WhiteSpaceStrPtr == NULL ) {
+		WhiteSpaceStrPtr = new std::string();
+		WhiteSpaceStrPtr->append( " \t\n\r" );
+	}
+	return true;
+
+}	// Initialize
+
+// -------------------------------------------------------------------------------------------------
+// Terminate
+// ---------
+
+/* class static */ void
+XMPUtils::Terminate() RELEASE_NO_THROW
+{
+
+	delete WhiteSpaceStrPtr;
+	WhiteSpaceStrPtr = NULL;
+	return;
+
+}	// Terminate
+
+// -------------------------------------------------------------------------------------------------
+// ComposeArrayItemPath
+// --------------------
+//
+// Return "arrayName[index]".
+
+/* class static */ void
+XMPUtils::ComposeArrayItemPath ( XMP_StringPtr	 schemaNS,
+								 XMP_StringPtr	 arrayName,
+								 XMP_Index		 itemIndex,
+								 XMP_VarString * _fullPath )
+{
+	XMP_Assert ( schemaNS != 0 );	// Enforced by wrapper.
+	XMP_Assert ( (arrayName != 0) && (*arrayName != 0) ); // Enforced by wrapper.
+	XMP_Assert ( _fullPath != 0 );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath expPath;	// Just for side effects to check namespace and basic path.
+	ExpandXPath ( schemaNS, arrayName, &expPath );
+
+	if ( (itemIndex < 0) && (itemIndex != kXMP_ArrayLastItem) ) XMP_Throw ( "Array index out of bounds", kXMPErr_BadParam );
+
+	XMP_StringLen reserveLen = strlen(arrayName) + 2 + 32;	// Room plus padding.
+
+	XMP_VarString fullPath;	// ! Allow for arrayName to be the incoming _fullPath.c_str().
+	fullPath.reserve ( reserveLen );
+		fullPath = arrayName;
+
+	if ( itemIndex == kXMP_ArrayLastItem ) {
+		fullPath += "[last()]";
+	} else {
+		// AUDIT: Using sizeof(buffer) for the snprintf length is safe.
+		char buffer [32];	// A 32 byte buffer is plenty, even for a 64-bit integer.
+		snprintf ( buffer, sizeof(buffer), "[%d]", itemIndex );
+		fullPath += buffer;
+	}
+
+	*_fullPath = fullPath;
+
+}	// ComposeArrayItemPath
+
+// -------------------------------------------------------------------------------------------------
+// ComposeStructFieldPath
+// ----------------------
+//
+// Return "structName/ns:fieldName".
+
+/* class static */ void
+XMPUtils::ComposeStructFieldPath ( XMP_StringPtr   schemaNS,
+								   XMP_StringPtr   structName,
+								   XMP_StringPtr   fieldNS,
+								   XMP_StringPtr   fieldName,
+								   XMP_VarString * _fullPath )
+{
+	XMP_Assert ( (schemaNS != 0) && (fieldNS != 0) );		// Enforced by wrapper.
+	XMP_Assert ( (structName != 0) && (*structName != 0) ); // Enforced by wrapper.
+	XMP_Assert ( (fieldName != 0) && (*fieldName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( _fullPath != 0 );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath expPath;	// Just for side effects to check namespace and basic path.
+	ExpandXPath ( schemaNS, structName, &expPath );
+
+	XMP_ExpandedXPath fieldPath;
+	ExpandXPath ( fieldNS, fieldName, &fieldPath );
+	if ( fieldPath.size() != 2 ) XMP_Throw ( "The fieldName must be simple", kXMPErr_BadXPath );
+
+	XMP_StringLen reserveLen = strlen(structName) + fieldPath[kRootPropStep].step.size() + 1;
+
+	XMP_VarString fullPath;	// ! Allow for arrayName to be the incoming _fullPath.c_str().
+	fullPath.reserve ( reserveLen );
+	fullPath = structName;
+	fullPath += '/';
+	fullPath += fieldPath[kRootPropStep].step;
+
+	*_fullPath = fullPath;
+
+}	// ComposeStructFieldPath
+
+// -------------------------------------------------------------------------------------------------
+// ComposeQualifierPath
+// --------------------
+//
+// Return "propName/?ns:qualName".
+
+/* class static */ void
+XMPUtils::ComposeQualifierPath ( XMP_StringPtr	 schemaNS,
+								 XMP_StringPtr	 propName,
+								 XMP_StringPtr	 qualNS,
+								 XMP_StringPtr	 qualName,
+								 XMP_VarString * _fullPath )
+{
+	XMP_Assert ( (schemaNS != 0) && (qualNS != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (propName != 0) && (*propName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (qualName != 0) && (*qualName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( _fullPath != 0 );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath expPath;	// Just for side effects to check namespace and basic path.
+	ExpandXPath ( schemaNS, propName, &expPath );
+
+	XMP_ExpandedXPath qualPath;
+	ExpandXPath ( qualNS, qualName, &qualPath );
+	if ( qualPath.size() != 2 ) XMP_Throw ( "The qualifier name must be simple", kXMPErr_BadXPath );
+
+	XMP_StringLen reserveLen = strlen(propName) + qualPath[kRootPropStep].step.size() + 2;
+
+	XMP_VarString fullPath;	// ! Allow for arrayName to be the incoming _fullPath.c_str().
+	fullPath.reserve ( reserveLen );
+	fullPath = propName;
+	fullPath += "/?";
+	fullPath += qualPath[kRootPropStep].step;
+
+	*_fullPath = fullPath;
+
+}	// ComposeQualifierPath
+
+// -------------------------------------------------------------------------------------------------
+// ComposeLangSelector
+// -------------------
+//
+// Return "arrayName[?xml:lang="lang"]".
+
+// *** #error "handle quotes in the lang - or verify format"
+
+/* class static */ void
+XMPUtils::ComposeLangSelector ( XMP_StringPtr	schemaNS,
+								XMP_StringPtr	arrayName,
+								XMP_StringPtr	_langName,
+								XMP_VarString * _fullPath )
+{
+	XMP_Assert ( schemaNS != 0 );	// Enforced by wrapper.
+	XMP_Assert ( (arrayName != 0) && (*arrayName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (_langName != 0) && (*_langName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( _fullPath != 0 );	// Enforced by wrapper.
+
+	XMP_ExpandedXPath expPath;	// Just for side effects to check namespace and basic path.
+	ExpandXPath ( schemaNS, arrayName, &expPath );
+
+	XMP_VarString langName ( _langName );
+	NormalizeLangValue ( &langName );
+
+	XMP_StringLen reserveLen = strlen(arrayName) + langName.size() + 14;
+
+	XMP_VarString fullPath;	// ! Allow for arrayName to be the incoming _fullPath.c_str().
+	fullPath.reserve ( reserveLen );
+	fullPath = arrayName;
+	fullPath += "[?xml:lang=\"";
+	fullPath += langName;
+	fullPath += "\"]";
+
+	*_fullPath = fullPath;
+
+}	// ComposeLangSelector
+
+// -------------------------------------------------------------------------------------------------
+// ComposeFieldSelector
+// --------------------
+//
+// Return "arrayName[ns:fieldName="fieldValue"]".
+
+// *** #error "handle quotes in the value"
+
+/* class static */ void
+XMPUtils::ComposeFieldSelector ( XMP_StringPtr	 schemaNS,
+								 XMP_StringPtr	 arrayName,
+								 XMP_StringPtr	 fieldNS,
+								 XMP_StringPtr	 fieldName,
+								 XMP_StringPtr	 fieldValue,
+								 XMP_VarString * _fullPath )
+{
+	XMP_Assert ( (schemaNS != 0) && (fieldNS != 0) && (fieldValue != 0) );	// Enforced by wrapper.
+	XMP_Assert ( (*arrayName != 0) && (*fieldName != 0) );	// Enforced by wrapper.
+	XMP_Assert ( _fullPath != 0 );		// Enforced by wrapper.
+
+	XMP_ExpandedXPath expPath;	// Just for side effects to check namespace and basic path.
+	ExpandXPath ( schemaNS, arrayName, &expPath );
+
+	XMP_ExpandedXPath fieldPath;
+	ExpandXPath ( fieldNS, fieldName, &fieldPath );
+	if ( fieldPath.size() != 2 ) XMP_Throw ( "The fieldName must be simple", kXMPErr_BadXPath );
+
+	XMP_StringLen reserveLen = strlen(arrayName) + fieldPath[kRootPropStep].step.size() + strlen(fieldValue) + 5;
+
+	XMP_VarString fullPath;	// ! Allow for arrayName to be the incoming _fullPath.c_str().
+	fullPath.reserve ( reserveLen );
+	fullPath = arrayName;
+	fullPath += '[';
+	fullPath += fieldPath[kRootPropStep].step;
+	fullPath += "=\"";
+	fullPath += fieldValue;
+	fullPath += "\"]";
+
+	*_fullPath = fullPath;
+
+}	// ComposeFieldSelector
+
+// -------------------------------------------------------------------------------------------------
+// ConvertFromBool
+// ---------------
+
+/* class static */ void
+XMPUtils::ConvertFromBool ( bool			binValue,
+							XMP_VarString * strValue )
+{
+	XMP_Assert ( strValue != 0 );	// Enforced by wrapper.
+
+	if ( binValue ) {
+		*strValue = kXMP_TrueStr;
+	} else {
+		*strValue = kXMP_FalseStr;
+	}
+
+}	// ConvertFromBool
+
+// -------------------------------------------------------------------------------------------------
+// ConvertFromInt
+// --------------
+
+/* class static */ void
+XMPUtils::ConvertFromInt ( XMP_Int32	   binValue,
+						   XMP_StringPtr   format,
+						   XMP_VarString * strValue )
+{
+	XMP_Assert ( (format != 0) && (strValue != 0) );	// Enforced by wrapper.
+
+	strValue->erase();
+	if ( *format == 0 ) format = "%d";
+
+	// AUDIT: Using sizeof(buffer) for the snprintf length is safe.
+	char buffer [32];	// Big enough for a 64-bit integer;
+	snprintf ( buffer, sizeof(buffer), format, binValue );
+
+	*strValue = buffer;
+
+}	// ConvertFromInt
+
+// -------------------------------------------------------------------------------------------------
+// ConvertFromInt64
+// ----------------
+
+/* class static */ void
+XMPUtils::ConvertFromInt64 ( XMP_Int64	     binValue,
+						     XMP_StringPtr   format,
+						     XMP_VarString * strValue )
+{
+	XMP_Assert ( (format != 0) && (strValue != 0) );	// Enforced by wrapper.
+
+	strValue->erase();
+	if ( *format == 0 ) format = "%lld";
+
+	// AUDIT: Using sizeof(buffer) for the snprintf length is safe.
+	char buffer [32];	// Big enough for a 64-bit integer;
+	snprintf ( buffer, sizeof(buffer), format, binValue );
+
+	*strValue = buffer;
+
+}	// ConvertFromInt64
+
+// -------------------------------------------------------------------------------------------------
+// ConvertFromFloat
+// ----------------
+
+/* class static */ void
+XMPUtils::ConvertFromFloat ( double			 binValue,
+							 XMP_StringPtr	 format,
+							 XMP_VarString * strValue )
+{
+	XMP_Assert ( (format != 0) && (strValue != 0) );	// Enforced by wrapper.
+
+	strValue->erase();
+	if ( *format == 0 ) format = "%f";
+
+	// AUDIT: Using sizeof(buffer) for the snprintf length is safe.
+	char buffer [64];	// Ought to be plenty big enough.
+	snprintf ( buffer, sizeof(buffer), format, binValue );
+
+	*strValue = buffer;
+
+}	// ConvertFromFloat
+
+// -------------------------------------------------------------------------------------------------
+// ConvertFromDate
+// ---------------
+//
+// Format a date-time string according to ISO 8601 and http://www.w3.org/TR/NOTE-datetime:
+//	YYYY
+//	YYYY-MM
+//	YYYY-MM-DD
+//	YYYY-MM-DDThh:mmTZD
+//	YYYY-MM-DDThh:mm:ssTZD
+//	YYYY-MM-DDThh:mm:ss.sTZD
+//
+//	YYYY = four-digit year
+//	MM	 = two-digit month (01=January, etc.)
+//	DD	 = two-digit day of month (01 through 31)
+//	hh	 = two digits of hour (00 through 23)
+//	mm	 = two digits of minute (00 through 59)
+//	ss	 = two digits of second (00 through 59)
+//	s	 = one or more digits representing a decimal fraction of a second
+//	TZD	 = time zone designator (Z or +hh:mm or -hh:mm)
+//
+// Note that ISO 8601 does not seem to allow years less than 1000 or greater than 9999. We allow
+// any year, even negative ones. The year is formatted as "%.4d". The TZD is also optional in XMP,
+// even though required in the W3C profile. Finally, Photoshop 8 (CS) sometimes created time-only
+// values so we tolerate that.
+
+/* class static */ void
+XMPUtils::ConvertFromDate ( const XMP_DateTime & _inValue,
+							XMP_VarString *      strValue )
+{
+	XMP_Assert ( strValue != 0 );	// Enforced by wrapper.
+
+	char buffer [100];	// Plenty long enough.
+	memset( buffer, 0, 100);
+
+	// Pick the format, use snprintf to format into a local buffer, assign to static output string.
+	// Don't use AdjustTimeOverflow at the start, that will wipe out zero month or day values.
+
+	// ! Photoshop 8 creates "time only" values with zeros for year, month, and day.
+
+	XMP_DateTime binValue = _inValue;
+	VerifyDateTimeFlags ( &binValue );
+
+	// Temporary fix for bug 1269463, silently fix out of range month or day.
+
+	if ( binValue.month == 0 ) {
+		if ( (binValue.day != 0) || binValue.hasTime ) binValue.month = 1;
+	} else {
+		if ( binValue.month < 1 ) binValue.month = 1;
+		if ( binValue.month > 12 ) binValue.month = 12;
+	}
+
+	if ( binValue.day == 0 ) {
+		if ( binValue.hasTime ) binValue.day = 1;
+	} else {
+		if ( binValue.day < 1 ) binValue.day = 1;
+		if ( binValue.day > 31 ) binValue.day = 31;
+	}
+
+	// Now carry on with the original logic.
+
+	if ( binValue.month == 0 ) {
+
+		// Output YYYY if all else is zero, otherwise output a full string for the quasi-bogus
+		// "time only" values from Photoshop CS.
+		if ( (binValue.day == 0) && (! binValue.hasTime) ) {
+			snprintf ( buffer, sizeof(buffer), "%.4d", binValue.year ); // AUDIT: Using sizeof for snprintf length is safe.
+		} else if ( (binValue.year == 0) && (binValue.day == 0) ) {
+			FormatFullDateTime ( binValue, buffer, sizeof(buffer) );
+		} else {
+			XMP_Throw ( "Invalid partial date", kXMPErr_BadParam);
+		}
+
+	} else if ( binValue.day == 0 ) {
+
+		// Output YYYY-MM.
+		if ( (binValue.month < 1) || (binValue.month > 12) ) XMP_Throw ( "Month is out of range", kXMPErr_BadParam);
+		if ( binValue.hasTime ) XMP_Throw ( "Invalid partial date, non-zeros after zero month and day", kXMPErr_BadParam);
+		snprintf ( buffer, sizeof(buffer), "%.4d-%02d", binValue.year, binValue.month );	// AUDIT: Using sizeof for snprintf length is safe.
+
+	} else if ( ! binValue.hasTime ) {
+
+		// Output YYYY-MM-DD.
+		if ( (binValue.month < 1) || (binValue.month > 12) ) XMP_Throw ( "Month is out of range", kXMPErr_BadParam);
+		if ( (binValue.day < 1) || (binValue.day > 31) ) XMP_Throw ( "Day is out of range", kXMPErr_BadParam);
+		snprintf ( buffer, sizeof(buffer), "%.4d-%02d-%02d", binValue.year, binValue.month, binValue.day ); // AUDIT: Using sizeof for snprintf length is safe.
+
+	} else {
+
+		FormatFullDateTime ( binValue, buffer, sizeof(buffer) );
+
+	}
+
+	strValue->assign ( buffer );
+
+	if ( binValue.hasTimeZone ) {
+
+		if ( (binValue.tzHour < 0) || (binValue.tzHour > 23) ||
+			 (binValue.tzMinute < 0 ) || (binValue.tzMinute > 59) ||
+			 (binValue.tzSign < -1) || (binValue.tzSign > +1) ||
+			 ((binValue.tzSign == 0) && ((binValue.tzHour != 0) || (binValue.tzMinute != 0))) ) {
+			XMP_Throw ( "Invalid time zone values", kXMPErr_BadParam );
+		}
+
+		if ( binValue.tzSign == 0 ) {
+			*strValue += 'Z';
+		} else {
+			snprintf ( buffer, sizeof(buffer), "+%02d:%02d", binValue.tzHour, binValue.tzMinute );	// AUDIT: Using sizeof for snprintf length is safe.
+			if ( binValue.tzSign < 0 ) buffer[0] = '-';
+			*strValue += buffer;
+		}
+
+	}
+
+}	// ConvertFromDate
+
+// -------------------------------------------------------------------------------------------------
+// ConvertToBool
+// -------------
+//
+// Formally the string value should be "True" or "False", but we should be more flexible here. Map
+// the string to lower case. Allow any of "true", "false", "t", "f", "1", or "0".
+
+/* class static */ bool
+XMPUtils::ConvertToBool ( XMP_StringPtr strValue )
+{
+	if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty convert-from string", kXMPErr_BadValue );
+
+	bool result = false;
+	XMP_VarString strObj ( strValue );
+
+	for ( XMP_VarStringPos ch = strObj.begin(); ch != strObj.end(); ++ch ) {
+		if ( ('A' <= *ch) && (*ch <= 'Z') ) *ch += 0x20;
+	}
+
+	if ( (strObj == "true") || (strObj == "t") || (strObj == "1") ) {
+		result = true;
+	} else if ( (strObj == "false") || (strObj == "f") || (strObj == "0") ) {
+		result = false;
+	} else {
+		XMP_Throw ( "Invalid Boolean string", kXMPErr_BadParam );
+	}
+
+	return result;
+
+}	// ConvertToBool
+
+// -------------------------------------------------------------------------------------------------
+// ConvertToInt
+// ------------
+
+/* class static */ XMP_Int32
+XMPUtils::ConvertToInt ( XMP_StringPtr strValue )
+{
+	if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty convert-from string", kXMPErr_BadValue );
+
+	int count;
+	char nextCh;
+	XMP_Int32 result;
+
+	if ( ! XMP_LitNMatch ( strValue, "0x", 2 ) ) {
+		count = sscanf ( strValue, "%d%c", &result, &nextCh );
+	} else {
+		count = sscanf ( strValue, "%x%c", &result, &nextCh );
+	}
+
+	if ( count != 1 ) XMP_Throw ( "Invalid integer string", kXMPErr_BadParam );
+
+	return result;
+
+}	// ConvertToInt
+
+// -------------------------------------------------------------------------------------------------
+// ConvertToInt64
+// --------------
+
+/* class static */ XMP_Int64
+XMPUtils::ConvertToInt64 ( XMP_StringPtr strValue )
+{
+	if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty convert-from string", kXMPErr_BadValue );
+
+	int count;
+	char nextCh;
+	XMP_Int64 result;
+
+	if ( ! XMP_LitNMatch ( strValue, "0x", 2 ) ) {
+		count = sscanf ( strValue, "%lld%c", &result, &nextCh );
+	} else {
+		count = sscanf ( strValue, "%llx%c", &result, &nextCh );
+	}
+
+	if ( count != 1 ) XMP_Throw ( "Invalid integer string", kXMPErr_BadParam );
+
+	return result;
+
+}	// ConvertToInt64
+
+// -------------------------------------------------------------------------------------------------
+// ConvertToFloat
+// --------------
+
+/* class static */ double
+XMPUtils::ConvertToFloat ( XMP_StringPtr strValue )
+{
+	if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty convert-from string", kXMPErr_BadValue );
+
+	XMP_VarString oldLocale;	// Try to make sure number conversion uses '.' as the decimal point.
+	XMP_StringPtr oldLocalePtr = setlocale ( LC_ALL, 0 );
+	if ( oldLocalePtr != 0 ) {
+		oldLocale.assign ( oldLocalePtr );	// Save the locale to be reset when exiting.
+		setlocale ( LC_ALL, "C" );
+	}
+
+	errno = 0;
+	char * numEnd;
+	double result = strtod ( strValue, &numEnd );
+	int errnoSave = errno;	// The setlocale call below might change errno.
+
+	if ( ! oldLocale.empty() ) setlocale ( LC_ALL, oldLocale.c_str() );	// ! Reset locale before possible throw!
+	if ( (errnoSave != 0) || (*numEnd != 0) ) XMP_Throw ( "Invalid float string", kXMPErr_BadParam );
+
+	return result;
+
+}	// ConvertToFloat
+
+// -------------------------------------------------------------------------------------------------
+// ConvertToDate
+// -------------
+//
+// Parse a date-time string according to ISO 8601 and http://www.w3.org/TR/NOTE-datetime:
+//	YYYY
+//	YYYY-MM
+//	YYYY-MM-DD
+//	YYYY-MM-DDThh:mmTZD
+//	YYYY-MM-DDThh:mm:ssTZD
+//	YYYY-MM-DDThh:mm:ss.sTZD
+//
+//	YYYY = four-digit year
+//	MM	 = two-digit month (01=January, etc.)
+//	DD	 = two-digit day of month (01 through 31)
+//	hh	 = two digits of hour (00 through 23)
+//	mm	 = two digits of minute (00 through 59)
+//	ss	 = two digits of second (00 through 59)
+//	s	 = one or more digits representing a decimal fraction of a second
+//	TZD	 = time zone designator (Z or +hh:mm or -hh:mm)
+//
+// Note that ISO 8601 does not seem to allow years less than 1000 or greater than 9999. We allow
+// any year, even negative ones. The year is formatted as "%.4d". The TZD is also optional in XMP,
+// even though required in the W3C profile. Finally, Photoshop 8 (CS) sometimes created time-only
+// values so we tolerate that.
+
+// *** Put the ISO format comments in the header documentation.
+
+/* class static */ void
+XMPUtils::ConvertToDate ( XMP_StringPtr	 strValue,
+						  XMP_DateTime * binValue )
+{
+	if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty convert-from string", kXMPErr_BadValue);
+
+	size_t pos = 0;
+	XMP_Int32 temp;
+
+	XMP_Assert ( sizeof(*binValue) == sizeof(XMP_DateTime) );
+	(void) memset ( binValue, 0, sizeof(*binValue) );	// AUDIT: Safe, using sizeof destination.
+
+	size_t strSize = strlen ( strValue );
+	bool timeOnly = ( (strValue[0] == 'T') ||
+					  ((strSize >= 2) && (strValue[1] == ':')) ||
+					  ((strSize >= 3) && (strValue[2] == ':')) );
+
+	if ( ! timeOnly ) {
+
+		binValue->hasDate = true;
+
+		if ( strValue[0] == '-' ) pos = 1;
+
+		temp = GatherInt ( strValue, &pos, "Invalid year in date string" ); // Extract the year.
+		if ( (strValue[pos] != 0) && (strValue[pos] != '-') ) XMP_Throw ( "Invalid date string, after year", kXMPErr_BadParam );
+		if ( strValue[0] == '-' ) temp = -temp;
+		binValue->year = temp;
+		if ( strValue[pos] == 0 ) return;
+
+		++pos;
+		temp = GatherInt ( strValue, &pos, "Invalid month in date string" );	// Extract the month.
+		if ( (strValue[pos] != 0) && (strValue[pos] != '-') ) XMP_Throw ( "Invalid date string, after month", kXMPErr_BadParam );
+		binValue->month = temp;
+		if ( strValue[pos] == 0 ) return;
+
+		++pos;
+		temp = GatherInt ( strValue, &pos, "Invalid day in date string" );	// Extract the day.
+		if ( (strValue[pos] != 0) && (strValue[pos] != 'T') ) XMP_Throw ( "Invalid date string, after day", kXMPErr_BadParam );
+		binValue->day = temp;
+		if ( strValue[pos] == 0 ) return;
+
+		// Allow year, month, and day to all be zero; implies the date portion is missing.
+		if ( (binValue->year != 0) || (binValue->month != 0) || (binValue->day != 0) ) {
+			// Temporary fix for bug 1269463, silently fix out of range month or day.
+			// if ( (binValue->month < 1) || (binValue->month > 12) ) XMP_Throw ( "Month is out of range", kXMPErr_BadParam );
+			// if ( (binValue->day < 1) || (binValue->day > 31) ) XMP_Throw ( "Day is out of range", kXMPErr_BadParam );
+			if ( binValue->month < 1 ) binValue->month = 1;
+			if ( binValue->month > 12 ) binValue->month = 12;
+			if ( binValue->day < 1 ) binValue->day = 1;
+			if ( binValue->day > 31 ) binValue->day = 31;
+		}
+
+	}
+
+	// If we get here there is more of the string, otherwise we would have returned above.
+
+	if ( strValue[pos] == 'T' ) {
+		++pos;
+	} else if ( ! timeOnly ) {
+		XMP_Throw ( "Invalid date string, missing 'T' after date", kXMPErr_BadParam );
+	}
+
+	binValue->hasTime = true;
+
+	temp = GatherInt ( strValue, &pos, "Invalid hour in date string" ); // Extract the hour.
+	if ( strValue[pos] != ':' ) XMP_Throw ( "Invalid date string, after hour", kXMPErr_BadParam );
+	if ( temp > 23 ) temp = 23;	// *** 1269463: XMP_Throw ( "Hour is out of range", kXMPErr_BadParam );
+	binValue->hour = temp;
+	// Don't check for done, we have to work up to the time zone.
+
+	++pos;
+	temp = GatherInt ( strValue, &pos, "Invalid minute in date string" );	// And the minute.
+	if ( (strValue[pos] != ':') && (strValue[pos] != 'Z') &&
+		 (strValue[pos] != '+') && (strValue[pos] != '-') && (strValue[pos] != 0) ) XMP_Throw ( "Invalid date string, after minute", kXMPErr_BadParam );
+	if ( temp > 59 ) temp = 59;	// *** 1269463: XMP_Throw ( "Minute is out of range", kXMPErr_BadParam );
+	binValue->minute = temp;
+	// Don't check for done, we have to work up to the time zone.
+
+	if ( strValue[pos] == ':' ) {
+
+		++pos;
+		temp = GatherInt ( strValue, &pos, "Invalid whole seconds in date string" );	// Extract the whole seconds.
+		if ( (strValue[pos] != '.') && (strValue[pos] != 'Z') &&
+			 (strValue[pos] != '+') && (strValue[pos] != '-') && (strValue[pos] != 0) ) {
+			XMP_Throw ( "Invalid date string, after whole seconds", kXMPErr_BadParam );
+		}
+		if ( temp > 59 ) temp = 59;	// *** 1269463: XMP_Throw ( "Whole second is out of range", kXMPErr_BadParam );
+		binValue->second = temp;
+		// Don't check for done, we have to work up to the time zone.
+
+		if ( strValue[pos] == '.' ) {
+
+			++pos;
+			size_t digits = pos;	// Will be the number of digits later.
+
+			temp = GatherInt ( strValue, &pos, "Invalid fractional seconds in date string" );	// Extract the fractional seconds.
+			if ( (strValue[pos] != 'Z') && (strValue[pos] != '+') && (strValue[pos] != '-') && (strValue[pos] != 0) ) {
+				XMP_Throw ( "Invalid date string, after fractional second", kXMPErr_BadParam );
+			}
+
+			digits = pos - digits;
+			for ( ; digits > 9; --digits ) temp = temp / 10;
+			for ( ; digits < 9; ++digits ) temp = temp * 10;
+
+			if ( temp >= 1000*1000*1000 ) XMP_Throw ( "Fractional second is out of range", kXMPErr_BadParam );
+			binValue->nanoSecond = temp;
+			// Don't check for done, we have to work up to the time zone.
+
+		}
+
+	}
+
+	if ( strValue[pos] == 0 ) return;
+
+	binValue->hasTimeZone = true;
+
+	if ( strValue[pos] == 'Z' ) {
+
+		++pos;
+
+	} else {
+
+		if ( strValue[pos] == '+' ) {
+			binValue->tzSign = kXMP_TimeEastOfUTC;
+		} else if ( strValue[pos] == '-' ) {
+			binValue->tzSign = kXMP_TimeWestOfUTC;
+		} else {
+			XMP_Throw ( "Time zone must begin with 'Z', '+', or '-'", kXMPErr_BadParam );
+		}
+
+		++pos;
+		temp = GatherInt ( strValue, &pos, "Invalid time zone hour in date string" );	// Extract the time zone hour.
+		if ( strValue[pos] != ':' ) XMP_Throw ( "Invalid date string, after time zone hour", kXMPErr_BadParam );
+		if ( temp > 23 ) XMP_Throw ( "Time zone hour is out of range", kXMPErr_BadParam );
+		binValue->tzHour = temp;
+
+		++pos;
+		temp = GatherInt ( strValue, &pos, "Invalid time zone minute in date string" ); // Extract the time zone minute.
+		if ( temp > 59 ) XMP_Throw ( "Time zone minute is out of range", kXMPErr_BadParam );
+		binValue->tzMinute = temp;
+
+	}
+
+	if ( strValue[pos] != 0 ) XMP_Throw ( "Invalid date string, extra chars at end", kXMPErr_BadParam );
+
+}	// ConvertToDate
+
+// -------------------------------------------------------------------------------------------------
+// EncodeToBase64
+// --------------
+//
+// Encode a string of raw data bytes in base 64 according to RFC 2045. For the encoding definition
+// see section 6.8 in <http://www.ietf.org/rfc/rfc2045.txt>. Although it isn't needed for RDF, we
+// do insert a linefeed character as a newline for every 76 characters of encoded output.
+
+/* class static */ void
+XMPUtils::EncodeToBase64 ( XMP_StringPtr   rawStr,
+						   XMP_StringLen   rawLen,
+						   XMP_VarString * encodedStr )
+{
+	if ( (rawStr == 0) && (rawLen != 0) ) XMP_Throw ( "Null raw data buffer", kXMPErr_BadParam );
+	XMP_Assert ( encodedStr != 0 );	// Enforced by wrapper.
+
+	encodedStr->erase();
+	if ( rawLen == 0 ) return;
+
+	char	encChunk[4];
+
+	unsigned long	in, out;
+	unsigned char	c1, c2, c3;
+	unsigned long	merge;
+
+	const size_t	outputSize	= (rawLen / 3) * 4; // Approximate, might be  small.
+
+	encodedStr->reserve ( outputSize );
+
+	// ----------------------------------------------------------------------------------------
+	// Each 6 bits of input produces 8 bits of output, so 3 input bytes become 4 output bytes.
+	// Process the whole chunks of 3 bytes first, then deal with any remainder. Be careful with
+	// the loop comparison, size-2 could be negative!
+
+	for ( in = 0, out = 0; (in+2) < rawLen; in += 3, out += 4 ) {
+
+		c1	= rawStr[in];
+		c2	= rawStr[in+1];
+		c3	= rawStr[in+2];
+
+		merge	= (c1 << 16) + (c2 << 8) + c3;
+
+		encChunk[0] = sBase64Chars [ merge >> 18 ];
+		encChunk[1] = sBase64Chars [ (merge >> 12) & 0x3F ];
+		encChunk[2] = sBase64Chars [ (merge >> 6) & 0x3F ];
+		encChunk[3] = sBase64Chars [ merge & 0x3F ];
+
+		if ( out >= 76 ) {
+			encodedStr->append ( 1, kLF );
+			out = 0;
+		}
+		encodedStr->append ( encChunk, 4 );
+
+	}
+
+	// ------------------------------------------------------------------------------------------
+	// The output must always be a multiple of 4 bytes. If there is a 1 or 2 byte input remainder
+	// we need to create another chunk. Zero pad with bits to a 6 bit multiple, then add one or
+	// two '=' characters to pad out to 4 bytes.
+
+	switch ( rawLen - in ) {
+
+		case 0:		// Done, no remainder.
+			break;
+
+		case 1:		// One input byte remains.
+
+			c1	= rawStr[in];
+			merge	= c1 << 16;
+
+			encChunk[0] = sBase64Chars [ merge >> 18 ];
+			encChunk[1] = sBase64Chars [ (merge >> 12) & 0x3F ];
+			encChunk[2] = encChunk[3] = '=';
+
+			if ( out >= 76 ) encodedStr->append ( 1, kLF );
+			encodedStr->append ( encChunk, 4 );
+			break;
+
+		case 2:		// Two input bytes remain.
+
+			c1	= rawStr[in];
+			c2	= rawStr[in+1];
+			merge	= (c1 << 16) + (c2 << 8);
+
+			encChunk[0] = sBase64Chars [ merge >> 18 ];
+			encChunk[1] = sBase64Chars [ (merge >> 12) & 0x3F ];
+			encChunk[2] = sBase64Chars [ (merge >> 6) & 0x3F ];
+			encChunk[3] = '=';
+
+			if ( out >= 76 ) encodedStr->append ( 1, kLF );
+			encodedStr->append ( encChunk, 4 );
+			break;
+
+	}
+
+}	// EncodeToBase64
+
+// -------------------------------------------------------------------------------------------------
+// DecodeFromBase64
+// ----------------
+//
+// Decode a string of raw data bytes from base 64 according to RFC 2045. For the encoding definition
+// see section 6.8 in <http://www.ietf.org/rfc/rfc2045.txt>. RFC 2045 talks about ignoring all "bad"
+// input but warning about non-whitespace. For XMP use we ignore space, tab, LF, and CR. Any other
+// bad input is rejected.
+
+/* class static */ void
+XMPUtils::DecodeFromBase64 ( XMP_StringPtr	 encodedStr,
+							 XMP_StringLen	 encodedLen,
+							 XMP_VarString * rawStr )
+{
+	if ( (encodedStr == 0) && (encodedLen != 0) ) XMP_Throw ( "Null encoded data buffer", kXMPErr_BadParam );
+	XMP_Assert ( rawStr != 0 );	// Enforced by wrapper.
+
+	rawStr->erase();
+	if ( encodedLen == 0 ) return;
+
+	unsigned char	ch, rawChunk[3];
+	unsigned long	inStr, inChunk, inLimit, merge, padding;
+
+	XMP_StringLen	outputSize	= (encodedLen / 4) * 3; // Only a close approximation.
+
+	rawStr->reserve ( outputSize );
+
+
+	// ----------------------------------------------------------------------------------------
+	// Each 8 bits of input produces 6 bits of output, so 4 input bytes become 3 output bytes.
+	// Process all but the last 4 data bytes first, then deal with the final chunk. Whitespace
+	// in the input must be ignored. The first loop finds where the last 4 data bytes start and
+	// counts the number of padding equal signs.
+
+	padding = 0;
+	for ( inStr = 0, inLimit = encodedLen; (inStr < 4) && (inLimit > 0); ) {
+		inLimit -= 1;	// ! Don't do in the loop control, the decr/test order is wrong.
+		ch = encodedStr[inLimit];
+		if ( ch == '=' ) {
+			padding += 1;	// The equal sign padding is a data byte.
+		} else if ( DecodeBase64Char(ch) == 0xFF ) {
+			continue;	// Ignore whitespace, don't increment inStr.
+		} else {
+			inStr += 1;
+		}
+	}
+
+	// ! Be careful to count whitespace that is immediately before the final data. Otherwise
+	// ! middle portion will absorb the final data and mess up the final chunk processing.
+
+	while ( (inLimit > 0) && (DecodeBase64Char(encodedStr[inLimit-1]) == 0xFF) ) --inLimit;
+
+	if ( inStr == 0 ) return;	// Nothing but whitespace.
+	if ( padding > 2 ) XMP_Throw ( "Invalid encoded string", kXMPErr_BadParam );
+
+	// -------------------------------------------------------------------------------------------
+	// Now process all but the last chunk. The limit ensures that we have at least 4 data bytes
+	// left when entering the output loop, so the inner loop will succeed without overrunning the
+	// end of the data. At the end of the outer loop we might be past inLimit though.
+
+	inStr = 0;
+	while ( inStr < inLimit ) {
+
+		merge = 0;
+		for ( inChunk = 0; inChunk < 4; ++inStr ) { // ! Yes, increment inStr on each pass.
+			ch = DecodeBase64Char ( encodedStr [inStr] );
+			if ( ch == 0xFF ) continue; // Ignore whitespace.
+			merge = (merge << 6) + ch;
+			inChunk += 1;
+		}
+
+		rawChunk[0] = (unsigned char) (merge >> 16);
+		rawChunk[1] = (unsigned char) ((merge >> 8) & 0xFF);
+		rawChunk[2] = (unsigned char) (merge & 0xFF);
+
+		rawStr->append ( (char*)rawChunk, 3 );
+
+	}
+
+	// -------------------------------------------------------------------------------------------
+	// Process the final, possibly partial, chunk of data. The input is always a multiple 4 bytes,
+	// but the raw data can be any length. The number of padding '=' characters determines if the
+	// final chunk has 1, 2, or 3 raw data bytes.
+
+	XMP_Assert ( inStr < encodedLen );
+
+	merge = 0;
+	for ( inChunk = 0; inChunk < 4-padding; ++inStr ) { // ! Yes, increment inStr on each pass.
+		ch = DecodeBase64Char ( encodedStr[inStr] );
+		if ( ch == 0xFF ) continue; // Ignore whitespace.
+		merge = (merge << 6) + ch;
+		inChunk += 1;
+	}
+
+	if ( padding == 2 ) {
+
+		rawChunk[0] = (unsigned char) (merge >> 4);
+		rawStr->append ( (char*)rawChunk, 1 );
+
+	} else if ( padding == 1 ) {
+
+		rawChunk[0] = (unsigned char) (merge >> 10);
+		rawChunk[1] = (unsigned char) ((merge >> 2) & 0xFF);
+		rawStr->append ( (char*)rawChunk, 2 );
+
+	} else {
+
+		rawChunk[0] = (unsigned char) (merge >> 16);
+		rawChunk[1] = (unsigned char) ((merge >> 8) & 0xFF);
+		rawChunk[2] = (unsigned char) (merge & 0xFF);
+		rawStr->append ( (char*)rawChunk, 3 );
+
+	}
+
+}	// DecodeFromBase64
+
+// -------------------------------------------------------------------------------------------------
+// PackageForJPEG
+// --------------
+
+/* class static */ void
+XMPUtils::PackageForJPEG ( const XMPMeta & origXMP,
+						   XMP_VarString * stdStr,
+						   XMP_VarString * extStr,
+						   XMP_VarString * digestStr )
+{
+	XMP_Assert ( (stdStr != 0) && (extStr != 0) && (digestStr != 0) );	// ! Enforced by wrapper.
+
+	enum { kStdXMPLimit = 65000 };
+	static const char * kPacketTrailer = "<?xpacket end=\"w\"?>";
+	static size_t kTrailerLen = strlen ( kPacketTrailer );
+
+	XMP_VarString tempStr;
+	XMPMeta stdXMP, extXMP;
+	XMP_OptionBits keepItSmall = kXMP_UseCompactFormat | kXMP_OmitAllFormatting;
+
+	stdStr->erase();
+	extStr->erase();
+	digestStr->erase();
+
+	// Try to serialize everything. Note that we're making internal calls to SerializeToBuffer, so
+	// we'll be getting back the pointer and length for its internal string.
+
+	origXMP.SerializeToBuffer ( &tempStr, keepItSmall, 1, "", "", 0 );
+	#if Trace_PackageForJPEG
+		printf ( "\nXMPUtils::PackageForJPEG - Full serialize %d bytes\n", tempStr.size() );
+	#endif
+
+	if ( tempStr.size() > kStdXMPLimit ) {
+
+		// Couldn't fit everything, make a copy of the input XMP and make sure there is no xmp:Thumbnails property.
+
+		stdXMP.tree.options = origXMP.tree.options;
+		stdXMP.tree.name    = origXMP.tree.name;
+		stdXMP.tree.value   = origXMP.tree.value;
+		CloneOffspring ( &origXMP.tree, &stdXMP.tree );
+
+		if ( stdXMP.DoesPropertyExist ( kXMP_NS_XMP, "Thumbnails" ) ) {
+			stdXMP.DeleteProperty ( kXMP_NS_XMP, "Thumbnails" );
+			stdXMP.SerializeToBuffer ( &tempStr, keepItSmall, 1, "", "", 0 );
+			#if Trace_PackageForJPEG
+				printf ( "  Delete xmp:Thumbnails, %d bytes left\n", tempStr.size() );
+			#endif
+		}
+
+	}
+
+	if ( tempStr.size() > kStdXMPLimit ) {
+
+		// Still doesn't fit, move all of the Camera Raw namespace. Add a dummy value for xmpNote:HasExtendedXMP.
+
+		stdXMP.SetProperty ( kXMP_NS_XMP_Note, "HasExtendedXMP", "123456789-123456789-123456789-12", 0 );
+
+		XMP_NodePtrPos crSchemaPos;
+		XMP_Node * crSchema = FindSchemaNode ( &stdXMP.tree, kXMP_NS_CameraRaw, kXMP_ExistingOnly, &crSchemaPos );
+
+		if ( crSchema != 0 ) {
+			crSchema->parent = &extXMP.tree;
+			extXMP.tree.children.push_back ( crSchema );
+			stdXMP.tree.children.erase ( crSchemaPos );
+			stdXMP.SerializeToBuffer ( &tempStr, keepItSmall, 1, "", "", 0 );
+			#if Trace_PackageForJPEG
+				printf ( "  Move Camera Raw schema, %d bytes left\n", tempStr.size() );
+			#endif
+		}
+
+	}
+
+	if ( tempStr.size() > kStdXMPLimit ) {
+
+		// Still doesn't fit, move photoshop:History.
+
+		bool moved = MoveOneProperty ( stdXMP, &extXMP, kXMP_NS_Photoshop, "photoshop:History" );
+
+		if ( moved ) {
+			stdXMP.SerializeToBuffer ( &tempStr, keepItSmall, 1, "", "", 0 );
+			#if Trace_PackageForJPEG
+				printf ( "  Move photoshop:History, %d bytes left\n", tempStr.size() );
+			#endif
+		}
+
+	}
+
+	if ( tempStr.size() > kStdXMPLimit ) {
+
+		// Still doesn't fit, move top level properties in order of estimated size. This is done by
+		// creating a multi-map that maps the serialized size to the string pair for the schema URI
+		// and top level property name. Since maps are inherently ordered, a reverse iteration of
+		// the map can be done to move the largest things first. We use a double loop to keep going
+		// until the serialization actually fits, in case the estimates are off.
+
+		PropSizeMap propSizes;
+		CreateEstimatedSizeMap ( stdXMP, &propSizes );
+
+		#if Trace_PackageForJPEG
+		if ( ! propSizes.empty() ) {
+			printf ( "  Top level property map, smallest to largest:\n" );
+			PropSizeMap::iterator mapPos = propSizes.begin();
+			PropSizeMap::iterator mapEnd = propSizes.end();
+			for ( ; mapPos != mapEnd; ++mapPos ) {
+				size_t propSize = mapPos->first;
+				const char * schemaName = mapPos->second.first->c_str();
+				const char * propName   = mapPos->second.second->c_str();
+				printf ( "    %d bytes, %s in %s\n", propSize, propName, schemaName );
+			}
+		}
+		#endif
+
+		#if 0	// Trace_PackageForJPEG		*** Xcode 2.3 on 10.4.7 has bugs in backwards iteration
+		if ( ! propSizes.empty() ) {
+			printf ( "  Top level property map, largest to smallest:\n" );
+			PropSizeMap::iterator mapPos   = propSizes.end();
+			PropSizeMap::iterator mapBegin = propSizes.begin();
+			for ( --mapPos; true; --mapPos ) {
+				size_t propSize = mapPos->first;
+				const char * schemaName = mapPos->second.first->c_str();
+				const char * propName   = mapPos->second.second->c_str();
+				printf ( "    %d bytes, %s in %s\n", propSize, propName, schemaName );
+				if ( mapPos == mapBegin ) break;
+			}
+		}
+		#endif
+
+		// Outer loop to make sure enough is actually moved.
+
+		while ( (tempStr.size() > kStdXMPLimit) && (! propSizes.empty()) ) {
+
+			// Inner loop, move what seems to be enough according to the estimates.
+
+			size_t tempLen = tempStr.size();
+			while ( (tempLen > kStdXMPLimit) && (! propSizes.empty()) ) {
+
+				size_t propSize = MoveLargestProperty ( stdXMP, &extXMP, propSizes );
+				XMP_Assert ( propSize > 0 );
+
+				if ( propSize > tempLen ) propSize = tempLen;	// ! Don't go negative.
+				tempLen -= propSize;
+
+			}
+
+			// Reserialize the remaining standard XMP.
+
+			stdXMP.SerializeToBuffer ( &tempStr, keepItSmall, 1, "", "", 0 );
+
+		}
+
+	}
+
+	if ( tempStr.size() > kStdXMPLimit ) {
+		// Still doesn't fit, throw an exception and let the client decide what to do.
+		// ! This should never happen with the policy of moving any and all top level properties.
+		XMP_Throw ( "Can't reduce XMP enough for JPEG file", kXMPErr_TooLargeForJPEG );
+	}
+
+	// Set the static output strings.
+
+	if ( extXMP.tree.children.empty() ) {
+
+		// Just have the standard XMP.
+		*stdStr = tempStr;
+
+	} else {
+
+		// Have extended XMP. Serialize it, compute the digest, reset xmpNote:HasExtendedXMP, and
+		// reserialize the standard XMP.
+
+		extXMP.SerializeToBuffer ( &tempStr, (keepItSmall | kXMP_OmitPacketWrapper), 0, "", "", 0 );
+		*extStr = tempStr;
+
+		MD5_CTX  context;
+		XMP_Uns8 digest [16];
+		MD5Init ( &context );
+		MD5Update ( &context, (XMP_Uns8*)tempStr.c_str(), (XMP_Uns32)tempStr.size() );
+		MD5Final ( digest, &context );
+
+		digestStr->reserve ( 32 );
+		for ( size_t i = 0; i < 16; ++i ) {
+			XMP_Uns8 byte = digest[i];
+			digestStr->push_back ( kHexDigits [ byte>>4 ] );
+			digestStr->push_back ( kHexDigits [ byte&0xF ] );
+		}
+
+		stdXMP.SetProperty ( kXMP_NS_XMP_Note, "HasExtendedXMP", digestStr->c_str(), 0 );
+		stdXMP.SerializeToBuffer ( &tempStr, keepItSmall, 1, "", "", 0 );
+		*stdStr = tempStr;
+
+	}
+
+	// Adjust the standard XMP padding to be up to 2KB.
+
+#if XMP_DebugBuild
+	XMP_Assert ( (stdStr->size() > kTrailerLen) && (stdStr->size() <= kStdXMPLimit) );
+	const char * packetEnd = stdStr->c_str() + stdStr->size() - kTrailerLen;
+	XMP_Assert ( XMP_LitMatch ( packetEnd, kPacketTrailer ) );
+#endif
+
+	size_t extraPadding = kStdXMPLimit - stdStr->size();	// ! Do this before erasing the trailer.
+	if ( extraPadding > 2047 ) extraPadding = 2047;
+	stdStr->erase ( stdStr->size() - kTrailerLen );
+	stdStr->append ( extraPadding, ' ' );
+	stdStr->append ( kPacketTrailer );
+
+}	// PackageForJPEG
+
+// -------------------------------------------------------------------------------------------------
+// MergeFromJPEG
+// -------------
+//
+// Copy all of the top level properties from extendedXMP to fullXMP, replacing any duplicates.
+// Delete the xmpNote:HasExtendedXMP property from fullXMP.
+
+/* class static */ void
+XMPUtils::MergeFromJPEG ( XMPMeta *       fullXMP,
+                          const XMPMeta & extendedXMP )
+{
+
+	XMP_OptionBits apFlags = (kXMPTemplate_ReplaceExistingProperties | kXMPTemplate_IncludeInternalProperties);
+	XMPUtils::ApplyTemplate ( fullXMP, extendedXMP, apFlags );
+	fullXMP->DeleteProperty ( kXMP_NS_XMP_Note, "HasExtendedXMP" );
+
+}	// MergeFromJPEG
+
+// -------------------------------------------------------------------------------------------------
+// CurrentDateTime
+// ---------------
+
+/* class static */ void
+XMPUtils::CurrentDateTime ( XMP_DateTime * xmpTime )
+{
+	XMP_Assert ( xmpTime != 0 );	// ! Enforced by wrapper.
+
+	ansi_tt binTime = ansi_time(0);
+	if ( binTime == -1 ) XMP_Throw ( "Failure from ANSI C time function", kXMPErr_ExternalFailure );
+	ansi_tm currTime;
+	ansi_localtime ( &binTime, &currTime );
+
+	xmpTime->year = currTime.tm_year + 1900;
+	xmpTime->month = currTime.tm_mon + 1;
+	xmpTime->day = currTime.tm_mday;
+	xmpTime->hasDate = true;
+
+	xmpTime->hour = currTime.tm_hour;
+	xmpTime->minute = currTime.tm_min;
+	xmpTime->second = currTime.tm_sec;
+	xmpTime->nanoSecond = 0;
+	xmpTime->hasTime = true;
+
+	xmpTime->tzSign = 0;
+	xmpTime->tzHour = 0;
+	xmpTime->tzMinute = 0;
+	xmpTime->hasTimeZone = false;	// ! Needed for SetTimeZone.
+	XMPUtils::SetTimeZone ( xmpTime );
+
+}	// CurrentDateTime
+
+// -------------------------------------------------------------------------------------------------
+// SetTimeZone
+// -----------
+//
+// Sets just the time zone part of the time.  Useful for determining the local time zone or for
+// converting a "zone-less" time to a proper local time. The ANSI C time functions are smart enough
+// to do all the right stuff, as long as we call them properly!
+
+/* class static */ void
+XMPUtils::SetTimeZone ( XMP_DateTime * xmpTime )
+{
+	XMP_Assert ( xmpTime != 0 );	// ! Enforced by wrapper.
+
+	VerifyDateTimeFlags ( xmpTime );
+
+	if ( xmpTime->hasTimeZone ) {
+		XMP_Throw ( "SetTimeZone can only be used on zone-less times", kXMPErr_BadParam );
+	}
+
+	// Create ansi_tt form of the input time. Need the ansi_tm form to make the ansi_tt form.
+
+	ansi_tt ttTime;
+	ansi_tm tmLocal, tmUTC;
+
+	if ( (xmpTime->year == 0) && (xmpTime->month == 0) && (xmpTime->day == 0) ) {
+		ansi_tt now = ansi_time(0);
+		if ( now == -1 ) XMP_Throw ( "Failure from ANSI C time function", kXMPErr_ExternalFailure );
+		ansi_localtime ( &now, &tmLocal );
+	} else {
+		tmLocal.tm_year = xmpTime->year - 1900;
+		while ( tmLocal.tm_year < 70 ) tmLocal.tm_year += 4;	// ! Some versions of mktime barf on years before 1970.
+		tmLocal.tm_mon	 = xmpTime->month - 1;
+		tmLocal.tm_mday	 = xmpTime->day;
+	}
+
+	tmLocal.tm_hour = xmpTime->hour;
+	tmLocal.tm_min = xmpTime->minute;
+	tmLocal.tm_sec = xmpTime->second;
+	tmLocal.tm_isdst = -1;	// Don't know if daylight time is in effect.
+
+	ttTime = ansi_mktime ( &tmLocal );
+	if ( ttTime == -1 ) XMP_Throw ( "Failure from ANSI C mktime function", kXMPErr_ExternalFailure );
+
+	// Convert back to a localized ansi_tm time and get the corresponding UTC ansi_tm time.
+
+	ansi_localtime ( &ttTime, &tmLocal );
+	ansi_gmtime ( &ttTime, &tmUTC );
+
+	// Get the offset direction and amount.
+
+	ansi_tm tmx = tmLocal;	// ! Note that mktime updates the ansi_tm parameter, messing up difftime!
+	ansi_tm tmy = tmUTC;
+	tmx.tm_isdst = tmy.tm_isdst = 0;
+	ansi_tt ttx = ansi_mktime ( &tmx );
+	ansi_tt tty = ansi_mktime ( &tmy );
+	double diffSecs;
+
+	if ( (ttx != -1) && (tty != -1) ) {
+		diffSecs = ansi_difftime ( ttx, tty );
+	} else {
+		#if XMP_MacBuild | XMP_iOSBuild
+			// Looks like Apple's mktime is buggy - see W1140533. But the offset is visible.
+			diffSecs = tmLocal.tm_gmtoff;
+		#else
+			// Win and UNIX don't have a visible offset. Make sure we know about the failure,
+			// then try using the current date/time as a close fallback.
+			ttTime = ansi_time(0);
+			if ( ttTime == -1 ) XMP_Throw ( "Failure from ANSI C time function", kXMPErr_ExternalFailure );
+			ansi_localtime ( &ttTime, &tmx );
+			ansi_gmtime ( &ttTime, &tmy );
+			tmx.tm_isdst = tmy.tm_isdst = 0;
+			ttx = ansi_mktime ( &tmx );
+			tty = ansi_mktime ( &tmy );
+			if ( (ttx == -1) || (tty == -1) ) XMP_Throw ( "Failure from ANSI C mktime function", kXMPErr_ExternalFailure );
+			diffSecs = ansi_difftime ( ttx, tty );
+		#endif
+	}
+
+	if ( diffSecs > 0.0 ) {
+		xmpTime->tzSign = kXMP_TimeEastOfUTC;
+	} else if ( diffSecs == 0.0 ) {
+		xmpTime->tzSign = kXMP_TimeIsUTC;
+	} else {
+		xmpTime->tzSign = kXMP_TimeWestOfUTC;
+		diffSecs = -diffSecs;
+	}
+	xmpTime->tzHour = XMP_Int32 ( diffSecs / 3600.0 );
+	xmpTime->tzMinute = XMP_Int32 ( (diffSecs / 60.0) - (xmpTime->tzHour * 60.0) );
+
+	xmpTime->hasTimeZone = xmpTime->hasTime = true;
+
+	// *** Save the tm_isdst flag in a qualifier?
+
+	XMP_Assert ( (0 <= xmpTime->tzHour) && (xmpTime->tzHour <= 23) );
+	XMP_Assert ( (0 <= xmpTime->tzMinute) && (xmpTime->tzMinute <= 59) );
+	XMP_Assert ( (-1 <= xmpTime->tzSign) && (xmpTime->tzSign <= +1) );
+	XMP_Assert ( (xmpTime->tzSign == 0) ? ((xmpTime->tzHour == 0) && (xmpTime->tzMinute == 0)) :
+										  ((xmpTime->tzHour != 0) || (xmpTime->tzMinute != 0)) );
+
+}	// SetTimeZone
+
+// -------------------------------------------------------------------------------------------------
+// ConvertToUTCTime
+// ----------------
+
+/* class static */ void
+XMPUtils::ConvertToUTCTime ( XMP_DateTime * time )
+{
+	XMP_Assert ( time != 0 );	// ! Enforced by wrapper.
+
+	VerifyDateTimeFlags ( time );
+
+	if ( ! time->hasTimeZone ) return;	// Do nothing if there is no current time zone.
+
+	XMP_Assert ( (0 <= time->tzHour) && (time->tzHour <= 23) );
+	XMP_Assert ( (0 <= time->tzMinute) && (time->tzMinute <= 59) );
+	XMP_Assert ( (-1 <= time->tzSign) && (time->tzSign <= +1) );
+	XMP_Assert ( (time->tzSign == 0) ? ((time->tzHour == 0) && (time->tzMinute == 0)) :
+									   ((time->tzHour != 0) || (time->tzMinute != 0)) );
+
+	if ( time->tzSign == kXMP_TimeEastOfUTC ) {
+		// We are before (east of) GMT, subtract the offset from the time.
+		time->hour -= time->tzHour;
+		time->minute -= time->tzMinute;
+	} else if ( time->tzSign == kXMP_TimeWestOfUTC ) {
+		// We are behind (west of) GMT, add the offset to the time.
+		time->hour += time->tzHour;
+		time->minute += time->tzMinute;
+	}
+
+	AdjustTimeOverflow ( time );
+	time->tzSign = time->tzHour = time->tzMinute = 0;
+
+}	// ConvertToUTCTime
+
+// -------------------------------------------------------------------------------------------------
+// ConvertToLocalTime
+// ------------------
+
+/* class static */ void
+XMPUtils::ConvertToLocalTime ( XMP_DateTime * time )
+{
+	XMP_Assert ( time != 0 );	// ! Enforced by wrapper.
+
+	VerifyDateTimeFlags ( time );
+
+	if ( ! time->hasTimeZone ) return;	// Do nothing if there is no current time zone.
+
+	XMP_Assert ( (0 <= time->tzHour) && (time->tzHour <= 23) );
+	XMP_Assert ( (0 <= time->tzMinute) && (time->tzMinute <= 59) );
+	XMP_Assert ( (-1 <= time->tzSign) && (time->tzSign <= +1) );
+	XMP_Assert ( (time->tzSign == 0) ? ((time->tzHour == 0) && (time->tzMinute == 0)) :
+									   ((time->tzHour != 0) || (time->tzMinute != 0)) );
+
+	ConvertToUTCTime ( time );	// The existing time zone might not be the local one.
+	time->hasTimeZone = false;	// ! Needed for SetTimeZone.
+	SetTimeZone ( time );		// Fill in the local timezone offset, then adjust the time.
+
+	if ( time->tzSign > 0 ) {
+		// We are before (east of) GMT, add the offset to the time.
+		time->hour += time->tzHour;
+		time->minute += time->tzMinute;
+	} else if ( time->tzSign < 0 ) {
+		// We are behind (west of) GMT, subtract the offset from the time.
+		time->hour -= time->tzHour;
+		time->minute -= time->tzMinute;
+	}
+
+	AdjustTimeOverflow ( time );
+
+}	// ConvertToLocalTime
+
+// -------------------------------------------------------------------------------------------------
+// CompareDateTime
+// ---------------
+
+/* class static */ int
+XMPUtils::CompareDateTime ( const XMP_DateTime & _in_left,
+							const XMP_DateTime & _in_right )
+{
+	int result = 0;
+
+	XMP_DateTime left  = _in_left;
+	XMP_DateTime right = _in_right;
+
+	VerifyDateTimeFlags ( &left );
+	VerifyDateTimeFlags ( &right );
+
+	// Can't compare if one has a date and the other does not.
+	if ( left.hasDate != right.hasDate ) return 0;	// Throw?
+
+	if ( left.hasTimeZone & right.hasTimeZone ) {
+		// If both times have zones then convert them to UTC, otherwise assume the same zone.
+		ConvertToUTCTime ( &left );
+		ConvertToUTCTime ( &right );
+	}
+
+	if ( left.hasDate ) {
+
+		XMP_Assert ( right.hasDate );
+
+		if ( left.year < right.year ) {
+			result = -1;
+		} else if ( left.year > right.year ) {
+			result = +1;
+		} else if ( left.month < right.month ) {
+			result = -1;
+		} else if ( left.month > right.month ) {
+			result = +1;
+		} else if ( left.day < right.day ) {
+			result = -1;
+		} else if ( left.day > right.day ) {
+			result = +1;
+		}
+
+		if ( result != 0 ) return result;
+
+	}
+
+	if ( left.hasTime & right.hasTime ) {
+
+		// Ignore the time parts if either value is date-only.
+
+		if ( left.hour < right.hour ) {
+			result = -1;
+		} else if ( left.hour > right.hour ) {
+			result = +1;
+		} else if ( left.minute < right.minute ) {
+			result = -1;
+		} else if ( left.minute > right.minute ) {
+			result = +1;
+		} else if ( left.second < right.second ) {
+			result = -1;
+		} else if ( left.second > right.second ) {
+			result = +1;
+		} else if ( left.nanoSecond < right.nanoSecond ) {
+			result = -1;
+		} else if ( left.nanoSecond > right.nanoSecond ) {
+			result = +1;
+		} else {
+			result = 0;
+		}
+
+	}
+
+	return result;
+
+}	// CompareDateTime
+
+// =================================================================================================
+
+std::string& XMPUtils::Trim( std::string& string )
+{
+	size_t pos = string.find_last_not_of( *WhiteSpaceStrPtr );
+
+	if ( pos != std::string::npos ) {
+		string.erase( pos + 1 );
+		pos = string.find_first_not_of( *WhiteSpaceStrPtr );
+		if(pos != std::string::npos) string.erase(0, pos);
+	} else {
+		string.erase( string.begin(), string.end() );
+	}
+	return string;
+}
+
+std::string * XMPUtils::WhiteSpaceStrPtr = NULL;
+
+// =================================================================================================
diff --git a/XMPCore/source/XMPUtils.hpp b/XMPCore/source/XMPUtils.hpp
new file mode 100644
index 0000000..f9cfce1
--- /dev/null
+++ b/XMPCore/source/XMPUtils.hpp
@@ -0,0 +1,198 @@
+#ifndef __XMPUtils_hpp__
+#define __XMPUtils_hpp__
+
+// =================================================================================================
+// Copyright 2003 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 "public/include/XMP_Environment.h"
+#include "public/include/XMP_Const.h"
+
+#include "XMPCore/source/XMPMeta.hpp"
+#include "XMPCore/source/XMPCore_Impl.hpp"
+#include "public/include/client-glue/WXMPUtils.hpp"
+
+// -------------------------------------------------------------------------------------------------
+
+class	XMPUtils {
+public:
+	
+	static bool
+	Initialize();	// ! For internal use only!
+	
+	static void
+	Terminate() RELEASE_NO_THROW;	// ! For internal use only!
+
+	// ---------------------------------------------------------------------------------------------
+
+	static void
+	ComposeArrayItemPath ( XMP_StringPtr   schemaNS,
+						   XMP_StringPtr   arrayName,
+						   XMP_Index	   itemIndex,
+						   XMP_VarString * fullPath );
+
+	static void
+	ComposeStructFieldPath ( XMP_StringPtr	 schemaNS,
+							 XMP_StringPtr	 structName,
+							 XMP_StringPtr	 fieldNS,
+							 XMP_StringPtr	 fieldName,
+							 XMP_VarString * fullPath );
+
+	static void
+	ComposeQualifierPath ( XMP_StringPtr   schemaNS,
+						   XMP_StringPtr   propName,
+						   XMP_StringPtr   qualNS,
+						   XMP_StringPtr   qualName,
+						   XMP_VarString * fullPath );
+
+	static void
+	ComposeLangSelector ( XMP_StringPtr	  schemaNS,
+						  XMP_StringPtr	  arrayName,
+						  XMP_StringPtr	  langName,
+						  XMP_VarString * fullPath );
+
+	static void
+	ComposeFieldSelector ( XMP_StringPtr   schemaNS,
+						   XMP_StringPtr   arrayName,
+						   XMP_StringPtr   fieldNS,
+						   XMP_StringPtr   fieldName,
+						   XMP_StringPtr   fieldValue,
+						   XMP_VarString * fullPath );
+
+	// ---------------------------------------------------------------------------------------------
+
+	static void
+	ConvertFromBool ( bool			  binValue,
+					  XMP_VarString * strValue );
+
+	static void
+	ConvertFromInt ( XMP_Int32		 binValue,
+					 XMP_StringPtr	 format,
+					 XMP_VarString * strValue );
+
+	static void
+	ConvertFromInt64 ( XMP_Int64	   binValue,
+					   XMP_StringPtr   format,
+					   XMP_VarString * strValue );
+
+	static void
+	ConvertFromFloat ( double		   binValue,
+					   XMP_StringPtr   format,
+					   XMP_VarString * strValue );
+
+	static void
+	ConvertFromDate ( const XMP_DateTime & binValue,
+					  XMP_VarString *	   strValue );
+
+	// ---------------------------------------------------------------------------------------------
+
+	static bool
+	ConvertToBool ( XMP_StringPtr strValue );
+
+	static XMP_Int32
+	ConvertToInt ( XMP_StringPtr strValue );
+
+	static XMP_Int64
+	ConvertToInt64 ( XMP_StringPtr strValue );
+
+	static double
+	ConvertToFloat ( XMP_StringPtr strValue );
+
+	static void
+	ConvertToDate  ( XMP_StringPtr	strValue,
+					 XMP_DateTime * binValue );
+
+	// ---------------------------------------------------------------------------------------------
+
+	static void
+	CurrentDateTime ( XMP_DateTime * time );
+
+	static void
+	SetTimeZone ( XMP_DateTime * time );
+
+	static void
+	ConvertToUTCTime ( XMP_DateTime * time );
+
+	static void
+	ConvertToLocalTime ( XMP_DateTime * time );
+
+	static int
+	CompareDateTime ( const XMP_DateTime & left,
+					  const XMP_DateTime & right );
+	// ---------------------------------------------------------------------------------------------
+
+	static void
+	EncodeToBase64 ( XMP_StringPtr	 rawStr,
+					 XMP_StringLen	 rawLen,
+					 XMP_VarString * encodedStr );
+
+	static void
+	DecodeFromBase64 ( XMP_StringPtr   encodedStr,
+					   XMP_StringLen   encodedLen,
+					   XMP_VarString * rawStr );
+
+	// ---------------------------------------------------------------------------------------------
+
+	static void
+	PackageForJPEG ( const XMPMeta & xmpObj,
+					 XMP_VarString * stdStr,
+					 XMP_VarString * extStr,
+					 XMP_VarString * digestStr );
+
+	static void
+	MergeFromJPEG ( XMPMeta *       fullXMP,
+                    const XMPMeta & extendedXMP );
+
+	// ---------------------------------------------------------------------------------------------
+
+	static void
+	CatenateArrayItems ( const XMPMeta & xmpObj,
+						 XMP_StringPtr	 schemaNS,
+						 XMP_StringPtr	 arrayName,
+						 XMP_StringPtr	 separator,
+						 XMP_StringPtr	 quotes,
+						 XMP_OptionBits	 options,
+						 XMP_VarString * catedStr );
+
+	static void
+	SeparateArrayItems ( XMPMeta *		xmpObj,
+						 XMP_StringPtr	schemaNS,
+						 XMP_StringPtr	arrayName,
+						 XMP_OptionBits options,
+						 XMP_StringPtr	catedStr );
+
+	static void
+	ApplyTemplate ( XMPMeta *	    workingXMP,
+					const XMPMeta & templateXMP,
+					XMP_OptionBits  actions );
+
+	static void
+	RemoveProperties ( XMPMeta *	  xmpObj,
+					   XMP_StringPtr  schemaNS,
+					   XMP_StringPtr  propName,
+					   XMP_OptionBits options );
+
+	static void
+	DuplicateSubtree ( const XMPMeta & source,
+					   XMPMeta *	   dest,
+					   XMP_StringPtr   sourceNS,
+					   XMP_StringPtr   sourceRoot,
+					   XMP_StringPtr   destNS,
+					   XMP_StringPtr   destRoot,
+					   XMP_OptionBits  options );
+
+	// ---------------------------------------------------------------------------------------------
+
+	static std::string& Trim(std::string& string);
+
+	static std::string * WhiteSpaceStrPtr;
+
+};	// XMPUtils
+
+// =================================================================================================
+
+#endif	// __XMPUtils_hpp__
diff --git a/XMPFiles/Makefile.am b/XMPFiles/Makefile.am
new file mode 100644
index 0000000..525e2e5
--- /dev/null
+++ b/XMPFiles/Makefile.am
@@ -0,0 +1,3 @@
+
+
+SUBDIRS=source
diff --git a/XMPFiles/Makefile.in b/XMPFiles/Makefile.in
new file mode 100644
index 0000000..6e7ee10
--- /dev/null
+++ b/XMPFiles/Makefile.in
@@ -0,0 +1,642 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFiles
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = source
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFiles/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFiles/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp
new file mode 100644
index 0000000..6331a0b
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp
@@ -0,0 +1,441 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FileHandlers/AIFF_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h"
+#include "XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h"
+#include "XMPFiles/source/NativeMetadataSupport/MetadataSet.h"
+#include "source/XIO.hpp"
+
+using namespace IFF_RIFF;
+
+// =================================================================================================
+/// \file AIFF_Handler.cpp
+/// \brief File format handler for AIFF.
+// =================================================================================================
+
+
+// =================================================================================================
+// AIFF_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * AIFF_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new AIFF_MetaHandler ( parent );
+}
+
+// =================================================================================================
+// AIFF_CheckFormat
+// ===============
+//
+// Checks if the given file is a valid AIFF or AIFC file.
+// The first 12 bytes are checked. The first 4 must be "FORM"
+// Bytes 8 to 12 must be "AIFF" or "AIFC"
+
+bool AIFF_CheckFormat ( XMP_FileFormat  format,
+					   XMP_StringPtr    filePath,
+			           XMP_IO*      file,
+			           XMPFiles*        parent )
+{
+	// Reset file pointer position
+	file ->Rewind();
+
+	XMP_Uns8 chunkID[12];
+	XMP_Int32 got = file->Read ( chunkID, 12 );
+
+	// Reset file pointer position
+	file ->Rewind();
+
+	// Need to have at least ID, size and Type of first chunk
+	if ( got < 12 )
+	{
+		return false;
+	}
+
+	const BigEndian& endian = BigEndian::getInstance();
+	if ( endian.getUns32(chunkID) != kChunk_FORM ) 
+	{
+		return false;
+	}
+
+	XMP_Uns32 type = AIFF_MetaHandler::whatAIFFFormat( &chunkID[8] );
+	if ( type == kType_AIFF || type == kType_AIFC ) 
+	{
+		return true;
+	}
+
+	return false;
+}	// AIFF_CheckFormat
+
+
+// =================================================================================================
+// AIFF_MetaHandler::whatAIFFFormat
+// ===============
+
+XMP_Uns32 AIFF_MetaHandler::whatAIFFFormat( XMP_Uns8* buffer )
+{
+	XMP_Uns32 type = 0;
+
+	const BigEndian& endian = BigEndian::getInstance();
+
+	if( buffer != 0 )
+	{
+		if( endian.getUns32( buffer ) == kType_AIFF )
+		{
+			type = kType_AIFF;
+		}
+		else if( endian.getUns32( buffer ) == kType_AIFC )
+		{
+			type = kType_AIFC;
+		}
+	}
+
+	return type;
+}	// whatAIFFFormat
+
+
+// Static inits
+
+// ChunkIdentifier
+// FORM:AIFF/APPL:XMP
+const ChunkIdentifier AIFF_MetaHandler::kAIFFXMP[2] = { { kChunk_FORM, kType_AIFF }, { kChunk_APPL, kType_XMP } };
+// FORM:AIFC/APPL:XMP
+const ChunkIdentifier AIFF_MetaHandler::kAIFCXMP[2] = { { kChunk_FORM, kType_AIFC }, { kChunk_APPL, kType_XMP } };
+// FORM:AIFF/NAME
+const ChunkIdentifier AIFF_MetaHandler::kAIFFName[2] = { { kChunk_FORM, kType_AIFF }, { kChunk_NAME, kType_NONE } };
+// FORM:AIFC/NAME
+const ChunkIdentifier AIFF_MetaHandler::kAIFCName[2] = { { kChunk_FORM, kType_AIFC }, { kChunk_NAME, kType_NONE } };
+// FORM:AIFF/AUTH
+const ChunkIdentifier AIFF_MetaHandler::kAIFFAuth[2] = { { kChunk_FORM, kType_AIFF }, { kChunk_AUTH, kType_NONE } };
+// FORM:AIFC/AUTH
+const ChunkIdentifier AIFF_MetaHandler::kAIFCAuth[2] = { { kChunk_FORM, kType_AIFC }, { kChunk_AUTH, kType_NONE } };
+// FORM:AIFF/(c)
+const ChunkIdentifier AIFF_MetaHandler::kAIFFCpr[2] = { { kChunk_FORM, kType_AIFF }, { kChunk_CPR, kType_NONE } };
+// FORM:AIFC/(c)
+const ChunkIdentifier AIFF_MetaHandler::kAIFCCpr[2] = { { kChunk_FORM, kType_AIFC }, { kChunk_CPR, kType_NONE } };
+// FORM:AIFF/ANNO
+const ChunkIdentifier AIFF_MetaHandler::kAIFFAnno[2] = { { kChunk_FORM, kType_AIFF }, { kChunk_ANNO, kType_NONE } };
+// FORM:AIFC/ANNO
+const ChunkIdentifier AIFF_MetaHandler::kAIFCAnno[2] = { { kChunk_FORM, kType_AIFC }, { kChunk_ANNO, kType_NONE } };
+
+// =================================================================================================
+// AIFF_MetaHandler::AIFF_MetaHandler
+// ================================
+
+AIFF_MetaHandler::AIFF_MetaHandler ( XMPFiles * _parent )
+	: mChunkController(NULL), mChunkBehavior(NULL),
+	mAiffMeta(), mXMPChunk(NULL),
+	mNameChunk(NULL), mAuthChunk(NULL),
+	mCprChunk(NULL), mAnnoChunk(NULL)
+{
+	this->parent = _parent;
+	this->handlerFlags = kAIFF_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	this->mChunkBehavior = new AIFFBehavior();
+	this->mChunkController = new ChunkController( mChunkBehavior, true );
+
+}	// AIFF_MetaHandler::AIFF_MetaHandler
+
+// =================================================================================================
+// AIFF_MetaHandler::~AIFF_MetaHandler
+// =================================
+
+AIFF_MetaHandler::~AIFF_MetaHandler()
+{
+	if( mChunkController != NULL )
+	{
+		delete mChunkController;
+	}
+
+	if( mChunkBehavior != NULL )
+	{
+		delete mChunkBehavior;
+	}
+}	// AIFF_MetaHandler::~AIFF_MetaHandler
+
+
+// =================================================================================================
+// AIFF_MetaHandler::CacheFileData
+// ==============================
+
+void AIFF_MetaHandler::CacheFileData()
+{
+	// Need to determine the file type, need the first 12 bytes of the file
+
+	// Reset file pointer position
+	this->parent->ioRef ->Rewind();
+
+	XMP_Uns8 buffer[12];
+	XMP_Int32 got = this->parent->ioRef->Read ( buffer, 12 );
+	XMP_Assert( got == 12 );
+	
+	XMP_Uns32 type = AIFF_MetaHandler::whatAIFFFormat( &buffer[8] );
+	XMP_Assert( type == kType_AIFF || type == kType_AIFC );
+
+	// Reset file pointer position
+	this->parent->ioRef ->Rewind();
+
+	// Add the relevant chunk paths for the determined AIFF format
+	if( type == kType_AIFF )
+	{
+		mAIFFXMPChunkPath.append( kAIFFXMP, SizeOfCIArray(kAIFFXMP) );
+		mAIFFNameChunkPath.append( kAIFFName, SizeOfCIArray(kAIFFName) );
+		mAIFFAuthChunkPath.append( kAIFFAuth, SizeOfCIArray(kAIFFAuth) );
+		mAIFFCprChunkPath.append( kAIFFCpr, SizeOfCIArray(kAIFFCpr) );
+		mAIFFAnnoChunkPath.append( kAIFFAnno, SizeOfCIArray(kAIFFAnno) );
+	}
+	else // kType_AIFC
+	{
+		mAIFFXMPChunkPath.append( kAIFCXMP, SizeOfCIArray(kAIFCXMP) );
+		mAIFFNameChunkPath.append( kAIFCName, SizeOfCIArray(kAIFCName) );
+		mAIFFAuthChunkPath.append( kAIFCAuth, SizeOfCIArray(kAIFCAuth) );
+		mAIFFCprChunkPath.append( kAIFCCpr, SizeOfCIArray(kAIFCCpr) );
+		mAIFFAnnoChunkPath.append( kAIFCAnno, SizeOfCIArray(kAIFCAnno) );
+	}
+
+	mChunkController->addChunkPath( mAIFFXMPChunkPath );
+	mChunkController->addChunkPath( mAIFFNameChunkPath );
+	mChunkController->addChunkPath( mAIFFAuthChunkPath );
+	mChunkController->addChunkPath( mAIFFCprChunkPath );
+	mChunkController->addChunkPath( mAIFFAnnoChunkPath );
+
+
+	// Parse the given file
+	// Throws exception if the file cannot be parsed
+	mChunkController->parseFile( this->parent->ioRef, &this->parent->openFlags );
+
+	// Check if the file contains XMP (last one if there are multiple chunks)
+	mXMPChunk = mChunkController->getChunk( mAIFFXMPChunkPath, true );
+	
+	// Retrieve XMP packet info
+	if( mXMPChunk != NULL )
+	{
+		// subtract the type size that is contained in the XMP data chunk
+		this->packetInfo.length = static_cast<XMP_Int32>(mXMPChunk->getSize() - 4);
+		this->packetInfo.charForm  = kXMP_Char8Bit;
+		this->packetInfo.writeable = true;
+
+		// Get actual the XMP packet without the 4byte type
+		this->xmpPacket.assign ( mXMPChunk->getString( this->packetInfo.length, 4 ) );
+
+		// set state
+		this->containsXMP = true;
+	}
+} // AIFF_MetaHandler::CacheFileData
+
+
+// =================================================================================================
+// AIFF_MetaHandler::ProcessXMP
+// ============================
+
+void AIFF_MetaHandler::ProcessXMP()
+{
+	// Must be done only once
+	if ( this->processedXMP )
+	{
+		return;
+	}
+	// Set the status at start, in case something goes wrong in this method
+	this->processedXMP = true;
+
+	// Parse the XMP
+	if ( ! this->xmpPacket.empty() ) {
+
+		XMP_Assert ( this->containsXMP );
+
+		FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+
+		this->containsXMP = true;
+	}
+
+	// Then import native properties
+	MetadataSet metaSet;
+	AIFFReconcile recon;
+
+	// Fill the AIFF metadata object with values
+	
+	// Get NAME (title) legacy chunk
+	mNameChunk = mChunkController->getChunk( mAIFFNameChunkPath, true );
+	if( mNameChunk != NULL )
+	{
+		mAiffMeta.setValue<std::string>( AIFFMetadata::kName, mNameChunk->getString() );
+	}
+	// Get AUTH (author) legacy chunk
+	mAuthChunk = mChunkController->getChunk( mAIFFAuthChunkPath, true );
+	if( mAuthChunk != NULL )
+	{
+		mAiffMeta.setValue<std::string>( AIFFMetadata::kAuthor, mAuthChunk->getString() );
+	}
+	// Get CPR (Copyright) legacy chunk
+	mCprChunk = mChunkController->getChunk( mAIFFCprChunkPath, true );
+	if( mCprChunk != NULL )
+	{
+		mAiffMeta.setValue<std::string>( AIFFMetadata::kCopyright, mCprChunk->getString() );
+	}
+	// Get ANNO (annotation) legacy chunk(s)
+	// Get the list of Annotation chunks and pick the last one not being empty
+	const std::vector<IChunkData*> &annoChunks = mChunkController->getChunks( mAIFFAnnoChunkPath );
+
+	mAnnoChunk = selectLastNonEmptyAnnoChunk( annoChunks );
+	if( mAnnoChunk != NULL )
+	{
+		mAiffMeta.setValue<std::string>( AIFFMetadata::kAnnotation, mAnnoChunk->getString() );
+	}
+
+	// Only interested in AIFF metadata
+	metaSet.append( &mAiffMeta );
+	// Do the import
+	if( recon.importToXMP( this->xmpObj, metaSet ) )
+	{
+		// Remember if anything has changed
+		this->containsXMP = true;
+	}
+
+} // AIFF_MetaHandler::ProcessXMP
+
+
+IChunkData* AIFF_MetaHandler::selectLastNonEmptyAnnoChunk( const std::vector<IChunkData*> &annoChunks )
+{
+	IChunkData* annoChunk = NULL;
+	for ( std::vector<IChunkData*>::const_reverse_iterator iter = annoChunks.rbegin(); iter != annoChunks.rend(); iter++ )
+	{
+		if( ! (*iter)->getString().empty() && (*iter)->getString()[0] != '\0' )
+		{
+			annoChunk = *iter;
+			break;
+		}
+	}
+	return annoChunk;
+} // selectFirstNonEmptyAnnoChunk
+
+
+// =================================================================================================
+// AIFF_MetaHandler::UpdateFile
+// ===========================
+
+void AIFF_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) {	// If needsUpdate is set then at least the XMP changed.
+		return;
+	}
+
+	if ( doSafeUpdate )
+	{
+		XMP_Throw ( "AIFF_MetaHandler::UpdateFile: Safe update not supported", kXMPErr_Unavailable );
+	}
+
+	//update/create XMP chunk
+	if( this->containsXMP )
+	{
+		this->xmpObj.SerializeToBuffer ( &(this->xmpPacket) );
+
+		if( mXMPChunk != NULL )
+		{
+			mXMPChunk->setData( reinterpret_cast<const XMP_Uns8 *>(this->xmpPacket.c_str()), this->xmpPacket.length(), true );
+		}
+		else // create XMP chunk
+		{
+			mXMPChunk = mChunkController->createChunk( kChunk_APPL, kType_XMP );
+			mXMPChunk->setData( reinterpret_cast<const XMP_Uns8 *>(this->xmpPacket.c_str()), this->xmpPacket.length(), true );
+			mChunkController->insertChunk( mXMPChunk );
+		}
+	}
+	// XMP Packet is never completely removed from the file.
+
+	// Export XMP to legacy chunks. Create/delete them if necessary
+	MetadataSet metaSet;
+	AIFFReconcile recon;
+
+	metaSet.append( &mAiffMeta );
+
+	// If anything changes, update/create/delete the legacy chunks
+	if( recon.exportFromXMP( metaSet, this->xmpObj ) )
+	{
+		updateLegacyChunk( &mNameChunk, kChunk_NAME, AIFFMetadata::kName );
+		updateLegacyChunk( &mAuthChunk, kChunk_AUTH, AIFFMetadata::kAuthor );
+		updateLegacyChunk( &mCprChunk, kChunk_CPR, AIFFMetadata::kCopyright );
+		updateLegacyChunk( &mAnnoChunk, kChunk_ANNO, AIFFMetadata::kAnnotation );
+	}
+	
+	XMP_ProgressTracker* progressTracker=this->parent->progressTracker;
+	// local progess tracking required because  for Handlers incapable of 
+	// kXMPFiles_CanRewrite XMPFiles call this Update method after making
+	// a copy of the orignal file
+	bool localProgressTracking=false;
+	if ( progressTracker != 0 )
+	{
+		if ( ! progressTracker->WorkInProgress() ) 
+		{
+			localProgressTracking = true;
+			progressTracker->BeginWork ();
+		}
+	}
+	//write tree back to file
+	mChunkController->writeFile( this->parent->ioRef ,progressTracker);
+	if ( localProgressTracking && progressTracker != 0 ) progressTracker->WorkComplete();
+
+	this->needsUpdate = false;	// Make sure this is only called once.
+}	// AIFF_MetaHandler::UpdateFile
+
+
+void AIFF_MetaHandler::updateLegacyChunk( IChunkData **chunk, XMP_Uns32 chunkID, XMP_Uns32 legacyId )
+{
+	// If there is a legacy value, update/create the appropriate chunk
+	if( mAiffMeta.valueExists( legacyId ) )
+	{
+		std::string chunkValue;
+		std::string legacyValue = mAiffMeta.getValue<std::string>( legacyId );
+
+		// If the length is < 4 we need to fill up the value with \0 to a size of 4
+		// This ensures that the overall size of text chunks is 12 bytes so that they can be
+		// converted to free chunks if necessary
+		if( legacyValue.length() < 4 )
+		{
+			char buffer[4];
+			memset( buffer, 0, 4 );
+			memcpy( buffer, legacyValue.c_str(), legacyValue.length() );
+			chunkValue.assign( buffer, 4 );
+		}
+		else // take the value as is
+		{
+			chunkValue = legacyValue;
+		}
+
+		if( *chunk != NULL )
+		{
+			(*chunk)->setData( reinterpret_cast<const XMP_Uns8 *>(chunkValue.c_str()), chunkValue.length() );
+		}
+		else
+		{
+			*chunk = mChunkController->createChunk( chunkID, kType_NONE );
+			(*chunk)->setData( reinterpret_cast<const XMP_Uns8 *>(chunkValue.c_str()), chunkValue.length() );
+			mChunkController->insertChunk( *chunk );
+		}
+	}
+	else //delete chunk if existing
+	{
+		mChunkController->removeChunk ( *chunk );
+	}
+}	// updateLegacyChunk
+
+
+// =================================================================================================
+// AIFF_MetaHandler::WriteTempFile
+// ===============================
+
+void AIFF_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_Throw ( "AIFF_MetaHandler::WriteTempFile is not Implemented!", kXMPErr_Unimplemented );
+}	// AIFF_MetaHandler::WriteTempFile
diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.hpp b/XMPFiles/source/FileHandlers/AIFF_Handler.hpp
new file mode 100644
index 0000000..1ccb6a9
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/AIFF_Handler.hpp
@@ -0,0 +1,159 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 __AIFF_Handler_hpp__
+#define __AIFF_Handler_hpp__	1
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/IFF/ChunkController.h"
+#include "XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/IChunkData.h"
+#include "source/Endian.h"
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+using namespace IFF_RIFF;
+
+// =================================================================================================
+/// \file AIFF_Handler.hpp
+/// \brief File format handler for AIFF.
+// =================================================================================================
+
+/**
+ * Contructor for the handler.
+ */
+extern XMPFileHandler * AIFF_MetaHandlerCTor ( XMPFiles * parent );
+
+/**
+ * Checks the format of the file, see common code.
+ */
+extern bool AIFF_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+			                  XMP_IO*    fileRef,
+			                  XMPFiles *     parent );
+
+/** AIFF does not need kXMPFiles_CanRewrite as we can always use UpdateFile to either do
+ *  in-place update or append to the file. */
+static const XMP_OptionBits kAIFF_HandlerFlags = (kXMPFiles_CanInjectXMP |
+												  kXMPFiles_CanExpand |
+												  kXMPFiles_PrefersInPlace |
+												  kXMPFiles_CanReconcile |
+												  kXMPFiles_AllowsSafeUpdate |
+												  kXMPFiles_CanNotifyProgress
+												 );
+
+/**
+ * Main class for the the AIFF file handler.
+ */
+class AIFF_MetaHandler : public XMPFileHandler
+{
+public:
+	AIFF_MetaHandler ( XMPFiles* parent );
+	~AIFF_MetaHandler();
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	/**
+	* Checks if the first 4 bytes of the given buffer are either type AIFF or AIFC
+	* @param buffer a byte buffer that must contain at least 4 bytes and point to the correct byte
+	* @return Either kType_AIFF, kType_AIFC 0 if no type could be determined
+	*/
+	static XMP_Uns32 whatAIFFFormat( XMP_Uns8* buffer );
+
+private:
+	/**
+	 * Updates/creates/deletes a given legacy chunk depending on the given new legacy value
+	 * If the Chunk exists and the value is not empty, it is updated. If the value is empty the
+	 * Chunk is removed from the tree. If the Chunk does not exist but a value is given, it is created
+	 * and initialized with that value
+	 *
+	 * @param chunk OUT pointer to the legacy chunk
+	 * @param chunkID Id of the Chunk if it needs to be created
+	 * @param legacyId ID of the legacy value
+	 */
+	void updateLegacyChunk( IChunkData **chunk, XMP_Uns32 chunkID, XMP_Uns32 legacyId );
+
+	/**
+	 * Finds the last non-empty annotation chunk in the given list
+	 * @param annoChunks list of annotation chunks
+	 * @return pointer to the first non-empty chunk or NULL
+	 */
+	IChunkData* selectLastNonEmptyAnnoChunk( const std::vector<IChunkData*> &annoChunks );
+
+	/** private standard Ctor, not to be used */
+	AIFF_MetaHandler (): mChunkController(NULL), mChunkBehavior(NULL),
+						mAiffMeta(), mXMPChunk(NULL),
+						mNameChunk(NULL), mAuthChunk(NULL),
+						mCprChunk(NULL), mAnnoChunk(NULL) {};
+
+
+	// ----- MEMBERS ----- //
+
+	/** Controls the parsing and writing of the passed stream. */
+	ChunkController *mChunkController;
+	/** Represents the rules how chunks are added, removed or rearranged */
+	IChunkBehavior *mChunkBehavior;
+	/** container for Legacy metadata */
+	AIFFMetadata mAiffMeta;
+
+	/** pointer to the XMP chunk */
+	IChunkData *mXMPChunk;
+	/** pointer to legacy chunks */
+	IChunkData *mNameChunk;
+	IChunkData *mAuthChunk;
+	IChunkData *mCprChunk;
+	IChunkData *mAnnoChunk;
+
+	/** Type of the file, either AIFF or AIFC */
+	//XMP_Uns32 mFileType;
+
+
+	// ----- CONSTANTS ----- //
+
+	/** Chunk path identifier of interest in AIFF/AIFC */
+	static const ChunkIdentifier kAIFFXMP[2];
+	static const ChunkIdentifier kAIFCXMP[2];
+	static const ChunkIdentifier kAIFFName[2];
+	static const ChunkIdentifier kAIFCName[2];
+	static const ChunkIdentifier kAIFFAuth[2];
+	static const ChunkIdentifier kAIFCAuth[2];
+	static const ChunkIdentifier kAIFFCpr[2];
+	static const ChunkIdentifier kAIFCCpr[2];
+	static const ChunkIdentifier kAIFFAnno[2];
+	static const ChunkIdentifier kAIFCAnno[2];
+
+	/** Path to XMP chunk */
+	ChunkPath mAIFFXMPChunkPath;
+
+	/** Path to NAME chunk */
+	ChunkPath mAIFFNameChunkPath;
+
+	/** Path to AUTH chunk */
+	ChunkPath mAIFFAuthChunkPath;
+
+	/** Path to COPYRIGHT chunk */
+	ChunkPath mAIFFCprChunkPath;
+
+	/** Path to ANNOTATION chunk */
+	ChunkPath mAIFFAnnoChunkPath;
+
+};	// AIFF_MetaHandler
+
+// =================================================================================================
+
+#endif /* __AIFF_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/ASF_Handler.cpp b/XMPFiles/source/FileHandlers/ASF_Handler.cpp
new file mode 100644
index 0000000..14bf225
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/ASF_Handler.cpp
@@ -0,0 +1,355 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/ASF_Handler.hpp"
+
+// =================================================================================================
+/// \file ASF_Handler.hpp
+/// \brief File format handler for ASF.
+///
+/// This handler ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// ASF_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * ASF_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new ASF_MetaHandler ( parent );
+
+}	// ASF_MetaHandlerCTor
+
+// =================================================================================================
+// ASF_CheckFormat
+// ===============
+
+bool ASF_CheckFormat ( XMP_FileFormat format,
+					   XMP_StringPtr  filePath,
+                       XMP_IO*    fileRef,
+                       XMPFiles *     parent )
+{
+
+	IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_WMAVFile );
+
+	if ( fileRef->Length() < guidLen ) return false;
+	GUID guid;
+
+	fileRef->Rewind();
+	fileRef->Read ( &guid, guidLen );
+	if ( ! IsEqualGUID ( ASF_Header_Object, guid ) ) return false;
+
+	return true;
+
+}	// ASF_CheckFormat
+
+// =================================================================================================
+// ASF_MetaHandler::ASF_MetaHandler
+// ==================================
+
+ASF_MetaHandler::ASF_MetaHandler ( XMPFiles * _parent )
+{
+	this->parent = _parent;
+	this->handlerFlags = kASF_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}
+
+// =================================================================================================
+// ASF_MetaHandler::~ASF_MetaHandler
+// ===================================
+
+ASF_MetaHandler::~ASF_MetaHandler()
+{
+	// Nothing extra to do.
+}
+
+// =================================================================================================
+// ASF_MetaHandler::CacheFileData
+// ===============================
+
+void ASF_MetaHandler::CacheFileData()
+{
+
+	this->containsXMP = false;
+
+	XMP_IO* fileRef ( this->parent->ioRef );
+	if ( fileRef == 0 ) return;
+
+	ASF_Support support ( &this->legacyManager,0 );
+	ASF_Support::ObjectState objectState;
+	long numTags = support.OpenASF ( fileRef, objectState );
+	if ( numTags == 0 ) return;
+
+	if ( objectState.xmpLen != 0 ) {
+
+		// XMP present
+
+		XMP_Int32 len = XMP_Int32 ( objectState.xmpLen );
+
+		this->xmpPacket.reserve( len );
+		this->xmpPacket.assign ( len, ' ' );
+
+		bool found = ASF_Support::ReadBuffer ( fileRef, objectState.xmpPos, objectState.xmpLen,
+											   const_cast<char *>(this->xmpPacket.data()) );
+		if ( found ) {
+			this->packetInfo.offset = objectState.xmpPos;
+			this->packetInfo.length = len;
+			this->containsXMP = true;
+		}
+
+	}
+
+}	// ASF_MetaHandler::CacheFileData
+
+// =================================================================================================
+// ASF_MetaHandler::ProcessXMP
+// ============================
+//
+// Process the raw XMP and legacy metadata that was previously cached.
+
+void ASF_MetaHandler::ProcessXMP()
+{
+
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	// Process the XMP packet.
+
+	if ( this->xmpPacket.empty() ) {
+
+		// import legacy in any case, when no XMP present
+		legacyManager.ImportLegacy ( &this->xmpObj );
+		this->legacyManager.SetDigest ( &this->xmpObj );
+
+	} else {
+
+		XMP_Assert ( this->containsXMP );
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen)this->xmpPacket.size();
+
+		this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+
+		if ( ! legacyManager.CheckDigest ( this->xmpObj ) ) {
+			legacyManager.ImportLegacy ( &this->xmpObj );
+		}
+
+	}
+
+	// Assume we now have something in the XMP.
+	this->containsXMP = true;
+
+}	// ASF_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// ASF_MetaHandler::UpdateFile
+// ============================
+
+void ASF_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+
+	bool updated = false;
+
+	if ( ! this->needsUpdate ) return;
+
+	XMP_IO* fileRef ( this->parent->ioRef );
+	if ( fileRef == 0 ) return;
+
+	ASF_Support support(0,this->parent->progressTracker);
+	ASF_Support::ObjectState objectState;
+	long numTags = support.OpenASF ( fileRef, objectState );
+	if ( numTags == 0 ) return;
+
+	XMP_StringLen packetLen = (XMP_StringLen)xmpPacket.size();
+
+	this->legacyManager.ExportLegacy ( this->xmpObj );
+	if ( this->legacyManager.hasLegacyChanged() ) {
+
+		this->legacyManager.SetDigest ( &this->xmpObj );
+
+		// serialize with updated digest
+		if ( objectState.xmpLen == 0 ) {
+
+			// XMP does not exist, use standard padding
+			this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+
+		} else {
+
+			// re-use padding with static XMP size
+			try {
+				XMP_OptionBits compactExact = (kXMP_UseCompactFormat | kXMP_ExactPacketLength);
+				this->xmpObj.SerializeToBuffer ( &this->xmpPacket, compactExact, XMP_StringLen(objectState.xmpLen) );
+			} catch ( ... ) {
+				// re-use padding with exact packet length failed (legacy-digest needed too much space): try again using standard padding
+				this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+			}
+
+		}
+
+	}
+
+	XMP_StringPtr packetStr = xmpPacket.c_str();
+	packetLen = (XMP_StringLen)xmpPacket.size();
+	if ( packetLen == 0 ) return;
+
+	// value, when guessing for sufficient legacy padding (line-ending conversion etc.)
+	const int paddingTolerance = 50;
+
+	bool xmpGrows = ( objectState.xmpLen && (packetLen > objectState.xmpLen) && ( ! objectState.xmpIsLastObject) );
+
+	bool legacyGrows = ( this->legacyManager.hasLegacyChanged() &&
+						 (this->legacyManager.getLegacyDiff() > (this->legacyManager.GetPadding() - paddingTolerance)) );
+
+	if ( doSafeUpdate || legacyGrows || xmpGrows ) {
+
+		// do a safe update in any case
+		updated = SafeWriteFile();
+
+	} else {
+
+		// possibly we can do an in-place update
+
+		if ( objectState.xmpLen < packetLen ) {
+
+			updated = SafeWriteFile();
+
+		} else {
+			
+			XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+			if ( progressTracker != 0 ) progressTracker->BeginWork ( (float)packetLen );
+			
+			// current XMP chunk size is sufficient -> write (in place update)
+			updated = ASF_Support::WriteBuffer(fileRef, objectState.xmpPos, packetLen, packetStr );
+
+			// legacy update
+			if ( updated && this->legacyManager.hasLegacyChanged() ) {
+
+				ASF_Support::ObjectIterator curPos = objectState.objects.begin();
+				ASF_Support::ObjectIterator endPos = objectState.objects.end();
+
+				for ( ; curPos != endPos; ++curPos ) {
+
+					ASF_Support::ObjectData object = *curPos;
+
+					// find header-object
+					if ( IsEqualGUID ( ASF_Header_Object, object.guid ) ) {
+						// update header object
+						updated = support.UpdateHeaderObject ( fileRef, object, legacyManager );
+					}
+
+				}
+
+			}
+
+			if ( progressTracker != 0  ) progressTracker->WorkComplete();
+		}
+
+	}
+
+	if ( ! updated ) return;	// If there's an error writing the chunk, bail.
+
+	this->needsUpdate = false;
+
+}	// ASF_MetaHandler::UpdateFile
+
+// =================================================================================================
+// ASF_MetaHandler::WriteTempFile
+// ==============================
+
+void ASF_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	bool ok;
+	XMP_IO* originalRef = this->parent->ioRef;
+
+	ASF_Support support(0,this->parent->progressTracker);
+	ASF_Support::ObjectState objectState;
+	long numTags = support.OpenASF ( originalRef, objectState );
+	if ( numTags == 0 ) return;
+
+	tempRef->Truncate ( 0 );
+
+	ASF_Support::ObjectIterator curPos = objectState.objects.begin();
+	ASF_Support::ObjectIterator endPos = objectState.objects.end();
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+	if ( progressTracker != 0 ) {
+		float nonheadersize = (float)(xmpPacket.size()+kASF_ObjectBaseLen+8);
+		bool legacyChange=this->legacyManager.hasLegacyChanged( );
+		for ( ; curPos != endPos; ++curPos ) {
+			if (curPos->xmp) continue;
+			//header objects are taken care of in ASF_Support::WriteHeaderObject
+			if ( ! ( IsEqualGUID ( ASF_Header_Object, curPos->guid) && legacyChange ) ) {
+				nonheadersize+=(curPos->len);
+			}
+		}
+		curPos = objectState.objects.begin();
+		endPos = objectState.objects.end();
+		progressTracker->BeginWork ( nonheadersize );
+	}
+	for ( ; curPos != endPos; ++curPos ) {
+
+		ASF_Support::ObjectData object = *curPos;
+
+		// discard existing XMP object
+		if ( object.xmp ) continue;
+
+		// update header-object, when legacy needs update
+		if ( IsEqualGUID ( ASF_Header_Object, object.guid) && this->legacyManager.hasLegacyChanged( ) ) {
+			// rewrite header object
+			ok = support.WriteHeaderObject ( originalRef, tempRef, object, this->legacyManager, false );
+			if ( ! ok ) XMP_Throw ( "Failure writing ASF header object", kXMPErr_InternalFailure );
+		} else {
+			// copy any other object
+			ok = ASF_Support::CopyObject ( originalRef, tempRef, object );
+			if ( ! ok ) XMP_Throw ( "Failure copyinh ASF object", kXMPErr_InternalFailure );
+		}
+
+		// write XMP object immediately after the (one and only) top-level DataObject
+		if ( IsEqualGUID ( ASF_Data_Object, object.guid ) ) {
+			XMP_StringPtr packetStr = xmpPacket.c_str();
+			XMP_StringLen packetLen = (XMP_StringLen)xmpPacket.size();
+			ok = ASF_Support::WriteXMPObject ( tempRef, packetLen, packetStr );
+			if ( ! ok ) XMP_Throw ( "Failure writing ASF XMP object", kXMPErr_InternalFailure );
+		}
+
+	}
+
+	ok = support.UpdateFileSize ( tempRef );
+	if ( ! ok ) XMP_Throw ( "Failure updating ASF file size", kXMPErr_InternalFailure );
+	if ( progressTracker != 0  ) progressTracker->WorkComplete();
+
+}	// ASF_MetaHandler::WriteTempFile
+
+// =================================================================================================
+// ASF_MetaHandler::SafeWriteFile
+// ==============================
+
+bool ASF_MetaHandler::SafeWriteFile()
+{
+	XMP_IO* originalFile = this->parent->ioRef;
+	XMP_IO* tempFile = originalFile->DeriveTemp();
+	if ( tempFile == 0 ) XMP_Throw ( "Failure creating ASF temp file", kXMPErr_InternalFailure );
+
+	this->WriteTempFile ( tempFile );
+	originalFile->AbsorbTemp();
+
+	return true;
+
+} // ASF_MetaHandler::SafeWriteFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/ASF_Handler.hpp b/XMPFiles/source/FileHandlers/ASF_Handler.hpp
new file mode 100644
index 0000000..f8b883e
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/ASF_Handler.hpp
@@ -0,0 +1,65 @@
+#ifndef __ASF_Handler_hpp__
+#define __ASF_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/ASF_Support.hpp"
+
+// =================================================================================================
+/// \file ASF_Handler.hpp
+/// \brief File format handler for ASF.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// *** Could derive from Basic_Handler - buffer file tail in a temp file.
+
+extern XMPFileHandler* ASF_MetaHandlerCTor ( XMPFiles* parent );
+
+extern bool ASF_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+                              XMP_IO*    fileRef,
+                              XMPFiles *     parent );
+
+static const XMP_OptionBits kASF_HandlerFlags = ( kXMPFiles_CanInjectXMP |
+												  kXMPFiles_CanExpand |
+												  kXMPFiles_PrefersInPlace |
+                                                  kXMPFiles_CanReconcile |
+												  kXMPFiles_AllowsOnlyXMP |
+												  kXMPFiles_ReturnsRawPacket |
+												  kXMPFiles_NeedsReadOnlyPacket |
+												  kXMPFiles_CanNotifyProgress );
+
+class ASF_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	bool SafeWriteFile ();
+
+	ASF_MetaHandler ( XMPFiles* parent );
+	virtual ~ASF_MetaHandler();
+
+private:
+
+	ASF_LegacyManager legacyManager;
+
+};	// ASF_MetaHandler
+
+// =================================================================================================
+
+#endif /* __ASF_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp
new file mode 100644
index 0000000..95d4f1b
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp
@@ -0,0 +1,2424 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+#include "source/IOUtils.hpp"
+
+#include "XMPFiles/source/FileHandlers/AVCHD_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/PackageFormat_Support.hpp"
+
+#include "source/UnicodeConversions.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+
+using namespace std;
+
+// AVCHD maker ID values. Panasonic has confirmed their Maker ID with us, the others come from examining
+// sample data files.
+#define kMakerIDPanasonic 0x103
+#define kMakerIDSony 0x108
+#define kMakerIDCanon 0x1011
+
+// =================================================================================================
+/// \file AVCHD_Handler.cpp
+/// \brief Folder format handler for AVCHD.
+///
+/// This handler is for the AVCHD video format.
+///
+/// A typical AVCHD layout looks like:
+///
+///     BDMV/
+///         index.bdmv
+///         MovieObject.bdmv
+///         PLAYLIST/
+///				00000.mpls
+///             00001.mpls
+///         STREAM/
+///				00000.m2ts
+///             00001.m2ts
+///         CLIPINF/
+///				00000.clpi
+///             00001.clpi
+///         BACKUP/
+///
+// =================================================================================================
+
+// =================================================================================================
+
+// AVCHD Format. Book 1: Playback System Basic Specifications V 1.01. p. 76
+
+struct AVCHD_blkProgramInfo
+{
+	XMP_Uns32	mLength;
+	XMP_Uns8	mReserved1[2];
+	XMP_Uns32	mSPNProgramSequenceStart;
+	XMP_Uns16	mProgramMapPID;
+	XMP_Uns8	mNumberOfStreamsInPS;
+	XMP_Uns8	mReserved2;
+
+	// Video stream.
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mVideoFormat;
+		XMP_Uns8	mFrameRate;
+		XMP_Uns8	mAspectRatio;
+		XMP_Uns8	mCCFlag;
+	} mVideoStream;
+
+	// Audio stream.
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mAudioPresentationType;
+		XMP_Uns8	mSamplingFrequency;
+		XMP_Uns8	mAudioLanguageCode[4];
+	} mAudioStream;
+
+	// Pverlay bitmap stream.
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mOBLanguageCode[4];
+	} mOverlayBitmapStream;
+
+	// Menu bitmap stream.
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mBMLanguageCode[4];
+	} mMenuBitmapStream;
+
+};
+
+// AVCHD Format, Panasonic proprietary PRO_PlayListMark block
+
+struct AVCCAM_blkProPlayListMark
+{
+	XMP_Uns8	mPresent;
+	XMP_Uns8	mProTagID;
+	XMP_Uns8	mFillItem1;
+	XMP_Uns16	mLength;
+	XMP_Uns8	mMarkType;
+
+	// Entry mark
+	struct
+	{
+		XMP_Uns8	mGlobalClipID[32];
+		XMP_Uns8	mStartTimeCode[4];
+		XMP_Uns8	mStreamTimecodeInfo;
+		XMP_Uns8	mStartBinaryGroup[4];
+		XMP_Uns8	mLastUpdateTimeZone;
+		XMP_Uns8	mLastUpdateDate[7];
+		XMP_Uns16	mFillItem;
+	} mEntryMark;
+
+	// Shot Mark
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mShotMark;
+		XMP_Uns8	mFillItem[3];
+	} mShotMark;
+
+	// Access
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mCreatorCharacterSet;
+		XMP_Uns8	mCreatorLength;
+		XMP_Uns8	mCreator[32];
+		XMP_Uns8	mLastUpdatePersonCharacterSet;
+		XMP_Uns8	mLastUpdatePersonLength;
+		XMP_Uns8	mLastUpdatePerson[32];
+	} mAccess;
+
+	// Device
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns16	mMakerID;
+		XMP_Uns16	mMakerModelCode;
+		XMP_Uns8	mSerialNoCharacterCode;
+		XMP_Uns8	mSerialNoLength;
+		XMP_Uns8	mSerialNo[24];
+		XMP_Uns16	mFillItem;
+	} mDevice;
+
+	// Shoot
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mShooterCharacterSet;
+		XMP_Uns8	mShooterLength;
+		XMP_Uns8	mShooter[32];
+		XMP_Uns8	mStartDateTimeZone;
+		XMP_Uns8	mStartDate[7];
+		XMP_Uns8	mEndDateTimeZone;
+		XMP_Uns8	mEndDate[7];
+		XMP_Uns16	mFillItem;
+	} mShoot;
+
+	// Location
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mSource;
+		XMP_Uns32	mGPSLatitudeRef;
+		XMP_Uns32	mGPSLatitude1;
+		XMP_Uns32	mGPSLatitude2;
+		XMP_Uns32	mGPSLatitude3;
+		XMP_Uns32	mGPSLongitudeRef;
+		XMP_Uns32	mGPSLongitude1;
+		XMP_Uns32	mGPSLongitude2;
+		XMP_Uns32	mGPSLongitude3;
+		XMP_Uns32	mGPSAltitudeRef;
+		XMP_Uns32	mGPSAltitude;
+		XMP_Uns8	mPlaceNameCharacterSet;
+		XMP_Uns8	mPlaceNameLength;
+		XMP_Uns8	mPlaceName[64];
+		XMP_Uns8	mFillItem;
+	} mLocation;
+};
+
+// AVCHD Format, Panasonic proprietary extension data (AVCCAM)
+
+struct AVCCAM_Pro_PlayListInfo
+{
+	XMP_Uns8					mPresent;
+	XMP_Uns8					mTagID;
+	XMP_Uns8					mTagVersion;
+	XMP_Uns16					mFillItem1;
+	XMP_Uns32					mLength;
+	XMP_Uns16					mNumberOfPlayListMarks;
+	XMP_Uns16					mFillItem2;
+
+	// Although a playlist may contain multiple marks, we only store the one that corresponds to
+	// the clip/shot of interest.
+	AVCCAM_blkProPlayListMark	mPlayListMark;
+};
+
+// AVCHD Format, Panasonic proprietary extension data (AVCCAM)
+
+struct AVCHD_blkPanasonicPrivateData
+{
+	XMP_Uns8					mPresent;
+	XMP_Uns16					mNumberOfData;
+	XMP_Uns16					mReserved;
+
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mTagID;
+		XMP_Uns8	mTagVersion;
+		XMP_Uns16	mTagLength;
+		XMP_Uns8	mProfessionalMetaID[16];
+	} mProMetaIDBlock;
+
+	struct
+	{
+		XMP_Uns8	mPresent;
+		XMP_Uns8	mTagID;
+		XMP_Uns8	mTagVersion;
+		XMP_Uns16	mTagLength;
+		XMP_Uns8	mGlobalClipID[32];
+		XMP_Uns8	mStartTimecode[4];
+		XMP_Uns32	mStartBinaryGroup;
+	} mProClipIDBlock;
+
+	AVCCAM_Pro_PlayListInfo		mProPlaylistInfoBlock;
+};
+
+// AVCHD Format. Book 2: Recording Extension Specifications, section 4.2.4.2. plus Panasonic extensions
+
+struct AVCHD_blkMakersPrivateData
+{
+	XMP_Uns8						mPresent;
+	XMP_Uns32						mLength;
+	XMP_Uns32						mDataBlockStartAddress;
+	XMP_Uns8						mReserved[3];
+	XMP_Uns8						mNumberOfMakerEntries;
+	XMP_Uns16						mMakerID;
+	XMP_Uns16						mMakerModelCode;
+	AVCHD_blkPanasonicPrivateData	mPanasonicPrivateData;
+};
+
+// AVCHD Format. Book 2: Recording Extension Specifications, section 4.4.2.1
+
+struct AVCHD_blkClipInfoExt
+{
+	XMP_Uns32	mLength;
+	XMP_Uns16	mMakerID;
+	XMP_Uns16	mMakerModelCode;
+};
+
+// AVCHD Format. Book 2: Recording Extension Specifications, section 4.4.1.2
+
+struct AVCHD_blkClipExtensionData
+{
+	XMP_Uns8					mPresent;
+	XMP_Uns8					mTypeIndicator[4];
+	XMP_Uns8					mReserved1[4];
+	XMP_Uns32					mProgramInfoExtStartAddress;
+	XMP_Uns32					mMakersPrivateDataStartAddress;
+
+	AVCHD_blkClipInfoExt		mClipInfoExt;
+	AVCHD_blkMakersPrivateData	mMakersPrivateData;
+};
+
+// AVCHD Format. Book 2: Recording Extension Specifications, section 4.3.3.1 -- although each playlist
+// may contain a list of these, we only record the one that matches our target shot/clip.
+
+struct AVCHD_blkPlayListMarkExt
+{
+	XMP_Uns32	mLength;
+	XMP_Uns16	mNumberOfPlaylistMarks;
+	bool		mPresent;
+	XMP_Uns16	mMakerID;
+	XMP_Uns16	mMakerModelCode;
+	XMP_Uns8	mReserved1[3];
+	XMP_Uns8	mFlags;			// bit 0: MarkWriteProtectFlag, bits 1-2: pulldown
+	XMP_Uns16	mRefToMarkThumbnailIndex;
+	XMP_Uns8	mBlkTimezone;
+	XMP_Uns8	mRecordDataAndTime[7];
+	XMP_Uns8	mMarkCharacterSet;
+	XMP_Uns8	mMarkNameLength;
+	XMP_Uns8	mMarkName[24];
+	XMP_Uns8	mMakersInformation[16];
+	XMP_Uns8	mBlkTimecode[4];
+	XMP_Uns16	mReserved2;
+};
+
+// AVCHD Format. Book 2: Recording Extension Specifications, section 4.3.2.1
+
+struct AVCHD_blkPlaylistMeta
+{
+	XMP_Uns32	mLength;
+	XMP_Uns16	mMakerID;
+	XMP_Uns16	mMakerModelCode;
+	XMP_Uns32	mReserved1;
+	XMP_Uns16	mRefToMenuThumbnailIndex;
+	XMP_Uns8	mBlkTimezone;
+	XMP_Uns8	mRecordDataAndTime[7];
+	XMP_Uns8	mReserved2;
+	XMP_Uns8	mPlaylistCharacterSet;
+	XMP_Uns8	mPlaylistNameLength;
+	XMP_Uns8	mPlaylistName[255];
+};
+
+// AVCHD Format. Book 2: Recording Extension Specifications, section 4.3.1.2
+
+struct AVCHD_blkPlayListExtensionData
+{
+	XMP_Uns8					mPresent;
+	char						mTypeIndicator[4];
+	XMP_Uns8					mReserved[4];
+	XMP_Uns32					mPlayListMarkExtStartAddress;
+	XMP_Uns32					mMakersPrivateDataStartAddress;
+
+	AVCHD_blkPlaylistMeta		mPlaylistMeta;
+	AVCHD_blkPlayListMarkExt	mPlaylistMarkExt;
+	AVCHD_blkMakersPrivateData	mMakersPrivateData;
+};
+
+// AVCHD Format. Book 1: Playback System Basic Specifications V 1.01. p. 38
+struct AVCHD_blkExtensionData
+{
+	XMP_Uns32	mLength;
+	XMP_Uns32	mDataBlockStartAddress;
+	XMP_Uns8	mReserved[3];
+	XMP_Uns8	mNumberOfDataEntries;
+
+	struct AVCHD_blkExtDataEntry
+	{
+		XMP_Uns16	mExtDataType;
+		XMP_Uns16	mExtDataVersion;
+		XMP_Uns32	mExtDataStartAddress;
+		XMP_Uns32	mExtDataLength;
+	} mExtDataEntry;
+};
+
+// Simple container for the various AVCHD legacy metadata structures we care about for an AVCHD clip
+
+struct AVCHD_LegacyMetadata
+{
+	AVCHD_blkProgramInfo			mProgramInfo;
+	AVCHD_blkClipExtensionData		mClipExtensionData;
+	AVCHD_blkPlayListExtensionData	mPlaylistExtensionData;
+};
+
+// =================================================================================================
+// MakeLeafPath
+// ============
+
+static bool MakeLeafPath ( std::string * path, XMP_StringPtr root, XMP_StringPtr group,
+						   XMP_StringPtr clip, XMP_StringPtr suffix, bool checkFile = false )
+{
+	size_t partialLen;
+
+	*path = root;
+	*path += kDirChar;
+	*path += "BDMV";
+	*path += kDirChar;
+	*path += group;
+	*path += kDirChar;
+	*path += clip;
+	partialLen = path->size();
+	*path += suffix;
+
+	if ( ! checkFile ) return true;
+	if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+	// Convert the suffix to uppercase and try again. Even on Mac/Win, in case a remote file system is sensitive.
+	for ( char* chPtr = ((char*)path->c_str() + partialLen); *chPtr != 0; ++chPtr ) {
+		if ( (0x61 <= *chPtr) && (*chPtr <= 0x7A) ) *chPtr -= 0x20;
+	}
+	if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+	if ( XMP_LitMatch ( suffix, ".clpi" ) ) {	// Special case of ".cpi" for the clip file.
+
+		path->erase ( partialLen );
+		*path += ".cpi";
+		if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+		path->erase ( partialLen );
+		*path += ".CPI";
+		if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+	} else if ( XMP_LitMatch ( suffix, ".mpls" ) ) {	// Special case of ".mpl" for the playlist file.
+
+		path->erase ( partialLen );
+		*path += ".mpl";
+		if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+		path->erase ( partialLen );
+		*path += ".MPL";
+		if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+	} else if ( XMP_LitMatch ( suffix, ".m2ts" ) ) {	// Special case of ".mts" for the stream file.
+
+		path->erase ( partialLen );
+		*path += ".mts";
+		if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+		path->erase ( partialLen );
+		*path += ".MTS";
+		if ( Host_IO::GetFileMode ( path->c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+	}
+
+	// Still not found, revert to the original suffix.
+	path->erase ( partialLen );
+	*path += suffix;
+	return false;
+
+}	// MakeLeafPath
+
+// =================================================================================================
+// AVCHD_CheckFormat
+// =================
+//
+// This version checks for the presence of a top level BPAV directory, and the required files and
+// directories immediately within it. The CLIPINF, PLAYLIST, and STREAM subfolders are required, as
+// are the index.bdmv and MovieObject.bdmv files.
+//
+// The state of the string parameters depends on the form of the path passed by the client. If the
+// client passed a logical clip path, like ".../MyMovie/00001", the parameters are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - empty
+//   parentName - empty
+//   leafName   - "00001"
+// If the client passed a full file path, like ".../MyMovie/BDMV/CLIPINF/00001.clpi", they are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - "BDMV"
+//   parentName - "CLIPINF" or "PALYLIST" or "STREAM"
+//   leafName   - "00001"
+
+// ! The common code has shifted the gpName, parentName, and leafName strings to upper case. It has
+// ! also made sure that for a logical clip path the rootPath is an existing folder, and that the
+// ! file exists for a full file path.
+
+// ! Using explicit '/' as a separator when creating paths, it works on Windows.
+
+// ! Sample files show that the ".bdmv" extension can sometimes be ".bdm". Allow either.
+
+bool AVCHD_CheckFormat ( XMP_FileFormat format,
+						 const std::string & rootPath,
+						 const std::string & gpName,
+						 const std::string & parentName,
+						 const std::string & leafName,
+						 XMPFiles * parent )
+{
+	if ( gpName.empty() != parentName.empty() ) return false;	// Must be both empty or both non-empty.
+
+	if ( ! gpName.empty() ) {
+		if ( gpName != "BDMV" ) return false;
+		if ( (parentName != "CLIPINF") && (parentName != "PLAYLIST") && (parentName != "STREAM") ) return false;
+	}
+
+	// Check the rest of the required general structure. Look for both ".bdmv" and ".bmd" extensions.
+
+	std::string bdmvPath ( rootPath );
+	bdmvPath += kDirChar;
+	bdmvPath += "BDMV";
+
+	if ( Host_IO::GetChildMode ( bdmvPath.c_str(), "CLIPINF" ) != Host_IO::kFMode_IsFolder ) return false;
+	if ( Host_IO::GetChildMode ( bdmvPath.c_str(), "PLAYLIST" ) != Host_IO::kFMode_IsFolder ) return false;
+	if ( Host_IO::GetChildMode ( bdmvPath.c_str(), "STREAM" ) != Host_IO::kFMode_IsFolder ) return false;
+
+	if ( (Host_IO::GetChildMode ( bdmvPath.c_str(), "index.bdmv" ) != Host_IO::kFMode_IsFile) &&
+		 (Host_IO::GetChildMode ( bdmvPath.c_str(), "index.bdm" ) != Host_IO::kFMode_IsFile) &&
+		 (Host_IO::GetChildMode ( bdmvPath.c_str(), "INDEX.BDMV" ) != Host_IO::kFMode_IsFile) &&	// Some usage is all caps.
+		 (Host_IO::GetChildMode ( bdmvPath.c_str(), "INDEX.BDM" ) != Host_IO::kFMode_IsFile) ) return false;
+
+	if ( (Host_IO::GetChildMode ( bdmvPath.c_str(), "MovieObject.bdmv" ) != Host_IO::kFMode_IsFile) &&
+		 (Host_IO::GetChildMode ( bdmvPath.c_str(), "MovieObj.bdm" ) != Host_IO::kFMode_IsFile) &&
+		 (Host_IO::GetChildMode ( bdmvPath.c_str(), "MOVIEOBJECT.BDMV" ) != Host_IO::kFMode_IsFile) &&	// Some usage is all caps.
+		 (Host_IO::GetChildMode ( bdmvPath.c_str(), "MOVIEOBJ.BDM" ) != Host_IO::kFMode_IsFile) ) return false;
+
+
+	// Make sure the .clpi file exists.
+	std::string tempPath;
+	bool foundClpi = MakeLeafPath ( &tempPath, rootPath.c_str(), "CLIPINF", leafName.c_str(), ".clpi", true /* checkFile */ );
+	if ( ! foundClpi ) return false;
+
+	// And now save the pseudo path for the handler object.
+	tempPath = rootPath;
+	tempPath += kDirChar;
+	tempPath += leafName;
+	size_t pathLen = tempPath.size() + 1;	// Include a terminating nul.
+	parent->tempPtr = malloc ( pathLen );
+	if ( parent->tempPtr == 0 ) XMP_Throw ( "No memory for AVCHD clip info", kXMPErr_NoMemory );
+	memcpy ( parent->tempPtr, tempPath.c_str(), pathLen );
+
+	return true;
+
+}	// AVCHD_CheckFormat
+
+// =================================================================================================
+
+static void* CreatePseudoClipPath ( const std::string & clientPath ) {
+
+	// Used to create the clip pseudo path when the CheckFormat function is skipped.
+	
+	std::string pseudoPath = clientPath;
+
+	size_t pathLen;
+	void* tempPtr = 0;
+	
+	if ( Host_IO::Exists ( pseudoPath.c_str() ) ) {
+	
+		// The client passed a physical path. The logical clip name is the leaf name, with the
+		// extension removed. There are no extra suffixes on AVCHD files. The movie root path ends
+		// two levels up.
+		
+		std::string clipName, ignored;
+		
+		XIO::SplitLeafName ( &pseudoPath, &clipName );	// Extract the logical clip name.
+		XIO::SplitFileExtension ( &clipName, &ignored );
+
+		XIO::SplitLeafName ( &pseudoPath, &ignored );	// Remove the 2 intermediate folder levels.
+		XIO::SplitLeafName ( &pseudoPath, &ignored );
+		
+		pseudoPath += kDirChar;
+		pseudoPath += clipName;
+	
+	}
+
+	pathLen = pseudoPath.size() + 1;	// Include a terminating nul.
+	tempPtr = malloc ( pathLen );
+	if ( tempPtr == 0 ) XMP_Throw ( "No memory for AVCHD clip info", kXMPErr_NoMemory );
+	memcpy ( tempPtr, pseudoPath.c_str(), pathLen );
+	
+	return tempPtr;
+
+}	// CreatePseudoClipPath
+
+// =================================================================================================
+// ReadAVCHDProgramInfo
+// ====================
+
+static bool ReadAVCHDProgramInfo ( XMPFiles_IO & cpiFile, AVCHD_blkProgramInfo& avchdProgramInfo )
+{
+	avchdProgramInfo.mLength = XIO::ReadUns32_BE ( &cpiFile );
+	cpiFile.ReadAll ( avchdProgramInfo.mReserved1, 2 );
+	avchdProgramInfo.mSPNProgramSequenceStart = XIO::ReadUns32_BE ( &cpiFile );
+	avchdProgramInfo.mProgramMapPID = XIO::ReadUns16_BE ( &cpiFile );
+	cpiFile.ReadAll ( &avchdProgramInfo.mNumberOfStreamsInPS, 1 );
+	cpiFile.ReadAll ( &avchdProgramInfo.mReserved2, 1 );
+
+	XMP_Uns16 streamPID = 0;
+	for ( int i=0; i<avchdProgramInfo.mNumberOfStreamsInPS; ++i ) {
+
+		XMP_Uns8	length = 0;
+		XMP_Uns8	streamCodingType = 0;
+
+		streamPID = XIO::ReadUns16_BE ( &cpiFile );
+		cpiFile.ReadAll ( &length, 1 );
+
+		XMP_Int64 pos = cpiFile.Offset();
+
+		cpiFile.ReadAll ( &streamCodingType, 1 );
+
+		switch ( streamCodingType ) {
+
+			case 0x1B	: // Video stream case.
+				{
+					XMP_Uns8 videoFormatAndFrameRate;
+					cpiFile.ReadAll ( &videoFormatAndFrameRate, 1 );
+					avchdProgramInfo.mVideoStream.mVideoFormat	= videoFormatAndFrameRate >> 4;    // hi 4 bits
+					avchdProgramInfo.mVideoStream.mFrameRate	= videoFormatAndFrameRate & 0x0f;  // lo 4 bits
+
+					XMP_Uns8 aspectRatioAndReserved = 0;
+					cpiFile.ReadAll ( &aspectRatioAndReserved, 1 );
+					avchdProgramInfo.mVideoStream.mAspectRatio	 = aspectRatioAndReserved >> 4; // hi 4 bits
+
+					XMP_Uns8 ccFlag = 0;
+					cpiFile.ReadAll ( &ccFlag, 1 );
+					avchdProgramInfo.mVideoStream.mCCFlag = ccFlag;
+
+					avchdProgramInfo.mVideoStream.mPresent = 1;
+				}
+				break;
+
+			case 0x80   : // Fall through.
+			case 0x81	: // Audio stream case.
+				{
+					XMP_Uns8 audioPresentationTypeAndFrequency = 0;
+					cpiFile.ReadAll ( &audioPresentationTypeAndFrequency, 1 );
+
+					avchdProgramInfo.mAudioStream.mAudioPresentationType = audioPresentationTypeAndFrequency >> 4;    // hi 4 bits
+					avchdProgramInfo.mAudioStream.mSamplingFrequency	 = audioPresentationTypeAndFrequency & 0x0f;  // lo 4 bits
+
+					cpiFile.ReadAll ( avchdProgramInfo.mAudioStream.mAudioLanguageCode, 3 );
+					avchdProgramInfo.mAudioStream.mAudioLanguageCode[3] = 0;
+
+					avchdProgramInfo.mAudioStream.mPresent = 1;
+				}
+				break;
+
+			case 0x90	: // Overlay bitmap stream case.
+				cpiFile.ReadAll ( &avchdProgramInfo.mOverlayBitmapStream.mOBLanguageCode, 3 );
+				avchdProgramInfo.mOverlayBitmapStream.mOBLanguageCode[3] = 0;
+				avchdProgramInfo.mOverlayBitmapStream.mPresent = 1;
+				break;
+
+			case 0x91   : // Menu bitmap stream.
+				cpiFile.ReadAll ( &avchdProgramInfo.mMenuBitmapStream.mBMLanguageCode, 3 );
+				avchdProgramInfo.mMenuBitmapStream.mBMLanguageCode[3] = 0;
+				avchdProgramInfo.mMenuBitmapStream.mPresent = 1;
+				break;
+
+			default :
+				break;
+
+		}
+
+		cpiFile.Seek ( pos + length, kXMP_SeekFromStart );
+
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCHDExtensionData
+// ======================
+
+static bool ReadAVCHDExtensionData ( XMPFiles_IO & cpiFile, AVCHD_blkExtensionData& extensionDataHeader )
+{
+	extensionDataHeader.mLength = XIO::ReadUns32_BE ( &cpiFile );
+
+	if ( extensionDataHeader.mLength == 0 ) {
+		// Nothing to read
+		return true;
+	}
+
+	extensionDataHeader.mDataBlockStartAddress = XIO::ReadUns32_BE ( &cpiFile );
+	cpiFile.ReadAll ( extensionDataHeader.mReserved, 3 );
+	cpiFile.ReadAll ( &extensionDataHeader.mNumberOfDataEntries, 1 );
+
+	if ( extensionDataHeader.mNumberOfDataEntries != 1 ) {
+		// According to AVCHD Format. Book1. v. 1.01. p 38, "This field shall be set to 1 in this format."
+		return false;
+	}
+
+	extensionDataHeader.mExtDataEntry.mExtDataType = XIO::ReadUns16_BE ( &cpiFile );
+	extensionDataHeader.mExtDataEntry.mExtDataVersion = XIO::ReadUns16_BE ( &cpiFile );
+	extensionDataHeader.mExtDataEntry.mExtDataStartAddress = XIO::ReadUns32_BE ( &cpiFile );
+	extensionDataHeader.mExtDataEntry.mExtDataLength = XIO::ReadUns32_BE ( &cpiFile );
+
+	if ( extensionDataHeader.mExtDataEntry.mExtDataType != 0x1000 ) {
+		// According to AVCHD Format. Book1. v. 1.01. p 38, "If the metadata is for an AVCHD application,
+		// this value shall be set to 'Ox1OOO'."
+		return false;
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAMProMetaID
+// ===================
+//
+// Read Panasonic's proprietary PRO_MetaID block
+
+static bool ReadAVCCAMProMetaID ( XMPFiles_IO & cpiFile, XMP_Uns8 tagID, AVCHD_blkPanasonicPrivateData& extensionDataHeader )
+{
+	extensionDataHeader.mPresent = 1;
+	extensionDataHeader.mProMetaIDBlock.mPresent = 1;
+	extensionDataHeader.mProMetaIDBlock.mTagID = tagID;
+	cpiFile.ReadAll ( &extensionDataHeader.mProMetaIDBlock.mTagVersion, 1);
+	extensionDataHeader.mProMetaIDBlock.mTagLength = XIO::ReadUns16_BE ( &cpiFile );
+	cpiFile.ReadAll ( &extensionDataHeader.mProMetaIDBlock.mProfessionalMetaID, 16);
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAMProClipInfo
+// =====================
+//
+// Read Panasonic's proprietary PRO_ClipInfo block.
+
+static bool ReadAVCCAMProClipInfo ( XMPFiles_IO & cpiFile, XMP_Uns8 tagID, AVCHD_blkPanasonicPrivateData& extensionDataHeader )
+{
+	extensionDataHeader.mPresent = 1;
+	extensionDataHeader.mProClipIDBlock.mPresent = 1;
+	extensionDataHeader.mProClipIDBlock.mTagID = tagID;
+	cpiFile.ReadAll ( &extensionDataHeader.mProClipIDBlock.mTagVersion, 1);
+	extensionDataHeader.mProClipIDBlock.mTagLength = XIO::ReadUns16_BE ( &cpiFile );
+	cpiFile.ReadAll ( &extensionDataHeader.mProClipIDBlock.mGlobalClipID, 32);
+	cpiFile.ReadAll ( &extensionDataHeader.mProClipIDBlock.mStartTimecode, 4 );
+	extensionDataHeader.mProClipIDBlock.mStartBinaryGroup = XIO::ReadUns32_BE ( &cpiFile );
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAM_blkPRO_ShotMark
+// ==========================
+//
+// Read Panasonic's proprietary PRO_ShotMark block.
+
+static bool ReadAVCCAM_blkPRO_ShotMark ( XMPFiles_IO & mplFile, AVCCAM_blkProPlayListMark& proMark )
+{
+	proMark.mShotMark.mPresent = 1;
+	mplFile.ReadAll ( &proMark.mShotMark.mShotMark, 1);
+	mplFile.ReadAll ( &proMark.mShotMark.mFillItem, 3);
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAM_blkPRO_Access
+// ========================
+//
+// Read Panasonic's proprietary PRO_Access block.
+
+static bool ReadAVCCAM_blkPRO_Access ( XMPFiles_IO & mplFile, AVCCAM_blkProPlayListMark& proMark )
+{
+	proMark.mAccess.mPresent = 1;
+	mplFile.ReadAll ( &proMark.mAccess.mCreatorCharacterSet, 1 );
+	mplFile.ReadAll ( &proMark.mAccess.mCreatorLength, 1 );
+	mplFile.ReadAll ( &proMark.mAccess.mCreator, 32 );
+	mplFile.ReadAll ( &proMark.mAccess.mLastUpdatePersonCharacterSet, 1 );
+	mplFile.ReadAll ( &proMark.mAccess.mLastUpdatePersonLength, 1 );
+	mplFile.ReadAll ( &proMark.mAccess.mLastUpdatePerson, 32 );
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAM_blkPRO_Device
+// ========================
+//
+// Read Panasonic's proprietary PRO_Device block.
+
+static bool ReadAVCCAM_blkPRO_Device ( XMPFiles_IO & mplFile, AVCCAM_blkProPlayListMark& proMark )
+{
+	proMark.mDevice.mPresent = 1;
+	proMark.mDevice.mMakerID = XIO::ReadUns16_BE ( &mplFile );
+	proMark.mDevice.mMakerModelCode = XIO::ReadUns16_BE ( &mplFile );
+	mplFile.ReadAll ( &proMark.mDevice.mSerialNoCharacterCode, 1 );
+	mplFile.ReadAll ( &proMark.mDevice.mSerialNoLength, 1 );
+	mplFile.ReadAll ( &proMark.mDevice.mSerialNo, 24 );
+	mplFile.ReadAll ( &proMark.mDevice.mFillItem, 2 );
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAM_blkPRO_Shoot
+// =======================
+//
+// Read Panasonic's proprietary PRO_Shoot block.
+
+static bool ReadAVCCAM_blkPRO_Shoot ( XMPFiles_IO & mplFile, AVCCAM_blkProPlayListMark& proMark )
+{
+	proMark.mShoot.mPresent = 1;
+	mplFile.ReadAll ( &proMark.mShoot.mShooterCharacterSet, 1 );
+	mplFile.ReadAll ( &proMark.mShoot.mShooterLength, 1 );
+	mplFile.ReadAll ( &proMark.mShoot.mShooter, 32 );
+	mplFile.ReadAll ( &proMark.mShoot.mStartDateTimeZone, 1 );
+	mplFile.ReadAll ( &proMark.mShoot.mStartDate, 7 );
+	mplFile.ReadAll ( &proMark.mShoot.mEndDateTimeZone, 1 );
+	mplFile.ReadAll ( &proMark.mShoot.mEndDate, 7 );
+	mplFile.ReadAll ( &proMark.mShoot.mFillItem, 2 );
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAM_blkPRO_Location
+// ==========================
+//
+// Read Panasonic's proprietary PRO_Location block.
+
+static bool ReadAVCCAM_blkPRO_Location ( XMPFiles_IO & mplFile, AVCCAM_blkProPlayListMark& proMark )
+{
+	proMark.mLocation.mPresent = 1;
+	mplFile.ReadAll ( &proMark.mLocation.mSource, 1 );
+	proMark.mLocation.mGPSLatitudeRef = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSLatitude1 = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSLatitude2 = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSLatitude3 = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSLongitudeRef = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSLongitude1 = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSLongitude2 = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSLongitude3 = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSAltitudeRef = XIO::ReadUns32_BE ( &mplFile );
+	proMark.mLocation.mGPSAltitude = XIO::ReadUns32_BE ( &mplFile );
+	mplFile.ReadAll ( &proMark.mLocation.mPlaceNameCharacterSet, 1 );
+	mplFile.ReadAll ( &proMark.mLocation.mPlaceNameLength, 1 );
+	mplFile.ReadAll ( &proMark.mLocation.mPlaceName, 64 );
+	mplFile.ReadAll ( &proMark.mLocation.mFillItem, 1 );
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAMProPlaylistInfo
+// =========================
+//
+// Read Panasonic's proprietary PRO_PlayListInfo block.
+
+static bool ReadAVCCAMProPlaylistInfo ( XMPFiles_IO & mplFile,
+										XMP_Uns8 tagID,
+										XMP_Uns16 playlistMarkID,
+										AVCHD_blkPanasonicPrivateData& extensionDataHeader )
+{
+	AVCCAM_Pro_PlayListInfo& playlistBlock = extensionDataHeader.mProPlaylistInfoBlock;
+
+	playlistBlock.mTagID = tagID;
+	mplFile.ReadAll ( &playlistBlock.mTagVersion, 1);
+	mplFile.ReadAll ( &playlistBlock.mFillItem1, 2);
+	playlistBlock.mLength = XIO::ReadUns32_BE ( &mplFile );
+	playlistBlock.mNumberOfPlayListMarks = XIO::ReadUns16_BE ( &mplFile );
+	mplFile.ReadAll ( &playlistBlock.mFillItem2, 2);
+
+	if ( playlistBlock.mNumberOfPlayListMarks == 0 ) return true;
+
+	extensionDataHeader.mPresent = 1;
+
+	XMP_Uns64 blockStart = 0;
+
+	for ( int i = 0; i < playlistBlock.mNumberOfPlayListMarks; ++i ) {
+		AVCCAM_blkProPlayListMark& currMark = playlistBlock.mPlayListMark;
+
+		mplFile.ReadAll ( &currMark.mProTagID, 1);
+		mplFile.ReadAll ( &currMark.mFillItem1, 1);
+		currMark.mLength = XIO::ReadUns16_BE ( &mplFile );
+		blockStart = mplFile.Offset();
+		mplFile.ReadAll ( &currMark.mMarkType, 1 );
+
+		if ( ( currMark.mProTagID == 0x40 ) && ( currMark.mMarkType == 0x01 ) ) {
+			mplFile.ReadAll ( &currMark.mEntryMark.mGlobalClipID, 32);
+
+			// skip marks for different clips
+			if ( i == playlistMarkID ) {
+				playlistBlock.mPresent = 1;
+				currMark.mPresent = 1;
+				mplFile.ReadAll ( &currMark.mEntryMark.mStartTimeCode, 4);
+				mplFile.ReadAll ( &currMark.mEntryMark.mStreamTimecodeInfo, 1);
+				mplFile.ReadAll ( &currMark.mEntryMark.mStartBinaryGroup, 4);
+				mplFile.ReadAll ( &currMark.mEntryMark.mLastUpdateTimeZone, 1);
+				mplFile.ReadAll ( &currMark.mEntryMark.mLastUpdateDate, 7);
+				mplFile.ReadAll ( &currMark.mEntryMark.mFillItem, 2);
+
+				XMP_Uns64 currPos = mplFile.Offset();
+				XMP_Uns8 blockTag = 0;
+				XMP_Uns8 blockFill;
+				XMP_Uns16 blockLength = 0;
+
+				while ( currPos < ( blockStart + currMark.mLength ) ) {
+					mplFile.ReadAll ( &blockTag, 1);
+					mplFile.ReadAll ( &blockFill, 1);
+					blockLength = XIO::ReadUns16_BE ( &mplFile );
+					currPos += 4;
+
+					switch ( blockTag ) {
+						case 0x20:
+							if ( ! ReadAVCCAM_blkPRO_ShotMark ( mplFile, currMark ) ) return false;
+							break;
+
+
+						case 0x21:
+							if ( ! ReadAVCCAM_blkPRO_Access ( mplFile, currMark ) ) return false;
+							break;
+
+						case 0x22:
+							if ( ! ReadAVCCAM_blkPRO_Device ( mplFile, currMark ) ) return false;
+							break;
+
+						case 0x23:
+							if ( ! ReadAVCCAM_blkPRO_Shoot ( mplFile, currMark ) ) return false;
+							break;
+
+						case 0x24:
+							if (! ReadAVCCAM_blkPRO_Location ( mplFile, currMark ) ) return false;
+							break;
+
+						default : break;
+					}
+
+					currPos += blockLength;
+					mplFile.Seek ( currPos, kXMP_SeekFromStart );
+				}
+			}
+		}
+
+		mplFile.Seek ( blockStart + currMark.mLength, kXMP_SeekFromStart );
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCCAMMakersPrivateData
+// ===========================
+//
+// Read Panasonic's implementation of an AVCCAM "Maker's Private Data" block. Panasonic calls their
+// extensions "AVCCAM."
+
+static bool ReadAVCCAMMakersPrivateData ( XMPFiles_IO & fileRef,
+										  XMP_Uns16 playlistMarkID,
+										  AVCHD_blkPanasonicPrivateData& avccamPrivateData )
+{
+	const XMP_Uns64 blockStart = fileRef.Offset();
+
+	avccamPrivateData.mNumberOfData = XIO::ReadUns16_BE ( &fileRef );
+	fileRef.ReadAll ( &avccamPrivateData.mReserved, 2 );
+
+	for (int i = 0; i < avccamPrivateData.mNumberOfData; ++i) {
+		const XMP_Uns8 tagID = XIO::ReadUns8 ( &fileRef );
+
+		switch ( tagID ) {
+			case 0xe0:	ReadAVCCAMProMetaID ( fileRef, tagID, avccamPrivateData );
+				break;
+			case 0xe2:	ReadAVCCAMProClipInfo( fileRef, tagID, avccamPrivateData );
+				break;
+			case 0xf0:	ReadAVCCAMProPlaylistInfo( fileRef, tagID, playlistMarkID, avccamPrivateData );
+				break;
+
+			default:
+				// Ignore any blocks we don't now or care about
+				break;
+		}
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCHDMakersPrivateData
+// ==========================
+//
+// AVCHD Format. Book 2: Recording Extension Specifications, section 4.2.4.2.
+
+static bool ReadAVCHDMakersPrivateData ( XMPFiles_IO & mplFile,
+										 XMP_Uns16 playlistMarkID,
+										 AVCHD_blkMakersPrivateData& avchdLegacyData )
+{
+	const XMP_Uns64 blockStart = mplFile.Offset();
+
+	avchdLegacyData.mLength = XIO::ReadUns32_BE ( &mplFile );
+
+	if ( avchdLegacyData.mLength == 0 ) return false;
+
+	avchdLegacyData.mPresent = 1;
+	avchdLegacyData.mDataBlockStartAddress = XIO::ReadUns32_BE ( &mplFile );
+	mplFile.ReadAll ( &avchdLegacyData.mReserved, 3 );
+	mplFile.ReadAll ( &avchdLegacyData.mNumberOfMakerEntries, 1 );
+
+	if ( avchdLegacyData.mNumberOfMakerEntries == 0 ) return true;
+
+	XMP_Uns16 makerID;
+	XMP_Uns16 makerModelCode;
+	XMP_Uns32 mpdStartAddress;
+	XMP_Uns32 mpdLength;
+
+	for ( int i = 0; i < avchdLegacyData.mNumberOfMakerEntries; ++i ) {
+		makerID = XIO::ReadUns16_BE ( &mplFile );
+		makerModelCode = XIO::ReadUns16_BE ( &mplFile );
+		mpdStartAddress = XIO::ReadUns32_BE ( &mplFile );
+		mpdLength = XIO::ReadUns32_BE ( &mplFile );
+
+		// We only have documentation for Panasonic's Maker's Private Data blocks, so we'll ignore everyone else's
+		if ( makerID == kMakerIDPanasonic ) {
+			avchdLegacyData.mMakerID = makerID;
+			avchdLegacyData.mMakerModelCode = makerModelCode;
+			mplFile.Seek ( blockStart + mpdStartAddress, kXMP_SeekFromStart );
+
+			if (! ReadAVCCAMMakersPrivateData ( mplFile, playlistMarkID, avchdLegacyData.mPanasonicPrivateData ) ) return false;
+		}
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCHDClipExtensionData
+// ==========================
+
+static bool ReadAVCHDClipExtensionData ( XMPFiles_IO & cpiFile, AVCHD_blkClipExtensionData& avchdExtensionData )
+{
+	const XMP_Int64 extensionBlockStart = cpiFile.Offset();
+	AVCHD_blkExtensionData extensionDataHeader;
+
+	if ( ! ReadAVCHDExtensionData ( cpiFile, extensionDataHeader ) ) {
+		 return false;
+	}
+
+	if ( extensionDataHeader.mLength == 0 ) {
+		return true;
+	}
+
+	const XMP_Int64 dataBlockStart = extensionBlockStart + extensionDataHeader.mDataBlockStartAddress;
+
+	cpiFile.Seek ( dataBlockStart, kXMP_SeekFromStart );
+	cpiFile.ReadAll ( avchdExtensionData.mTypeIndicator, 4 );
+
+	if ( strncmp ( reinterpret_cast<const char*>( avchdExtensionData.mTypeIndicator ), "CLEX", 4 ) != 0 ) return false;
+
+	avchdExtensionData.mPresent = 1;
+	cpiFile.ReadAll ( avchdExtensionData.mReserved1, 4 );
+	avchdExtensionData.mProgramInfoExtStartAddress = XIO::ReadUns32_BE ( &cpiFile );
+	avchdExtensionData.mMakersPrivateDataStartAddress = XIO::ReadUns32_BE ( &cpiFile );
+
+	// read Clip info extension
+	cpiFile.Seek ( dataBlockStart + 40, kXMP_SeekFromStart );
+	avchdExtensionData.mClipInfoExt.mLength = XIO::ReadUns32_BE ( &cpiFile );
+	avchdExtensionData.mClipInfoExt.mMakerID = XIO::ReadUns16_BE ( &cpiFile );
+	avchdExtensionData.mClipInfoExt.mMakerModelCode = XIO::ReadUns16_BE ( &cpiFile );
+
+	if ( avchdExtensionData.mMakersPrivateDataStartAddress == 0 )  return true;
+
+	if ( avchdExtensionData.mClipInfoExt.mMakerID == kMakerIDPanasonic ) {
+		// Read Maker's Private Data block -- we only have Panasonic's definition for their AVCCAM models
+		// at this point, so we'll ignore the block if its from a different manufacturer.
+		cpiFile.Seek ( dataBlockStart + avchdExtensionData.mMakersPrivateDataStartAddress, kXMP_SeekFromStart );
+
+		if ( ! ReadAVCHDMakersPrivateData ( cpiFile, 0, avchdExtensionData.mMakersPrivateData ) ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// AVCHD_PlaylistContainsClip
+// ==========================
+//
+// Returns true of the specified AVCHD playlist block references the specified clip, or false if not.
+
+static bool AVCHD_PlaylistContainsClip ( XMPFiles_IO & mplFile, XMP_Uns16& playItemID, const std::string& strClipName )
+{
+	// Read clip header. ( AVCHD Format. Book1. v. 1.01. p 45 )
+	struct AVCHD_blkPlayList
+	{
+		XMP_Uns32	mLength;
+		XMP_Uns16	mReserved;
+		XMP_Uns16	mNumberOfPlayItems;
+		XMP_Uns16	mNumberOfSubPaths;
+	};
+
+	AVCHD_blkPlayList blkPlayList;
+	blkPlayList.mLength = XIO::ReadUns32_BE ( &mplFile );
+	mplFile.ReadAll ( &blkPlayList.mReserved, 2 );
+	blkPlayList.mNumberOfPlayItems = XIO::ReadUns16_BE ( &mplFile );
+	blkPlayList.mNumberOfSubPaths = XIO::ReadUns16_BE ( &mplFile );
+
+	// Search the play items. ( AVCHD Format. Book1. v. 1.01. p 47 )
+	struct AVCHD_blkPlayItem
+	{
+		XMP_Uns16	mLength;
+		char		mClipInformationFileName[5];
+		// Note: remaining fields omitted because we don't care about them
+	};
+
+	AVCHD_blkPlayItem currPlayItem;
+	XMP_Uns64 blockStart = 0;
+	for ( playItemID = 0; playItemID < blkPlayList.mNumberOfPlayItems; ++playItemID ) {
+		currPlayItem.mLength = XIO::ReadUns16_BE ( &mplFile );
+
+		// mLength is measured from the end of mLength, not the start of the block ( AVCHD Format. Book1. v. 1.01. p 47 )
+		blockStart = mplFile.Offset();
+		mplFile.ReadAll ( currPlayItem.mClipInformationFileName, 5 );
+
+		if ( strncmp ( strClipName.c_str(), currPlayItem.mClipInformationFileName, 5 ) == 0 ) return true;
+
+		mplFile.Seek ( blockStart + currPlayItem.mLength, kXMP_SeekFromStart );
+	}
+
+	return false;
+}
+
+// =================================================================================================
+// ReadAVCHDPlaylistMetadataBlock
+// ==============================
+
+static bool ReadAVCHDPlaylistMetadataBlock ( XMPFiles_IO & mplFile,
+											 AVCHD_blkPlaylistMeta& avchdLegacyData )
+{
+	avchdLegacyData.mLength = XIO::ReadUns32_BE ( &mplFile );
+
+	if ( avchdLegacyData.mLength < sizeof ( AVCHD_blkPlaylistMeta ) ) return false;
+
+	avchdLegacyData.mMakerID = XIO::ReadUns16_BE ( &mplFile );
+	avchdLegacyData.mMakerModelCode = XIO::ReadUns16_BE ( &mplFile );
+	mplFile.ReadAll ( &avchdLegacyData.mReserved1, 4 );
+	avchdLegacyData.mRefToMenuThumbnailIndex = XIO::ReadUns16_BE ( &mplFile );
+	mplFile.ReadAll ( &avchdLegacyData.mBlkTimezone, 1 );
+	mplFile.ReadAll ( &avchdLegacyData.mRecordDataAndTime, 7 );
+	mplFile.ReadAll ( &avchdLegacyData.mReserved2, 1 );
+	mplFile.ReadAll ( &avchdLegacyData.mPlaylistCharacterSet, 1 );
+	mplFile.ReadAll ( &avchdLegacyData.mPlaylistNameLength, 1 );
+	mplFile.ReadAll ( &avchdLegacyData.mPlaylistName, avchdLegacyData.mPlaylistNameLength );
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCHDPlaylistMarkExtension
+// ==============================
+
+static bool ReadAVCHDPlaylistMarkExtension ( XMPFiles_IO & mplFile,
+											 XMP_Uns16 playlistMarkID,
+											 AVCHD_blkPlayListMarkExt& avchdLegacyData )
+{
+	avchdLegacyData.mLength = XIO::ReadUns32_BE ( &mplFile );
+
+	if ( avchdLegacyData.mLength == 0 ) return false;
+
+	avchdLegacyData.mNumberOfPlaylistMarks = XIO::ReadUns16_BE ( &mplFile );
+
+	if ( avchdLegacyData.mNumberOfPlaylistMarks <= playlistMarkID ) return true;
+
+	// Number of bytes in blkMarkExtension, AVCHD Book 2, section 4.3.3.1
+	const XMP_Uns64 markExtensionSize = 66;
+
+	// Entries in the mark extension block correspond one-to-one with entries in
+	// blkPlaylistMark, so we'll only read the one that corresponds to the
+	// chosen clip.
+	const XMP_Uns64 markOffset = markExtensionSize * playlistMarkID;
+
+	avchdLegacyData.mPresent = 1;
+	mplFile.Seek ( markOffset, kXMP_SeekFromCurrent );
+	avchdLegacyData.mMakerID = XIO::ReadUns16_BE ( &mplFile );
+	avchdLegacyData.mMakerModelCode = XIO::ReadUns16_BE ( &mplFile );
+	mplFile.ReadAll ( &avchdLegacyData.mReserved1, 3 );
+	mplFile.ReadAll ( &avchdLegacyData.mFlags, 1 );
+	avchdLegacyData.mRefToMarkThumbnailIndex = XIO::ReadUns16_BE ( &mplFile );
+	mplFile.ReadAll ( &avchdLegacyData.mBlkTimezone, 1 );
+	mplFile.ReadAll ( &avchdLegacyData.mRecordDataAndTime, 7 );
+	mplFile.ReadAll ( &avchdLegacyData.mMarkCharacterSet, 1 );
+	mplFile.ReadAll ( &avchdLegacyData.mMarkNameLength, 1 );
+	mplFile.ReadAll ( &avchdLegacyData.mMarkName, 24 );
+	mplFile.ReadAll ( &avchdLegacyData.mMakersInformation, 16 );
+	mplFile.ReadAll ( &avchdLegacyData.mBlkTimecode, 4 );
+	mplFile.ReadAll ( &avchdLegacyData.mReserved2, 2 );
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCHDPlaylistMarkID
+// =======================
+//
+// Read the playlist mark block to find the ID of the playlist mark that matches the specified
+// playlist item.
+
+static bool ReadAVCHDPlaylistMarkID ( XMPFiles_IO & mplFile,
+									  XMP_Uns16 playItemID,
+									  XMP_Uns16& markID )
+{
+	XMP_Uns32 length = XIO::ReadUns32_BE ( &mplFile );
+	XMP_Uns16 numberOfPlayListMarks = XIO::ReadUns16_BE ( &mplFile );
+
+	if ( length == 0 ) return false;
+
+	XMP_Uns8 reserved;
+	XMP_Uns8 markType;
+	XMP_Uns16 refToPlayItemID;
+
+	for ( int i = 0; i < numberOfPlayListMarks; ++i ) {
+		mplFile.ReadAll ( &reserved, 1 );
+		mplFile.ReadAll ( &markType, 1 );
+		refToPlayItemID = XIO::ReadUns16_BE ( &mplFile );
+
+		if ( ( markType == 0x01 ) && ( refToPlayItemID == playItemID ) ) {
+			markID = i;
+			return true;
+		}
+
+		mplFile.Seek ( 10, kXMP_SeekFromCurrent );
+	}
+
+	return false;
+}
+
+// =================================================================================================
+// ReadAVCHDPlaylistExtensionData
+// ==============================
+
+static bool ReadAVCHDPlaylistExtensionData ( XMPFiles_IO & mplFile,
+											 AVCHD_LegacyMetadata& avchdLegacyData,
+											 XMP_Uns16 playlistMarkID )
+{
+	const XMP_Int64 extensionBlockStart = mplFile.Offset();
+	AVCHD_blkExtensionData extensionDataHeader;
+
+	if ( ! ReadAVCHDExtensionData ( mplFile, extensionDataHeader ) ) {
+		 return false;
+	}
+
+	if ( extensionDataHeader.mLength == 0 ) {
+		return true;
+	}
+
+	const XMP_Int64 dataBlockStart = extensionBlockStart + extensionDataHeader.mDataBlockStartAddress;
+	AVCHD_blkPlayListExtensionData& extensionData = avchdLegacyData.mPlaylistExtensionData;
+	const int reserved2Len = 24;
+
+	mplFile.Seek ( dataBlockStart, kXMP_SeekFromStart );
+	mplFile.ReadAll ( extensionData.mTypeIndicator, 4 );
+
+	if ( strncmp ( extensionData.mTypeIndicator, "PLEX", 4 ) != 0 ) return false;
+
+	extensionData.mPresent = true;
+	mplFile.ReadAll ( extensionData.mReserved, 4 );
+	extensionData.mPlayListMarkExtStartAddress = XIO::ReadUns32_BE ( &mplFile );
+	extensionData.mMakersPrivateDataStartAddress = XIO::ReadUns32_BE ( &mplFile );
+	mplFile.Seek ( reserved2Len, kXMP_SeekFromCurrent );
+
+	if ( ! ReadAVCHDPlaylistMetadataBlock ( mplFile, extensionData.mPlaylistMeta ) ) return false;
+
+	mplFile.Seek ( dataBlockStart + extensionData.mPlayListMarkExtStartAddress, kXMP_SeekFromStart );
+
+	if ( ! ReadAVCHDPlaylistMarkExtension ( mplFile, playlistMarkID, extensionData.mPlaylistMarkExt ) ) return false;
+
+	if ( extensionData.mMakersPrivateDataStartAddress > 0 ) {
+
+		// return true here because all the data is already read successfully except the maker's private data and more
+		// specifically of panasonic. So if the relevant panasonic data is not present we just skip it.
+		// Assumption here is that if its not present in ClipExtension then it will not be in Playlist extension
+		if ( ! avchdLegacyData.mClipExtensionData.mMakersPrivateData.mPanasonicPrivateData.mPresent ) return true;
+
+		mplFile.Seek ( dataBlockStart + extensionData.mMakersPrivateDataStartAddress, kXMP_SeekFromStart );
+		
+		// Here private data was found.If the data was panasonic private data and we were unable to read it ,
+		// Return false 
+		if ( ! ReadAVCHDMakersPrivateData ( mplFile, playlistMarkID, extensionData.mMakersPrivateData ) ) return false;
+
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// ReadAVCHDLegacyClipFile
+// =======================
+//
+// Read the legacy metadata stored in an AVCHD .CPI file.
+
+static bool ReadAVCHDLegacyClipFile ( const std::string& strPath, AVCHD_LegacyMetadata& avchdLegacyData )
+{
+	bool success = false;
+
+	try {
+
+		Host_IO::FileRef hostRef = Host_IO::Open ( strPath.c_str(), Host_IO::openReadOnly );
+		if ( hostRef == Host_IO::noFileRef ) return false;	// The open failed.
+		XMPFiles_IO cpiFile ( hostRef, strPath.c_str(), Host_IO::openReadOnly );
+
+		memset ( &avchdLegacyData, 0, sizeof(AVCHD_LegacyMetadata) );
+
+		// Read clip header. ( AVCHD Format. Book1. v. 1.01. p 64 )
+		struct AVCHD_ClipInfoHeader
+		{
+			char		mTypeIndicator[4];
+			char		mTypeIndicator2[4];
+			XMP_Uns32	mSequenceInfoStartAddress;
+			XMP_Uns32	mProgramInfoStartAddress;
+			XMP_Uns32	mCPIStartAddress;
+			XMP_Uns32	mClipMarkStartAddress;
+			XMP_Uns32	mExtensionDataStartAddress;
+			XMP_Uns8	mReserved[12];
+		};
+
+		// Read the AVCHD header.
+		AVCHD_ClipInfoHeader avchdHeader;
+		cpiFile.ReadAll ( avchdHeader.mTypeIndicator,  4 );
+		cpiFile.ReadAll ( avchdHeader.mTypeIndicator2, 4 );
+
+		if ( strncmp ( avchdHeader.mTypeIndicator, "HDMV", 4 ) != 0 ) return false;
+		if ( strncmp ( avchdHeader.mTypeIndicator2, "0100", 4 ) != 0 ) return false;
+
+		avchdHeader.mSequenceInfoStartAddress	= XIO::ReadUns32_BE ( &cpiFile );
+		avchdHeader.mProgramInfoStartAddress	= XIO::ReadUns32_BE ( &cpiFile );
+		avchdHeader.mCPIStartAddress			= XIO::ReadUns32_BE ( &cpiFile );
+		avchdHeader.mClipMarkStartAddress		= XIO::ReadUns32_BE ( &cpiFile );
+		avchdHeader.mExtensionDataStartAddress	= XIO::ReadUns32_BE ( &cpiFile );
+		cpiFile.ReadAll ( avchdHeader.mReserved, 12 );
+
+		// Seek to the program header. (AVCHD Format. Book1. v. 1.01. p 77 )
+		cpiFile.Seek ( avchdHeader.mProgramInfoStartAddress, kXMP_SeekFromStart );
+
+		// Read the program info block
+		success = ReadAVCHDProgramInfo ( cpiFile, avchdLegacyData.mProgramInfo );
+
+		if ( success && ( avchdHeader.mExtensionDataStartAddress != 0 ) ) {
+			// Seek to the program header. (AVCHD Format. Book1. v. 1.01. p 77 )
+			cpiFile.Seek ( avchdHeader.mExtensionDataStartAddress, kXMP_SeekFromStart );
+			success = ReadAVCHDClipExtensionData ( cpiFile, avchdLegacyData.mClipExtensionData );
+		}
+
+	} catch ( ... ) {
+
+		return false;
+
+	}
+
+	return success;
+
+}	// ReadAVCHDLegacyClipFile
+
+// =================================================================================================
+// ReadAVCHDLegacyPlaylistFile
+// ===========================
+//
+// Read the legacy metadata stored in an AVCHD .MPL file.
+
+static bool ReadAVCHDLegacyPlaylistFile ( const std::string& mplPath,
+										  const std::string& strClipName,
+										  AVCHD_LegacyMetadata& avchdLegacyData )
+{
+
+#if 1
+	bool success = false;
+
+	try {
+
+		Host_IO::FileRef hostRef = Host_IO::Open ( mplPath.c_str(), Host_IO::openReadOnly );
+		if ( hostRef == Host_IO::noFileRef ) return false;	// The open failed.
+		XMPFiles_IO mplFile ( hostRef, mplPath.c_str(), Host_IO::openReadOnly );
+
+		// Read playlist header. ( AVCHD Format. Book1. v. 1.01. p 43 )
+		struct AVCHD_PlaylistFileHeader {
+			char		mTypeIndicator[4];
+			char		mTypeIndicator2[4];
+			XMP_Uns32	mPlaylistStartAddress;
+			XMP_Uns32	mPlaylistMarkStartAddress;
+			XMP_Uns32	mExtensionDataStartAddress;
+		};
+
+		// Read the AVCHD playlist file header.
+		AVCHD_PlaylistFileHeader avchdHeader;
+		mplFile.ReadAll ( avchdHeader.mTypeIndicator,  4 );
+		mplFile.ReadAll ( avchdHeader.mTypeIndicator2,  4 );
+
+		if ( strncmp ( avchdHeader.mTypeIndicator, "MPLS", 4 ) != 0 ) return false;
+		if ( strncmp ( avchdHeader.mTypeIndicator2, "0100", 4 ) != 0 ) return false;
+
+		avchdHeader.mPlaylistStartAddress		= XIO::ReadUns32_BE ( &mplFile );
+		avchdHeader.mPlaylistMarkStartAddress	= XIO::ReadUns32_BE ( &mplFile );
+		avchdHeader.mExtensionDataStartAddress	= XIO::ReadUns32_BE ( &mplFile );
+
+		if ( avchdHeader.mExtensionDataStartAddress == 0 ) return false;
+
+		// Seek to the start of the Playlist block. (AVCHD Format. Book1. v. 1.01. p 45 )
+		mplFile.Seek ( avchdHeader.mPlaylistStartAddress, kXMP_SeekFromStart );
+
+		XMP_Uns16 playItemID = 0xFFFF;
+		XMP_Uns16 playlistMarkID = 0xFFFF;
+
+		if ( AVCHD_PlaylistContainsClip ( mplFile, playItemID, strClipName ) ) {
+			mplFile.Seek ( avchdHeader.mPlaylistMarkStartAddress, kXMP_SeekFromStart );
+			if ( ! ReadAVCHDPlaylistMarkID ( mplFile, playItemID, playlistMarkID ) ) return false;
+			mplFile.Seek ( avchdHeader.mExtensionDataStartAddress, kXMP_SeekFromStart );
+			success = ReadAVCHDPlaylistExtensionData ( mplFile, avchdLegacyData, playlistMarkID );
+		}
+
+	} catch ( ... ) {
+
+		success = false;
+
+	}
+
+	return success;
+
+#else
+
+	bool success = false;
+	std::string mplPath;
+	char playlistName [10];
+	const int rootPlaylistNum = atoi(strClipName.c_str());
+
+	// Find the corresponding .MPL file -- because of clip spanning the .MPL name may not match the .CPI name for
+	// a given clip -- we need to open .MPL files and look for one that contains a reference to the clip name. To speed
+	// up the search we'll start with the playlist with the same number/name as the clip and search backwards. Assuming
+	// this directory was generated by a camera, the clip numbers will increase sequentially across the playlist files,
+	// though one playlist file may reference more than one clip.
+	for ( int i = rootPlaylistNum; i >= 0; --i ) {
+
+		sprintf ( playlistName, "%05d", i );
+
+		if ( MakeLeafPath ( &mplPath, strRootPath.c_str(), "PLAYLIST", playlistName, ".mpl", true /* checkFile */ ) ) {
+
+			try {
+
+				Host_IO::FileRef hostRef = Host_IO::Open ( mplPath.c_str(), Host_IO::openReadOnly );
+				if ( hostRef == Host_IO::noFileRef ) return false;	// The open failed.
+				XMPFiles_IO mplFile ( hostRef, mplPath.c_str(), Host_IO::openReadOnly );
+
+				// Read playlist header. ( AVCHD Format. Book1. v. 1.01. p 43 )
+				struct AVCHD_PlaylistFileHeader
+				{
+					char		mTypeIndicator[4];
+					char		mTypeIndicator2[4];
+					XMP_Uns32	mPlaylistStartAddress;
+					XMP_Uns32	mPlaylistMarkStartAddress;
+					XMP_Uns32	mExtensionDataStartAddress;
+				};
+
+				// Read the AVCHD playlist file header.
+				AVCHD_PlaylistFileHeader avchdHeader;
+				mplFile.ReadAll ( avchdHeader.mTypeIndicator,  4 );
+				mplFile.ReadAll ( avchdHeader.mTypeIndicator2, 4 );
+
+				if ( strncmp ( avchdHeader.mTypeIndicator, "MPLS", 4 ) != 0 ) return false;
+				if ( strncmp ( avchdHeader.mTypeIndicator2, "0100", 4 ) != 0 ) return false;
+
+				avchdHeader.mPlaylistStartAddress		= XIO::ReadUns32_BE ( &mplFile );
+				avchdHeader.mPlaylistMarkStartAddress	= XIO::ReadUns32_BE ( &mplFile );
+				avchdHeader.mExtensionDataStartAddress	= XIO::ReadUns32_BE ( &mplFile );
+
+				if ( avchdHeader.mExtensionDataStartAddress == 0 ) return false;
+
+				// Seek to the start of the Playlist block. (AVCHD Format. Book1. v. 1.01. p 45 )
+				mplFile.Seek ( avchdHeader.mPlaylistStartAddress, kXMP_SeekFromStart );
+
+				XMP_Uns16 playItemID = 0xFFFF;
+				XMP_Uns16 playlistMarkID = 0xFFFF;
+
+				if ( AVCHD_PlaylistContainsClip ( mplFile, playItemID, strClipName ) ) {
+					mplFile.Seek ( avchdHeader.mPlaylistMarkStartAddress, kXMP_SeekFromStart );
+
+					if ( ! ReadAVCHDPlaylistMarkID ( mplFile, playItemID, playlistMarkID ) ) return false;
+
+					mplFile.Seek ( avchdHeader.mExtensionDataStartAddress, kXMP_SeekFromStart );
+					success = ReadAVCHDPlaylistExtensionData ( mplFile, avchdLegacyData, playlistMarkID );
+				}
+
+			} catch ( ... ) {
+
+				return false;
+
+			}
+		}
+
+	}
+
+	return success;
+
+#endif
+
+}	// ReadAVCHDLegacyPlaylistFile
+
+// =================================================================================================
+// FindAVCHDLegacyPlaylistFile
+// ===========================
+//
+// Find and read the legacy metadata stored in an AVCHD .MPL file.
+
+static bool FindAVCHDLegacyPlaylistFile ( const std::string& strRootPath,
+										  const std::string& strClipName,
+										  AVCHD_LegacyMetadata& avchdLegacyData,
+										  std::string &mplPath )
+{
+	bool success = false;
+
+	// Find the corresponding .MPL file -- because of clip spanning the .MPL name may not match the
+	// .CPI name for a given clip -- we need to open .MPL files and look for one that contains a
+	// reference to the clip name. To speed up the search we'll start with the playlist with the
+	// same number/name as the clip, and if that fails look into other playlist files in the
+	// directory. One playlist file may reference more than one clip.
+
+	if ( MakeLeafPath ( &mplPath, strRootPath.c_str(), "PLAYLIST", strClipName.c_str(), ".mpl", true /* checkFile */ ) ) {
+		success = ReadAVCHDLegacyPlaylistFile ( mplPath, strClipName, avchdLegacyData );
+	}
+
+	if ( ! success ) {
+
+		std::string playlistPath = strRootPath;
+		playlistPath += kDirChar;
+		playlistPath += "BDMV";
+		playlistPath += kDirChar;
+		playlistPath += "PLAYLIST";
+		playlistPath += kDirChar;
+
+		std::string childName;
+
+		if ( Host_IO::GetFileMode ( playlistPath.c_str() ) == Host_IO::kFMode_IsFolder ) {
+
+			Host_IO::AutoFolder af;
+			af.folder = Host_IO::OpenFolder ( playlistPath.c_str() );
+			if ( af.folder == Host_IO::noFolderRef ) return false;
+
+			while ( (! success) && Host_IO::GetNextChild ( af.folder, &childName ) &&
+					(childName.find(".mpl") || childName.find(".MPL")) ) {
+				mplPath = playlistPath + childName;
+				if ( Host_IO::GetFileMode ( mplPath.c_str() ) == Host_IO::kFMode_IsFile ) {
+					success = ReadAVCHDLegacyPlaylistFile ( mplPath, strClipName, avchdLegacyData );
+				}
+
+			}
+			
+			af.Close();
+
+		}
+
+	}
+
+	return success;
+
+}	// FindAVCHDLegacyPlaylistFile
+
+// =================================================================================================
+// ReadAVCHDLegacyMetadata
+// =======================
+//
+// Read the legacy metadata stored in an AVCHD .CPI file.
+
+static bool ReadAVCHDLegacyMetadata ( const std::string& strPath,
+									  const std::string& strRootPath,
+									  const std::string& strClipName,
+									  AVCHD_LegacyMetadata& avchdLegacyData,
+									  std::string&	mplFile)
+{
+	bool success = ReadAVCHDLegacyClipFile ( strPath, avchdLegacyData );
+
+	if ( success && avchdLegacyData.mClipExtensionData.mPresent ) {
+		success = FindAVCHDLegacyPlaylistFile ( strRootPath, strClipName, avchdLegacyData, mplFile );
+	}
+
+	return success;
+
+}	// ReadAVCHDLegacyMetadata
+
+// =================================================================================================
+// AVCCAM_SetXMPStartTimecode
+// ==========================
+
+static void AVCCAM_SetXMPStartTimecode ( SXMPMeta& xmpObj, const XMP_Uns8* avccamTimecode, XMP_Uns8 avchdFrameRate )
+{
+	//	Timecode in SMPTE 12M format, according to Panasonic's documentation
+	if ( *reinterpret_cast<const XMP_Uns32*>( avccamTimecode ) == 0xFFFFFFFF ) {
+		// 0xFFFFFFFF means timecode not specified
+		return;
+	}
+
+	const XMP_Uns8 isColor = ( avccamTimecode[0] >> 7 ) & 0x01;
+	const XMP_Uns8 isDropFrame = ( avccamTimecode[0] >> 6 ) & 0x01;
+	const XMP_Uns8 frameTens = ( avccamTimecode[0] >> 4 ) & 0x03;
+	const XMP_Uns8 frameUnits = avccamTimecode[0] & 0x0f;
+	const XMP_Uns8 secondTens = ( avccamTimecode[1] >> 4 ) & 0x07;
+	const XMP_Uns8 secondUnits = avccamTimecode[1] & 0x0f;
+	const XMP_Uns8 minuteTens = ( avccamTimecode[2] >> 4 ) & 0x07;
+	const XMP_Uns8 minuteUnits = avccamTimecode[2] & 0x0f;
+	const XMP_Uns8 hourTens = ( avccamTimecode[3] >> 4 ) & 0x03;
+	const XMP_Uns8 hourUnits = avccamTimecode[3] & 0x0f;
+	char tcSeparator = ':';
+	const char* dmTimeFormat = NULL;
+	const char* dmTimeScale = NULL;
+	const char* dmTimeSampleSize = NULL;
+
+	switch ( avchdFrameRate ) {
+		case 1 :
+			// 23.976i
+			dmTimeFormat = "23976Timecode";
+			dmTimeScale = "24000";
+			dmTimeSampleSize = "1001";
+			break;
+
+		case 2 :
+			// 24p
+			dmTimeFormat = "24Timecode";
+			dmTimeScale = "24";
+			dmTimeSampleSize = "1";
+			break;
+
+		case 3 :
+		case 6 :
+			// 50i or 25p
+			dmTimeFormat = "25Timecode";
+			dmTimeScale = "25";
+			dmTimeSampleSize = "1";
+			break;
+
+		case 4 :
+		case 7 :
+			// 29.97p or 59.94i
+			if ( isDropFrame ) {
+				dmTimeFormat = "2997DropTimecode";
+				tcSeparator = ';';
+			} else {
+				dmTimeFormat = "2997NonDropTimecode";
+			}
+
+			dmTimeScale = "30000";
+			dmTimeSampleSize = "1001";
+
+			break;
+	}
+
+	if ( dmTimeFormat != NULL ) {
+		char timecodeBuff [12];
+
+		sprintf ( timecodeBuff, "%d%d%c%d%d%c%d%d%c%d%d", hourTens, hourUnits, tcSeparator,
+			minuteTens, minuteUnits, tcSeparator, secondTens, secondUnits, tcSeparator, frameTens, frameUnits);
+
+		xmpObj.SetProperty( kXMP_NS_DM, "startTimeScale", dmTimeScale, kXMP_DeleteExisting );
+		xmpObj.SetProperty( kXMP_NS_DM, "startTimeSampleSize", dmTimeSampleSize, kXMP_DeleteExisting );
+		xmpObj.SetStructField ( kXMP_NS_DM, "startTimecode", kXMP_NS_DM, "timeValue", timecodeBuff, 0 );
+		xmpObj.SetStructField ( kXMP_NS_DM, "startTimecode", kXMP_NS_DM, "timeFormat", dmTimeFormat, 0 );
+	}
+}
+
+// =================================================================================================
+// AVCHD_SetXMPMakeAndModel
+// ========================
+
+static bool AVCHD_SetXMPMakeAndModel ( SXMPMeta& xmpObj, const AVCHD_blkClipExtensionData& clipExtData )
+{
+	if ( ! clipExtData.mPresent ) return false;
+
+	XMP_StringPtr xmpValue = 0;
+
+	// Set the Make. Use a hex string for unknown makes.
+	{
+		char hexMakeNumber [7];
+
+		switch ( clipExtData.mClipInfoExt.mMakerID ) {
+			case kMakerIDCanon : xmpValue = "Canon";			break;
+			case kMakerIDPanasonic : xmpValue = "Panasonic";	break;
+			case kMakerIDSony : xmpValue = "Sony";				break;
+			default :
+				std::sprintf ( hexMakeNumber, "0x%04x", clipExtData.mClipInfoExt.mMakerID );
+				xmpValue = hexMakeNumber;
+
+				break;
+		}
+
+		xmpObj.SetProperty ( kXMP_NS_TIFF, "Make", xmpValue, kXMP_DeleteExisting );
+	}
+
+	// Set the Model number. Use a hex string for unknown model numbers so they can still be distinguished.
+	{
+		char hexModelNumber [7];
+
+		xmpValue = 0;
+
+		switch ( clipExtData.mClipInfoExt.mMakerID  ) {
+			case kMakerIDCanon :
+				switch ( clipExtData.mClipInfoExt.mMakerModelCode ) {
+					case 0x1000 : xmpValue = "HR10";		break;
+					case 0x2000 : xmpValue = "HG10";		break;
+					case 0x2001 : xmpValue = "HG21";		break;
+					case 0x3000 : xmpValue = "HF100";		break;
+					case 0x3003 : xmpValue = "HF S10";		break;
+					default :								break;
+				}
+				break;
+
+			case kMakerIDPanasonic :
+				switch ( clipExtData.mClipInfoExt.mMakerModelCode ) {
+					case 0x0202 : xmpValue = "HD-writer";				break;
+					case 0x0400 : xmpValue = "AG-HSC1U";				break;
+					case 0x0401 : xmpValue = "AG-HMC70";				break;
+					case 0x0410 : xmpValue = "AG-HMC150";				break;
+					case 0x0411 : xmpValue = "AG-HMC40";				break;
+					case 0x0412 : xmpValue = "AG-HMC80";				break;
+					case 0x0413 : xmpValue = "AG-3DA1";					break;
+					case 0x0414 : xmpValue = "AG-AF100";				break;
+					case 0x0450 : xmpValue = "AG-HMR10";				break;
+					case 0x0451 : xmpValue = "AJ-YCX250";				break;
+					case 0x0452 : xmpValue = "AG-MDR15";				break;
+					case 0x0490 : xmpValue = "AVCCAM Restorer";			break;
+					case 0x0491 : xmpValue = "AVCCAM Viewer";			break;
+					case 0x0492 : xmpValue = "AVCCAM Viewer for Mac";	break;
+					default :											break;
+				}
+
+			break;
+
+			default : break;
+		}
+
+		if ( ( xmpValue == 0 ) && ( clipExtData.mClipInfoExt.mMakerID != kMakerIDSony ) ) {
+			// Panasonic has said that if we don't have a string for the model number, they'd like to see the code
+			// anyway. We'll do the same for every manufacturer except Sony, who have said that they use
+			// the same model number for multiple cameras.
+			std::sprintf ( hexModelNumber, "0x%04x", clipExtData.mClipInfoExt.mMakerModelCode );
+			xmpValue = hexModelNumber;
+		}
+
+		if ( xmpValue != 0 ) xmpObj.SetProperty ( kXMP_NS_TIFF, "Model", xmpValue, kXMP_DeleteExisting );
+	}
+
+	return true;
+}
+
+// =================================================================================================
+// AVCHD_StringFieldToXMP
+// ======================
+
+static std::string AVCHD_StringFieldToXMP ( XMP_Uns8 avchdLength,
+											XMP_Uns8 avchdCharacterSet,
+											const XMP_Uns8* avchdField,
+											XMP_Uns8 avchdFieldSize )
+{
+	std::string xmpString;
+
+	if ( avchdCharacterSet == 0x02 ) {
+		// UTF-16, Big Endian
+		UTF8Unit utf8Name [512];
+		const XMP_Uns8 avchdMaxChars = ( avchdFieldSize / 2);
+		size_t utf16Read;
+		size_t utf8Written;
+
+		// The spec doesn't say whether AVCHD length fields count bytes or characters, so we'll
+		// clamp to the max number of UTF-16 characters just in case.
+		const int stringLength = ( avchdLength > avchdMaxChars ) ? avchdMaxChars : avchdLength;
+
+		UTF16BE_to_UTF8 ( reinterpret_cast<const UTF16Unit*> ( avchdField ), stringLength,
+						  utf8Name, 512, &utf16Read, &utf8Written );
+		xmpString.assign ( reinterpret_cast<const char*> ( utf8Name ), utf8Written );
+	} else {
+		// AVCHD supports many character encodings, but UTF-8 (0x01) and ASCII (0x90) are the only ones I've
+		// seen in the wild at this point. We'll treat the other character sets as UTF-8 on the assumption that
+		// at least a few characters will come across, and something is better than nothing.
+		const int stringLength = ( avchdLength > avchdFieldSize ) ? avchdFieldSize : avchdLength;
+
+		xmpString.assign ( reinterpret_cast<const char*> ( avchdField ), stringLength );
+	}
+
+	return xmpString;
+}
+
+// =================================================================================================
+// AVCHD_SetXMPShotName
+// ====================
+
+static void AVCHD_SetXMPShotName ( SXMPMeta& xmpObj, const AVCHD_blkPlayListMarkExt& markExt, const std::string& strClipName )
+{
+	if ( markExt.mPresent ) {
+		const std::string shotName = AVCHD_StringFieldToXMP ( markExt.mMarkNameLength, markExt.mMarkCharacterSet, markExt.mMarkName, 24 );
+
+		if ( ! shotName.empty() ) xmpObj.SetProperty ( kXMP_NS_DC, "shotName", shotName.c_str(), kXMP_DeleteExisting );
+	}
+}
+
+// =================================================================================================
+// BytesToHex
+// ==========
+
+#define kHexDigits "0123456789ABCDEF"
+
+static std::string BytesToHex ( const XMP_Uns8* inClipIDBytes, int inNumBytes )
+{
+	const int numChars = ( inNumBytes * 2 );
+	std::string hexStr;
+
+	hexStr.reserve(numChars);
+
+	for ( int i = 0; i < inNumBytes; ++i ) {
+		const XMP_Uns8 byte = inClipIDBytes[i];
+		hexStr.push_back ( kHexDigits [byte >> 4] );
+		hexStr.push_back ( kHexDigits [byte & 0xF] );
+	}
+
+	return hexStr;
+}
+
+// =================================================================================================
+// AVCHD_DateFieldToXMP
+// ====================
+//
+// AVCHD Format Book 2, section 4.2.2.2.
+
+static std::string AVCHD_DateFieldToXMP ( XMP_Uns8 avchdTimeZone, const XMP_Uns8* avchdDateTime )
+{
+	const XMP_Uns8 daylightSavingsTime = ( avchdTimeZone >> 6 ) & 0x01;
+	const XMP_Uns8 timezoneSign = ( avchdTimeZone >> 5 ) & 0x01;
+	const XMP_Uns8 timezoneValue = ( avchdTimeZone >> 1 ) & 0x0F;
+	const XMP_Uns8 halfHourFlag = avchdTimeZone & 0x01;
+	int utcOffsetHours = 0;
+	unsigned int utcOffsetMinutes = 0;
+
+	// It's not entirely clear how to interpret the daylightSavingsTime flag from the documentation -- my best
+	// guess is that it should only be used if trying to display local time, not the UTC-relative time that
+	// XMP specifies.
+	if ( timezoneValue != 0xF ) {
+		utcOffsetHours = timezoneSign ? -timezoneValue : timezoneValue;
+		utcOffsetMinutes = 30 * halfHourFlag;
+	}
+
+	char dateBuff [26];
+
+	sprintf ( dateBuff,
+			  "%01d%01d%01d%01d-%01d%01d-%01d%01dT%01d%01d:%01d%01d:%01d%01d%+02d:%02d",
+			  (avchdDateTime[0] >> 4), (avchdDateTime[0] & 0x0F),
+			  (avchdDateTime[1] >> 4), (avchdDateTime[1] & 0x0F),
+			  (avchdDateTime[2] >> 4), (avchdDateTime[2] & 0x0F),
+			  (avchdDateTime[3] >> 4), (avchdDateTime[3] & 0x0F),
+			  (avchdDateTime[4] >> 4), (avchdDateTime[4] & 0x0F),
+			  (avchdDateTime[5] >> 4), (avchdDateTime[5] & 0x0F),
+			  (avchdDateTime[6] >> 4), (avchdDateTime[6] & 0x0F),
+			  utcOffsetHours, utcOffsetMinutes );
+
+	return std::string(dateBuff);
+}
+
+// =================================================================================================
+// AVCHD_MetaHandlerCTor
+// =====================
+
+XMPFileHandler * AVCHD_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new AVCHD_MetaHandler ( parent );
+
+}	// AVCHD_MetaHandlerCTor
+
+// =================================================================================================
+// AVCHD_MetaHandler::AVCHD_MetaHandler
+// ====================================
+
+AVCHD_MetaHandler::AVCHD_MetaHandler ( XMPFiles * _parent )
+{
+	this->parent = _parent;	// Inherited, can't set in the prefix.
+	this->handlerFlags = kAVCHD_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	// Extract the root path and clip name.
+
+	if ( this->parent->tempPtr == 0 ) {
+		// The CheckFormat call might have been skipped.
+		this->parent->tempPtr = CreatePseudoClipPath ( this->parent->GetFilePath() );
+	}
+
+	this->rootPath.assign ( (char*) this->parent->tempPtr );
+	free ( this->parent->tempPtr );
+	this->parent->tempPtr = 0;
+
+	XIO::SplitLeafName ( &this->rootPath, &this->clipName );
+
+}	// AVCHD_MetaHandler::AVCHD_MetaHandler
+
+// =================================================================================================
+// AVCHD_MetaHandler::~AVCHD_MetaHandler
+// =====================================
+
+AVCHD_MetaHandler::~AVCHD_MetaHandler()
+{
+
+	if ( this->parent->tempPtr != 0 ) {
+		free ( this->parent->tempPtr );
+		this->parent->tempPtr = 0;
+	}
+
+}	// AVCHD_MetaHandler::~AVCHD_MetaHandler
+
+// =================================================================================================
+// AVCHD_MetaHandler::MakeClipInfoPath
+// ===================================
+
+bool AVCHD_MetaHandler::MakeClipInfoPath ( std::string * path, XMP_StringPtr suffix, bool checkFile /* = false */ ) const
+{
+	return MakeLeafPath ( path, this->rootPath.c_str(), "CLIPINF", this->clipName.c_str(), suffix, checkFile );
+}	// AVCHD_MetaHandler::MakeClipInfoPath
+
+// =================================================================================================
+// AVCHD_MetaHandler::MakeClipStreamPath
+// =====================================
+
+bool AVCHD_MetaHandler::MakeClipStreamPath ( std::string * path, XMP_StringPtr suffix, bool checkFile /* = false */ ) const
+{
+	return MakeLeafPath ( path, this->rootPath.c_str(), "STREAM", this->clipName.c_str(), suffix, checkFile );
+}	// AVCHD_MetaHandler::MakeClipStreamPath
+
+// =================================================================================================
+// AVCHD_MetaHandler::MakePlaylistPath
+// =====================================
+
+bool AVCHD_MetaHandler::MakePlaylistPath ( std::string * path, XMP_StringPtr suffix, bool checkFile /* = false */ ) const
+{
+	return MakeLeafPath ( path, this->rootPath.c_str(), "PLAYLIST", this->clipName.c_str(), suffix, checkFile );
+}	// AVCHD_MetaHandler::MakePlaylistPath
+
+// =================================================================================================
+// AVCHD_MetaHandler::MakeLegacyDigest
+// ===================================
+
+void AVCHD_MetaHandler::MakeLegacyDigest ( std::string * digestStr )
+{
+	std::string strClipPath;
+	std::string strPlaylistPath;
+	std::vector<XMP_Uns8> legacyBuff;
+
+	bool ok = this->MakeClipInfoPath ( &strClipPath, ".clpi", true /* checkFile */ );
+	if ( ! ok ) return;
+
+	ok = this->MakePlaylistPath ( &strPlaylistPath, ".mpls", true /* checkFile */ );
+	if ( ! ok ) return;
+
+	try {
+		{
+			Host_IO::FileRef hostRef = Host_IO::Open ( strClipPath.c_str(), Host_IO::openReadOnly );
+			if ( hostRef == Host_IO::noFileRef ) return;	// The open failed.
+			XMPFiles_IO cpiFile ( hostRef, strClipPath.c_str(), Host_IO::openReadOnly );
+
+			// Read at most the first 2k of data from the cpi file to use in the digest
+			// (every CPI file I've seen is less than 1k).
+			const XMP_Int64 cpiLen = cpiFile.Length();
+			const XMP_Int64 buffLen = (cpiLen <= 2048) ? cpiLen : 2048;
+
+			legacyBuff.resize ( (unsigned int) buffLen );
+			cpiFile.ReadAll ( &(legacyBuff[0]),  static_cast<XMP_Int32> ( buffLen ) );
+		}
+
+		{
+			Host_IO::FileRef hostRef = Host_IO::Open ( strPlaylistPath.c_str(), Host_IO::openReadOnly );
+			if ( hostRef == Host_IO::noFileRef ) return;	// The open failed.
+			XMPFiles_IO mplFile ( hostRef, strPlaylistPath.c_str(), Host_IO::openReadOnly );
+
+			// Read at most the first 2k of data from the cpi file to use in the digest
+			// (every playlist file I've seen is less than 1k).
+			const XMP_Int64 mplLen = mplFile.Length();
+			const XMP_Int64 buffLen = (mplLen <= 2048) ? mplLen : 2048;
+			const XMP_Int64 clipBuffLen = legacyBuff.size();
+
+			legacyBuff.resize ( (unsigned int) (clipBuffLen + buffLen) );
+			mplFile.ReadAll ( &( legacyBuff [(unsigned int)clipBuffLen] ),  (XMP_Int32)buffLen );
+		}
+
+	} catch (...) {
+		return;
+	}
+
+	MD5_CTX context;
+	unsigned char digestBin [16];
+
+	MD5Init ( &context );
+	MD5Update ( &context, (XMP_Uns8*)&(legacyBuff[0]), (unsigned int) legacyBuff.size() );
+	MD5Final ( digestBin, &context );
+
+	*digestStr = BytesToHex ( digestBin, 16 );
+}	// AVCHD_MetaHandler::MakeLegacyDigest
+
+// =================================================================================================
+// AVCHD_MetaHandler::GetFileModDate
+// =================================
+
+static inline bool operator< ( const XMP_DateTime & left, const XMP_DateTime & right ) {
+	int compare = SXMPUtils::CompareDateTime ( left, right );
+	return (compare < 0);
+}
+
+bool AVCHD_MetaHandler::GetFileModDate ( XMP_DateTime * modDate )
+{
+
+	// The AVCHD locations of metadata:
+	//	BDMV/
+	//		CLIPINF/
+	//			00001.clpi
+	//		PLAYLIST/
+	//			00001.mpls
+	//		STREAM/
+	//			00001.xmp
+
+	bool ok, haveDate = false;
+	std::string fullPath;
+	XMP_DateTime oneDate, junkDate;
+	if ( modDate == 0 ) modDate = &junkDate;
+
+	ok = this->MakeClipInfoPath ( &fullPath, ".clpi", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( *modDate < oneDate ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	ok = this->MakePlaylistPath ( &fullPath, ".mpls", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) || (*modDate < oneDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	ok = this->MakeClipStreamPath ( &fullPath, ".xmp", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) || (*modDate < oneDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	return haveDate;
+
+}	// AVCHD_MetaHandler::GetFileModDate
+
+// =================================================================================================
+// AVCHD_MetaHandler::FillMetadataFiles
+// ================================
+void AVCHD_MetaHandler::FillMetadataFiles ( std::vector<std::string> * metadataFiles)
+{
+	std::string noExtPath, filePath, altPath;
+
+	noExtPath = rootPath + kDirChar + "BDMV" + kDirChar + "STREAM" + kDirChar + clipName;
+	filePath  = noExtPath + ".xmp";
+	if ( ! Host_IO::Exists ( filePath.c_str() ) ) {
+		altPath = noExtPath + ".XMP";
+		if ( Host_IO::Exists ( altPath.c_str() ) ) filePath = altPath;
+	}
+	metadataFiles->push_back ( filePath );
+
+	noExtPath = rootPath + kDirChar + "BDMV" + kDirChar + "CLIPINF" + kDirChar + clipName;
+	filePath  = noExtPath + ".clpi";
+	if ( ! Host_IO::Exists ( filePath.c_str() ) ) {
+		altPath = noExtPath + ".CLPI";
+		if ( ! Host_IO::Exists ( altPath.c_str() ) ) altPath = noExtPath + ".cpi";
+		if ( ! Host_IO::Exists ( altPath.c_str() ) ) altPath = noExtPath + ".CPI";
+		if ( Host_IO::Exists ( altPath.c_str() ) ) filePath = altPath;
+	}
+	metadataFiles->push_back ( filePath );
+
+}	// 	FillMetadataFiles_AVCHD
+
+// =================================================================================================
+// AVCHD_MetaHandler::IsMetadataWritable
+// =======================================
+
+bool AVCHD_MetaHandler::IsMetadataWritable ( )
+{
+	std::vector<std::string> metadataFiles;
+	FillMetadataFiles(&metadataFiles);
+	std::vector<std::string>::iterator itr = metadataFiles.begin();
+	// Check whether sidecar is writable, if not then check if it can be created.
+	return Host_IO::Writable( itr->c_str(), true );
+}// AVCHD_MetaHandler::IsMetadataWritable
+
+// =================================================================================================
+// AVCHD_MetaHandler::FillAssociatedResources
+// ======================================
+void AVCHD_MetaHandler::FillAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	/// The possible associated resources:
+	///   BDMV/
+	///         index.bdmv
+	///         MovieObject.bdmv
+	///         PLAYLIST/
+	///				xxxxx.mpls   
+	///         STREAM/
+	///				zzzzz.m2ts
+	///             zzzzz.xmp
+	///         CLIPINF/
+	///				zzzzz.clpi
+	///         BACKUP/
+	//    xxxxx is a five digit playlist name
+	//    zzzzz is a five digit clip name
+	//
+	std::string bdmvPath = rootPath + kDirChar + "BDMV" + kDirChar;
+	std::string filePath, clipInfoPath;
+	//Add RootPath
+	filePath = rootPath + kDirChar;
+	PackageFormat_Support::AddResourceIfExists( resourceList, filePath );
+	// Add existing files under the folder "BDMV"
+	filePath = bdmvPath + "index.bdmv";
+	if ( ! PackageFormat_Support::AddResourceIfExists ( resourceList, filePath ) ) {
+		filePath = bdmvPath + "INDEX.BDMV";
+		if ( ! PackageFormat_Support::AddResourceIfExists ( resourceList, filePath ) ) {
+			filePath = bdmvPath + "index.bdm";
+			if ( ! PackageFormat_Support::AddResourceIfExists ( resourceList, filePath ) ) {
+				filePath = bdmvPath + "INDEX.BDM";
+				PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+			}
+		}
+	}
+	filePath = bdmvPath + "MovieObject.bdmv";
+	if ( ! PackageFormat_Support::AddResourceIfExists ( resourceList, filePath ) ) {
+		filePath = bdmvPath + "MOVIEOBJECT.BDMV";
+		if ( ! PackageFormat_Support::AddResourceIfExists ( resourceList, filePath ) ) {
+			filePath = bdmvPath + "MovieObj.bdm";
+			if ( ! PackageFormat_Support::AddResourceIfExists ( resourceList, filePath ) ) {
+				filePath = bdmvPath + "MOVIEOBJ.BDM";
+				PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+			}
+		}
+	}
+
+
+	if ( MakeClipInfoPath ( &filePath, ".clpi", true /* checkFile */ ) ) {
+		PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+		clipInfoPath = filePath;
+	}
+	else {
+		filePath = bdmvPath + "CLIPINF" + kDirChar ;
+		PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	}
+
+	bool addedStreamDir=false;
+	if ( MakeClipStreamPath ( &filePath, ".xmp", true /* checkFile */ ) ) {
+		PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+		addedStreamDir = true;
+	}
+
+
+	if ( MakeClipStreamPath ( &filePath, ".m2ts", true /* checkFile */ ) ) {
+		PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	}
+	else if ( ! addedStreamDir ) {
+		filePath = bdmvPath + "STREAM" + kDirChar ;
+		PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	}
+
+	AVCHD_LegacyMetadata avchdLegacyData;
+	if ( ReadAVCHDLegacyMetadata ( clipInfoPath, this->rootPath, this->clipName, avchdLegacyData, filePath ) ) {
+		PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	}	
+	else {
+		filePath = bdmvPath + "PLAYLIST" + kDirChar ;
+		PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	}
+}
+	
+// =================================================================================================
+// AVCHD_MetaHandler::CacheFileData
+// ================================
+
+void AVCHD_MetaHandler::CacheFileData()
+{
+	XMP_Assert ( ! this->containsXMP );
+
+	if ( this->parent->UsesClientIO() ) {
+		XMP_Throw ( "AVCHD cannot be used with client-managed I/O", kXMPErr_InternalFailure );
+	}
+
+	// See if the clip's .XMP file exists.
+
+	std::string xmpPath;
+	bool found = this->MakeClipStreamPath ( &xmpPath, ".xmp", true /* checkFile */ );
+	if ( ! found ) return;	// No XMP.
+	XMP_Assert ( Host_IO::Exists ( xmpPath.c_str() ) );	// MakeClipStreamPath should ensure this.
+
+	// Read the entire .XMP file. We know the XMP exists, New_XMPFiles_IO is supposed to return 0
+	// only if the file does not exist.
+
+	bool readOnly = XMP_OptionIsClear ( this->parent->openFlags, kXMPFiles_OpenForUpdate );
+
+	XMP_Assert ( this->parent->ioRef == 0 );
+	XMPFiles_IO* xmpFile =  XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), readOnly );
+	if ( xmpFile == 0 ) XMP_Throw ( "AVCHD XMP file open failure", kXMPErr_InternalFailure );
+	this->parent->ioRef = xmpFile;
+
+	XMP_Int64 xmpLen = xmpFile->Length();
+	if ( xmpLen > 100*1024*1024 ) {
+		XMP_Throw ( "AVCHD XMP is outrageously large", kXMPErr_InternalFailure );	// Sanity check.
+	}
+
+	this->xmpPacket.erase();
+	this->xmpPacket.append ( (size_t ) xmpLen, ' ' );
+
+	XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen );
+
+	this->packetInfo.offset = 0;
+	this->packetInfo.length = (XMP_Int32)xmpLen;
+	FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+	this->containsXMP = true;
+
+}	// AVCHD_MetaHandler::CacheFileData
+
+// =================================================================================================
+// AVCHD_MetaHandler::ProcessXMP
+// =============================
+
+void AVCHD_MetaHandler::ProcessXMP()
+{
+	if ( this->processedXMP ) return;
+	this->processedXMP = true;	// Make sure only called once.
+
+	if ( this->containsXMP ) {
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	}
+
+	// read clip info
+	AVCHD_LegacyMetadata avchdLegacyData;
+	std::string strPath,mplfile;
+
+	bool ok = this->MakeClipInfoPath ( &strPath, ".clpi", true /* checkFile */ );
+	if ( ok ) ReadAVCHDLegacyMetadata ( strPath, this->rootPath, this->clipName, avchdLegacyData , mplfile);
+	if ( ! ok ) return;
+
+	const AVCHD_blkPlayListMarkExt& markExt = avchdLegacyData.mPlaylistExtensionData.mPlaylistMarkExt;
+	XMP_Uns8 pulldownFlag = 0;
+
+	if ( markExt.mPresent ) {
+		const std::string dateString = AVCHD_DateFieldToXMP ( markExt.mBlkTimezone, markExt.mRecordDataAndTime );
+
+		if ( ! dateString.empty() ) this->xmpObj.SetProperty ( kXMP_NS_DM, "shotDate", dateString.c_str(), kXMP_DeleteExisting );
+		AVCHD_SetXMPShotName ( this->xmpObj, markExt, this->clipName );
+		AVCCAM_SetXMPStartTimecode ( this->xmpObj, markExt.mBlkTimecode, avchdLegacyData.mProgramInfo.mVideoStream.mFrameRate );
+		pulldownFlag = (markExt.mFlags >> 1) & 0x03;  // bits 1 and 2
+	}
+
+	// Video Stream. AVCHD Format v. 1.01 p. 78
+
+	const bool has2_2pulldown = (pulldownFlag == 0x01);
+	const bool has3_2pulldown = (pulldownFlag == 0x10);
+	XMP_StringPtr xmpValue = 0;
+
+	if ( avchdLegacyData.mProgramInfo.mVideoStream.mPresent ) {
+
+		// XMP videoFrameSize.
+		xmpValue = 0;
+		int frameIndex = -1;
+		bool isProgressiveHD = false;
+		const char* frameWidth[4]	= { "720", "720", "1280", "1920" };
+		const char* frameHeight[4]	= { "480", "576", "720",  "1080" };
+
+		switch ( avchdLegacyData.mProgramInfo.mVideoStream.mVideoFormat ) {
+			case 1 : frameIndex = 0;							break; // 480i
+			case 2 : frameIndex = 1;							break; // 576i
+			case 3 : frameIndex = 0;							break; // 480p
+			case 4 : frameIndex = 3;							break; // 1080i
+			case 5 : frameIndex = 2; isProgressiveHD = true;	break; // 720p
+			case 6 : frameIndex = 3; isProgressiveHD = true;	break; // 1080p
+			default: break;
+		}
+
+		if ( frameIndex != -1 ) {
+			xmpValue = frameWidth[frameIndex];
+			this->xmpObj.SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "w", xmpValue, 0 );
+			xmpValue = frameHeight[frameIndex];
+			this->xmpObj.SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "h", xmpValue, 0 );
+			xmpValue = "pixels";
+			this->xmpObj.SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "unit", xmpValue, 0 );
+		}
+
+		// XMP videoFrameRate. The logic below seems pretty tortured, but matches "Table 4-4 pulldown" on page 31 of Book 2 of the AVCHD
+		// spec, if you interepret "frame_mbs_only_flag" as "isProgressiveHD", "frame-rate [Hz]" as the frame rate encoded in
+		// mVideoStream.mFrameRate, and "Video Scan Type" as the desired xmp output value. The algorithm produces correct results for
+		// all the AVCHD media I've tested.
+		xmpValue = 0;
+		if ( isProgressiveHD ) {
+
+			switch ( avchdLegacyData.mProgramInfo.mVideoStream.mFrameRate ) {
+				case 1 : xmpValue = "23.98p";								break;   // "23.976"
+				case 2 : xmpValue = "24p";									break;   // "24"
+				case 3 : xmpValue = "25p";									break;   // "25"
+				case 4 : xmpValue = has2_2pulldown ? "29.97p" : "59.94p";	break;   // "29.97"
+				case 6 : xmpValue = has2_2pulldown ? "25p" : "50p";			break;   // "50"
+				case 7 :															 // "59.94"
+					if ( has2_2pulldown )
+						xmpValue = "29.97p";
+					else
+						xmpValue = has3_2pulldown ? "23.98p" : "59.94p";
+
+					break;
+				default: break;
+			}
+
+		} else {
+
+			switch ( avchdLegacyData.mProgramInfo.mVideoStream.mFrameRate ) {
+				case 3 : xmpValue = has2_2pulldown ? "25p" : "50i";			break;  // "25" (but 1080p25 is reported as 1080i25 with 2:2 pulldown...)
+				case 4 :															// "29.97"
+					if ( has2_2pulldown )
+						xmpValue = "29.97p";
+					else
+						xmpValue = "59.94i";
+
+					break;
+				default: break;
+			}
+
+		}
+
+		if ( xmpValue != 0 ) {
+			this->xmpObj.SetProperty ( kXMP_NS_DM, "videoFrameRate", xmpValue, kXMP_DeleteExisting );
+		}
+
+		this->containsXMP = true;
+
+	}
+
+	// Audio Stream.
+	if ( avchdLegacyData.mProgramInfo.mAudioStream.mPresent ) {
+
+		xmpValue = 0;
+		switch ( avchdLegacyData.mProgramInfo.mAudioStream.mAudioPresentationType ) {
+			case 1  : xmpValue = "Mono"; break;
+			case 3  : xmpValue = "Stereo"; break;
+			default : break;
+		}
+		if ( xmpValue != 0 ) {
+			this->xmpObj.SetProperty ( kXMP_NS_DM, "audioChannelType", xmpValue, kXMP_DeleteExisting );
+		}
+
+		xmpValue = 0;
+		switch ( avchdLegacyData.mProgramInfo.mAudioStream.mSamplingFrequency ) {
+			case 1  : xmpValue = "48000"; break;
+			case 4  : xmpValue = "96000"; break;
+			case 5  : xmpValue = "192000"; break;
+			default : break;
+		}
+		if ( xmpValue != 0 ) {
+			this->xmpObj.SetProperty ( kXMP_NS_DM, "audioSampleRate", xmpValue, kXMP_DeleteExisting );
+		}
+
+		this->containsXMP = true;
+	}
+
+	// Proprietary vendor extensions
+	if ( AVCHD_SetXMPMakeAndModel ( this->xmpObj, avchdLegacyData.mClipExtensionData ) ) this->containsXMP = true;
+
+	this->xmpObj.SetProperty ( kXMP_NS_DM, "title", this->clipName.c_str(), kXMP_DeleteExisting );
+	this->containsXMP = true;
+
+	if ( avchdLegacyData.mClipExtensionData.mMakersPrivateData.mPresent &&
+		 ( avchdLegacyData.mClipExtensionData.mClipInfoExt.mMakerID == kMakerIDPanasonic ) ) {
+
+		const AVCHD_blkPanasonicPrivateData& panasonicClipData = avchdLegacyData.mClipExtensionData.mMakersPrivateData.mPanasonicPrivateData;
+
+		if ( panasonicClipData.mProClipIDBlock.mPresent ) {
+			const std::string globalClipIDString = BytesToHex ( panasonicClipData.mProClipIDBlock.mGlobalClipID, 32 );
+
+			this->xmpObj.SetProperty ( kXMP_NS_DC, "identifier", globalClipIDString.c_str(), kXMP_DeleteExisting );
+		}
+
+		const AVCHD_blkPanasonicPrivateData& panasonicPlaylistData =
+			avchdLegacyData.mPlaylistExtensionData.mMakersPrivateData.mPanasonicPrivateData;
+
+		if ( panasonicPlaylistData.mProPlaylistInfoBlock.mPlayListMark.mPresent ) {
+			const AVCCAM_blkProPlayListMark& playlistMark = panasonicPlaylistData.mProPlaylistInfoBlock.mPlayListMark;
+
+			if ( playlistMark.mShotMark.mPresent ) {
+				// Unlike P2, where "shotmark" is a boolean, Panasonic treats their AVCCAM shotmark as a bit field with
+				// 8 user-definable bits. For now we're going to treat any bit being set as xmpDM::good == true, and all
+				// bits being clear as xmpDM::good == false.
+				const bool isGood = ( playlistMark.mShotMark.mShotMark != 0 );
+
+				xmpObj.SetProperty_Bool ( kXMP_NS_DM, "good",  isGood, kXMP_DeleteExisting );
+			}
+
+			if ( playlistMark.mAccess.mPresent && ( playlistMark.mAccess.mCreatorLength > 0 ) ) {
+				const std::string creatorString = AVCHD_StringFieldToXMP (
+					playlistMark.mAccess.mCreatorLength, playlistMark.mAccess.mCreatorCharacterSet, playlistMark.mAccess.mCreator, 32 ) ;
+
+				if ( ! creatorString.empty() ) {
+					xmpObj.DeleteProperty ( kXMP_NS_DC, "creator" );
+					xmpObj.AppendArrayItem ( kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered, creatorString.c_str() );
+				}
+			}
+
+			if ( playlistMark.mDevice.mPresent && ( playlistMark.mDevice.mSerialNoLength > 0 ) ) {
+				const std::string serialNoString = AVCHD_StringFieldToXMP (
+					playlistMark.mDevice.mSerialNoLength, playlistMark.mDevice.mSerialNoCharacterCode, playlistMark.mDevice.mSerialNo, 24 ) ;
+
+				if ( ! serialNoString.empty() ) xmpObj.SetProperty ( kXMP_NS_EXIF_Aux, "SerialNumber", serialNoString.c_str(), kXMP_DeleteExisting );
+			}
+
+			if ( playlistMark.mLocation.mPresent && ( playlistMark.mLocation.mPlaceNameLength > 0 ) ) {
+				const std::string placeNameString = AVCHD_StringFieldToXMP (
+					playlistMark.mLocation.mPlaceNameLength, playlistMark.mLocation.mPlaceNameCharacterSet, playlistMark.mLocation.mPlaceName, 64 ) ;
+
+				if ( ! placeNameString.empty() ) xmpObj.SetProperty ( kXMP_NS_DM, "shotLocation", placeNameString.c_str(), kXMP_DeleteExisting );
+			}
+		}
+	}
+
+}	// AVCHD_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// AVCHD_MetaHandler::UpdateFile
+// =============================
+//
+// Note that UpdateFile is only called from XMPFiles::CloseFile, so it is OK to close the file here.
+
+void AVCHD_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) return;
+	this->needsUpdate = false;	// Make sure only called once.
+
+	XMP_Assert ( this->parent->UsesLocalIO() );
+
+	std::string newDigest;
+	this->MakeLegacyDigest ( &newDigest );
+	this->xmpObj.SetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "AVCHD", newDigest.c_str(), kXMP_DeleteExisting );
+
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, this->GetSerializeOptions() );
+
+	std::string xmpPath;
+	this->MakeClipStreamPath ( &xmpPath, ".xmp" );
+
+	bool haveXMP = Host_IO::Exists ( xmpPath.c_str() );
+	if ( ! haveXMP ) {
+		XMP_Assert ( this->parent->ioRef == 0 );
+		Host_IO::Create ( xmpPath.c_str() );
+		this->parent->ioRef = XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), Host_IO::openReadWrite );
+		if ( this->parent->ioRef == 0 ) XMP_Throw ( "Failure opening AVCHD XMP file", kXMPErr_ExternalFailure );
+	}
+
+	XMP_IO* xmpFile = this->parent->ioRef;
+	XMP_Assert ( xmpFile != 0 );
+	XIO::ReplaceTextFile ( xmpFile, this->xmpPacket, (haveXMP & doSafeUpdate) );
+
+}	// AVCHD_MetaHandler::UpdateFile
+
+// =================================================================================================
+// AVCHD_MetaHandler::WriteTempFile
+// ================================
+
+void AVCHD_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+
+	// ! WriteTempFile is not supposed to be called for handlers that own the file.
+	XMP_Throw ( "AVCHD_MetaHandler::WriteTempFile should not be called", kXMPErr_InternalFailure );
+
+}	// AVCHD_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp
new file mode 100644
index 0000000..0860d5b
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp
@@ -0,0 +1,84 @@
+#ifndef __AVCHD_Handler_hpp__
+#define __AVCHD_Handler_hpp__	1
+
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "source/ExpatAdapter.hpp"
+
+// =================================================================================================
+/// \file AVCHD_Handler.hpp
+/// \brief Folder format handler for AVCHD.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler * AVCHD_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool AVCHD_CheckFormat ( XMP_FileFormat format,
+								const std::string & rootPath,
+								const std::string & gpName,
+								const std::string & parentName,
+								const std::string & leafName,
+								XMPFiles * parent );
+
+static const XMP_OptionBits kAVCHD_HandlerFlags = (kXMPFiles_CanInjectXMP |
+												   kXMPFiles_CanExpand |
+												   kXMPFiles_CanRewrite |
+												   kXMPFiles_PrefersInPlace |
+												   kXMPFiles_CanReconcile |
+												   kXMPFiles_AllowsOnlyXMP |
+												   kXMPFiles_ReturnsRawPacket |
+												   kXMPFiles_HandlerOwnsFile |
+												   kXMPFiles_AllowsSafeUpdate |
+												   kXMPFiles_FolderBasedFormat);
+
+class AVCHD_MetaHandler : public XMPFileHandler
+{
+public:
+
+	bool GetFileModDate ( XMP_DateTime * modDate );
+	void FillMetadataFiles ( std::vector<std::string> * metadataFiles );
+    void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	bool IsMetadataWritable ( );
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	XMP_OptionBits GetSerializeOptions()	// *** These should be standard for standalone XMP files.
+		{ return (kXMP_UseCompactFormat | kXMP_OmitPacketWrapper); };
+
+	AVCHD_MetaHandler ( XMPFiles * _parent );
+	virtual ~AVCHD_MetaHandler();
+
+private:
+
+	AVCHD_MetaHandler() {};	// Hidden on purpose.
+
+	bool MakeClipInfoPath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false ) const;
+	bool MakeClipStreamPath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false ) const;
+	bool MakePlaylistPath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false ) const;
+
+	void MakeLegacyDigest ( std::string * digestStr );
+
+	std::string rootPath, clipName;
+
+};	// AVCHD_MetaHandler
+
+// =================================================================================================
+
+#endif /* __AVCHD_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/Basic_Handler.cpp b/XMPFiles/source/FileHandlers/Basic_Handler.cpp
new file mode 100644
index 0000000..795dbd7
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Basic_Handler.cpp
@@ -0,0 +1,243 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/Basic_Handler.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file Basic_Handler.cpp
+/// \brief Base class for basic handlers that only process in-place XMP.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// Basic_MetaHandler::~Basic_MetaHandler
+// =====================================
+
+Basic_MetaHandler::~Basic_MetaHandler()
+{
+	// ! Inherit the base cleanup.
+
+}	// Basic_MetaHandler::~Basic_MetaHandler
+
+// =================================================================================================
+// Basic_MetaHandler::UpdateFile
+// =============================
+
+// ! This must be called from the destructor for all derived classes. It can't be called from the
+// ! Basic_MetaHandler destructor, by then calls to the virtual functions would not go to the
+// ! actual implementations for the derived class.
+
+void Basic_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	IgnoreParam ( doSafeUpdate );
+	XMP_Assert ( ! doSafeUpdate );	// Not supported at this level.
+	if ( ! this->needsUpdate ) return;
+
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+	std::string &    xmpPacket  = this->xmpPacket;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	this->CaptureFileEnding ( fileRef );	// ! Do this first, before any location info changes.
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "Basic_MetaHandler::UpdateFile - User abort", kXMPErr_UserAbort );
+	}
+
+	this->NoteXMPRemoval ( fileRef );
+	this->ShuffleTrailingContent ( fileRef );
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "Basic_MetaHandler::UpdateFile - User abort", kXMPErr_UserAbort );
+	}
+
+	XMP_Int64 tempLength = this->xmpFileOffset - this->xmpPrefixSize + this->trailingContentSize;
+	fileRef->Truncate ( tempLength );
+
+	packetInfo.offset = tempLength + this->xmpPrefixSize;
+	this->NoteXMPInsertion ( fileRef );
+
+	fileRef->ToEOF();
+	this->WriteXMPPrefix ( fileRef );
+	fileRef->Write ( xmpPacket.c_str(), (XMP_StringLen)xmpPacket.size() );
+	this->WriteXMPSuffix ( fileRef );
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "Basic_MetaHandler::UpdateFile - User abort", kXMPErr_UserAbort );
+	}
+
+	this->RestoreFileEnding ( fileRef );
+
+	this->xmpFileOffset = packetInfo.offset;
+	this->xmpFileSize = packetInfo.length;
+	this->needsUpdate = false;
+
+}	// Basic_MetaHandler::UpdateFile
+
+// =================================================================================================
+// Basic_MetaHandler::WriteTempFile
+// ================================
+
+// *** What about computing the new file length and pre-allocating the file?
+
+void Basic_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_IO* originalRef = this->parent->ioRef;
+
+	// Capture the "back" of the original file.
+
+	this->CaptureFileEnding ( originalRef );
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "Basic_MetaHandler::UpdateFile - User abort", kXMPErr_UserAbort );
+	}
+
+	// Seek to the beginning of the original and temp files, truncate the temp.
+
+	originalRef->Rewind();
+	tempRef->Rewind();
+	tempRef->Truncate ( 0 );
+
+	// Copy the front of the original file to the temp file. Note the XMP (pseudo) removal and
+	// insertion. This mainly updates info about the new XMP length.
+
+	XMP_Int64 xmpSectionOffset = this->xmpFileOffset - this->xmpPrefixSize;
+	XMP_Int32 oldSectionLength = this->xmpPrefixSize + this->xmpFileSize + this->xmpSuffixSize;
+
+	XIO::Copy ( originalRef, tempRef, xmpSectionOffset, abortProc, abortArg );
+	this->NoteXMPRemoval ( originalRef );
+	packetInfo.offset = this->xmpFileOffset;	// ! The packet offset does not change.
+	this->NoteXMPInsertion ( tempRef );
+	tempRef->ToEOF();
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "Basic_MetaHandler::WriteFile - User abort", kXMPErr_UserAbort );
+	}
+
+	// Write the new XMP section to the temp file.
+
+	this->WriteXMPPrefix ( tempRef );
+	tempRef->Write ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	this->WriteXMPSuffix ( tempRef );
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "Basic_MetaHandler::WriteFile - User abort", kXMPErr_UserAbort );
+	}
+
+	// Copy the trailing file content from the original and write the "back" of the file.
+
+	XMP_Int64 remainderOffset = xmpSectionOffset + oldSectionLength;
+
+	originalRef->Seek ( remainderOffset, kXMP_SeekFromStart );
+	XIO::Copy ( originalRef, tempRef, this->trailingContentSize, abortProc, abortArg );
+	this->RestoreFileEnding ( tempRef );
+
+	// Done.
+
+	this->xmpFileOffset = packetInfo.offset;
+	this->xmpFileSize = packetInfo.length;
+	this->needsUpdate = false;
+
+}	// Basic_MetaHandler::WriteTempFile
+
+// =================================================================================================
+// ShuffleTrailingContent
+// ======================
+//
+// Shuffle the trailing content portion of a file forward. This does not include the final "back"
+// portion of the file, just the arbitrary length content between the XMP section and the back.
+// Don't use XIO::Copy, that assumes separate files and hence separate I/O positions.
+
+// ! The XMP packet location and prefix/suffix sizes must still reflect the XMP section that is in
+// ! the process of being removed.
+
+void Basic_MetaHandler::ShuffleTrailingContent ( XMP_IO* fileRef )
+{
+	XMP_Int64 readOffset  = this->packetInfo.offset + xmpSuffixSize;
+	XMP_Int64 writeOffset = this->packetInfo.offset - xmpPrefixSize;
+
+	XMP_Int64 remainingLength = this->trailingContentSize;
+
+	enum { kBufferSize = 64*1024 };
+	char buffer [kBufferSize];
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	while ( remainingLength > 0 ) {
+
+		XMP_Int32 ioCount = kBufferSize;
+		if ( remainingLength < kBufferSize ) ioCount = (XMP_Int32)remainingLength;
+
+		fileRef->Seek ( readOffset, kXMP_SeekFromStart );
+		fileRef->ReadAll ( buffer, ioCount );
+		fileRef->Seek ( writeOffset, kXMP_SeekFromStart );
+		fileRef->Write ( buffer, ioCount );
+
+		readOffset  += ioCount;
+		writeOffset += ioCount;
+		remainingLength -= ioCount;
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "Basic_MetaHandler::ShuffleTrailingContent - User abort", kXMPErr_UserAbort );
+		}
+
+	}
+
+}	// ShuffleTrailingContent
+
+// =================================================================================================
+// Dummies needed for VS.Net
+// =========================
+
+void Basic_MetaHandler::WriteXMPPrefix ( XMP_IO* fileRef )
+{
+	XMP_Throw ( "Basic_MetaHandler::WriteXMPPrefix - Needs specific override", kXMPErr_InternalFailure );
+}
+
+void Basic_MetaHandler::WriteXMPSuffix ( XMP_IO* fileRef )
+{
+	XMP_Throw ( "Basic_MetaHandler::WriteXMPSuffix - Needs specific override", kXMPErr_InternalFailure );
+}
+
+void Basic_MetaHandler::NoteXMPRemoval ( XMP_IO* fileRef )
+{
+	XMP_Throw ( "Basic_MetaHandler::NoteXMPRemoval - Needs specific override", kXMPErr_InternalFailure );
+}
+
+void Basic_MetaHandler::NoteXMPInsertion ( XMP_IO* fileRef )
+{
+	XMP_Throw ( "Basic_MetaHandler::NoteXMPInsertion - Needs specific override", kXMPErr_InternalFailure );
+}
+
+void Basic_MetaHandler::CaptureFileEnding ( XMP_IO* fileRef )
+{
+	XMP_Throw ( "Basic_MetaHandler::CaptureFileEnding - Needs specific override", kXMPErr_InternalFailure );
+}
+
+void Basic_MetaHandler::RestoreFileEnding ( XMP_IO* fileRef )
+{
+	XMP_Throw ( "Basic_MetaHandler::RestoreFileEnding - Needs specific override", kXMPErr_InternalFailure );
+}
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/Basic_Handler.hpp b/XMPFiles/source/FileHandlers/Basic_Handler.hpp
new file mode 100644
index 0000000..d5fca0f
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Basic_Handler.hpp
@@ -0,0 +1,117 @@
+#ifndef __Basic_Handler_hpp__
+#define __Basic_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+// =================================================================================================
+/// \file Basic_Handler.hpp
+///
+/// \brief Base class for handlers that support a simple file model allowing insertion and expansion
+/// of XMP, but probably not reconciliation with other forms of metadata. Reconciliation would have
+/// to be done within the I/O model presented here.
+///
+/// \note Any specific derived handler might not be able to do insertion, but all must support
+/// expansion. If a handler can't do either it should be derived from Trivial_Handler. Common code
+/// must check the actual canInject flag where appropriate.
+///
+/// The model for a basic handler divides the file into 6 portions:
+///
+/// \li The front of the file. This portion can be arbitrarily large. Files over 4GB are supported.
+/// Adding or expanding the XMP must not require expanding this portion of the file. The XMP offset
+/// or length might be written into reserved space in this section though.
+///
+/// \li A prefix for the XMP section. The prefix and suffix for the XMP "section" are the format
+/// specific portions that surround the raw XMP packet. They must be generated on the fly, even when
+/// updating existing XMP with or without expansion. Their length must not depend on the XMP packet.
+///
+/// \li The XMP packet, as created by SXMPMeta::SerializeToBuffer. The size must be less than 2GB.
+///
+/// \li A suffix for the XMP section.
+///
+/// \li Trailing file content. This portion can be arbitarily large. It must be possible to remove
+/// the XMP, move this portion of the file forward, then reinsert the XMP after this portion. This
+/// is actually how the XMP is expanded. There must not be any embedded file offsets in this part,
+/// this content must not change if the XMP changes size.
+///
+/// \li The back of the file. This portion must have modest size, and/or be generated on the fly.
+/// When inserting XMP, part of this may be buffered in RAM (hence the modest size requirement), the
+/// XMP section is written, then this portion is rewritten. There must not be any embedded file
+/// offsets in this part, this content must not change if the XMP changes size.
+///
+/// \note There is no general promise here about crash-safe I/O. An update to an existing file might
+/// have invalid partial state, for example while moving the trailing content portion forward if the
+/// XMP increases in size or even rewriting existing XMP in-place. Crash-safe updates are managed at
+/// a higher level of XMPFiles, using a temporary file and final swap of file content.
+///
+// =================================================================================================
+
+static const XMP_OptionBits kBasic_HandlerFlags = (kXMPFiles_CanInjectXMP |
+                                                   kXMPFiles_CanExpand |
+                                                   kXMPFiles_CanRewrite |
+                                                   kXMPFiles_PrefersInPlace |
+                                                   kXMPFiles_AllowsOnlyXMP |
+                                                   kXMPFiles_ReturnsRawPacket |
+                                                   kXMPFiles_AllowsSafeUpdate);
+
+class Basic_MetaHandler : public XMPFileHandler
+{
+public:
+
+	Basic_MetaHandler() :
+		xmpFileOffset(0), xmpFileSize(0), xmpPrefixSize(0), xmpSuffixSize(0), trailingContentSize(0) {};
+	~Basic_MetaHandler();
+
+	virtual void CacheFileData() = 0;	// Sets offset for insertion if no XMP yet.
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+protected:
+
+	// Write a cached or fixed prefix or suffix for the XMP. The file is passed because it could be
+	// either the original file or a safe-update temp file.
+	virtual void WriteXMPPrefix ( XMP_IO* fileRef ) = 0;	// ! Must have override in actual handlers!
+	virtual void WriteXMPSuffix ( XMP_IO* fileRef ) = 0;	// ! Must have override in actual handlers!
+
+	// Note that the XMP is being removed or inserted. The file is passed because it could be either
+	// the original file or a safe-update temp file.
+	virtual void NoteXMPRemoval ( XMP_IO* fileRef ) = 0;	// ! Must have override in actual handlers!
+	virtual void NoteXMPInsertion ( XMP_IO* fileRef ) = 0;	// ! Must have override in actual handlers!
+
+	// Capture or restore the tail portion of the file. The file is passed because it could be either
+	// the original file or a safe-update temp file.
+	virtual void CaptureFileEnding ( XMP_IO* fileRef ) = 0;	// ! Must have override in actual handlers!
+	virtual void RestoreFileEnding ( XMP_IO* fileRef ) = 0;	// ! Must have override in actual handlers!
+
+	// Move the trailing content portion forward. Excludes "back" of the file. The file is passed
+	// because it could be either the original file or a safe-update temp file.
+	void ShuffleTrailingContent ( XMP_IO* fileRef );	// Has a common implementation.
+
+	XMP_Uns64 xmpFileOffset;	// The offset of the XMP in the file.
+	XMP_Uns32 xmpFileSize;	// The size of the XMP in the file.
+		// ! The packetInfo offset and length are updated by PutXMP, before the file is updated!
+
+	XMP_Uns32 xmpPrefixSize;	// The size of the existing header for the XMP section.
+	XMP_Uns32 xmpSuffixSize;	// The size of the existing trailer for the XMP section.
+
+	XMP_Uns64 trailingContentSize;	// The size of the existing trailing content. Excludes "back" of the file.
+
+};	// Basic_MetaHandler
+
+// =================================================================================================
+
+#endif /* __Basic_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.cpp b/XMPFiles/source/FileHandlers/FLV_Handler.cpp
new file mode 100644
index 0000000..db6ae4b
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/FLV_Handler.cpp
@@ -0,0 +1,762 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FileHandlers/FLV_Handler.hpp"
+
+#include "source/XIO.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+
+using namespace std;
+
+// =================================================================================================
+/// \file FLV_Handler.cpp
+/// \brief File format handler for FLV.
+///
+/// FLV is a fairly simple format, with a strong orientation to streaming use. It consists of a
+/// small file header then a sequence of tags that can contain audio data, video data, or
+/// ActionScript data. All integers in FLV are big endian.
+///
+/// For FLV version 1, the file header contains:
+///
+///   UI24 signature - the characters "FLV"
+///   UI8 version - 1
+///   UI8 flags - 0x01 = has video tags, 0x04 = has audio tags
+///   UI32 length in bytes of file header
+///
+/// For FLV version 1, each tag begins with an 11 byte header:
+///
+///   UI8 tag type - 8 = audio tag, 9 = video tag, 18 = script data tag
+///   UI24 content length in bytes
+///   UI24 time - low order 3 bytes
+///   UI8 time - high order byte
+///   UI24 stream ID
+///
+/// This is followed by the tag's content, then a UI32 "back pointer" which is the header size plus
+/// the content size. A UI32 zero is placed between the file header and the first tag as a
+/// terminator for backward scans. The time in a tag header is the start of playback for that tag.
+/// The tags must be in ascending time order. For a given time it is preferred that script data tags
+/// precede audio and video tags.
+///
+/// For metadata purposes only the script data tags are of interest. Script data information becomes
+/// accessible to ActionScript at the playback moment of the script data tag through a call to a
+/// registered data handler. The content of a script data tag contains a string and an ActionScript
+/// data value. The string is the name of the handler to be invoked, the data value is passed as an
+/// ActionScript Object parameter to the handler.
+///
+/// The XMP is placed in a script data tag with the name "onXMPData". A variety of legacy metadata
+/// is contained in a script data tag with the name "onMetaData". This contains only "internal"
+/// information (like duration or width/height), nothing that is user or author editiable (like
+/// title or description). Some of these legacy items are imported into the XMP, none are updated
+/// from the XMP.
+///
+/// A script data tag's content is:
+///
+///   UI8 0x02
+///   UI16 name length - includes nul terminator if present
+///   UI8n object name - UTF-8, possibly with nul terminator
+///   ...  object value - serialized ActionScript value (SCRIPTDATAVALUE in FLV spec)
+///
+/// The onXMPData and onMetaData values are both ECMA arrays. These have more in common with XMP
+/// structs than arrays, the items have arbitrary string names. The serialized form is:
+///
+///   UI8 0x08
+///   UI32 array length - need not be exact, an optimization hint
+///   array items
+///      UI16 name length - includes nul terminator if present
+///      UI8n item name - UTF-8, possibly with nul terminator
+///      ...  object value - serialized ActionScript value (SCRIPTDATAVALUE in FLV spec)
+///   UI24 0x000009 - array terminator
+///
+/// The object names and array item names in sample files do not have a nul terminator. The policy
+/// here is to treat them as optional when reading, and to omit them when writing.
+///
+/// The onXMPData array typically has one item named "liveXML". The value of this is a short or long
+/// string as necessary:
+///
+///   UI8 type - 2 for a short string, 12 for a long string
+///   UIx value length - UI16 for a short string, UI32 for a long string, includes nul terminator
+///   UI8n value - UTF-8 with nul terminator
+///
+// =================================================================================================
+
+static inline XMP_Uns32 GetUns24BE ( const void * addr )
+{
+	return (GetUns32BE(addr) >> 8);
+}
+
+static inline void PutUns24BE ( XMP_Uns32 value, void * addr )
+{
+	XMP_Uns8 * bytes = (XMP_Uns8*)addr;
+	bytes[0] = (XMP_Uns8)(value >> 16);
+	bytes[1] = (XMP_Uns8)(value >> 8);
+	bytes[2] = (XMP_Uns8)(value);
+}
+
+// =================================================================================================
+// FLV_CheckFormat
+// ===============
+//
+// Check for "FLV" and 1 in the first 4 bytes, that the header length is at least 9, that the file
+// size is at least as big as the header, and that the leading 0 back pointer is present if the file
+// is bigger than the header.
+
+#define kFLV1 0x464C5601UL
+
+bool FLV_CheckFormat ( XMP_FileFormat format,
+					   XMP_StringPtr  filePath,
+					   XMP_IO*    fileRef,
+					   XMPFiles *     parent )
+{
+	XMP_Uns8 buffer [9];
+
+	fileRef->Rewind();
+	XMP_Uns32 ioCount = fileRef->Read ( buffer, 9 );
+	if ( ioCount != 9 ) return false;
+
+	XMP_Uns32 fileSignature = GetUns32BE ( &buffer[0] );
+	if ( fileSignature != kFLV1 ) return false;
+
+	XMP_Uns32 headerSize = GetUns32BE ( &buffer[5] );
+	XMP_Uns64 fileSize   = fileRef->Length();
+	if ( (fileSize < (headerSize + 4)) && (fileSize != headerSize) ) return false;
+
+	if ( fileSize >= (headerSize + 4) ) {
+		XMP_Uns32 bpZero;
+		fileRef->Seek ( headerSize, kXMP_SeekFromStart );
+		ioCount = fileRef->Read ( &bpZero, 4 );
+		if ( (ioCount != 4) || (bpZero != 0) ) return false;
+	}
+
+	return true;
+
+}	// FLV_CheckFormat
+
+// =================================================================================================
+// FLV_MetaHandlerCTor
+// ===================
+
+XMPFileHandler * FLV_MetaHandlerCTor ( XMPFiles * parent )
+{
+
+	return new FLV_MetaHandler ( parent );
+
+}	// FLV_MetaHandlerCTor
+
+// =================================================================================================
+// FLV_MetaHandler::FLV_MetaHandler
+// ================================
+
+FLV_MetaHandler::FLV_MetaHandler ( XMPFiles * _parent )
+	: flvHeaderLen(0), longXMP(false), xmpTagPos(0), omdTagPos(0), xmpTagLen(0), omdTagLen(0)
+{
+
+	this->parent = _parent;	// Inherited, can't set in the prefix.
+	this->handlerFlags = kFLV_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}	// FLV_MetaHandler::FLV_MetaHandler
+
+// =================================================================================================
+// FLV_MetaHandler::~FLV_MetaHandler
+// =================================
+
+FLV_MetaHandler::~FLV_MetaHandler()
+{
+
+	// Nothing to do yet.
+
+}	// FLV_MetaHandler::~FLV_MetaHandler
+
+// =================================================================================================
+// GetTagInfo
+// ==========
+//
+// Seek to the start of a tag and extract the type, data size, and timestamp. Leave the file
+// positioned at the first byte of data.
+
+struct TagInfo {
+	XMP_Uns8  type;
+	XMP_Uns32 time;
+	XMP_Uns32 dataSize;
+};
+
+static void GetTagInfo ( XMP_IO* fileRef, XMP_Uns64 tagPos, TagInfo * info )
+{
+	XMP_Uns8 buffer [11];
+
+	fileRef->Seek ( tagPos, kXMP_SeekFromStart );
+	fileRef->ReadAll ( buffer, 11 );
+
+	info->type = buffer[0];
+	info->time = GetUns24BE ( &buffer[4] ) || (buffer[7] << 24);
+	info->dataSize = GetUns24BE ( &buffer[1] );
+
+}	// GetTagInfo
+
+// =================================================================================================
+// GetASValueLen
+// =============
+//
+// Return the full length of a serialized ActionScript value, including the type byte, zero if unknown.
+
+static XMP_Uns32 GetASValueLen ( const XMP_Uns8 * asValue, const XMP_Uns8 * asLimit )
+{
+	XMP_Uns32 valueLen = 0;
+	const XMP_Uns8 * itemPtr;
+	XMP_Uns32 arrayCount;
+
+	switch ( asValue[0] ) {
+
+		case 0 :	// IEEE double
+			valueLen = 1 + 8;
+			break;
+
+		case 1 :	// UI8 Boolean
+			valueLen = 1 + 1;
+			break;
+
+		case 2 :	// Short string
+			valueLen = 1 + 2 + GetUns16BE ( &asValue[1] );
+			break;
+
+		case 3 :	// ActionScript object, a name and value.
+			itemPtr = &asValue[1];
+			itemPtr += 2 + GetUns16BE ( itemPtr );	// Move past the name portion.
+			itemPtr += GetASValueLen ( itemPtr, asLimit );	// And past the data portion.
+			valueLen = (XMP_Uns32) (itemPtr - asValue);
+			break;
+
+		case 4 :	// Short string (movie clip path)
+			valueLen = 1 + 2 + GetUns16BE ( &asValue[1] );
+			break;
+
+		case 5 :	// Null
+			valueLen = 1;
+			break;
+
+		case 6 :	// Undefined
+			valueLen = 1;
+			break;
+
+		case 7 :	// UI16 reference ID
+			valueLen = 1 + 2;
+			break;
+
+		case 8 :	// ECMA array, ignore the count, look for the 0x000009 terminator.
+			itemPtr = &asValue[5];
+			while ( itemPtr < asLimit ) {
+				XMP_Uns16 nameLen = GetUns16BE ( itemPtr );
+				itemPtr += 2 + nameLen;	// Move past the name portion.
+				if ( (nameLen == 0) && (*itemPtr == 9) ) {
+					itemPtr += 1;
+					break;	// Done, found the 0x000009 terminator.
+				}
+				itemPtr += GetASValueLen ( itemPtr, asLimit );	// And past the data portion.
+			}
+			valueLen = (XMP_Uns32) (itemPtr - asValue);
+			break;
+
+		case 10 :	// Strict array, has an exact count.
+			arrayCount = GetUns32BE ( &asValue[1] );
+			itemPtr = &asValue[5];
+			for ( ; (arrayCount > 0) && (itemPtr < asLimit); --arrayCount ) {
+				itemPtr += 2 + GetUns16BE ( itemPtr );	// Move past the name portion.
+				itemPtr += GetASValueLen ( itemPtr, asLimit );	// And past the data portion.
+			}
+			valueLen = (XMP_Uns32) (itemPtr - asValue);
+			break;
+
+		case 11 :	// Date
+			valueLen = 1 + 8 + 2;
+			break;
+
+		case  12:	// Long string
+			valueLen = 1 + 4 + GetUns32BE ( &asValue[1] );
+			break;
+
+	}
+
+	return valueLen;
+
+}	// GetASValueLen
+
+// =================================================================================================
+// CheckName
+// =========
+//
+// Check for the name portion of a script data tag or array item, with optional nul terminator. The
+// wantedLen must not count the terminator.
+
+static inline bool CheckName ( XMP_StringPtr inputName,  XMP_Uns16 inputLen,
+							   XMP_StringPtr wantedName, XMP_Uns16 wantedLen )
+{
+
+	if ( inputLen == wantedLen+1 ) {
+		if ( inputName[wantedLen] != 0 ) return false;	// Extra byte must be terminating nul.
+		--inputLen;
+	}
+
+	if ( (inputLen == wantedLen) && XMP_LitNMatch ( inputName, wantedName, wantedLen ) ) return true;
+	return false;
+
+}	// CheckName
+
+// =================================================================================================
+// FLV_MetaHandler::CacheFileData
+// ==============================
+//
+// Look for the onXMPData and onMetaData script data tags at time 0. Cache all of onMetaData, it
+// shouldn't be that big and this removes a need to know what is reconciled. It can't be more than
+// 16MB anyway, the size field is only 24 bits.
+
+void FLV_MetaHandler::CacheFileData()
+{
+	XMP_Assert ( ! this->containsXMP );
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_IO* fileRef  = this->parent->ioRef;
+	XMP_Uns64   fileSize = fileRef->Length();
+
+	XMP_Uns8  buffer [16];	// Enough for 1+2+"onMetaData"+nul.
+	XMP_Uns32 ioCount;
+	TagInfo   info;
+
+	fileRef->Seek ( 5, kXMP_SeekFromStart );
+	fileRef->ReadAll ( buffer, 4 );
+
+	this->flvHeaderLen = GetUns32BE ( &buffer[0] );
+	XMP_Uns32 firstTagPos = this->flvHeaderLen + 4;	// Include the initial zero back pointer.
+
+	if ( firstTagPos >= fileSize ) return;	// Quit now if the file is just a header.
+
+	for ( XMP_Uns64 tagPos = firstTagPos; tagPos < fileSize; tagPos += (11 + info.dataSize + 4) ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "FLV_MetaHandler::LookForMetadata - User abort", kXMPErr_UserAbort );
+		}
+
+		GetTagInfo ( fileRef, tagPos, &info );	// ! GetTagInfo seeks to the tag offset.
+		if ( info.time != 0 ) break;
+		if ( info.type != 18 ) continue;
+
+		XMP_Assert ( sizeof(buffer) >= (1+2+10+1) );	// 02 000B onMetaData 00
+		ioCount = fileRef->Read ( buffer, sizeof(buffer) );
+		if ( (ioCount < 4) || (buffer[0] != 0x02) ) continue;
+
+		XMP_Uns16     nameLen = GetUns16BE ( &buffer[1] );
+		XMP_StringPtr namePtr = (XMP_StringPtr)(&buffer[3]);
+
+		if ( this->onXMP.empty() && CheckName ( namePtr, nameLen, "onXMPData", 9 ) ) {
+
+			// ! Put the raw data in onXMPData, analyze the value in ProcessXMP.
+
+			this->xmpTagPos = tagPos;
+			this->xmpTagLen = 11 + info.dataSize + 4;	// ! Includes the trailing back pointer.
+
+			this->packetInfo.offset = tagPos + 11 + 1+2+nameLen;	// ! Not the real offset yet, the offset of the onXMPData value.
+
+			ioCount = info.dataSize - (1+2+nameLen);	// Just the onXMPData value portion.
+			this->onXMP.reserve ( ioCount );
+			this->onXMP.assign ( ioCount, ' ' );
+			fileRef->Seek ( this->packetInfo.offset, kXMP_SeekFromStart );
+			fileRef->ReadAll ( (void*)this->onXMP.data(), ioCount );
+
+			if ( ! this->onMetaData.empty() ) break;	// Done if we've found both.
+
+		} else if ( this->onMetaData.empty() && CheckName ( namePtr, nameLen, "onMetaData", 10 ) ) {
+
+			this->omdTagPos  = tagPos;
+			this->omdTagLen  = 11 + info.dataSize + 4;	// ! Includes the trailing back pointer.
+
+			ioCount = info.dataSize - (1+2+nameLen);	// Just the onMetaData value portion.
+			this->onMetaData.reserve ( ioCount );
+			this->onMetaData.assign ( ioCount, ' ' );
+			fileRef->Seek ( (tagPos + 11 + 1+2+nameLen), kXMP_SeekFromStart );
+			fileRef->ReadAll ( (void*)this->onMetaData.data(), ioCount );
+
+			if ( ! this->onXMP.empty() ) break;	// Done if we've found both.
+
+		}
+
+	}
+
+}	// FLV_MetaHandler::CacheFileData
+
+// =================================================================================================
+// FLV_MetaHandler::MakeLegacyDigest
+// =================================
+
+#define kHexDigits "0123456789ABCDEF"
+
+void FLV_MetaHandler::MakeLegacyDigest ( std::string * digestStr )
+{
+	MD5_CTX    context;
+	unsigned char digestBin [16];
+
+	MD5Init ( &context );
+	MD5Update ( &context, (XMP_Uns8*)this->onMetaData.data(), (unsigned int)this->onMetaData.size() );
+	MD5Final ( digestBin, &context );
+
+	char buffer [40];
+	for ( int in = 0, out = 0; in < 16; in += 1, out += 2 ) {
+		XMP_Uns8 byte = digestBin[in];
+		buffer[out]   = kHexDigits [ byte >> 4 ];
+		buffer[out+1] = kHexDigits [ byte & 0xF ];
+	}
+	buffer[32] = 0;
+	digestStr->erase();
+	digestStr->append ( buffer, 32 );
+
+}	// FLV_MetaHandler::MakeLegacyDigest
+
+// =================================================================================================
+// FLV_MetaHandler::ExtractLiveXML
+// ===============================
+//
+// Extract the XMP packet from the cached onXMPData ECMA array's "liveXMP" item.
+
+void FLV_MetaHandler::ExtractLiveXML()
+{
+	if ( this->onXMP[0] != 0x08 ) return;	// Make sure onXMPData is an ECMA array.
+	const XMP_Uns8 * ecmaArray = (const XMP_Uns8 *) this->onXMP.c_str();
+	const XMP_Uns8 * ecmaLimit = ecmaArray + this->onXMP.size();
+
+	if ( this->onXMP.size() >= 3 ) {	// Omit the 0x000009 terminator, simplifies the loop.
+		if ( GetUns24BE ( ecmaLimit-3 ) == 9 ) ecmaLimit -= 3;
+	}
+
+	for ( const XMP_Uns8 * itemPtr = ecmaArray + 5; itemPtr < ecmaLimit; /* internal increment */ ) {
+
+		// Find the "liveXML" array item, make sure it is a short or long string.
+
+		XMP_Uns16 nameLen = GetUns16BE ( itemPtr );
+		const XMP_Uns8 * namePtr = itemPtr + 2;
+
+		itemPtr += (2 + nameLen);	// Move to the value portion.
+		XMP_Uns32 valueLen = GetASValueLen ( itemPtr, ecmaLimit );
+		if ( valueLen == 0 ) return;	// ! Unknown value type, can't look further.
+
+		if ( CheckName ( (char*)namePtr, nameLen, "liveXML", 7 ) ) {
+
+			XMP_Uns32 lenLen = 2;	// Assume a short string.
+			if ( *itemPtr == 12 ) {
+				lenLen = 4;
+				this->longXMP = true;
+			} else if ( *itemPtr != 2 ) {
+				return;	// Not a short or long string.
+			}
+
+			valueLen -= (1 + lenLen);
+			itemPtr += (1 + lenLen);
+
+			this->packetInfo.offset += (itemPtr - ecmaArray);
+			this->packetInfo.length += valueLen;
+
+			this->xmpPacket.reserve ( valueLen );
+			this->xmpPacket.assign ( (char*)itemPtr, valueLen );
+
+			return;
+
+		}
+
+		itemPtr += valueLen;	// Move past the value portion.
+
+	}
+
+}	// FLV_MetaHandler::ExtractLiveXML
+
+// =================================================================================================
+// FLV_MetaHandler::ProcessXMP
+// ===========================
+
+void FLV_MetaHandler::ProcessXMP()
+{
+	if ( this->processedXMP ) return;
+	this->processedXMP = true;	// Make sure only called once.
+
+	if ( ! this->onXMP.empty() ) {	// Look for the XMP packet.
+
+		this->ExtractLiveXML();
+		if ( ! this->xmpPacket.empty() ) {
+			FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+			this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+			this->containsXMP = true;
+		}
+
+	}
+
+	// Now process the legacy, if necessary.
+
+	if ( this->onMetaData.empty() ) return;	// No legacy, we're done.
+
+	std::string oldDigest;
+	bool oldDigestFound = this->xmpObj.GetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "FLV", &oldDigest, 0 );
+
+	if ( oldDigestFound ) {
+		std::string newDigest;
+		this->MakeLegacyDigest ( &newDigest );
+		if ( oldDigest == newDigest ) return;	// No legacy changes.
+	}
+
+	// *** No spec yet for what legacy to reconcile.
+
+}	// FLV_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// FLV_MetaHandler::UpdateFile
+// ===========================
+
+void FLV_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) return;
+	XMP_Assert ( ! doSafeUpdate );	// This should only be called for "unsafe" updates.
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_IO* fileRef  = this->parent->ioRef;
+	XMP_Uns64   fileSize = fileRef->Length();
+
+	// Make sure the XMP has a legacy digest if appropriate.
+
+	if ( ! this->onMetaData.empty() ) {
+
+		std::string newDigest;
+		this->MakeLegacyDigest ( &newDigest );
+		this->xmpObj.SetStructField ( kXMP_NS_XMP, "NativeDigests",
+									  kXMP_NS_XMP, "FLV", newDigest.c_str(), kXMP_DeleteExisting );
+
+		try {
+			XMP_StringLen xmpLen = (XMP_StringLen)this->xmpPacket.size();
+			this->xmpObj.SerializeToBuffer ( &this->xmpPacket, (kXMP_UseCompactFormat | kXMP_ExactPacketLength), xmpLen );
+		} catch ( ... ) {
+			this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+		}
+
+	}
+
+	// Rewrite the packet in-place if it fits. Otherwise rewrite the whole file.
+
+	if ( this->xmpPacket.size() == (size_t)this->packetInfo.length ) {
+		XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+		if ( progressTracker != 0 ) progressTracker->BeginWork ( (float)this->xmpPacket.size() );
+		fileRef->Seek ( this->packetInfo.offset, kXMP_SeekFromStart );
+		fileRef->Write ( this->xmpPacket.data(), (XMP_Int32)this->xmpPacket.size() );
+		if ( progressTracker != 0 ) progressTracker->WorkComplete();
+
+
+	} else {
+
+		XMP_IO* tempRef = fileRef->DeriveTemp();
+		if ( tempRef == 0 ) XMP_Throw ( "Failure creating FLV temp file", kXMPErr_InternalFailure );
+
+		this->WriteTempFile ( tempRef );
+		fileRef->AbsorbTemp();
+
+	}
+
+	this->needsUpdate = false;
+
+}	// FLV_MetaHandler::UpdateFile
+
+// =================================================================================================
+// WriteOnXMP
+// ==========
+//
+// Write the XMP packet wrapped up in an ECMA array script data tag:
+//
+//    0 UI8  tag type : 18
+//    1 UI24 content length : 1+2+9+1+4+2+7+1 + <2 or 4> + XMP packet size + 1 + 3
+//    4 UI24 time low : 0
+//    7 UI8  time high : 0
+//    8 UI24 stream ID : 0
+//
+//   11 UI8  0x02
+//   12 UI16 name length : 9
+//   14 str9 tag name : "onXMPData", no nul terminator
+//   23 UI8  value type : 8
+//   24 UI32 array count : 1
+//   28 UI16 name length : 7
+//   30 str7 item name : "liveXML", no nul terminator
+//
+//   37 UI8  value type : 2 for a short string, 12 for a long string
+//   38 UIn  XMP packet size + 1, UI16 or UI32 as needed
+//   -- str  XMP packet, with nul terminator
+//
+//   -- UI24 array terminator : 0x000009
+//   -- UI32 back pointer : content length + 11
+
+static void WriteOnXMP ( XMP_IO* fileRef, const std::string & xmpPacket )
+{
+	char buffer [64];
+	bool longXMP = false;
+	XMP_Uns32 tagLen = 1+2+9+1+4+2+7+1 + 2 + (XMP_Uns32)xmpPacket.size() + 1 + 3;
+
+	if ( xmpPacket.size() > 0xFFFE ) {
+		longXMP = true;
+		tagLen += 2;
+	}
+
+	if ( tagLen > 16*1024*1024 ) XMP_Throw ( "FLV tags can't be larger than 16MB", kXMPErr_TBD );
+
+	// Fill in the script data tag header.
+
+	buffer[0] = 18;
+	PutUns24BE ( tagLen, &buffer[1] );
+	PutUns24BE ( 0, &buffer[4] );
+	buffer[7] = 0;
+	PutUns24BE ( 0, &buffer[8] );
+
+	// Fill in the "onXMPData" name, ECMA array start, and "liveXML" name.
+
+	buffer[11] = 2;
+	PutUns16BE ( 9, &buffer[12] );
+	memcpy ( &buffer[14], "onXMPData", 9 );	// AUDIT: Safe, buffer has 64 chars.
+	buffer[23] = 8;
+	PutUns32BE ( 1, &buffer[24] );
+	PutUns16BE ( 7, &buffer[28] );
+	memcpy ( &buffer[30], "liveXML", 7 );	// AUDIT: Safe, buffer has 64 chars.
+
+	// Fill in the XMP packet string type and length, write what we have so far.
+
+	fileRef->ToEOF();
+	if ( ! longXMP ) {
+		buffer[37] = 2;
+		PutUns16BE ( (XMP_Uns16)xmpPacket.size()+1, &buffer[38] );
+		fileRef->Write ( buffer, 40 );
+	} else {
+		buffer[37] = 12;
+		PutUns32BE ( (XMP_Uns32)xmpPacket.size()+1, &buffer[38] );
+		fileRef->Write ( buffer, 42 );
+	}
+
+	//  Write the XMP packet, nul terminator, array terminator, and back pointer.
+
+	fileRef->Write ( xmpPacket.c_str(), (XMP_Int32)xmpPacket.size()+1 );
+	PutUns24BE ( 9, &buffer[0] );
+	PutUns32BE ( tagLen+11, &buffer[3] );
+	fileRef->Write ( buffer, 7 );
+
+}	// WriteOnXMP
+
+// =================================================================================================
+// FLV_MetaHandler::WriteTempFile
+// ==============================
+//
+// Use a source (old) file and the current XMP to build a destination (new) file. All of the source
+// file is copied except for previous XMP. The current XMP is inserted after onMetaData, or at least
+// before the first time 0 audio or video tag.
+
+// ! We do not currently update anything in onMetaData.
+
+void FLV_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	if ( ! this->needsUpdate ) return;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_IO* originalRef = this->parent->ioRef;
+
+	XMP_Uns64 sourceLen = originalRef->Length();
+	XMP_Uns64 sourcePos = 0;
+
+	originalRef->Rewind();
+	tempRef->Rewind();
+	tempRef->Truncate ( 0 );
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+	if ( progressTracker != 0 ) {
+		float fileSize=(float)(this->xmpPacket.size()+48);
+		if ( this->omdTagPos == 0 ) {
+			sourcePos=(this->flvHeaderLen+4);
+			fileSize+=sourcePos;
+		} else {
+			if ( this->xmpTagPos < this->omdTagPos ) {
+				fileSize+=this->xmpTagPos;
+			}
+			fileSize+=(this->omdTagPos + this->omdTagLen-
+				((this->xmpTagPos!=0 && this->xmpTagPos < this->omdTagPos)?
+				(this->xmpTagPos + this->xmpTagLen):0));
+			sourcePos =this->omdTagPos + this->omdTagLen;
+		}
+		if ( (this->xmpTagPos != 0) && (this->xmpTagPos >= sourcePos) ) {
+			fileSize+=(this->xmpTagPos - sourcePos);
+			sourcePos=this->xmpTagPos + this->xmpTagLen;
+		}
+		fileSize+=(sourceLen - sourcePos);
+		sourcePos=0;
+		progressTracker->BeginWork ( fileSize );
+	}
+	// First do whatever is needed to put the new XMP after any existing onMetaData tag, or as the
+	// first time 0 tag.
+
+	if ( this->omdTagPos == 0 ) {
+
+		// There is no onMetaData tag. Copy the file header, then write the new XMP as the first tag.
+		// Allow the degenerate case of a file with just a header, no initial back pointer or tags.
+
+		originalRef->Seek ( sourcePos, kXMP_SeekFromStart );
+		XIO::Copy ( originalRef, tempRef, this->flvHeaderLen, abortProc, abortArg );
+
+		XMP_Uns32 zero = 0;	// Ensure that the initial back offset really is zero.
+		tempRef->Write ( &zero, 4 );
+		sourcePos = this->flvHeaderLen + 4;
+
+		WriteOnXMP ( tempRef, this->xmpPacket );
+
+	} else {
+
+		// There is an onMetaData tag. Copy the front of the file through the onMetaData tag,
+		// skipping any XMP that happens to be in the way. The XMP should not be before onMetaData,
+		// but let's be robust. Write the new XMP immediately after onMetaData, at the same time.
+
+		XMP_Uns64 omdEnd = this->omdTagPos + this->omdTagLen;
+
+		if ( (this->xmpTagPos != 0) && (this->xmpTagPos < this->omdTagPos) ) {
+			// The XMP tag was in front of the onMetaData tag. Copy up to it, then skip it.
+			originalRef->Seek ( sourcePos, kXMP_SeekFromStart );
+			XIO::Copy ( originalRef, tempRef, this->xmpTagPos, abortProc, abortArg );
+			sourcePos = this->xmpTagPos + this->xmpTagLen;	// The tag length includes the trailing size field.
+		}
+
+		// Copy through the onMetaData tag, then write the XMP.
+		originalRef->Seek ( sourcePos, kXMP_SeekFromStart );
+		XIO::Copy ( originalRef, tempRef, (omdEnd - sourcePos), abortProc, abortArg );
+		sourcePos = omdEnd;
+
+		WriteOnXMP ( tempRef, this->xmpPacket );
+
+	}
+
+	// Copy the rest of the file, skipping any XMP that is in the way.
+
+	if ( (this->xmpTagPos != 0) && (this->xmpTagPos >= sourcePos) ) {
+		originalRef->Seek ( sourcePos, kXMP_SeekFromStart );
+		XIO::Copy ( originalRef, tempRef, (this->xmpTagPos - sourcePos), abortProc, abortArg );
+		sourcePos = this->xmpTagPos + this->xmpTagLen;
+	}
+
+	originalRef->Seek ( sourcePos, kXMP_SeekFromStart );
+	XIO::Copy ( originalRef, tempRef, (sourceLen - sourcePos), abortProc, abortArg );
+
+	this->needsUpdate = false;
+	
+	if (  progressTracker != 0  ) progressTracker->WorkComplete();
+
+}	// FLV_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.hpp b/XMPFiles/source/FileHandlers/FLV_Handler.hpp
new file mode 100644
index 0000000..fe129de
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/FLV_Handler.hpp
@@ -0,0 +1,81 @@
+#ifndef __FLV_Handler_hpp__
+#define __FLV_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+//  ================================================================================================
+/// \file FLV_Handler.hpp
+/// \brief File format handler for FLV.
+///
+/// This header ...
+///
+//  ================================================================================================
+
+extern XMPFileHandler * FLV_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool FLV_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+							  XMP_IO*        fileRef,
+							  XMPFiles *     parent );
+
+static const XMP_OptionBits kFLV_HandlerFlags = ( kXMPFiles_CanInjectXMP |
+												  kXMPFiles_CanExpand |
+												  kXMPFiles_CanRewrite |
+												  kXMPFiles_PrefersInPlace |
+												  kXMPFiles_CanReconcile |
+												  kXMPFiles_AllowsOnlyXMP |
+												  kXMPFiles_ReturnsRawPacket |
+												  kXMPFiles_AllowsSafeUpdate |
+												  kXMPFiles_CanNotifyProgress
+												);
+
+class FLV_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+
+	FLV_MetaHandler ( XMPFiles * _parent );
+	virtual ~FLV_MetaHandler();
+
+private:
+
+	FLV_MetaHandler() : flvHeaderLen(0), longXMP(false),
+						xmpTagPos(0), omdTagPos(0), xmpTagLen(0), omdTagLen(0) {};	// Hidden on purpose.
+
+	void ExtractLiveXML();
+	void MakeLegacyDigest ( std::string * digestStr );
+
+	XMP_Uns32 flvHeaderLen;
+	bool longXMP;	// True if the stored XMP is a long string (4 byte length).
+
+	XMP_Uns64 xmpTagPos, omdTagPos;	// The file offset and length of onXMP and onMetaData tags.
+	XMP_Uns32 xmpTagLen, omdTagLen;	// Zero if the tag is not present.
+
+	std::string onXMP, onMetaData;	// ! Actually contains structured binary data.
+
+};	// FLV_MetaHandler
+
+// =================================================================================================
+
+#endif // __FLV_Handler_hpp__
diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.cpp b/XMPFiles/source/FileHandlers/GIF_Handler.cpp
new file mode 100644
index 0000000..39090ea
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/GIF_Handler.cpp
@@ -0,0 +1,264 @@
+// =================================================================================================
+// 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
+// of the Adobe license agreement accompanying it.
+//
+// Derived from PNG_Handler.cpp by Ian Jacobi
+// =================================================================================================
+
+#include "GIF_Handler.hpp"
+
+#include "source/XIO.hpp"
+#include "XMPFiles/source/FormatSupport/GIF_Support.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file GIF_Handler.hpp
+/// \brief File format handler for GIF.
+///
+/// This handler ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// GIF_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * GIF_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new GIF_MetaHandler ( parent );
+
+}	// GIF_MetaHandlerCTor
+
+// =================================================================================================
+// GIF_CheckFormat
+// ===============
+
+bool GIF_CheckFormat ( XMP_FileFormat format,
+					   XMP_StringPtr  filePath,
+                       XMP_IO*    fileRef,
+                       XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_GIFFile );
+
+	IOBuffer ioBuf;
+
+	fileRef->Rewind();
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, GIF_SIGNATURE_LEN ) ) return false;	// We need at least 3, so the buffer is not filled.
+
+	if ( ! CheckBytes ( ioBuf.ptr, GIF_SIGNATURE_DATA, GIF_SIGNATURE_LEN ) ) return false;
+
+	return true;
+
+}	// GIF_CheckFormat
+
+// =================================================================================================
+// GIF_MetaHandler::GIF_MetaHandler
+// ==================================
+
+GIF_MetaHandler::GIF_MetaHandler ( XMPFiles * _parent )
+{
+	this->parent = _parent;
+	this->handlerFlags = kGIF_HandlerFlags;
+	// It MUST be UTF-8.
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}
+
+// =================================================================================================
+// GIF_MetaHandler::~GIF_MetaHandler
+// ===================================
+
+GIF_MetaHandler::~GIF_MetaHandler()
+{
+}
+
+// =================================================================================================
+// GIF_MetaHandler::CacheFileData
+// ===============================
+
+void GIF_MetaHandler::CacheFileData()
+{
+
+	this->containsXMP = false;
+
+	XMP_IO* fileRef ( this->parent->ioRef );
+	if ( fileRef == 0) return;
+
+	// We try to navigate through the blocks to find the XMP block.
+	GIF_Support::BlockState blockState;
+	long numBlocks = GIF_Support::OpenGIF ( fileRef, blockState );
+	if ( numBlocks == 0 ) return;
+
+	if (blockState.xmpLen != 0)
+	{
+		// XMP present
+
+		this->xmpPacket.reserve(blockState.xmpLen);
+		this->xmpPacket.assign(blockState.xmpLen, ' ');
+
+		if (GIF_Support::ReadBuffer ( fileRef, blockState.xmpPos, blockState.xmpLen, const_cast<char *>(this->xmpPacket.data()) ))
+		{
+			this->packetInfo.offset = blockState.xmpPos;
+			this->packetInfo.length = blockState.xmpLen;
+			this->containsXMP = true;
+		}
+	}
+	else
+	{
+		// no XMP
+	}
+
+}	// GIF_MetaHandler::CacheFileData
+
+// =================================================================================================
+// GIF_MetaHandler::ProcessTNail
+// ==============================
+
+void GIF_MetaHandler::ProcessTNail()
+{
+
+	XMP_Throw ( "GIF_MetaHandler::ProcessTNail isn't implemented yet", kXMPErr_Unimplemented );
+
+}	// GIF_MetaHandler::ProcessTNail
+
+// =================================================================================================
+// GIF_MetaHandler::ProcessXMP
+// ============================
+//
+// Process the raw XMP and legacy metadata that was previously cached.
+
+void GIF_MetaHandler::ProcessXMP()
+{
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	// Process the XMP packet.
+
+	if ( ! this->xmpPacket.empty() ) {
+	
+		XMP_Assert ( this->containsXMP );
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = this->xmpPacket.size();
+
+		this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+
+		this->containsXMP = true;
+
+	}
+
+}	// GIF_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// GIF_MetaHandler::UpdateFile
+// ============================
+
+void GIF_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	bool updated = false;
+	
+	if ( ! this->needsUpdate ) return;
+	if ( doSafeUpdate ) XMP_Throw ( "GIF_MetaHandler::UpdateFile: Safe update not supported", kXMPErr_Unavailable );
+	
+	XMP_StringPtr packetStr = xmpPacket.c_str();
+	XMP_StringLen packetLen = xmpPacket.size();
+	if ( packetLen == 0 ) return;
+
+	XMP_IO* fileRef(this->parent->ioRef);
+	if ( fileRef == 0 ) return;
+
+	GIF_Support::BlockState blockState;
+	long numBlocks = GIF_Support::OpenGIF ( fileRef, blockState );
+	if ( numBlocks == 0 ) return;
+
+	// write/update block(s)
+	if (blockState.xmpLen == 0)
+	{
+		// no current chunk -> inject
+		updated = SafeWriteFile();
+	}
+	else if (blockState.xmpLen >= packetLen )
+	{
+		// current chunk size is sufficient -> write and update CRC (in place update)
+		updated = GIF_Support::WriteBuffer(fileRef, blockState.xmpPos, packetLen, packetStr );
+		// GIF doesn't have a CRC like PNG.
+	}
+	else if (blockState.xmpLen < packetLen)
+	{
+		// XMP is too large for current chunk -> expand 
+		updated = SafeWriteFile();
+	}
+
+	if ( ! updated )return;	// If there's an error writing the chunk, bail.
+
+	this->needsUpdate = false;
+
+}	// GIF_MetaHandler::UpdateFile
+
+// =================================================================================================
+// GIF_MetaHandler::WriteFile
+// ===========================
+
+void GIF_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_IO* originalRef = this->parent->ioRef;
+
+	GIF_Support::BlockState blockState;
+	long numBlocks = GIF_Support::OpenGIF ( originalRef, blockState );
+	if ( numBlocks == 0 ) return;
+
+	tempRef->Truncate( 0 );
+	// LFA_Write(destRef, GIF_SIGNATURE_DATA, GIF_SIGNATURE_LEN);
+
+	GIF_Support::BlockIterator curPos = blockState.blocks.begin();
+	GIF_Support::BlockIterator endPos = blockState.blocks.end();
+
+	long blockCount;
+
+	for (blockCount = 0; (curPos != endPos); ++curPos, ++blockCount)
+	{
+		GIF_Support::BlockData block = *curPos;
+
+		// discard existing XMP block
+		if (block.xmp)
+			continue;
+
+		// copy any other block
+		GIF_Support::CopyBlock(originalRef, tempRef, block);
+
+		// place XMP block immediately before trailer
+		if (blockCount == numBlocks - 2)
+		{
+			XMP_StringPtr packetStr = xmpPacket.c_str();
+			XMP_StringLen packetLen = xmpPacket.size();
+
+			GIF_Support::WriteXMPBlock(tempRef, packetLen, packetStr );
+		}
+	}
+
+}	// GIF_MetaHandler::WriteFile
+
+// =================================================================================================
+// GIF_MetaHandler::SafeWriteFile
+// ===========================
+
+bool GIF_MetaHandler::SafeWriteFile ()
+{
+	bool ret = false;
+
+	XMP_IO* originalFile  = this->parent->ioRef;
+	XMP_IO* tempFile = originalFile->DeriveTemp();
+	if ( tempFile == 0 )
+		XMP_Throw ( "Failure creating GIF temp file", kXMPErr_InternalFailure );
+
+	this->WriteTempFile( tempFile );
+	originalFile->AbsorbTemp();
+
+	return true;
+} // GIF_MetaHandler::SafeWriteFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.hpp b/XMPFiles/source/FileHandlers/GIF_Handler.hpp
new file mode 100644
index 0000000..40f7046
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/GIF_Handler.hpp
@@ -0,0 +1,70 @@
+#ifndef __GIF_Handler_hpp__
+#define __GIF_Handler_hpp__	1
+
+// =================================================================================================
+// 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
+// of the Adobe license agreement accompanying it.
+//
+// Derived from PNG_Handler.hpp by Ian Jacobi
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "XMPFiles/source/FormatSupport/GIF_Support.hpp"
+
+// =================================================================================================
+/// \file GIF_Handler.hpp
+/// \brief File format handler for GIF.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// *** Could derive from Basic_Handler - buffer file tail in a temp file.
+
+extern XMPFileHandler* GIF_MetaHandlerCTor ( XMPFiles* parent );
+
+extern bool GIF_CheckFormat ( XMP_FileFormat format,
+							   XMP_StringPtr  filePath,
+                               XMP_IO*    fileRef,
+                               XMPFiles*     parent );
+
+static const XMP_OptionBits kGIF_HandlerFlags = ( kXMPFiles_CanInjectXMP | 
+												  kXMPFiles_CanExpand | 
+												  kXMPFiles_PrefersInPlace | 
+												  kXMPFiles_AllowsOnlyXMP | 
+												  kXMPFiles_ReturnsRawPacket |
+												  kXMPFiles_NeedsReadOnlyPacket
+													);
+
+class GIF_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessTNail();
+	void ProcessXMP();
+	
+	void UpdateFile ( bool doSafeUpdate );
+	void WriteTempFile  ( XMP_IO* tempRef );
+
+	bool SafeWriteFile ();
+
+	GIF_MetaHandler ( XMPFiles* parent );
+	virtual ~GIF_MetaHandler();
+
+};	// GIF_MetaHandler
+
+// =================================================================================================
+
+#endif /* __GIF_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp
new file mode 100644
index 0000000..d627580
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp
@@ -0,0 +1,422 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FileHandlers/InDesign_Handler.hpp"
+
+#include "source/XIO.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file InDesign_Handler.cpp
+/// \brief File format handler for InDesign files.
+///
+/// This header ...
+///
+/// The layout of an InDesign file in terms of the Basic_MetaHandler model is:
+///
+/// \li The front of the file. This is everything up to the XMP contiguous object section. The file
+/// starts with a pair of master pages, followed by the data pages, followed by contiguous object
+/// sections, finished with padding to a page boundary.
+///
+/// \li A prefix for the XMP section. This is the contiguous object header. The offset is
+/// (this->packetInfo.offset - this->xmpPrefixSize).
+///
+/// \li The XMP packet. The offset is this->packetInfo.offset.
+///
+/// \li A suffix for the XMP section. This is the contiguous object header. The offset is
+/// (this->packetInfo.offset + this->packetInfo.length).
+///
+/// \li Trailing file content. This is the contiguous objects that follow the XMP. The offset is
+/// (this->packetInfo.offset + this->packetInfo.length + this->xmpSuffixSize).
+///
+/// \li The back of the file. This is the final padding to a page boundary. The offset is
+/// (this->packetInfo.offset + this->packetInfo.length + this->xmpSuffixSize + this->trailingContentSize).
+///
+// =================================================================================================
+
+// *** Add PutXMP overrides that throw if the file does not contain XMP.
+
+#ifndef TraceInDesignHandler
+	#define TraceInDesignHandler 0
+#endif
+
+enum { 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];
+};
+
+enum {
+	kINDD_PageSize     = 4096,
+	kINDD_PageMask     = (kINDD_PageSize - 1),
+	kINDD_LittleEndian = 1,
+	kINDD_BigEndian    = 2 };
+
+struct InDesignContigObjMarker {
+	XMP_Uns8  fGUID [kInDesignGUIDSize];
+	XMP_Uns32 fObjectUID;
+	XMP_Uns32 fObjectClassID;
+	XMP_Uns32 fStreamLength;
+	XMP_Uns32 fChecksum;
+};
+
+static const XMP_Uns8 * kINDD_MasterPageGUID =
+	(const XMP_Uns8 *) "\x06\x06\xED\xF5\xD8\x1D\x46\xE5\xBD\x31\xEF\xE7\xFE\x74\xB7\x1D";
+
+static const XMP_Uns8 * kINDDContigObjHeaderGUID =
+	(const XMP_Uns8 *) "\xDE\x39\x39\x79\x51\x88\x4B\x6C\x8E\x63\xEE\xF8\xAE\xE0\xDD\x38";
+
+static const XMP_Uns8 * kINDDContigObjTrailerGUID =
+	(const XMP_Uns8 *) "\xFD\xCE\xDB\x70\xF7\x86\x4B\x4F\xA4\xD3\xC7\x28\xB3\x41\x71\x06";
+
+// =================================================================================================
+// InDesign_MetaHandlerCTor
+// ========================
+
+XMPFileHandler * InDesign_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new InDesign_MetaHandler ( parent );
+
+}	// InDesign_MetaHandlerCTor
+
+// =================================================================================================
+// InDesign_CheckFormat
+// ====================
+//
+// For InDesign we check that the pair of master pages begin with the 16 byte GUID.
+
+bool InDesign_CheckFormat ( XMP_FileFormat format,
+	                        XMP_StringPtr  filePath,
+	                        XMP_IO*    fileRef,
+	                        XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_InDesignFile );
+	XMP_Assert ( strlen ( (const char *) kINDD_MasterPageGUID ) == kInDesignGUIDSize );
+
+	enum { kBufferSize = 2*kINDD_PageSize };
+	XMP_Uns8 buffer [kBufferSize];
+
+	XMP_Int64 filePos   = 0;
+	XMP_Uns8 * bufPtr   = buffer;
+	XMP_Uns8 * bufLimit = bufPtr + kBufferSize;
+
+	fileRef->Rewind();
+	size_t bufLen = fileRef->Read ( buffer, kBufferSize );
+	if ( bufLen != kBufferSize ) return false;
+
+	if ( ! CheckBytes ( bufPtr, kINDD_MasterPageGUID, kInDesignGUIDSize ) ) return false;
+	if ( ! CheckBytes ( bufPtr+kINDD_PageSize, kINDD_MasterPageGUID, kInDesignGUIDSize ) ) return false;
+
+	return true;
+
+}	// InDesign_CheckFormat
+
+// =================================================================================================
+// InDesign_MetaHandler::InDesign_MetaHandler
+// ==========================================
+
+InDesign_MetaHandler::InDesign_MetaHandler ( XMPFiles * _parent ) : streamBigEndian(0), xmpObjID(0), xmpClassID(0)
+{
+	this->parent = _parent;
+	this->handlerFlags = kInDesign_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}	// InDesign_MetaHandler::InDesign_MetaHandler
+
+// =================================================================================================
+// InDesign_MetaHandler::~InDesign_MetaHandler
+// ===========================================
+
+InDesign_MetaHandler::~InDesign_MetaHandler()
+{
+	// Nothing to do here.
+
+}	// InDesign_MetaHandler::~InDesign_MetaHandler
+
+// =================================================================================================
+// InDesign_MetaHandler::CacheFileData
+// ===================================
+//
+// Look for the XMP in an InDesign database file. This is a paged database using 4K byte pages,
+// followed by redundant "contiguous object streams". Each contiguous object stream is a copy of a
+// database object stored as a contiguous byte stream. The XMP that we want is one of these.
+//
+// The first 2 pages of the database are alternating master pages. A generation number is used to
+// select the active master page. The master page contains an offset to the start of the contiguous
+// object streams. Each of the contiguous object streams contains a header and trailer, allowing
+// fast motion from one stream to the next.
+//
+// There is no unique "what am I" tagging to the contiguous object streams, so we simply pick the
+// first one that looks right. At present this is a 4 byte little endian packet size followed by the
+// packet.
+
+// ! Note that insertion of XMP is not allowed for InDesign, the XMP must be a contiguous copy of an
+// ! internal database object. So we don't set the packet offset to an insertion point if not found.
+
+void InDesign_MetaHandler::CacheFileData()
+{
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+
+	XMP_Assert ( kINDD_PageSize == sizeof(InDesignMasterPage) );
+	static const size_t kBufferSize = (2 * kINDD_PageSize);
+	XMP_Uns8 buffer [kBufferSize];
+
+	size_t	 dbPages;
+	XMP_Uns8 cobjEndian;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	this->containsXMP = false;
+
+	// ---------------------------------------------------------------------------------
+	// Figure out which master page is active and seek to the contiguous object portion.
+
+	{
+		fileRef->Rewind();
+		fileRef->ReadAll ( buffer, (2 * kINDD_PageSize) );
+
+		InDesignMasterPage * masters = (InDesignMasterPage *) &buffer[0];
+		XMP_Uns64 seq0 = GetUns64LE ( (XMP_Uns8 *) &masters[0].fSequenceNumber );
+		XMP_Uns64 seq1 = GetUns64LE ( (XMP_Uns8 *) &masters[1].fSequenceNumber );
+
+		dbPages = GetUns32LE ( (XMP_Uns8 *) &masters[0].fFilePages );
+		cobjEndian = masters[0].fObjectStreamEndian;
+		if ( seq1 > seq0 ) {
+			dbPages = GetUns32LE ( (XMP_Uns8 *)  &masters[1].fFilePages );
+			cobjEndian = masters[1].fObjectStreamEndian;
+		}
+	}
+
+	XMP_Assert ( ! this->streamBigEndian );
+	if ( cobjEndian == kINDD_BigEndian ) this->streamBigEndian = true;
+
+	// ---------------------------------------------------------------------------------------------
+	// Look for the XMP contiguous object. Each contiguous object has a header and trailer, both of
+	// the InDesignContigObjMarker structure. The stream size in the header/trailer is the number of
+	// data bytes between the header and trailer. The XMP stream begins with a 4 byte size of the
+	// XMP packet. Yes, this is the contiguous object data size minus 4 - silly but true. The XMP
+	// must have a packet wrapper, the leading xpacket PI is used as the marker of XMP.
+
+	XMP_Int64 cobjPos = (XMP_Int64)dbPages * kINDD_PageSize;	// ! Use a 64 bit multiply!
+	cobjPos -= (2 * sizeof(InDesignContigObjMarker));			// ! For the first pass in the loop.
+	XMP_Uns32 streamLength = 0;									// ! For the first pass in the loop.
+
+	while ( true ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "InDesign_MetaHandler::LocateXMP - User abort", kXMPErr_UserAbort );
+		}
+
+		// Fetch the start of the next stream and check the contiguous object header.
+		// ! The writeable bit of fObjectClassID is ignored, we use the packet trailer flag.
+
+		cobjPos += streamLength + (2 * sizeof(InDesignContigObjMarker));
+		fileRef->Seek ( cobjPos, kXMP_SeekFromStart );
+		fileRef->ReadAll ( buffer, sizeof(InDesignContigObjMarker) );
+
+		const InDesignContigObjMarker * cobjHeader = (const InDesignContigObjMarker *) &buffer[0];
+		if ( ! CheckBytes ( Uns8Ptr(&cobjHeader->fGUID), kINDDContigObjHeaderGUID, kInDesignGUIDSize ) ) break;	// Not a contiguous object header.
+		this->xmpObjID = cobjHeader->fObjectUID;	// Save these now while the buffer is good.
+		this->xmpClassID = cobjHeader->fObjectClassID;
+		streamLength = GetUns32LE ( (XMP_Uns8 *) &cobjHeader->fStreamLength );
+
+		// See if this is the XMP stream.
+
+		if ( streamLength < (4 + kUTF8_PacketHeaderLen + kUTF8_PacketTrailerLen) ) continue;	// Too small, can't possibly be XMP.
+
+		fileRef->ReadAll ( buffer, (4 + kUTF8_PacketHeaderLen) );
+		XMP_Uns32 innerLength = GetUns32LE ( &buffer[0] );
+		if ( this->streamBigEndian ) innerLength = GetUns32BE ( &buffer[0] );
+		if ( innerLength != (streamLength - 4) ) {
+			// Be tolerant of a mistake with the endian flag.
+			innerLength = Flip4 ( innerLength );
+			if ( innerLength != (streamLength - 4) ) continue;	// Not legit XMP.
+		}
+
+		XMP_Uns8 * chPtr = &buffer[4];
+		size_t startLen = strlen((char*)kUTF8_PacketStart);
+		size_t idLen = strlen((char*)kUTF8_PacketID);
+		
+		if ( ! CheckBytes ( chPtr, kUTF8_PacketStart, startLen ) ) continue;
+		chPtr += startLen;
+
+		XMP_Uns8 quote = *chPtr;
+		if ( (quote != '\'') && (quote != '"') ) continue;
+		chPtr += 1;
+		if ( *chPtr != quote ) {
+			if ( ! CheckBytes ( chPtr, Uns8Ptr("\xEF\xBB\xBF"), 3 ) ) continue;
+			chPtr += 3;
+		}
+		if ( *chPtr != quote ) continue;
+		chPtr += 1;
+
+		if ( ! CheckBytes ( chPtr, Uns8Ptr(" id="), 4 ) ) continue;
+		chPtr += 4;
+		quote = *chPtr;
+		if ( (quote != '\'') && (quote != '"') ) continue;
+		chPtr += 1;
+		if ( ! CheckBytes ( chPtr, kUTF8_PacketID, idLen ) ) continue;
+		chPtr += idLen;
+		if ( *chPtr != quote ) continue;
+		chPtr += 1;
+
+		// We've seen enough, it is the XMP. To fit the Basic_Handler model we need to compute the
+		// total size of remaining contiguous objects, the trailingContentSize. We don't use the
+		// size to EOF, that would wrongly include the final zero padding for 4KB alignment.
+
+		this->xmpPrefixSize = sizeof(InDesignContigObjMarker) + 4;
+		this->xmpSuffixSize = sizeof(InDesignContigObjMarker);
+		packetInfo.offset = cobjPos + this->xmpPrefixSize;
+		packetInfo.length = innerLength;
+
+		XMP_Int64 tcStart = cobjPos + streamLength + (2 * sizeof(InDesignContigObjMarker));
+		while ( true ) {
+			if ( checkAbort && abortProc(abortArg) ) {
+				XMP_Throw ( "InDesign_MetaHandler::LocateXMP - User abort", kXMPErr_UserAbort );
+			}
+			cobjPos += streamLength + (2 * sizeof(InDesignContigObjMarker));
+			XMP_Uns32 len = fileRef->Read ( buffer, sizeof(InDesignContigObjMarker) );
+			if ( len < sizeof(InDesignContigObjMarker) ) break;	// Too small, must be end of file.
+			cobjHeader = (const InDesignContigObjMarker *) &buffer[0];
+			if ( ! CheckBytes ( Uns8Ptr(&cobjHeader->fGUID), kINDDContigObjHeaderGUID, kInDesignGUIDSize ) ) break;	// Not a contiguous object header.
+			streamLength = GetUns32LE ( (XMP_Uns8 *) &cobjHeader->fStreamLength );
+		}
+		this->trailingContentSize = cobjPos - tcStart;
+
+		#if TraceInDesignHandler
+			XMP_Uns32 pktOffset = (XMP_Uns32)this->packetInfo.offset;
+			printf ( "Found XMP in InDesign file, offsets:\n" );
+			printf ( "  CObj head %X, XMP %X, CObj tail %X, file tail %X, padding %X\n",
+					 (pktOffset - this->xmpPrefixSize), pktOffset, (pktOffset + this->packetInfo.length),
+					 (pktOffset + this->packetInfo.length + this->xmpSuffixSize),
+					 (pktOffset + this->packetInfo.length + this->xmpSuffixSize + (XMP_Uns32)this->trailingContentSize) );
+		#endif
+
+		this->containsXMP = true;
+		break;
+
+	}
+
+	if ( this->containsXMP ) {
+		this->xmpFileOffset = packetInfo.offset;
+		this->xmpFileSize = packetInfo.length;
+		ReadXMPPacket ( this );
+	}
+
+}	// InDesign_MetaHandler::CacheFileData
+
+// =================================================================================================
+// InDesign_MetaHandler::WriteXMPPrefix
+// ====================================
+
+void InDesign_MetaHandler::WriteXMPPrefix ( XMP_IO* fileRef )
+{
+	// Write the contiguous object header and the 4 byte length of the XMP packet.
+
+	XMP_Uns32 packetSize = (XMP_Uns32)this->xmpPacket.size();
+
+	InDesignContigObjMarker header;
+	memcpy ( header.fGUID, kINDDContigObjHeaderGUID, sizeof(header.fGUID) );	// AUDIT: Use of dest sizeof for length is safe.
+	header.fObjectUID = this->xmpObjID;
+	header.fObjectClassID = this->xmpClassID;
+	header.fStreamLength = MakeUns32LE ( 4 + packetSize );
+	header.fChecksum = (XMP_Uns32)(-1);
+	fileRef->Write ( &header, sizeof(header) );
+
+	XMP_Uns32 pktLength = MakeUns32LE ( packetSize );
+	if ( this->streamBigEndian ) pktLength = MakeUns32BE ( packetSize );
+	fileRef->Write ( &pktLength, sizeof(pktLength) );
+
+}	// InDesign_MetaHandler::WriteXMPPrefix
+
+// =================================================================================================
+// InDesign_MetaHandler::WriteXMPSuffix
+// ====================================
+
+void InDesign_MetaHandler::WriteXMPSuffix ( XMP_IO* fileRef )
+{
+	// Write the contiguous object trailer.
+
+	XMP_Uns32 packetSize = (XMP_Uns32)this->xmpPacket.size();
+
+	InDesignContigObjMarker trailer;
+
+	memcpy ( trailer.fGUID, kINDDContigObjTrailerGUID, sizeof(trailer.fGUID) );	// AUDIT: Use of dest sizeof for length is safe.
+	trailer.fObjectUID = this->xmpObjID;
+	trailer.fObjectClassID = this->xmpClassID;
+	trailer.fStreamLength = MakeUns32LE ( 4 + packetSize );
+	trailer.fChecksum = (XMP_Uns32)(-1);
+
+	fileRef->Write ( &trailer, sizeof(trailer) );
+
+}	// InDesign_MetaHandler::WriteXMPSuffix
+
+// =================================================================================================
+// InDesign_MetaHandler::NoteXMPRemoval
+// ====================================
+
+void InDesign_MetaHandler::NoteXMPRemoval ( XMP_IO* fileRef )
+{
+	// Nothing to do.
+
+}	// InDesign_MetaHandler::NoteXMPRemoval
+
+// =================================================================================================
+// InDesign_MetaHandler::NoteXMPInsertion
+// ======================================
+
+void InDesign_MetaHandler::NoteXMPInsertion ( XMP_IO* fileRef )
+{
+	// Nothing to do.
+
+}	// InDesign_MetaHandler::NoteXMPInsertion
+
+// =================================================================================================
+// InDesign_MetaHandler::CaptureFileEnding
+// =======================================
+
+void InDesign_MetaHandler::CaptureFileEnding ( XMP_IO* fileRef )
+{
+	// Nothing to do. The back of an InDesign file is the final zero padding.
+
+}	// InDesign_MetaHandler::CaptureFileEnding
+
+// =================================================================================================
+// InDesign_MetaHandler::RestoreFileEnding
+// =======================================
+
+void InDesign_MetaHandler::RestoreFileEnding ( XMP_IO* fileRef )
+{
+	// Pad the file with zeros to a page boundary.
+
+	XMP_Int64 dataLength = fileRef->Length();
+	XMP_Int32 padLength  = (kINDD_PageSize - ((XMP_Int32)dataLength & kINDD_PageMask)) & kINDD_PageMask;
+
+	XMP_Uns8 buffer [kINDD_PageSize];
+	memset ( buffer, 0, kINDD_PageSize );
+	fileRef->Write ( buffer, padLength );
+
+}	// InDesign_MetaHandler::RestoreFileEnding
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.hpp b/XMPFiles/source/FileHandlers/InDesign_Handler.hpp
new file mode 100644
index 0000000..66d9f79
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/InDesign_Handler.hpp
@@ -0,0 +1,68 @@
+#ifndef __InDesign_Handler_hpp__
+#define __InDesign_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "XMPFiles/source/FileHandlers/Basic_Handler.hpp"
+
+// =================================================================================================
+/// \file InDesign_Handler.hpp
+/// \brief File format handler for InDesign files.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler * InDesign_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool InDesign_CheckFormat ( XMP_FileFormat format,
+								   XMP_StringPtr  filePath,
+			                       XMP_IO*        fileRef,
+			                       XMPFiles *     parent );
+
+static const XMP_OptionBits kInDesign_HandlerFlags = kBasic_HandlerFlags & (~kXMPFiles_CanInjectXMP);	// ! InDesign can't inject.
+
+class InDesign_MetaHandler : public Basic_MetaHandler
+{
+public:
+
+	InDesign_MetaHandler ( XMPFiles * parent );
+	~InDesign_MetaHandler();
+
+	void CacheFileData();
+
+protected:
+
+	void WriteXMPPrefix ( XMP_IO* fileRef );
+	void WriteXMPSuffix ( XMP_IO* fileRef );
+
+	void NoteXMPRemoval ( XMP_IO* fileRef );
+	void NoteXMPInsertion ( XMP_IO* fileRef );
+
+	void CaptureFileEnding ( XMP_IO* fileRef );
+	void RestoreFileEnding ( XMP_IO* fileRef );
+
+	bool streamBigEndian;	// Set from master page's fObjectStreamEndian.
+	XMP_Uns32 xmpObjID;		// Set from contiguous object's fObjectID, still as little endian.
+	XMP_Uns32 xmpClassID;	// Set from contiguous object's fObjectClassID, still as little endian.
+
+};	// InDesign_MetaHandler
+
+// =================================================================================================
+
+#endif /* __InDesign_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp
new file mode 100644
index 0000000..bdc5505
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp
@@ -0,0 +1,987 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/JPEG_Handler.hpp"
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+#include "XMPFiles/source/FormatSupport/ReconcileLegacy.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+
+#include "third-party/zuid/interfaces/MD5.h"
+
+using namespace std;
+
+// =================================================================================================
+/// \file JPEG_Handler.cpp
+/// \brief File format handler for JPEG.
+///
+/// This handler ...
+///
+// =================================================================================================
+
+static const char * kExifSignatureString = "Exif\0\x00";	// There are supposed to be two zero bytes,
+static const char * kExifSignatureAltStr = "Exif\0\xFF";	// but files have been seen with just one.
+static const size_t kExifSignatureLength = 6;
+static const size_t kExifMaxDataLength   = 0xFFFF - 2 - kExifSignatureLength;
+
+static const char * kPSIRSignatureString = "Photoshop 3.0\0";
+static const size_t kPSIRSignatureLength = 14;
+static const size_t kPSIRMaxDataLength   = 0xFFFF - 2 - kPSIRSignatureLength;
+
+static const char * kMainXMPSignatureString = "http://ns.adobe.com/xap/1.0/\0";
+static const size_t kMainXMPSignatureLength = 29;
+
+static const char * kExtXMPSignatureString = "http://ns.adobe.com/xmp/extension/\0";
+static const size_t kExtXMPSignatureLength = 35;
+static const size_t kExtXMPPrefixLength    = kExtXMPSignatureLength + 32 + 4 + 4;
+
+typedef std::map < XMP_Uns32 /* offset */, std::string /* portion */ > ExtXMPPortions;
+
+struct ExtXMPContent {
+	XMP_Uns32 length;
+	ExtXMPPortions portions;
+	ExtXMPContent() : length(0) {};
+	ExtXMPContent ( XMP_Uns32 _length ) : length(_length) {};
+};
+
+typedef std::map < JPEG_MetaHandler::GUID_32 /* guid */, ExtXMPContent /* content */ > ExtendedXMPInfo;
+
+#ifndef Trace_UnlimitedJPEG
+	#define Trace_UnlimitedJPEG 0
+#endif
+
+// =================================================================================================
+// JPEG_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * JPEG_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new JPEG_MetaHandler ( parent );
+
+}	// JPEG_MetaHandlerCTor
+
+// =================================================================================================
+// JPEG_CheckFormat
+// ================
+
+// For JPEG we just check for the initial SOI standalone marker followed by any of the other markers
+// that might, well, follow it. A more aggressive check might be to read 4KB then check for legit
+// marker segments within that portion. Probably won't buy much, and thrashes the dCache more. We
+// tolerate only a small amount of 0xFF padding between the SOI and following marker. This formally
+// violates the rules of JPEG, but in practice there won't be any padding anyway.
+//
+// ! The CheckXyzFormat routines don't track the filePos, that is left to ScanXyzFile.
+
+bool JPEG_CheckFormat ( XMP_FileFormat format,
+	                    XMP_StringPtr  filePath,
+                        XMP_IO *       fileRef,
+                        XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_JPEGFile );
+
+	XMP_Uns8 buffer [100];
+	XMP_Uns16 marker;
+
+	fileRef->Rewind();
+	if ( fileRef->Length() < 2 ) return false;	// Need at least the SOI marker.
+	size_t bufferLen = fileRef->Read ( buffer, sizeof(buffer) );
+
+	marker = GetUns16BE ( &buffer[0] );
+	if ( marker != 0xFFD8 ) return false;	// Offset 0 must have the SOI marker.
+	
+	// Skip 0xFF padding and high order 0xFF of next marker.
+	size_t bufferPos = 2;
+	while ( (bufferPos < bufferLen) && (buffer[bufferPos] == 0xFF) ) bufferPos += 1;
+	if ( bufferPos == bufferLen ) return true;	// Nothing but 0xFF bytes, close enough.
+
+	XMP_Uns8 id = buffer[bufferPos];	// Check the ID of the second marker.
+	if ( id >= 0xDD ) return true;	// The most probable cases.
+	if ( (id < 0xC0) || ((id & 0xF8) == 0xD0) || (id == 0xD8) || (id == 0xDA) || (id == 0xDC) ) return false;
+	return true;
+
+}	// JPEG_CheckFormat
+
+// =================================================================================================
+// JPEG_MetaHandler::JPEG_MetaHandler
+// ==================================
+
+JPEG_MetaHandler::JPEG_MetaHandler ( XMPFiles * _parent )
+	: exifMgr(0), psirMgr(0), iptcMgr(0), skipReconcile(false)
+{
+	this->parent = _parent;
+	this->handlerFlags = kJPEG_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}	// JPEG_MetaHandler::JPEG_MetaHandler
+
+// =================================================================================================
+// JPEG_MetaHandler::~JPEG_MetaHandler
+// ===================================
+
+JPEG_MetaHandler::~JPEG_MetaHandler()
+{
+
+	if ( exifMgr != 0 ) delete ( exifMgr );
+	if ( psirMgr != 0 ) delete ( psirMgr );
+	if ( iptcMgr != 0 ) delete ( iptcMgr );
+
+}	// JPEG_MetaHandler::~JPEG_MetaHandler
+
+// =================================================================================================
+// CacheExtendedXMP
+// ================
+
+static void CacheExtendedXMP ( ExtendedXMPInfo * extXMP, XMP_Uns8 * buffer, size_t bufferLen )
+{
+
+	// Have a portion of the extended XMP, cache the contents. This is complicated by the need to
+	// tolerate files where the extension portions are not in order. The local ExtendedXMPInfo map
+	// uses the GUID as the key and maps that to a struct that has the full length and a map of the
+	// known portions. This known portion map uses the offset of the portion as the key and maps
+	// that to a string. Only fully seen extended XMP streams are kept, the right one gets picked in
+	// ProcessXMP.
+
+	// The extended XMP JPEG marker segment content holds:
+	//	- a signature string, "http://ns.adobe.com/xmp/extension/\0", already verified
+	//	- a 128 bit GUID stored as a 32 byte ASCII hex string
+	//	- a UInt32 full length of the entire extended XMP
+	//	- a UInt32 offset for this portion of the extended XMP
+	//	- the UTF-8 text for this portion of the extended XMP
+	
+	if ( bufferLen < kExtXMPPrefixLength ) return;	// Ignore bad input.
+	XMP_Assert ( CheckBytes ( &buffer[0], kExtXMPSignatureString, kExtXMPSignatureLength ) );
+
+	XMP_Uns8 * bufferPtr = buffer + kExtXMPSignatureLength;	// Start at the GUID.
+	
+	JPEG_MetaHandler::GUID_32 guid;
+	XMP_Assert ( sizeof(guid.data) == 32 );
+	memcpy ( &guid.data[0], bufferPtr, sizeof(guid.data) );	// AUDIT: Use of sizeof(guid.data) is safe.
+
+	bufferPtr += sizeof(guid.data);	// Move to the length and offset.
+	XMP_Uns32 fullLen = GetUns32BE ( bufferPtr );
+	XMP_Uns32 offset  = GetUns32BE ( bufferPtr+4 );
+
+	bufferPtr += 8;	// Move to the XMP stream portion.
+	size_t xmpLen = bufferLen - kExtXMPPrefixLength;
+
+	#if Trace_UnlimitedJPEG
+		printf ( "New extended XMP portion: fullLen %d, offset %d, GUID %.32s\n", fullLen, offset, guid.data );
+	#endif
+
+	// Find the ExtXMPContent for this GUID, and the string for this portion's offset.
+
+	ExtendedXMPInfo::iterator guidPos = extXMP->find ( guid );
+	if ( guidPos == extXMP->end() ) {
+		ExtXMPContent newExtContent ( fullLen );
+		guidPos = extXMP->insert ( extXMP->begin(), ExtendedXMPInfo::value_type ( guid, newExtContent ) );
+	}
+
+	ExtXMPPortions::iterator offsetPos;
+	ExtXMPContent & extContent = guidPos->second;
+
+	if ( extContent.portions.empty() ) {
+		// When new create a full size offset 0 string, to which all in-order portions will get appended.
+		offsetPos = extContent.portions.insert ( extContent.portions.begin(),
+												 ExtXMPPortions::value_type ( 0, std::string() ) );
+		offsetPos->second.reserve ( extContent.length );
+	}
+
+	// Try to append this portion to a logically contiguous preceeding one.
+
+	if ( offset == 0 ) {
+		offsetPos = extContent.portions.begin();
+		XMP_Assert ( (offsetPos->first == 0) && (offsetPos->second.size() == 0) );
+	} else {
+		offsetPos = extContent.portions.lower_bound ( offset );
+		--offsetPos;	// Back up to the portion whose offset is less than the new offset.
+		if ( (offsetPos->first + offsetPos->second.size()) != offset ) {
+			// Can't append, create a new portion.
+			offsetPos = extContent.portions.insert ( extContent.portions.begin(),
+													 ExtXMPPortions::value_type ( offset, std::string() ) );
+		}
+	}
+
+	// Cache this portion of the extended XMP.
+
+	std::string & extPortion = offsetPos->second;
+	extPortion.append ( (XMP_StringPtr)bufferPtr, xmpLen );
+
+}	// CacheExtendedXMP
+
+// =================================================================================================
+// JPEG_MetaHandler::CacheFileData
+// ===============================
+//
+// Look for the Exif metadata, Photoshop image resources, and XMP in a JPEG (JFIF) file. The native
+// thumbnail is inside the Exif. The general layout of a JPEG file is:
+//    SOI marker, 2 bytes, 0xFFD8
+//    Marker segments for tables and metadata
+//    SOFn marker segment
+//    Image data
+//    EOI marker, 2 bytes, 0xFFD9
+//
+// Each marker segment begins with a 2 byte big endian marker and a 2 byte big endian length. The
+// length includes the 2 bytes of the length field but not the marker. The high order byte of a
+// marker is 0xFF, the low order byte tells what kind of marker. A marker can be preceeded by any
+// number of 0xFF fill bytes, however there are no alignment constraints.
+//
+// There are virtually no constraints on the order of the marker segments before the SOFn. A reader
+// must be prepared to handle any order.
+//
+// The Exif metadata is in an APP1 marker segment with a 6 byte signature string of "Exif\0\0" at
+// the start of the data. The rest of the data is a TIFF stream.
+//
+// The Photoshop image resources are in an APP13 marker segment with a 14 byte signature string of
+// "Photoshop 3.0\0". The rest of the data is a sequence of image resources.
+//
+// The main XMP is in an APP1 marker segment with a 29 byte signature string of
+// "http://ns.adobe.com/xap/1.0/\0". The rest of the data is the serialized XMP packet. This is the
+// only XMP if everything fits within the 64KB limit for marker segment data. If not, there will be
+// a series of XMP extension segments.
+//
+// Each XMP extension segment is an APP1 marker segment whose data contains:
+//    - A 35 byte signature string of "http://ns.adobe.com/xmp/extension/\0".
+//    - A 128 bit GUID stored as 32 ASCII hex digits, capital A-F, no nul termination.
+//    - A 32 bit unsigned integer length for the full extended XMP serialization.
+//    - A 32 bit unsigned integer offset for this portion of the extended XMP serialization.
+//    - A portion of the extended XMP serialization, up to about 65400 bytes (at most 65458).
+//
+// A reader must be prepared to encounter the extended XMP portions out of order. Also to encounter
+// defective files that have differing extended XMP according to the GUID. The main XMP contains the
+// GUID for the associated extended XMP.
+
+// *** This implementation simply returns when invalid JPEG is encountered. Should we throw instead?
+
+void JPEG_MetaHandler::CacheFileData()
+{
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+
+	static const size_t kBufferSize = 64*1024;	// Enough for maximum segment contents.
+	XMP_Uns8 buffer [kBufferSize];
+
+	psirContents.clear();
+	exifContents.clear();
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	ExtendedXMPInfo extXMP;
+
+	XMP_Assert ( ! this->containsXMP );
+	// Set containsXMP to true here only if the standard XMP packet is found.
+
+	XMP_Assert ( kPSIRSignatureLength == (strlen(kPSIRSignatureString) + 1) );
+	XMP_Assert ( kMainXMPSignatureLength == (strlen(kMainXMPSignatureString) + 1) );
+	XMP_Assert ( kExtXMPSignatureLength == (strlen(kExtXMPSignatureString) + 1) );
+
+	// -------------------------------------------------------------------------------------------
+	// Look for any of the Exif, PSIR, main XMP, or extended XMP marker segments. Quit when we hit
+	// an SOFn, EOI, or invalid/unexpected marker.
+
+	fileRef->Seek ( 2, kXMP_SeekFromStart  );	// Skip the SOI, CheckFormat made sure it is present.
+
+	while ( true ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "JPEG_MetaHandler::CacheFileData - User abort", kXMPErr_UserAbort );
+		}
+
+		if ( ! XIO::CheckFileSpace ( fileRef, 2 ) ) return;	// Quit, don't throw, if the file ends unexpectedly.
+		
+		XMP_Uns16 marker = XIO::ReadUns16_BE ( fileRef );	// Read the next marker.
+		if ( marker == 0xFFFF ) {
+			// Have a pad byte, skip it. These are almost unheard of, so efficiency isn't critical.
+			fileRef->Seek ( -1, kXMP_SeekFromCurrent );	// Skip the first 0xFF, read the second again.
+			continue;
+		}
+
+		if ( (marker == 0xFFDA) || (marker == 0xFFD9) ) break;	// Quit reading at the first SOS marker or at EOI.
+
+		if ( (marker == 0xFF01) ||	// Ill-formed file if we encounter a TEM or RSTn marker.
+			 ((0xFFD0 <= marker) && (marker <= 0xFFD7)) ) return;
+
+		XMP_Uns16 contentLen = XIO::ReadUns16_BE ( fileRef );	// Read this segment's length.
+		if ( contentLen < 2 ) XMP_Throw ( "Invalid JPEG segment length", kXMPErr_BadJPEG );
+		contentLen -= 2;	// Reduce to just the content length.
+		
+		XMP_Int64 contentOrigin = fileRef->Offset();
+		size_t signatureLen;
+
+		if ( (marker == 0xFFED) && (contentLen >= kPSIRSignatureLength) ) {
+
+			// This is an APP13 marker, is it the Photoshop image resources?
+
+			signatureLen = fileRef->Read ( buffer, kPSIRSignatureLength );
+			if ( (signatureLen == kPSIRSignatureLength) &&
+				 CheckBytes ( &buffer[0], kPSIRSignatureString, kPSIRSignatureLength ) ) {
+
+				size_t psirLen = contentLen - kPSIRSignatureLength;
+				fileRef->Seek ( (contentOrigin + kPSIRSignatureLength), kXMP_SeekFromStart );
+				fileRef->ReadAll ( buffer, psirLen );
+				this->psirContents.append( (char *) buffer, psirLen );
+				continue;	// Move on to the next marker.
+
+			}
+
+		} else if ( (marker == 0xFFE1) && (contentLen >= kExifSignatureLength) ) {	// Check for the shortest signature.
+
+			// This is an APP1 marker, is it the Exif, main XMP, or extended XMP?
+			// ! Check in that order, which is in increasing signature string length.
+			
+			XMP_Assert ( (kExifSignatureLength < kMainXMPSignatureLength) &&
+						 (kMainXMPSignatureLength < kExtXMPSignatureLength) );
+			signatureLen = fileRef->Read ( buffer, kExtXMPSignatureLength );	// Read for the longest signature.
+
+			if ( (signatureLen >= kExifSignatureLength) &&
+				 (CheckBytes ( &buffer[0], kExifSignatureString, kExifSignatureLength ) ||
+				  CheckBytes ( &buffer[0], kExifSignatureAltStr, kExifSignatureLength )) ) {
+
+				size_t exifLen = contentLen - kExifSignatureLength;
+				fileRef->Seek ( (contentOrigin + kExifSignatureLength), kXMP_SeekFromStart );
+				fileRef->ReadAll ( buffer, exifLen );
+				this->exifContents.append ( (char*)buffer, exifLen );
+				continue;	// Move on to the next marker.
+
+			}
+			
+			if ( (signatureLen >= kMainXMPSignatureLength) &&
+				 CheckBytes ( &buffer[0], kMainXMPSignatureString, kMainXMPSignatureLength ) ) {
+
+				this->containsXMP = true;	// Found the standard XMP packet.
+				size_t xmpLen = contentLen - kMainXMPSignatureLength;
+				fileRef->Seek ( (contentOrigin + kMainXMPSignatureLength), kXMP_SeekFromStart );
+				fileRef->ReadAll ( buffer, xmpLen );
+				this->xmpPacket.assign ( (char*)buffer, xmpLen );
+				this->packetInfo.offset = contentOrigin + kMainXMPSignatureLength;
+				this->packetInfo.length = (XMP_Int32)xmpLen;
+				this->packetInfo.padSize   = 0;	// Assume the rest for now, set later in ProcessXMP.
+				this->packetInfo.charForm  = kXMP_CharUnknown;
+				this->packetInfo.writeable = true;
+				continue;	// Move on to the next marker.
+
+			}
+			
+			if ( (signatureLen >= kExtXMPSignatureLength) &&
+				 CheckBytes ( &buffer[0], kExtXMPSignatureString, kExtXMPSignatureLength ) ) {
+
+				fileRef->Seek ( contentOrigin, kXMP_SeekFromStart );
+				fileRef->ReadAll ( buffer, contentLen );
+				CacheExtendedXMP ( &extXMP, buffer, contentLen );
+				continue;	// Move on to the next marker.
+
+			}
+
+		}
+		
+		// None of the above, seek to the next marker.
+		fileRef->Seek ( (contentOrigin + contentLen) , kXMP_SeekFromStart );
+
+	}
+
+	if ( ! extXMP.empty() ) {
+
+		// We have extended XMP. Find out which ones are complete, collapse them into a single
+		// string, and save them for ProcessXMP.
+
+		ExtendedXMPInfo::iterator guidPos = extXMP.begin();
+		ExtendedXMPInfo::iterator guidEnd = extXMP.end();
+
+		for ( ; guidPos != guidEnd; ++guidPos ) {
+
+			ExtXMPContent & thisContent = guidPos->second;
+			ExtXMPPortions::iterator partZero = thisContent.portions.begin();
+			ExtXMPPortions::iterator partEnd  = thisContent.portions.end();
+			ExtXMPPortions::iterator partPos  = partZero;
+
+			#if Trace_UnlimitedJPEG
+				printf ( "Extended XMP portions for GUID %.32s, full length %d\n",
+					     guidPos->first.data, guidPos->second.length );
+				printf ( "  Offset %d, length %d, next offset %d\n",
+						 partZero->first, partZero->second.size(), (partZero->first + partZero->second.size()) );
+			#endif
+
+			for ( ++partPos; partPos != partEnd; ++partPos ) {
+				#if Trace_UnlimitedJPEG
+					printf ( "  Offset %d, length %d, next offset %d\n",
+							 partPos->first, partPos->second.size(), (partPos->first + partPos->second.size()) );
+				#endif
+				if ( partPos->first != partZero->second.size() ) break;	// Quit if not contiguous.
+				partZero->second.append ( partPos->second );
+			}
+
+			if ( (partPos == partEnd) && (partZero->first == 0) && (partZero->second.size() == thisContent.length) ) {
+				// This is a complete extended XMP stream.
+				this->extendedXMP.insert ( ExtendedXMPMap::value_type ( guidPos->first, partZero->second ) );
+				#if Trace_UnlimitedJPEG
+					printf ( "Full extended XMP for GUID %.32s, full length %d\n",
+							 guidPos->first.data, partZero->second.size() );
+				#endif
+			}
+
+		}
+
+	}
+
+}	// JPEG_MetaHandler::CacheFileData
+
+// =================================================================================================
+// TrimFullExifAPP1
+// ================
+//
+// Try to trim trailing padding from full Exif APP1 segment written by some Nikon cameras. Do a
+// temporary read-only parse of the Exif APP1 contents, determine the highest used offset, trim the
+// padding if all zero bytes.
+
+static const char * IFDNames[] = { "Primary", "TNail", "Exif", "GPS", "Interop", };
+
+static void TrimFullExifAPP1 ( std::string * exifContents )
+{
+	TIFF_MemoryReader tempMgr;
+	TIFF_MemoryReader::TagInfo tagInfo;
+	bool tagFound, isNikon;
+
+	// ! Make a copy of the data to parse! The RO memory TIFF manager will flip bytes in-place!
+	tempMgr.ParseMemoryStream ( exifContents->data(), (XMP_Uns32)exifContents->size(), true /* copy data */ );
+
+	// Only trim the Exif APP1 from Nikon cameras.
+	tagFound = tempMgr.GetTag ( kTIFF_PrimaryIFD, kTIFF_Make, &tagInfo );
+	isNikon = tagFound && (tagInfo.type == kTIFF_ASCIIType) && (tagInfo.count >= 5) &&
+						  (memcmp ( tagInfo.dataPtr, "NIKON", 5) == 0);
+	if ( ! isNikon ) return;
+
+	// Find the start of the padding, one past the highest used offset. Look at the IFD structure,
+	// and the thumbnail info. Ignore the MakerNote tag, Nikon says they are self-contained.
+
+	XMP_Uns32 padOffset = 0;
+
+	for ( XMP_Uns8 ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+		TIFF_MemoryReader::TagInfoMap tagMap;
+		bool ifdFound = tempMgr.GetIFD ( ifd, &tagMap );
+		if ( ! ifdFound ) continue;
+
+		TIFF_MemoryReader::TagInfoMap::const_iterator mapPos = tagMap.begin();
+		TIFF_MemoryReader::TagInfoMap::const_iterator mapEnd = tagMap.end();
+
+		for ( ; mapPos != mapEnd; ++mapPos ) {
+			const TIFF_MemoryReader::TagInfo & tagInfo = mapPos->second;
+			XMP_Uns32 tagEnd = tempMgr.GetValueOffset ( ifd, tagInfo.id ) + tagInfo.dataLen;
+			if ( tagEnd > padOffset ) padOffset = tagEnd;
+		}
+
+	}
+
+	tagFound = tempMgr.GetTag ( kTIFF_TNailIFD, kTIFF_JPEGInterchangeFormat, &tagInfo );
+	if ( tagFound ) {
+		XMP_Uns32 tnailOffset = tempMgr.GetUns32 ( tagInfo.dataPtr );
+		tagFound = tempMgr.GetTag ( kTIFF_TNailIFD, kTIFF_JPEGInterchangeFormatLength, &tagInfo );
+		if ( ! tagFound ) return;	// Don't trim if there is a TNail offset but no length.
+		tnailOffset += tempMgr.GetUns32 ( tagInfo.dataPtr );
+		if ( tnailOffset > padOffset ) padOffset = tnailOffset;
+	}
+
+	// Decide if it is OK to trim the Exif segment. It is OK if the padding is all zeros. It is OK
+	// if the last non-zero byte is no more than 64 bytes into the padding and there are at least
+	// an additional 64 bytes of padding after it.
+	
+	if ( padOffset >= exifContents->size() ) return;	// Sanity check for an OK last used offset.
+
+	size_t lastNonZero = exifContents->size() - 1;
+	while ( (lastNonZero >= padOffset) && ((*exifContents)[lastNonZero] == 0) ) --lastNonZero;
+	
+	bool ok = lastNonZero < padOffset;
+	if ( ! ok ) {
+		size_t nzSize = lastNonZero - padOffset + 1;
+		size_t finalSize = (exifContents->size() - 1) - lastNonZero;
+		if ( (nzSize < 64) && (finalSize > 64) ) {
+			padOffset = lastNonZero + 64;
+			assert ( padOffset < exifContents->size() );
+			ok = true;
+		}
+	}
+	
+	if ( ok ) exifContents->erase ( padOffset );
+
+}	// TrimFullExifAPP1
+
+// =================================================================================================
+// JPEG_MetaHandler::ProcessXMP
+// ============================
+//
+// Process the raw XMP and legacy metadata that was previously cached.
+
+void JPEG_MetaHandler::ProcessXMP()
+{
+
+	XMP_Assert ( ! this->processedXMP );
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	// Create the PSIR and IPTC handlers, even if there is no legacy. They might be needed for updates.
+
+	XMP_Assert ( (this->psirMgr == 0) && (this->iptcMgr == 0) );	// ProcessTNail might create the exifMgr.
+
+	bool readOnly = false;
+	if ( this->parent ){
+		readOnly = ((this->parent->openFlags & kXMPFiles_OpenForUpdate) == 0);
+	}
+	if ( readOnly ) {
+		if ( this->exifMgr == 0 ) this->exifMgr = new TIFF_MemoryReader();
+		this->psirMgr = new PSIR_MemoryReader();
+		this->iptcMgr = new IPTC_Reader();	// ! Parse it later.
+	} else {
+		if ( this->exifContents.size() == (65534 - 2 - 6) ) TrimFullExifAPP1 ( &this->exifContents );
+		if ( this->exifMgr == 0 ) this->exifMgr = new TIFF_FileWriter();
+		this->psirMgr = new PSIR_FileWriter();
+		this->iptcMgr = new IPTC_Writer();	// ! Parse it later.
+	}
+	if ( this->parent )
+		exifMgr->SetErrorCallback( &this->parent->errorCallback );
+
+	// Set up everything for the legacy import, but don't do it yet. This lets us do a forced legacy
+	// import if the XMP packet gets parsing errors.
+
+	TIFF_Manager & exif = *this->exifMgr;	// Give the compiler help in recognizing non-aliases.
+	PSIR_Manager & psir = *this->psirMgr;
+	IPTC_Manager & iptc = *this->iptcMgr;
+
+	bool haveExif = (! this->exifContents.empty());
+	if ( haveExif ) {
+		exif.ParseMemoryStream ( this->exifContents.c_str(), (XMP_Uns32)this->exifContents.size() );
+	}
+
+	bool havePSIR = (! this->psirContents.empty());
+	if ( havePSIR ) {
+		psir.ParseMemoryResources ( this->psirContents.c_str(), (XMP_Uns32)this->psirContents.size() );
+	}
+
+	PSIR_Manager::ImgRsrcInfo iptcInfo;
+	bool haveIPTC = false;
+	if ( havePSIR ) haveIPTC = psir.GetImgRsrc ( kPSIR_IPTC, &iptcInfo );;
+	int iptcDigestState = kDigestMatches;
+
+	if ( haveIPTC ) {
+
+		bool haveDigest = false;
+		PSIR_Manager::ImgRsrcInfo digestInfo;
+		if ( havePSIR ) haveDigest = psir.GetImgRsrc ( kPSIR_IPTCDigest, &digestInfo );
+		if ( digestInfo.dataLen != 16 ) haveDigest = false;
+
+		if ( ! haveDigest ) {
+			iptcDigestState = kDigestMissing;
+		} else {
+			iptcDigestState = PhotoDataUtils::CheckIPTCDigest ( iptcInfo.dataPtr, iptcInfo.dataLen, digestInfo.dataPtr );
+		}
+
+	}
+
+	XMP_OptionBits options = 0;
+	if ( this->containsXMP ) options |= k2XMP_FileHadXMP;
+	if ( haveExif ) options |= k2XMP_FileHadExif;
+	if ( haveIPTC ) options |= k2XMP_FileHadIPTC;
+
+	// Process the main XMP packet. If it fails to parse, do a forced legacy import but still throw
+	// an exception. This tells the caller that an error happened, but gives them recovered legacy
+	// should they want to proceed with that.
+
+	bool haveXMP = false;
+
+	if ( ! this->xmpPacket.empty() ) {
+		XMP_Assert ( this->containsXMP );
+		// Common code takes care of packetInfo.charForm, .padSize, and .writeable.
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen)this->xmpPacket.size();
+		try {
+			this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+		} catch ( ... ) { /* Ignore parsing failures, someday we hope to get partial XMP back. */ }
+		haveXMP = true;
+	}
+
+	// Process the extended XMP if it has a matching GUID.
+
+	if ( ! this->extendedXMP.empty() ) {
+
+		bool found;
+		GUID_32 g32;
+		std::string extGUID, extPacket;
+		ExtendedXMPMap::iterator guidPos = this->extendedXMP.end();
+
+		found = this->xmpObj.GetProperty ( kXMP_NS_XMP_Note, "HasExtendedXMP", &extGUID, 0 );
+		if ( found && (extGUID.size() == sizeof(g32.data)) ) {
+			XMP_Assert ( sizeof(g32.data) == 32 );
+			memcpy ( g32.data, extGUID.c_str(), sizeof(g32.data) );	// AUDIT: Use of sizeof(g32.data) is safe.
+			guidPos = this->extendedXMP.find ( g32 );
+			this->xmpObj.DeleteProperty ( kXMP_NS_XMP_Note, "HasExtendedXMP" );	// ! Must only be in the file.
+			#if Trace_UnlimitedJPEG
+				printf ( "%s extended XMP for GUID %s\n",
+					     ((guidPos != this->extendedXMP.end()) ? "Found" : "Missing"), extGUID.c_str() );
+			#endif
+		}
+
+		if ( guidPos != this->extendedXMP.end() ) {
+			try {
+				XMP_StringPtr extStr = guidPos->second.c_str();
+				XMP_StringLen extLen = (XMP_StringLen)guidPos->second.size();
+				SXMPMeta extXMP ( extStr, extLen );
+				SXMPUtils::MergeFromJPEG ( &this->xmpObj, extXMP );
+			} catch ( ... ) {
+				// Ignore failures, let the rest of the XMP and legacy be kept.
+			}
+		}
+
+	}
+
+	// Process the legacy metadata.
+
+	if ( haveIPTC && (! haveXMP) && (iptcDigestState == kDigestMatches) ) iptcDigestState = kDigestMissing;
+	bool parseIPTC = (iptcDigestState != kDigestMatches) || (! readOnly);
+	if ( parseIPTC ) iptc.ParseMemoryDataSets ( iptcInfo.dataPtr, iptcInfo.dataLen );
+	ImportPhotoData ( exif, iptc, psir, iptcDigestState, &this->xmpObj, options );
+
+	this->containsXMP = true;	// Assume we had something for the XMP.
+
+}	// JPEG_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// JPEG_MetaHandler::UpdateFile
+// ============================
+
+void JPEG_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	XMP_Assert ( ! doSafeUpdate );	// This should only be called for "unsafe" updates.
+
+	XMP_Int64 oldPacketOffset = this->packetInfo.offset;
+	XMP_Int32 oldPacketLength = this->packetInfo.length;
+
+	if ( oldPacketOffset == kXMPFiles_UnknownOffset ) oldPacketOffset = 0;	// ! Simplify checks.
+	if ( oldPacketLength == kXMPFiles_UnknownLength ) oldPacketLength = 0;
+
+	bool fileHadXMP = ((oldPacketOffset != 0) && (oldPacketLength != 0));
+
+	// Update the IPTC-IIM and native TIFF/Exif metadata. ExportPhotoData also trips the tiff: and
+	// exif: copies from the XMP, so reserialize the now final XMP packet.
+
+	ExportPhotoData ( kXMP_JPEGFile, &this->xmpObj, this->exifMgr, this->iptcMgr, this->psirMgr );
+
+	try {
+		XMP_OptionBits options = kXMP_UseCompactFormat;
+		if ( fileHadXMP ) options |= kXMP_ExactPacketLength;
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, options, oldPacketLength );
+	} catch ( ... ) {
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+	}
+
+	// Decide whether to do an in-place update. This can only happen if all of the following are true:
+	//	- There is a standard packet in the file.
+	//	- There is no extended XMP in the file.
+	//	- The are no changes to the legacy Exif or PSIR portions. (The IPTC is in the PSIR.)
+	//	- The new XMP can fit in the old space, without extensions.
+
+	bool doInPlace = (fileHadXMP && (this->xmpPacket.size() <= (size_t)oldPacketLength));
+
+	if ( ! this->extendedXMP.empty() ) doInPlace = false;
+
+	if ( (this->exifMgr != 0) && (this->exifMgr->IsLegacyChanged()) ) doInPlace = false;
+	if ( (this->psirMgr != 0) && (this->psirMgr->IsLegacyChanged()) ) doInPlace = false;
+
+	if ( doInPlace ) {
+
+		#if GatherPerformanceData
+			sAPIPerf->back().extraInfo += ", JPEG in-place update";
+		#endif
+
+		if ( this->xmpPacket.size() < (size_t)this->packetInfo.length ) {
+			// They ought to match, cheap to be sure.
+			size_t extraSpace = (size_t)this->packetInfo.length - this->xmpPacket.size();
+			this->xmpPacket.append ( extraSpace, ' ' );
+		}
+
+		XMP_IO* liveFile = this->parent->ioRef;
+		std::string & newPacket = this->xmpPacket;
+
+		XMP_Assert ( newPacket.size() == (size_t)oldPacketLength );	// ! Done by common PutXMP logic.
+
+		liveFile->Seek ( oldPacketOffset, kXMP_SeekFromStart  );
+		liveFile->Write ( newPacket.c_str(), (XMP_Int32)newPacket.size() );
+
+	} else {
+
+		#if GatherPerformanceData
+			sAPIPerf->back().extraInfo += ", JPEG copy update";
+		#endif
+
+		XMP_IO* origRef = this->parent->ioRef;
+		XMP_IO* tempRef = origRef->DeriveTemp();
+
+		try {
+			XMP_Assert ( ! this->skipReconcile );
+			this->skipReconcile = true;
+			this->WriteTempFile ( tempRef );
+			this->skipReconcile = false;
+		} catch ( ... ) {
+			this->skipReconcile = false;
+			origRef->DeleteTemp();
+			throw;
+		}
+
+		origRef->AbsorbTemp();
+
+	}
+
+	this->needsUpdate = false;
+
+}	// JPEG_MetaHandler::UpdateFile
+
+// =================================================================================================
+// JPEG_MetaHandler::WriteTempFile
+// ===============================
+//
+// The metadata parts of a JPEG file are APP1 marker segments for Exif and XMP, and an APP13 marker
+// segment for Photoshop image resources which contain the IPTC. Corresponding marker segments in
+// the source file are ignored, other parts of the source file are copied. Any initial APP0 marker
+// segments are copied first. Then the new Exif, XMP, and PSIR marker segments are written. Then the
+// rest of the file is copied, skipping the old Exif, XMP, and PSIR. The checking for old metadata
+// stops at the first SOFn marker.
+
+void JPEG_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_IO* origRef = this->parent->ioRef;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_Uns16 marker, contentLen;
+
+	static const size_t kBufferSize = 64*1024;	// Enough for a segment with maximum contents.
+	XMP_Uns8 buffer [kBufferSize];
+	
+	XMP_Int64 origLength = origRef->Length();
+	if ( origLength == 0 ) return;	// Tolerate empty files.
+	if ( origLength < 4 ) {
+		XMP_Throw ( "JPEG must have at least SOI and EOI markers", kXMPErr_BadJPEG );
+	}
+
+	if ( ! skipReconcile ) {
+		// Update the IPTC-IIM and native TIFF/Exif metadata, and reserialize the now final XMP packet.
+		ExportPhotoData ( kXMP_JPEGFile, &this->xmpObj, this->exifMgr, this->iptcMgr, this->psirMgr );
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+	}
+
+	origRef->Rewind();
+	tempRef->Truncate ( 0 );
+
+	marker = XIO::ReadUns16_BE ( origRef );	// Just read the SOI marker.
+	if ( marker != 0xFFD8 ) XMP_Throw ( "Missing SOI marker", kXMPErr_BadJPEG );
+	XIO::WriteUns16_BE ( tempRef, marker );
+
+	// Copy any leading APP0 marker segments.
+
+	while ( true ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "JPEG_MetaHandler::WriteFile - User abort", kXMPErr_UserAbort );
+		}
+		
+		if ( ! XIO::CheckFileSpace ( origRef, 2 ) ) break;	// Tolerate a file that ends abruptly.
+		
+		marker = XIO::ReadUns16_BE ( origRef );	// Read the next marker.
+		if ( marker == 0xFFFF ) {
+			// Have a pad byte, skip it. These are almost unheard of, so efficiency isn't critical.
+			origRef->Seek ( -1, kXMP_SeekFromCurrent );	// Skip the first 0xFF, read the second again.
+			continue;
+		}
+
+		if ( marker != 0xFFE0 ) break;	// Have a non-APP0 marker.
+		XIO::WriteUns16_BE ( tempRef, marker );	// Write the APP0 marker.
+		
+		contentLen = XIO::ReadUns16_BE ( origRef );	// Copy the APP0 segment's length.
+		XIO::WriteUns16_BE ( tempRef, contentLen );
+
+		if ( contentLen < 2 ) XMP_Throw ( "Invalid JPEG segment length", kXMPErr_BadJPEG );
+		contentLen -= 2;	// Reduce to just the content length.
+		origRef->ReadAll ( buffer, contentLen );	// Copy the APP0 segment's content.
+		tempRef->Write ( buffer, contentLen );
+
+	}
+
+	// Write the new Exif APP1 marker segment.
+
+	XMP_Uns32 first4;
+
+	if ( this->exifMgr != 0 ) {
+
+		void* exifPtr;
+		XMP_Uns32 exifLen = this->exifMgr->UpdateMemoryStream ( &exifPtr );
+		if ( exifLen > kExifMaxDataLength ) exifLen = this->exifMgr->UpdateMemoryStream ( &exifPtr, true /* compact */ );
+
+		while ( exifLen > 0 ) {
+			XMP_Uns32 count = std::min ( exifLen, (XMP_Uns32) kExifMaxDataLength );
+			first4 = MakeUns32BE ( 0xFFE10000 + 2 + kExifSignatureLength + count );
+			tempRef->Write ( &first4, 4 );
+			tempRef->Write ( kExifSignatureString, kExifSignatureLength );
+			tempRef->Write ( exifPtr, count );
+			exifPtr = (XMP_Uns8 *) exifPtr + count;
+			exifLen -= count;
+		}
+	}
+
+	// Write the new XMP APP1 marker segment, with possible extension marker segments.
+
+	std::string mainXMP, extXMP, extDigest;
+	SXMPUtils::PackageForJPEG ( this->xmpObj, &mainXMP, &extXMP, &extDigest );
+	XMP_Assert ( (extXMP.size() == 0) || (extDigest.size() == 32) );
+
+	first4 = MakeUns32BE ( 0xFFE10000 + 2 + kMainXMPSignatureLength + (XMP_Uns32)mainXMP.size() );
+	tempRef->Write ( &first4, 4 );
+	tempRef->Write ( kMainXMPSignatureString, kMainXMPSignatureLength );
+	tempRef->Write ( mainXMP.c_str(), (XMP_Int32)mainXMP.size() );
+
+	size_t extPos = 0;
+	size_t extLen = extXMP.size();
+
+	while ( extLen > 0 ) {
+
+		size_t partLen = extLen;
+		if ( partLen > 65000 ) partLen = 65000;
+
+		first4 = MakeUns32BE ( 0xFFE10000 + 2 + kExtXMPPrefixLength + (XMP_Uns32)partLen );
+		tempRef->Write ( &first4, 4 );
+
+		tempRef->Write ( kExtXMPSignatureString, kExtXMPSignatureLength );
+		tempRef->Write ( extDigest.c_str(), (XMP_Int32)extDigest.size() );
+
+		first4 = MakeUns32BE ( (XMP_Int32)extXMP.size() );
+		tempRef->Write ( &first4, 4 );
+		first4 = MakeUns32BE ( (XMP_Int32)extPos );
+		tempRef->Write ( &first4, 4 );
+
+		tempRef->Write ( &extXMP[extPos], (XMP_Int32)partLen );
+
+		extPos += partLen;
+		extLen -= partLen;
+
+	}
+
+	// Write the new PSIR APP13 marker segments.
+	if ( this->psirMgr != 0 ) {
+
+		void* psirPtr;
+		XMP_Uns32 psirLen = this->psirMgr->UpdateMemoryResources ( &psirPtr );
+		while ( psirLen > 0 ) {
+			XMP_Uns32 count = std::min ( psirLen, (XMP_Uns32) kPSIRMaxDataLength );
+			first4 = MakeUns32BE ( 0xFFED0000 + 2 + kPSIRSignatureLength + count );
+			tempRef->Write ( &first4, 4 );
+			tempRef->Write ( kPSIRSignatureString, kPSIRSignatureLength );
+			tempRef->Write ( psirPtr, count );
+			psirPtr = (XMP_Uns8 *) psirPtr + count;
+			psirLen -= count;
+		}
+	}
+
+	// Copy remaining marker segments, skipping old metadata, to the first SOS marker or to EOI.
+	origRef->Seek ( -2, kXMP_SeekFromCurrent );	// Back up to the marker from the end of the APP0 copy loop.
+	
+	while ( true ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "JPEG_MetaHandler::WriteFile - User abort", kXMPErr_UserAbort );
+		}
+
+		if ( ! XIO::CheckFileSpace ( origRef, 2 ) ) break;	// Tolerate a file that ends abruptly.
+		
+		marker = XIO::ReadUns16_BE ( origRef );	// Read the next marker.
+		if ( marker == 0xFFFF ) {
+			// Have a pad byte, skip it. These are almost unheard of, so efficiency isn't critical.
+			origRef->Seek ( -1, kXMP_SeekFromCurrent );	// Skip the first 0xFF, read the second again.
+			continue;
+		}
+
+		if ( (marker == 0xFFDA) || (marker == 0xFFD9) ) {	// Quit at the first SOS marker or at EOI.
+			origRef->Seek ( -2, kXMP_SeekFromCurrent );	// The tail copy must include this marker.
+			break;
+		}
+
+		if ( (marker == 0xFF01) ||	// Ill-formed file if we encounter a TEM or RSTn marker.
+			 ((0xFFD0 <= marker) && (marker <= 0xFFD7)) ) {
+			XMP_Throw ( "Unexpected TEM or RSTn marker", kXMPErr_BadJPEG );
+		}
+
+		contentLen = XIO::ReadUns16_BE ( origRef );	// Read this segment's length.
+		if ( contentLen < 2 ) XMP_Throw ( "Invalid JPEG segment length", kXMPErr_BadJPEG );
+		contentLen -= 2;	// Reduce to just the content length.
+		
+		XMP_Int64 contentOrigin = origRef->Offset();
+		bool copySegment = true;
+		size_t signatureLen;
+
+		if ( (marker == 0xFFED) && (contentLen >= kPSIRSignatureLength) ) {
+
+			// This is an APP13 segment, skip if it is the old PSIR.
+			signatureLen = origRef->Read ( buffer, kPSIRSignatureLength );
+			if ( (signatureLen == kPSIRSignatureLength) &&
+				 CheckBytes ( &buffer[0], kPSIRSignatureString, kPSIRSignatureLength ) ) {
+				copySegment = false;
+			}
+
+		} else if ( (marker == 0xFFE1) && (contentLen >= kExifSignatureLength) ) {	// Check for the shortest signature.
+
+			// This is an APP1 segment, skip if it is the old Exif or XMP.
+			
+			XMP_Assert ( (kExifSignatureLength < kMainXMPSignatureLength) &&
+						 (kMainXMPSignatureLength < kExtXMPSignatureLength) );
+			signatureLen = origRef->Read ( buffer, kExtXMPSignatureLength );	// Read for the longest signature.
+
+			if ( (signatureLen >= kExifSignatureLength) &&
+				 (CheckBytes ( &buffer[0], kExifSignatureString, kExifSignatureLength ) ||
+				  CheckBytes ( &buffer[0], kExifSignatureAltStr, kExifSignatureLength )) ) {
+				copySegment = false;
+			}
+			
+			if ( copySegment && (signatureLen >= kMainXMPSignatureLength) &&
+				 CheckBytes ( &buffer[0], kMainXMPSignatureString, kMainXMPSignatureLength ) ) {
+				copySegment = false;
+			}
+			
+			if ( copySegment && (signatureLen == kExtXMPSignatureLength) &&
+				 CheckBytes ( &buffer[0], kExtXMPSignatureString, kExtXMPPrefixLength ) ) {
+				copySegment = false;
+			}
+			
+		}
+		
+		if ( ! copySegment ) {
+			origRef->Seek ( (contentOrigin + contentLen), kXMP_SeekFromStart );
+		} else {
+			XIO::WriteUns16_BE ( tempRef, marker );
+			XIO::WriteUns16_BE ( tempRef, (contentLen + 2) );
+			origRef->Seek ( contentOrigin, kXMP_SeekFromStart );
+			origRef->ReadAll ( buffer, contentLen );
+			tempRef->Write ( buffer, contentLen );
+		}
+
+	}
+
+	// Copy the remainder of the source file.
+
+	XIO::Copy ( origRef, tempRef, (origLength - origRef->Offset()) );
+	this->needsUpdate = false;
+
+}	// JPEG_MetaHandler::WriteTempFile
diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.hpp b/XMPFiles/source/FileHandlers/JPEG_Handler.hpp
new file mode 100644
index 0000000..9e859c1
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/JPEG_Handler.hpp
@@ -0,0 +1,99 @@
+#ifndef __JPEG_Handler_hpp__
+#define __JPEG_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! Must be the first #include!
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+
+// =================================================================================================
+/// \file JPEG_Handler.hpp
+/// \brief File format handler for JPEG.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// *** Could derive from Basic_Handler - buffer file tail in a temp file.
+
+extern XMPFileHandler * JPEG_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool JPEG_CheckFormat ( XMP_FileFormat format,
+							   XMP_StringPtr  filePath,
+                               XMP_IO *       fileRef,
+                               XMPFiles *     parent );
+
+static const XMP_OptionBits kJPEG_HandlerFlags = (kXMPFiles_CanInjectXMP |
+                                                  kXMPFiles_CanExpand |
+                                                  kXMPFiles_CanRewrite |
+                                                  kXMPFiles_PrefersInPlace |
+                                                  kXMPFiles_CanReconcile |
+                                                  kXMPFiles_AllowsOnlyXMP |
+                                                  kXMPFiles_ReturnsRawPacket |
+                                                  kXMPFiles_AllowsSafeUpdate);
+
+class JPEG_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile    ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	struct GUID_32 {	// A hack to get an assignment operator for an array.
+		char data [32];
+		void operator= ( const GUID_32 & in )
+		{
+			memcpy ( this->data, in.data, sizeof(this->data) );	// AUDIT: Use of sizeof(this->data) is safe.
+		};
+		bool operator< ( const GUID_32 & right ) const
+		{
+			return (memcmp ( this->data, right.data, sizeof(this->data) ) < 0);
+		};
+		bool operator== ( const GUID_32 & right ) const
+		{
+			return (memcmp ( this->data, right.data, sizeof(this->data) ) == 0);
+		};
+	};
+
+	JPEG_MetaHandler ( XMPFiles * parent );
+	virtual ~JPEG_MetaHandler();
+
+private:
+
+	JPEG_MetaHandler() : exifMgr(0), psirMgr(0), iptcMgr(0), skipReconcile(false) {};	// Hidden on purpose.
+
+	std::string exifContents;
+	std::string psirContents;
+
+	TIFF_Manager * exifMgr;	// The Exif manager will be created by ProcessTNail or ProcessXMP.
+	PSIR_Manager * psirMgr;	// Need to use pointers so we can properly select between read-only and
+	IPTC_Manager * iptcMgr;	//	read-write modes of usage.
+
+	bool skipReconcile;	// ! Used between UpdateFile and WriteFile.
+
+	typedef std::map < GUID_32, std::string > ExtendedXMPMap;
+
+	ExtendedXMPMap extendedXMP;	// ! Only contains those with complete data.
+//	void CacheExtendedXMP ( ExtendedXMPInfo * extXMP, XMP_Uns8 * buffer, size_t bufferLen );
+
+};	// JPEG_MetaHandler
+
+// =================================================================================================
+
+#endif /* __JPEG_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.cpp b/XMPFiles/source/FileHandlers/MP3_Handler.cpp
new file mode 100644
index 0000000..55211c9
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/MP3_Handler.cpp
@@ -0,0 +1,729 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/MP3_Handler.hpp"
+
+// =================================================================================================
+/// \file MP3_Handler.cpp
+/// \brief MP3 handler class.
+// =================================================================================================
+
+// =================================================================================================
+// Helper structs and private routines
+// ====================
+struct ReconProps {
+	const char* mainID;	// The stored v2.3 and v2.4 ID, also used as the main logical ID.
+	const char* v22ID;	// The stored v2.2 ID.
+	const char* ns;
+	const char* prop;
+};
+
+const static XMP_Uns32 XMP_V23_ID = 0x50524956;	// PRIV
+const static XMP_Uns32 XMP_V22_ID = 0x50525600;	// PRV
+
+const static ReconProps reconProps[] = {
+	{ "TPE1", "TP1", kXMP_NS_DM,	"artist" },
+	{ "TALB", "TAL", kXMP_NS_DM,	"album"  },
+	{ "TRCK", "TRK", kXMP_NS_DM,	"trackNumber"  },
+	// exceptions that need attention:
+	{ "TCON", "TCO", kXMP_NS_DM,	"genre"  }, // genres might be numeric
+	{ "TIT2", "TT2", kXMP_NS_DC,	"title"  }, // ["x-default"] language alternatives
+	{ "COMM", "COM", kXMP_NS_DM,	"logComment"  }, // two distinct strings, language alternative
+
+	{ "TYER", "TYE", kXMP_NS_XMP,	"CreateDate"  }, // Year (YYYY) Deprecated in 2.4
+	{ "TDAT", "TDA", kXMP_NS_XMP,	"CreateDate"  }, // Date (DDMM) Deprecated in 2.4
+	{ "TIME", "TIM", kXMP_NS_XMP,	"CreateDate"  }, // Time (HHMM) Deprecated in 2.4
+	{ "TDRC", "", kXMP_NS_XMP,	"CreateDate"  }, // assembled date/time v2.4
+
+	// new reconciliations introduced in Version 5
+	{ "TCMP", "TCP", kXMP_NS_DM,	"partOfCompilation"  },	// presence/absence of TCMP frame dedides
+	{ "USLT", "ULT", kXMP_NS_DM,	"lyrics"  },
+	{ "TCOM", "TCM", kXMP_NS_DM,	"composer"  },
+	{ "TPOS", "TPA", kXMP_NS_DM,	"discNumber"  },		// * a text field! might contain "/<total>"
+	{ "TCOP", "TCR", kXMP_NS_DC,	"rights"  },  // ["x-default"] language alternatives
+	{ "TPE4", "TP4", kXMP_NS_DM,	"engineer"  },
+	{ "WCOP", "WCP", kXMP_NS_XMP_Rights,	"WebStatement"  },
+
+	{ 0, 0, 0, 0 }	// must be last as a sentinel
+};
+
+// =================================================================================================
+// MP3_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * MP3_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new MP3_MetaHandler ( parent );
+}
+
+// =================================================================================================
+// MP3_CheckFormat
+// ===============
+
+// For MP3 we check parts .... See the MP3 spec for offset info.
+
+bool MP3_CheckFormat ( XMP_FileFormat format,
+					  XMP_StringPtr  filePath,
+					  XMP_IO*    file,
+					  XMPFiles *     parent )
+{
+	IgnoreParam(filePath); IgnoreParam(parent);	//supress warnings
+	XMP_Assert ( format == kXMP_MP3File );		//standard assert
+
+	if ( file->Length() < 10 ) return false;
+	file ->Rewind();
+
+	XMP_Uns8 header[3];
+	file->ReadAll ( header, 3 );
+	if ( ! CheckBytes( &header[0], "ID3", 3 ) ) return (parent->format == kXMP_MP3File);
+
+	XMP_Uns8 major = XIO::ReadUns8( file );
+	XMP_Uns8 minor = XIO::ReadUns8( file );
+
+	if ( (major < 2) || (major > 4) || (minor == 0xFF) ) return false;
+
+	XMP_Uns8 flags = XIO::ReadUns8 ( file );
+
+	//TODO
+	if ( flags & 0x10 ) XMP_Throw ( "no support for MP3 with footer", kXMPErr_Unimplemented );
+	if ( flags & 0x80 ) return false; //no support for unsynchronized MP3 (as before, also see [1219125])
+	if ( flags & 0x0F ) XMP_Throw ( "illegal header lower bits", kXMPErr_Unimplemented );
+
+	XMP_Uns32 size = XIO::ReadUns32_BE ( file );
+	if ( (size & 0x80808080) != 0 ) return false; //if any bit survives -> not a valid synchsafe 32 bit integer
+
+	return true;
+	
+}	// MP3_CheckFormat
+
+
+// =================================================================================================
+// MP3_MetaHandler::MP3_MetaHandler
+// ================================
+
+MP3_MetaHandler::MP3_MetaHandler ( XMPFiles * _parent )
+{
+	this->oldTagSize = 0;
+	this->oldPadding = 0;
+	this->oldFramesSize = 0;
+	this->newTagSize = 0;
+	this->newPadding = 0;
+	this->newFramesSize = 0;
+	this->tagIsDirty = false;
+	this->mustShift = false;
+	this->majorVersion = 2;
+	this->minorVersion = 3;
+	this->hasID3Tag = false;
+	this->hasFooter = false;
+	this->extHeaderSize = 0;
+	this->hasExtHeader = false;
+	this->parent = _parent;
+	this->handlerFlags = kMP3_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+}
+
+// =================================================================================================
+// MP3_MetaHandler::~MP3_MetaHandler
+// =================================
+
+MP3_MetaHandler::~MP3_MetaHandler()
+{
+	// free frames
+	ID3v2Frame* curFrame;
+	while ( !this->framesVector.empty() ) {
+		curFrame = this->framesVector.back();
+		delete curFrame;
+		framesVector.pop_back();
+	}
+}
+
+// =================================================================================================
+// MP3_MetaHandler::CacheFileData
+// ==============================
+
+void MP3_MetaHandler::CacheFileData()
+{
+
+	//*** abort procedures
+	this->containsXMP = false;		//assume no XMP for now
+
+	XMP_IO* file = this->parent->ioRef;
+	XMP_PacketInfo &packetInfo = this->packetInfo;
+
+	file->Rewind();
+
+	this->hasID3Tag = this->id3Header.read( file );
+	this->majorVersion = this->id3Header.fields[ID3Header::o_vMajor];
+	this->minorVersion = this->id3Header.fields[ID3Header::o_vMinor];
+	this->hasExtHeader = (0 != ( 0x40 & this->id3Header.fields[ID3Header::o_flags])); //'naturally' false if no ID3Tag
+	this->hasFooter = ( 0 != ( 0x10 & this->id3Header.fields[ID3Header::o_flags])); //'naturally' false if no ID3Tag
+
+	// stored size is w/o initial header (thus adding 10)
+	// + but extended header (if existing)
+	// + padding + frames after unsynchronisation (?)
+	// (if no ID3 tag existing, constructed default correctly sets size to 10.)
+	this->oldTagSize = ID3Header::kID3_TagHeaderSize + synchToInt32(GetUns32BE( &id3Header.fields[ID3Header::o_size] ));
+
+	if ( ! hasExtHeader ) {
+
+		this->extHeaderSize = 0; // := there is no such header.
+
+	} else {
+
+		this->extHeaderSize = synchToInt32( XIO::ReadInt32_BE( file));
+		XMP_Uns8 extHeaderNumFlagBytes = XIO::ReadUns8( file );
+
+		// v2.3 doesn't include the size, while v2.4 does
+		if ( this->majorVersion < 4 ) this->extHeaderSize += 4;
+		XMP_Validate( this->extHeaderSize >= 6, "extHeader size too small", kXMPErr_BadFileFormat );
+
+		file->Seek ( this->extHeaderSize - 6, kXMP_SeekFromCurrent );
+
+	}
+
+	this->framesVector.clear(); //mac precaution
+	ID3v2Frame* curFrame = 0; // reusable
+
+	////////////////////////////////////////////////////
+	// read frames
+	
+	XMP_Uns32 xmpID = XMP_V23_ID;
+	if ( this->majorVersion == 2 ) xmpID = XMP_V22_ID;
+
+	while ( file->Offset() < this->oldTagSize ) {
+
+		curFrame = new ID3v2Frame();
+
+		try {
+			XMP_Int64 frameSize = curFrame->read ( file, this->majorVersion );
+			if ( frameSize == 0 ) {
+				delete curFrame; // ..since not becoming part of vector for latter delete.
+				break;			 // not a throw. There's nothing wrong with padding.
+			}
+			this->containsXMP = true;
+		} catch ( ... ) {
+			delete curFrame;
+			throw;
+		}
+
+		// these are both pointer assignments, no (copy) construction
+		// (MemLeak Note: for all things pushed, memory cleanup is taken care of in destructor.)
+		this->framesVector.push_back ( curFrame );
+
+		//remember XMP-Frame, if it occurs:
+		if ( (curFrame->id ==xmpID) &&
+			 (curFrame->contentSize > 8) && CheckBytes ( &curFrame->content[0], "XMP\0", 4 ) ) {
+
+			// be sure that this is the first packet (all else would be illegal format)
+			XMP_Validate ( this->framesMap[xmpID] == 0, "two XMP packets in one file", kXMPErr_BadFileFormat );
+			//add this to map, needed on reconciliation
+			this->framesMap[xmpID] = curFrame;
+	
+			this->packetInfo.length = curFrame->contentSize - 4; // content minus "XMP\0"
+			this->packetInfo.offset = ( file->Offset() - this->packetInfo.length );
+	
+			this->xmpPacket.erase(); //safety
+			this->xmpPacket.assign( &curFrame->content[4], curFrame->contentSize - 4 );
+			this->containsXMP = true; // do this last, after all possible failure
+		
+		}
+
+		// No space for another frame? => assume into ID3v2.4 padding.
+		XMP_Int64 newPos = file->Offset();
+		XMP_Int64 spaceLeft = this->oldTagSize - newPos;	// Depends on first check below!
+		if ( (newPos > this->oldTagSize) || (spaceLeft < (XMP_Int64)ID3Header::kID3_TagHeaderSize) ) break;
+
+	}
+
+	////////////////////////////////////////////////////
+	// padding
+
+	this->oldPadding = this->oldTagSize - file->Offset();
+	this->oldFramesSize = this->oldTagSize - ID3Header::kID3_TagHeaderSize - this->oldPadding;
+
+	XMP_Validate ( (this->oldPadding >= 0), "illegal oldTagSize or padding value", kXMPErr_BadFileFormat );
+
+	for ( XMP_Int64 i = this->oldPadding; i > 0; ) {
+		if ( i >= 8 ) {
+			if ( XIO::ReadInt64_BE(file) != 0 ) XMP_Throw ( "padding not nulled out", kXMPErr_BadFileFormat );
+			i -= 8;
+			continue;
+		}
+		if ( XIO::ReadUns8(file) != 0) XMP_Throw ( "padding(2) not nulled out", kXMPErr_BadFileFormat );
+		i--;
+	}
+
+	//// read ID3v1 tag
+	if ( ! this->containsXMP ) this->containsXMP = id3v1Tag.read ( file, &this->xmpObj );
+
+}	// MP3_MetaHandler::CacheFileData
+
+
+// =================================================================================================
+// MP3_MetaHandler::ProcessXMP
+// ===========================
+//
+// Process the raw XMP and legacy metadata that was previously cached.
+
+void MP3_MetaHandler::ProcessXMP()
+{
+
+	// Process the XMP packet.
+	if ( ! this->xmpPacket.empty() ) {
+		XMP_Assert ( this->containsXMP );
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen) this->xmpPacket.size();
+		this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+		this->processedXMP = true;
+	}
+
+	///////////////////////////////////////////////////////////////////
+	// assumptions on presence-absence "flag tags"
+	//   ( unless no xmp whatsoever present )
+	if ( ! this->xmpPacket.empty() ) this->xmpObj.SetProperty ( kXMP_NS_DM, "partOfCompilation", "false" );
+
+	////////////////////////////////////////////////////////////////////
+	// import of legacy properties
+	ID3v2Frame* curFrame;
+	XMP_Bool hasTDRC = false;
+	XMP_DateTime newDateTime;
+
+	if ( this->hasID3Tag ) {	// otherwise pretty pointless...
+
+		for ( int r = 0; reconProps[r].mainID != 0; ++r ) {
+
+			//get the frame ID to look for
+			XMP_Uns32 logicalID = GetUns32BE ( reconProps[r].mainID );
+			XMP_Uns32 storedID = logicalID;
+			if ( this->majorVersion == 2 ) storedID = GetUns32BE ( reconProps[r].v22ID );
+
+			// deal with each such frame in the frameVector
+			// (since there might be several, some of them not applicable, i.e. COMM)
+
+			vector<ID3_Support::ID3v2Frame*>::iterator it;
+			for ( it = this->framesVector.begin(); it != this->framesVector.end(); ++it ) {
+
+				curFrame = *it;
+				if ( storedID != curFrame->id ) continue;
+
+				// go deal with it!
+				// get the property
+				std::string id3Text, xmpText;
+				bool result = curFrame->getFrameValue ( this->majorVersion, logicalID, &id3Text );
+				if ( ! result ) continue; //ignore but preserve this frame (i.e. not applicable COMM frame)
+
+				//////////////////////////////////////////////////////////////////////////////////
+				// if we come as far as here, it's proven that there's a relevant XMP property
+
+				this->containsXMP = true;
+
+				ID3_Support::ID3v2Frame* t = this->framesMap [ storedID ];
+				if ( t != 0 )  t->active = false;
+
+				// add this to map (needed on reconciliation)
+				// note: above code reaches, that COMM/USLT frames
+				// only then reach this map, if they are 'eng'(lish)
+				// multiple occurences indeed leads to last one survives
+				// ( in this map, all survive in the file )
+				this->framesMap [ storedID ] = curFrame;
+
+				// now write away as needed;
+				// merely based on existence, relevant even if empty:
+				if ( logicalID == 0x54434D50) {	// TCMP if exists: part of compilation
+
+					this->xmpObj.SetProperty ( kXMP_NS_DM, "partOfCompilation", "true" );
+
+				} else if ( ! id3Text.empty() ) {
+
+					switch ( logicalID ) {
+
+						case 0x54495432: // TIT2 -> title["x-default"]
+						case 0x54434F50: // TCOP -> rights["x-default"]
+							this->xmpObj.SetLocalizedText ( reconProps[r].ns, reconProps[r].prop,"", "x-default", id3Text );
+							break;
+
+						case 0x54434F4E: // TCON -> genre
+							ID3_Support::GenreUtils::ConvertGenreToXMP ( id3Text.c_str(), &xmpText );
+							if ( ! xmpText.empty() ) {
+								this->xmpObj.SetProperty ( reconProps[r].ns, reconProps[r].prop, xmpText );
+							}
+							break;
+
+						case 0x54594552: // TYER -> xmp:CreateDate.year
+							{
+								try {	// Don't let wrong dates in id3 stop import.
+									if ( ! hasTDRC ) {
+										newDateTime.year = SXMPUtils::ConvertToInt ( id3Text );
+										newDateTime.hasDate = true;
+									}
+								} catch ( ... ) {
+										// Do nothing, let other imports proceed.
+								}
+								break;
+							}
+
+						case 0x54444154: //TDAT	-> xmp:CreateDate.month and day
+							{
+								try {	// Don't let wrong dates in id3 stop import.
+									// only if no TDRC has been found before
+									//&& must have the format DDMM
+									if ( (! hasTDRC) && (id3Text.length() == 4) ) {
+										newDateTime.day = SXMPUtils::ConvertToInt (id3Text.substr(0,2));
+										newDateTime.month = SXMPUtils::ConvertToInt ( id3Text.substr(2,2));
+										newDateTime.hasDate = true;
+									}
+								} catch ( ... ) {
+									// Do nothing, let other imports proceed.
+								}
+								break;
+							}
+
+						case 0x54494D45: //TIME	-> xmp:CreateDate.hours and minutes
+							{
+								try {	// Don't let wrong dates in id3 stop import.
+									// only if no TDRC has been found before
+									// && must have the format HHMM
+									if ( (! hasTDRC) && (id3Text.length() == 4) ) {
+										newDateTime.hour = SXMPUtils::ConvertToInt (id3Text.substr(0,2));
+										newDateTime.minute = SXMPUtils::ConvertToInt ( id3Text.substr(2,2));
+										newDateTime.hasTime = true;
+									}
+								} catch ( ... ) {
+									// Do nothing, let other imports proceed.
+								}
+								break;
+							}
+
+						case 0x54445243: // TDRC -> xmp:CreateDate //id3 v2.4
+							{
+								try {	// Don't let wrong dates in id3 stop import.
+									hasTDRC = true;
+									// This always wins over TYER, TDAT and TIME
+									SXMPUtils::ConvertToDate ( id3Text, &newDateTime );
+								} catch ( ... ) {
+									// Do nothing, let other imports proceed.
+								}
+								break;
+							}
+
+						default:
+							// NB: COMM/USLT need no special fork regarding language alternatives/multiple occurence.
+							//		relevant code forks are in ID3_Support::getFrameValue()
+							this->xmpObj.SetProperty ( reconProps[r].ns, reconProps[r].prop, id3Text );
+							break;
+
+					}//switch
+					
+				}
+
+			} //for iterator
+
+		}//for reconProps
+
+		// import DateTime
+        XMP_DateTime oldDateTime;
+        bool haveNewDateTime  = newDateTime.year != 0 ;
+        if ( xmpObj.GetProperty_Date ( kXMP_NS_XMP, "CreateDate", &oldDateTime, 0 ) )
+        {
+
+            haveNewDateTime = haveNewDateTime && 
+                                                        ( (newDateTime.year != oldDateTime.year) ||
+                                                            ( (newDateTime.month != 0 ) && ( (newDateTime.day != oldDateTime.day) || (newDateTime.month != oldDateTime.month) ) ) ||
+                                                            ( newDateTime.hasTime && ( (newDateTime.hour != oldDateTime.hour) || (newDateTime.minute != oldDateTime.minute) ) ) );
+        }
+            // NOTE: no further validation nessesary the function "SetProperty_Date" will care about validating date and time
+            // any exception will be caught and block import
+        try {
+            if ( haveNewDateTime ) {
+                    this->xmpObj.SetProperty_Date ( kXMP_NS_XMP, "CreateDate", newDateTime );
+            }
+        } catch ( ... ) {
+            // Dont import invalid dates from ID3
+        }
+
+	}
+
+	// very important to avoid multiple runs! (in which case I'd need to clean certain
+	// fields (i.e. regarding ->active setting)
+	this->processedXMP = true;
+
+}	// MP3_MetaHandler::ProcessXMP
+
+
+// =================================================================================================
+// MP3_MetaHandler::UpdateFile
+// ===========================
+void MP3_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( doSafeUpdate ) XMP_Throw ( "MP3_MetaHandler::UpdateFile: Safe update not supported", kXMPErr_Unavailable );
+
+	XMP_IO* file = this->parent->ioRef;
+
+	// leave 2.3 resp. 2.4 header, since we want to let alone
+	// and don't know enough about the encoding of unrelated frames...
+	XMP_Assert( this->containsXMP );
+
+	tagIsDirty = false;
+	mustShift = false;
+
+	// write out native properties:
+	// * update existing ones
+	// * create new frames as needed
+	// * delete frames if property is gone!
+	// see what there is to do for us:
+
+	// RECON LOOP START
+	for (int r = 0; reconProps[r].mainID != 0; r++ ) {
+
+		std::string value;
+		bool needDescriptor = false;
+		bool needEncodingByte = true;
+
+		XMP_Uns32 logicalID = GetUns32BE ( reconProps[r].mainID );
+		XMP_Uns32 storedID = logicalID;
+		if ( this->majorVersion == 2 ) storedID = GetUns32BE ( reconProps[r].v22ID );
+
+		ID3v2Frame* frame = framesMap[ storedID ];	// the actual frame (if already existing)
+
+		// get XMP property
+		//	* honour specific exceptions
+		//  * leave value empty() if it doesn't exist ==> frame must be delete/not created
+		switch ( logicalID ) {
+
+			case 0x54434D50: // TCMP if exists: part of compilation
+				if ( xmpObj.GetProperty( kXMP_NS_DM, "partOfCompilation", &value, 0 ) && ( 0 == stricmp( value.c_str(), "true" ) )) {
+					value = "1"; // set a TCMP frame of value 1
+				} else {
+					value.erase(); // delete/prevent creation of frame
+				}
+				break;
+	
+			case 0x54495432: // TIT2 -> title["x-default"]
+			case 0x54434F50: // TCOP -> rights["x-default"]
+				if (! xmpObj.GetLocalizedText( reconProps[r].ns, reconProps[r].prop, "", "x-default", 0, &value, 0 )) value.erase(); // if not, erase string.
+				break;
+	
+			case 0x54434F4E: // TCON -> genre
+				{
+					bool found = xmpObj.GetProperty ( reconProps[r].ns, reconProps[r].prop, &value, 0 );
+					if ( found ) {
+						std::string xmpValue = value;
+						ID3_Support::GenreUtils::ConvertGenreToID3 ( xmpValue.c_str(), &value );
+					}
+				}
+				break;
+
+			case 0x434F4D4D: // COMM
+			case 0x55534C54: // USLT, both need descriptor.
+				needDescriptor = true;
+				if (! xmpObj.GetProperty( reconProps[r].ns, reconProps[r].prop, &value, 0 )) value.erase();
+				break;
+	
+			case 0x54594552: //TYER
+			case 0x54444154: //TDAT
+			case 0x54494D45: //TIME
+				{
+					if ( majorVersion <= 3 ) {	// TYER, TIME and TDAT depricated since v. 2.4 -> else use TDRC
+
+						XMP_DateTime dateTime;
+						if (! xmpObj.GetProperty_Date( reconProps[r].ns, reconProps[r].prop, &dateTime, 0 )) {	// nothing found? -> Erase string. (Leads to Unset below)
+							value.erase();
+							break;
+						}
+	
+						// TYER
+						if ( logicalID == 0x54594552 ) {
+							XMP_Validate( dateTime.year <= 9999 && dateTime.year > 0, "Year is out of range", kXMPErr_BadParam);
+							// get only Year!
+							SXMPUtils::ConvertFromInt( dateTime.year, "", &value );
+							break;
+						} else if ( logicalID == 0x54444154 && dateTime.hasDate ) {
+							std::string day, month;
+							SXMPUtils::ConvertFromInt( dateTime.day, "", &day );
+							SXMPUtils::ConvertFromInt( dateTime.month, "", &month );
+							if ( dateTime.day < 10 )
+								value = "0";
+							value += day;
+							if ( dateTime.month < 10 )
+								value += "0";
+							value += month;
+							break;
+						} else if ( logicalID == 0x54494D45 && dateTime.hasTime ) {
+							std::string hour, minute;
+							SXMPUtils::ConvertFromInt( dateTime.hour, "", &hour );
+							SXMPUtils::ConvertFromInt( dateTime.minute, "", &minute );
+							if ( dateTime.hour < 10 )
+								value = "0";
+							value += hour;
+							if ( dateTime.minute < 10 )
+								value += "0";
+							value += minute;
+							break;
+						} else {
+							value.erase();
+							break;
+						}
+					} else {
+						value.erase();
+						break;
+					}
+				}
+				break;
+	
+			case 0x54445243: //TDRC (only v2.4)
+				{
+					// only export for id3 > v2.4
+					if ( majorVersion > 3 )  {
+						if (! xmpObj.GetProperty( reconProps[r].ns, reconProps[r].prop, &value, 0 )) value.erase();
+					}
+					break;
+				}
+				break;
+	
+			case 0x57434F50: //WCOP
+				needEncodingByte = false;
+				if (! xmpObj.GetProperty( reconProps[r].ns, reconProps[r].prop, &value, 0 )) value.erase(); // if not, erase string
+				break;
+	
+			case 0x5452434B: // TRCK
+			case 0x54504F53: // TPOS
+				// no break, go on:
+	
+			default:
+				if (! xmpObj.GetProperty( reconProps[r].ns, reconProps[r].prop, &value, 0 )) value.erase(); // if not, erase string
+				break;
+
+		}
+
+		// [XMP exist] x [frame exist] => four cases:
+		// 1/4) nothing before, nothing now
+		if ( value.empty() && (frame==0)) continue; // nothing to do
+
+		// all else means there will be rewrite work to do:
+		tagIsDirty = true;
+
+		// 2/4) value before, now gone:
+		if ( value.empty() && (frame!=0)) {
+			frame->active = false; //mark for non-use
+			continue;
+		}
+
+		// 3/4) no old value, create new value
+		bool needUTF16 = false;
+		if ( needEncodingByte ) needUTF16 = (! ReconcileUtils::IsASCII ( value.c_str(), value.size() ) );
+		if ( frame != 0 ) {
+			frame->setFrameValue( value, needDescriptor, needUTF16, false, needEncodingByte );
+		} else {
+			ID3v2Frame* newFrame=new ID3v2Frame( storedID );
+			newFrame->setFrameValue( value, needDescriptor,  needUTF16, false, needEncodingByte ); //always write as utf16-le incl. BOM
+			framesVector.push_back( newFrame );
+			framesMap[ storedID ] = newFrame;
+			continue;
+		}
+
+	} 	// RECON LOOP END
+
+	/////////////////////////////////////////////////////////////////////////////////
+	// (Re)Build XMP frame:
+
+	XMP_Uns32 xmpID = XMP_V23_ID;
+	if ( this->majorVersion == 2 ) xmpID = XMP_V22_ID;
+	
+	ID3v2Frame* frame = framesMap[ xmpID ];
+	if ( frame != 0 ) {
+		frame->setFrameValue( this->xmpPacket, false, false, true );
+	} else {
+		ID3v2Frame* newFrame=new ID3v2Frame( xmpID );
+		newFrame->setFrameValue ( this->xmpPacket, false, false, true );
+		framesVector.push_back ( newFrame );
+		framesMap[ xmpID ] = newFrame;
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	// Decision making
+
+	XMP_Int32 frameHeaderSize = ID3v2Frame::kV23_FrameHeaderSize;
+	if ( this->majorVersion == 2 ) frameHeaderSize = ID3v2Frame::kV22_FrameHeaderSize;
+	
+	newFramesSize = 0;
+	for ( XMP_Uns32 i = 0; i < framesVector.size(); i++ ) {
+		if ( framesVector[i]->active ) newFramesSize += (frameHeaderSize + framesVector[i]->contentSize);
+	}
+
+	mustShift = (newFramesSize > (XMP_Int64)(oldTagSize - ID3Header::kID3_TagHeaderSize)) ||
+	//optimization: If more than 8K can be saved by rewriting the MP3, go do it:
+				((newFramesSize + 8*1024) < oldTagSize );
+
+	if ( ! mustShift )	{	// fill what we got
+		newTagSize = oldTagSize;
+	} else { // if need to shift anyway, get some nice 2K padding
+		newTagSize = newFramesSize + 2048 + ID3Header::kID3_TagHeaderSize;
+	}
+	newPadding = newTagSize - ID3Header::kID3_TagHeaderSize - newFramesSize;
+
+	// shifting needed? -> shift
+	if ( mustShift ) {
+		XMP_Int64 filesize = file ->Length();
+		if ( this->hasID3Tag ) {
+			XIO::Move ( file, oldTagSize, file, newTagSize, filesize - oldTagSize ); //fix [2338569]
+		} else {
+			XIO::Move ( file, 0, file, newTagSize, filesize ); // move entire file up.
+		}
+	}
+
+	// correct size stuff, write out header
+	file ->Rewind();
+	id3Header.write ( file, newTagSize );
+
+	// write out tags
+	for ( XMP_Uns32 i = 0; i < framesVector.size(); i++ ) {
+		if ( framesVector[i]->active ) framesVector[i]->write ( file, majorVersion );
+	}
+
+	// write out padding:
+	for ( XMP_Int64 i = newPadding; i > 0; ) {
+		const XMP_Uns64 zero = 0;
+		if ( i >= 8 ) {
+			file->Write ( &zero, 8  );
+			i -= 8;
+			continue;
+		}
+		file->Write ( &zero, 1  );
+		i--;
+	}
+
+	// check end of file for ID3v1 tag
+	XMP_Int64 possibleTruncationPoint = file->Seek ( -128, kXMP_SeekFromEnd );
+	bool alreadyHasID3v1 = (XIO::ReadInt32_BE( file ) & 0xFFFFFF00) == 0x54414700; // "TAG"
+	if ( ! alreadyHasID3v1 ) file->Seek ( 128, kXMP_SeekFromEnd );	// Seek will extend the file.
+	id3v1Tag.write( file, &this->xmpObj );
+
+	this->needsUpdate = false; //do last for safety reasons
+
+}	// MP3_MetaHandler::UpdateFile
+
+// =================================================================================================
+// MP3_MetaHandler::WriteTempFile
+// ==============================
+
+void MP3_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	IgnoreParam(tempRef);
+	XMP_Throw ( "MP3_MetaHandler::WriteTempFile: Not supported", kXMPErr_Unimplemented );
+}	// MP3_MetaHandler::WriteTempFile
diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.hpp b/XMPFiles/source/FileHandlers/MP3_Handler.hpp
new file mode 100644
index 0000000..05345c6
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/MP3_Handler.hpp
@@ -0,0 +1,93 @@
+#ifndef __MP3_Handler_hpp__
+#define __MP3_Handler_hpp__	1
+
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/ID3_Support.hpp"
+
+using namespace std;
+using namespace ID3_Support;
+
+extern XMPFileHandler * MP3_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool MP3_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+			                  XMP_IO*    fileRef,
+			                  XMPFiles *     parent );
+
+static const XMP_OptionBits kMP3_HandlerFlags = (kXMPFiles_CanInjectXMP |
+												 kXMPFiles_CanExpand |
+												 kXMPFiles_PrefersInPlace |
+												 kXMPFiles_AllowsOnlyXMP |
+												 kXMPFiles_ReturnsRawPacket|
+												 kXMPFiles_CanReconcile);
+
+class MP3_MetaHandler : public XMPFileHandler
+{
+public:
+	MP3_MetaHandler ( XMPFiles * parent );
+	~MP3_MetaHandler();
+
+	void CacheFileData();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	void ProcessXMP();
+
+private:
+	////////////////////////////////////////////////////////////////////////////////////
+	// instance vars
+	XMP_Int64 oldTagSize;		// the entire tag, including padding, including 10B header
+	XMP_Int64 oldPadding;		// number of padding bytes
+	XMP_Int64 oldFramesSize;	// actual space needed by frames := oldTagSize - 10 - oldPadding
+
+	XMP_Int64 newTagSize;
+	XMP_Int64 newPadding;
+	XMP_Int64 newFramesSize;
+
+	// decision making:
+	bool tagIsDirty;	// true, if any legacy properties changed.
+	bool mustShift;		// entire tag to rewrite? (or possibly just XMP?)
+
+
+	XMP_Uns8 majorVersion, minorVersion; // Version Number post ID3v2, i.e. 3 0 ==> ID3v2.3.0
+	bool hasID3Tag; //incoming file has an ID3 tag?
+	bool hasFooter;
+	//bool legacyChanged; // tag rewrite certainly needed?
+
+	ID3Header id3Header;
+
+	XMP_Int64 extHeaderSize;
+	bool hasExtHeader;
+
+	// the frames
+	// * all to be kept till write-out
+	// * parsed/understood only if needed
+	// * vector used to free memory in handler destructor
+	std::vector<ID3_Support::ID3v2Frame*> framesVector;
+
+	// ID3v1 - treated as a single object
+	ID3v1Tag id3v1Tag;
+
+	// * also kept in a map for better import<->export access
+	//    * only keeps legacy 'relevant frames' (i.e. no abused COMM frames)
+	//    * only keeps last relevant frame
+	//       * earlier 'relevant frames' will be deleted. This map also helps in this
+	// * key shall be the FrameID, always interpreted as BE
+	std::map<XMP_Uns32,ID3_Support::ID3v2Frame*> framesMap;
+
+};	// MP3_MetaHandler
+
+// =================================================================================================
+
+#endif /* __MP3_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp
new file mode 100644
index 0000000..abeb781
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp
@@ -0,0 +1,231 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+#include "source/IOUtils.hpp"
+
+#include "XMPFiles/source/FileHandlers/MPEG2_Handler.hpp"
+#include "../FormatSupport/PackageFormat_Support.hpp"
+using namespace std;
+
+// =================================================================================================
+/// \file MPEG2_Handler.cpp
+/// \brief File format handler for MPEG2.
+///
+/// BLECH! YUCK! GAG! MPEG-2 is done using a sidecar and recognition only by file extension! BARF!!!!!
+///
+// =================================================================================================
+
+// =================================================================================================
+// FindFileExtension
+// =================
+
+static inline XMP_StringPtr FindFileExtension ( XMP_StringPtr filePath )
+{
+
+	XMP_StringPtr pathEnd = filePath + strlen(filePath);
+	XMP_StringPtr extPtr;
+
+	for ( extPtr = pathEnd-1; extPtr > filePath; --extPtr ) {
+		if ( (*extPtr == '.') || (*extPtr == '/') ) break;
+		#if XMP_WinBuild
+			if ( (*extPtr == '\\') || (*extPtr == ':') ) break;
+		#endif
+	}
+
+	if ( (extPtr < filePath) || (*extPtr != '.') ) return pathEnd;
+	return extPtr;
+
+}	// FindFileExtension
+
+// =================================================================================================
+// MPEG2_MetaHandlerCTor
+// =====================
+
+XMPFileHandler * MPEG2_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new MPEG2_MetaHandler ( parent );
+
+}	// MPEG2_MetaHandlerCTor
+
+// =================================================================================================
+// MPEG2_CheckFormat
+// =================
+
+// The MPEG-2 handler uses just the file extension, not the file content. Worse yet, it also uses a
+// sidecar file for the XMP. This works better if the handler owns the file, we open the sidecar
+// instead of the actual MPEG-2 file.
+
+bool MPEG2_CheckFormat ( XMP_FileFormat format,
+						XMP_StringPtr  filePath,
+						XMP_IO*    fileRef,
+						XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(fileRef);
+
+	XMP_Assert ( (format == kXMP_MPEGFile) || (format == kXMP_MPEG2File) );
+	XMP_Assert ( fileRef == 0 );
+
+	return ( (parent->format == kXMP_MPEGFile) || (parent->format == kXMP_MPEG2File) );	// ! Just use the first call's format hint.
+
+}	// MPEG2_CheckFormat
+
+// =================================================================================================
+// MPEG2_MetaHandler::MPEG2_MetaHandler
+// ====================================
+
+MPEG2_MetaHandler::MPEG2_MetaHandler ( XMPFiles * _parent )
+{
+	this->parent = _parent;
+	this->handlerFlags = kMPEG2_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	XMP_StringPtr filePath = this->parent->GetFilePath().c_str();
+	XMP_StringPtr extPtr = FindFileExtension ( filePath );
+	this->sidecarPath.assign ( filePath, (extPtr - filePath) );
+	this->sidecarPath += ".xmp";
+}	// MPEG2_MetaHandler::MPEG2_MetaHandler
+
+// =================================================================================================
+// MPEG2_MetaHandler::~MPEG2_MetaHandler
+// =====================================
+
+MPEG2_MetaHandler::~MPEG2_MetaHandler()
+{
+	// Nothing to do.
+
+}	// MPEG2_MetaHandler::~MPEG2_MetaHandler
+
+// =================================================================================================
+// MPEG2_MetaHandler::GetFileModDate
+// =================================
+
+bool MPEG2_MetaHandler::GetFileModDate ( XMP_DateTime * modDate )
+{
+	if ( ! Host_IO::Exists ( this->sidecarPath.c_str() ) ) return false;
+	return Host_IO::GetModifyDate ( this->sidecarPath.c_str(), modDate );
+
+}	// MPEG2_MetaHandler::GetFileModDate
+
+// =================================================================================================
+// MPEG2_MetaHandler::FillAssociatedResources
+// =================================
+void MPEG2_MetaHandler::FillAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	resourceList->push_back(this->parent->GetFilePath());
+	PackageFormat_Support::AddResourceIfExists(resourceList, this->sidecarPath);
+}	// MPEG2_MetaHandler::FillAssociatedResources
+
+// =================================================================================================
+// MPEG2_MetaHandler::IsMetadataWritable
+// =================================
+bool MPEG2_MetaHandler::IsMetadataWritable ( )
+{
+	return Host_IO::Writable( this->sidecarPath.c_str(), true );
+}	// MPEG2_MetaHandler::IsMetadataWritable
+
+// =================================================================================================
+// MPEG2_MetaHandler::CacheFileData
+// ================================
+
+void MPEG2_MetaHandler::CacheFileData()
+{
+	bool readOnly = (! (this->parent->openFlags & kXMPFiles_OpenForUpdate));
+
+	if ( this->parent->UsesClientIO() ) {
+		XMP_Throw ( "MPEG2 cannot be used with client-managed I/O", kXMPErr_InternalFailure );
+	}
+
+	this->containsXMP = false;
+	this->processedXMP = true;	// Whatever we do here is all that we do for XMPFiles::OpenFile.
+
+	// Try to open the sidecar XMP file. Tolerate an open failure, there might not be any XMP.
+	// Note that MPEG2_CheckFormat can't save the sidecar path because the handler doesn't exist then.
+
+	if ( ! Host_IO::Exists ( this->sidecarPath.c_str() ) ) return;	// OK to not have XMP.
+
+	XMPFiles_IO * localFile = XMPFiles_IO::New_XMPFiles_IO ( this->sidecarPath.c_str(), readOnly );
+	if ( localFile == 0 ) XMP_Throw ( "Failure opening MPEG-2 XMP file", kXMPErr_ExternalFailure );
+	this->parent->ioRef = localFile;
+
+	// Extract the sidecar's contents and parse.
+
+	this->packetInfo.offset = 0;	// We take the whole sidecar file.
+	this->packetInfo.length = (XMP_Int32) localFile->Length();
+
+	if ( this->packetInfo.length > 0 ) {
+
+		this->xmpPacket.assign ( this->packetInfo.length, ' ' );
+		localFile->ReadAll ( (void*)this->xmpPacket.c_str(), this->packetInfo.length );
+
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+		this->containsXMP = true;
+
+	}
+
+	if ( readOnly ) {
+		localFile->Close();
+		delete localFile;
+		this->parent->ioRef = 0;
+	}
+
+}	// MPEG2_MetaHandler::CacheFileData
+
+// =================================================================================================
+// MPEG2_MetaHandler::UpdateFile
+// =============================
+
+void MPEG2_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) return;
+
+	XMP_Assert ( this->parent->UsesLocalIO() );
+
+	if ( this->parent->ioRef == 0 ) {
+		XMP_Assert ( ! Host_IO::Exists ( this->sidecarPath.c_str() ) );
+		Host_IO::Create ( this->sidecarPath.c_str() );
+		this->parent->ioRef = XMPFiles_IO::New_XMPFiles_IO ( this->sidecarPath.c_str(), Host_IO::openReadWrite );
+		if ( this->parent->ioRef == 0 ) XMP_Throw ( "Failure opening MPEG-2 XMP file", kXMPErr_ExternalFailure );
+	}
+
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_Assert ( fileRef != 0 );
+	XIO::ReplaceTextFile ( fileRef, this->xmpPacket, doSafeUpdate );
+
+	XMPFiles_IO* localFile = (XMPFiles_IO*)fileRef;
+	localFile->Close();
+	delete localFile;
+	this->parent->ioRef = 0;
+
+	this->needsUpdate = false;
+
+}	// MPEG2_MetaHandler::UpdateFile
+
+// =================================================================================================
+// MPEG2_MetaHandler::WriteTempFile
+// ================================
+
+void MPEG2_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	IgnoreParam(tempRef);
+
+	XMP_Throw ( "MPEG2_MetaHandler::WriteTempFile: Should never be called", kXMPErr_Unavailable );
+
+}	// MPEG2_MetaHandler::WriteTempFile
diff --git a/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp b/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp
new file mode 100644
index 0000000..549781f
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp
@@ -0,0 +1,67 @@
+#ifndef __MPEG2_Handler_hpp__
+#define __MPEG2_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+// =================================================================================================
+/// \file MPEG2_Handler.hpp
+/// \brief File format handler for MPEG2.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler * MPEG2_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool MPEG2_CheckFormat ( XMP_FileFormat format,
+							    XMP_StringPtr  filePath,
+							    XMP_IO *       fileRef,
+							    XMPFiles *     parent);
+
+static const XMP_OptionBits kMPEG2_HandlerFlags = ( kXMPFiles_CanInjectXMP |
+													kXMPFiles_CanExpand |
+													kXMPFiles_CanRewrite |
+													kXMPFiles_AllowsOnlyXMP |
+													kXMPFiles_ReturnsRawPacket |
+													kXMPFiles_HandlerOwnsFile |
+													kXMPFiles_AllowsSafeUpdate |
+													kXMPFiles_UsesSidecarXMP );
+
+class MPEG2_MetaHandler : public XMPFileHandler
+{
+public:
+
+	std::string sidecarPath;
+
+	MPEG2_MetaHandler ( XMPFiles * parent );
+	~MPEG2_MetaHandler();
+
+	bool GetFileModDate ( XMP_DateTime * modDate );
+	void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	bool IsMetadataWritable ( ) ;
+
+	void CacheFileData();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO * tempRef );
+
+
+};	// MPEG2_MetaHandler
+
+// =================================================================================================
+
+#endif /* __MPEG2_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
new file mode 100644
index 0000000..905f19f
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
@@ -0,0 +1,3063 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/MPEG4_Handler.hpp"
+
+#include "XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp"
+#include "XMPFiles/source/FormatSupport/MOOV_Support.hpp"
+
+#include "source/XMP_ProgressTracker.hpp"
+#include "source/UnicodeConversions.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+#include <math.h>
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+using namespace std;
+
+// =================================================================================================
+/// \file MPEG4_Handler.cpp
+/// \brief File format handler for MPEG-4, a flavor of the ISO Base Media File Format.
+///
+/// This handler ...
+///
+// =================================================================================================
+
+// The basic content of a timecode sample description table entry. Does not include trailing boxes.
+
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( 1 )
+#else
+#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+struct stsdBasicEntry {
+	XMP_Uns32 entrySize;
+	XMP_Uns32 format;
+	XMP_Uns8  reserved_1 [6];
+	XMP_Uns16 dataRefIndex;
+	XMP_Uns32 reserved_2;
+	XMP_Uns32 flags;
+	XMP_Uns32 timeScale;
+	XMP_Uns32 frameDuration;
+	XMP_Uns8  frameCount;
+	XMP_Uns8  reserved_3;
+};
+
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack (  )
+#else
+#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+// =================================================================================================
+
+// ! The buffer and constants are both already big endian.
+#define Get4CharCode(buffPtr) (*((XMP_Uns32*)(buffPtr)))
+
+// =================================================================================================
+
+static inline bool IsClassicQuickTimeBox ( XMP_Uns32 boxType )
+{
+	if ( (boxType == ISOMedia::k_moov) || (boxType == ISOMedia::k_mdat) || (boxType == ISOMedia::k_pnot) ||
+		 (boxType == ISOMedia::k_free) || (boxType == ISOMedia::k_skip) || (boxType == ISOMedia::k_wide) ) return true;
+	return false;
+}	// IsClassicQuickTimeBox
+
+// =================================================================================================
+
+// Pairs of 3 letter ISO 639-2 codes mapped to 2 letter ISO 639-1 codes from:
+//   http://www.loc.gov/standards/iso639-2/php/code_list.php
+// Would have to write an "==" operator to use std::map, must compare values not pointers.
+// ! Not fully sorted, do not use a binary search.
+
+static XMP_StringPtr kKnownLangs[] =
+	{ "aar", "aa", "abk", "ab", "afr", "af", "aka", "ak", "alb", "sq", "sqi", "sq", "amh", "am",
+	  "ara", "ar", "arg", "an", "arm", "hy", "hye", "hy", "asm", "as", "ava", "av", "ave", "ae",
+	  "aym", "ay", "aze", "az", "bak", "ba", "bam", "bm", "baq", "eu", "eus", "eu", "bel", "be",
+	  "ben", "bn", "bih", "bh", "bis", "bi", "bod", "bo", "tib", "bo", "bos", "bs", "bre", "br",
+	  "bul", "bg", "bur", "my", "mya", "my", "cat", "ca", "ces", "cs", "cze", "cs", "cha", "ch",
+	  "che", "ce", "chi", "zh", "zho", "zh", "chu", "cu", "chv", "cv", "cor", "kw", "cos", "co",
+	  "cre", "cr", "cym", "cy", "wel", "cy", "cze", "cs", "ces", "cs", "dan", "da", "deu", "de",
+	  "ger", "de", "div", "dv", "dut", "nl", "nld", "nl", "dzo", "dz", "ell", "el", "gre", "el",
+	  "eng", "en", "epo", "eo", "est", "et", "eus", "eu", "baq", "eu", "ewe", "ee", "fao", "fo",
+	  "fas", "fa", "per", "fa", "fij", "fj", "fin", "fi", "fra", "fr", "fre", "fr", "fre", "fr",
+	  "fra", "fr", "fry", "fy", "ful", "ff", "geo", "ka", "kat", "ka", "ger", "de", "deu", "de",
+	  "gla", "gd", "gle", "ga", "glg", "gl", "glv", "gv", "gre", "el", "ell", "el", "grn", "gn",
+	  "guj", "gu", "hat", "ht", "hau", "ha", "heb", "he", "her", "hz", "hin", "hi", "hmo", "ho",
+	  "hrv", "hr", "scr", "hr", "hun", "hu", "hye", "hy", "arm", "hy", "ibo", "ig", "ice", "is",
+	  "isl", "is", "ido", "io", "iii", "ii", "iku", "iu", "ile", "ie", "ina", "ia", "ind", "id",
+	  "ipk", "ik", "isl", "is", "ice", "is", "ita", "it", "jav", "jv", "jpn", "ja", "kal", "kl",
+	  "kan", "kn", "kas", "ks", "kat", "ka", "geo", "ka", "kau", "kr", "kaz", "kk", "khm", "km",
+	  "kik", "ki", "kin", "rw", "kir", "ky", "kom", "kv", "kon", "kg", "kor", "ko", "kua", "kj",
+	  "kur", "ku", "lao", "lo", "lat", "la", "lav", "lv", "lim", "li", "lin", "ln", "lit", "lt",
+	  "ltz", "lb", "lub", "lu", "lug", "lg", "mac", "mk", "mkd", "mk", "mah", "mh", "mal", "ml",
+	  "mao", "mi", "mri", "mi", "mar", "mr", "may", "ms", "msa", "ms", "mkd", "mk", "mac", "mk",
+	  "mlg", "mg", "mlt", "mt", "mol", "mo", "mon", "mn", "mri", "mi", "mao", "mi", "msa", "ms",
+	  "may", "ms", "mya", "my", "bur", "my", "nau", "na", "nav", "nv", "nbl", "nr", "nde", "nd",
+	  "ndo", "ng", "nep", "ne", "nld", "nl", "dut", "nl", "nno", "nn", "nob", "nb", "nor", "no",
+	  "nya", "ny", "oci", "oc", "oji", "oj", "ori", "or", "orm", "om", "oss", "os", "pan", "pa",
+	  "per", "fa", "fas", "fa", "pli", "pi", "pol", "pl", "por", "pt", "pus", "ps", "que", "qu",
+	  "roh", "rm", "ron", "ro", "rum", "ro", "rum", "ro", "ron", "ro", "run", "rn", "rus", "ru",
+	  "sag", "sg", "san", "sa", "scc", "sr", "srp", "sr", "scr", "hr", "hrv", "hr", "sin", "si",
+	  "slk", "sk", "slo", "sk", "slo", "sk", "slk", "sk", "slv", "sl", "sme", "se", "smo", "sm",
+	  "sna", "sn", "snd", "sd", "som", "so", "sot", "st", "spa", "es", "sqi", "sq", "alb", "sq",
+	  "srd", "sc", "srp", "sr", "scc", "sr", "ssw", "ss", "sun", "su", "swa", "sw", "swe", "sv",
+	  "tah", "ty", "tam", "ta", "tat", "tt", "tel", "te", "tgk", "tg", "tgl", "tl", "tha", "th",
+	  "tib", "bo", "bod", "bo", "tir", "ti", "ton", "to", "tsn", "tn", "tso", "ts", "tuk", "tk",
+	  "tur", "tr", "twi", "tw", "uig", "ug", "ukr", "uk", "urd", "ur", "uzb", "uz", "ven", "ve",
+	  "vie", "vi", "vol", "vo", "wel", "cy", "cym", "cy", "wln", "wa", "wol", "wo", "xho", "xh",
+	  "yid", "yi", "yor", "yo", "zha", "za", "zho", "zh", "chi", "zh", "zul", "zu",
+	  0, 0 };
+
+static inline XMP_StringPtr Lookup2LetterLang ( XMP_StringPtr lang3 )
+{
+	for ( size_t i = 0; kKnownLangs[i] != 0; i += 2 ) {
+		if ( XMP_LitMatch ( lang3, kKnownLangs[i] ) ) return kKnownLangs[i+1];
+	}
+	return "";
+}
+
+static inline XMP_StringPtr Lookup3LetterLang ( XMP_StringPtr lang2 )
+{
+	for ( size_t i = 0; kKnownLangs[i] != 0; i += 2 ) {
+		if ( XMP_LitMatch ( lang2, kKnownLangs[i+1] ) ) return kKnownLangs[i];
+	}
+	return "";
+}
+
+
+#define IsTolerableBoxChar(ch)	( ((0x20 <= (ch)) && ((ch) <= 0x7E)) || ((ch) == 0xA9) )
+
+static inline bool IsTolerableBox ( XMP_Uns32 boxType )
+{
+	// Make sure the box type is 4 ASCII characters or 0xA9 (MacRoman copyright).
+	XMP_Uns8 b1 = (XMP_Uns8) (boxType >> 24);
+	XMP_Uns8 b2 = (XMP_Uns8) ((boxType >> 16) & 0xFF);
+	XMP_Uns8 b3 = (XMP_Uns8) ((boxType >> 8) & 0xFF);
+	XMP_Uns8 b4 = (XMP_Uns8) (boxType & 0xFF);
+	bool ok = IsTolerableBoxChar(b1) && IsTolerableBoxChar(b2) &&
+		IsTolerableBoxChar(b3) && IsTolerableBoxChar(b4);
+	return ok;
+}
+
+static inline bool IsXMPUUID ( XMP_IO * fileRef,XMP_Uns64 contentSize, bool unmovedFilePtr=false )
+{
+	if ( contentSize < 16 ) return false;
+	XMP_Uns8 uuid [16];
+	fileRef->ReadAll ( uuid, 16 );
+	if (unmovedFilePtr) fileRef->Seek ( -16, kXMP_SeekFromCurrent );
+	if ( memcmp ( uuid, ISOMedia::k_xmpUUID, 16 ) != 0 ) return false;	// Check for the XMP GUID.
+	return true;
+}
+
+// =================================================================================================
+// MPEG4_CheckFormat
+// =================
+//
+// There are 3 variations of recognized file:
+//	- Normal MPEG-4 - has an 'ftyp' box containing a known compatible brand but not 'qt  '.
+//	- Modern QuickTime - has an 'ftyp' box containing 'qt  ' as a compatible brand.
+//	- Classic QuickTime - has no 'ftyp' box, should have recognized top level boxes.
+//
+// An MPEG-4 or modern QuickTime file is an instance of an ISO Base Media file, ISO 14496-12 and -14.
+// A classic QuickTime file has the same physical box structure, but somewhat different box types.
+// The ISO files must begin with an 'ftyp' box containing 'mp41', 'mp42', 'f4v ', or 'qt  ' in the
+// compatible brands.
+//
+// The general box structure is:
+//
+//   0  4  uns32  box size, 0 means "to EoF", 1 means 64-bit size follows
+//   4  4  uns32  box type
+//   8  8  uns64  box size, present only if uns32 size is 1
+//   -  *  box content
+//
+// The 'ftyp' box content is:
+//
+//   -  4  uns32  major brand
+//   -  4  uns32  minor version
+//   -  *  uns32  sequence of compatible brands, to the end of the box
+
+// ! With the addition of QuickTime support there is some change in behavior in OpenFile when the
+// ! kXMPFiles_OpenStrictly option is used wth a specific file format. The kXMP_MPEG4File and
+// ! kXMP_MOVFile formats are treated uniformly, you can't force "real MOV" or "real MPEG-4". You
+// ! can check afterwards using GetFileInfo to see what the file happens to be.
+
+bool MPEG4_CheckFormat ( XMP_FileFormat format,
+						 XMP_StringPtr  filePath,
+						 XMP_IO*    fileRef,
+						 XMPFiles*      parent )
+{
+	XMP_Uns8  buffer [4*1024];
+	XMP_Uns32 ioCount, brandCount, brandOffset;
+	XMP_Uns64 fileSize, nextOffset;
+	ISOMedia::BoxInfo currBox;
+
+	XMP_AbortProc abortProc  = parent->abortProc;
+	void *        abortArg   = parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	bool openStrictly = XMP_OptionIsSet ( parent->openFlags, kXMPFiles_OpenStrictly);
+
+	// Get the first box's info, see if it is 'ftyp' or not.
+
+	XMP_Assert ( (parent->tempPtr == 0) && (parent->tempUI32 == 0) );
+
+	fileSize = fileRef->Length();
+	if ( fileSize < 8 ) return false;
+
+	nextOffset = ISOMedia::GetBoxInfo ( fileRef, 0, fileSize, &currBox );
+	if ( currBox.headerSize < 8 ) return false;	// Can't be an ISO or QuickTime file.
+
+	if ( currBox.boxType == ISOMedia::k_ftyp ) {
+
+		// Have an 'ftyp' box, look through the compatible brands. If 'qt  ' is present then this is
+		// a modern QuickTime file, regardless of what else is found. Otherwise this is plain ISO if
+		// any of the other recognized brands are found.
+
+		if ( currBox.contentSize < 12 ) return false;	// No compatible brands at all.
+		if ( currBox.contentSize > 1024*1024 ) return false;	// Sanity check and make sure count fits in 32 bits.
+		brandCount = ((XMP_Uns32)currBox.contentSize - 8) >> 2;
+
+		fileRef->Seek ( 8, kXMP_SeekFromCurrent );	// Skip the major and minor brands.
+		ioCount = brandOffset = 0;
+
+		bool haveCompatibleBrand = false;
+
+		for ( ; brandCount > 0; --brandCount, brandOffset += 4 ) {
+
+			if ( brandOffset >= ioCount ) {
+				if ( checkAbort && abortProc(abortArg) ) {
+					XMP_Throw ( "MPEG4_CheckFormat - User abort", kXMPErr_UserAbort );
+				}
+				ioCount = 4 * brandCount;
+				if ( ioCount > sizeof(buffer) ) ioCount = sizeof(buffer);
+				ioCount = fileRef->ReadAll ( buffer, ioCount );
+				brandOffset = 0;
+			}
+
+			XMP_Uns32 brand = GetUns32BE ( &buffer[brandOffset] );
+			if ( brand == ISOMedia::k_qt ) {	// Don't need to look further.
+				if ( openStrictly && (format != kXMP_MOVFile) ) return false;
+				parent->format = kXMP_MOVFile;
+				parent->tempUI32 = MOOV_Manager::kFileIsModernQT;
+				return true;
+			} else if ( (brand == ISOMedia::k_mp41) || (brand == ISOMedia::k_mp42) || 
+				(brand == ISOMedia::k_f4v) || ( brand == ISOMedia::k_avc1 ) ) {
+				haveCompatibleBrand = true;	// Need to keep looking in case 'qt  ' follows.
+			}
+
+		}
+
+		if ( ! haveCompatibleBrand ) return false;
+		if ( openStrictly && (format != kXMP_MPEG4File) ) return false;
+		parent->format = kXMP_MPEG4File;
+		parent->tempUI32 = MOOV_Manager::kFileIsNormalISO;
+		return true;
+
+	} else {
+		// No 'ftyp', look for classic QuickTime: 'moov', 'mdat', 'pnot', 'free', 'skip', and 'wide'.
+		// As an expedient, quit when a 'moov' box is found. Tolerate other boxes, they are in the
+		// wild for ill-formed files, e.g. seen when 'moov'/'udta' children get left at top level.
+
+		while ( currBox.boxType != ISOMedia::k_moov ) {
+
+			if ( ! IsClassicQuickTimeBox ( currBox.boxType ) ) {
+				if ( ! IsTolerableBox(currBox.boxType) ) return false;
+			}
+			if ( nextOffset >= fileSize ) return false;
+			if ( checkAbort && abortProc(abortArg) ) {
+				XMP_Throw ( "MPEG4_CheckFormat - User abort", kXMPErr_UserAbort );
+			}
+			nextOffset = ISOMedia::GetBoxInfo ( fileRef, nextOffset, fileSize, &currBox );
+
+		}
+
+		if ( openStrictly && (format != kXMP_MOVFile) ) return false;
+		parent->format = kXMP_MOVFile;
+		parent->tempUI32 = MOOV_Manager::kFileIsTraditionalQT;
+		return true;
+
+	}
+
+	return false;
+
+}	// MPEG4_CheckFormat
+
+// =================================================================================================
+// MPEG4_MetaHandlerCTor
+// =====================
+
+XMPFileHandler * MPEG4_MetaHandlerCTor ( XMPFiles * parent )
+{
+
+	return new MPEG4_MetaHandler ( parent );
+
+}	// MPEG4_MetaHandlerCTor
+
+// =================================================================================================
+// MPEG4_MetaHandler::MPEG4_MetaHandler
+// ====================================
+
+MPEG4_MetaHandler::MPEG4_MetaHandler ( XMPFiles * _parent )
+	: fileMode(0), havePreferredXMP(false), xmpBoxPos(0), moovBoxPos(0), xmpBoxSize(0), moovBoxSize(0)
+{
+
+	this->parent = _parent;	// Inherited, can't set in the prefix.
+	this->handlerFlags = kMPEG4_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+	this->fileMode = (XMP_Uns8)_parent->tempUI32;
+	_parent->tempUI32 = 0;
+
+}	// MPEG4_MetaHandler::MPEG4_MetaHandler
+
+// =================================================================================================
+// MPEG4_MetaHandler::~MPEG4_MetaHandler
+// =====================================
+
+MPEG4_MetaHandler::~MPEG4_MetaHandler()
+{
+
+	// Nothing to do.
+
+}	// MPEG4_MetaHandler::~MPEG4_MetaHandler
+
+// =================================================================================================
+// SecondsToXMPDate
+// ================
+
+// *** ASF has similar code with different origin, should make a shared utility.
+
+static void SecondsToXMPDate ( XMP_Uns64 isoSeconds, XMP_DateTime * xmpDate )
+{
+	memset ( xmpDate, 0, sizeof(XMP_DateTime) );	// AUDIT: Using sizeof(XMP_DateTime) is safe.
+
+	XMP_Int32 days = (XMP_Int32) (isoSeconds / 86400);
+	isoSeconds -= ((XMP_Uns64)days * 86400);
+
+	XMP_Int32 hour = (XMP_Int32) (isoSeconds / 3600);
+	isoSeconds -= ((XMP_Uns64)hour * 3600);
+
+	XMP_Int32 minute = (XMP_Int32) (isoSeconds / 60);
+	isoSeconds -= ((XMP_Uns64)minute * 60);
+
+	XMP_Int32 second = (XMP_Int32)isoSeconds;
+
+	xmpDate->year  = 1904;	// Start with the ISO origin.
+	xmpDate->month = 1;
+	xmpDate->day   = 1;
+
+	xmpDate->day += days;	// Add in the delta.
+	xmpDate->hour = hour;
+	xmpDate->minute = minute;
+	xmpDate->second = second;
+
+	xmpDate->hasTimeZone = true;	// ! Needed for ConvertToUTCTime to do anything.
+	SXMPUtils::ConvertToUTCTime ( xmpDate );	// Normalize the date/time.
+
+}	// SecondsToXMPDate
+
+// =================================================================================================
+// XMPDateToSeconds
+// ================
+
+// *** ASF has similar code with different origin, should make a shared utility.
+
+static bool IsLeapYear ( XMP_Int32 year )
+{
+	if ( year < 0 ) year = -year + 1;		// Fold the negative years, assuming there is a year 0.
+	if ( (year % 4) != 0 ) return false;	// Not a multiple of 4.
+	if ( (year % 100) != 0 ) return true;	// A multiple of 4 but not a multiple of 100.
+	if ( (year % 400) == 0 ) return true;	// A multiple of 400.
+	return false;							// A multiple of 100 but not a multiple of 400.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static XMP_Int32 DaysInMonth ( XMP_Int32 year, XMP_Int32 month )
+{
+	static XMP_Int32 daysInMonth[13] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+										 // Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec
+	XMP_Int32 days = daysInMonth[month];
+	if ( (month == 2) && IsLeapYear(year) ) days += 1;
+	return days;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static void XMPDateToSeconds ( const XMP_DateTime & _xmpDate, XMP_Uns64 * isoSeconds )
+{
+	XMP_DateTime xmpDate = _xmpDate;
+	SXMPUtils::ConvertToUTCTime ( &xmpDate );
+
+	XMP_Uns64 tempSeconds = (XMP_Uns64)xmpDate.second;
+	tempSeconds += (XMP_Uns64)xmpDate.minute * 60;
+	tempSeconds += (XMP_Uns64)xmpDate.hour * 3600;
+
+	XMP_Int32 days = (xmpDate.day - 1);
+
+	--xmpDate.month;
+	while ( xmpDate.month >= 1 ) {
+		days += DaysInMonth ( xmpDate.year, xmpDate.month );
+		--xmpDate.month;
+	}
+
+	--xmpDate.year;
+	while ( xmpDate.year >= 1904 ) {
+		days += (IsLeapYear ( xmpDate.year) ? 366 : 365 );
+		--xmpDate.year;
+	}
+
+	tempSeconds += (XMP_Uns64)days * 86400;
+	*isoSeconds = tempSeconds;
+
+}	// XMPDateToSeconds
+
+// =================================================================================================
+// ImportMVHDItems
+// ===============
+
+static bool ImportMVHDItems ( MOOV_Manager::BoxInfo mvhdInfo, SXMPMeta * xmp )
+{
+	XMP_Assert ( mvhdInfo.boxType == ISOMedia::k_mvhd );
+	if ( mvhdInfo.contentSize < 4 ) return false;	// Just enough to check the version/flags at first.
+
+	XMP_Uns8 mvhdVersion = *mvhdInfo.content;
+	if ( mvhdVersion > 1 ) return false;
+
+	XMP_Uns64 creationTime, modificationTime, duration;
+	XMP_Uns32 timescale;
+
+	if ( mvhdVersion == 0 ) {
+
+		if ( mvhdInfo.contentSize < sizeof ( MOOV_Manager::Content_mvhd_0 ) ) return false;
+		MOOV_Manager::Content_mvhd_0 * mvhdRaw_0 = (MOOV_Manager::Content_mvhd_0*) mvhdInfo.content;
+
+		creationTime = (XMP_Uns64) GetUns32BE ( &mvhdRaw_0->creationTime );
+		modificationTime = (XMP_Uns64) GetUns32BE ( &mvhdRaw_0->modificationTime );
+		timescale = GetUns32BE ( &mvhdRaw_0->timescale );
+		duration = (XMP_Uns64) GetUns32BE ( &mvhdRaw_0->duration );
+
+	} else {
+
+		XMP_Assert ( mvhdVersion == 1 );
+		if ( mvhdInfo.contentSize < sizeof ( MOOV_Manager::Content_mvhd_1 ) ) return false;
+		MOOV_Manager::Content_mvhd_1 * mvhdRaw_1 = (MOOV_Manager::Content_mvhd_1*) mvhdInfo.content;
+
+		creationTime = GetUns64BE ( &mvhdRaw_1->creationTime );
+		modificationTime = GetUns64BE ( &mvhdRaw_1->modificationTime );
+		timescale = GetUns32BE ( &mvhdRaw_1->timescale );
+		duration = GetUns64BE ( &mvhdRaw_1->duration );
+
+	}
+
+	bool haveImports = false;
+	XMP_DateTime xmpDate;
+
+	if ( (creationTime >> 32) < 0xFF ) {		// Sanity check for bogus date info.
+		SecondsToXMPDate ( creationTime, &xmpDate );
+		xmp->SetProperty_Date ( kXMP_NS_XMP, "CreateDate", xmpDate );
+		haveImports = true;
+	}
+
+	if ( (modificationTime >> 32) < 0xFF ) {	// Sanity check for bogus date info.
+		SecondsToXMPDate ( modificationTime, &xmpDate );
+		xmp->SetProperty_Date ( kXMP_NS_XMP, "ModifyDate", xmpDate );
+		haveImports = true;
+	}
+
+	if ( timescale != 0 ) {	// Avoid 1/0 for the scale field.
+		char buffer [32];	// A 64-bit number is at most 20 digits.
+		xmp->DeleteProperty ( kXMP_NS_DM, "duration" );	// Delete the whole struct.
+		snprintf ( buffer, sizeof(buffer), "%llu", duration );	// AUDIT: The buffer is big enough.
+		xmp->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "value", &buffer[0] );
+		snprintf ( buffer, sizeof(buffer), "1/%u", timescale );	// AUDIT: The buffer is big enough.
+		xmp->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "scale", &buffer[0] );
+		haveImports = true;
+	}
+
+	return haveImports;
+
+}	// ImportMVHDItems
+
+// =================================================================================================
+// ExportMVHDItems
+// ===============
+
+static void ExportMVHDItems ( const SXMPMeta & xmp, MOOV_Manager * moovMgr )
+{
+	XMP_DateTime xmpDate;
+	bool createFound, modifyFound;
+	XMP_Uns64 createSeconds = 0, modifySeconds = 0;
+
+	MOOV_Manager::BoxInfo mvhdInfo;
+	MOOV_Manager::BoxRef  mvhdRef = moovMgr->GetBox ( "moov/mvhd", &mvhdInfo );
+	if ( (mvhdRef == 0) || (mvhdInfo.contentSize < 4) ) return;
+
+	XMP_Uns8 version = *mvhdInfo.content;
+	if ( version > 1 ) return;
+
+	createFound = xmp.GetProperty_Date ( kXMP_NS_XMP, "CreateDate", &xmpDate, 0 );
+	if ( createFound ) XMPDateToSeconds ( xmpDate, &createSeconds );
+
+	modifyFound = xmp.GetProperty_Date ( kXMP_NS_XMP, "ModifyDate", &xmpDate, 0 );
+	if ( modifyFound ) XMPDateToSeconds ( xmpDate, &modifySeconds );
+
+	if ( version == 1 ) {
+
+		// Modify the v1 box in-place.
+
+		if ( mvhdInfo.contentSize < sizeof ( MOOV_Manager::Content_mvhd_1 ) ) return;
+
+		XMP_Uns64 oldCreate = GetUns64BE ( mvhdInfo.content + 4 );
+		XMP_Uns64 oldModify = GetUns64BE ( mvhdInfo.content + 12 );
+
+		if ( createFound ) {
+			if ( createSeconds != oldCreate ) PutUns64BE ( createSeconds, ((XMP_Uns8*)mvhdInfo.content + 4) );
+			moovMgr->NoteChange();
+		}
+		if ( modifyFound  ) {
+			if ( modifySeconds != oldModify ) PutUns64BE ( modifySeconds, ((XMP_Uns8*)mvhdInfo.content + 12) );
+			moovMgr->NoteChange();
+		}
+
+	} else if ( ((createSeconds >> 32) == 0) && ((modifySeconds >> 32) == 0) ) {
+
+		// Modify the v0 box in-place.
+
+		if ( mvhdInfo.contentSize < sizeof ( MOOV_Manager::Content_mvhd_0 ) ) return;
+
+		XMP_Uns32 oldCreate = GetUns32BE ( mvhdInfo.content + 4 );
+		XMP_Uns32 oldModify = GetUns32BE ( mvhdInfo.content + 8 );
+
+		if ( createFound ) {
+			if ( (XMP_Uns32)createSeconds != oldCreate ) PutUns32BE ( (XMP_Uns32)createSeconds, ((XMP_Uns8*)mvhdInfo.content + 4) );
+			moovMgr->NoteChange();
+		}
+		if ( modifyFound ) {
+			if ( (XMP_Uns32)modifySeconds != oldModify ) PutUns32BE ( (XMP_Uns32)modifySeconds, ((XMP_Uns8*)mvhdInfo.content + 8) );
+			moovMgr->NoteChange();
+		}
+
+	} else {
+
+		// Replace the v0 box with a v1 box.
+
+		XMP_Assert ( createFound | modifyFound );	// One of them has high bits set.
+		if ( mvhdInfo.contentSize != sizeof ( MOOV_Manager::Content_mvhd_0 ) ) return;
+
+		MOOV_Manager::Content_mvhd_0 * mvhdV0 = (MOOV_Manager::Content_mvhd_0*) mvhdInfo.content;
+		MOOV_Manager::Content_mvhd_1   mvhdV1;
+
+		// Copy the unchanged fields directly.
+
+		mvhdV1.timescale = mvhdV0->timescale;
+		mvhdV1.rate = mvhdV0->rate;
+		mvhdV1.volume = mvhdV0->volume;
+		mvhdV1.pad_1 = mvhdV0->pad_1;
+		mvhdV1.pad_2 = mvhdV0->pad_2;
+		mvhdV1.pad_3 = mvhdV0->pad_3;
+		for ( int i = 0; i < 9; ++i ) mvhdV1.matrix[i] = mvhdV0->matrix[i];
+		for ( int i = 0; i < 6; ++i ) mvhdV1.preDef[i] = mvhdV0->preDef[i];
+		mvhdV1.nextTrackID = mvhdV0->nextTrackID;
+
+		// Set the fields that have changes.
+
+		mvhdV1.vFlags = (1 << 24) | (mvhdV0->vFlags & 0xFFFFFF);
+		mvhdV1.duration = MakeUns64BE ( (XMP_Uns64) GetUns32BE ( &mvhdV0->duration ) );
+
+		XMP_Uns64 temp64;
+
+		temp64 = (XMP_Uns64) GetUns32BE ( &mvhdV0->creationTime );
+		if ( createFound ) temp64 = createSeconds;
+		mvhdV1.creationTime = MakeUns64BE ( temp64 );
+
+		temp64 = (XMP_Uns64) GetUns32BE ( &mvhdV0->modificationTime );
+		if ( modifyFound ) temp64 = modifySeconds;
+		mvhdV1.modificationTime = MakeUns64BE ( temp64 );
+
+		moovMgr->SetBox ( mvhdRef, &mvhdV1, sizeof ( MOOV_Manager::Content_mvhd_1 ) );
+
+	}
+
+}	// ExportMVHDItems
+
+// =================================================================================================
+// ImportISOCopyrights
+// ===================
+//
+// The cached 'moov'/'udta'/'cprt' boxes are full boxes. The "real" content is a UInt16 packed 3
+// character language code and a UTF-8 or UTF-16 string.
+
+static bool ImportISOCopyrights ( const std::vector<MOOV_Manager::BoxInfo> & cprtBoxes, SXMPMeta * xmp )
+{
+	bool haveImports = false;
+
+	std::string tempStr;
+	char lang3 [4];	// The unpacked ISO-639-2/T language code with final null.
+	lang3[3] = 0;
+
+	for ( size_t i = 0, limit = cprtBoxes.size(); i < limit; ++i ) {
+
+		const MOOV_Manager::BoxInfo & currBox = cprtBoxes[i];
+		if ( currBox.contentSize < 4+2+1 ) continue;	// Want enough for a non-empty value.
+		if ( *currBox.content != 0 ) continue;	// Only proceed for version 0, ignore the flags.
+
+		XMP_Uns16 packedLang = GetUns16BE ( currBox.content + 4 );
+		lang3[0] = (packedLang >> 10) + 0x60;
+		lang3[1] = ((packedLang >> 5) & 0x1F) + 0x60;
+		lang3[2] = (packedLang & 0x1F) + 0x60;
+		XMP_StringPtr xmpLang  = Lookup2LetterLang ( lang3 );
+		if ( *xmpLang == 0 ) continue;
+
+		XMP_StringPtr textPtr = (XMP_StringPtr) (currBox.content + 6);
+		XMP_StringLen textLen = currBox.contentSize - 6;
+
+		if ( (textLen >= 2) && (GetUns16BE(textPtr) == 0xFEFF) ) {
+			FromUTF16 ( (UTF16Unit*)textPtr, textLen/2, &tempStr, true /* big endian */ );
+			textPtr = tempStr.c_str();
+		}
+
+		xmp->SetLocalizedText ( kXMP_NS_DC, "rights", xmpLang, xmpLang, textPtr );
+		haveImports = true;
+
+	}
+
+	return haveImports;
+
+}	// ImportISOCopyrights
+
+// =================================================================================================
+// ExportISOCopyrights
+// ===================
+
+static void ExportISOCopyrights ( const SXMPMeta & xmp, MOOV_Manager * moovMgr )
+{
+	bool haveMappings = false;	// True if any ISO-XMP language mappings are found.
+
+	// Go through the ISO 'cprt' items and look for a corresponding XMP item. Ignore the ISO item if
+	// there is no language mapping to XMP. Update the ISO item if the mappable XMP exists, delete
+	// the ISO item if the mappable XMP does not exist. Since the import side would have made sure
+	// the mappable XMP items existed, if they don't now they must have been deleted.
+
+	MOOV_Manager::BoxInfo udtaInfo;
+	MOOV_Manager::BoxRef  udtaRef = moovMgr->GetBox ( "moov/udta", &udtaInfo );
+	if ( udtaRef == 0 ) return;
+
+	std::string xmpPath, xmpValue, xmpLang, tempStr;
+	char lang3 [4];	// An unpacked ISO-639-2/T language code.
+	lang3[3] = 0;
+
+	for ( XMP_Uns32 ordinal = udtaInfo.childCount; ordinal > 0; --ordinal ) {	// ! Go backwards because of deletions.
+
+		MOOV_Manager::BoxInfo cprtInfo;
+		MOOV_Manager::BoxRef  cprtRef = moovMgr->GetNthChild ( udtaRef, ordinal-1, &cprtInfo );
+		if ( cprtRef == 0 ) break;	// Sanity check, should not happen.
+		if ( (cprtInfo.boxType != ISOMedia::k_cprt) || (cprtInfo.contentSize < 6) ) continue;
+		if ( *cprtInfo.content != 0 ) continue;	// Only accept version 0, ignore the flags.
+
+		XMP_Uns16 packedLang = GetUns16BE ( cprtInfo.content + 4 );
+		lang3[0] = (packedLang >> 10) + 0x60;
+		lang3[1] = ((packedLang >> 5) & 0x1F) + 0x60;
+		lang3[2] = (packedLang & 0x1F) + 0x60;
+
+		XMP_StringPtr lang2  = Lookup2LetterLang ( lang3 );
+		if ( *lang2 == 0 ) continue;	// No language mapping to XMP.
+		haveMappings = true;
+
+		bool xmpFound = xmp.GetLocalizedText ( kXMP_NS_DC, "rights", lang2, lang2, &xmpLang, &xmpValue, 0 );
+		if ( xmpFound ) {
+			if ( (xmpLang.size() < 2) ||
+				 ( (xmpLang.size() == 2) && (xmpLang != lang2) ) ||
+				 ( (xmpLang.size() > 2) && ( (xmpLang[2] != '-') || (! XMP_LitNMatch ( xmpLang.c_str(), lang2, 2)) ) ) ) {
+				xmpFound = false;	// The language does not match, the corresponding XMP does not exist.
+			}
+		}
+
+		if ( ! xmpFound ) {
+
+			// No XMP, delete the ISO item.
+			moovMgr->DeleteNthChild ( udtaRef, ordinal-1 );
+
+		} else {
+
+			// Update the ISO item if necessary.
+			XMP_StringPtr isoStr = (XMP_StringPtr)cprtInfo.content + 6;
+			size_t rawLen = cprtInfo.contentSize - 6;
+			if ( (rawLen >= 8) && (GetUns16BE(isoStr) == 0xFEFF) ) {
+				FromUTF16 ( (UTF16Unit*)(isoStr+2), (rawLen-2)/2, &tempStr, true /* big endian */ );
+				isoStr = tempStr.c_str();
+			}
+			if ( xmpValue != isoStr ) {
+				std::string newContent = "vfffll";
+				newContent += xmpValue;
+				memcpy ( (char*)newContent.c_str(), cprtInfo.content, 6 ); // Keep old version, flags, and language.
+				moovMgr->SetBox ( cprtRef, newContent.c_str(), (XMP_Uns32)(newContent.size() + 1) );
+			}
+
+		}
+
+	}
+
+	// Go through the XMP items and look for a corresponding ISO item. Skip if found (did it above),
+	// otherwise add a new ISO item.
+
+	bool haveXDefault = false;
+	XMP_Index xmpCount = xmp.CountArrayItems ( kXMP_NS_DC, "rights" );
+
+	for ( XMP_Index xmpIndex = 1; xmpIndex <= xmpCount; ++xmpIndex ) {	// ! The first XMP array index is 1.
+
+		SXMPUtils::ComposeArrayItemPath ( kXMP_NS_DC, "rights", xmpIndex, &xmpPath );
+		xmp.GetArrayItem ( kXMP_NS_DC, "rights", xmpIndex, &xmpValue, 0 );
+		bool hasLang = xmp.GetQualifier ( kXMP_NS_DC, xmpPath.c_str(), kXMP_NS_XML, "lang", &xmpLang, 0 );
+		if ( ! hasLang ) continue;	// Sanity check.
+		if ( xmpLang == "x-default" ) {
+			haveXDefault = true;	// See later special case.
+			continue;
+		}
+
+		XMP_StringPtr isoLang = "";
+		size_t rootLen = xmpLang.find ( '-' );
+		if ( rootLen == std::string::npos ) rootLen = xmpLang.size();
+		if ( rootLen == 2 ) {
+			if( xmpLang.size() > 2 ) xmpLang[2] = 0;
+			isoLang = Lookup3LetterLang ( xmpLang.c_str() );
+			if ( *isoLang == 0 ) continue;
+		} else if ( rootLen == 3 ) {
+			if( xmpLang.size() > 3 ) xmpLang[3] = 0;
+			isoLang = xmpLang.c_str();
+		} else {
+			continue;
+		}
+		haveMappings = true;
+
+		bool isoFound = false;
+		XMP_Uns16 packedLang = ((isoLang[0] - 0x60) << 10) | ((isoLang[1] - 0x60) << 5) | (isoLang[2] - 0x60);
+
+		for ( XMP_Uns32 isoIndex = 0; (isoIndex < udtaInfo.childCount) && (! isoFound); ++isoIndex ) {
+
+			MOOV_Manager::BoxInfo cprtInfo;
+			MOOV_Manager::BoxRef  cprtRef = moovMgr->GetNthChild ( udtaRef, isoIndex, &cprtInfo );
+			if ( cprtRef == 0 ) break;	// Sanity check, should not happen.
+			if ( (cprtInfo.boxType != ISOMedia::k_cprt) || (cprtInfo.contentSize < 6) ) continue;
+			if ( *cprtInfo.content != 0 ) continue;	// Only accept version 0, ignore the flags.
+			if ( packedLang != GetUns16BE ( cprtInfo.content + 4 ) ) continue;	// Look for matching language.
+
+			isoFound = true;	// Found the language entry, whether or not we update it.
+
+		}
+
+		if ( ! isoFound ) {
+
+			std::string newContent = "vfffll";
+			newContent += xmpValue;
+			*((XMP_Uns32*)newContent.c_str()) = 0;	// Set the version and flags to zero.
+			PutUns16BE ( packedLang, (char*)newContent.c_str() + 4 );
+			moovMgr->AddChildBox ( udtaRef, ISOMedia::k_cprt, newContent.c_str(), (XMP_Uns32)(newContent.size() + 1) );
+
+		}
+
+	}
+
+	// If there were no mappings in the loops, export the XMP "x-default" value to the first ISO item.
+
+	if ( ! haveMappings ) {
+
+		MOOV_Manager::BoxInfo cprtInfo;
+		MOOV_Manager::BoxRef  cprtRef = moovMgr->GetTypeChild ( udtaRef, ISOMedia::k_cprt, &cprtInfo );
+
+		if ( (cprtRef != 0) && (cprtInfo.contentSize >= 6) && (*cprtInfo.content == 0) ) {
+
+			bool xmpFound = xmp.GetLocalizedText ( kXMP_NS_DC, "rights", "", "x-default", &xmpLang, &xmpValue, 0 );
+
+			if ( xmpFound && (xmpLang == "x-default") ) {
+
+				// Update the ISO item if necessary.
+				XMP_StringPtr isoStr = (XMP_StringPtr)cprtInfo.content + 6;
+				size_t rawLen = cprtInfo.contentSize - 6;
+				if ( (rawLen >= 8) && (GetUns16BE(isoStr) == 0xFEFF) ) {
+					FromUTF16 ( (UTF16Unit*)(isoStr+2), (rawLen-2)/2, &tempStr, true /* big endian */ );
+					isoStr = tempStr.c_str();
+				}
+				if ( xmpValue != isoStr ) {
+					std::string newContent = "vfffll";
+					newContent += xmpValue;
+					memcpy ( (char*)newContent.c_str(), cprtInfo.content, 6 ); // Keep old version, flags, and language.
+					moovMgr->SetBox ( cprtRef, newContent.c_str(), (XMP_Uns32)(newContent.size() + 1) );
+				}
+
+			}
+
+		}
+
+	}
+
+}	// ExportISOCopyrights
+
+// =================================================================================================
+// ExportQuickTimeItems
+// ====================
+
+static void ExportQuickTimeItems ( const SXMPMeta & xmp, TradQT_Manager * qtMgr, MOOV_Manager * moovMgr )
+{
+
+	// The QuickTime 'udta' timecode items are done here for simplicity.
+
+	#define createWithZeroLang true
+
+	qtMgr->ExportSimpleXMP ( kQTilst_Reel, xmp, kXMP_NS_DM, "tapeName" );
+	qtMgr->ExportSimpleXMP ( kQTilst_Timecode, xmp, kXMP_NS_DM, "startTimecode/xmpDM:timeValue", createWithZeroLang );
+	qtMgr->ExportSimpleXMP ( kQTilst_TimeScale, xmp, kXMP_NS_DM, "startTimeScale", createWithZeroLang );
+	qtMgr->ExportSimpleXMP ( kQTilst_TimeSize, xmp, kXMP_NS_DM, "startTimeSampleSize", createWithZeroLang );
+
+	qtMgr->UpdateChangedBoxes ( moovMgr );
+
+}	// ExportQuickTimeItems
+
+// =================================================================================================
+// SelectTimeFormat
+// ================
+
+static const char * SelectTimeFormat ( const MPEG4_MetaHandler::TimecodeTrackInfo & tmcdInfo )
+{
+	const char * timeFormat = 0;
+
+	float fltFPS = (float)tmcdInfo.timeScale / (float)tmcdInfo.frameDuration;
+	int   intFPS = (int) (fltFPS + 0.5);
+
+	switch ( intFPS ) {
+
+		case 30:
+			if ( fltFPS >= 29.985 ) {
+				timeFormat = "30Timecode";
+			} else if ( tmcdInfo.isDropFrame ) {
+				timeFormat = "2997DropTimecode";
+			} else {
+				timeFormat = "2997NonDropTimecode";
+			}
+			break;
+
+		case 24:
+			if ( fltFPS >= 23.988 ) {
+				timeFormat = "24Timecode";
+			} else {
+				timeFormat = "23976Timecode";
+			}
+			break;
+
+		case 25:
+			timeFormat = "25Timecode";
+			break;
+
+		case 50:
+			timeFormat = "50Timecode";
+			break;
+
+		case 60:
+			if ( fltFPS >= 59.97 ) {
+				timeFormat = "60Timecode";
+			} else if ( tmcdInfo.isDropFrame ) {
+				timeFormat = "5994DropTimecode";
+			} else {
+				timeFormat = "5994NonDropTimecode";
+			}
+			break;
+
+	}
+
+	return timeFormat;
+
+}	// SelectTimeFormat
+
+// =================================================================================================
+// SelectTimeFormat
+// ================
+
+static const char * SelectTimeFormat ( const SXMPMeta & xmp )
+{
+	bool ok;
+	MPEG4_MetaHandler::TimecodeTrackInfo tmcdInfo;
+
+	XMP_Int64 timeScale;
+	ok = xmp.GetProperty_Int64 ( kXMP_NS_DM, "startTimeScale", &timeScale, 0 );
+	if ( ! ok ) return 0;
+	tmcdInfo.timeScale = (XMP_Uns32)timeScale;
+
+	XMP_Int64 frameDuration;
+	ok = xmp.GetProperty_Int64 ( kXMP_NS_DM, "startTimeSampleSize", &frameDuration, 0 );
+	if ( ! ok ) return 0;
+	tmcdInfo.frameDuration = (XMP_Uns32)frameDuration;
+
+	std::string timecode;
+	ok = xmp.GetProperty ( kXMP_NS_DM, "startTimecode/xmpDM:timeValue", &timecode, 0 );
+	if ( ! ok ) return 0;
+	if ( (timecode.size() == 11) && (timecode[8] == ';') ) tmcdInfo.isDropFrame = true;
+
+	return SelectTimeFormat ( tmcdInfo );
+
+}	// SelectTimeFormat
+
+// =================================================================================================
+// ComposeTimecode
+// ===============
+
+static const char * kDecDigits = "0123456789";
+#define TwoDigits(val,str)	(str)[0] = kDecDigits[(val)/10]; (str)[1] = kDecDigits[(val)%10]
+
+static bool ComposeTimecode ( const MPEG4_MetaHandler::TimecodeTrackInfo & tmcdInfo, std::string * strValue )
+{
+	float fltFPS = (float)tmcdInfo.timeScale / (float)tmcdInfo.frameDuration;
+	int   intFPS = (int) (fltFPS + 0.5);
+	if ( (intFPS != 30) && (intFPS != 24) && (intFPS != 25) && (intFPS != 50) && (intFPS != 60) ) return false;
+
+	XMP_Uns32 framesPerDay = intFPS * 24*60*60;
+	XMP_Uns32 dropLimit = 2;	// Used in the drop-frame correction.
+
+	if ( tmcdInfo.isDropFrame ) {
+		if ( intFPS == 30 ) {
+			framesPerDay = 2589408;	// = 29.97 * 24*60*60
+		} else if ( intFPS == 60 ) {
+			framesPerDay = 5178816;	// = 59.94 * 24*60*60
+			dropLimit = 4;
+		} else {
+			strValue->erase();
+			return false;	// Dropframe can only apply to 29.97 and 59.94.
+		}
+	}
+
+	XMP_Uns32 framesPerHour = framesPerDay / 24;
+	XMP_Uns32 framesPerTenMinutes = framesPerHour / 6;
+	XMP_Uns32 framesPerMinute = framesPerTenMinutes / 10;
+
+	XMP_Uns32 frameCount = tmcdInfo.timecodeSample;
+	while (frameCount >= framesPerDay ) frameCount -= framesPerDay;	// Normalize to be within 24 hours.
+
+	XMP_Uns32 hours, minHigh, minLow, seconds;
+
+	hours = frameCount / framesPerHour;
+	frameCount -= (hours * framesPerHour);
+
+	minHigh = frameCount / framesPerTenMinutes;
+	frameCount -= (minHigh * framesPerTenMinutes);
+
+	minLow = frameCount / framesPerMinute;
+	frameCount -= (minLow * framesPerMinute);
+
+	// Do some drop-frame corrections at this point: If this is drop-frame and the units of minutes
+	// is non-zero, and the seconds are zero, and the frames are zero or one, the time is illegal.
+	// Perform correction by subtracting 1 from the units of minutes and adding 1798 to the frames.�
+	// For example, 1:00:00 becomes 59:28, and 1:00:01 becomes 59:29. A special case can occur for
+	// when the frameCount just before the minHigh calculation is less than framesPerTenMinutes but
+	// more than 10*framesPerMinute. This happens because of roundoff, and will result in a minHigh
+	// of 0 and a minLow of 10.�The drop frame correction must�also be performed for this case.
+
+	if ( tmcdInfo.isDropFrame ) {
+		if ( (minLow == 10) || ((minLow != 0) && (frameCount < dropLimit)) ) {
+			minLow -= 1;
+			frameCount += framesPerMinute;
+		}
+	}
+
+	seconds = frameCount / intFPS;
+	frameCount -= (seconds * intFPS);
+
+	if ( tmcdInfo.isDropFrame ) {
+		*strValue = "hh;mm;ss;ff";
+	} else {
+		*strValue = "hh:mm:ss:ff";
+	}
+
+	char * str = (char*)strValue->c_str();
+	TwoDigits ( hours, str );
+	str[3] = kDecDigits[minHigh]; str[4] = kDecDigits[minLow];
+	TwoDigits ( seconds, str+6 );
+	TwoDigits ( frameCount, str+9 );
+
+	return true;
+
+}	// ComposeTimecode
+
+// =================================================================================================
+// DecomposeTimecode
+// =================
+
+static bool DecomposeTimecode ( const char * strValue, MPEG4_MetaHandler::TimecodeTrackInfo * tmcdInfo )
+{
+	float fltFPS = (float)tmcdInfo->timeScale / (float)tmcdInfo->frameDuration;
+	int   intFPS = (int) (fltFPS + 0.5);
+	if ( (intFPS != 30) && (intFPS != 24) && (intFPS != 25) && (intFPS != 50) && (intFPS != 60) ) return false;
+
+	XMP_Uns32 framesPerDay = intFPS * 24*60*60;
+
+	int items, hours, minutes, seconds, frames;
+
+	if ( ! tmcdInfo->isDropFrame ) {
+		items = sscanf ( strValue, "%d:%d:%d:%d", &hours, &minutes, &seconds, &frames );
+	} else {
+		items = sscanf ( strValue, "%d;%d;%d;%d", &hours, &minutes, &seconds, &frames );
+		if ( intFPS == 30 ) {
+			framesPerDay = 2589408;	// = 29.97 * 24*60*60
+		} else if ( intFPS == 60 ) {
+			framesPerDay = 5178816;	// = 59.94 * 24*60*60
+		} else {
+			return false;	// Dropframe can only apply to 29.97 and 59.94.
+		}
+	}
+
+	if ( items != 4 ) return false;
+	int minHigh = minutes / 10;
+	int minLow = minutes % 10;
+
+	XMP_Uns32 framesPerHour = framesPerDay / 24;
+	XMP_Uns32 framesPerTenMinutes = framesPerHour / 6;
+	XMP_Uns32 framesPerMinute = framesPerTenMinutes / 10;
+
+	tmcdInfo->timecodeSample = (hours * framesPerHour) + (minHigh * framesPerTenMinutes) +
+							   (minLow * framesPerMinute) + (seconds * intFPS) + frames;
+
+	return true;
+
+}	// DecomposeTimecode
+
+// =================================================================================================
+// FindTimecode_trak
+// =================
+//
+// Look for a well-formed timecode track, return the trak box ref.
+
+static MOOV_Manager::BoxRef FindTimecode_trak ( const MOOV_Manager & moovMgr )
+{
+
+	// Find a 'trak' box with a handler type of 'tmcd'.
+
+	MOOV_Manager::BoxInfo moovInfo;
+	MOOV_Manager::BoxRef  moovRef = moovMgr.GetBox ( "moov", &moovInfo );
+	XMP_Assert ( moovRef != 0 );
+
+	MOOV_Manager::BoxInfo trakInfo;
+	MOOV_Manager::BoxRef  trakRef;
+
+	size_t i = 0;
+	for ( ; i < moovInfo.childCount; ++i ) {
+
+		trakRef = moovMgr.GetNthChild ( moovRef, i, &trakInfo );
+		if ( trakRef == 0 ) return 0;	// Sanity check, should not happen.
+		if ( trakInfo.boxType != ISOMedia::k_trak ) continue;
+
+		MOOV_Manager::BoxRef  innerRef;
+		MOOV_Manager::BoxInfo innerInfo;
+
+		innerRef = moovMgr.GetTypeChild ( trakRef, ISOMedia::k_mdia, &innerInfo );
+		if ( innerRef == 0 ) continue;
+
+		innerRef = moovMgr.GetTypeChild ( innerRef, ISOMedia::k_hdlr, &innerInfo );
+		if ( (innerRef == 0) || (innerInfo.contentSize < sizeof ( MOOV_Manager::Content_hdlr )) ) continue;
+
+		const MOOV_Manager::Content_hdlr * hdlr = (MOOV_Manager::Content_hdlr*) innerInfo.content;
+		if ( hdlr->versionFlags != 0 ) continue;
+		if ( GetUns32BE ( &hdlr->handlerType ) == ISOMedia::k_tmcd ) break;
+
+	}
+
+	if ( i == moovInfo.childCount ) return 0;
+	return trakRef;
+
+}	// FindTimecode_trak
+
+// =================================================================================================
+// FindTimecode_dref
+// =================
+//
+// Look for the mdia/minf/dinf/dref box within a well-formed timecode track, return the dref box ref.
+
+static MOOV_Manager::BoxRef FindTimecode_dref ( const MOOV_Manager & moovMgr )
+{
+
+	MOOV_Manager::BoxRef trakRef = FindTimecode_trak ( moovMgr );
+	if ( trakRef == 0 ) return 0;
+
+	MOOV_Manager::BoxInfo tempInfo;
+	MOOV_Manager::BoxRef  tempRef, drefRef;
+
+	tempRef = moovMgr.GetTypeChild ( trakRef, ISOMedia::k_mdia, &tempInfo );
+	if ( tempRef == 0 ) return 0;
+
+	tempRef = moovMgr.GetTypeChild ( tempRef, ISOMedia::k_minf, &tempInfo );
+	if ( tempRef == 0 ) return 0;
+
+	tempRef = moovMgr.GetTypeChild ( tempRef, ISOMedia::k_dinf, &tempInfo );
+	if ( tempRef == 0 ) return 0;
+
+	drefRef = moovMgr.GetTypeChild ( tempRef, ISOMedia::k_dref, &tempInfo );
+
+	return drefRef;
+
+}	// FindTimecode_dref
+
+// =================================================================================================
+// FindTimecode_stbl
+// =================
+//
+// Look for the mdia/minf/stbl box within a well-formed timecode track, return the stbl box ref.
+
+static MOOV_Manager::BoxRef FindTimecode_stbl ( const MOOV_Manager & moovMgr )
+{
+
+	MOOV_Manager::BoxRef trakRef = FindTimecode_trak ( moovMgr );
+	if ( trakRef == 0 ) return 0;
+
+	MOOV_Manager::BoxInfo tempInfo;
+	MOOV_Manager::BoxRef  tempRef, stblRef;
+
+	tempRef = moovMgr.GetTypeChild ( trakRef, ISOMedia::k_mdia, &tempInfo );
+	if ( tempRef == 0 ) return 0;
+
+	tempRef = moovMgr.GetTypeChild ( tempRef, ISOMedia::k_minf, &tempInfo );
+	if ( tempRef == 0 ) return 0;
+
+	stblRef = moovMgr.GetTypeChild ( tempRef, ISOMedia::k_stbl, &tempInfo );
+	return stblRef;
+
+}	// FindTimecode_stbl
+
+// =================================================================================================
+// FindTimecode_elst
+// =================
+//
+// Look for the edts/elst box within a well-formed timecode track, return the elst box ref.
+
+static MOOV_Manager::BoxRef FindTimecode_elst ( const MOOV_Manager & moovMgr )
+{
+
+	MOOV_Manager::BoxRef trakRef = FindTimecode_trak ( moovMgr );
+	if ( trakRef == 0 ) return 0;
+
+	MOOV_Manager::BoxInfo tempInfo;
+	MOOV_Manager::BoxRef  tempRef, elstRef;
+
+	tempRef = moovMgr.GetTypeChild ( trakRef, ISOMedia::k_edts, &tempInfo );
+	if ( tempRef == 0 ) return 0;
+
+	elstRef = moovMgr.GetTypeChild ( tempRef, ISOMedia::k_elst, &tempInfo );
+	return elstRef;
+
+}	// FindTimecode_elst
+
+// =================================================================================================
+// ImportTimecodeItems
+// ===================
+
+static bool ImportTimecodeItems ( const MPEG4_MetaHandler::TimecodeTrackInfo & tmcdInfo,
+								  const TradQT_Manager & qtInfo, SXMPMeta * xmp )
+{
+	std::string xmpValue;
+	bool haveItem;
+	bool haveImports = false;
+
+	// The QT user data item '�REL' goes into xmpDM:tapeName, and the 'name' box at the end of the
+	// timecode sample description goes into xmpDM:altTapeName.
+	haveImports |= qtInfo.ImportSimpleXMP ( kQTilst_Reel, xmp, kXMP_NS_DM, "tapeName" );
+	if ( ! tmcdInfo.macName.empty() ) {
+		haveItem = ConvertFromMacLang ( tmcdInfo.macName, tmcdInfo.macLang, &xmpValue );
+		if ( haveItem ) {
+			xmp->SetProperty ( kXMP_NS_DM, "altTapeName", xmpValue.c_str() );
+			haveImports = true;
+		}
+	}
+
+	// The QT user data item '�TSC' goes into xmpDM:startTimeScale. If that isn't present, then
+	// the timecode sample description's timeScale is used.
+	haveItem = qtInfo.ImportSimpleXMP ( kQTilst_TimeScale, xmp, kXMP_NS_DM, "startTimeScale" );
+	if ( tmcdInfo.stsdBoxFound & (! haveItem) ) {
+		xmp->SetProperty_Int64 ( kXMP_NS_DM, "startTimeScale", tmcdInfo.timeScale );
+		haveItem = true;
+	}
+	haveImports |= haveItem;
+
+	// The QT user data item '�TSZ' goes into xmpDM:startTimeSampleSize. If that isn't present, then
+	// the timecode sample description's frameDuration is used.
+	haveItem = qtInfo.ImportSimpleXMP ( kQTilst_TimeSize, xmp, kXMP_NS_DM, "startTimeSampleSize" );
+	if ( tmcdInfo.stsdBoxFound & (! haveItem) ) {
+		xmp->SetProperty_Int64 ( kXMP_NS_DM, "startTimeSampleSize", tmcdInfo.frameDuration );
+		haveItem = true;
+	}
+	haveImports |= haveItem;
+
+	const char * timeFormat;
+
+	// The Timecode struct type is used for xmpDM:startTimecode and xmpDM:altTimecode. For both, only
+	// the xmpDM:timeValue and xmpDM:timeFormat fields are set.
+
+	// The QT user data item '�TIM' goes into xmpDM:startTimecode/xmpDM:timeValue. This is an already
+	// formatted timecode string. The XMP values of xmpDM:startTimeScale, xmpDM:startTimeSampleSize,
+	// and xmpDM:startTimecode/xmpDM:timeValue are used to select the timeFormat value.
+	haveImports |= qtInfo.ImportSimpleXMP ( kQTilst_Timecode, xmp, kXMP_NS_DM, "startTimecode/xmpDM:timeValue" );
+	timeFormat = SelectTimeFormat ( *xmp );
+	if ( timeFormat != 0 ) {
+		xmp->SetProperty ( kXMP_NS_DM, "startTimecode/xmpDM:timeFormat", timeFormat );
+		haveImports = true;
+	}
+
+	if ( tmcdInfo.stsdBoxFound ) {
+
+		haveItem = ComposeTimecode ( tmcdInfo, &xmpValue );
+		if ( haveItem ) {
+			xmp->SetProperty ( kXMP_NS_DM, "altTimecode/xmpDM:timeValue", xmpValue.c_str() );
+			haveImports = true;
+		}
+
+		timeFormat = SelectTimeFormat ( tmcdInfo );
+		if ( timeFormat != 0 ) {
+			xmp->SetProperty ( kXMP_NS_DM, "altTimecode/xmpDM:timeFormat", timeFormat );
+			haveImports = true;
+		}
+
+	}
+
+	return haveImports;
+
+}	// ImportTimecodeItems
+
+// =================================================================================================
+// ExportTimecodeItems
+// ===================
+
+static void ExportTimecodeItems ( const SXMPMeta & xmp, MPEG4_MetaHandler::TimecodeTrackInfo * tmcdInfo,
+								  TradQT_Manager * qtMgr, MOOV_Manager * moovMgr )
+{
+	// Export the items that go into the timecode track:
+	//  - the timescale and frame duration in the first 'stsd' table entry
+	//  - the 'name' box appended to the first 'stsd' table entry
+	//  - the first timecode sample
+	// ! The QuickTime 'udta' timecode items are handled in ExportQuickTimeItems.
+
+	if ( ! tmcdInfo->stsdBoxFound ) return;	// Don't make changes unless there is a well-formed timecode track.
+
+	MOOV_Manager::BoxRef stblRef = FindTimecode_stbl ( *moovMgr );
+	if ( stblRef == 0 ) return;
+
+	MOOV_Manager::BoxInfo stsdInfo;
+	MOOV_Manager::BoxRef  stsdRef;
+
+	stsdRef = moovMgr->GetTypeChild ( stblRef, ISOMedia::k_stsd, &stsdInfo );
+	if ( stsdRef == 0 ) return;
+	if ( stsdInfo.contentSize < (8 + sizeof ( MOOV_Manager::Content_stsd_entry )) ) return;
+	if ( GetUns32BE ( stsdInfo.content + 4 ) == 0 ) return;	// Make sure the entry count is non-zero.
+
+	MOOV_Manager::Content_stsd_entry * stsdRawEntry = (MOOV_Manager::Content_stsd_entry*) (stsdInfo.content + 8);
+
+	XMP_Uns32 stsdEntrySize = GetUns32BE ( &stsdRawEntry->entrySize );
+	if ( stsdEntrySize > (stsdInfo.contentSize - 4) ) stsdEntrySize = stsdInfo.contentSize - 4;
+	if ( stsdEntrySize < sizeof ( MOOV_Manager::Content_stsd_entry ) ) return;
+
+	bool ok, haveScale = false, haveDuration = false;
+	std::string xmpValue;
+	XMP_Int64 int64;	// Used to allow UInt32 values, GetProperty_Int is SInt32.
+
+	// The tmcdInfo timeScale field is set from xmpDM:startTimeScale.
+	 ok = xmp.GetProperty_Int64 ( kXMP_NS_DM, "startTimeScale", &int64, 0 );
+	 if ( ok && (int64 <= 0xFFFFFFFF) ) {
+	 	haveScale = true;
+	 	if ( tmcdInfo->timeScale != 0 ) { // Entry must not be created if not existing before
+			tmcdInfo->timeScale = (XMP_Uns32)int64;
+			PutUns32BE ( tmcdInfo->timeScale, (void*)&stsdRawEntry->timeScale );
+			moovMgr->NoteChange();
+	 	}
+	 }
+
+	// The tmcdInfo frameDuration field is set from xmpDM:startTimeSampleSize.
+	 ok = xmp.GetProperty_Int64 ( kXMP_NS_DM, "startTimeSampleSize", &int64, 0 );
+	 if ( ok && (int64 <= 0xFFFFFFFF) ) {
+	 	haveDuration = true;
+	 	if ( tmcdInfo->frameDuration != 0 ) { // Entry must not be created if not existing before
+			tmcdInfo->frameDuration = (XMP_Uns32)int64;
+			PutUns32BE ( tmcdInfo->frameDuration, (void*)&stsdRawEntry->frameDuration );
+			moovMgr->NoteChange();
+	 	}
+	 }
+	
+	 // The tmcdInfo frameCount field is a simple ratio of the timeScale and frameDuration.
+	 if ( (haveScale & haveDuration) && (tmcdInfo->frameDuration != 0) ) {
+	 	float floatScale = (float) tmcdInfo->timeScale;
+	 	float floatDuration = (float) tmcdInfo->frameDuration;
+		XMP_Uns8 newCount = (XMP_Uns8) ( (floatScale / floatDuration) + 0.5 );
+		if ( newCount != stsdRawEntry->frameCount ) {
+			stsdRawEntry->frameCount = newCount;
+			moovMgr->NoteChange();
+		}
+	 }
+
+	// The tmcdInfo isDropFrame flag is set from xmpDM:altTimecode/xmpDM:timeValue. The timeScale
+	// and frameDuration must be updated first, they are used by DecomposeTimecode. Compute the new
+	// UInt32 timecode sample, but it gets written to the file later by UpdateFile.
+
+	ok = xmp.GetProperty ( kXMP_NS_DM, "altTimecode/xmpDM:timeValue", &xmpValue, 0 );
+	if ( ok && (xmpValue.size() == 11) ) {
+
+		bool oldDropFrame = tmcdInfo->isDropFrame;
+		tmcdInfo->isDropFrame = false;
+		if ( xmpValue[8] == ';' ) tmcdInfo->isDropFrame = true;
+		if ( oldDropFrame != tmcdInfo->isDropFrame ) {
+			XMP_Uns32 flags = GetUns32BE ( &stsdRawEntry->flags );
+			flags = (flags & 0xFFFFFFFE) | (XMP_Uns32)tmcdInfo->isDropFrame;
+			PutUns32BE ( flags, (void*)&stsdRawEntry->flags );
+		 	moovMgr->NoteChange();
+		}
+
+		XMP_Uns32 oldSample = tmcdInfo->timecodeSample;
+		ok = DecomposeTimecode ( xmpValue.c_str(), tmcdInfo );
+	 	if ( ok && (oldSample != tmcdInfo->timecodeSample) ) moovMgr->NoteChange();
+
+	}
+
+	// The 'name' box attached to the first 'stsd' table entry is set from xmpDM:altTapeName.
+
+	bool replaceNameBox = false;
+
+	ok = xmp.GetProperty ( kXMP_NS_DM, "altTapeName", &xmpValue, 0 );
+	if ( (! ok) || xmpValue.empty() ) {
+		if ( tmcdInfo->nameOffset != 0 ) replaceNameBox = true;	// No XMP, get rid of existing name.
+	} else {
+		std::string macValue;
+		ok = ConvertToMacLang ( xmpValue, tmcdInfo->macLang, &macValue );
+		if ( ok && (macValue != tmcdInfo->macName) ) {
+			tmcdInfo->macName = macValue;
+			replaceNameBox = true;	// Write changed name.
+		}
+	}
+
+	if ( replaceNameBox ) {
+
+		// To replace the 'name' box we have to create an entire new 'stsd' box, and attach the
+		// new name to the first 'stsd' table entry. The 'name' box content is a UInt16 text length,
+		// UInt16 language code, and Mac encoded text with no nul termination.
+
+		if ( tmcdInfo->macName.size() > 0xFFFF ) tmcdInfo->macName.erase ( 0xFFFF );
+
+		ISOMedia::BoxInfo oldNameInfo;
+		XMP_Assert ( (oldNameInfo.headerSize == 0) && (oldNameInfo.contentSize == 0) );
+		if ( tmcdInfo->nameOffset != 0 ) {
+			const XMP_Uns8 * oldNamePtr = stsdInfo.content + tmcdInfo->nameOffset;
+			const XMP_Uns8 * oldNameLimit = stsdInfo.content + stsdInfo.contentSize;
+			(void) ISOMedia::GetBoxInfo ( oldNamePtr, oldNameLimit, &oldNameInfo );
+		}
+
+		XMP_Uns32 oldNameBoxSize = (XMP_Uns32)oldNameInfo.headerSize + (XMP_Uns32)oldNameInfo.contentSize;
+		XMP_Uns32 newNameBoxSize = 0;
+		if ( ! tmcdInfo->macName.empty() ) newNameBoxSize = 4+4 + 2+2 + (XMP_Uns32)tmcdInfo->macName.size();
+
+		XMP_Uns32 stsdNewContentSize = stsdInfo.contentSize - oldNameBoxSize + newNameBoxSize;
+		RawDataBlock stsdNewContent;
+		stsdNewContent.assign ( stsdNewContentSize, 0 );	// Get the space allocated, direct fill below.
+
+		XMP_Uns32 stsdPrefixSize = tmcdInfo->nameOffset;
+		if ( tmcdInfo->nameOffset == 0 ) stsdPrefixSize = 4+4 + sizeof ( MOOV_Manager::Content_stsd_entry );
+
+		XMP_Uns32 oldSuffixOffset = stsdPrefixSize + oldNameBoxSize;
+		XMP_Uns32 newSuffixOffset = stsdPrefixSize + newNameBoxSize;
+		XMP_Uns32 stsdSuffixSize  = stsdInfo.contentSize - oldSuffixOffset;
+
+		memcpy ( &stsdNewContent[0], stsdInfo.content, stsdPrefixSize );
+		if ( stsdSuffixSize != 0 ) memcpy ( &stsdNewContent[newSuffixOffset], (stsdInfo.content + oldSuffixOffset), stsdSuffixSize );
+
+		XMP_Uns32 newEntrySize = stsdEntrySize - oldNameBoxSize + newNameBoxSize;
+		MOOV_Manager::Content_stsd_entry * stsdNewEntry = (MOOV_Manager::Content_stsd_entry*) (&stsdNewContent[0] + 8);
+		PutUns32BE ( newEntrySize, &stsdNewEntry->entrySize );
+
+		if ( newNameBoxSize != 0 ) {
+			PutUns32BE ( newNameBoxSize, &stsdNewContent[stsdPrefixSize] );
+			PutUns32BE ( ISOMedia::k_name, &stsdNewContent[stsdPrefixSize+4] );
+			PutUns16BE ( (XMP_Uns16)tmcdInfo->macName.size(), &stsdNewContent[stsdPrefixSize+8] );
+			PutUns16BE ( tmcdInfo->macLang, &stsdNewContent[stsdPrefixSize+10] );
+			memcpy ( &stsdNewContent[stsdPrefixSize+12], tmcdInfo->macName.c_str(), tmcdInfo->macName.size() );
+		}
+
+		moovMgr->SetBox ( stsdRef, &stsdNewContent[0], stsdNewContentSize );
+
+	}
+
+}	// ExportTimecodeItems
+
+// =================================================================================================
+// ImportCr8rItems
+// ===============
+
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( 1 )
+#else
+#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+struct PrmLBoxContent {
+	XMP_Uns32 magic;
+	XMP_Uns32 size;
+	XMP_Uns16 verAPI;
+	XMP_Uns16 verCode;
+	XMP_Uns32 exportType;
+	XMP_Uns16 MacVRefNum;
+	XMP_Uns32 MacParID;
+	char filePath[260];
+};
+
+enum { kExportTypeMovie = 0, kExportTypeStill = 1, kExportTypeAudio = 2, kExportTypeCustom = 3 };
+
+struct Cr8rBoxContent {
+	XMP_Uns32 magic;
+	XMP_Uns32 size;
+	XMP_Uns16 majorVer;
+	XMP_Uns16 minorVer;
+	XMP_Uns32 creatorCode;
+	XMP_Uns32 appleEvent;
+	char fileExt[16];
+	char appOptions[16];
+	char appName[32];
+};
+
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( )
+#else
+#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+// -------------------------------------------------------------------------------------------------
+
+static bool ImportCr8rItems ( const MOOV_Manager & moovMgr, SXMPMeta * xmp )
+{
+	bool haveXMP = false;
+	std::string fieldPath;
+
+	MOOV_Manager::BoxInfo infoPrmL, infoCr8r;
+	MOOV_Manager::BoxRef  refPrmL = moovMgr.GetBox ( "moov/udta/PrmL", &infoPrmL );
+	MOOV_Manager::BoxRef  refCr8r = moovMgr.GetBox ( "moov/udta/Cr8r", &infoCr8r );
+
+	bool havePrmL = ( (refPrmL != 0) && (infoPrmL.contentSize == sizeof ( PrmLBoxContent )) );
+	bool haveCr8r = ( (refCr8r != 0) && (infoCr8r.contentSize == sizeof ( Cr8rBoxContent )) );
+
+	if ( havePrmL ) {
+
+		PrmLBoxContent rawPrmL;
+		XMP_Assert ( sizeof ( rawPrmL ) == 282 );
+		XMP_Assert ( sizeof ( rawPrmL.filePath ) == 260 );
+		memcpy ( &rawPrmL, infoPrmL.content, sizeof ( rawPrmL ) );
+		if ( rawPrmL.magic != 0xBEEFCAFE ) {
+			Flip4 ( &rawPrmL.exportType );	// The only numeric field that we care about.
+		}
+
+		rawPrmL.filePath[259] = 0;	// Ensure a terminating nul.
+		if ( rawPrmL.filePath[0] != 0 ) {
+			if ( rawPrmL.filePath[0] == '/' ) {
+				haveXMP = true;
+				SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "macAtom",
+												    kXMP_NS_CreatorAtom, "posixProjectPath", &fieldPath );
+				if ( ! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() ) ) {
+					xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath.c_str(), rawPrmL.filePath );
+				}
+			} else if ( XMP_LitNMatch ( rawPrmL.filePath, "\\\\?\\", 4 ) ) {
+				haveXMP = true;
+				SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "windowsAtom",
+												    kXMP_NS_CreatorAtom, "uncProjectPath", &fieldPath );
+				if ( ! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() ) ) {
+					xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath.c_str(), rawPrmL.filePath );
+				}
+			}
+		}
+
+		const char * exportStr = 0;
+		switch ( rawPrmL.exportType ) {
+			case kExportTypeMovie  : exportStr = "movie";  break;
+			case kExportTypeStill  : exportStr = "still";  break;
+			case kExportTypeAudio  : exportStr = "audio";  break;
+			case kExportTypeCustom : exportStr = "custom"; break;
+		}
+		if ( exportStr != 0 ) {
+			haveXMP = true;
+			SXMPUtils::ComposeStructFieldPath ( kXMP_NS_DM, "projectRef", kXMP_NS_DM, "type", &fieldPath );
+			if ( ! xmp->DoesPropertyExist ( kXMP_NS_DM, fieldPath.c_str() ) ) {
+				xmp->SetProperty ( kXMP_NS_DM, fieldPath.c_str(), exportStr );
+			}
+		}
+
+	}
+
+	if ( haveCr8r ) {
+
+		Cr8rBoxContent rawCr8r;
+		XMP_Assert ( sizeof ( rawCr8r ) == 84 );
+		XMP_Assert ( sizeof ( rawCr8r.fileExt ) == 16 );
+		XMP_Assert ( sizeof ( rawCr8r.appOptions ) == 16 );
+		XMP_Assert ( sizeof ( rawCr8r.appName ) == 32 );
+		memcpy ( &rawCr8r, infoCr8r.content, sizeof ( rawCr8r ) );
+		if ( rawCr8r.magic != 0xBEEFCAFE ) {
+			Flip4 ( &rawCr8r.creatorCode );	// The only numeric fields that we care about.
+			Flip4 ( &rawCr8r.appleEvent );
+		}
+
+		std::string fieldPath;
+
+		SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "applicationCode", &fieldPath );
+		if ( (rawCr8r.creatorCode != 0) && (! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() )) ) {
+			haveXMP = true;
+			xmp->SetProperty_Int64 ( kXMP_NS_CreatorAtom, fieldPath.c_str(), (XMP_Int64)rawCr8r.creatorCode );	// ! Unsigned trickery.
+		}
+
+		SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "invocationAppleEvent", &fieldPath );
+		if ( (rawCr8r.appleEvent != 0) && (! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() )) ) {
+			haveXMP = true;
+			xmp->SetProperty_Int64 ( kXMP_NS_CreatorAtom, fieldPath.c_str(), (XMP_Int64)rawCr8r.appleEvent );	// ! Unsigned trickery.
+		}
+
+		rawCr8r.fileExt[15] = 0;	// Ensure a terminating nul.
+		SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "extension", &fieldPath );
+		if ( (rawCr8r.fileExt[0] != 0) && (! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() )) ) {
+			haveXMP = true;
+			xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath.c_str(), rawCr8r.fileExt );
+		}
+
+		rawCr8r.appOptions[15] = 0;	// Ensure a terminating nul.
+		SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "invocationFlags", &fieldPath );
+		if ( (rawCr8r.appOptions[0] != 0) && (! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() )) ) {
+			haveXMP = true;
+			xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath.c_str(), rawCr8r.appOptions );
+		}
+
+		rawCr8r.appName[31] = 0;	// Ensure a terminating nul.
+		if ( (rawCr8r.appName[0] != 0) && (! xmp->DoesPropertyExist ( kXMP_NS_XMP, "CreatorTool" )) ) {
+			haveXMP = true;
+			xmp->SetProperty ( kXMP_NS_XMP, "CreatorTool", rawCr8r.appName );
+		}
+
+	}
+
+	return haveXMP;
+
+}	// ImportCr8rItems
+
+// =================================================================================================
+// ExportCr8rItems
+// ===============
+
+static inline void SetBufferedString ( char * dest, const std::string source, size_t limit )
+{
+	memset ( dest, 0, limit );
+	size_t count = source.size();
+	if ( count >= limit ) count = limit - 1;	// Ensure a terminating nul.
+	memcpy ( dest, source.c_str(), count );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static void ExportCr8rItems ( const SXMPMeta & xmp, MOOV_Manager * moovMgr )
+{
+	bool haveNewCr8r = false;
+	std::string creatorCode, appleEvent, fileExt, appOptions, appName;
+
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "applicationCode", &creatorCode, 0 );
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "invocationAppleEvent", &appleEvent, 0 );
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "extension", &fileExt, 0 );
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "invocationFlags", &appOptions, 0 );
+	haveNewCr8r |= xmp.GetProperty ( kXMP_NS_XMP, "CreatorTool", &appName, 0 );
+
+	MOOV_Manager::BoxInfo infoCr8r;
+	MOOV_Manager::BoxRef  refCr8r = moovMgr->GetBox ( "moov/udta/Cr8r", &infoCr8r );
+	bool haveOldCr8r = ( (refCr8r != 0) && (infoCr8r.contentSize == sizeof ( Cr8rBoxContent )) );
+
+	if ( ! haveNewCr8r ) {
+		if ( haveOldCr8r ) {
+			MOOV_Manager::BoxRef udtaRef = moovMgr->GetBox ( "moov/udta", 0 );
+			moovMgr->DeleteTypeChild ( udtaRef, 0x43723872 /* 'Cr8r' */ );
+		}
+		return;
+	}
+
+	Cr8rBoxContent newCr8r;
+	const Cr8rBoxContent * oldCr8r = (Cr8rBoxContent*) infoCr8r.content;
+
+	if ( ! haveOldCr8r ) {
+
+		memset ( &newCr8r, 0, sizeof(newCr8r) );
+		newCr8r.magic = MakeUns32BE ( 0xBEEFCAFE );
+		newCr8r.size = MakeUns32BE ( sizeof ( newCr8r ) );
+		newCr8r.majorVer = MakeUns16BE ( 1 );
+
+	} else {
+
+		memcpy ( &newCr8r, oldCr8r, sizeof(newCr8r) );
+		if ( GetUns32BE ( &newCr8r.magic ) != 0xBEEFCAFE ) {	// Make sure we write BE numbers.
+			Flip4 ( &newCr8r.magic );
+			Flip4 ( &newCr8r.size );
+			Flip2 ( &newCr8r.majorVer );
+			Flip2 ( &newCr8r.minorVer );
+			Flip4 ( &newCr8r.creatorCode );
+			Flip4 ( &newCr8r.appleEvent );
+		}
+
+	}
+
+	if ( ! creatorCode.empty() ) {
+		newCr8r.creatorCode = MakeUns32BE ( (XMP_Uns32) strtoul ( creatorCode.c_str(), 0, 0 ) );
+	}
+
+	if ( ! appleEvent.empty() ) {
+		newCr8r.appleEvent = MakeUns32BE ( (XMP_Uns32) strtoul ( appleEvent.c_str(), 0, 0 ) );
+	}
+
+	if ( ! fileExt.empty() ) SetBufferedString ( newCr8r.fileExt, fileExt, sizeof ( newCr8r.fileExt ) );
+	if ( ! appOptions.empty() ) SetBufferedString ( newCr8r.appOptions, appOptions, sizeof ( newCr8r.appOptions ) );
+	if ( ! appName.empty() ) SetBufferedString ( newCr8r.appName, appName, sizeof ( newCr8r.appName ) );
+
+	moovMgr->SetBox ( "moov/udta/Cr8r", &newCr8r, sizeof(newCr8r) );
+
+}	// ExportCr8rItems
+
+// =================================================================================================
+// GetAtomInfo
+// ===========
+
+struct AtomInfo {
+	XMP_Int64 atomSize;
+	XMP_Uns32 atomType;
+	bool hasLargeSize;
+};
+
+enum {	// ! Do not rearrange, code depends on this order.
+	kBadQT_NoError		= 0,	// No errors.
+	kBadQT_SmallInner	= 1,	// An extra 1..7 bytes at the end of an inner span.
+	kBadQT_LargeInner	= 2,	// More serious inner garbage, found as invalid atom length.
+	kBadQT_SmallOuter	= 3,	// An extra 1..7 bytes at the end of the file.
+	kBadQT_LargeOuter	= 4		// More serious EOF garbage, found as invalid atom length.
+};
+typedef XMP_Uns8 QTErrorMode;
+
+static QTErrorMode GetAtomInfo ( XMP_IO* qtFile, XMP_Int64 spanSize, int nesting, AtomInfo * info )
+{
+	QTErrorMode status = kBadQT_NoError;
+	XMP_Uns8 buffer [8];
+
+	info->hasLargeSize = false;
+
+	qtFile->ReadAll ( buffer, 8 );	// Will throw if 8 bytes aren't available.
+	info->atomSize = GetUns32BE ( &buffer[0] );	// ! Yes, the initial size is big endian UInt32.
+	info->atomType = GetUns32BE ( &buffer[4] );
+
+	if ( info->atomSize == 0 ) {	// Does the atom extend to EOF?
+
+		if ( nesting != 0 ) return kBadQT_LargeInner;
+		info->atomSize = spanSize;	// This outer atom goes to EOF.
+
+	} else if ( info->atomSize == 1 ) {	// Does the atom have a 64-bit size?
+
+		if ( spanSize < 16 ) {	// Is there room in the span for the 16 byte header?
+			status = kBadQT_LargeInner;
+			if ( nesting == 0 ) status += 2;	// Convert to "outer".
+			return status;
+		}
+
+		qtFile->ReadAll ( buffer, 8 );
+		info->atomSize = (XMP_Int64) GetUns64BE ( &buffer[0] );
+		info->hasLargeSize = true;
+
+	}
+
+	XMP_Assert ( status == kBadQT_NoError );
+	return status;
+
+}	// GetAtomInfo
+
+// =================================================================================================
+// CheckAtomList
+// =============
+//
+// Check that a sequence of atoms fills a given span. The I/O position must be at the start of the
+// span, it is left just past the span on success. Recursive checks are done for top level 'moov'
+// atoms, and second level 'udta' atoms ('udta' inside 'moov').
+//
+// Checking continues for "small inner" errors. They will be reported if no other kinds of errors
+// are found, otherwise the other error is reported. Checking is immediately aborted for any "large"
+// error. The rationale is that QuickTime can apparently handle small inner errors. They might be
+// arise from updates that shorten an atom by less than 8 bytes. Larger shrinkage should introduce a
+// 'free' atom.
+
+static QTErrorMode CheckAtomList ( XMP_IO* qtFile, XMP_Int64 spanSize, int nesting )
+{
+	QTErrorMode status = kBadQT_NoError;
+	AtomInfo    info;
+
+	const static XMP_Uns32 moovAtomType = 0x6D6F6F76;	// ! Don't use MakeUns32BE, already big endian.
+	const static XMP_Uns32 udtaAtomType = 0x75647461;
+
+	for ( ; spanSize >= 8; spanSize -= info.atomSize ) {
+
+		QTErrorMode atomStatus = GetAtomInfo ( qtFile, spanSize, nesting, &info );
+		if ( atomStatus != kBadQT_NoError ) return atomStatus;
+
+		XMP_Int64 headerSize = 8;
+		if ( info.hasLargeSize ) headerSize = 16;
+
+		if ( (info.atomSize < headerSize) || (info.atomSize > spanSize) ) {
+			status = kBadQT_LargeInner;
+			if ( nesting == 0 ) status += 2;	// Convert to "outer".
+			return status;
+		}
+
+		bool doChildren = false;
+		if ( (nesting == 0) && (info.atomType == moovAtomType) ) doChildren = true;
+		if ( (nesting == 1) && (info.atomType == udtaAtomType) ) doChildren = true;
+
+		XMP_Int64 dataSize = info.atomSize - headerSize;
+
+		if ( ! doChildren ) {
+			qtFile->Seek ( dataSize, kXMP_SeekFromCurrent );
+		} else {
+			QTErrorMode innerStatus = CheckAtomList ( qtFile, dataSize, nesting+1 );
+			if ( innerStatus > kBadQT_SmallInner ) return innerStatus;	// Quit for serious errors.
+			if ( status == kBadQT_NoError ) status = innerStatus;	// Remember small inner errors.
+		}
+
+	}
+
+	XMP_Assert ( status <= kBadQT_SmallInner );	// Else already returned.
+	// ! Make sure inner kBadQT_SmallInner is propagated if this span is OK.
+
+	if ( spanSize != 0 ) {
+		qtFile->Seek ( spanSize, kXMP_SeekFromCurrent );	// ! Skip the trailing garbage of this span.
+		status = kBadQT_SmallInner;
+		if ( nesting == 0 ) status += 2;	// Convert to "outer".
+	}
+
+	return status;
+
+}	// CheckAtomList
+
+// =================================================================================================
+// AttemptFileRepair
+// =================
+
+static void AttemptFileRepair ( XMP_IO* qtFile, XMP_Int64 fileSpace, QTErrorMode status, GenericErrorCallback * ec )
+{
+
+	switch ( status ) {
+		case kBadQT_NoError    : return;	// Sanity check.
+		case kBadQT_SmallInner : return;	// Fixed in normal update code for the 'udta' box.
+		case kBadQT_LargeInner : 
+			{
+				XMP_Error error ( kXMPErr_BadFileFormat,"Can't repair QuickTime file" );
+				XMPFileHandler::NotifyClient(ec, kXMPErrSev_FileFatal, error);
+				break;// will never be here
+			}
+		case kBadQT_SmallOuter :	// Truncate file below.
+		case kBadQT_LargeOuter : 	// Truncate file below.
+			{
+				break;
+			}
+		default                : 
+			{
+				XMP_Error error ( kXMPErr_InternalFailure, "Invalid QuickTime error mode" );
+				XMPFileHandler::NotifyClient(ec, kXMPErrSev_FileFatal, error);
+			}
+	}
+
+	AtomInfo info;
+	XMP_Int64 headerSize;
+
+	// Process the top level atoms until an error is found.
+
+	qtFile->Rewind();
+
+	for ( ; fileSpace >= 8; fileSpace -= info.atomSize ) {
+
+		QTErrorMode atomStatus = GetAtomInfo ( qtFile, fileSpace, 0, &info );
+
+		headerSize = 8;	// ! Set this before checking atomStatus, used after the loop.
+		if ( info.hasLargeSize ) headerSize = 16;
+
+		if ( atomStatus != kBadQT_NoError ) break;
+		// If the atom size is less than header -case of kBadQT_SmallOuter
+		// If the atom size is more than left filespace -case of kBadQT_LargeOuter
+		if ( (info.atomSize < headerSize) || (info.atomSize > fileSpace ) ) break; 
+
+		XMP_Int64 dataSize = info.atomSize - headerSize;
+		qtFile->Seek ( dataSize, kXMP_SeekFromCurrent );
+
+	}
+	// Truncate only if the last box type was XMP boxes
+	// Refrain from truncating a known box as it 
+	// might have some useful data which is incomplete
+	if ( fileSpace < 8 ||
+		 ! ISOMedia::IsKnownBoxType ( info.atomType ) || 
+		 ((info.atomType == ISOMedia::k_uuid) && IsXMPUUID(qtFile,info.atomSize-headerSize,true)) ||
+		  (info.atomType == ISOMedia::k_XMP_)
+		 ){
+		
+		XMP_Error error ( kXMPErr_BadFileFormat,"Truncate outer EOF Garbage" );
+		XMPFileHandler::NotifyClient(ec, kXMPErrSev_Recoverable, error);
+		// Truncate the file. If fileSpace >= 8 then the loop exited early due to a bad atom, seek back
+		// to the atom's start. Otherwise, the loop exited because no more atoms are possible, no seek.
+
+		if ( fileSpace >= 8 ) qtFile->Seek ( -headerSize, kXMP_SeekFromCurrent );
+		XMP_Int64 currPos = qtFile->Offset();
+		qtFile->Truncate ( currPos );
+	}
+	else{
+
+		XMP_Error error ( kXMPErr_BadFileFormat,"Missing box Data at EOF" );
+		XMPFileHandler::NotifyClient(ec, kXMPErrSev_FileFatal, error);
+	}
+
+}	// AttemptFileRepair
+
+// =================================================================================================
+// CheckQTFileStructure
+// ====================
+
+static void CheckQTFileStructure ( XMPFileHandler * thiz,bool doRepair, GenericErrorCallback * ec )
+{
+	XMPFiles * parent = thiz->parent;
+	XMP_IO* fileRef  = parent->ioRef;
+	XMP_Int64 fileSize = fileRef->Length();
+
+	// Check the basic file structure and try to repair if asked.
+
+	fileRef->Rewind();
+	QTErrorMode status = CheckAtomList ( fileRef, fileSize, 0 );
+
+	if ( status != kBadQT_NoError ) {
+		if ( doRepair || (status == kBadQT_SmallInner) || (status == kBadQT_SmallOuter) ) {
+			AttemptFileRepair ( fileRef, fileSize, status,ec );	// Will throw if the attempt fails.
+		} else if ( status != kBadQT_SmallInner ) {
+			//don't truncate Large Outer EOF garbage unless the client wants it to
+			// Clients can pass their intent by setting the flag kXMPFiles_OpenRepairFile
+			XMP_Error error ( kXMPErr_BadFileFormat,"Ill-formed QuickTime file" );
+			XMPFileHandler::NotifyClient(ec, kXMPErrSev_FileFatal, error);
+		} 
+	}
+
+}	// CheckQTFileStructure;
+
+// =================================================================================================
+// CheckFinalBox
+// =============
+//
+// Before appending anything new, check if the final top level box has a "to EoF" length. If so, fix
+// it to have an explicit length.
+
+static void CheckFinalBox ( XMP_IO* fileRef, XMP_AbortProc abortProc, void * abortArg )
+{
+	const bool checkAbort = (abortProc != 0);
+
+	XMP_Uns64 fileSize = fileRef->Length();
+
+	// Find the last 2 boxes in the file. Need the previous to last in case it is an Apple 'wide' box.
+
+	XMP_Uns64 prevPos, lastPos, nextPos;
+	ISOMedia::BoxInfo prevBox, lastBox;
+	XMP_Uns8 buffer [16];	// Enough to create an extended header.
+
+	memset ( &prevBox, 0, sizeof(prevBox) );	// AUDIT: Using sizeof(prevBox) is safe.
+	memset ( &lastBox, 0, sizeof(lastBox) );	// AUDIT: Using sizeof(lastBox) is safe.
+	prevPos = lastPos = nextPos = 0;
+	while ( nextPos != fileSize ) {
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "MPEG4_MetaHandler::CheckFinalBox - User abort", kXMPErr_UserAbort );
+		}
+		prevBox = lastBox;
+		prevPos = lastPos;
+		lastPos = nextPos;
+		nextPos = ISOMedia::GetBoxInfo ( fileRef, lastPos, fileSize, &lastBox, true /* throw errors */ );
+	}
+
+	// See if the last box is valid and has a "to EoF" size.
+
+	if ( lastBox.headerSize < 8 ) XMP_Throw ( "MPEG-4 final box is invalid", kXMPErr_EnforceFailure );
+	fileRef->Seek ( lastPos, kXMP_SeekFromStart );
+	fileRef->Read ( buffer, 4 );
+	XMP_Uns64 lastSize = GetUns32BE ( &buffer[0] );	// ! Yes, the file has a 32-bit value.
+	if ( lastSize != 0 ) return;
+
+	// Have a final "to EoF" box, try to write the explicit size.
+
+	lastSize = lastBox.headerSize + lastBox.contentSize;
+	if ( lastSize <= 0xFFFFFFFFUL ) {
+
+		// Fill in the 32-bit exact size.
+		PutUns32BE ( (XMP_Uns32)lastSize, &buffer[0] );
+		fileRef->Seek ( lastPos, kXMP_SeekFromStart );
+		fileRef->Write ( buffer, 4 );
+
+	} else {
+
+		// Try to convert to using an extended header.
+
+		if ( (prevBox.boxType != ISOMedia::k_wide) || (prevBox.headerSize != 8) || (prevBox.contentSize != 0) ) {
+			XMP_Throw ( "Can't expand final box header", kXMPErr_EnforceFailure );
+		}
+		XMP_Assert ( prevPos == (lastPos - 8) );
+
+		PutUns32BE ( 1, &buffer[0] );
+		PutUns32BE ( lastBox.boxType, &buffer[4] );
+		PutUns64BE ( lastSize, &buffer[8] );
+		fileRef->Seek ( prevPos, kXMP_SeekFromStart );
+		fileRef->Write ( buffer, 16 );
+
+	}
+
+}	// CheckFinalBox
+
+// =================================================================================================
+// WriteBoxHeader
+// ==============
+
+static void WriteBoxHeader ( XMP_IO* fileRef, XMP_Uns32 boxType, XMP_Uns64 boxSize )
+{
+	XMP_Uns32 u32;
+	XMP_Uns64 u64;
+	XMP_Enforce ( boxSize >= 8 );	// The size must be the full size, not just the content.
+
+	if ( boxSize <= 0xFFFFFFFF ) {
+
+		u32 = MakeUns32BE ( (XMP_Uns32)boxSize );
+		fileRef->Write ( &u32, 4 );
+		u32 = MakeUns32BE ( boxType );
+		fileRef->Write ( &u32, 4 );
+
+	} else {
+
+		u32 = MakeUns32BE ( 1 );
+		fileRef->Write ( &u32, 4 );
+		u32 = MakeUns32BE ( boxType );
+		fileRef->Write ( &u32, 4 );
+		u64 = MakeUns64BE ( boxSize );
+		fileRef->Write ( &u64, 8 );
+
+	}
+
+}	// WriteBoxHeader
+
+// =================================================================================================
+// WipeBoxFree
+// ===========
+//
+// Change the box's type to 'free' (or create a 'free' box) and zero the content.
+
+static XMP_Uns8 kZeroes [64*1024];	// C semantics guarantee zero initialization.
+
+static void WipeBoxFree ( XMP_IO* fileRef, XMP_Uns64 boxOffset, XMP_Uns32 boxSize )
+{
+	if ( boxSize == 0 ) return;
+	XMP_Enforce ( boxSize >= 8 );
+
+	fileRef->Seek ( boxOffset, kXMP_SeekFromStart );
+	XMP_Uns32 u32;
+	u32 = MakeUns32BE ( boxSize );	// ! The actual size should not change, but might have had a long header.
+	fileRef->Write ( &u32, 4 );
+	u32 = MakeUns32BE ( ISOMedia::k_free );
+	fileRef->Write ( &u32, 4 );
+
+	XMP_Uns32 ioCount = sizeof ( kZeroes );
+	for ( boxSize -= 8; boxSize > 0; boxSize -= ioCount ) {
+		if ( ioCount > boxSize ) ioCount = boxSize;
+		fileRef->Write ( &kZeroes[0], ioCount );
+	}
+
+}	// WipeBoxFree
+
+// =================================================================================================
+// CreateFreeSpaceList
+// ===================
+
+struct SpaceInfo {
+	XMP_Uns64 offset, size;
+	SpaceInfo() : offset(0), size(0) {};
+	SpaceInfo ( XMP_Uns64 _offset, XMP_Uns64 _size ) : offset(_offset), size(_size) {};
+};
+
+typedef std::vector<SpaceInfo> FreeSpaceList;
+
+static void CreateFreeSpaceList ( XMP_IO* fileRef, XMP_Uns64 fileSize,
+								  XMP_Uns64 oldOffset, XMP_Uns32 oldSize, FreeSpaceList * spaceList )
+{
+	XMP_Uns64 boxPos=0, boxNext=0, adjacentFree=0;
+	ISOMedia::BoxInfo currBox;
+
+	fileRef->Rewind();
+	spaceList->clear();
+
+	for ( boxPos = 0; boxPos < fileSize; boxPos = boxNext ) {
+
+		boxNext = ISOMedia::GetBoxInfo ( fileRef, boxPos, fileSize, &currBox, true /* throw errors */ );
+		XMP_Uns64 currSize = currBox.headerSize + currBox.contentSize;
+
+		if ( (currBox.boxType == ISOMedia::k_free) ||
+			 (currBox.boxType == ISOMedia::k_skip) ||
+			 ((boxPos == oldOffset) && (currSize == oldSize)) ) {
+
+			if ( spaceList->empty() || (boxPos != adjacentFree) ) {
+				spaceList->push_back ( SpaceInfo ( boxPos, currSize ) );
+				adjacentFree = boxPos + currSize;
+			} else {
+				SpaceInfo * lastSpace = &spaceList->back();
+				lastSpace->size += currSize;
+			}
+
+		}
+
+	}
+
+}	// CreateFreeSpaceList
+
+// =================================================================================================
+// MPEG4_MetaHandler::CacheFileData
+// ================================
+//
+// There are 3 file variants: normal ISO Base Media, modern QuickTime, and classic QuickTime. The
+// XMP is placed differently between the ISO and two QuickTime forms, and there is different but not
+// colliding native metadata. The entire 'moov' subtree is cached, along with the top level 'uuid'
+// box of XMP if present.
+
+void MPEG4_MetaHandler::CacheFileData()
+{
+	XMP_Assert ( ! this->containsXMP );
+
+	XMPFiles * parent = this->parent;
+	XMP_OptionBits openFlags = parent->openFlags;
+
+	XMP_IO* fileRef  = parent->ioRef;
+
+	XMP_AbortProc abortProc  = parent->abortProc;
+	void *        abortArg   = parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	// First do some special case repair to QuickTime files, based on bad files in the wild.
+
+	const bool isUpdate = XMP_OptionIsSet ( openFlags, kXMPFiles_OpenForUpdate );
+	const bool doRepair = XMP_OptionIsSet ( openFlags, kXMPFiles_OpenRepairFile );
+
+	if ( isUpdate ) {
+		CheckQTFileStructure ( this, doRepair, &parent->errorCallback );	// Will throw for failure.
+	}
+
+	// Cache the top level 'moov' and 'uuid'/XMP boxes.
+
+	XMP_Uns64 fileSize = fileRef->Length();
+
+	XMP_Uns64 boxPos, boxNext;
+	ISOMedia::BoxInfo currBox;
+
+	bool xmpOnly = XMP_OptionIsSet ( openFlags, kXMPFiles_OpenOnlyXMP );
+	bool haveISOFile = (this->fileMode == MOOV_Manager::kFileIsNormalISO);
+
+	bool uuidFound = (! haveISOFile);			// Ignore the XMP 'uuid' box for QuickTime files.
+	bool moovIgnored = (xmpOnly & haveISOFile);	// Ignore the 'moov' box for XMP-only ISO files.
+	bool moovFound = moovIgnored;
+
+	for ( boxPos = 0; boxPos < fileSize; boxPos = boxNext ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "MPEG4_MetaHandler::CacheFileData - User abort", kXMPErr_UserAbort );
+		}
+
+
+		boxNext = ISOMedia::GetBoxInfo ( fileRef, boxPos, fileSize, &currBox );
+
+		if ( (! moovFound) && (currBox.boxType == ISOMedia::k_moov) ) {
+
+			XMP_Uns64 fullMoovSize = currBox.headerSize + currBox.contentSize;
+			if ( fullMoovSize > moovBoxSizeLimit ) {	// From here on we know 32-bit offsets are safe.
+				XMP_Throw ( "Oversize 'moov' box", kXMPErr_EnforceFailure );
+			}
+
+			this->moovMgr.fullSubtree.assign ( (XMP_Uns32)fullMoovSize, 0 );
+			fileRef->Seek ( boxPos, kXMP_SeekFromStart );
+			fileRef->Read ( &this->moovMgr.fullSubtree[0], (XMP_Uns32)fullMoovSize );
+
+			this->moovBoxPos = boxPos;
+			this->moovBoxSize = (XMP_Uns32)fullMoovSize;
+			moovFound = true;
+			if ( uuidFound ) break;	// Exit the loop when both are found.
+
+		} else if ( (! uuidFound) && (currBox.boxType == ISOMedia::k_uuid) && IsXMPUUID(fileRef,currBox.contentSize) ) {
+
+			XMP_Uns64 fullUuidSize = currBox.headerSize + currBox.contentSize;
+			if ( fullUuidSize > moovBoxSizeLimit ) {	// From here on we know 32-bit offsets are safe.
+				XMP_Throw ( "Oversize XMP 'uuid' box", kXMPErr_EnforceFailure );
+			}
+
+			this->packetInfo.offset = boxPos + currBox.headerSize + 16;	// The 16 is for the UUID.
+			this->packetInfo.length = (XMP_Int32) (currBox.contentSize - 16);
+
+			this->xmpPacket.assign ( this->packetInfo.length, ' ' );
+			fileRef->ReadAll ( (void*)this->xmpPacket.data(), this->packetInfo.length );
+
+			this->xmpBoxPos = boxPos;
+			this->xmpBoxSize = (XMP_Uns32)fullUuidSize;
+			uuidFound = true;
+			if ( moovFound ) break;	// Exit the loop when both are found.
+
+		}
+
+	}
+
+	if ( (! moovFound) && (! moovIgnored) ){
+		XMP_Error error ( kXMPErr_BadFileFormat,"No 'moov' box" );
+		XMPFileHandler::NotifyClient(&parent->errorCallback, kXMPErrSev_FileFatal, error);
+	}
+
+}	// MPEG4_MetaHandler::CacheFileData
+
+// =================================================================================================
+// MPEG4_MetaHandler::ProcessXMP
+// =============================
+
+void MPEG4_MetaHandler::ProcessXMP()
+{
+	if ( this->processedXMP ) return;
+	this->processedXMP = true;	// Make sure only called once.
+
+	XMPFiles * parent = this->parent;
+	XMP_OptionBits openFlags = parent->openFlags;
+
+	bool xmpOnly = XMP_OptionIsSet ( openFlags, kXMPFiles_OpenOnlyXMP );
+	bool haveISOFile = (this->fileMode == MOOV_Manager::kFileIsNormalISO);
+
+	// Process the cached XMP (from the 'uuid' box) if that is all we want and this is an ISO file.
+
+	if ( xmpOnly & haveISOFile ) {
+
+		this->containsXMP = this->havePreferredXMP = (this->packetInfo.length != 0);
+
+		if ( this->containsXMP ) {
+			FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+			this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+			this->xmpObj.DeleteProperty ( kXMP_NS_XMP, "NativeDigests" );	// No longer used.
+		}
+
+		return;
+
+	}
+
+	// Parse the cached 'moov' subtree, parse the preferred XMP.
+
+	if ( this->moovMgr.fullSubtree.empty() ) {
+		XMP_Error error ( kXMPErr_BadFileFormat,"No 'moov' box" );
+		XMPFileHandler::NotifyClient(&parent->errorCallback, kXMPErrSev_FileFatal, error);
+	}
+	this->moovMgr.ParseMemoryTree ( this->fileMode );
+
+	if ( (this->xmpBoxPos == 0) || (! haveISOFile) ) {
+
+		// Look for the QuickTime moov/uuid/XMP_ box.
+
+		MOOV_Manager::BoxInfo xmpInfo;
+		MOOV_Manager::BoxRef  xmpRef = this->moovMgr.GetBox ( "moov/udta/XMP_", &xmpInfo );
+
+		if ( (xmpRef != 0) && (xmpInfo.contentSize != 0) ) {
+
+			this->xmpBoxPos = this->moovBoxPos + this->moovMgr.GetParsedOffset ( xmpRef );
+			this->packetInfo.offset = this->xmpBoxPos + this->moovMgr.GetHeaderSize ( xmpRef );
+			this->packetInfo.length = xmpInfo.contentSize;
+
+			this->xmpPacket.assign ( (char*)xmpInfo.content, this->packetInfo.length );
+			this->havePreferredXMP = (! haveISOFile);
+
+		}
+
+	}
+
+	if ( this->xmpBoxPos != 0 ) {
+		this->containsXMP = true;
+		FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+		this->xmpObj.DeleteProperty ( kXMP_NS_XMP, "NativeDigests" );	// No longer used.
+	}
+
+	// Import the non-XMP items. Do the imports in reverse priority order, last import wins!
+
+	MOOV_Manager::BoxInfo mvhdInfo;
+	MOOV_Manager::BoxRef  mvhdRef = this->moovMgr.GetBox ( "moov/mvhd", &mvhdInfo );
+	bool mvhdFound = ((mvhdRef != 0) && (mvhdInfo.contentSize != 0));
+
+	MOOV_Manager::BoxInfo udtaInfo;
+	MOOV_Manager::BoxRef  udtaRef = this->moovMgr.GetBox ( "moov/udta", &udtaInfo );
+	std::vector<MOOV_Manager::BoxInfo> cprtBoxes;
+
+	if ( udtaRef != 0 ) {
+		for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) {
+			MOOV_Manager::BoxInfo currInfo;
+			MOOV_Manager::BoxRef  currRef = this->moovMgr.GetNthChild ( udtaRef, i, &currInfo );
+			if ( currRef == 0 ) break;	// Sanity check, should not happen.
+			if ( currInfo.boxType != ISOMedia::k_cprt ) continue;
+			cprtBoxes.push_back ( currInfo );
+		}
+	}
+	bool cprtFound = (! cprtBoxes.empty());
+
+	bool tradQTFound = this->tradQTMgr.ParseCachedBoxes ( this->moovMgr );
+	bool tmcdFound = this->ParseTimecodeTrack();
+
+	if ( this->fileMode == MOOV_Manager::kFileIsNormalISO ) {
+
+		if ( mvhdFound )   this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj );
+		if ( cprtFound )   this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj );
+		if ( tmcdFound )   this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj );
+	} else {	// This is a QuickTime file, either traditional or modern.
+
+		if ( mvhdFound )   this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj );
+		if ( cprtFound )   this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj );
+		if ( tmcdFound | tradQTFound ) {
+			// Some of the timecode items are in the .../udta/�... set but handled by ImportTimecodeItems.
+			this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj );
+		}
+
+		this->containsXMP |= ImportCr8rItems ( this->moovMgr, &this->xmpObj );
+
+	}
+
+}	// MPEG4_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// MPEG4_MetaHandler::ParseTimecodeTrack
+// =====================================
+
+bool MPEG4_MetaHandler::ParseTimecodeTrack()
+{
+	MOOV_Manager::BoxInfo drefInfo;
+	MOOV_Manager::BoxRef drefRef = FindTimecode_dref ( this->moovMgr );
+	bool qtTimecodeIsExternal=false;
+	if( drefRef != 0 )
+	{
+		this->moovMgr.GetBoxInfo( drefRef , &drefInfo );
+		// After dref atom in a QT file we should only 
+		// proceed further to check the Data refernces 
+		// if the total size of the content is greater
+		// than 8 bytes which suggests that there is atleast
+		// one data reference to check for external references.
+		if ( drefInfo.contentSize>8)
+		{
+			XMP_Uns32 noOfDrefs=GetUns32BE(drefInfo.content+4);
+			if(noOfDrefs>0)
+			{
+				const XMP_Uns8* dataReference = drefInfo.content + 8;
+				const XMP_Uns8* nextDataref   = 0;
+				const XMP_Uns8* boxlimit      = drefInfo.content + drefInfo.contentSize;
+				ISOMedia::BoxInfo dataRefernceInfo;
+				while(noOfDrefs--)
+				{
+					nextDataref= ISOMedia::GetBoxInfo( dataReference , boxlimit, 
+						&dataRefernceInfo);
+					//The content atleast contains the flag and some data
+					if ( dataRefernceInfo.contentSize > 4 )
+					{
+						if (dataRefernceInfo.boxType==ISOMedia::k_alis &&
+							*((XMP_Uns8*)(dataReference + dataRefernceInfo.headerSize + 4)) !=1 )
+						{
+							qtTimecodeIsExternal=true;
+							break;
+						}
+					}
+					dataReference=nextDataref;
+				}
+			}
+		}
+	}
+
+	MOOV_Manager::BoxRef stblRef = FindTimecode_stbl ( this->moovMgr );
+	if ( stblRef == 0 ) return false;
+
+	// Find the .../stbl/stsd box and process the first table entry.
+
+	MOOV_Manager::BoxInfo stsdInfo;
+	MOOV_Manager::BoxRef  stsdRef;
+
+	stsdRef = this->moovMgr.GetTypeChild ( stblRef, ISOMedia::k_stsd, &stsdInfo );
+	if ( stsdRef == 0 ) return false;
+	if ( stsdInfo.contentSize < (8 + sizeof ( MOOV_Manager::Content_stsd_entry )) ) return false;
+	if ( GetUns32BE ( stsdInfo.content + 4 ) == 0 ) return false;	// Make sure the entry count is non-zero.
+
+	const MOOV_Manager::Content_stsd_entry * stsdRawEntry = (MOOV_Manager::Content_stsd_entry*) (stsdInfo.content + 8);
+
+	XMP_Uns32 stsdEntrySize = GetUns32BE ( &stsdRawEntry->entrySize );
+	if ( stsdEntrySize > (stsdInfo.contentSize - 4) ) stsdEntrySize = stsdInfo.contentSize - 4;
+	if ( stsdEntrySize < sizeof ( MOOV_Manager::Content_stsd_entry ) ) return false;
+
+	XMP_Uns32 stsdEntryFormat = GetUns32BE ( &stsdRawEntry->format );
+	if ( stsdEntryFormat != ISOMedia::k_tmcd ) return false;
+
+	// If frame duration is zero it means tmcd sample is invalid
+	if(GetUns32BE(&stsdRawEntry->frameDuration)==0)
+		return false;
+
+	this->tmcdInfo.timeScale = GetUns32BE ( &stsdRawEntry->timeScale );
+	this->tmcdInfo.frameDuration = GetUns32BE ( &stsdRawEntry->frameDuration );
+
+	double floatCount = (double)this->tmcdInfo.timeScale / (double)this->tmcdInfo.frameDuration;
+	XMP_Uns8 expectedCount = (XMP_Uns8) (floatCount + 0.5);
+	if( expectedCount == 0 )	return false;
+	if ( expectedCount != stsdRawEntry->frameCount ) {
+		double countRatio = (double)stsdRawEntry->frameCount / (double)expectedCount;
+		this->tmcdInfo.timeScale = (XMP_Uns32) (((double)this->tmcdInfo.timeScale * countRatio) + 0.5);
+	}
+
+	XMP_Uns32 flags = GetUns32BE ( &stsdRawEntry->flags );
+	this->tmcdInfo.isDropFrame = flags & 0x1;
+
+	// Look for a trailing 'name' box on the first stsd table entry.
+
+	XMP_Uns32 stsdTrailerSize = stsdEntrySize - sizeof ( MOOV_Manager::Content_stsd_entry );
+	if ( stsdTrailerSize > 8 ) {	// Room for a non-empty 'name' box?
+
+		const XMP_Uns8 * trailerStart = stsdInfo.content + 8 + sizeof ( MOOV_Manager::Content_stsd_entry );
+		const XMP_Uns8 * trailerLimit = trailerStart + stsdTrailerSize;
+		const XMP_Uns8 * trailerPos;
+		const XMP_Uns8 * trailerNext;
+		ISOMedia::BoxInfo trailerInfo;
+
+		for ( trailerPos = trailerStart; trailerPos < trailerLimit; trailerPos = trailerNext ) {
+
+			trailerNext = ISOMedia::GetBoxInfo ( trailerPos, trailerLimit, &trailerInfo );
+
+			if ( trailerInfo.boxType == ISOMedia::k_name ) {
+
+				this->tmcdInfo.nameOffset = (XMP_Uns32) (trailerPos - stsdInfo.content);
+
+				if ( trailerInfo.contentSize > 4 ) {
+
+					XMP_Uns16 textLen = GetUns16BE ( trailerPos + trailerInfo.headerSize );
+					this->tmcdInfo.macLang = GetUns16BE ( trailerPos + trailerInfo.headerSize + 2 );
+
+					if ( trailerInfo.contentSize >= (XMP_Uns64)(textLen + 4) ) {
+						const char * textPtr = (char*) (trailerPos + trailerInfo.headerSize + 4);
+						this->tmcdInfo.macName.assign ( textPtr, textLen );
+					}
+
+				}
+
+				break;	// Done after finding the first 'name' box.
+
+			}
+
+		}
+
+	}
+
+	// Find the timecode sample.
+	// Read the timecode only if we are sure that it is not External
+	// This way we never find stsdBox and ExportTimecodeItems and
+	// ImportTimecodeItems doesn't do anything with timeCodeSample
+	// Also because sampleOffset is/remains zero UpdateFile doesn't
+	// update the timeCodeSample value
+	if(!qtTimecodeIsExternal)
+	{
+		XMP_Uns64 sampleOffset = 0;
+		MOOV_Manager::BoxInfo tempInfo;
+		MOOV_Manager::BoxRef  tempRef;
+
+		tempRef = this->moovMgr.GetTypeChild ( stblRef, ISOMedia::k_stsc, &tempInfo );
+		if ( tempRef == 0 ) return false;
+		if ( tempInfo.contentSize < (8 + sizeof ( MOOV_Manager::Content_stsc_entry )) ) return false;
+		if ( GetUns32BE ( tempInfo.content + 4 ) == 0 ) return false;	// Make sure the entry count is non-zero.
+
+		XMP_Uns32 firstChunkNumber = GetUns32BE ( tempInfo.content + 8 );	// Want first field of first entry.
+
+		tempRef = this->moovMgr.GetTypeChild ( stblRef, ISOMedia::k_stco, &tempInfo );
+
+		if ( tempRef != 0 ) {
+
+			if ( tempInfo.contentSize < (8 + 4) ) return false;
+			XMP_Uns32 stcoCount = GetUns32BE ( tempInfo.content + 4 );
+			if ( stcoCount < firstChunkNumber ) return false;
+			XMP_Uns32 * stcoPtr = (XMP_Uns32*) (tempInfo.content + 8);
+			sampleOffset = GetUns32BE ( &stcoPtr[firstChunkNumber-1] );	// ! Chunk number is 1-based.
+
+		} else {
+
+			tempRef = this->moovMgr.GetTypeChild ( stblRef, ISOMedia::k_co64, &tempInfo );
+			if ( (tempRef == 0) || (tempInfo.contentSize < (8 + 8)) ) return false;
+			XMP_Uns32 co64Count = GetUns32BE ( tempInfo.content + 4 );
+			if ( co64Count < firstChunkNumber ) return false;
+			XMP_Uns64 * co64Ptr = (XMP_Uns64*) (tempInfo.content + 8);
+			sampleOffset = GetUns64BE ( &co64Ptr[firstChunkNumber-1] );	// ! Chunk number is 1-based.
+
+		}
+
+		if ( sampleOffset != 0 ) {	// Read the timecode sample.
+
+			XMPFiles_IO* localFile = 0;
+
+			if ( this->parent->ioRef == 0 ) {	// Local read-only files get closed in CacheFileData.
+				XMP_Assert ( this->parent->UsesLocalIO() );
+				localFile = XMPFiles_IO::New_XMPFiles_IO ( this->parent->GetFilePath().c_str(), Host_IO::openReadOnly, &this->parent->errorCallback);
+				XMP_Enforce ( localFile != 0 );
+				this->parent->ioRef = localFile;
+			}
+
+			this->parent->ioRef->Seek ( sampleOffset, kXMP_SeekFromStart  );
+			this->parent->ioRef->ReadAll ( &this->tmcdInfo.timecodeSample, 4 );
+			this->tmcdInfo.timecodeSample = MakeUns32BE ( this->tmcdInfo.timecodeSample );
+			if ( localFile != 0 ) {
+				localFile->Close();
+				delete localFile;
+				this->parent->ioRef = 0;
+			}
+
+		}
+	
+		// If this is a QT file, look for an edit list offset to add to the timecode sample. Look in the
+		// timecode track for an edts/elst box. The content is a UInt8 version, UInt8[3] flags, a UInt32
+		// entry count, and a sequence of UInt32 triples (trackDuration, mediaTime, mediaRate). Take
+		// mediaTime from the first entry, divide it by tmcdInfo.frameDuration, add that to
+		// tmcdInfo.timecodeSample.
+
+		bool isQT = (this->fileMode == MOOV_Manager::kFileIsModernQT) ||
+					(this->fileMode == MOOV_Manager::kFileIsTraditionalQT);
+
+		MOOV_Manager::BoxRef elstRef = 0;
+		if ( isQT ) elstRef = FindTimecode_elst ( this->moovMgr );
+		if ( elstRef != 0 ) {
+
+			MOOV_Manager::BoxInfo elstInfo;
+			this->moovMgr.GetBoxInfo ( elstRef, &elstInfo );
+		
+			if ( elstInfo.contentSize >= (4+4+12) ) {
+				XMP_Uns32 elstCount = GetUns32BE ( elstInfo.content + 4 );
+				if ( elstCount >= 1 ) {
+					XMP_Uns32 mediaTime = GetUns32BE ( elstInfo.content + (4+4+4) );
+					this->tmcdInfo.timecodeSample += (mediaTime / this->tmcdInfo.frameDuration);
+				}
+			}
+		
+		}
+
+		// Finally update this->tmcdInfo to remember (for update) that there is an OK timecode track.
+
+		this->tmcdInfo.stsdBoxFound = true;
+		this->tmcdInfo.sampleOffset = sampleOffset;
+	}
+	return true;
+
+}	// MPEG4_MetaHandler::ParseTimecodeTrack
+
+// =================================================================================================
+// MPEG4_MetaHandler::UpdateTopLevelBox
+// ====================================
+
+void MPEG4_MetaHandler::UpdateTopLevelBox ( XMP_Uns64 oldOffset, XMP_Uns32 oldSize,
+											const XMP_Uns8 * newBox, XMP_Uns32 newSize )
+{
+	if ( (oldSize == 0) && (newSize == 0) ) return;	// Sanity check, should not happen.
+
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_Uns64 oldFileSize = fileRef->Length();
+
+	XMP_AbortProc abortProc = this->parent->abortProc;
+	void *        abortArg  = this->parent->abortArg;
+
+	if ( newSize == oldSize ) {
+
+		// Trivial case, update the existing box in-place.
+		fileRef->Seek ( oldOffset, kXMP_SeekFromStart );
+		fileRef->Write ( newBox, oldSize );
+
+	} else if ( (oldOffset + oldSize) == oldFileSize ) {
+
+		// The old box was at the end, write the new and truncate the file if necessary.
+		fileRef->Seek ( oldOffset, kXMP_SeekFromStart );
+		fileRef->Write ( newBox, newSize );
+		fileRef->Truncate ( (oldOffset + newSize) );	// Does nothing if new size is bigger.
+
+	} else if ( (newSize < oldSize) && ((oldSize - newSize) >= 8) ) {
+
+		// The new size is smaller and there is enough room to create a free box.
+		fileRef->Seek ( oldOffset, kXMP_SeekFromStart );
+		fileRef->Write ( newBox, newSize );
+		WipeBoxFree ( fileRef, (oldOffset + newSize), (oldSize - newSize) );
+
+	} else {
+
+		// Look for a trailing free box with enough space. If not found, consider any free space.
+		// If still not found, append the new box and make the old one free.
+
+		ISOMedia::BoxInfo nextBoxInfo;
+		(void) ISOMedia::GetBoxInfo ( fileRef, (oldOffset + oldSize), oldFileSize, &nextBoxInfo, true /* throw errors */ );
+
+		XMP_Uns64 totalRoom = oldSize + nextBoxInfo.headerSize + nextBoxInfo.contentSize;
+
+		bool nextIsFree = (nextBoxInfo.boxType == ISOMedia::k_free) || (nextBoxInfo.boxType == ISOMedia::k_skip);
+		bool haveEnoughRoom = (newSize == totalRoom) ||
+							  ( (newSize < totalRoom) && ((totalRoom - newSize) >= 8) );
+
+		if ( nextIsFree & haveEnoughRoom ) {
+
+			fileRef->Seek ( oldOffset, kXMP_SeekFromStart );
+			fileRef->Write ( newBox, newSize );
+
+			if ( newSize < totalRoom ) {
+				// Don't wipe, at most 7 old bytes left, it will be covered by the free header.
+				WriteBoxHeader ( fileRef, ISOMedia::k_free, (totalRoom - newSize) );
+			}
+
+		} else {
+
+			// Create a list of all top level free space, including the old space as free. Use the
+			// earliest space that fits. If none, append.
+
+			FreeSpaceList spaceList;
+			CreateFreeSpaceList ( fileRef, oldFileSize, oldOffset, oldSize, &spaceList );
+
+			size_t freeSlot, limit;
+			for ( freeSlot = 0, limit = spaceList.size(); freeSlot < limit; ++freeSlot ) {
+				XMP_Uns64 freeSize = spaceList[freeSlot].size;
+				if ( (newSize == freeSize) || ( (newSize < freeSize) && ((freeSize - newSize) >= 8) ) ) break;
+			}
+
+			if ( freeSlot == spaceList.size() ) {
+
+				// No available free space, append the new box.
+				CheckFinalBox ( fileRef, abortProc, abortArg );
+				fileRef->ToEOF();
+				fileRef->Write ( newBox, newSize );
+				WipeBoxFree ( fileRef, oldOffset, oldSize );
+
+			} else {
+
+				// Use the available free space. Wipe non-overlapping parts of the old box. The old
+				// box is either included in the new space, or is fully disjoint.
+
+				SpaceInfo & newSpace = spaceList[freeSlot];
+
+				bool oldIsDisjoint = ((oldOffset + oldSize) <= newSpace.offset) ||		// Old is in front.
+									 ((newSpace.offset + newSpace.size) <= oldOffset);	// Old is behind.
+
+				XMP_Assert ( (newSize == newSpace.size) ||
+							 ( (newSize < newSpace.size) && ((newSpace.size - newSize) >= 8) ) );
+
+				XMP_Assert ( oldIsDisjoint ||
+							 ( (newSpace.offset <= oldOffset) &&
+							   ((oldOffset + oldSize) <= (newSpace.offset + newSpace.size)) ) /* old is included */ );
+
+				XMP_Uns64 newFreeOffset = newSpace.offset + newSize;
+				XMP_Uns64 newFreeSize   = newSpace.size - newSize;
+
+				fileRef->Seek ( newSpace.offset, kXMP_SeekFromStart );
+				fileRef->Write ( newBox, newSize );
+
+				if ( newFreeSize > 0 ) WriteBoxHeader ( fileRef, ISOMedia::k_free, newFreeSize );
+
+				if ( oldIsDisjoint ) {
+
+					WipeBoxFree ( fileRef, oldOffset, oldSize );
+
+				} else {
+
+					// Clear the exposed portion of the old box.
+
+					XMP_Uns64 zeroStart = newFreeOffset + 8;
+					if ( newFreeSize > 0xFFFFFFFF ) zeroStart += 8;
+					if ( oldOffset > zeroStart ) zeroStart = oldOffset;
+					XMP_Uns64 zeroEnd = newFreeOffset + newFreeSize;
+					if ( (oldOffset + oldSize) < zeroEnd ) zeroEnd = oldOffset + oldSize;
+
+					if ( zeroStart < zeroEnd ) {	// The new box might cover the old.
+						XMP_Assert ( (zeroEnd - zeroStart) <= (XMP_Uns64)oldSize );
+						XMP_Uns32 zeroSize = (XMP_Uns32) (zeroEnd - zeroStart);
+						fileRef->Seek ( zeroStart, kXMP_SeekFromStart );
+						for ( XMP_Uns32 ioCount = sizeof ( kZeroes ); zeroSize > 0; zeroSize -= ioCount ) {
+							if ( ioCount > zeroSize ) ioCount = zeroSize;
+							fileRef->Write ( &kZeroes[0], ioCount );
+						}
+					}
+
+				}
+
+			}
+
+		}
+
+	}
+
+}	// MPEG4_MetaHandler::UpdateTopLevelBox
+
+// =================================================================================================
+// AdjustOffset
+// ============
+//
+// A utility for OptimizeFileLayout, adjusts a 'stco' or 'co64' table entry for the new layout. The
+// map is keyed by the original box's last content offset, so that map.lower_bound does what we want.
+
+struct LayoutInfo {
+	XMP_Uns32 boxType;
+	XMP_Uns64 boxSize;	// The full size, including the header.
+	XMP_Uns64 oldOffset, newOffset;
+	LayoutInfo() : boxType(0), boxSize(0), oldOffset(0), newOffset(0) {};
+	LayoutInfo ( XMP_Uns32 type, XMP_Uns64 size, XMP_Uns64 offset )
+		: boxType(type), boxSize(size), oldOffset(offset), newOffset(0) {};
+};
+
+typedef std::vector < LayoutInfo > LayoutVector;
+typedef std::map < XMP_Uns64, LayoutInfo* > LayoutMap;
+
+static XMP_Uns64 AdjustOffset ( XMP_Uns64 oldOffset, const LayoutMap & newMap , GenericErrorCallback * ec)
+{
+
+	LayoutMap::const_iterator mapEntry = newMap.lower_bound ( oldOffset );
+	if ( (mapEntry == newMap.end()) || (oldOffset < mapEntry->second->oldOffset) ) {
+		XMP_Error error ( kXMPErr_BadFileFormat,"Offset from 'stco' or 'co64' is not into kept box" );
+		XMPFileHandler::NotifyClient(ec, kXMPErrSev_FileFatal, error);
+	}
+
+	XMP_Assert ( (mapEntry->second->oldOffset <= oldOffset) &&
+				 (oldOffset <= (mapEntry->second->oldOffset + mapEntry->second->boxSize)) );
+
+	return mapEntry->second->newOffset + (oldOffset - mapEntry->second->oldOffset);
+
+}	// AdjustOffset
+
+// =================================================================================================
+// MPEG4_MetaHandler::OptimizeFileLayout
+// =====================================
+//
+// Make sure the file is acceptable for streaming use: the 'moov' and XMP 'uuid' boxes must be
+// before any 'mdat' box, other top level boxes after 'mdat' are accepted. If the file needs
+// optimization, it is fully rewritten in this order: 'ftyp' (if ISO), 'moov', XMP 'uuid', other
+// non-'mdat', all 'mdat' boxes. Top level 'free' and 'skip' boxes will be removed. Offsets in the
+// 'stco' and 'co64' boxes will be adjusted.
+
+void MPEG4_MetaHandler::OptimizeFileLayout()
+{
+	XMP_IO* originalFile = this->parent->ioRef;
+	XMP_Uns64 originalSize = originalFile->Length();
+
+	XMP_AbortProc abortProc  = parent->abortProc;
+	void *        abortArg   = parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_Uns64 currPos, nextPos;
+	ISOMedia::BoxInfo currBox;
+
+	size_t boxCount = 0;
+	size_t moovIndex = 0, xmpIndex = 0;
+
+	// Go through the top level boxes to see if the file layout needs to be optimized. Look until
+	// we find both the 'moov' and XMP 'uuid' boxes, saving their relative index in the file.
+
+	bool needsOptimization = false;
+	bool moovFound = false, xmpFound = false, mdatFound = false;
+
+	for ( currPos = 0; currPos < originalSize; currPos = nextPos ) {
+
+		nextPos = ISOMedia::GetBoxInfo ( originalFile, currPos, originalSize, &currBox );
+		if ( (currBox.boxType == ISOMedia::k_free) ||
+			 (currBox.boxType == ISOMedia::k_skip) ||
+			 (currBox.boxType == ISOMedia::k_wide) ) continue;
+
+		++boxCount;	// ! Must be counted for all, continue statements below skip an end of loop increment.
+
+		if ( currBox.boxType == ISOMedia::k_mdat ) {
+
+			mdatFound = true;
+			XMP_Assert ( (! moovFound) | (! xmpFound) );	// The other cases should be exiting.
+
+		} else if ( currBox.boxType == ISOMedia::k_moov ) {
+
+			moovFound = true;
+			moovIndex = boxCount-1;	// Need later for optimization.
+			needsOptimization = mdatFound;
+			if ( xmpFound ) break;	// Don't need to look further.
+
+		} else if ( currBox.boxType == ISOMedia::k_uuid && IsXMPUUID(originalFile,currBox.contentSize) ) {
+
+			xmpFound = true;
+			xmpIndex = boxCount-1;	// Need later for optimization.
+			needsOptimization = mdatFound;
+			if ( moovFound ) break;	// Don't need to look further.
+
+		}
+
+	}
+
+	if ( ! needsOptimization ) return;
+
+	// The file needs to be optimized. Make sure that a file over 4 GB has 'co64', not 'stco' boxes.
+	// These are needed to hold 64-bit offsets. We don't go to the effort of changing from 'stco'
+	// to 'co64', the file needs to be OK from the start. (Yes, this eliminates a marginal case of
+	// a file growing beyond 4 GB due to metadata growth.)
+
+	if ( originalSize >= 0xFFFFFFFF ) {
+
+		MOOV_Manager::BoxRef  moovRef, trakRef, tempRef, stcoRef;
+		MOOV_Manager::BoxInfo boxInfo;
+
+		moovRef = this->moovMgr.GetBox ( "moov", &boxInfo );
+		XMP_Enforce ( moovRef != 0 );
+
+		for ( size_t i = 0, limit = boxInfo.childCount; i < limit; ++i ) {
+
+			trakRef = this->moovMgr.GetNthChild ( moovRef, i, &boxInfo );
+			if ( boxInfo.boxType != ISOMedia::k_trak ) continue;
+
+			tempRef = this->moovMgr.GetTypeChild ( trakRef, ISOMedia::k_mdia, 0 );
+			if ( tempRef == 0 ) continue;
+			tempRef = this->moovMgr.GetTypeChild ( tempRef, ISOMedia::k_minf, 0 );
+			if ( tempRef == 0 ) continue;
+			tempRef = this->moovMgr.GetTypeChild ( tempRef, ISOMedia::k_stbl, 0 );
+			if ( tempRef == 0 ) continue;
+
+			stcoRef = this->moovMgr.GetTypeChild ( tempRef, ISOMedia::k_stco, 0 );
+			if ( stcoRef != 0 ) {
+				XMP_Error error ( kXMPErr_BadFileFormat,"Large MPEG-4 file must use 'co64' boxes" );
+				XMPFileHandler::NotifyClient(&parent->errorCallback, kXMPErrSev_FileFatal, error);
+			}
+
+		}
+
+	}
+
+	// Build a vector of info for the top level boxes, ignoring 'free', 'skip', and 'wide' boxes.
+	// Then determine the new offsets and create a map keyed by the new offset.
+	
+	// ! The box indices saved in the prior loop must match those in the vector built here!
+
+	LayoutVector fileBoxes;
+	LayoutMap optLayout;
+
+	for ( currPos = 0; currPos < originalSize; currPos = nextPos ) {
+		nextPos = ISOMedia::GetBoxInfo ( originalFile, currPos, originalSize, &currBox );
+		if ( (currBox.boxType == ISOMedia::k_free) ||
+			 (currBox.boxType == ISOMedia::k_skip) ||
+			 (currBox.boxType == ISOMedia::k_wide) ) continue;
+		--boxCount;	// For sanity check below.
+		fileBoxes.push_back ( LayoutInfo ( currBox.boxType, (currBox.headerSize + currBox.contentSize), currPos ) );
+	}
+
+	XMP_Assert ( boxCount == 0 );	// Must get the same count in both loops.
+	XMP_Assert ( fileBoxes.size() >= 2 );	// At least 'mdat', and 'moov' or XMP 'uuid'.
+	XMP_Assert ( (!moovFound) || (fileBoxes[moovIndex].boxType == ISOMedia::k_moov) );
+	XMP_Assert ( (!xmpFound) || (fileBoxes[xmpIndex].boxType == ISOMedia::k_uuid) );
+
+	size_t currIndex = 0, limit = fileBoxes.size();
+	XMP_Uns64 newSize = 0;
+
+	if ( fileBoxes[0].boxType == ISOMedia::k_ftyp ) {
+		optLayout.insert ( optLayout.end(), LayoutMap::value_type ( 0, &fileBoxes[0] ) );
+		newSize = fileBoxes[0].boxSize;
+		currIndex = 1;	// Keep the 'ftyp' box in front.
+	}
+
+	if ( moovFound ) {
+		optLayout.insert ( optLayout.end(), LayoutMap::value_type ( newSize, &fileBoxes[moovIndex] ) );
+		fileBoxes[moovIndex].newOffset = newSize;
+		newSize += fileBoxes[moovIndex].boxSize;
+	}
+
+	if ( xmpFound ) {
+		optLayout.insert ( optLayout.end(), LayoutMap::value_type ( newSize, &fileBoxes[xmpIndex] ) );
+		fileBoxes[xmpIndex].newOffset = newSize;
+		newSize += fileBoxes[xmpIndex].boxSize;
+	}
+
+	for ( ; currIndex < limit; ++currIndex ) {	// Add all of the other non-'mdat' boxes to the map.
+		if ( moovFound && (currIndex == moovIndex) ) continue;
+		if ( xmpFound && (currIndex == xmpIndex) ) continue;
+		if ( fileBoxes[currIndex].boxType == ISOMedia::k_mdat ) continue;
+		optLayout.insert ( optLayout.end(), LayoutMap::value_type ( newSize, &fileBoxes[currIndex] ) );
+		fileBoxes[currIndex].newOffset = newSize;
+		newSize += fileBoxes[currIndex].boxSize;
+	}
+
+	for ( currIndex = 0; currIndex < limit; ++currIndex ) {	// Add all of the 'mdat' boxes to the map.
+		if ( fileBoxes[currIndex].boxType != ISOMedia::k_mdat ) continue;
+		optLayout.insert ( optLayout.end(), LayoutMap::value_type ( newSize, &fileBoxes[currIndex] ) );
+		fileBoxes[currIndex].newOffset = newSize;
+		newSize += fileBoxes[currIndex].boxSize;
+	}
+	
+	// Adjust the progress tracking if necessary.
+	
+	XMP_ProgressTracker * progressTracker = this->parent->progressTracker;
+	if ( progressTracker != 0 ) {
+		XMP_Assert ( progressTracker->WorkInProgress() );
+		progressTracker->AddTotalWork ( (float) newSize );
+	}
+
+	// Create a temp file for the optimized layout, write it, update the offset tables.
+
+	XMP_IO* tempFile = originalFile->DeriveTemp();
+	XMP_Enforce ( tempFile != 0 );
+
+	// Iterate the map and write the new layout.
+
+	LayoutMap::iterator layoutPos = optLayout.begin();
+	LayoutMap::iterator layoutEnd = optLayout.end();
+
+	for ( ; layoutPos != layoutEnd; ++layoutPos ) {
+		LayoutInfo * currBox = layoutPos->second;
+		XMP_Assert ( (XMP_Int64)currBox->newOffset == tempFile->Length() );
+		originalFile->Seek ( currBox->oldOffset, kXMP_SeekFromStart );
+		XIO::Copy ( originalFile, tempFile, currBox->boxSize, abortProc, abortArg );
+	}
+
+	// Update the offset tables in the temp file. Create a layout map ordered by the last actual
+	// offset of the old box's content to enable fast lookup within AdjustOffset.
+
+	LayoutMap oldEndMap;
+	for ( size_t i = 0, limit = fileBoxes.size(); i < limit; ++i ) {
+		XMP_Uns64 oldEnd = fileBoxes[i].oldOffset + fileBoxes[i].boxSize - 1;	// ! Want the last actual offset!
+		oldEndMap.insert ( oldEndMap.end(), LayoutMap::value_type ( oldEnd, &fileBoxes[i] ) );
+	}
+
+	MOOV_Manager::BoxRef moovRef, trakRef, tempRef, stcoRef, co64Ref;
+	MOOV_Manager::BoxInfo boxInfo;
+
+	moovRef = this->moovMgr.GetBox ( "moov", &boxInfo );
+	XMP_Enforce ( moovRef != 0 );
+
+	for ( size_t i = 0, limit = boxInfo.childCount; i < limit; ++i ) {
+
+		trakRef = this->moovMgr.GetNthChild ( moovRef, i, &boxInfo );
+		if ( boxInfo.boxType != ISOMedia::k_trak ) continue;
+
+		tempRef = this->moovMgr.GetTypeChild ( trakRef, ISOMedia::k_mdia, 0 );
+		if ( tempRef == 0 ) continue;
+		tempRef = this->moovMgr.GetTypeChild ( tempRef, ISOMedia::k_minf, 0 );
+		if ( tempRef == 0 ) continue;
+		tempRef = this->moovMgr.GetTypeChild ( tempRef, ISOMedia::k_stbl, 0 );
+		if ( tempRef == 0 ) continue;
+
+		co64Ref = 0;
+		XMP_Uns32 entrySize = 4;
+		stcoRef = this->moovMgr.GetTypeChild ( tempRef, ISOMedia::k_stco, &boxInfo );
+		if ( stcoRef == 0 ) {
+			co64Ref = this->moovMgr.GetTypeChild ( tempRef, ISOMedia::k_co64, &boxInfo );
+			if ( co64Ref == 0 ) continue;
+			entrySize = 8;
+		}
+
+		XMP_Uns32 offsetCount = GetUns32BE ( boxInfo.content + 4 );
+		if ( boxInfo.contentSize < (4+4 + entrySize*offsetCount) ) {
+			XMP_Error error ( kXMPErr_BadFileFormat, "Bad 'stco' size or count" );
+			XMPFileHandler::NotifyClient(&parent->errorCallback, kXMPErrSev_FileFatal, error);
+		}
+
+		if ( stcoRef != 0 ) {
+
+			XMP_Uns64 stcoTableOffset = fileBoxes[moovIndex].newOffset +
+										(XMP_Uns64) this->moovMgr.GetParsedOffset ( stcoRef ) +
+										(XMP_Uns64) this->moovMgr.GetHeaderSize ( stcoRef ) + 4+4;
+			tempFile->Seek ( stcoTableOffset, kXMP_SeekFromStart );
+
+			XMP_Uns32 * rawOldU32 = (XMP_Uns32*) (boxInfo.content + 4+4);
+			for ( XMP_Uns32 i = 0; i < offsetCount; ++i, ++rawOldU32 ) {
+				XMP_Uns64 newOffset = AdjustOffset ( (XMP_Uns64)GetUns32BE(rawOldU32), oldEndMap,&parent->errorCallback );
+				XMP_Uns32 u32 = MakeUns32BE ( (XMP_Uns32)newOffset );
+				tempFile->Write ( &u32, 4 );
+			}
+
+		} else {
+
+			XMP_Uns64 co64TableOffset = fileBoxes[moovIndex].newOffset +
+										(XMP_Uns64) this->moovMgr.GetParsedOffset ( co64Ref ) +
+										(XMP_Uns64) this->moovMgr.GetHeaderSize ( co64Ref ) + 4+4;
+			tempFile->Seek ( co64TableOffset, kXMP_SeekFromStart );
+
+			XMP_Uns64 * rawOldU64 = (XMP_Uns64*) (boxInfo.content + 4+4);
+			for ( XMP_Uns32 i = 0; i < offsetCount; ++i, ++rawOldU64 ) {
+				XMP_Uns64 newOffset = AdjustOffset ( GetUns64BE(rawOldU64), oldEndMap,&parent->errorCallback );
+				XMP_Uns64 u64 = MakeUns64BE ( newOffset );
+				tempFile->Write ( &u64, 8 );
+			}
+
+		}
+
+	}
+
+	// Swap the temp and original files.
+
+	originalFile->AbsorbTemp();
+
+}	// MPEG4_MetaHandler::OptimizeFileLayout
+
+// =================================================================================================
+// MPEG4_MetaHandler::UpdateFile
+// =============================
+//
+// Revamp notes:
+// The 'moov' subtree and possibly the XMP 'uuid' box get updated. Compose the new copy of each and
+// see if it fits in existing space, incorporating adjacent 'free' boxes if necessary. If that won't
+// work, look for a sufficient 'free' box anywhere in the file. As a last resort, append the new copy.
+// Assume no location sensitive data within 'moov', i.e. no offsets into it. This lets it be moved
+// and its children freely rearranged.
+
+void MPEG4_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+
+	bool optimizeFileLayout = false;
+	if ( this->parent) 
+	{
+		optimizeFileLayout = XMP_OptionIsSet ( this->parent->openFlags, kXMPFiles_OptimizeFileLayout );
+	}
+
+	if ( ! this->needsUpdate ) {	// If needsUpdate is set then at least the XMP changed.
+		if ( optimizeFileLayout ) this->OptimizeFileLayout();
+		return;
+	}
+
+	this->needsUpdate = false;	// Make sure only called once.
+	XMP_Assert ( ! doSafeUpdate );	// This should only be called for "unsafe" updates.
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_IO* fileRef  = this->parent->ioRef;
+	XMP_Uns64   fileSize = fileRef->Length();
+
+	bool haveISOFile = (this->fileMode == MOOV_Manager::kFileIsNormalISO);
+
+	// Update the 'moov' subtree with exports from the XMP, but not the XMP itself (for QT files).
+
+	ExportMVHDItems ( this->xmpObj, &this->moovMgr );
+	ExportISOCopyrights ( this->xmpObj, &this->moovMgr );
+	ExportQuickTimeItems ( this->xmpObj, &this->tradQTMgr, &this->moovMgr );
+	ExportTimecodeItems ( this->xmpObj, &this->tmcdInfo, &this->tradQTMgr, &this->moovMgr );
+
+	if ( ! haveISOFile ) ExportCr8rItems ( this->xmpObj, &this->moovMgr );
+
+	// Set up progress tracking if necessary. At this point just include the XMP size, we don't
+	// know the 'moov' box size until later.
+
+	bool localProgressTracking = false;
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+	if ( progressTracker != 0 ) {
+		float xmpSize = (float)this->xmpPacket.size();
+		if ( progressTracker->WorkInProgress() ) {
+			progressTracker->AddTotalWork ( xmpSize );
+		} else {
+			localProgressTracking = true;
+			progressTracker->BeginWork ( xmpSize );
+		}
+	}
+
+	// Try to update the XMP in-place if that is all that changed, or if it is in a preferred 'uuid' box.
+	// The XMP has already been serialized by common code to the appropriate length. Otherwise, update
+	// the 'moov'/'udta'/'XMP_' box in the MOOV_Manager, or the 'uuid' XMP box in the file.
+
+	bool useUuidXMP = (this->fileMode == MOOV_Manager::kFileIsNormalISO);
+	bool inPlaceXMP = (this->xmpPacket.size() == (size_t)this->packetInfo.length) &&
+	                  ( (useUuidXMP & this->havePreferredXMP) || (! this->moovMgr.IsChanged()) );
+
+
+	if ( inPlaceXMP ) {
+
+		// Update the existing XMP in-place.
+		fileRef->Seek ( this->packetInfo.offset, kXMP_SeekFromStart );
+		fileRef->Write ( this->xmpPacket.c_str(), (XMP_Int32)this->xmpPacket.size() );
+
+	} else if ( useUuidXMP ) {
+
+		// Don't leave an old 'moov'/'udta'/'XMP_' box around.
+		MOOV_Manager::BoxRef udtaRef = this->moovMgr.GetBox ( "moov/udta", 0 );
+		if ( udtaRef != 0 ) this->moovMgr.DeleteTypeChild ( udtaRef, ISOMedia::k_XMP_ );
+
+	} else {
+
+		// Don't leave an old uuid XMP around (if we know about it).
+		if ( (! havePreferredXMP) && (this->xmpBoxSize != 0) ) {
+			WipeBoxFree ( fileRef, this->xmpBoxPos, this->xmpBoxSize );
+		}
+
+		// The udta form of XMP has just the XMP packet.
+		this->moovMgr.SetBox ( "moov/udta/XMP_", this->xmpPacket.c_str(), (XMP_Uns32)this->xmpPacket.size() );
+
+	}
+
+	// Update the 'moov' subtree if necessary, and finally update the timecode sample.
+
+	if ( this->moovMgr.IsChanged() ) {
+		this->moovMgr.UpdateMemoryTree();
+		if ( progressTracker != 0 ) {
+			progressTracker->AddTotalWork ( (float)this->moovMgr.fullSubtree.size() );
+		}
+		this->UpdateTopLevelBox ( moovBoxPos, moovBoxSize, &this->moovMgr.fullSubtree[0],
+								  (XMP_Uns32)this->moovMgr.fullSubtree.size() );
+	}
+
+	if ( this->tmcdInfo.sampleOffset != 0 ) {
+		fileRef->Seek ( this->tmcdInfo.sampleOffset, kXMP_SeekFromStart );
+		XMP_Uns32 sample = MakeUns32BE ( this->tmcdInfo.timecodeSample );
+		fileRef->Write ( &sample, 4 );
+	}
+
+	// Update the 'uuid' XMP box if necessary.
+
+	if ( useUuidXMP & (! inPlaceXMP) ) {
+
+		// The uuid form of XMP has the 16-byte UUID in front of the XMP packet. Form the complete
+		// box (including size/type header) for UpdateTopLevelBox.
+		RawDataBlock uuidBox;
+		XMP_Uns32 uuidSize = 4+4 + 16 + (XMP_Uns32)this->xmpPacket.size();
+		uuidBox.assign ( uuidSize, 0 );
+		PutUns32BE ( uuidSize, &uuidBox[0] );
+		PutUns32BE ( ISOMedia::k_uuid, &uuidBox[4] );
+		memcpy ( &uuidBox[8], ISOMedia::k_xmpUUID, 16 );
+		memcpy ( &uuidBox[24], this->xmpPacket.c_str(), this->xmpPacket.size() );
+		this->UpdateTopLevelBox ( this->xmpBoxPos, this->xmpBoxSize, &uuidBox[0], uuidSize );
+
+	}
+
+	// Finally, optimize the file layout if asked.
+	if ( optimizeFileLayout ) this->OptimizeFileLayout();
+
+	if ( localProgressTracking ) progressTracker->WorkComplete();
+
+}	// MPEG4_MetaHandler::UpdateFile
+
+// =================================================================================================
+// MPEG4_MetaHandler::WriteTempFile
+// ================================
+//
+// Since the XMP and legacy is probably a miniscule part of the entire file, and since we can't
+// change the offset of most of the boxes, just copy the entire original file to the temp file, then
+// do an in-place update to the temp file.
+
+void MPEG4_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_Assert ( this->needsUpdate );
+
+	XMP_IO* originalRef = this->parent->ioRef;
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+
+	tempRef->Rewind();
+	originalRef->Rewind();
+	if ( progressTracker != 0 ) progressTracker->BeginWork ( (float) originalRef->Length() );
+	XIO::Copy ( originalRef, tempRef, originalRef->Length(),
+			    this->parent->abortProc, this->parent->abortArg );
+
+	try {
+		this->parent->ioRef = tempRef;	// ! Fool UpdateFile into using the temp file.
+		this->UpdateFile ( false );
+		this->parent->ioRef = originalRef;
+	} catch ( ... ) {
+		this->parent->ioRef = originalRef;
+		throw;
+	}
+
+	if ( progressTracker != 0 ) progressTracker->WorkComplete();
+
+}	// MPEG4_MetaHandler::WriteTempFile
+
+// =================================================================================================
\ No newline at end of file
diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp
new file mode 100644
index 0000000..9ad06bb
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp
@@ -0,0 +1,98 @@
+#ifndef __MPEG4_Handler_hpp__
+#define __MPEG4_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "XMPFiles/source/FormatSupport/MOOV_Support.hpp"
+#include "XMPFiles/source/FormatSupport/QuickTime_Support.hpp"
+
+//  ================================================================================================
+/// \file MPEG4_Handler.hpp
+/// \brief File format handler for MPEG-4.
+///
+/// This header ...
+///
+//  ================================================================================================
+
+extern XMPFileHandler * MPEG4_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool MPEG4_CheckFormat ( XMP_FileFormat format,
+								XMP_StringPtr  filePath,
+								XMP_IO*    fileRef,
+								XMPFiles *     parent );
+
+static const XMP_OptionBits kMPEG4_HandlerFlags = ( kXMPFiles_CanInjectXMP |
+													kXMPFiles_CanExpand |
+													kXMPFiles_CanRewrite |
+													kXMPFiles_PrefersInPlace |
+													kXMPFiles_CanReconcile |
+													kXMPFiles_AllowsOnlyXMP |
+													kXMPFiles_ReturnsRawPacket |
+													kXMPFiles_AllowsSafeUpdate |
+													kXMPFiles_CanNotifyProgress
+												  );
+
+class MPEG4_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+
+	MPEG4_MetaHandler ( XMPFiles * _parent );
+	virtual ~MPEG4_MetaHandler();
+
+	struct TimecodeTrackInfo {	// Info about a QuickTime timecode track.
+		bool stsdBoxFound, isDropFrame;
+		XMP_Uns32 timeScale;
+		XMP_Uns32 frameDuration;
+		XMP_Uns32 timecodeSample;
+		XMP_Uns64 sampleOffset;	// Absolute file offset of the timecode sample, 0 if none.
+		XMP_Uns32 nameOffset;	// The offset of the 'name' box relative to the 'stsd' box content.
+		XMP_Uns16   macLang;	// The Mac language code of the trailing 'name' box.
+		std::string macName;	// The text part of the trailing 'name' box, in macLang encoding.
+		TimecodeTrackInfo()
+			: stsdBoxFound(false), isDropFrame(false), timeScale(0), frameDuration(0),
+			  timecodeSample(0), sampleOffset(0), nameOffset(0), macLang(0) {};
+	};
+
+private:
+
+	MPEG4_MetaHandler() : fileMode(0), havePreferredXMP(false),
+						  xmpBoxPos(0), moovBoxPos(0), xmpBoxSize(0), moovBoxSize(0) {};	// Hidden on purpose.
+
+	bool ParseTimecodeTrack();
+
+	void UpdateTopLevelBox ( XMP_Uns64 oldOffset, XMP_Uns32 oldSize, const XMP_Uns8 * newBox, XMP_Uns32 newSize );
+
+	void OptimizeFileLayout();
+
+	XMP_Uns8 fileMode;
+	bool havePreferredXMP;
+	XMP_Uns64 xmpBoxPos;	// The file offset of the XMP box (the size field, not the content).
+	XMP_Uns64 moovBoxPos;	// The file offset of the 'moov' box (the size field, not the content).
+	XMP_Uns32 xmpBoxSize, moovBoxSize;	// The full size of the boxes, not just the content.
+
+	MOOV_Manager moovMgr;
+	TradQT_Manager tradQTMgr;
+
+	TimecodeTrackInfo tmcdInfo;
+
+};	// MPEG4_MetaHandler
+
+// =================================================================================================
+
+#endif // __MPEG4_Handler_hpp__
diff --git a/XMPFiles/source/FileHandlers/Makefile.am b/XMPFiles/source/FileHandlers/Makefile.am
new file mode 100644
index 0000000..44a3232
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Makefile.am
@@ -0,0 +1,73 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+
+noinst_LTLIBRARIES = libxmpfilehandlers.la
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-Wall @XMPCORE_CPPFLAGS@
+
+
+libxmpfilehandlers_la_SOURCES = \
+AIFF_Handler.cpp AIFF_Handler.hpp\
+ASF_Handler.cpp ASF_Handler.hpp\
+AVCHD_Handler.cpp AVCHD_Handler.hpp\
+Basic_Handler.cpp Basic_Handler.hpp\
+FLV_Handler.cpp FLV_Handler.hpp\
+InDesign_Handler.cpp InDesign_Handler.hpp\
+JPEG_Handler.cpp JPEG_Handler.hpp\
+MP3_Handler.cpp MP3_Handler.hpp\
+MPEG2_Handler.cpp MPEG2_Handler.hpp \
+MPEG4_Handler.cpp MPEG4_Handler.hpp \
+P2_Handler.cpp P2_Handler.hpp\
+PNG_Handler.cpp PNG_Handler.hpp\
+PostScript_Handler.cpp PostScript_Handler.hpp\
+PSD_Handler.cpp PSD_Handler.hpp\
+RIFF_Handler.cpp RIFF_Handler.hpp \
+Scanner_Handler.cpp Scanner_Handler.hpp\
+SonyHDV_Handler.cpp SonyHDV_Handler.hpp\
+SWF_Handler.cpp SWF_Handler.hpp\
+TIFF_Handler.cpp TIFF_Handler.hpp\
+Trivial_Handler.cpp Trivial_Handler.hpp\
+UCF_Handler.cpp UCF_Handler.hpp\
+XDCAMEX_Handler.cpp XDCAMEX_Handler.hpp\
+XDCAM_Handler.cpp XDCAM_Handler.hpp\
+WAVE_Handler.cpp WAVE_Handler.hpp \
+GIF_Handler.cpp GIF_Handler.hpp \
+WEBP_Handler.cpp WEBP_Handler.hpp
+$(NULL)
+
diff --git a/XMPFiles/source/FileHandlers/Makefile.in b/XMPFiles/source/FileHandlers/Makefile.in
new file mode 100644
index 0000000..c1d32a5
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Makefile.in
@@ -0,0 +1,730 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFiles/source/FileHandlers
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libxmpfilehandlers_la_LIBADD =
+am_libxmpfilehandlers_la_OBJECTS = AIFF_Handler.lo ASF_Handler.lo \
+	AVCHD_Handler.lo Basic_Handler.lo FLV_Handler.lo \
+	InDesign_Handler.lo JPEG_Handler.lo MP3_Handler.lo \
+	MPEG2_Handler.lo MPEG4_Handler.lo P2_Handler.lo PNG_Handler.lo \
+	PostScript_Handler.lo PSD_Handler.lo RIFF_Handler.lo \
+	Scanner_Handler.lo SonyHDV_Handler.lo SWF_Handler.lo \
+	TIFF_Handler.lo Trivial_Handler.lo UCF_Handler.lo \
+	XDCAMEX_Handler.lo XDCAM_Handler.lo WAVE_Handler.lo \
+	GIF_Handler.lo WEBP_Handler.lo
+libxmpfilehandlers_la_OBJECTS = $(am_libxmpfilehandlers_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libxmpfilehandlers_la_SOURCES)
+DIST_SOURCES = $(libxmpfilehandlers_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libxmpfilehandlers.la
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-Wall @XMPCORE_CPPFLAGS@
+
+libxmpfilehandlers_la_SOURCES = \
+AIFF_Handler.cpp AIFF_Handler.hpp\
+ASF_Handler.cpp ASF_Handler.hpp\
+AVCHD_Handler.cpp AVCHD_Handler.hpp\
+Basic_Handler.cpp Basic_Handler.hpp\
+FLV_Handler.cpp FLV_Handler.hpp\
+InDesign_Handler.cpp InDesign_Handler.hpp\
+JPEG_Handler.cpp JPEG_Handler.hpp\
+MP3_Handler.cpp MP3_Handler.hpp\
+MPEG2_Handler.cpp MPEG2_Handler.hpp \
+MPEG4_Handler.cpp MPEG4_Handler.hpp \
+P2_Handler.cpp P2_Handler.hpp\
+PNG_Handler.cpp PNG_Handler.hpp\
+PostScript_Handler.cpp PostScript_Handler.hpp\
+PSD_Handler.cpp PSD_Handler.hpp\
+RIFF_Handler.cpp RIFF_Handler.hpp \
+Scanner_Handler.cpp Scanner_Handler.hpp\
+SonyHDV_Handler.cpp SonyHDV_Handler.hpp\
+SWF_Handler.cpp SWF_Handler.hpp\
+TIFF_Handler.cpp TIFF_Handler.hpp\
+Trivial_Handler.cpp Trivial_Handler.hpp\
+UCF_Handler.cpp UCF_Handler.hpp\
+XDCAMEX_Handler.cpp XDCAMEX_Handler.hpp\
+XDCAM_Handler.cpp XDCAM_Handler.hpp\
+WAVE_Handler.cpp WAVE_Handler.hpp \
+GIF_Handler.cpp GIF_Handler.hpp \
+WEBP_Handler.cpp WEBP_Handler.hpp
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFiles/source/FileHandlers/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFiles/source/FileHandlers/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libxmpfilehandlers.la: $(libxmpfilehandlers_la_OBJECTS) $(libxmpfilehandlers_la_DEPENDENCIES) $(EXTRA_libxmpfilehandlers_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libxmpfilehandlers_la_OBJECTS) $(libxmpfilehandlers_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AIFF_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ASF_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AVCHD_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Basic_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FLV_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GIF_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InDesign_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPEG_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MP3_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MPEG2_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MPEG4_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/P2_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PNG_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSD_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PostScript_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RIFF_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SWF_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Scanner_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SonyHDV_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TIFF_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Trivial_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UCF_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WAVE_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WEBP_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XDCAMEX_Handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XDCAM_Handler.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+$(NULL)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFiles/source/FileHandlers/P2_Handler.cpp b/XMPFiles/source/FileHandlers/P2_Handler.cpp
new file mode 100644
index 0000000..d99235d
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/P2_Handler.cpp
@@ -0,0 +1,1313 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+#include "source/IOUtils.hpp"
+
+#include "XMPFiles/source/FileHandlers/P2_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/P2_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PackageFormat_Support.hpp"
+
+#include <cmath>
+#include <sstream>
+
+using namespace std;
+
+// =================================================================================================
+/// \file P2_Handler.cpp
+/// \brief Folder format handler for P2.
+///
+/// This handler is for the P2 video format. This is a pseudo-package, visible files but with a very
+/// well-defined layout and naming rules. A typical P2 example looks like:
+///
+/// .../MyMovie
+/// 	CONTENTS/
+/// 		CLIP/
+/// 			0001AB.XML
+/// 			0001AB.XMP
+/// 			0002CD.XML
+/// 			0002CD.XMP
+/// 		VIDEO/
+/// 			0001AB.MXF
+/// 			0002CD.MXF
+/// 		AUDIO/
+/// 			0001AB00.MXF
+/// 			0001AB01.MXF
+/// 			0002CD00.MXF
+/// 			0002CD01.MXF
+/// 		ICON/
+/// 			0001AB.BMP
+/// 			0002CD.BMP
+/// 		VOICE/
+/// 			0001AB.WAV
+/// 			0002CD.WAV
+/// 		PROXY/
+/// 			0001AB.MP4
+/// 			0002CD.MP4
+///
+/// From the user's point of view, .../MyMovie contains P2 stuff, in this case 2 clips whose raw
+/// names are 0001AB and 0002CD. There may be mapping information for nicer clip names to the raw
+/// names, but that can be ignored for now. Each clip is stored as a collection of files, each file
+/// holding some specific aspect of the clip's data.
+///
+/// The P2 handler operates on clips. The path from the client of XMPFiles can be either a logical
+/// clip path, like ".../MyMovie/0001AB", or a full path to one of the files. In the latter case the
+/// handler must figure out the intended clip, it must not blindly use the named file.
+///
+/// Once the P2 structure and intended clip are identified, the handler only deals with the .XMP and
+/// .XML files in the CLIP folder. The .XMP file, if present, contains the XMP for the clip. The .XML
+/// file must be present to define the existance of the clip. It contains a variety of information
+/// about the clip, including some legacy metadata.
+///
+// =================================================================================================
+
+static const char * kContentFolderNames[] = { "CLIP", "VIDEO", "AUDIO", "ICON", "VOICE", "PROXY", 0 };
+static int kNumRequiredContentFolders = 6;	// All 6 of the above.
+
+static inline bool CheckContentFolderName ( const std::string & folderName )
+{
+	for ( int i = 0; kContentFolderNames[i] != 0; ++i ) {
+		if ( folderName == kContentFolderNames[i] ) return true;
+	}
+	return false;
+}
+
+// =================================================================================================
+// InternalMakeClipFilePath
+// ========================
+//
+// P2_CheckFormat can't use the member function.
+
+static void InternalMakeClipFilePath ( std::string * path,
+									   const std::string & rootPath,
+									   const std::string & clipName,
+									   XMP_StringPtr suffix )
+{
+
+	*path = rootPath;
+	*path += kDirChar;
+	*path += "CONTENTS";
+	*path += kDirChar;
+	*path += "CLIP";
+	*path += kDirChar;
+	*path += clipName;
+	*path += suffix;
+
+}	// InternalMakeClipFilePath
+
+// =================================================================================================
+// P2_CheckFormat
+// ==============
+//
+// This version does fairly simple checks. The top level folder (.../MyMovie) must have a child
+// folder called CONTENTS. This must have a subfolder called CLIP. It may also have subfolders
+// called VIDEO, AUDIO, ICON, VOICE, and PROXY. Any mixture of these additional folders is allowed,
+// but no other children are allowed in CONTENTS. The CLIP folder must contain a .XML file for the
+// desired clip. The name checks are case insensitive.
+//
+// The state of the string parameters depends on the form of the path passed by the client. If the
+// client passed a logical clip path, like ".../MyMovie/0001AB", the parameters are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - empty
+//   parentName - empty
+//   leafName   - "0001AB"
+// If the client passed a full file path, like ".../MyMovie/CONTENTS/VOICE/0001AB.WAV", they are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - "CONTENTS"
+//   parentName - "VOICE"
+//   leafName   - "0001AB"
+//
+// For most of the content files the base file name is the raw clip name. Files in the AUDIO and
+// VOICE folders have an extra 2 digits appended to the raw clip name. These must be trimmed.
+
+// ! The common code has shifted the gpName, parentName, and leafName strings to upper case. It has
+// ! also made sure that for a logical clip path the rootPath is an existing folder, and that the
+// ! file exists for a full file path.
+
+bool P2_CheckFormat ( XMP_FileFormat format,
+					  const std::string & rootPath,
+					  const std::string & gpName,
+					  const std::string & parentName,
+					  const std::string & leafName,
+					  XMPFiles * parent )
+{
+	Host_IO::AutoFolder aFolder;
+	std::string tempPath, childName;
+
+	std::string clipName = leafName;
+
+	// Do some basic checks on the gpName and parentName.
+
+	if ( gpName.empty() != parentName.empty() ) return false;	// Must be both empty or both non-empty.
+
+	if ( ! gpName.empty() ) {
+
+		if ( gpName != "CONTENTS" ) return false;
+		if ( ! CheckContentFolderName ( parentName ) ) return false;
+
+		if ( (parentName == "AUDIO") | (parentName == "VOICE") ) {
+			if ( clipName.size() < 3 ) return false;
+			clipName.erase ( clipName.size() - 2 );
+		}
+
+	}
+
+	tempPath = rootPath;
+	tempPath += kDirChar;
+	tempPath += "CONTENTS";
+	if ( Host_IO::GetFileMode ( tempPath.c_str() ) != Host_IO::kFMode_IsFolder ) return false;
+
+	aFolder.folder = Host_IO::OpenFolder ( tempPath.c_str() );
+	int numChildrenFound = 0;
+	std::string childPath;
+
+	while ( ( Host_IO::GetNextChild ( aFolder.folder, &childName ) && ( numChildrenFound < kNumRequiredContentFolders ) ) ) {	// Make sure the children of CONTENTS are legit.
+		if ( CheckContentFolderName ( childName ) ) {
+			childPath = tempPath;
+			childPath += kDirChar;
+			childPath += childName;
+			if ( Host_IO::GetFileMode ( childPath.c_str() ) != Host_IO::kFMode_IsFolder ) return false;
+			++numChildrenFound;
+		}
+	}
+	aFolder.Close();
+
+	// Make sure the clip's .XML file exists.
+
+	InternalMakeClipFilePath ( &tempPath, rootPath, clipName, ".XML" );
+	if ( Host_IO::GetFileMode ( tempPath.c_str() ) != Host_IO::kFMode_IsFile ) return false;
+
+	// Make a bogus path to pass the root path and clip name to the handler. A bit of a hack, but
+	// the only way to get info from here to there.
+
+
+	tempPath = rootPath;
+	tempPath += kDirChar;
+	tempPath += clipName;
+
+	size_t pathLen = tempPath.size() + 1;	// Include a terminating nul.
+	parent->tempPtr = malloc ( pathLen );
+	if ( parent->tempPtr == 0 ) XMP_Throw ( "No memory for P2 clip path", kXMPErr_NoMemory );
+	memcpy ( parent->tempPtr, tempPath.c_str(), pathLen );	// AUDIT: Safe, allocated above.
+
+	return true;
+
+}	// P2_CheckFormat
+
+// =================================================================================================
+
+static void* CreatePseudoClipPath ( const std::string & clientPath ) {
+
+	// Used to create the clip pseudo path when the CheckFormat function is skipped.
+	
+	std::string pseudoPath = clientPath;
+
+	size_t pathLen;
+	void* tempPtr = 0;
+	
+	if ( Host_IO::Exists ( pseudoPath.c_str() ) ) {
+	
+		// The client passed a physical path. The logical clip name is the leaf name, with the
+		// extension removed. Files in the AUDIO and VOICE folders have an extra 2 digits appended
+		// to the clip name. The movie root path ends two levels up.
+		
+		std::string clipName, parentName, ignored;
+		
+		XIO::SplitLeafName ( &pseudoPath, &clipName );	// Extract the logical clip name.
+		XIO::SplitFileExtension ( &clipName, &ignored );
+
+		XIO::SplitLeafName ( &pseudoPath, &parentName );	// Remove the 2 intermediate folder levels.
+		XIO::SplitLeafName ( &pseudoPath, &ignored );
+
+		if ( (parentName == "AUDIO") | (parentName == "VOICE") ) {
+			if ( clipName.size() >= 3 ) clipName.erase ( clipName.size() - 2 );
+		}
+		
+		pseudoPath += kDirChar;
+		pseudoPath += clipName;
+	
+	}
+
+	pathLen = pseudoPath.size() + 1;	// Include a terminating nul.
+	tempPtr = malloc ( pathLen );
+	if ( tempPtr == 0 ) XMP_Throw ( "No memory for P2 clip info", kXMPErr_NoMemory );
+	memcpy ( tempPtr, pseudoPath.c_str(), pathLen );
+	
+	return tempPtr;
+
+}	// CreatePseudoClipPath
+
+// =================================================================================================
+// P2_MetaHandlerCTor
+// ==================
+
+XMPFileHandler * P2_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new P2_MetaHandler ( parent );
+
+}	// P2_MetaHandlerCTor
+
+// =================================================================================================
+// P2_MetaHandler::P2_MetaHandler
+// ==============================
+
+P2_MetaHandler::P2_MetaHandler ( XMPFiles * _parent )
+{
+
+	this->parent = _parent;	// Inherited, can't set in the prefix.
+	this->handlerFlags = kP2_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	// Extract the root path and clip name from tempPtr.
+
+	if ( this->parent->tempPtr == 0 ) {
+		// The CheckFormat call might have been skipped.
+		this->parent->tempPtr = CreatePseudoClipPath ( this->parent->GetFilePath() );
+	}
+
+	this->rootPath.assign ( (char*) this->parent->tempPtr );
+	free ( this->parent->tempPtr );
+	this->parent->tempPtr = 0;
+
+	XIO::SplitLeafName ( &this->rootPath, &this->clipName );
+
+	std::string xmlPath;
+	if ( this->MakeClipFilePath ( &xmlPath, ".XML", true ) )
+	{
+		try 
+		{
+
+			p2ClipManager.ProcessClip(xmlPath);
+			std::string* clipnm = p2ClipManager.GetManagedClip()->GetClipName();
+			if ( clipnm !=0 )
+			{	
+				std::string newpath,leafname;
+				newpath = p2ClipManager.GetManagedClip()->GetXMPFilePath();
+				XIO::SplitLeafName(&newpath,&leafname);
+				if ( leafname == std::string(*clipnm+ ".XMP") )
+				{
+					this->clipName=*clipnm;
+				}
+			}
+		}
+		catch(...)
+		{
+		}
+	}
+
+}	// P2_MetaHandler::P2_MetaHandler
+
+// =================================================================================================
+// P2_MetaHandler::~P2_MetaHandler
+// ===============================
+
+P2_MetaHandler::~P2_MetaHandler()
+{
+
+	if ( this->parent->tempPtr != 0 ) {
+		free ( this->parent->tempPtr );
+		this->parent->tempPtr = 0;
+	}
+
+}	// P2_MetaHandler::~P2_MetaHandler
+
+// =================================================================================================
+// P2_MetaHandler::MakeClipFilePath
+// ================================
+
+bool P2_MetaHandler::MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile /* = false */ )
+{
+
+	InternalMakeClipFilePath ( path, this->rootPath, this->clipName, suffix );
+	if ( ! checkFile ) return true;
+	
+	return Host_IO::Exists ( path->c_str() );
+
+}	// P2_MetaHandler::MakeClipFilePath
+
+
+
+// =================================================================================================
+// P2_MetaHandler::SetXMPPropertyFromLegacyXML
+// ===========================================
+
+void P2_MetaHandler::SetXMPPropertyFromLegacyXML ( bool digestFound,
+												   XMP_VarString* refContext,
+												   XMP_StringPtr schemaNS,
+												   XMP_StringPtr propName,
+												   bool isLocalized )
+{
+
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( schemaNS, propName )) ) {
+
+		if ( refContext !=0 )
+		{
+			if ( isLocalized ) {
+				this->xmpObj.SetLocalizedText ( schemaNS, propName, "", "x-default", refContext->c_str(), kXMP_DeleteExisting );
+			} else {
+				this->xmpObj.SetProperty ( schemaNS, propName, refContext->c_str(), kXMP_DeleteExisting );
+			}
+			this->containsXMP = true;
+		}
+	}
+}	// P2_MetaHandler::SetXMPPropertyFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::SetXMPPropertyFromLegacyXML
+// ===========================================
+void P2_MetaHandler::SetXMPPropertyFromLegacyXML ( bool digestFound,
+												   XML_NodePtr legacyContext,
+												   XMP_StringPtr schemaNS,
+												   XMP_StringPtr propName,
+												   XMP_StringPtr legacyPropName,
+												   bool isLocalized )
+{
+	XMP_StringPtr p2NS = this->p2ClipManager.GetManagedClip()->GetP2RootNode()->ns.c_str();
+	XML_NodePtr legacyProp = legacyContext->GetNamedElement ( p2NS, legacyPropName );
+
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+		XMP_StringPtr legacyValue = legacyProp->GetLeafContentValue();
+
+		if ( ( legacyValue != 0 ) &&
+			 ( ( *legacyValue != 0 ) || (! this->xmpObj.DoesPropertyExist ( schemaNS, propName )) )) {
+			if ( isLocalized ) {
+				this->xmpObj.SetLocalizedText ( schemaNS, propName, "", "x-default", legacyValue, kXMP_DeleteExisting );
+			} else {
+				this->xmpObj.SetProperty ( schemaNS, propName, legacyValue, kXMP_DeleteExisting );
+			}
+			this->containsXMP = true;
+		}
+	}
+
+}
+// =================================================================================================
+// P2_MetaHandler::SetRelationsFromLegacyXML
+// =========================================
+
+void P2_MetaHandler::SetRelationsFromLegacyXML ( bool digestFound )
+{
+
+	P2_Clip* p2Clip=this->p2ClipManager.GetManagedClip();
+
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DC, "relation" )) ) {
+		
+		XMP_VarString* globalShotId = p2Clip->GetShotId() ;
+		std::string relationString ;
+		if ( ( globalShotId != 0 ) ) {
+
+			this->xmpObj.DeleteProperty ( kXMP_NS_DC, "relation" );
+			relationString = std::string("globalShotID:") + *globalShotId ;
+			this->xmpObj.AppendArrayItem ( kXMP_NS_DC, "relation", kXMP_PropArrayIsUnordered, relationString );
+			this->containsXMP = true;
+	
+			XMP_VarString* topId = p2Clip->GetTopClipId() ;
+			if ( topId != 0 ) {
+				relationString = std::string("topGlobalClipID:") + *topId ;
+				this->xmpObj.AppendArrayItem ( kXMP_NS_DC, "relation", kXMP_PropArrayIsUnordered, relationString );
+			}
+			XMP_VarString* prevId = p2Clip->GetPreviousClipId() ;
+			if ( prevId != 0 ) {
+				relationString = std::string("previousGlobalClipID:") + *prevId ;
+				this->xmpObj.AppendArrayItem ( kXMP_NS_DC, "relation", kXMP_PropArrayIsUnordered, relationString );
+			}
+			XMP_VarString* nextId = p2Clip->GetNextClipId() ;
+			if ( nextId != 0 ) {
+				relationString = std::string("nextGlobalClipID:") + *nextId ;
+				this->xmpObj.AppendArrayItem ( kXMP_NS_DC, "relation", kXMP_PropArrayIsUnordered, relationString );
+			}
+
+		}
+
+	}
+
+}	// P2_MetaHandler::SetRelationsFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::SetAudioInfoFromLegacyXML
+// =========================================
+
+void P2_MetaHandler::SetAudioInfoFromLegacyXML ( bool digestFound )
+{
+	P2_Clip* p2Clip = this->p2ClipManager.GetManagedClip() ;
+	XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+	XML_NodePtr legacyAudioContext = p2Clip->GetEssenceListNode();
+
+	if ( legacyAudioContext != 0 ) {
+
+		legacyAudioContext = legacyAudioContext->GetNamedElement ( p2NS, "Audio" );
+
+		if ( legacyAudioContext != 0 ) {
+
+			this->SetXMPPropertyFromLegacyXML ( digestFound, legacyAudioContext, kXMP_NS_DM, "audioSampleRate", "SamplingRate", false );
+
+			if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DM, "audioSampleType" )) ) {
+				XML_NodePtr legacyProp = legacyAudioContext->GetNamedElement ( p2NS, "BitsPerSample" );
+
+				if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+
+					const std::string p2BitsPerSample = legacyProp->GetLeafContentValue();
+					std::string dmSampleType;
+
+					if ( p2BitsPerSample == "16" ) {
+						dmSampleType = "16Int";
+					} else if ( p2BitsPerSample == "24" ) {
+						dmSampleType = "32Int";
+					}
+
+					if ( ! dmSampleType.empty() ) {
+						this->xmpObj.SetProperty ( kXMP_NS_DM, "audioSampleType", dmSampleType, kXMP_DeleteExisting );
+						this->containsXMP = true;
+					}
+
+				}
+
+			}
+
+		}
+
+	}
+
+}	// P2_MetaHandler::SetAudioInfoFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::SetVideoInfoFromLegacyXML
+// =========================================
+
+void P2_MetaHandler::SetVideoInfoFromLegacyXML ( bool digestFound )
+{
+	P2_Clip* p2Clip = this->p2ClipManager.GetManagedClip() ;
+	XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+	XML_NodePtr legacyVideoContext = p2Clip->GetEssenceListNode();
+
+	if ( legacyVideoContext != 0 ) {
+
+		legacyVideoContext = legacyVideoContext->GetNamedElement ( p2NS, "Video" );
+
+		if ( legacyVideoContext != 0 ) {
+			this->SetVideoFrameInfoFromLegacyXML ( legacyVideoContext, digestFound );
+			this->SetStartTimecodeFromLegacyXML ( legacyVideoContext, digestFound );
+			this->SetXMPPropertyFromLegacyXML ( digestFound, legacyVideoContext, kXMP_NS_DM, "videoFrameRate", "FrameRate", false );
+		}
+
+	}
+
+}	// P2_MetaHandler::SetVideoInfoFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::SetDurationFromLegacyXML
+// ========================================
+
+void P2_MetaHandler::SetDurationFromLegacyXML ( bool digestFound )
+{
+
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DM, "duration" )) ) {
+		
+		P2_SpannedClip* p2Clip=this->p2ClipManager.GetSpannedClip();
+		XMP_Uns32 dur = p2Clip->GetDuration();
+		XMP_VarString* editunit= p2Clip->GetEditUnit();
+
+		if ( ( dur != 0) && ( editunit != 0 ) ) {
+
+			ostringstream duration;
+			duration<<dur;
+			this->xmpObj.DeleteProperty ( kXMP_NS_DM, "duration" );
+			this->xmpObj.SetStructField ( kXMP_NS_DM, "duration",
+										  kXMP_NS_DM, "value", duration.str().c_str() );
+
+			this->xmpObj.SetStructField ( kXMP_NS_DM, "duration",
+										  kXMP_NS_DM, "scale", editunit->c_str() );
+			this->containsXMP = true;
+
+		}
+
+	}
+
+}	// P2_MetaHandler::SetDurationFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::SetVideoFrameInfoFromLegacyXML
+// ==============================================
+
+void P2_MetaHandler::SetVideoFrameInfoFromLegacyXML ( XML_NodePtr legacyVideoContext, bool digestFound )
+{
+
+	//	Map the P2 Codec field to various dynamic media schema fields.
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DM, "videoFrameSize" )) ) {
+		
+		P2_Clip* p2Clip = this->p2ClipManager.GetManagedClip() ;
+		XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+		XML_NodePtr legacyProp = legacyVideoContext->GetNamedElement ( p2NS, "Codec" );
+
+		if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+
+			const std::string p2Codec = legacyProp->GetLeafContentValue();
+			std::string dmPixelAspectRatio, dmVideoCompressor, dmWidth, dmHeight;
+
+			if ( p2Codec == "DV25_411" ) {
+				dmWidth = "720";
+				dmVideoCompressor = "DV25 4:1:1";
+			} else if ( p2Codec == "DV25_420" ) {
+				dmWidth = "720";
+				dmVideoCompressor = "DV25 4:2:0";
+			} else if ( p2Codec == "DV50_422" ) {
+				dmWidth = "720";
+				dmVideoCompressor = "DV50 4:2:2";
+			} else if ( ( p2Codec == "DV100_1080/59.94i" ) || ( p2Codec == "DV100_1080/50i" ) ) {
+				dmVideoCompressor = "DV100";
+				dmHeight = "1080";
+
+				if ( p2Codec == "DV100_1080/59.94i" ) {
+					dmWidth = "1280";
+					dmPixelAspectRatio = "3/2";
+				} else {
+					dmWidth = "1440";
+					dmPixelAspectRatio = "1920/1440";
+				}
+			} else if ( ( p2Codec == "DV100_720/59.94p" ) || ( p2Codec == "DV100_720/50p" ) ) {
+				dmVideoCompressor = "DV100";
+				dmHeight = "720";
+				dmWidth = "960";
+				dmPixelAspectRatio = "1920/1440";
+			} else if ( ( p2Codec.compare ( 0, 6, "AVC-I_" ) == 0 ) ) {
+
+				// This is AVC-Intra footage. The framerate and PAR depend on the "class" attribute in the P2 XML.
+				const XMP_StringPtr codecClass = legacyProp->GetAttrValue( "Class" );
+				if ( codecClass != 0 )
+					dmVideoCompressor = "AVC-Intra"; // initializing with default value
+				if ( XMP_LitMatch ( codecClass, "100" ) ) {
+
+						dmVideoCompressor = "AVC-Intra 100";
+						dmPixelAspectRatio = "1/1";
+
+					   if ( p2Codec.compare ( 6, 4, "1080" ) == 0 ) {
+						   dmHeight = "1080";
+						   dmWidth = "1920";
+					   } else if ( p2Codec.compare ( 6, 3, "720" ) == 0 ) {
+						   dmHeight = "720";
+						   dmWidth = "1280";
+					   }
+
+				} else if ( XMP_LitMatch ( codecClass, "50" ) ) {
+
+					dmVideoCompressor = "AVC-Intra 50";
+					dmPixelAspectRatio = "1920/1440";
+
+					if ( p2Codec.compare ( 6, 4, "1080" ) == 0 ) {
+						dmHeight = "1080";
+						dmWidth = "1440";
+					} else if ( p2Codec.compare ( 6, 3, "720" ) == 0 ) {
+						dmHeight = "720";
+						dmWidth = "960";
+					}
+
+				} else {
+					//	Unknown codec class -- we don't have enough info to determine the
+					//	codec, PAR, or aspect ratio
+					dmVideoCompressor = "AVC-Intra";
+				}
+			}
+
+			if ( dmWidth == "720" ) {
+
+				//	This is SD footage -- calculate the frame height and pixel aspect ratio using the legacy P2
+				//	FrameRate and AspectRatio fields.
+
+				legacyProp = legacyVideoContext->GetNamedElement ( p2NS, "FrameRate" );
+				if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+
+					const std::string p2FrameRate = legacyProp->GetLeafContentValue();
+
+					legacyProp = legacyVideoContext->GetNamedElement ( p2NS, "AspectRatio" );
+
+					if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+						const std::string p2AspectRatio = legacyProp->GetLeafContentValue();
+
+						if ( p2FrameRate == "50i" ) {
+							//	Standard Definition PAL.
+							dmHeight = "576";
+							if ( p2AspectRatio == "4:3" ) {
+								dmPixelAspectRatio = "768/702";
+							} else if ( p2AspectRatio == "16:9" ) {
+								dmPixelAspectRatio = "1024/702";
+							}
+						} else if ( p2FrameRate == "59.94i" ) {
+							//	Standard Definition NTSC.
+							dmHeight = "480";
+							if ( p2AspectRatio == "4:3" ) {
+								dmPixelAspectRatio = "10/11";
+							} else if ( p2AspectRatio == "16:9" ) {
+								dmPixelAspectRatio = "40/33";
+							}
+						}
+
+					}
+				}
+			}
+
+			if ( ! dmPixelAspectRatio.empty() ) {
+				this->xmpObj.SetProperty ( kXMP_NS_DM, "videoPixelAspectRatio", dmPixelAspectRatio, kXMP_DeleteExisting );
+				this->containsXMP = true;
+			}
+
+			if ( ! dmVideoCompressor.empty() ) {
+				this->xmpObj.SetProperty ( kXMP_NS_DM, "videoCompressor", dmVideoCompressor, kXMP_DeleteExisting );
+				this->containsXMP = true;
+			}
+
+			if ( ( ! dmWidth.empty() ) && ( ! dmHeight.empty() ) ) {
+				this->xmpObj.SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "w", dmWidth, 0 );
+				this->xmpObj.SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "h", dmHeight, 0 );
+				this->xmpObj.SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "unit", "pixel", 0 );
+				this->containsXMP = true;
+			}
+
+		}
+
+	}
+
+}	// P2_MetaHandler::SetVideoFrameInfoFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::SetStartTimecodeFromLegacyXML
+// =============================================
+
+void P2_MetaHandler::SetStartTimecodeFromLegacyXML ( XML_NodePtr legacyVideoContext, bool digestFound )
+{
+
+	//	Translate start timecode to the format specified by the dynamic media schema.
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DM, "startTimecode" )) ) {
+
+		P2_Clip* p2Clip = this->p2ClipManager.GetManagedClip() ;
+		XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+		XML_NodePtr legacyProp = legacyVideoContext->GetNamedElement ( p2NS, "StartTimecode" );
+
+		if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+
+			std::string p2StartTimecode = legacyProp->GetLeafContentValue();
+
+			legacyProp = legacyVideoContext->GetNamedElement ( p2NS, "FrameRate" );
+
+			if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+
+				const std::string p2FrameRate = legacyProp->GetLeafContentValue();
+				XMP_StringPtr p2DropFrameFlag = legacyProp->GetAttrValue ( "DropFrameFlag" );
+				if ( p2DropFrameFlag == 0 ) p2DropFrameFlag = "";	// Make tests easier.
+				std::string dmTimeFormat;
+
+				if ( ( p2FrameRate == "50i" ) || ( p2FrameRate == "25p" ) ) {
+
+					dmTimeFormat = "25Timecode";
+
+				} else if ( p2FrameRate == "23.98p" ) {
+
+					dmTimeFormat = "23976Timecode";
+
+				} else if ( p2FrameRate == "50p" ) {
+
+					dmTimeFormat = "50Timecode";
+
+				} else if ( ( p2FrameRate == "59.94p" ) && ( p2DropFrameFlag != 0 ) ) {
+
+					if ( XMP_LitMatch ( p2DropFrameFlag, "true" ) ) {
+						dmTimeFormat = "5994DropTimecode";
+					} else if ( XMP_LitMatch ( p2DropFrameFlag, "false" ) ) {
+						dmTimeFormat = "5994NonDropTimecode";
+					}
+
+				} else if ( (p2FrameRate == "59.94i") || (p2FrameRate == "29.97p") ) {
+
+					if ( p2DropFrameFlag != 0 ) {
+
+						if ( XMP_LitMatch ( p2DropFrameFlag, "false" ) ) {
+
+							dmTimeFormat = "2997NonDropTimecode";
+
+						} else if ( XMP_LitMatch ( p2DropFrameFlag, "true" ) ) {
+
+							//	Drop frame NTSC timecode uses semicolons instead of colons as separators.
+							std::string::iterator currCharIt = p2StartTimecode.begin();
+							const std::string::iterator charsEndIt = p2StartTimecode.end();
+
+							for ( ; currCharIt != charsEndIt; ++currCharIt ) {
+								if ( *currCharIt == ':' ) *currCharIt = ';';
+							}
+
+							dmTimeFormat = "2997DropTimecode";
+
+						}
+
+					}
+
+				}
+
+				if ( ( ! p2StartTimecode.empty() ) && ( ! dmTimeFormat.empty() ) ) {
+					this->xmpObj.SetStructField ( kXMP_NS_DM, "startTimecode", kXMP_NS_DM, "timeValue", p2StartTimecode, 0 );
+					this->xmpObj.SetStructField ( kXMP_NS_DM, "startTimecode", kXMP_NS_DM, "timeFormat", dmTimeFormat, 0 );
+					this->containsXMP = true;
+				}
+
+			}
+
+		}
+
+	}
+
+}	// P2_MetaHandler::SetStartTimecodeFromLegacyXML
+
+
+// =================================================================================================
+// P2_MetaHandler::SetGPSPropertyFromLegacyXML
+// ===========================================
+
+void P2_MetaHandler::SetGPSPropertyFromLegacyXML  ( XML_NodePtr legacyLocationContext, bool digestFound, XMP_StringPtr propName, XMP_StringPtr legacyPropName )
+{
+
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_EXIF, propName )) ) {
+
+		P2_Clip* p2Clip = this->p2ClipManager.GetManagedClip() ;
+		XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+		XML_NodePtr legacyGPSProp = legacyLocationContext->GetNamedElement ( p2NS, legacyPropName );
+
+		if ( ( legacyGPSProp != 0 ) && legacyGPSProp->IsLeafContentNode() ) {
+
+			this->xmpObj.DeleteProperty ( kXMP_NS_EXIF, propName );
+
+			const std::string legacyGPSValue = legacyGPSProp->GetLeafContentValue();
+
+			if ( ! legacyGPSValue.empty() ) {
+
+				//	Convert from decimal to sexagesimal GPS coordinates
+				char direction = '\0';
+				double degrees = 0.0;
+				const int numFieldsRead = sscanf ( legacyGPSValue.c_str(), "%c%lf", &direction, &degrees );
+
+				if ( numFieldsRead == 2 ) {
+					double wholeDegrees = 0.0;
+					const double fractionalDegrees = modf ( degrees, &wholeDegrees );
+					const double minutes = fractionalDegrees * 60.0;
+					char xmpValue [128];
+
+					sprintf ( xmpValue, "%d,%.5lf%c", static_cast<int>(wholeDegrees), minutes, direction );
+					this->xmpObj.SetProperty ( kXMP_NS_EXIF, propName, xmpValue );
+					this->containsXMP = true;
+
+				}
+
+			}
+
+		}
+
+	}
+
+}	// P2_MetaHandler::SetGPSPropertyFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::SetAltitudeFromLegacyXML
+// ========================================
+
+void P2_MetaHandler::SetAltitudeFromLegacyXML  ( XML_NodePtr legacyLocationContext, bool digestFound )
+{
+
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_EXIF, "GPSAltitude" )) ) {
+
+		P2_Clip* p2Clip = this->p2ClipManager.GetManagedClip() ;
+		XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+		XML_NodePtr legacyAltitudeProp = legacyLocationContext->GetNamedElement ( p2NS, "Altitude" );
+
+		if ( ( legacyAltitudeProp != 0 ) && legacyAltitudeProp->IsLeafContentNode() ) {
+
+			this->xmpObj.DeleteProperty ( kXMP_NS_EXIF, "GPSAltitude" );
+
+			const std::string legacyGPSValue = legacyAltitudeProp->GetLeafContentValue();
+
+			if ( ! legacyGPSValue.empty() ) {
+
+				int altitude = 0;
+
+				if ( sscanf ( legacyGPSValue.c_str(), "%d", &altitude ) == 1) {
+
+					if ( altitude >= 0 ) {
+						// At or above sea level.
+						this->xmpObj.SetProperty ( kXMP_NS_EXIF, "GPSAltitudeRef", "0" );
+					} else {
+						// Below sea level.
+						altitude = -altitude;
+						this->xmpObj.SetProperty ( kXMP_NS_EXIF, "GPSAltitudeRef", "1" );
+					}
+
+					char xmpValue [128];
+
+					sprintf ( xmpValue, "%d/1", altitude );
+					this->xmpObj.SetProperty ( kXMP_NS_EXIF, "GPSAltitude", xmpValue );
+					this->containsXMP = true;
+
+				}
+
+			}
+
+		}
+
+	}
+
+}	// P2_MetaHandler::SetAltitudeFromLegacyXML
+
+// =================================================================================================
+// P2_MetaHandler::ForceChildElement
+// =================================
+
+XML_Node * P2_MetaHandler::ForceChildElement ( XML_Node * parent, XMP_StringPtr localName, XMP_Int32 indent , XMP_Bool insertAtFront  )
+{
+	XML_Node * wsNodeBefore, * wsNodeAfter;
+	P2_Clip* p2Clip = this->p2ClipManager.GetManagedClip() ;
+	XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+	XML_Node * childNode = parent->GetNamedElement ( p2NS, localName );
+	//
+
+	if ( childNode == 0 ) {
+
+		// The indenting is a hack, assuming existing 2 spaces per level.
+		try {
+			wsNodeBefore = new XML_Node ( parent, "", kCDataNode );
+			wsNodeBefore->value = "  ";	// Add 2 spaces to the existing WS before the parent's close tag.
+
+			childNode = new XML_Node ( parent, localName, kElemNode );
+			childNode->ns = parent->ns;
+			childNode->nsPrefixLen = parent->nsPrefixLen;
+			childNode->name.insert ( 0, parent->name, 0, parent->nsPrefixLen );
+
+			wsNodeAfter = new XML_Node ( parent, "", kCDataNode );
+		} catch (...) {
+			if (wsNodeBefore) 
+				delete wsNodeBefore;
+			if (childNode)
+				delete childNode;
+
+			throw;
+		}
+		wsNodeAfter->value = '\n';
+		for ( ; indent > 1; --indent ) wsNodeAfter->value += "  ";	// Indent less 1, to "outdent" the parent's close.
+
+		if(insertAtFront){
+			// we are asked to insert this child as the first child of it's parent.So if P is the parent and B,C are children
+			// already present. Then if we add a new child A as it's first child then we need to first add new line character right
+			// after "<P>" and then proper indentation to bring them on the level of other children.
+			//<P>
+			//	  <B>
+			//	  <C>
+			//</P>
+			std::vector<XML_Node *> indentedNode;
+			indentedNode.push_back(wsNodeAfter);
+			indentedNode.push_back(wsNodeBefore);
+			indentedNode.push_back(childNode);
+			parent->content.insert(parent->content.begin(), indentedNode.begin(), indentedNode.end());
+		}
+		else{
+			parent->content.push_back(wsNodeBefore);
+			parent->content.push_back(childNode);
+			parent->content.push_back(wsNodeAfter);
+		}
+
+	}
+
+	return childNode;
+
+}	// P2_MetaHandler::ForceChildElement
+
+// =================================================================================================
+// P2_MetaHandler::IsMetadataWritable
+// =======================================
+
+bool P2_MetaHandler::IsMetadataWritable ( )
+{
+	std::string noExtPath, filePath;
+	noExtPath = rootPath + kDirChar + "CONTENTS" + kDirChar + "CLIP" + kDirChar + this->clipName ;
+	filePath = noExtPath + ".XMP";
+	// Check whether sidecar is writable, if not then check if it can be created.
+	bool writable = Host_IO::Writable( filePath.c_str(), true );
+	 filePath = noExtPath + ".XML";
+	// Check if legacy XML is writable.
+	writable &= Host_IO::Writable( filePath.c_str(), false );
+	return writable;
+}// P2_MetaHandler::IsMetadataWritable
+
+// =================================================================================================
+// P2_MetaHandler::FillAssociatedResources
+// ======================================
+void P2_MetaHandler::FillAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	// The possible associated resources:
+	//	CONTENTS/
+	//		CLIP/
+	//			XXXXXX.XML			XXXXXX is clip name
+	//			XXXXXX.XMP
+	//		VIDEO/
+	//			XXXXXX.MXF
+	//		AUDIO/
+	//			XXXXXXNN.MXF	NN is a counter which can go from 00 to 15.
+	//		ICON/
+	//			XXXXXX.BMP
+	//		VOICE/
+	//			XXXXXXNN.WAV	NN is a counter which can go from 00 to 99.
+	//		PROXY/
+	//			XXXXXX.MP4
+	//			XXXXXX.BIN
+	XMP_VarString contentsPath = this->rootPath + kDirChar + "CONTENTS" + kDirChar;
+	XMP_VarString path;
+	
+	//Add RootPath
+	path = this->rootPath + kDirChar;
+	PackageFormat_Support::AddResourceIfExists(resourceList, path);
+	P2_SpannedClip* p2SpanClip=p2ClipManager.GetSpannedClip();
+	if ( ! p2SpanClip ) return ;
+	std::vector<std::string>  clipNameList;
+	p2SpanClip->GetAllClipNames ( clipNameList );
+	std::vector<std::string>::iterator iter = clipNameList.begin();
+	for(; iter!=clipNameList.end(); iter++)
+	{
+
+		std::string clipPathNoExt = contentsPath + "CLIP" + kDirChar + *iter;
+		// Get the files present inside CLIP folder.
+		path = clipPathNoExt + ".XML";
+		PackageFormat_Support::AddResourceIfExists(resourceList, path);
+		path = clipPathNoExt + ".XMP";
+		PackageFormat_Support::AddResourceIfExists(resourceList, path);
+
+		// Get the files present inside VIDEO folder.
+		path = contentsPath + "VIDEO" + kDirChar + *iter + ".MXF";
+		PackageFormat_Support::AddResourceIfExists(resourceList, path);
+
+		// Get the files present inside AUDIO folder.
+		path = contentsPath + "AUDIO" + kDirChar;
+		XMP_VarString regExp;
+		regExp = "^" + *iter + "\\d\\d.MXF$";
+		IOUtils::GetMatchingChildren ( *resourceList, path, regExp, false, true, true );
+
+		// Get the files present inside ICON folder.
+		path = contentsPath + "ICON" + kDirChar + *iter + ".BMP";
+		PackageFormat_Support::AddResourceIfExists(resourceList, path);
+
+		// Get the files present inside VOICE folder.
+		path = contentsPath + "VOICE" + kDirChar;
+		regExp = "^" + *iter + "\\d\\d.WAV$";
+		IOUtils::GetMatchingChildren ( *resourceList, path, regExp, false, true, true );
+
+		// Get the files present inside PROXY folder.
+		std::string proxyPathNoExt = contentsPath + "PROXY" + kDirChar + *iter;
+
+		path = proxyPathNoExt + ".MP4";
+		PackageFormat_Support::AddResourceIfExists(resourceList, path);
+		path = proxyPathNoExt + ".BIN";
+		PackageFormat_Support::AddResourceIfExists(resourceList, path);
+	}
+}	// P2_MetaHandler::FillAssociatedResources
+
+// =================================================================================================
+// P2_MetaHandler::CacheFileData
+// =============================
+
+void P2_MetaHandler::CacheFileData()
+{
+	XMP_Assert ( ! this->containsXMP );
+
+	if ( this->parent->UsesClientIO() ) {
+		XMP_Throw ( "P2 cannot be used with client-managed I/O", kXMPErr_InternalFailure );
+	}
+
+	// Make sure the clip's .XMP file exists.
+
+	std::string xmpPath;
+		
+	this->MakeClipFilePath ( &xmpPath, ".XMP" );
+	if ( ! Host_IO::Exists ( xmpPath.c_str() ) ) return;	// No XMP.
+
+	// Read the entire .XMP file. We know the XMP exists, New_XMPFiles_IO is supposed to return 0
+	// only if the file does not exist.
+
+	bool readOnly = XMP_OptionIsClear ( this->parent->openFlags, kXMPFiles_OpenForUpdate );
+
+	XMP_Assert ( this->parent->ioRef == 0 );
+	XMPFiles_IO* xmpFile =  XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), readOnly );
+	if ( xmpFile == 0 ) XMP_Throw ( "P2 XMP file open failure", kXMPErr_InternalFailure );
+	this->parent->ioRef = xmpFile;
+
+	XMP_Int64 xmpLen = xmpFile->Length();
+	if ( xmpLen > 100*1024*1024 ) {
+		XMP_Throw ( "P2 XMP is outrageously large", kXMPErr_InternalFailure );	// Sanity check.
+	}
+
+	this->xmpPacket.erase();
+	this->xmpPacket.append ( (size_t)xmpLen, ' ' );
+
+	XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen );
+
+	this->packetInfo.offset = 0;
+	this->packetInfo.length = (XMP_Int32)xmpLen;
+	FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+	this->containsXMP = true;
+
+}	// P2_MetaHandler::CacheFileData
+
+// =================================================================================================
+// P2_MetaHandler::ProcessXMP
+// ==========================
+
+void P2_MetaHandler::ProcessXMP()
+{
+	if ( this->processedXMP ) return;
+	this->processedXMP = true;	// Make sure only called once.
+
+	if ( this->containsXMP ) {
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	}
+	
+	XML_NodePtr legacyContext, clipMetadata, legacyProp;
+	if ( ! this->p2ClipManager.IsValidP2() ) return;
+	P2_Clip* p2Clip=this->p2ClipManager.GetManagedClip();
+	XMP_StringPtr p2NS = p2Clip->GetP2RootNode()->ns.c_str();
+	std::string oldDigest, newDigest;
+	bool digestFound = this->xmpObj.GetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "P2", &oldDigest, 0 );
+	if ( digestFound ) {
+		p2Clip->CreateDigest ( &newDigest );
+		if ( oldDigest == newDigest ) return;
+	}
+
+	// If we get here we need find and import the actual legacy elements using the current namespace.
+	// Either there is no old digest in the XMP, or the digests differ. In the former case keep any
+	// existing XMP, in the latter case take new legacy values.
+	std::string clipTitle= p2Clip->GetClipTitle();// needed for successful Mac Builds
+	this->SetXMPPropertyFromLegacyXML ( digestFound, &clipTitle , kXMP_NS_DC, "title", true );
+	if ( p2Clip->IsValidClip() ) 
+		this->SetXMPPropertyFromLegacyXML ( digestFound, p2Clip->GetClipId(), kXMP_NS_DC, "identifier", false );
+	this->SetDurationFromLegacyXML (digestFound );
+	this->SetRelationsFromLegacyXML ( digestFound );
+	clipMetadata = p2Clip->GetClipMetadataNode();
+	if ( clipMetadata == 0 ) return;
+	this->SetXMPPropertyFromLegacyXML ( digestFound,p2Clip->GetClipMetadataNode(), kXMP_NS_DM, "shotName", "UserClipName", false );
+	this->SetAudioInfoFromLegacyXML ( digestFound );
+	this->SetVideoInfoFromLegacyXML ( digestFound );
+
+
+	legacyContext = clipMetadata->GetNamedElement ( p2NS, "Access" );
+	if ( legacyContext == 0 ) return;
+
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DC, "creator" )) ) {
+		legacyProp = legacyContext->GetNamedElement ( p2NS, "Creator" );
+		if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+			this->xmpObj.DeleteProperty ( kXMP_NS_DC, "creator" );
+			this->xmpObj.AppendArrayItem ( kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered,
+										   legacyProp->GetLeafContentValue() );
+			this->containsXMP = true;
+		}
+	}
+
+	this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_XMP, "CreateDate", "CreationDate", false );
+	this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_XMP, "ModifyDate", "LastUpdateDate", false );
+
+	if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DM, "good" )) ) {
+		legacyProp = clipMetadata->GetNamedElement ( p2NS, "ShotMark" );
+		if ( (legacyProp == 0) || (! legacyProp->IsLeafContentNode()) ) {
+			this->xmpObj.DeleteProperty ( kXMP_NS_DM, "good" );
+		} else {
+			XMP_StringPtr markValue = legacyProp->GetLeafContentValue();
+			if ( markValue == 0 ) {
+				this->xmpObj.DeleteProperty ( kXMP_NS_DM, "good" );
+			} else if ( XMP_LitMatch ( markValue, "true" ) || XMP_LitMatch ( markValue, "1" ) ) {
+				this->xmpObj.SetProperty_Bool ( kXMP_NS_DM, "good", true, kXMP_DeleteExisting );
+				this->containsXMP = true;
+			} else if ( XMP_LitMatch ( markValue, "false" ) || XMP_LitMatch ( markValue, "0" ) ) {
+				this->xmpObj.SetProperty_Bool ( kXMP_NS_DM, "good", false, kXMP_DeleteExisting );
+				this->containsXMP = true;
+			}
+		}
+	}
+
+	legacyContext = clipMetadata->GetNamedElement ( p2NS, "Shoot" );
+	if ( legacyContext != 0 ) {
+		this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_TIFF, "Artist", "Shooter", false );
+		legacyContext = legacyContext->GetNamedElement ( p2NS, "Location" );
+	}
+
+	if ( legacyContext != 0 ) {
+		this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_DM, "shotLocation", "PlaceName", false );
+		this->SetGPSPropertyFromLegacyXML ( legacyContext, digestFound, "GPSLongitude", "Longitude" );
+		this->SetGPSPropertyFromLegacyXML ( legacyContext, digestFound, "GPSLatitude", "Latitude" );
+		this->SetAltitudeFromLegacyXML ( legacyContext, digestFound );
+	}
+
+	legacyContext = clipMetadata->GetNamedElement ( p2NS, "Device" );
+	if ( legacyContext != 0 ) {
+		this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_TIFF, "Make", "Manufacturer", false );
+		this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_EXIF_Aux, "SerialNumber", "SerialNo.", false );
+		this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_TIFF, "Model", "ModelName", false );
+	}
+
+	legacyContext = clipMetadata->GetNamedElement ( p2NS, "Scenario" );
+	if ( legacyContext != 0 ) {
+		this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_DM, "scene", "SceneNo.", false );
+		this->SetXMPPropertyFromLegacyXML ( digestFound, legacyContext, kXMP_NS_DM, "takeNumber", "TakeNo.", false );
+	}
+
+	return;
+
+}	// P2_MetaHandler::ProcessXMP
+
+// This function adds a dummy attribute to the clipContent/clipMetadata (whichever is non-null)
+// with empty value and namespace as xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance
+static XML_Node* AddXSINamespace(XML_Node *clipContent, XML_Node *clipMetadata){
+
+	XML_Node *parent = clipContent ? clipContent : clipMetadata;
+	if(parent){
+		XML_Node *attrWithXSINamespace = new XML_Node ( parent, "xsi:", kCDataNode );
+		attrWithXSINamespace->value="";
+		attrWithXSINamespace->ns="http://www.w3.org/2001/XMLSchema-instance";
+		parent->attrs.push_back(attrWithXSINamespace);
+		return parent;
+	}
+
+	return NULL;
+
+}
+
+// =================================================================================================
+// P2_MetaHandler::UpdateFile
+// ==========================
+//
+// Note that UpdateFile is only called from XMPFiles::CloseFile, so it is OK to close the file here.
+
+void P2_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) return;
+	this->needsUpdate = false;	// Make sure only called once.
+
+	XMP_Assert ( this->parent->UsesLocalIO() );
+
+	// Update the internal legacy XML tree if we have one, and set the digest in the XMP.
+
+	bool updateLegacyXML = false;
+	P2_Clip* p2Clip = 0;
+	XML_NodePtr clipMetadata = 0;
+	if ( this->p2ClipManager.IsValidP2() )
+	{
+		p2Clip=this->p2ClipManager.GetManagedClip();
+		clipMetadata = p2Clip->GetClipMetadataNode();
+		if ( clipMetadata != 0 ) {
+
+			bool xmpFound;
+			std::string xmpValue;
+			XML_Node * xmlNode;
+
+			xmpFound = this->xmpObj.GetLocalizedText ( kXMP_NS_DC, "title", "", "x-default", 0, &xmpValue, 0 );
+
+			if ( xmpFound && p2Clip->GetClipContentNode()) {
+
+				xmlNode = this->ForceChildElement ( p2Clip->GetClipContentNode(), "ClipName", 3, false );
+
+				if ( xmpValue != xmlNode->GetLeafContentValue() ) {
+					xmlNode->SetLeafContentValue ( xmpValue.c_str() );
+					updateLegacyXML = true;
+				}
+
+			}
+
+			xmpFound = this->xmpObj.GetArrayItem ( kXMP_NS_DC, "creator", 1, &xmpValue, 0 );
+
+			if ( xmpFound ) {
+				xmlNode = this->ForceChildElement ( clipMetadata , "Access", 3, false );
+
+				// "Creator" must be first child of "Access" node else Panasonic P2 Viewer gives an error.
+				xmlNode = this->ForceChildElement ( xmlNode, "Creator", 4 , true);
+				if ( xmpValue != xmlNode->GetLeafContentValue() ) {
+					xmlNode->SetLeafContentValue ( xmpValue.c_str() );
+					updateLegacyXML = true;
+				}
+			}
+
+		}
+
+		std::string newDigest;
+		this->p2ClipManager.GetManagedClip()->CreateDigest ( &newDigest );
+		this->xmpObj.SetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "P2", newDigest.c_str(), kXMP_DeleteExisting );
+	}
+
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, this->GetSerializeOptions() );
+
+	// -----------------------------------------------------------------------
+	// Update the XMP file first, don't let legacy XML failures block the XMP.
+
+	std::string xmpPath;
+	this->MakeClipFilePath ( &xmpPath, ".XMP" );
+
+	bool haveXMP = Host_IO::Exists ( xmpPath.c_str() );
+	if ( ! haveXMP ) {
+		XMP_Assert ( this->parent->ioRef == 0 );
+		Host_IO::Create ( xmpPath.c_str() );
+		this->parent->ioRef = XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), Host_IO::openReadWrite );
+		if ( this->parent->ioRef == 0 ) XMP_Throw ( "Failure opening P2 XMP file", kXMPErr_ExternalFailure );
+	}
+
+	XMP_IO* xmpFile = this->parent->ioRef;
+	XMP_Assert ( xmpFile != 0 );
+	XIO::ReplaceTextFile ( xmpFile, this->xmpPacket, (haveXMP & doSafeUpdate) );
+
+	// --------------------------------------------
+	// Now update the legacy XML file if necessary.
+
+	if ( updateLegacyXML ) {
+
+		std::string legacyXML, xmlPath;
+
+		/*bug # 3217688: xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance namespace must be defined at the 
+		root node "P2Main" in legacy XML else Panasonic P2 Viewer gives an error. So we are adding a 
+		dummy attribute with this namespace to clipContent/clipMetadata (whichever is non-null) before
+		serializing the XML tree. We are also undoing it below after serialization.*/
+
+		XML_Node *parentNode = AddXSINamespace(p2Clip->GetClipContentNode(), clipMetadata);
+		p2Clip->SerializeP2ClipContent ( legacyXML );
+		if(parentNode){
+			// Remove the dummy attribute added to clipContent/clipMetadata.
+			delete parentNode->attrs[parentNode->attrs.size()-1];
+			parentNode->attrs.pop_back();
+		}
+
+		this->MakeClipFilePath ( &xmlPath, ".XML" );
+
+		bool haveXML = Host_IO::Exists ( xmlPath.c_str() );
+		if ( ! haveXML ) Host_IO::Create ( xmlPath.c_str() );
+
+		Host_IO::FileRef hostRef = Host_IO::Open ( xmlPath.c_str(), Host_IO::openReadWrite );
+		if ( hostRef == Host_IO::noFileRef ) XMP_Throw ( "Failure opening P2 legacy XML file", kXMPErr_ExternalFailure );
+		XMPFiles_IO origXML ( hostRef, xmlPath.c_str(), Host_IO::openReadWrite );
+		XIO::ReplaceTextFile ( &origXML, legacyXML, (haveXML & doSafeUpdate) );
+		origXML.Close();
+
+	}
+
+}	// P2_MetaHandler::UpdateFile
+
+// =================================================================================================
+// P2_MetaHandler::WriteTempFile
+// =============================
+
+void P2_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+
+	// ! WriteTempFile is not supposed to be called for handlers that own the file.
+	XMP_Throw ( "P2_MetaHandler::WriteTempFile should not be called", kXMPErr_InternalFailure );
+
+}	// P2_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/P2_Handler.hpp b/XMPFiles/source/FileHandlers/P2_Handler.hpp
new file mode 100644
index 0000000..5e492ee
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/P2_Handler.hpp
@@ -0,0 +1,113 @@
+#ifndef __P2_Handler_hpp__
+#define __P2_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "source/ExpatAdapter.hpp"
+
+#include "third-party/zuid/interfaces/MD5.h"
+#include "XMPFiles/source/FormatSupport/P2_Support.hpp"
+
+// =================================================================================================
+/// \file P2_Handler.hpp
+/// \brief Folder format handler for P2.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// *** Could derive from Basic_Handler - buffer file tail in a temp file.
+
+extern XMPFileHandler * P2_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool P2_CheckFormat ( XMP_FileFormat format,
+							 const std::string & rootPath,
+							 const std::string & gpName,
+							 const std::string & parentName,
+							 const std::string & leafName,
+							 XMPFiles * parent );
+
+static const XMP_OptionBits kP2_HandlerFlags = (kXMPFiles_CanInjectXMP |
+												kXMPFiles_CanExpand |
+												kXMPFiles_CanRewrite |
+												kXMPFiles_PrefersInPlace |
+												kXMPFiles_CanReconcile |
+												kXMPFiles_AllowsOnlyXMP |
+												kXMPFiles_ReturnsRawPacket |
+												kXMPFiles_HandlerOwnsFile |
+												kXMPFiles_AllowsSafeUpdate |
+												kXMPFiles_FolderBasedFormat);
+
+class P2_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	bool IsMetadataWritable ( );
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	XMP_OptionBits GetSerializeOptions()	// *** These should be standard for standalone XMP files.
+		{ return (kXMP_UseCompactFormat | kXMP_OmitPacketWrapper); };
+
+	P2_MetaHandler ( XMPFiles * _parent );
+	virtual ~P2_MetaHandler();
+
+private:
+
+	P2_MetaHandler() {};	// Hidden on purpose.
+
+	bool MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false );
+	void MakeLegacyDigest ( std::string * digestStr );
+
+	void DigestLegacyItem ( MD5_CTX & md5Context, XML_NodePtr legacyContext, XMP_StringPtr legacyPropName );
+	void DigestLegacyRelations ( MD5_CTX & md5Context );
+
+	void SetXMPPropertyFromLegacyXML ( bool digestFound,
+									   XML_NodePtr legacyContext,
+									   XMP_StringPtr schemaNS,
+									   XMP_StringPtr propName,
+									   XMP_StringPtr legacyPropName,
+									   bool isLocalized );
+	void SetXMPPropertyFromLegacyXML ( bool digestFound,
+										XMP_VarString* refContext,
+										XMP_StringPtr schemaNS,
+										XMP_StringPtr propName,
+										bool isLocalized );
+
+	void SetRelationsFromLegacyXML ( bool digestFound );
+	void SetAudioInfoFromLegacyXML ( bool digestFound );
+	void SetVideoInfoFromLegacyXML ( bool digestFound );
+	void SetDurationFromLegacyXML  ( bool digestFound );
+
+	void SetVideoFrameInfoFromLegacyXML ( XML_NodePtr legacyVideoContext, bool digestFound );
+	void SetStartTimecodeFromLegacyXML  ( XML_NodePtr legacyVideoContext, bool digestFound );
+	void SetGPSPropertyFromLegacyXML  ( XML_NodePtr legacyLocationContext, bool digestFound, XMP_StringPtr propName, XMP_StringPtr legacyPropName );
+	void SetAltitudeFromLegacyXML  ( XML_NodePtr legacyLocationContext, bool digestFound );
+
+	XML_Node * ForceChildElement ( XML_Node * parent, XMP_StringPtr localName, XMP_Int32 indent, XMP_Bool insertAtFront );
+
+	std::string rootPath , clipName;
+
+	P2_Manager p2ClipManager;
+
+};	// P2_MetaHandler
+
+// =================================================================================================
+
+#endif /* __P2_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/PNG_Handler.cpp b/XMPFiles/source/FileHandlers/PNG_Handler.cpp
new file mode 100644
index 0000000..8c2fe8c
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/PNG_Handler.cpp
@@ -0,0 +1,248 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FileHandlers/PNG_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/PNG_Support.hpp"
+
+#include "source/XIO.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file PNG_Handler.hpp
+/// \brief File format handler for PNG.
+///
+/// This handler ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// PNG_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * PNG_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new PNG_MetaHandler ( parent );
+
+}	// PNG_MetaHandlerCTor
+
+// =================================================================================================
+// PNG_CheckFormat
+// ===============
+
+bool PNG_CheckFormat ( XMP_FileFormat format,
+					   XMP_StringPtr  filePath,
+                       XMP_IO*    fileRef,
+                       XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_PNGFile );
+
+	if ( fileRef->Length() < PNG_SIGNATURE_LEN ) return false;
+	XMP_Uns8 buffer [PNG_SIGNATURE_LEN];
+
+	fileRef->Rewind();
+	fileRef->Read ( buffer, PNG_SIGNATURE_LEN );
+	if ( ! CheckBytes ( buffer, PNG_SIGNATURE_DATA, PNG_SIGNATURE_LEN ) ) return false;
+
+	return true;
+
+}	// PNG_CheckFormat
+
+// =================================================================================================
+// PNG_MetaHandler::PNG_MetaHandler
+// ==================================
+
+PNG_MetaHandler::PNG_MetaHandler ( XMPFiles * _parent )
+{
+	this->parent = _parent;
+	this->handlerFlags = kPNG_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}
+
+// =================================================================================================
+// PNG_MetaHandler::~PNG_MetaHandler
+// ===================================
+
+PNG_MetaHandler::~PNG_MetaHandler()
+{
+}
+
+// =================================================================================================
+// PNG_MetaHandler::CacheFileData
+// ===============================
+
+void PNG_MetaHandler::CacheFileData()
+{
+
+	this->containsXMP = false;
+
+	XMP_IO* fileRef ( this->parent->ioRef );
+	if ( fileRef == 0) return;
+
+	PNG_Support::ChunkState chunkState;
+	long numChunks = PNG_Support::OpenPNG ( fileRef, chunkState );
+	if ( numChunks == 0 ) return;
+
+	if (chunkState.xmpLen != 0)
+	{
+		// XMP present
+
+		this->xmpPacket.reserve(chunkState.xmpLen);
+		this->xmpPacket.assign(chunkState.xmpLen, ' ');
+
+		if (PNG_Support::ReadBuffer ( fileRef, chunkState.xmpPos, chunkState.xmpLen, const_cast<char *>(this->xmpPacket.data()) ))
+		{
+			this->packetInfo.offset = chunkState.xmpPos;
+			this->packetInfo.length = chunkState.xmpLen;
+			this->containsXMP = true;
+		}
+	}
+	else
+	{
+		// no XMP
+	}
+
+}	// PNG_MetaHandler::CacheFileData
+
+// =================================================================================================
+// PNG_MetaHandler::ProcessXMP
+// ============================
+//
+// Process the raw XMP and legacy metadata that was previously cached.
+
+void PNG_MetaHandler::ProcessXMP()
+{
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	// Process the XMP packet.
+
+	if ( ! this->xmpPacket.empty() ) {
+
+		XMP_Assert ( this->containsXMP );
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen)this->xmpPacket.size();
+
+		this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+
+		this->containsXMP = true;
+
+	}
+
+}	// PNG_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// PNG_MetaHandler::UpdateFile
+// ============================
+
+void PNG_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	bool updated = false;
+
+	if ( ! this->needsUpdate ) return;
+	if ( doSafeUpdate ) XMP_Throw ( "PNG_MetaHandler::UpdateFile: Safe update not supported", kXMPErr_Unavailable );
+
+	XMP_StringPtr packetStr = xmpPacket.c_str();
+	XMP_StringLen packetLen = (XMP_StringLen)xmpPacket.size();
+	if ( packetLen == 0 ) return;
+
+	XMP_IO* fileRef(this->parent->ioRef);
+	if ( fileRef == 0 ) return;
+
+	PNG_Support::ChunkState chunkState;
+	long numChunks = PNG_Support::OpenPNG ( fileRef, chunkState );
+	if ( numChunks == 0 ) return;
+
+	// write/update chunk
+	if (chunkState.xmpLen == 0)
+	{
+		// no current chunk -> inject
+		updated = SafeWriteFile();
+	}
+	else if (chunkState.xmpLen >= packetLen )
+	{
+		// current chunk size is sufficient -> write and update CRC (in place update)
+		updated = PNG_Support::WriteBuffer(fileRef, chunkState.xmpPos, packetLen, packetStr );
+		PNG_Support::UpdateChunkCRC(fileRef, chunkState.xmpChunk );
+	}
+	else if (chunkState.xmpLen < packetLen)
+	{
+		// XMP is too large for current chunk -> expand
+		updated = SafeWriteFile();
+	}
+
+	if ( ! updated )return;	// If there's an error writing the chunk, bail.
+
+	this->needsUpdate = false;
+
+}	// PNG_MetaHandler::UpdateFile
+
+// =================================================================================================
+// PNG_MetaHandler::WriteTempFile
+// ==============================
+
+void PNG_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_IO* originalRef = this->parent->ioRef;
+
+	PNG_Support::ChunkState chunkState;
+	long numChunks = PNG_Support::OpenPNG ( originalRef, chunkState );
+	if ( numChunks == 0 ) return;
+
+	tempRef->Truncate ( 0 );
+	tempRef->Write ( PNG_SIGNATURE_DATA, PNG_SIGNATURE_LEN );
+
+	PNG_Support::ChunkIterator curPos = chunkState.chunks.begin();
+	PNG_Support::ChunkIterator endPos = chunkState.chunks.end();
+
+	for (; (curPos != endPos); ++curPos)
+	{
+		PNG_Support::ChunkData chunk = *curPos;
+
+		// discard existing XMP chunk
+		if (chunk.xmp)
+			continue;
+
+		// copy any other chunk
+		PNG_Support::CopyChunk(originalRef, tempRef, chunk);
+
+		// place XMP chunk immediately after IHDR-chunk
+		if (PNG_Support::CheckIHDRChunkHeader(chunk))
+		{
+			XMP_StringPtr packetStr = xmpPacket.c_str();
+			XMP_StringLen packetLen = (XMP_StringLen)xmpPacket.size();
+
+			PNG_Support::WriteXMPChunk(tempRef, packetLen, packetStr );
+		}
+	}
+
+}	// PNG_MetaHandler::WriteTempFile
+
+// =================================================================================================
+// PNG_MetaHandler::SafeWriteFile
+// ==============================
+
+bool PNG_MetaHandler::SafeWriteFile()
+{
+	XMP_IO* originalFile = this->parent->ioRef;
+	XMP_IO* tempFile = originalFile->DeriveTemp();
+	if ( tempFile == 0 ) XMP_Throw ( "Failure creating PNG temp file", kXMPErr_InternalFailure );
+
+	this->WriteTempFile ( tempFile );
+	originalFile->AbsorbTemp();
+
+	return true;
+
+} // PNG_MetaHandler::SafeWriteFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/PNG_Handler.hpp b/XMPFiles/source/FileHandlers/PNG_Handler.hpp
new file mode 100644
index 0000000..9298141
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/PNG_Handler.hpp
@@ -0,0 +1,62 @@
+#ifndef __PNG_Handler_hpp__
+#define __PNG_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/PNG_Support.hpp"
+#include "source/XIO.hpp"
+
+// =================================================================================================
+/// \file PNG_Handler.hpp
+/// \brief File format handler for PNG.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// *** Could derive from Basic_Handler - buffer file tail in a temp file.
+
+extern XMPFileHandler* PNG_MetaHandlerCTor ( XMPFiles* parent );
+
+extern bool PNG_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+                              XMP_IO *       fileRef,
+                              XMPFiles *     parent );
+
+static const XMP_OptionBits kPNG_HandlerFlags = ( kXMPFiles_CanInjectXMP |
+												  kXMPFiles_CanExpand |
+												  kXMPFiles_PrefersInPlace |
+												  kXMPFiles_AllowsOnlyXMP |
+												  kXMPFiles_ReturnsRawPacket |
+												  kXMPFiles_NeedsReadOnlyPacket );
+
+class PNG_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	bool SafeWriteFile();
+
+	PNG_MetaHandler ( XMPFiles* parent );
+	virtual ~PNG_MetaHandler();
+
+};	// PNG_MetaHandler
+
+// =================================================================================================
+
+#endif /* __PNG_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.cpp b/XMPFiles/source/FileHandlers/PSD_Handler.cpp
new file mode 100644
index 0000000..e5847e9
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/PSD_Handler.cpp
@@ -0,0 +1,429 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/PSD_Handler.hpp"
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+#include "XMPFiles/source/FormatSupport/ReconcileLegacy.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+
+#include "third-party/zuid/interfaces/MD5.h"
+
+using namespace std;
+
+// =================================================================================================
+/// \file PSD_Handler.cpp
+/// \brief File format handler for PSD (Photoshop).
+///
+/// This handler ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// PSD_CheckFormat
+// ===============
+
+// For PSD we just check the "8BPS" signature, the following version, and that the file is at least
+// 34 bytes long. This covers the 26 byte header, the 4 byte color mode section length (which might
+// be 0), and the 4 byte image resource section length (which might be 0). The parsing logic in
+// CacheFileData will do further checks that the image resources actually exist. Those checks are
+// not needed to decide if this is a PSD file though, instead they decide if this is valid PSD.
+
+// ! The CheckXyzFormat routines don't track the filePos, that is left to ScanXyzFile.
+
+bool PSD_CheckFormat ( XMP_FileFormat format,
+	                   XMP_StringPtr  filePath,
+                       XMP_IO*    	  fileRef,
+                       XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_PhotoshopFile );
+
+	fileRef->Rewind ( );
+	if ( fileRef->Length() < 34 ) return false;	// 34 = header plus 2 lengths
+
+	XMP_Uns8 buffer [4];
+	fileRef->ReadAll ( buffer, 4 );
+	if ( ! CheckBytes ( buffer, "8BPS", 4 ) ) return false;
+	XMP_Uns16 version = XIO::ReadUns16_BE ( fileRef );
+	if ( (version != 1) && (version != 2) ) return false;
+
+	return true;
+
+}	// PSD_CheckFormat
+
+// =================================================================================================
+// PSD_MetaHandlerCTor
+// ===================
+
+XMPFileHandler * PSD_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new PSD_MetaHandler ( parent );
+
+}	// PSD_MetaHandlerCTor
+
+// =================================================================================================
+// PSD_MetaHandler::PSD_MetaHandler
+// ================================
+
+PSD_MetaHandler::PSD_MetaHandler ( XMPFiles * _parent ) : skipReconcile(false), iptcMgr(0), exifMgr(0),imageWidth(0),imageHeight(0)
+{
+	this->parent = _parent;
+	this->handlerFlags = kPSD_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}	// PSD_MetaHandler::PSD_MetaHandler
+
+// =================================================================================================
+// PSD_MetaHandler::~PSD_MetaHandler
+// =================================
+
+PSD_MetaHandler::~PSD_MetaHandler()
+{
+
+	if ( this->iptcMgr != 0 ) delete ( this->iptcMgr );
+	if ( this->exifMgr != 0 ) delete ( this->exifMgr );
+
+}	// PSD_MetaHandler::~PSD_MetaHandler
+
+// =================================================================================================
+// PSD_MetaHandler::CacheFileData
+// ==============================
+//
+// Find and parse the image resource section, everything we want is in there. Don't simply capture
+// the whole section, there could be lots of stuff we don't care about.
+
+// *** This implementation simply returns when an invalid file is encountered. Should we throw instead?
+
+void PSD_MetaHandler::CacheFileData()
+{
+	XMP_IO*      fileRef    = this->parent->ioRef;
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_Assert ( ! this->containsXMP );
+	// Set containsXMP to true here only if the XMP image resource is found.
+
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "PSD_MetaHandler::CacheFileData - User abort", kXMPErr_UserAbort );
+	}
+
+	XMP_Uns8  psdHeader[30];
+	XMP_Uns32 ioLen, cmLen;
+
+	XMP_Int64 filePos = 0;
+	fileRef->Rewind ( );
+
+	ioLen = fileRef->Read ( psdHeader, 30 );
+	if ( ioLen != 30 ) return;	// Throw?
+
+	this->imageHeight = GetUns32BE ( &psdHeader[14] );
+	this->imageWidth  = GetUns32BE ( &psdHeader[18] );
+
+	cmLen = GetUns32BE ( &psdHeader[26] );
+
+	XMP_Int64 psirOrigin = 26 + 4 + cmLen;
+
+	filePos = fileRef->Seek ( psirOrigin, kXMP_SeekFromStart  );
+	if ( filePos !=  psirOrigin ) return;	// Throw?
+
+	if ( ! XIO::CheckFileSpace ( fileRef, 4 ) ) return;	// Throw?
+	XMP_Uns32 psirLen = XIO::ReadUns32_BE ( fileRef );
+
+	this->psirMgr.ParseFileResources ( fileRef, psirLen );
+
+	PSIR_Manager::ImgRsrcInfo xmpInfo;
+	bool found = this->psirMgr.GetImgRsrc ( kPSIR_XMP, &xmpInfo );
+
+	if ( found ) {
+
+		// printf ( "PSD_MetaHandler::CacheFileData - XMP packet offset %d (0x%X), size %d\n",
+		//		  xmpInfo.origOffset, xmpInfo.origOffset, xmpInfo.dataLen );
+		this->packetInfo.offset = xmpInfo.origOffset;
+		this->packetInfo.length = xmpInfo.dataLen;
+		this->packetInfo.padSize   = 0;				// Assume for now, set these properly in ProcessXMP.
+		this->packetInfo.charForm  = kXMP_CharUnknown;
+		this->packetInfo.writeable = true;
+
+		this->xmpPacket.assign ( (XMP_StringPtr)xmpInfo.dataPtr, xmpInfo.dataLen );
+
+		this->containsXMP = true;
+
+	}
+
+}	// PSD_MetaHandler::CacheFileData
+
+// =================================================================================================
+// PSD_MetaHandler::ProcessXMP
+// ===========================
+//
+// Process the raw XMP and legacy metadata that was previously cached.
+
+void PSD_MetaHandler::ProcessXMP()
+{
+
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	// Set up everything for the legacy import, but don't do it yet. This lets us do a forced legacy
+	// import if the XMP packet gets parsing errors.
+
+	bool readOnly = false;
+	if ( this->parent )
+		readOnly = ((this->parent->openFlags & kXMPFiles_OpenForUpdate) == 0);
+
+	if ( readOnly ) {
+		this->iptcMgr = new IPTC_Reader();
+		this->exifMgr = new TIFF_MemoryReader();
+	} else {
+		this->iptcMgr = new IPTC_Writer();	// ! Parse it later.
+		this->exifMgr = new TIFF_FileWriter();
+	}
+	if ( this->parent )
+		exifMgr->SetErrorCallback( &this->parent->errorCallback );
+
+	PSIR_Manager & psir = this->psirMgr;	// Give the compiler help in recognizing non-aliases.
+	IPTC_Manager & iptc = *this->iptcMgr;
+	TIFF_Manager & exif = *this->exifMgr;
+
+	PSIR_Manager::ImgRsrcInfo iptcInfo, exifInfo;
+	bool haveIPTC = psir.GetImgRsrc ( kPSIR_IPTC, &iptcInfo );
+	bool haveExif = psir.GetImgRsrc ( kPSIR_Exif, &exifInfo );
+	int iptcDigestState = kDigestMatches;
+
+	if ( haveExif ) exif.ParseMemoryStream ( exifInfo.dataPtr, exifInfo.dataLen );
+
+	if ( haveIPTC ) {
+
+		bool haveDigest = false;
+		PSIR_Manager::ImgRsrcInfo digestInfo;
+		haveDigest = psir.GetImgRsrc ( kPSIR_IPTCDigest, &digestInfo );
+		if ( digestInfo.dataLen != 16 ) haveDigest = false;
+
+		if ( ! haveDigest ) {
+			iptcDigestState = kDigestMissing;
+		} else {
+			iptcDigestState = PhotoDataUtils::CheckIPTCDigest ( iptcInfo.dataPtr, iptcInfo.dataLen, digestInfo.dataPtr );
+		}
+
+	}
+
+	XMP_OptionBits options = 0;
+	if ( this->containsXMP ) options |= k2XMP_FileHadXMP;
+	if ( haveIPTC ) options |= k2XMP_FileHadIPTC;
+	if ( haveExif ) options |= k2XMP_FileHadExif;
+
+	// Process the XMP packet. If it fails to parse, do a forced legacy import but still throw an
+	// exception. This tells the caller that an error happened, but gives them recovered legacy
+	// should they want to proceed with that.
+
+	bool haveXMP = false;
+
+	if ( ! this->xmpPacket.empty() ) {
+		XMP_Assert ( this->containsXMP );
+		// Common code takes care of packetInfo.charForm, .padSize, and .writeable.
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen)this->xmpPacket.size();
+		try {
+			this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+		} catch ( ... ) { /* Ignore parsing failures, someday we hope to get partial XMP back. */ }
+		haveXMP = true;
+	}
+
+	// Process the legacy metadata.
+
+	if ( haveIPTC && (! haveXMP) && (iptcDigestState == kDigestMatches) ) iptcDigestState = kDigestMissing;
+	bool parseIPTC = (iptcDigestState != kDigestMatches) || (! readOnly);
+	if ( parseIPTC ) iptc.ParseMemoryDataSets ( iptcInfo.dataPtr, iptcInfo.dataLen );
+	ImportPhotoData ( exif, iptc, psir, iptcDigestState, &this->xmpObj, options );
+	this->containsXMP = true;	// Assume we now have something in the XMP.
+
+}	// PSD_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// PSD_MetaHandler::UpdateFile
+// ===========================
+
+void PSD_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	XMP_Assert ( ! doSafeUpdate );	// This should only be called for "unsafe" updates.
+
+	XMP_Int64 oldPacketOffset = this->packetInfo.offset;
+	XMP_Int32 oldPacketLength = this->packetInfo.length;
+
+	if ( oldPacketOffset == kXMPFiles_UnknownOffset ) oldPacketOffset = 0;	// ! Simplify checks.
+	if ( oldPacketLength == kXMPFiles_UnknownLength ) oldPacketLength = 0;
+
+	bool fileHadXMP = ((oldPacketOffset != 0) && (oldPacketLength != 0));
+
+	// Update the IPTC-IIM and native TIFF/Exif metadata. ExportPhotoData also trips the tiff: and
+	// exif: copies from the XMP, so reserialize the now final XMP packet.
+
+	ExportPhotoData ( kXMP_PhotoshopFile, &this->xmpObj, this->exifMgr, this->iptcMgr, &this->psirMgr );
+
+	try {
+		XMP_OptionBits options = kXMP_UseCompactFormat;
+		if ( fileHadXMP ) options |= kXMP_ExactPacketLength;
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, options, oldPacketLength );
+	} catch ( ... ) {
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+	}
+
+	// Decide whether to do an in-place update. This can only happen if all of the following are true:
+	//	- There is an XMP packet in the file.
+	//	- The are no changes to the legacy image resources. (The IPTC and EXIF are in the PSIR.)
+	//	- The new XMP can fit in the old space.
+
+	bool doInPlace = (fileHadXMP && (this->xmpPacket.size() <= (size_t)oldPacketLength));
+	if ( this->psirMgr.IsLegacyChanged() ) doInPlace = false;
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+
+	if ( doInPlace ) {
+
+		#if GatherPerformanceData
+			sAPIPerf->back().extraInfo += ", PSD in-place update";
+		#endif
+
+		if ( this->xmpPacket.size() < (size_t)this->packetInfo.length ) {
+			// They ought to match, cheap to be sure.
+			size_t extraSpace = (size_t)this->packetInfo.length - this->xmpPacket.size();
+			this->xmpPacket.append ( extraSpace, ' ' );
+		}
+
+		XMP_IO* liveFile = this->parent->ioRef;
+
+		XMP_Assert ( this->xmpPacket.size() == (size_t)oldPacketLength );	// ! Done by common PutXMP logic.
+
+		if ( progressTracker != 0 ) progressTracker->BeginWork ( this->xmpPacket.size() );
+		liveFile->Seek ( oldPacketOffset, kXMP_SeekFromStart  );
+		liveFile->Write ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+		if ( progressTracker != 0 ) progressTracker->WorkComplete();
+
+	} else {
+
+		#if GatherPerformanceData
+			sAPIPerf->back().extraInfo += ", PSD copy update";
+		#endif
+
+		XMP_IO* origRef = this->parent->ioRef;
+		XMP_IO* tempRef = origRef->DeriveTemp();
+
+		try {
+			XMP_Assert ( ! this->skipReconcile );
+			this->skipReconcile = true;
+			this->WriteTempFile ( tempRef );
+			this->skipReconcile = false;
+		} catch ( ... ) {
+			this->skipReconcile = false;
+			origRef->DeleteTemp();
+			throw;
+		}
+
+		origRef->AbsorbTemp();
+
+	}
+
+	this->needsUpdate = false;
+
+}	// PSD_MetaHandler::UpdateFile
+
+// =================================================================================================
+// PSD_MetaHandler::WriteTempFile
+// ==============================
+
+// The metadata parts of a Photoshop file are all in the image resources. The PSIR_Manager's
+// UpdateFileResources method will take care of the image resource portion of the file, updating
+// those resources that have changed and preserving those that have not.
+
+void PSD_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_IO* origRef = this->parent->ioRef;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+
+	XMP_Uns64 sourceLen = origRef->Length();
+	if ( sourceLen == 0 ) return;	// Tolerate empty files.
+
+	// Reconcile the legacy metadata, unless this is called from UpdateFile. Reserialize the XMP to
+	// get standard padding, PutXMP has probably done an in-place serialize. Set the XMP image resource.
+
+	if ( ! skipReconcile ) {
+		// Update the IPTC-IIM and native TIFF/Exif metadata, and reserialize the now final XMP packet.
+		ExportPhotoData ( kXMP_JPEGFile, &this->xmpObj, this->exifMgr, this->iptcMgr, &this->psirMgr );
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+	}
+
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+	this->packetInfo.offset = kXMPFiles_UnknownOffset;
+	this->packetInfo.length = (XMP_StringLen)this->xmpPacket.size();
+	FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+	this->psirMgr.SetImgRsrc ( kPSIR_XMP, this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	
+	// Calculate the total writes I/O to be done by this method. This includes header section, color
+	// mode section and tail length after the image resources section. The write I/O for image
+	// resources section is added to total work in PSIR_FileWriter::UpdateFileResources.
+
+	origRef->Seek ( 26, kXMP_SeekFromStart );	//move to the point after Header 26 is the header length
+
+	XMP_Uns32 cmLen,cmLen1;
+	origRef->Read ( &cmLen, 4 );	// get the length of color mode section
+	cmLen1 = GetUns32BE ( &cmLen );
+	origRef->Seek ( cmLen1, kXMP_SeekFromCurrent );	//move to the end of color mode section
+	
+	XMP_Uns32 irLen;
+	origRef->Read ( &irLen, 4 );	// Get the source image resource section length.
+	irLen = GetUns32BE ( &irLen );
+		
+	XMP_Uns64 tailOffset = 26 + 4 + cmLen1 + 4 + irLen;
+	XMP_Uns64 tailLength = sourceLen - tailOffset;
+	
+	// Add work for 26 bytes header, 4 bytes color mode section length, color mode section length
+	// and tail length after the image resources section length.
+
+	if ( progressTracker != 0 ) progressTracker->BeginWork ( (float)(26.0f + 4.0f + cmLen1 + tailLength) );
+
+	// Copy the file header and color mode section, then write the updated image resource section,
+	// and copy the tail of the source file (layer and mask section to EOF).
+
+	origRef->Rewind ( );
+	tempRef->Truncate ( 0  );
+	XIO::Copy ( origRef, tempRef, 26 );	// Copy the file header.
+
+	origRef->Seek ( 4, kXMP_SeekFromCurrent );
+	tempRef->Write ( &cmLen, 4 );	// Copy the color mode section length.
+
+	XIO::Copy ( origRef, tempRef, cmLen1 );	// Copy the color mode section contents.
+
+	this->psirMgr.UpdateFileResources ( origRef, tempRef, abortProc, abortArg ,progressTracker );
+
+	origRef->Seek ( tailOffset, kXMP_SeekFromStart  );
+	tempRef->Seek ( 0, kXMP_SeekFromEnd  );
+	XIO::Copy ( origRef, tempRef, tailLength );	// Copy the tail of the file.
+
+	this->needsUpdate = false;
+	if ( progressTracker != 0 ) progressTracker->WorkComplete();
+
+}	// PSD_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.hpp b/XMPFiles/source/FileHandlers/PSD_Handler.hpp
new file mode 100644
index 0000000..4caec1b
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/PSD_Handler.hpp
@@ -0,0 +1,73 @@
+#ifndef __PSD_Handler_hpp__
+#define __PSD_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+
+// =================================================================================================
+/// \file PSD_Handler.hpp
+/// \brief File format handler for PSD (Photoshop).
+///
+/// This header ...
+///
+// =================================================================================================
+
+// *** Could derive from Basic_Handler - buffer file tail in a temp file.
+
+extern XMPFileHandler * PSD_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool PSD_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+                              XMP_IO*    fileRef,
+                              XMPFiles *     parent );
+
+static const XMP_OptionBits kPSD_HandlerFlags = (kXMPFiles_CanInjectXMP |
+                                                 kXMPFiles_CanExpand |
+                                                 kXMPFiles_CanRewrite |
+                                                 kXMPFiles_PrefersInPlace |
+                                                 kXMPFiles_CanReconcile |
+                                                 kXMPFiles_AllowsOnlyXMP |
+                                                 kXMPFiles_ReturnsRawPacket |
+                                                 kXMPFiles_AllowsSafeUpdate |
+												 kXMPFiles_CanNotifyProgress);
+
+class PSD_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile    ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	bool skipReconcile;	// ! Used between UpdateFile and WriteFile.
+
+	PSD_MetaHandler ( XMPFiles * parent );
+	virtual ~PSD_MetaHandler();
+
+private:
+
+	PSD_MetaHandler() : skipReconcile(false), iptcMgr(0), exifMgr(0) {}	// Hidden on purpose.
+
+	PSIR_FileWriter psirMgr;	// Don't need a pointer, the PSIR part is always file-based.
+	IPTC_Manager *  iptcMgr;	// Need to use pointers so we can properly select between read-only
+	TIFF_Manager *  exifMgr;	//	and read-write modes of usage.
+
+	XMP_Uns32 imageWidth, imageHeight;	// Pixel dimensions, used with thumbnail info.
+
+};	// PSD_MetaHandler
+
+// =================================================================================================
+
+#endif /* __PSD_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp
new file mode 100644
index 0000000..81b6928
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp
@@ -0,0 +1,1846 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/PostScript_Handler.hpp"
+
+#include "XMPFiles/source/FormatSupport/XMPScanner.hpp"
+#include "XMPFiles/source/FileHandlers/Scanner_Handler.hpp"
+
+#include <algorithm>
+
+using namespace std;
+// =================================================================================================
+/// \file PostScript_Handler.cpp
+/// \brief File format handler for PostScript and EPS files.
+///
+// =================================================================================================
+
+// =================================================================================================
+// PostScript_MetaHandlerCTor
+// ==========================
+
+XMPFileHandler * PostScript_MetaHandlerCTor ( XMPFiles * parent )
+{
+	XMPFileHandler * newHandler = new PostScript_MetaHandler ( parent );
+
+	return newHandler;
+
+}	// PostScript_MetaHandlerCTor
+
+// =================================================================================================
+// PostScript_CheckFormat
+// ======================
+
+bool PostScript_CheckFormat ( XMP_FileFormat format,
+	                          XMP_StringPtr  filePath,
+	                          XMP_IO*    fileRef,
+	                          XMPFiles *     parent )
+{
+	IgnoreParam(filePath); IgnoreParam(parent);
+	XMP_Assert ( (format == kXMP_EPSFile) || (format == kXMP_PostScriptFile) );
+
+	return PostScript_Support::IsValidPSFile(fileRef,format) ;
+
+}	// PostScript_CheckFormat
+
+// =================================================================================================
+// PostScript_MetaHandler::PostScript_MetaHandler
+// ==============================================
+
+PostScript_MetaHandler::PostScript_MetaHandler ( XMPFiles * _parent ):dscFlags(0),docInfoFlags(0)
+	,containsXMPHint(false),fileformat(kXMP_UnknownFile)
+{
+	this->parent = _parent;
+	this->handlerFlags = kPostScript_HandlerFlags;
+	this->stdCharForm = kXMP_Char8Bit;
+	this->psHint = kPSHint_NoMarker;
+
+}	// PostScript_MetaHandler::PostScript_MetaHandler
+
+// =================================================================================================
+// PostScript_MetaHandler::~PostScript_MetaHandler
+// ===============================================
+
+PostScript_MetaHandler::~PostScript_MetaHandler()
+{
+	// ! Inherit the base cleanup.
+
+}	// PostScript_MetaHandler::~PostScript_MetaHandler
+
+// =================================================================================================
+// PostScript_MetaHandler::FindPostScriptHint
+// ==========================================
+//
+// Search for "%ADO_ContainsXMP:" at the beginning of a line, it must be before "%%EndComments". If
+// the XMP marker is found, look for the MainFirst/MainLast/NoMain options.
+
+int PostScript_MetaHandler::FindPostScriptHint()
+{
+	bool     found = false;
+	IOBuffer ioBuf;
+	XMP_Uns8 ch;
+
+	XMP_IO* fileRef = this->parent->ioRef;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	// Check for the binary EPSF preview header.
+
+	fileRef->Rewind();
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, 4 ) ) return false;
+	XMP_Uns32 fileheader = GetUns32BE ( ioBuf.ptr );
+
+	if ( fileheader == 0xC5D0D3C6 ) {
+
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, 30 ) ) return false;
+
+		XMP_Uns32 psOffset = GetUns32LE ( ioBuf.ptr+4 );	// PostScript offset.
+		XMP_Uns32 psLength = GetUns32LE ( ioBuf.ptr+8 );	// PostScript length.
+
+		MoveToOffset ( fileRef, psOffset, &ioBuf );
+
+	}
+
+	// Look for the ContainsXMP comment.
+
+	while ( true ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "PostScript_MetaHandler::FindPostScriptHint - User abort", kXMPErr_UserAbort );
+		}
+
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsXMPString.length() ) ) return kPSHint_NoMarker;
+
+		if ( CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSEndCommentString.c_str()), kPSEndCommentString.length() ) ) {
+
+			// Found "%%EndComments", don't look any further.
+			return kPSHint_NoMarker;
+
+		} else if ( ! CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsXMPString.c_str()), kPSContainsXMPString.length() ) ) {
+
+			// Not "%%EndComments" or "%ADO_ContainsXMP:", skip past the end of this line.
+			do {
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return kPSHint_NoMarker;
+				ch = *ioBuf.ptr;
+				++ioBuf.ptr;
+			} while ( ! IsNewline ( ch ) );
+
+		} else {
+
+			// Found "%ADO_ContainsXMP:", look for the main packet location option.
+
+			ioBuf.ptr += kPSContainsXMPString.length();
+			int xmpHint = kPSHint_NoMain;	// ! From here on, a failure means "no main", not "no marker".
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return kPSHint_NoMain;
+			if ( ! IsSpaceOrTab ( *ioBuf.ptr ) ) return kPSHint_NoMain;
+
+			while ( true ) {
+
+				while ( true ) {	// Skip leading spaces and tabs.
+					if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return kPSHint_NoMain;
+					if ( ! IsSpaceOrTab ( *ioBuf.ptr ) ) break;
+					++ioBuf.ptr;
+				}
+				if ( IsNewline ( *ioBuf.ptr ) ) return kPSHint_NoMain;	// Reached the end of the ContainsXMP comment.
+
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, 6 ) ) return kPSHint_NoMain;
+
+				if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("NoMain"), 6 ) ) {
+
+					ioBuf.ptr += 6;
+					xmpHint = kPSHint_NoMain;
+					break;
+
+				} else if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("MainFi"), 6 ) ) {
+
+					ioBuf.ptr += 6;
+					if ( ! CheckFileSpace ( fileRef, &ioBuf, 3 ) ) return kPSHint_NoMain;
+					if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("rst"), 3 ) ) {
+						ioBuf.ptr += 3;
+						xmpHint = kPSHint_MainFirst;
+					}
+					break;
+
+				} else if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("MainLa"), 6 ) ) {
+
+					ioBuf.ptr += 6;
+					if ( ! CheckFileSpace ( fileRef, &ioBuf, 2 ) ) return kPSHint_NoMain;
+					if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("st"), 2 ) ) {
+						ioBuf.ptr += 2;
+						xmpHint = kPSHint_MainLast;
+					}
+					break;
+
+				} else {
+
+					while ( true ) {	// Skip until whitespace.
+						if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return kPSHint_NoMain;
+						if ( IsWhitespace ( *ioBuf.ptr ) ) break;
+						++ioBuf.ptr;
+					}
+
+				}
+
+			}	// Look for the main packet location option.
+
+			// Make sure we found exactly a known option.
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return kPSHint_NoMain;
+			if ( ! IsWhitespace ( *ioBuf.ptr ) ) return kPSHint_NoMain;
+			return xmpHint;
+
+		}	// Found "%ADO_ContainsXMP:".
+
+	}	// Outer marker loop.
+
+	return kPSHint_NoMarker;	// Should never reach here.
+
+}	// PostScript_MetaHandler::FindPostScriptHint
+
+
+// =================================================================================================
+// PostScript_MetaHandler::FindFirstPacket
+// =======================================
+//
+// Run the packet scanner until we find a valid packet. The first one is the main. For simplicity,
+// the state of all snips is checked after each buffer is read. In theory only the last of the
+// previous snips might change from partial to valid, but then we would have to special case the
+// first pass when there is no previous set of snips. Since we have to get a full report to look at
+// the last snip anyway, it costs virtually nothing extra to recheck all of the snips.
+
+bool PostScript_MetaHandler::FindFirstPacket()
+{
+	int		snipCount;
+	bool 	found	= false;
+	size_t	bufPos, bufLen;
+
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_Int64   fileLen = fileRef->Length();
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+
+	XMPScanner scanner ( fileLen );
+	XMPScanner::SnipInfoVector snips;
+
+	enum { kBufferSize = 64*1024 };
+	XMP_Uns8	buffer [kBufferSize];
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	bufPos = 0;
+	bufLen = 0;
+
+	fileRef->Rewind();	// Seek back to the beginning of the file.
+	bool firstfound=false;
+
+	while ( true ) 
+	{
+
+		if ( checkAbort && abortProc(abortArg) ) 
+		{
+			XMP_Throw ( "PostScript_MetaHandler::FindFirstPacket - User abort", kXMPErr_UserAbort );
+		}
+
+		bufPos += bufLen;
+		bufLen = fileRef->Read ( buffer, kBufferSize );
+		if ( bufLen == 0 ) return firstfound;	// Must be at EoF, no packets found.
+
+		scanner.Scan ( buffer, bufPos, bufLen );
+		snipCount = scanner.GetSnipCount();
+		scanner.Report ( snips );
+		for ( int i = 0; i < snipCount; ++i ) 
+		{
+			if ( snips[i].fState == XMPScanner::eValidPacketSnip ) 
+			{
+				if (!firstfound)
+				{
+					if ( snips[i].fLength > 0x7FFFFFFF ) XMP_Throw ( "PostScript_MetaHandler::FindFirstPacket: Oversize packet", kXMPErr_BadXMP );
+					packetInfo.offset = snips[i].fOffset;
+					packetInfo.length = (XMP_Int32)snips[i].fLength;
+					packetInfo.charForm  = snips[i].fCharForm;
+					packetInfo.writeable = (snips[i].fAccess == 'w');
+					firstPacketInfo=packetInfo;
+					lastPacketInfo=packetInfo;
+					firstfound=true;
+				}
+				else
+				{					
+					lastPacketInfo.offset = snips[i].fOffset;
+					lastPacketInfo.length = (XMP_Int32)snips[i].fLength;
+					lastPacketInfo.charForm  = snips[i].fCharForm;
+					lastPacketInfo.writeable = (snips[i].fAccess == 'w');
+				}
+			}
+		}
+
+	}
+	
+	return firstfound;
+
+}	// FindFirstPacket
+
+
+// =================================================================================================
+// PostScript_MetaHandler::FindLastPacket
+// ======================================
+//
+// Run the packet scanner backwards until we find the start of a packet, or a valid packet. If we
+// found a packet start, resume forward scanning to see if it is a valid packet. For simplicity, all
+// of the snips are checked on each pass, for much the same reasons as in FindFirstPacket.
+
+bool PostScript_MetaHandler::FindLastPacket()
+{
+	size_t	bufPos, bufLen;
+
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_Int64   fileLen = fileRef->Length();
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+
+	// ------------------------------------------------------
+	// Scan the entire file to find all of the valid packets.
+
+	XMPScanner	scanner ( fileLen );
+
+	enum { kBufferSize = 64*1024 };
+	XMP_Uns8	buffer [kBufferSize];
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	fileRef->Rewind();	// Seek back to the beginning of the file.
+
+	for ( bufPos = 0; bufPos < (size_t)fileLen; bufPos += bufLen )
+	{
+		if ( checkAbort && abortProc(abortArg) ) 
+		{
+			XMP_Throw ( "PostScript_MetaHandler::FindLastPacket - User abort", kXMPErr_UserAbort );
+		}
+		bufLen = fileRef->Read ( buffer, kBufferSize );
+		if ( bufLen == 0 ) XMP_Throw ( "PostScript_MetaHandler::FindLastPacket: Read failure", kXMPErr_ExternalFailure );
+		scanner.Scan ( buffer, bufPos, bufLen );
+	}
+
+	// -------------------------------
+	// Pick the last the valid packet.
+
+	int snipCount = scanner.GetSnipCount();
+
+	XMPScanner::SnipInfoVector snips ( snipCount );
+	scanner.Report ( snips );
+
+	bool lastfound=false;
+	for ( int i = 0; i < snipCount; ++i ) 
+	{
+		if ( snips[i].fState == XMPScanner::eValidPacketSnip ) 
+		{
+			if (!lastfound)
+			{
+				if ( snips[i].fLength > 0x7FFFFFFF ) XMP_Throw ( "PostScript_MetaHandler::FindLastPacket: Oversize packet", kXMPErr_BadXMP );
+				packetInfo.offset = snips[i].fOffset;
+				packetInfo.length = (XMP_Int32)snips[i].fLength;
+				packetInfo.charForm  = snips[i].fCharForm;
+				packetInfo.writeable = (snips[i].fAccess == 'w');
+				firstPacketInfo=packetInfo;
+				lastPacketInfo=packetInfo;
+				lastfound=true;
+			}
+			else
+			{					
+				lastPacketInfo.offset = snips[i].fOffset;
+				lastPacketInfo.length = (XMP_Int32)snips[i].fLength;
+				lastPacketInfo.charForm  = snips[i].fCharForm;
+				lastPacketInfo.writeable = (snips[i].fAccess == 'w');
+				packetInfo=lastPacketInfo;
+			}
+		}
+	}
+	return lastfound;
+
+}	// PostScript_MetaHandler::FindLastPacket
+
+// =================================================================================================
+// PostScript_MetaHandler::setTokenInfo
+// ====================================
+//
+// Function Sets the docInfo flag for tokens(PostScript DSC comments/ Docinfo Dictionary values)
+//	when parsing the file stream.Also takes note of the token offset from the start of the file
+//	and the length of the token
+void PostScript_MetaHandler::setTokenInfo(TokenFlag tFlag,XMP_Int64 offset,XMP_Int64 length)
+{
+	if (!(docInfoFlags&tFlag)&&tFlag>=kPS_ADOContainsXMP && tFlag<=kPS_EndPostScript)
+	{
+		size_t index=0;
+		XMP_Uns64 flag=tFlag;
+		while(flag>>=1) index++;
+		fileTokenInfo[index].offsetStart=offset;
+		fileTokenInfo[index].tokenlen=length;
+		docInfoFlags|=tFlag;
+	}
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::getTokenInfo
+// ====================================
+//
+// Function returns the token info for the flag, which was collected in parsing the input file
+//	
+PostScript_MetaHandler::TokenLocation& PostScript_MetaHandler::getTokenInfo(TokenFlag tFlag)
+{
+	if ((docInfoFlags&tFlag)&&tFlag>=kPS_ADOContainsXMP && tFlag<=kPS_EndPostScript)
+	{
+		size_t index=0;
+		XMP_Uns64 flag=tFlag;
+		while(flag>>=1) index++;
+		return fileTokenInfo[index];
+	}
+	return fileTokenInfo[kPS_NoData];
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::ExtractDSCCommentValue
+// ==============================================
+//
+// Function extracts the DSC comment value when parsing the file.This may be later used to reconcile
+//	
+bool PostScript_MetaHandler::ExtractDSCCommentValue(IOBuffer &ioBuf,NativeMetadataIndex index)
+{
+	
+	XMP_IO* fileRef = this->parent->ioRef;
+	if ( ! PostScript_Support::SkipTabsAndSpaces(fileRef,ioBuf) ) return false;
+	if ( !IsNewline ( *ioBuf.ptr ) )
+	{
+		do 
+		{
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			nativeMeta[index] += *ioBuf.ptr;
+			++ioBuf.ptr;
+		} while ( ! IsNewline ( *ioBuf.ptr) );
+		if (!PostScript_Support::HasCodesGT127(nativeMeta[index]))
+		{
+			dscFlags|=nativeIndextoFlag[index];
+		}
+		else
+			nativeMeta[index].clear();
+	}
+	return true;
+}
+
+
+// =================================================================================================
+// PostScript_MetaHandler::ExtractContainsXMPHint
+// ==============================================
+//
+// Function extracts the the value of "ADOContainsXMP:" DSC comment's value
+//	
+bool PostScript_MetaHandler::ExtractContainsXMPHint(IOBuffer &ioBuf,XMP_Int64 containsXMPStartpos)
+{
+	XMP_IO* fileRef = this->parent->ioRef;
+	int xmpHint = kPSHint_NoMain;	// ! From here on, a failure means "no main", not "no marker".
+	//checkfor atleast one whitespace
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+	if ( ! IsSpaceOrTab ( *ioBuf.ptr ) ) return false;
+	//skip extra ones	
+	if ( ! PostScript_Support::SkipTabsAndSpaces(fileRef,ioBuf) ) return false;
+	if ( IsNewline ( *ioBuf.ptr ) ) return false;	// Reached the end of the ContainsXMP comment.
+
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, 6 ) ) return false ;
+
+	if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("NoMain"), 6 ) ) 
+	{
+		ioBuf.ptr += 6;
+		if ( ! PostScript_Support::SkipTabsAndSpaces(fileRef,ioBuf) ) return false;
+		if ( ! IsNewline( *ioBuf.ptr) ) return false;
+		this->psHint = kPSHint_NoMain;
+		setTokenInfo(kPS_ADOContainsXMP,containsXMPStartpos,ioBuf.filePos+ioBuf.ptr-ioBuf.data-containsXMPStartpos);
+
+	} 
+	else if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("MainFi"), 6 ) ) 
+	{
+		ioBuf.ptr += 6;
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, 3 ) ) return false;
+		if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("rst"), 3 ) ) 
+		{
+			ioBuf.ptr += 3;
+			if ( ! PostScript_Support::SkipTabsAndSpaces(fileRef,ioBuf) ) return false;
+			if ( ! IsNewline( *ioBuf.ptr) ) return false;
+			this->psHint = kPSHint_MainFirst;
+			setTokenInfo(kPS_ADOContainsXMP,containsXMPStartpos,ioBuf.filePos+ioBuf.ptr-ioBuf.data-containsXMPStartpos);
+			containsXMPHint=true;
+		}
+	} 
+	else if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("MainLa"), 6 ) ) 
+	{
+		ioBuf.ptr += 6;
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, 2 ) ) return false;
+		if ( CheckBytes ( ioBuf.ptr, Uns8Ptr("st"), 2 ) ) {
+			ioBuf.ptr += 2;
+			if ( ! PostScript_Support::SkipTabsAndSpaces(fileRef,ioBuf) ) return false;
+			if ( ! IsNewline( *ioBuf.ptr) ) return false;
+			this->psHint = kPSHint_MainLast;
+			setTokenInfo(kPS_ADOContainsXMP,containsXMPStartpos,ioBuf.filePos+ioBuf.ptr-ioBuf.data-containsXMPStartpos);
+			containsXMPHint=true;
+		}
+	} 
+	else 
+	{
+		if ( ! PostScript_Support::SkipUntilNewline(fileRef,ioBuf) ) return false;
+	}
+	return true;
+}
+
+
+// =================================================================================================
+// PostScript_MetaHandler::ExtractDocInfoDict
+// ==============================================
+//
+// Function extracts the the value of DocInfo Dictionary.The keys that are looked in the dictionary
+//	are Creator, CreationDate, ModDate, Author, Title, Subject and Keywords.Other keys for the 
+//	Dictionary are ignored
+bool PostScript_MetaHandler::ExtractDocInfoDict(IOBuffer &ioBuf)
+{
+	XMP_Uns8 ch;
+	XMP_IO* fileRef = this->parent->ioRef;
+	XMP_Int64 endofDocInfo=(ioBuf.ptr-ioBuf.data)+ioBuf.filePos;
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+	if ( IsWhitespace (*ioBuf.ptr))
+	{
+		//skip the whitespaces
+		if ( ! ( PostScript_Support::SkipTabsAndSpaces(fileRef, ioBuf))) return false;
+		//check the pdfmark
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsPdfmarkString.length() ) ) return false;
+		if ( ! CheckBytes ( ioBuf.ptr,  Uns8Ptr(kPSContainsPdfmarkString.c_str()), kPSContainsPdfmarkString.length() ) ) return false;
+		//reverse the direction to collect data
+		while(true)
+		{
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			ch=*ioBuf.ptr;
+			--ioBuf.ptr;
+			if (ch=='/') break;//slash of /DOCINFO
+		} 
+		//skip white spaces
+		while(true)
+		{
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			if (!IsWhitespace(*ioBuf.ptr)) break;
+			--ioBuf.ptr;
+		} 
+						
+		bool findingkey=false;
+		std::string key, value;
+		while(true)
+		{
+			XMP_Uns32 noOfMarks=0;
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			if (*ioBuf.ptr==')')
+			{
+				--ioBuf.ptr;
+				while(true)
+				{
+					//get the string till '('
+					if (*ioBuf.ptr=='(')
+					{
+						if(findingkey)
+						{
+							reverse(key.begin(), key.end());
+							reverse(value.begin(), value.end());
+							RegisterKeyValue(key,value);
+						}
+						if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+						--ioBuf.ptr;
+						findingkey=!findingkey;
+						break;
+					}
+					else
+					{
+						if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+						if (findingkey)
+							key+=*ioBuf.ptr;
+						else
+							value+=*ioBuf.ptr;
+						--ioBuf.ptr;
+					}
+				}
+			}
+			else if(*ioBuf.ptr=='[')
+			{
+				//end of Doc Info parsing
+				//return;
+				break;
+			}
+			else
+			{
+				while(true)
+				{
+					if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+					if (findingkey)
+						key+=*ioBuf.ptr;
+					else
+						value+=*ioBuf.ptr;
+					--ioBuf.ptr;
+					if (*ioBuf.ptr=='/')
+					{
+						if(findingkey)
+						{
+							reverse(key.begin(), key.end());
+							reverse(value.begin(), value.end());
+							RegisterKeyValue(key,value);
+						}
+						if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+						--ioBuf.ptr;
+						findingkey=!findingkey;
+						break;
+					}
+					else if(IsWhitespace(*ioBuf.ptr))
+					{
+						//something not expected in Doc Info
+						break;
+					}
+				}
+			}
+			while(true)
+			{
+				if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+				if (!IsWhitespace(*ioBuf.ptr)) break;
+				--ioBuf.ptr;
+			} 
+						
+		}
+						
+		fileRef->Rewind();	
+		FillBuffer (fileRef, endofDocInfo, &ioBuf );
+		return true;
+	}//white space not after DOCINFO
+	return false;
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::ParsePSFile
+// ===================================
+//
+// Main parser for the Post script file.This is where all the DSC comments , Docinfo key value pairs 
+// and other insertion related Data is looked for and stored
+void PostScript_MetaHandler::ParsePSFile()
+{
+	bool     found = false;
+	IOBuffer ioBuf;
+
+	XMP_IO* fileRef = this->parent->ioRef;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	//Determine the file type PS or EPS
+	if ( ! PostScript_Support::IsValidPSFile(fileRef,this->fileformat) ) return ; 
+	// Check for the binary EPSF preview header.
+
+	fileRef->Rewind();
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, 4 ) ) return ;
+	XMP_Uns32 fileheader = GetUns32BE ( ioBuf.ptr );
+
+	if ( fileheader == 0xC5D0D3C6 ) 
+	{
+
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, 30 ) ) return ;
+
+		XMP_Uns32 psOffset = GetUns32LE ( ioBuf.ptr+4 );	// PostScript offset.
+		XMP_Uns32 psLength = GetUns32LE ( ioBuf.ptr+8 );	// PostScript length.
+
+		setTokenInfo(kPS_EndPostScript,psOffset+psLength,0);
+		MoveToOffset ( fileRef, psOffset, &ioBuf );
+
+	}
+
+	while ( true ) 
+	{
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "PostScript_MetaHandler::FindPostScriptHint - User abort", kXMPErr_UserAbort );
+		}
+
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsForString.length() ) ) return ;
+
+		if ( (CheckFileSpace ( fileRef, &ioBuf, kPSEndCommentString.length() )&& 
+				CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSEndCommentString.c_str()), kPSEndCommentString.length() )
+				)|| *ioBuf.ptr!='%' || !(*(ioBuf.ptr+1)>32 && *(ioBuf.ptr+1)<=126 )) // implicit endcomment check
+		{
+			if (CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSEndCommentString.c_str()), kPSEndCommentString.length() ))
+			{
+				setTokenInfo(kPS_EndComments,ioBuf.filePos+ioBuf.ptr-ioBuf.data,kPSEndCommentString.length());
+				ioBuf.ptr+=kPSEndCommentString.length();
+			}
+			else
+			{
+				setTokenInfo(kPS_EndComments,ioBuf.filePos+ioBuf.ptr-ioBuf.data,0);
+			}
+			// Found "%%EndComments", look for docInfo Dictionary
+			// skip past the end of this line.
+			while(true)
+			{
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return ;
+				if (! IsWhitespace (*ioBuf.ptr)) break;
+				++ioBuf.ptr;
+			} 
+			// search for /DOCINFO
+			while(true)
+			{
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, 5 ) ) return ;
+				if (CheckBytes ( ioBuf.ptr, Uns8Ptr("/DOCI"), 5 ) 
+					&& CheckFileSpace ( fileRef, &ioBuf, kPSContainsDocInfoString.length() )
+					&&CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsDocInfoString.c_str()), kPSContainsDocInfoString.length() ))
+					
+				{
+					
+					ioBuf.ptr+=kPSContainsDocInfoString.length();
+					ExtractDocInfoDict(ioBuf);
+				}// DOCINFO Not found in document
+				else if(CheckBytes ( ioBuf.ptr, Uns8Ptr("%%Beg"), 5 ))
+				{//possibly one of %%BeginProlog %%BeginSetup %%BeginBinary %%BeginData 
+					// %%BeginDocument %%BeginPageSetup
+					XMP_Int64 begStartpos=ioBuf.filePos+ioBuf.ptr-ioBuf.data;
+					ioBuf.ptr+=5;
+					if (!CheckFileSpace ( fileRef, &ioBuf, 6 )) return;
+					if(CheckBytes ( ioBuf.ptr, Uns8Ptr("inProl"), 6 ))
+					{//%%BeginProlog
+						ioBuf.ptr+=6;
+						if (!CheckFileSpace ( fileRef, &ioBuf, 2 ))return;
+						if(CheckBytes ( ioBuf.ptr, Uns8Ptr("og"), 2 ))
+						{
+							ioBuf.ptr+=2;
+							setTokenInfo(kPS_BeginProlog,begStartpos,13);
+						}
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("inSetu"), 6 ))
+					{//%%BeginSetup 
+						ioBuf.ptr+=6;
+						if (!CheckFileSpace ( fileRef, &ioBuf, 1 ))return;
+						if(CheckBytes ( ioBuf.ptr, Uns8Ptr("p"), 1 ))
+						{
+							ioBuf.ptr+=1;
+							setTokenInfo(kPS_BeginSetup,begStartpos,12);
+						}
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("inBina"), 6 ))
+					{//%%BeginBinary
+						ioBuf.ptr+=6;
+						if (!CheckFileSpace ( fileRef, &ioBuf, 3 ))return;
+						if(CheckBytes ( ioBuf.ptr, Uns8Ptr("ry"), 3 ))
+						{
+							ioBuf.ptr+=3;
+							//ignore till %%EndBinary
+							while(true)
+							{
+								if (!CheckFileSpace ( fileRef, &ioBuf, 12 ))return;
+								if (CheckBytes ( ioBuf.ptr, Uns8Ptr("%%EndBinary"), 11 ))
+								{
+									ioBuf.ptr+=11;
+									if (IsWhitespace(*ioBuf.ptr))
+									{
+										ioBuf.ptr++;
+										break;
+									}
+								}
+								++ioBuf.ptr;
+							}
+						}
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("inData"), 6 ))
+					{//%%BeginData
+						ioBuf.ptr+=6;
+						if (!CheckFileSpace ( fileRef, &ioBuf, 1 ))return;
+						if(CheckBytes ( ioBuf.ptr, Uns8Ptr(":"), 1 ))
+						{
+							//ignore till %%EndData
+							while(true)
+							{
+								if (!CheckFileSpace ( fileRef, &ioBuf, 10 ))return;
+								if (CheckBytes ( ioBuf.ptr, Uns8Ptr("%%EndData"), 9 ))
+								{
+									ioBuf.ptr+=9;
+									if (IsWhitespace(*ioBuf.ptr))
+									{
+										ioBuf.ptr++;
+										break;
+									}
+								}
+								++ioBuf.ptr;
+							}
+						}
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("inDocu"), 6 ))
+					{// %%BeginDocument
+						ioBuf.ptr+=6;
+						if (!CheckFileSpace ( fileRef, &ioBuf, 5 ))return;
+						if(CheckBytes ( ioBuf.ptr, Uns8Ptr("ment:"), 5 ))
+						{
+							ioBuf.ptr+=5;
+							//ignore till %%EndDocument
+							while(true)
+							{
+								if (!CheckFileSpace ( fileRef, &ioBuf, 14 ))return;
+								if (CheckBytes ( ioBuf.ptr, Uns8Ptr("%%EndDocument"), 13 ))
+								{
+									ioBuf.ptr+=13;
+									if (IsWhitespace(*ioBuf.ptr))
+									{
+										ioBuf.ptr++;
+										break;
+									}
+								}
+								++ioBuf.ptr;
+							}
+						}
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("inPage"), 6 ))
+					{// %%BeginPageSetup
+						ioBuf.ptr+=6;
+						if (!CheckFileSpace ( fileRef, &ioBuf, 5 ))return;
+						if(CheckBytes ( ioBuf.ptr, Uns8Ptr("Setup"), 5 ))
+						{
+							ioBuf.ptr+=5;
+							setTokenInfo(kPS_BeginPageSetup,begStartpos,16);
+						}
+					}
+				}
+				else if(CheckBytes ( ioBuf.ptr, Uns8Ptr("%%End"), 5 ))
+				{//possibly %%EndProlog %%EndSetup %%EndPageSetup %%EndPageComments
+					XMP_Int64 begStartpos=ioBuf.filePos+ioBuf.ptr-ioBuf.data;
+					ioBuf.ptr+=5;
+					if ( ! CheckFileSpace ( fileRef, &ioBuf, 5 ) ) return ;
+					if (CheckBytes ( ioBuf.ptr, Uns8Ptr("Prolo"), 5 ))
+					{// %%EndProlog
+						ioBuf.ptr+=5;
+						if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return ;
+						if (CheckBytes ( ioBuf.ptr, Uns8Ptr("g"), 1 ))
+						{
+							ioBuf.ptr+=1;
+							setTokenInfo(kPS_EndProlog,begStartpos,11);
+						}
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("Setup"), 5 ))
+					{//%%EndSetup
+						ioBuf.ptr+=5;
+						setTokenInfo(kPS_EndSetup,begStartpos,10);
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("PageS"), 5 ))
+					{//%%EndPageSetup
+						ioBuf.ptr+=5;
+						if ( ! CheckFileSpace ( fileRef, &ioBuf, 4 ) ) return ;
+						if (CheckBytes ( ioBuf.ptr, Uns8Ptr("etup"), 4 ))
+						{
+							ioBuf.ptr+=4;
+							setTokenInfo(kPS_EndPageSetup,begStartpos,14);
+						}
+					}
+					else if (CheckBytes ( ioBuf.ptr, Uns8Ptr("PageC"), 5 ))
+					{//%%EndPageComments
+						ioBuf.ptr+=5;
+						if ( ! CheckFileSpace ( fileRef, &ioBuf, 7 ) ) return ;
+						if (CheckBytes ( ioBuf.ptr, Uns8Ptr("omments"), 7 ))
+						{
+							ioBuf.ptr+=7;
+							setTokenInfo(kPS_EndPageComments,begStartpos,17);
+						}
+					}
+				}
+				else if(CheckBytes ( ioBuf.ptr, Uns8Ptr("%%Pag"), 5 ))
+				{
+					XMP_Int64 begStartpos=ioBuf.filePos+ioBuf.ptr-ioBuf.data;
+					ioBuf.ptr+=5;
+					if ( ! CheckFileSpace ( fileRef, &ioBuf, 2 ) ) return ;
+					if (CheckBytes ( ioBuf.ptr, Uns8Ptr(":"), 2 ))
+					{
+						ioBuf.ptr+=2;
+						while(!IsNewline(*ioBuf.ptr))
+						{
+							if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return ;
+							++ioBuf.ptr;
+						}
+						setTokenInfo(kPS_Page,begStartpos,ioBuf.filePos+ioBuf.ptr-ioBuf.data-begStartpos);
+					}
+
+				}
+				else if(CheckBytes ( ioBuf.ptr, Uns8Ptr("%%Tra"), 5 ))
+				{
+					XMP_Int64 begStartpos=ioBuf.filePos+ioBuf.ptr-ioBuf.data;
+					ioBuf.ptr+=5;
+					if ( ! CheckFileSpace ( fileRef, &ioBuf, 4 ) ) return ;
+					if (CheckBytes ( ioBuf.ptr, Uns8Ptr("iler"), 4 ))
+					{
+						ioBuf.ptr+=4;
+						// See bug https://bugs.freedesktop.org/show_bug.cgi?id=105206
+						// Ensure we don't get past the limit if
+						// the data is bogus.
+						while(ioBuf.ptr < ioBuf.limit &&
+						      !IsNewline(*ioBuf.ptr)) {
+							++ioBuf.ptr;
+						}
+						setTokenInfo(kPS_Trailer,begStartpos,ioBuf.filePos+ioBuf.ptr-ioBuf.data-begStartpos);
+					}
+				}
+				else if(CheckBytes ( ioBuf.ptr, Uns8Ptr("%%EOF"), 5 ))
+				{
+					ioBuf.ptr+=5;
+					setTokenInfo(kPS_EOF,ioBuf.filePos+ioBuf.ptr-ioBuf.data,5);
+				}
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return ;
+				++ioBuf.ptr;
+			}
+			//dont have to search after this DOCINFO last thing 
+			return;
+
+		}else if (!(kPS_Creator & dscFlags) && 
+			 CheckFileSpace ( fileRef, &ioBuf, kPSContainsForString.length() )&&
+			CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsForString.c_str()), kPSContainsForString.length() ))
+		{
+			ioBuf.ptr+=kPSContainsForString.length();
+			if ( ! ExtractDSCCommentValue(ioBuf,kPS_dscFor) ) return ;
+		}
+		else if (!(kPS_CreatorTool & dscFlags) &&
+			 CheckFileSpace ( fileRef, &ioBuf, kPSContainsCreatorString.length() )&&
+			 CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsCreatorString.c_str()), kPSContainsCreatorString.length() ))
+		{
+			ioBuf.ptr+=kPSContainsCreatorString.length();
+			if ( ! ExtractDSCCommentValue(ioBuf,kPS_dscCreator) ) return ;
+		}
+		else if (!(kPS_CreateDate & dscFlags) &&
+			 CheckFileSpace ( fileRef, &ioBuf, kPSContainsCreateDateString.length() )&&
+			CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsCreateDateString.c_str()), kPSContainsCreateDateString.length() ))
+		{
+			
+			ioBuf.ptr+=kPSContainsCreateDateString.length();
+			if ( ! ExtractDSCCommentValue(ioBuf,kPS_dscCreateDate) ) return ;
+		}
+		else if (!(kPS_Title & dscFlags) &&
+			 CheckFileSpace ( fileRef, &ioBuf, kPSContainsTitleString.length() )&&
+			CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsTitleString.c_str()), kPSContainsTitleString.length() ))
+		{
+						
+			ioBuf.ptr+=kPSContainsTitleString.length();
+			if ( ! ExtractDSCCommentValue(ioBuf,kPS_dscTitle) ) return ;
+		}
+		else if( CheckFileSpace ( fileRef, &ioBuf, kPSContainsXMPString.length() )&&
+			 (  CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsXMPString.c_str()), kPSContainsXMPString.length()    ) )) {
+
+			// Found "%ADO_ContainsXMP:", look for the main packet location option.
+			
+			XMP_Int64 containsXMPStartpos=ioBuf.filePos+ioBuf.ptr-ioBuf.data;
+			ioBuf.ptr += kPSContainsXMPString.length();
+			ExtractContainsXMPHint(ioBuf,containsXMPStartpos);
+
+		}	// Found "%ADO_ContainsXMP:".
+		//Some other DSC comments skip past the end of this line.
+		if ( ! PostScript_Support::SkipUntilNewline(fileRef,ioBuf) ) return ;
+
+	}	// Outer marker loop.
+
+	return ;	// Should never reach here.
+
+}	
+
+// =================================================================================================
+// PostScript_MetaHandler::ReadXMPPacket
+// =====================================
+//
+// Helper method read the raw xmp into a string from a file
+void PostScript_MetaHandler::ReadXMPPacket (std::string & xmpPacket )
+{
+	if ( packetInfo.length == 0 ) XMP_Throw ( "ReadXMPPacket - No XMP packet", kXMPErr_BadXMP );
+
+	xmpPacket.erase();
+	xmpPacket.reserve ( packetInfo.length );
+	xmpPacket.append ( packetInfo.length, ' ' );
+
+	XMP_StringPtr packetStr = XMP_StringPtr ( xmpPacket.c_str() );	// Don't set until after reserving the space!
+
+	this->parent->ioRef->Seek ( packetInfo.offset, kXMP_SeekFromStart );
+	this->parent->ioRef->ReadAll ( (char*)packetStr, packetInfo.length );
+
+}	// ReadXMPPacket
+
+
+// =================================================================================================
+// PostScript_MetaHandler::RegisterKeyValue
+// =========================================
+//
+// Helper method registers the Key value pairs for the DocInfo dictionary and sets the Appriopriate 
+// DocInfo flags
+void PostScript_MetaHandler::RegisterKeyValue(std::string& key, std::string& value)
+{
+	size_t vallen=value.length();
+	if (key.length()==0||vallen==0)
+	{
+		key.clear();
+		value.clear();
+		return;
+	}
+	for (size_t index=0;index<vallen;index++)
+	{
+		if ((unsigned char)value[index]>127)
+		{
+			key.clear();
+			value.clear();
+			return;
+		}
+	}
+	switch (key[0])
+	{	
+		case 'A': // probably Author
+			{
+				if (!key.compare("Author"))
+				{
+					nativeMeta[kPS_docInfoAuthor]=value;
+					docInfoFlags|=kPS_Creator;
+				}
+			break;
+			}
+		case 'C': //probably Creator or CreationDate
+			{
+				if (!key.compare("Creator"))
+				{
+					nativeMeta[kPS_docInfoCreator]=value;
+					docInfoFlags|=kPS_CreatorTool;
+				}
+				else if (!key.compare("CreationDate"))
+				{
+					nativeMeta[kPS_docInfoCreateDate]=value;
+					docInfoFlags|=kPS_CreateDate;
+				}
+				break;
+			}
+		case 'T': // probably Title
+			{				
+				if (!key.compare("Title"))
+				{
+					nativeMeta[kPS_docInfoTitle]=value;
+					docInfoFlags|=kPS_Title;
+				}
+				break;
+			}
+		case 'S':// probably Subject
+			{
+				if (!key.compare("Subject"))
+				{
+					nativeMeta[kPS_docInfoSubject]=value;
+					docInfoFlags|=kPS_Description;
+				}
+				break;
+			}
+		case 'K':// probably Keywords
+			{
+				if (!key.compare("Keywords"))
+				{
+					nativeMeta[kPS_docInfoKeywords]=value;
+					docInfoFlags|=kPS_Subject;
+				}
+				break;
+			}
+		case 'M': // probably ModDate 
+			{
+				if (!key.compare("ModDate"))
+				{
+					nativeMeta[kPS_docInfoModDate]=value;
+					docInfoFlags|=kPS_ModifyDate;
+				}
+				break;
+			}
+		default: //ignore everything else
+			{
+				;
+			}
+	}
+	key.clear();
+	value.clear();
+}
+
+
+// =================================================================================================
+// PostScript_MetaHandler::ReconcileXMP
+// =========================================
+//
+// Helper method that facilitates the read time reconcilliation of native metadata
+
+void PostScript_MetaHandler::ReconcileXMP( const std::string &xmpStr, std::string *outStr ) 
+{
+	SXMPMeta xmp;
+	xmp.ParseFromBuffer( xmpStr.c_str(), xmpStr.length() );
+	// Adding creator Toll if any 
+	if (!xmp.DoesPropertyExist ( kXMP_NS_XMP,"CreatorTool" ))
+	{
+		if(docInfoFlags&kPS_CreatorTool)
+		{
+			xmp.SetProperty( kXMP_NS_XMP, "CreatorTool", nativeMeta[kPS_docInfoCreator] );
+		}
+		else if (dscFlags&kPS_CreatorTool)
+		{
+			xmp.SetProperty( kXMP_NS_XMP, "CreatorTool", nativeMeta[kPS_dscCreator] );
+		}
+	}
+	if (!xmp.DoesPropertyExist ( kXMP_NS_XMP,"CreateDate" ))
+	{
+		if(docInfoFlags&kPS_CreateDate && nativeMeta[kPS_docInfoCreateDate].length()>0)
+		{
+			std::string xmpdate=PostScript_Support::ConvertToDate(nativeMeta[kPS_docInfoCreateDate].c_str());
+			if (xmpdate.length()>0)
+			{
+				xmp.SetProperty( kXMP_NS_XMP, "CreateDate", xmpdate );
+			}
+		}
+		else if (dscFlags&kPS_CreateDate&& nativeMeta[kPS_dscCreateDate].length()>0)
+		{
+			std::string xmpdate=PostScript_Support::ConvertToDate(nativeMeta[kPS_dscCreateDate].c_str());
+			xmp.SetProperty( kXMP_NS_XMP, "CreateDate", xmpdate );
+		}
+	}
+	if (!xmp.DoesPropertyExist ( kXMP_NS_XMP,"ModifyDate" ))
+	{
+		if(docInfoFlags&kPS_ModifyDate && nativeMeta[kPS_docInfoModDate].length()>0)
+		{
+			std::string xmpdate=PostScript_Support::ConvertToDate(nativeMeta[kPS_docInfoModDate].c_str());
+			if (xmpdate.length()>0)
+			{
+				xmp.SetProperty( kXMP_NS_XMP, "ModifyDate", xmpdate );
+			}
+		}
+	}
+	if (!xmp.DoesPropertyExist ( kXMP_NS_DC,"creator" ))
+	{
+		if(docInfoFlags&kPS_Creator)
+		{
+			xmp.AppendArrayItem ( kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered,
+										   nativeMeta[kPS_docInfoAuthor] );
+		}
+		else if ( dscFlags&kPS_Creator)
+		{
+			xmp.AppendArrayItem ( kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered,
+										   nativeMeta[kPS_dscFor] );
+		}
+	}
+	if (!xmp.DoesPropertyExist ( kXMP_NS_DC,"title" ))
+	{
+		if(docInfoFlags&kPS_Title)
+		{
+			xmp.SetLocalizedText( kXMP_NS_DC, "title",NULL,"x-default", nativeMeta[kPS_docInfoTitle] );
+		}
+		else if ( dscFlags&kPS_Title)
+		{
+			xmp.SetLocalizedText( kXMP_NS_DC, "title",NULL,"x-default", nativeMeta[kPS_dscTitle] );
+		}
+	}
+	if (!xmp.DoesPropertyExist ( kXMP_NS_DC,"description" ))
+	{
+		if(docInfoFlags&kPS_Description)
+		{
+			xmp.SetLocalizedText( kXMP_NS_DC, "description",NULL,"x-default", nativeMeta[kPS_docInfoSubject] );
+		}
+	}
+	if (!xmp.DoesPropertyExist ( kXMP_NS_DC,"subject" ))
+	{
+		if(docInfoFlags&kPS_Subject)
+		{
+			xmp.AppendArrayItem( kXMP_NS_DC, "subject", kXMP_PropArrayIsUnordered,
+								nativeMeta[kPS_docInfoKeywords], kXMP_NoOptions );
+		}
+	}
+
+	if (packetInfo.length>0)
+	{
+		try
+		{
+			xmp.SerializeToBuffer( outStr, kXMP_ExactPacketLength|kXMP_UseCompactFormat,packetInfo.length);
+		}
+		catch(...)
+		{
+			xmp.SerializeToBuffer( outStr, kXMP_UseCompactFormat,0);
+		}
+	}
+	else
+	{
+		xmp.SerializeToBuffer( outStr, kXMP_UseCompactFormat,0);
+	}
+}
+
+
+// =================================================================================================
+// PostScript_MetaHandler::CacheFileData
+// =====================================
+void PostScript_MetaHandler::CacheFileData()
+{
+	this->containsXMP = false;
+	this->psHint = kPSHint_NoMarker;
+	ParsePSFile();
+
+	if ( this->psHint == kPSHint_MainFirst ) {
+		this->containsXMP = FindFirstPacket();
+	} else if ( this->psHint == kPSHint_MainLast ) {
+		this->containsXMP = FindLastPacket();
+	}else
+	{
+		//find first packet in case of NoMain or absence of hint
+		//When inserting new packet should be inserted in front 
+		//any other existing packet
+		FindFirstPacket();
+	}
+	if ( this->containsXMP )
+	{
+		ReadXMPPacket ( xmpPacket );
+	}
+}	// PostScript_MetaHandler::CacheFileData
+
+// =================================================================================================
+// PostScript_MetaHandler::ProcessXMP
+// ==================================
+void PostScript_MetaHandler::ProcessXMP()
+{
+	
+	XMP_Assert ( ! this->processedXMP );
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	std::string xmptempStr=xmpPacket;
+
+	//Read time reconciliation with native metadata
+	try
+	{
+		ReconcileXMP(xmptempStr, &xmpPacket);
+	}
+	catch(...)
+	{
+	}
+	if ( ! this->xmpPacket.empty() ) 
+	{
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen)this->xmpPacket.size();
+		this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+	}
+	if (xmpPacket.length()>0)
+	{
+		this->containsXMP = true;	// Assume we had something for the XMP.
+	}
+}
+
+
+// =================================================================================================
+// PostScript_MetaHandler::modifyHeader
+// =====================================
+//
+// Method modifies the header (if one is present) for the postscript offset, tiff offset etc. 
+//	when an XMP update resulted in increase in the file size(non-inplace updates)
+void PostScript_MetaHandler::modifyHeader(XMP_IO* fileRef,XMP_Int64 extrabytes,XMP_Int64 offset )
+{
+	//change the header
+	IOBuffer temp;
+	fileRef->Rewind();
+	if ( ! CheckFileSpace ( fileRef, &temp, 4 ) ) return ;
+	XMP_Uns32 fileheader = GetUns32BE ( temp.ptr );
+
+	if ( fileheader == 0xC5D0D3C6 ) 
+	{
+		XMP_Uns8 buffLE[4];
+		if ( ! CheckFileSpace ( fileRef, &temp, 32 ) ) return ;
+		XMP_Uns32 psLength = GetUns32LE ( temp.ptr+8 );	// PostScript length.
+		if (psLength>0)
+		{
+			psLength+=extrabytes;
+			PutUns32LE ( psLength, buffLE);
+			fileRef->Seek ( 8, kXMP_SeekFromStart );
+			fileRef->Write(buffLE,4);
+		}
+		XMP_Uns32 wmfOffset = GetUns32LE ( temp.ptr+12 );	// WMF offset.
+		if (wmfOffset>0 && wmfOffset>offset)
+		{
+			wmfOffset+=extrabytes;
+			PutUns32LE ( wmfOffset, buffLE);
+			fileRef->Seek ( 12, kXMP_SeekFromStart );
+			fileRef->Write(buffLE,4);
+		}
+						
+		XMP_Uns32 tiffOffset = GetUns32LE ( temp.ptr+20 );	// Tiff offset.
+		if (tiffOffset>0 && tiffOffset>offset)
+		{
+			tiffOffset+=extrabytes;
+			PutUns32LE ( tiffOffset, buffLE);
+			fileRef->Seek ( 20, kXMP_SeekFromStart );
+			fileRef->Write(buffLE,4);
+		}
+		//set the checksum to 0xFFFFFFFF
+		XMP_Uns16 checksum=0xFFFF;
+		PutUns16LE ( checksum, buffLE);
+		fileRef->Seek ( 28, kXMP_SeekFromStart );
+		fileRef->Write(buffLE,2);
+	}
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::DetermineUpdateMethod
+// =============================================
+//
+// The policy followed to update a Postscript file is
+//	a) if the update can fit into the existing xpacket size, go for inplace update.
+//	b) If sub file decode filter is used to embed the metadata expand the metadata 
+//		and the move the rest contents(after the xpacket) by some calc offset.
+//  c) If some other method is used to embed the xpacket readstring or readline
+//		insert a new metadata xpacket before the existing xpacket.
+//	The preference to use these methods is in the same order a , b and then c
+//  DetermineUpdateMethod helps to decide which method be used for the given
+//	input file
+//
+UpdateMethod PostScript_MetaHandler::DetermineUpdateMethod(std::string & outStr)
+{
+	SXMPMeta xmp;
+	std::string &    xmpPacket  = this->xmpPacket;
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+	xmp.ParseFromBuffer( xmpPacket.c_str(), xmpPacket.length() );
+	if (packetInfo.length>0)
+	{
+		try
+		{
+			//First try to fit the modified XMP data into existing XMP packet length
+			//prefers Inplace
+			xmp.SerializeToBuffer( &outStr, kXMP_ExactPacketLength|kXMP_UseCompactFormat,packetInfo.length);
+		}
+		catch(...)
+		{
+			// if it doesnt fit :(
+			xmp.SerializeToBuffer( &outStr, kXMP_UseCompactFormat,0);
+		}
+	}
+	else
+	{
+		// this will be the case for Injecting new metadata
+		xmp.SerializeToBuffer( &outStr, kXMP_UseCompactFormat,0);
+	}
+	if ( this->containsXMPHint && (outStr.size() == (size_t)packetInfo.length) )
+	{
+		return kPS_Inplace;
+	}
+	else if (this->containsXMPHint && PostScript_Support::IsSFDFilterUsed(this->parent->ioRef,packetInfo.offset))
+	{
+		return kPS_ExpandSFDFilter;
+	}
+	else
+	{
+		return kPS_InjectNew;
+	}
+
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::InplaceUpdate
+// =====================================
+//
+// Method does the inplace update of the metadata
+void PostScript_MetaHandler::InplaceUpdate (std::string &outStr,XMP_IO* &tempRef ,bool doSafeUpdate)
+{
+	
+	XMP_IO*      fileRef		= this->parent->ioRef;
+	XMP_Int64	 pos			= 0;
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+	//Inplace update of metadata
+	if (!doSafeUpdate)
+	{
+		if ( progressTracker != 0 )  progressTracker->AddTotalWork ((float) outStr.length() );
+		fileRef->Seek(packetInfo.offset,kXMP_SeekFromStart);
+		fileRef->Write((void *)outStr.c_str(), static_cast<XMP_Uns32>(outStr.length()));
+	}
+	else
+	{
+		if ( ! tempRef ) tempRef=fileRef->DeriveTemp();
+		pos=fileRef->Length();
+		if ( progressTracker != 0 )  progressTracker->AddTotalWork ((float) pos );
+		//copy data till xmp Packet
+		fileRef->Seek(0,kXMP_SeekFromStart);
+		XIO::Copy ( fileRef, tempRef, packetInfo.offset, this->parent->abortProc, this->parent->abortArg );
+
+		//insert the new XMP packet
+		fileRef->Seek(packetInfo.offset+packetInfo.length,kXMP_SeekFromStart);
+		tempRef->Write((void *)outStr.c_str(), static_cast<XMP_Uns32>(outStr.length()));
+
+		//copy the rest of data
+		XIO::Copy ( fileRef, tempRef,pos-packetInfo.offset-packetInfo.length, this->parent->abortProc, this->parent->abortArg );
+	}
+}
+
+
+// =================================================================================================
+// PostScript_MetaHandler::ExpandingSFDFilterUpdate
+// ================================================
+//
+// Method updates the metadata by expanding it
+void PostScript_MetaHandler::ExpandingSFDFilterUpdate (std::string &outStr,XMP_IO* &tempRef ,bool doSafeUpdate)
+{
+	//If SubFileDecode Filter is present expanding the
+	//existing metadata is easy 
+
+	XMP_IO*      fileRef		= this->parent->ioRef;
+	XMP_Int64	 pos			= 0;
+	XMP_Int32 extrapacketlength=outStr.length()-packetInfo.length;
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;	
+	if ( progressTracker != 0 )  progressTracker->AddTotalWork ((float) (extrapacketlength + fileRef->Length() -packetInfo.offset+14) );
+	if (!doSafeUpdate)
+	{
+		size_t bufSize=extrapacketlength/(kIOBufferSize) +1*(extrapacketlength!=(kIOBufferSize));
+		std::vector<IOBuffer> tempfilebuffer1(bufSize);
+		IOBuffer temp;
+		XMP_Int64 readpoint=packetInfo.offset+packetInfo.length,writepoint=packetInfo.offset;
+		fileRef->Seek ( readpoint, kXMP_SeekFromStart );
+					
+		for(size_t x=0;x<bufSize;x++)
+		{
+			tempfilebuffer1[x].len=fileRef->Read(tempfilebuffer1[x].data,kIOBufferSize,false);
+			readpoint+=tempfilebuffer1[x].len;
+		}
+
+		fileRef->Seek ( writepoint, kXMP_SeekFromStart );
+		fileRef->Write( (void *)outStr.c_str(), static_cast<XMP_Uns32>(outStr.length()));
+		writepoint+=static_cast<XMP_Uns32>(outStr.length());
+		size_t y=0;
+		bool continueread=(tempfilebuffer1[bufSize-1].len==kIOBufferSize);
+		size_t loop=bufSize;
+		while(loop)
+		{
+			if(continueread)
+			{
+				fileRef->Seek ( readpoint, kXMP_SeekFromStart );
+				temp.len=fileRef->Read(temp.data,kIOBufferSize,false);
+				readpoint+=temp.len;
+			}
+			fileRef->Seek ( writepoint, kXMP_SeekFromStart );
+			fileRef->Write(tempfilebuffer1[y].data,tempfilebuffer1[y].len);
+			writepoint+=tempfilebuffer1[y].len;
+			if (continueread)
+				tempfilebuffer1[y]=temp;
+			else
+				--loop;
+			if (temp.len<kIOBufferSize)continueread=false;
+			y=(y+1)%bufSize;
+		}
+
+		modifyHeader(fileRef,extrapacketlength,packetInfo.offset );
+	}
+	else
+	{
+		if ( progressTracker != 0 )  progressTracker->AddTotalWork ((float) (packetInfo.offset) );
+		if ( ! tempRef ) tempRef=fileRef->DeriveTemp();
+		//copy data till xmp Packet
+		fileRef->Seek(0,kXMP_SeekFromStart);
+		XIO::Copy ( fileRef, tempRef, packetInfo.offset, this->parent->abortProc, this->parent->abortArg );
+
+		//insert the new XMP packet
+		fileRef->Seek(packetInfo.offset+packetInfo.length,kXMP_SeekFromStart);
+		tempRef->Write((void *)outStr.c_str(), static_cast<XMP_Uns32>(outStr.length()));
+
+		//copy the rest of data
+		pos=fileRef->Length();
+		XIO::Copy ( fileRef, tempRef,pos-packetInfo.offset-packetInfo.length,  this->parent->abortProc, this->parent->abortArg );
+		modifyHeader(tempRef,extrapacketlength,packetInfo.offset );
+	}
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::DetermineInsertionOffsets
+// =============================================
+//
+// Method determines the offsets at which the new xpacket and other postscript code be inserted
+void PostScript_MetaHandler::DetermineInsertionOffsets(XMP_Int64& ADOhintOffset,XMP_Int64& InjectData1Offset,
+							XMP_Int64& InjectData3Offset)
+{
+	//find the position to place ADOContainsXMP hint
+	if(psHint!=kPSHint_MainFirst && (fileformat==kXMP_EPSFile||kXMPFiles_UnknownLength==packetInfo.offset))
+	{
+		TokenLocation& tokenLoc= getTokenInfo(kPS_ADOContainsXMP);
+		if(tokenLoc.offsetStart==-1)
+		{
+			TokenLocation& tokenLoc1= getTokenInfo(kPS_EndComments);
+			if(tokenLoc1.offsetStart==-1)
+			{
+				//should never reach here
+				throw XMP_Error(kXMPErr_BadFileFormat,"%%EndComment Missing");
+			}
+			ADOhintOffset=tokenLoc1.offsetStart;
+		}
+		else
+		{
+			ADOhintOffset= tokenLoc.offsetStart;
+		}
+	}
+	else if (psHint!=kPSHint_MainLast &&fileformat==kXMP_PostScriptFile)
+	{
+		TokenLocation& tokenLoc= getTokenInfo(kPS_ADOContainsXMP);
+		if(tokenLoc.offsetStart==-1)
+		{
+			TokenLocation& tokenLoc1= getTokenInfo(kPS_EndComments);
+			if(tokenLoc1.offsetStart==-1)
+			{
+				//should never reach here
+				throw XMP_Error(kXMPErr_BadFileFormat,"%%EndComment Missing");
+			}
+			ADOhintOffset=tokenLoc1.offsetStart;
+		}
+		else
+		{
+			ADOhintOffset= tokenLoc.offsetStart;
+		}
+	}
+	//Find the location to insert kEPS_Injectdata1
+	XMP_Uns64 xpacketLoc;
+	if ( (fileformat == kXMP_PostScriptFile) && (kXMPFiles_UnknownLength != packetInfo.offset) )
+	{
+		xpacketLoc = (XMP_Uns64)lastPacketInfo.offset;
+		TokenLocation& endPagsetuploc = getTokenInfo(kPS_EndPageSetup);
+		if ( (endPagsetuploc.offsetStart > -1) && (xpacketLoc < (XMP_Uns64)endPagsetuploc.offsetStart) )
+		{
+			InjectData1Offset=endPagsetuploc.offsetStart;
+		}
+		else
+		{
+			TokenLocation& trailerloc= getTokenInfo(kPS_Trailer);
+			if ( (trailerloc.offsetStart > -1) && (xpacketLoc < (XMP_Uns64)trailerloc.offsetStart) )
+			{
+				InjectData1Offset=trailerloc.offsetStart;
+			}
+			else
+			{
+				TokenLocation& eofloc= getTokenInfo(kPS_EOF);
+				if ( (eofloc.offsetStart > -1) && (xpacketLoc < (XMP_Uns64)eofloc.offsetStart) )
+				{
+					InjectData1Offset=eofloc.offsetStart;
+				}
+				else
+				{
+					TokenLocation& endPostScriptloc= getTokenInfo(kPS_EndPostScript);
+					if ( (endPostScriptloc.offsetStart > -1) && (xpacketLoc < (XMP_Uns64)endPostScriptloc.offsetStart) )
+					{
+						InjectData1Offset=endPostScriptloc.offsetStart;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		xpacketLoc = (XMP_Uns64)firstPacketInfo.offset;
+		TokenLocation& endPagsetuploc = getTokenInfo(kPS_EndPageSetup);
+		if ( (endPagsetuploc.offsetStart > -1) && (xpacketLoc > (XMP_Uns64)endPagsetuploc.offsetStart) )
+		{
+			InjectData1Offset=endPagsetuploc.offsetStart;
+		}
+		else 
+		{
+			TokenLocation& beginPagsetuploc= getTokenInfo(kPS_BeginPageSetup);
+			if ( (beginPagsetuploc.offsetStart > -1) &&
+				 (xpacketLoc > (XMP_Uns64)(beginPagsetuploc.offsetStart + beginPagsetuploc.tokenlen)) )
+			{
+				InjectData1Offset=beginPagsetuploc.offsetStart+beginPagsetuploc.tokenlen;
+			}
+			else
+			{
+				TokenLocation& endPageCommentsloc= getTokenInfo(kPS_EndPageComments);
+				if ( (endPageCommentsloc.offsetStart > -1) &&
+					 (xpacketLoc > (XMP_Uns64)(endPageCommentsloc.offsetStart + endPageCommentsloc.tokenlen)) )
+				{
+					InjectData1Offset=endPageCommentsloc.offsetStart+endPageCommentsloc.tokenlen;
+				}
+				else
+				{
+					TokenLocation& pageLoc= getTokenInfo(kPS_Page);
+					if ( (pageLoc.offsetStart > -1) &&
+						 (xpacketLoc > (XMP_Uns64)(pageLoc.offsetStart + pageLoc.tokenlen)) )
+					{
+						InjectData1Offset=pageLoc.offsetStart+pageLoc.tokenlen;
+					}
+					else
+					{
+						TokenLocation& endSetupLoc= getTokenInfo(kPS_EndSetup);
+						if ( (endSetupLoc.offsetStart > -1) && (xpacketLoc > (XMP_Uns64)endSetupLoc.offsetStart) )
+						{
+							InjectData1Offset=endSetupLoc.offsetStart;
+						}
+						else
+						{
+							TokenLocation& beginSetupLoc= getTokenInfo(kPS_BeginSetup);
+							if ( (beginSetupLoc.offsetStart > -1) &&
+								 (xpacketLoc > (XMP_Uns64)(beginSetupLoc.offsetStart + beginSetupLoc.tokenlen)) )
+							{
+								InjectData1Offset=beginSetupLoc.offsetStart+beginSetupLoc.tokenlen;
+							}
+							else
+							{
+								TokenLocation& endPrologLoc= getTokenInfo(kPS_EndProlog);
+								if ( (endPrologLoc.offsetStart > -1) &&
+									 (xpacketLoc > (XMP_Uns64)(endPrologLoc.offsetStart + endPrologLoc.tokenlen)) )
+								{
+									InjectData1Offset=endPrologLoc.offsetStart+endPrologLoc.tokenlen;
+								}
+								else
+								{
+									TokenLocation& endCommentsLoc= getTokenInfo(kPS_EndComments);
+									if ( (endCommentsLoc.offsetStart > -1) &&
+										 (xpacketLoc > (XMP_Uns64)(endCommentsLoc.offsetStart + endCommentsLoc.tokenlen)) )
+									{
+										InjectData1Offset=endCommentsLoc.offsetStart+endCommentsLoc.tokenlen;
+									}
+									else
+									{
+										//should never reach here
+										throw XMP_Error(kXMPErr_BadFileFormat,"%%EndComment Missing");
+									}
+								}
+
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+					
+	//Find the location to insert kEPS_Injectdata3
+	TokenLocation& trailerloc= getTokenInfo(kPS_Trailer);
+	if(trailerloc.offsetStart>-1 )
+	{
+		InjectData3Offset=trailerloc.offsetStart+trailerloc.tokenlen;
+	}
+	else
+	{
+		TokenLocation& eofloc= getTokenInfo(kPS_EOF);
+		if(eofloc.offsetStart>-1 )
+		{
+			InjectData3Offset=eofloc.offsetStart;
+		}
+		else
+		{
+			TokenLocation& endPostScriptloc= getTokenInfo(kPS_EndPostScript);
+			if(endPostScriptloc.offsetStart>-1 )
+			{
+				InjectData3Offset=endPostScriptloc.offsetStart;
+			}
+		}
+	}
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::InsertNewUpdate
+// =======================================
+//
+// Method inserts a new Xpacket in the postscript file.This will be called in two cases
+//	a) If there is no xpacket in the PS file
+//	b) If the existing xpacket is embedded using readstring or readline method
+void PostScript_MetaHandler::InsertNewUpdate (std::string &outStr,XMP_IO* &tempRef,bool doSafeUpdate )
+{
+	// In this case it is better to have safe update 
+	// as non-safe update implementation is going to be complex 
+	// and more time consuming 
+	// ignoring doSafeUpdate for this update method
+
+	//No SubFileDecode Filter 
+	// Need to insert new Metadata before existing metadata
+	// with SubFileDecode Filter
+	
+	XMP_IO*      fileRef		= this->parent->ioRef;	
+	if ( ! tempRef ) tempRef=fileRef->DeriveTemp();
+	//inject metadata at the right place
+	XMP_Int64 ADOhintOffset=-1,InjectData1Offset=-1,InjectData3Offset=-1;
+	DetermineInsertionOffsets(ADOhintOffset,InjectData1Offset,InjectData3Offset);
+	XMP_Int64 tempInjectData1Offset=InjectData1Offset;
+	fileRef->Rewind();
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;	
+	if ( progressTracker != 0 )  
+	{
+		progressTracker->AddTotalWork ((float) ( fileRef->Length() +outStr.length() + 14) );
+		if (fileformat==kXMP_EPSFile)
+		{
+			progressTracker->AddTotalWork ((float) ( kEPS_Injectdata1.length() + kEPS_Injectdata2.length() + kEPS_Injectdata3.length()) );
+		}
+		else
+		{
+			progressTracker->AddTotalWork ((float) ( kPS_Injectdata1.length() + kPS_Injectdata2.length()) );
+		}
+	}
+	XMP_Int64 totalReadLength=0;
+	//copy contents from orignal file to Temp File
+	if(ADOhintOffset!=-1)
+	{
+		XIO::Copy(fileRef,tempRef,ADOhintOffset,this->parent->abortProc,this->parent->abortArg);
+		totalReadLength+=ADOhintOffset;
+		if (fileformat==kXMP_EPSFile || kXMPFiles_UnknownLength==packetInfo.offset)
+		{
+			if ( progressTracker != 0 )  progressTracker->AddTotalWork ((float) ( kPS_XMPHintMainFirst.length()) );
+			tempRef->Write(kPS_XMPHintMainFirst.c_str(),kPS_XMPHintMainFirst.length());
+		}
+		else
+		{
+			if ( progressTracker != 0 )  progressTracker->AddTotalWork ((float) ( kPS_XMPHintMainLast.length()) );
+			tempRef->Write(kPS_XMPHintMainLast.c_str(),kPS_XMPHintMainLast.length());
+		}
+	}
+	InjectData1Offset-=totalReadLength;
+	XIO::Copy(fileRef,tempRef,InjectData1Offset,this->parent->abortProc,this->parent->abortArg);
+	totalReadLength+=InjectData1Offset;
+	if (fileformat==kXMP_EPSFile)
+	{
+		tempRef->Write(kEPS_Injectdata1.c_str(),kEPS_Injectdata1.length());
+		tempRef->Write((void *)outStr.c_str(), static_cast<XMP_Uns32>(outStr.length()));
+		tempRef->Write(kEPS_Injectdata2.c_str(),kEPS_Injectdata2.length());
+	}
+	else
+	{
+		tempRef->Write(kPS_Injectdata1.c_str(),kPS_Injectdata1.length());
+		tempRef->Write((void *)outStr.c_str(), static_cast<XMP_Uns32>(outStr.length()));
+		tempRef->Write(kPS_Injectdata2.c_str(),kPS_Injectdata2.length());
+	}
+	if (InjectData3Offset!=-1)
+	{
+		InjectData3Offset-=totalReadLength;
+		XIO::Copy(fileRef,tempRef,InjectData3Offset,this->parent->abortProc,this->parent->abortArg);
+		totalReadLength+=InjectData3Offset;
+		if (fileformat==kXMP_EPSFile)
+		{
+			tempRef->Write(kEPS_Injectdata3.c_str(),kEPS_Injectdata3.length());
+		}
+		XMP_Int64 remlength=fileRef->Length()-totalReadLength;
+		XIO::Copy(fileRef,tempRef,remlength,this->parent->abortProc,this->parent->abortArg);
+		totalReadLength+=remlength;
+	}
+	else
+	{
+		XMP_Int64 remlength=fileRef->Length()-totalReadLength;
+		XIO::Copy(fileRef,tempRef,remlength,this->parent->abortProc,this->parent->abortArg);
+		totalReadLength+=remlength;
+		if (fileformat==kXMP_EPSFile)
+		{
+			tempRef->Write(kEPS_Injectdata3.c_str(),kEPS_Injectdata3.length());
+		}
+	}
+	XMP_Int64 extraBytes;
+	if (fileformat==kXMP_EPSFile )
+	{
+		extraBytes=((ADOhintOffset!=-1)?kPS_XMPHintMainFirst.length():0)+kEPS_Injectdata3.length()+kEPS_Injectdata2.length()+
+			kEPS_Injectdata1.length()+outStr.length();
+	}
+	else
+	{
+		extraBytes=((ADOhintOffset!=-1)?(kXMPFiles_UnknownLength!=packetInfo.offset?kPS_XMPHintMainLast.length():kPS_XMPHintMainFirst.length()):0)+kPS_Injectdata2.length()+kPS_Injectdata1.length()+outStr.length();
+	}
+	modifyHeader(tempRef,extraBytes,tempInjectData1Offset );
+}
+
+// =================================================================================================
+// PostScript_MetaHandler::UpdateFile
+// ==================================
+//
+// Virtual Method implementation to update XMP metadata in a PS file 
+void PostScript_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	IgnoreParam ( doSafeUpdate );
+	if ( ! this->needsUpdate ) return;
+
+	XMP_IO *	tempRef			= 0;
+	XMP_IO*      fileRef		= this->parent->ioRef;
+	std::string &    xmpPacket  = this->xmpPacket;
+	std::string outStr;
+	
+	if (!fileRef )
+	{
+		XMP_Throw ( "Invalid File Refernce Cannot update XMP", kXMPErr_BadOptions );
+	}
+	bool localProgressTracking = false;
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;	
+	if ( progressTracker != 0 ) 
+	{
+		if ( ! progressTracker->WorkInProgress() ) 
+		{
+			localProgressTracking = true;
+			progressTracker->BeginWork ();
+		}
+	}
+	try
+	{	switch(DetermineUpdateMethod(outStr))
+		{
+			case kPS_Inplace:
+			{
+				InplaceUpdate ( outStr, tempRef, doSafeUpdate );
+				break;
+			}
+			case kPS_ExpandSFDFilter:
+			{
+				ExpandingSFDFilterUpdate ( outStr, tempRef, doSafeUpdate );
+				break;
+			}
+			case kPS_InjectNew:
+			{
+				InsertNewUpdate ( outStr, tempRef, doSafeUpdate );
+				break;
+			}
+			case kPS_None:
+			default:
+			{
+				XMP_Throw ( "XMP Write Failed ", kXMPErr_BadOptions );
+			}
+		}
+	}
+	catch(...)
+	{
+		if( tempRef ) fileRef->DeleteTemp();
+		throw;
+	}
+	// rename the modified temp file and then delete the temp file
+	if ( tempRef ) fileRef->AbsorbTemp();
+	if ( localProgressTracking ) progressTracker->WorkComplete();
+	this->needsUpdate = false;
+
+}	// PostScript_MetaHandler::UpdateFile
+
+
+// =================================================================================================
+// PostScript_MetaHandler::UpdateFile
+// ==================================
+//
+//  Method to write the file with updated XMP metadata to the passed temp file reference
+void PostScript_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_IO* origRef = this->parent->ioRef;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+
+	XMP_Int64 fileLen = origRef->Length();
+	
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+	if ( progressTracker != 0 )  progressTracker->BeginWork ((float) fileLen );
+	origRef->Rewind ( );
+	tempRef->Truncate ( 0 );
+	XIO::Copy ( origRef, tempRef, fileLen, abortProc, abortArg );
+
+	try 
+	{
+		this->parent->ioRef = tempRef;	// ! Make UpdateFile update the temp.
+		this->UpdateFile ( false );
+		this->parent->ioRef = origRef;
+	} 
+	catch ( ... ) 
+	{
+		this->parent->ioRef = origRef;
+		throw;
+	}
+	
+	if ( progressTracker != 0 ) progressTracker->WorkComplete();
+}
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.hpp b/XMPFiles/source/FileHandlers/PostScript_Handler.hpp
new file mode 100644
index 0000000..7bff0fc
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/PostScript_Handler.hpp
@@ -0,0 +1,147 @@
+#ifndef __PostScript_Handler_hpp__
+#define __PostScript_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/FormatSupport/PostScript_Support.hpp"
+
+
+
+// =================================================================================================
+/// \file PostScript_Handler.hpp
+/// \brief File format handler for PostScript and EPS files.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler * PostScript_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool PostScript_CheckFormat ( XMP_FileFormat format,
+									 XMP_StringPtr  filePath,
+			                         XMP_IO *       fileRef,
+			                         XMPFiles *     parent );
+
+static const XMP_OptionBits kPostScript_HandlerFlags = (
+		kXMPFiles_CanInjectXMP
+		|kXMPFiles_CanExpand
+		|kXMPFiles_CanRewrite
+		|kXMPFiles_PrefersInPlace
+		|kXMPFiles_CanReconcile
+		|kXMPFiles_AllowsOnlyXMP
+		|kXMPFiles_ReturnsRawPacket
+		|kXMPFiles_AllowsSafeUpdate 
+		|kXMPFiles_CanNotifyProgress );
+
+class PostScript_MetaHandler : public XMPFileHandler
+{
+public:
+
+	PostScript_MetaHandler ( XMPFiles * parent );
+	~PostScript_MetaHandler();
+
+	void CacheFileData(); 
+	void UpdateFile ( bool doSafeUpdate );
+	void ProcessXMP ( );
+	void WriteTempFile ( XMP_IO* tempRef );
+
+	int psHint;
+	/* Structure used to keep
+		Track of Tokens in 
+		EPS files
+	*/
+	struct TokenLocation{
+		//offset from the begining of the file 
+		// at which the token string starts
+		XMP_Int64 offsetStart;
+		//Total length of the token string
+		XMP_Int64 tokenlen;
+		TokenLocation():offsetStart(-1),tokenlen(0)
+		{}
+	};
+protected:
+	//Determines the postscript hint in the DSC comments
+	int FindPostScriptHint();
+
+	// Helper methods to get the First or the Last packet from the 
+	// PS file based upon the PostScript hint that is present in the PS file
+	bool FindFirstPacket();
+	bool FindLastPacket();
+
+	
+	//Facilitates read time reconciliation of PS native metadata
+	void ReconcileXMP( const std::string &xmpStr, std::string *outStr );
+
+	//Facilitates reading of XMP packet , if one exists
+	void ReadXMPPacket ( std::string & xmpPacket);
+
+	// Parses the PS file to record th epresence and location of 
+	// XMP packet and native metadata in the file
+	void ParsePSFile();
+
+	// Helper function to record the native metadata key/avlue pairs 
+	// when parsing the PS file
+	void RegisterKeyValue(std::string& key, std::string& value);
+
+	// Helper Function to record the location and length of the Tokens
+	// in the opened PS file
+	void setTokenInfo(TokenFlag tFlag,XMP_Int64 offset,XMP_Int64 length);
+
+	// Getter to get the location of a token ina PS file.
+	TokenLocation& getTokenInfo(TokenFlag tFlag);
+
+	//modifies the Binary Header of a PS file as per the modifications
+	void modifyHeader(XMP_IO* fileRef,XMP_Int64 extrabytes,XMP_Int64 offset );
+
+	//Extract the values for different DSC comments
+	bool ExtractDSCCommentValue(IOBuffer &ioBuf,NativeMetadataIndex index);
+
+	//Extract value for ADO_ContainsXMP Comment
+	bool ExtractContainsXMPHint(IOBuffer &ioBuf,XMP_Int64 containsXMPStartpos);
+	
+	//Extract values from DocInfo Dict
+	bool ExtractDocInfoDict(IOBuffer &ioBuf);
+
+	//Determine the update method to be used 
+	UpdateMethod DetermineUpdateMethod(std::string & outStr);
+	void DetermineInsertionOffsets(XMP_Int64& ADOhintOffset,XMP_Int64& InjectData1Offset,
+							XMP_Int64& InjectData3Offset);
+	//Different update methods
+	void InplaceUpdate (std::string &outStr,XMP_IO* &tempRef, bool doSafeUpdate);
+	void ExpandingSFDFilterUpdate (std::string &outStr,XMP_IO* &tempRef, bool doSafeUpdate );
+	void InsertNewUpdate ( std::string &outStr,XMP_IO* &tempRef, bool doSafeUpdate );
+private:
+	//Flag tracks DSC comments 
+	XMP_Uns32 dscFlags;
+	//Flag tracks DOCINFO keys
+	XMP_Uns32 docInfoFlags;
+	//stores the native metadata values. Index values an enum var NativeMetadataIndex
+	std::string nativeMeta[kPS_MaxNativeIndexValue];
+	//all offsets are to the end of the comment after atleast one whitespace
+	TokenLocation fileTokenInfo[25];
+	//Indicates the presence of both XMP hint and XMP
+	bool containsXMPHint;
+	//Keeps track whether a PS or EPS
+	XMP_FileFormat fileformat;
+	//keep the first packet info
+	XMP_PacketInfo firstPacketInfo;	
+	//keep the last packet info
+	XMP_PacketInfo lastPacketInfo;	
+
+};	// PostScript_MetaHandler
+
+// =================================================================================================
+
+#endif /* __PostScript_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp
new file mode 100644
index 0000000..7d6fdb3
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp
@@ -0,0 +1,356 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/RIFF.hpp"
+#include "XMPFiles/source/FileHandlers/RIFF_Handler.hpp"
+#include "source/XIO.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file RIFF_Handler.cpp
+/// \brief File format handler for RIFF.
+// =================================================================================================
+
+// =================================================================================================
+// RIFF_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * RIFF_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new RIFF_MetaHandler ( parent );
+}
+
+// =================================================================================================
+// RIFF_CheckFormat
+// ===============
+//
+// An RIFF file must begin with "RIFF", a 4 byte length, then the chunkType (AVI or WAV)
+// The specified length MUST (in practice: SHOULD) match fileSize-8, but we don't bother checking this here.
+
+bool RIFF_CheckFormat ( XMP_FileFormat  format,
+					   XMP_StringPtr    filePath,
+			           XMP_IO*      	file,
+			           XMPFiles*        parent )
+{
+	IgnoreParam(format); IgnoreParam(parent);
+	XMP_Assert ( (format == kXMP_AVIFile) || (format == kXMP_WAVFile) );
+
+	if ( file->Length() < 12 ) return false;
+	file ->Rewind();
+
+	XMP_Uns8 chunkID[12];
+	file->ReadAll ( chunkID, 12 );
+	if ( ! CheckBytes( &chunkID[0], "RIFF", 4 )) return false;
+
+	if ( CheckBytes(&chunkID[8],"AVI ",4) && format == kXMP_AVIFile ) return true;
+	if ( CheckBytes(&chunkID[8],"WAVE",4) && format == kXMP_WAVFile ) return true;
+
+	return false;
+
+}	// RIFF_CheckFormat
+
+// =================================================================================================
+// RIFF_MetaHandler::RIFF_MetaHandler
+// ================================
+
+RIFF_MetaHandler::RIFF_MetaHandler ( XMPFiles * _parent )
+{
+	this->parent = _parent;
+	this->handlerFlags = kRIFF_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	this->oldFileSize = this->newFileSize = this->trailingGarbageSize = 0;
+	this->level = 0;
+	this->listInfoChunk = this->listTdatChunk = 0;
+	this->dispChunk = this->bextChunk = this->cr8rChunk = this->prmlChunk = 0;
+	this->xmpChunk = 0;
+	this->lastChunk = 0;
+	this->hasListInfoINAM = false;
+}
+
+// =================================================================================================
+// RIFF_MetaHandler::~RIFF_MetaHandler
+// =================================
+
+RIFF_MetaHandler::~RIFF_MetaHandler()
+{
+	while ( ! this->riffChunks.empty() )
+	{
+		delete this->riffChunks.back();
+		this->riffChunks.pop_back();
+	}
+}
+
+// =================================================================================================
+// RIFF_MetaHandler::CacheFileData
+// ==============================
+
+void RIFF_MetaHandler::CacheFileData()
+{
+	this->containsXMP = false; //assume for now
+
+	XMP_IO* file = this->parent->ioRef;
+	this->oldFileSize = file ->Length();
+	if ( (this->parent->format == kXMP_WAVFile) && (this->oldFileSize > 0xFFFFFFFF) )
+		XMP_Throw ( "RIFF_MetaHandler::CacheFileData: WAV Files larger 4GB not supported", kXMPErr_Unimplemented );
+
+	file ->Rewind();
+	this->level = 0;
+
+	// parse top-level chunks (most likely just one, except large avi files)
+	XMP_Int64 filePos = 0;
+	while ( filePos < this->oldFileSize )
+	{
+
+		this->riffChunks.push_back( (RIFF::ContainerChunk*) RIFF::getChunk( NULL, this ) );
+
+		// Tolerate limited forms of trailing garbage in a file. Some apps append private data.
+
+		filePos = file->Offset();
+		XMP_Int64 fileTail = this->oldFileSize - filePos;
+
+		if ( fileTail != 0 ) {
+
+			if ( fileTail < 12 ) {
+
+				this->oldFileSize = filePos;	// Pretend the file is smaller.
+				this->trailingGarbageSize = fileTail;
+
+			} else if ( this->parent->format == kXMP_WAVFile ) {
+
+				if ( fileTail < 1024*1024 ) {
+					this->oldFileSize = filePos;	// Pretend the file is smaller.
+					this->trailingGarbageSize = fileTail;
+				} else {
+					XMP_Throw ( "Excessive garbage at end of file", kXMPErr_BadFileFormat )
+				}
+
+			} else {
+
+				XMP_Int32 chunkInfo [3];
+				file->ReadAll ( &chunkInfo, 12 );
+				file->Seek ( -12, kXMP_SeekFromCurrent );
+				if ( (GetUns32LE ( &chunkInfo[0] ) != RIFF::kChunk_RIFF) || (GetUns32LE ( &chunkInfo[2] ) != RIFF::kType_AVIX) ) {
+					if ( fileTail < 1024*1024 ) {
+						this->oldFileSize = filePos;	// Pretend the file is smaller.
+						this->trailingGarbageSize = fileTail;
+					} else {
+						XMP_Throw ( "Excessive garbage at end of file", kXMPErr_BadFileFormat )
+					}
+				}
+
+			}
+
+		}
+
+	}
+
+	// covered before => internal error if it occurs
+	XMP_Validate( file->Offset() == this->oldFileSize,
+		          "RIFF_MetaHandler::CacheFileData: unknown data at end of file",
+				  kXMPErr_InternalFailure );
+
+}	// RIFF_MetaHandler::CacheFileData
+
+// =================================================================================================
+// RIFF_MetaHandler::ProcessXMP
+// ============================
+
+void RIFF_MetaHandler::ProcessXMP()
+{
+	SXMPUtils::RemoveProperties ( &this->xmpObj, 0, 0, kXMPUtil_DoAllProperties );
+	// process physical packet first
+	if ( this->containsXMP ) this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	// then import native properties:
+	RIFF::importProperties( this );
+	this->processedXMP = true;
+}
+
+// =================================================================================================
+// RIFF_MetaHandler::UpdateFile
+// ===========================
+
+void RIFF_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	XMP_Validate( this->needsUpdate, "nothing to update", kXMPErr_InternalFailure );
+
+	////////////////////////////////////////////////////////////////////////////////////////
+	//////////// PASS 1: basics, exports, packet reserialze
+	XMP_IO* file = this->parent->ioRef;
+	RIFF::containerVect *rc = &this->riffChunks;
+
+	//temptemp
+	//printf( "BEFORE:\n%s\n", rc->at(0)->toString().c_str() );
+
+	XMP_Enforce( rc->size() >= 1);
+	RIFF::ContainerChunk* mainChunk = rc->at(0);
+	this->lastChunk = rc->at( rc->size() - 1 );  // (may or may not coincide with mainChunk: )
+	XMP_Enforce( mainChunk != NULL );
+
+	RIFF::relocateWronglyPlacedXMPChunk( this );
+	// [2435625] lifted disablement for AVI
+	RIFF::exportAndRemoveProperties( this );
+
+	// always rewrite both LISTs (implicit size changes, e.g. through 0-term corrections may
+	// have very well led to size changes...)
+	// set XMP packet info, re-serialize
+	this->packetInfo.charForm = stdCharForm;
+	this->packetInfo.writeable = true;
+	this->packetInfo.offset = kXMPFiles_UnknownOffset;
+	this->packetInfo.length = kXMPFiles_UnknownLength;
+
+	// re-serialization ( needed because of above exportAndRemoveProperties() )
+	try {
+		if ( this->xmpChunk == 0 ) // new chunk? pad with 2K
+			this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_NoOptions , 2048 );
+		else // otherwise try to match former size
+			this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_ExactPacketLength , (XMP_Uns32) this->xmpChunk->oldSize-8 );
+	}   catch ( ... ) { // if that fails, be happy with whatever.
+			this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_NoOptions );
+	}
+
+	if ( (this->xmpPacket.size() & 1) == 1 ) this->xmpPacket += ' ';	// Force the XMP to have an even size.
+
+	// if missing, add xmp packet at end:
+	if( this->xmpChunk == 0 )
+		this->xmpChunk = new RIFF::XMPChunk( this->lastChunk );
+	// * parenting happens within this call.
+	// * size computation will happen in XMPChunk::changesAndSize()
+	// * actual data will be set in XMPChunk::write()
+
+	////////////////////////////////////////////////////////////////////////////////////////
+	// PASS 2: compute sizes, optimize container structure (no writing yet)
+	{
+		this->newFileSize = 0;
+
+		// note: going through forward (not vice versa) is an important condition,
+		// so that parking LIST:Tdat,Cr8r, PrmL to last chunk is doable
+		// when encountered en route
+		for ( XMP_Uns32 chunkNo = 0; chunkNo < rc->size(); chunkNo++ )
+		{
+			RIFF::Chunk* cur = rc->at(chunkNo);
+			cur->changesAndSize( this );
+			this->newFileSize += cur->newSize;
+			if ( this->newFileSize % 2 == 1 ) this->newFileSize++; // pad byte
+		}
+		this->newFileSize += this->trailingGarbageSize;
+	} // PASS2
+
+	////////////////////////////////////////////////////////////////////////////////////////
+	// PASS 2a: verify no chunk violates 2GB boundaries
+	switch( this->parent->format )
+	{
+		// NB: <4GB for ALL chunks asserted before in ContainerChunk::changesAndSize()
+
+		case kXMP_AVIFile:
+			// ensure no chunk (single or multi, no matter) crosses 2 GB ...
+			for ( XMP_Int32 chunkNo = 0; chunkNo < (XMP_Int32)rc->size(); chunkNo++ )
+			{
+				if ( rc->at(chunkNo)->oldSize <= 0x80000000LL ) // ... if <2GB before
+					XMP_Validate( rc->at(chunkNo)->newSize <= 0x80000000LL,
+							"Chunk grew beyond 2 GB", kXMPErr_Unimplemented );
+			}
+
+			// compatibility: if single-chunk AND below <1GB, ensure <1GB
+			if ( ( rc->size() > 1 ) && ( rc->at(0)->oldSize < 0x40000000 ) )
+			{
+				 XMP_Validate( rc->at(0)->newSize < 0x40000000LL, "compatibility: mainChunk must remain < 1GB" , kXMPErr_Unimplemented );
+			}
+
+			// [2473381] compatibility: if single-chunk AND >2GB,<4GB, ensure <4GB
+			if ( ( rc->size() > 1 ) &&
+				 ( rc->at(0)->oldSize >  0x80000000LL ) && // 2GB
+				 ( rc->at(0)->oldSize < 0x100000000LL ) )  // 4GB
+			{
+				 XMP_Validate( rc->at(0)->newSize < 0x100000000LL, "compatibility: mainChunk must remain < 4GB" , kXMPErr_Unimplemented );
+			}
+
+			break;
+
+		case kXMP_WAVFile:
+			XMP_Validate( 1 == rc->size(), "WAV must be single-chunk", kXMPErr_InternalFailure );
+			XMP_Validate( rc->at(0)->newSize <= 0xFFFFFFFFLL, "WAV above 4 GB not supported", kXMPErr_Unimplemented );
+			break;
+
+		default:
+			XMP_Throw( "unknown format", kXMPErr_InternalFailure );
+	}
+
+	////////////////////////////////////////////////////////////////////////////////////////
+	// PASS 3: write avix chunk(s) if applicable (shrinks or stays)
+	//         and main chunk. -- operation order depends on mainHasShrunk.
+	{
+		// if needed, extend file beforehand
+		if ( this->newFileSize > this->oldFileSize ) {
+			file->Seek ( newFileSize, kXMP_SeekFromStart );
+			file->Rewind();
+		}
+
+		RIFF::Chunk* mainChunk = rc->at(0);
+
+		XMP_Int64 mainGrowth = mainChunk->newSize - mainChunk->oldSize;
+		XMP_Enforce( mainGrowth >= 0 ); // main always stays or grows
+
+		//temptemp
+		//printf( "AFTER:\n%s\n", rc->at(0)->toString().c_str() );
+
+		if ( rc->size() > 1 ) // [2457482]
+			XMP_Validate( mainGrowth == 0, "mainChunk must not grow, if multiple RIFF chunks", kXMPErr_InternalFailure );
+
+		// back to front:
+
+		XMP_Int64 avixStart = newFileSize; // count from the back
+
+		if ( this->trailingGarbageSize != 0 ) {
+			XMP_Int64 goodDataEnd = this->newFileSize - this->trailingGarbageSize;
+			XIO::Move ( file, this->oldFileSize, file, goodDataEnd, this->trailingGarbageSize );
+			avixStart = goodDataEnd;
+		}
+
+		for ( XMP_Int32 chunkNo = ((XMP_Int32)rc->size()) -1; chunkNo >= 0; chunkNo-- )
+		{
+			RIFF::Chunk* cur = rc->at(chunkNo);
+
+			avixStart -= cur->newSize;
+			if ( avixStart % 2 == 1 ) // rewind one more
+				avixStart -= 1;
+
+			file->Seek ( avixStart , kXMP_SeekFromStart  );
+
+			if ( cur->hasChange ) // need explicit write-out ?
+				cur->write( this, file, chunkNo == 0 );
+			else // or will a simple move do?
+			{
+				XMP_Enforce( cur->oldSize == cur->newSize );
+				if ( cur->oldPos != avixStart ) // important optimization: only move if there's a need to
+					XIO::Move( file, cur->oldPos, file, avixStart, cur->newSize );
+			}
+		}
+
+		// if needed, shrink file afterwards
+		if ( this->newFileSize < this->oldFileSize ) file->Truncate ( this->newFileSize  );
+	} // PASS 3
+
+	this->needsUpdate = false; //do last for safety
+}	// RIFF_MetaHandler::UpdateFile
+
+// =================================================================================================
+// RIFF_MetaHandler::WriteTempFile
+// ===============================
+
+void RIFF_MetaHandler::WriteTempFile ( XMP_IO* tempRef  )
+{
+	IgnoreParam( tempRef );
+	XMP_Throw ( "RIFF_MetaHandler::WriteTempFile: Not supported (must go through UpdateFile", kXMPErr_Unavailable );
+}
+
diff --git a/XMPFiles/source/FileHandlers/RIFF_Handler.hpp b/XMPFiles/source/FileHandlers/RIFF_Handler.hpp
new file mode 100644
index 0000000..d8c83a2
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/RIFF_Handler.hpp
@@ -0,0 +1,73 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 __RIFF_Handler_hpp__
+#define __RIFF_Handler_hpp__	1
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/RIFF_Support.hpp"
+#include "source/XIO.hpp"
+
+// =================================================================================================
+/// \file RIFF_Handler.hpp
+/// \brief File format handler for RIFF (AVI, WAV).
+// =================================================================================================
+
+extern XMPFileHandler * RIFF_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool RIFF_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+			                  XMP_IO *       fileRef,
+			                  XMPFiles *     parent );
+
+static const XMP_OptionBits kRIFF_HandlerFlags = (kXMPFiles_CanInjectXMP |
+												  kXMPFiles_CanExpand |
+												  kXMPFiles_PrefersInPlace |
+												  kXMPFiles_AllowsOnlyXMP |
+												  kXMPFiles_ReturnsRawPacket |
+												  kXMPFiles_CanReconcile
+												 );
+
+class RIFF_MetaHandler : public XMPFileHandler
+{
+public:
+	RIFF_MetaHandler ( XMPFiles* parent );
+	~RIFF_MetaHandler();
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+
+	////////////////////////////////////////////////////////////////////////////////////
+	// instance vars
+	// most often just one RIFF:* (except for AVI,[AVIX] >1 GB)
+	std::vector<RIFF::ContainerChunk*> riffChunks;
+	XMP_Int64 oldFileSize, newFileSize, trailingGarbageSize;
+
+	// state variables, needed during parsing
+	XMP_Uns8  level;
+
+	RIFF::ContainerChunk *listInfoChunk, *listTdatChunk;
+	RIFF::ValueChunk* dispChunk;
+	RIFF::ValueChunk* bextChunk;
+	RIFF::ValueChunk* cr8rChunk;
+	RIFF::ValueChunk* prmlChunk;
+	RIFF::XMPChunk* xmpChunk;
+	RIFF::ContainerChunk* lastChunk;
+	bool hasListInfoINAM; // needs to be known for the special 3-way merge around dc:title
+
+};	// RIFF_MetaHandler
+
+// =================================================================================================
+
+#endif /* __RIFF_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.cpp b/XMPFiles/source/FileHandlers/SWF_Handler.cpp
new file mode 100644
index 0000000..3266e94
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/SWF_Handler.cpp
@@ -0,0 +1,337 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/SWF_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/SWF_Support.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file SWF_Handler.hpp
+/// \brief File format handler for SWF.
+///
+/// This handler ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// SWF_MetaHandlerCTor
+// ===================
+
+XMPFileHandler * SWF_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new SWF_MetaHandler ( parent );
+
+}	// SWF_MetaHandlerCTor
+
+// =================================================================================================
+// SWF_CheckFormat
+// ===============
+
+bool SWF_CheckFormat ( XMP_FileFormat format,
+					   XMP_StringPtr  filePath,
+                       XMP_IO *       fileRef,
+                       XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_SWFFile );
+	
+	// Make sure the file is long enough for an empty SWF stream. Check the signature.
+
+	if ( fileRef->Length() < (XMP_Int64)SWF_IO::HeaderPrefixSize ) return false;
+
+	fileRef->Rewind();
+	XMP_Uns8 buffer [4];
+	fileRef->ReadAll ( buffer, 4 );
+	XMP_Uns32 signature = GetUns32LE ( &buffer[0] ) & 0xFFFFFF;	// Discard the version byte.
+	
+	return ( (signature == SWF_IO::CompressedSignature) || (signature == SWF_IO::ExpandedSignature) );
+
+}	// SWF_CheckFormat
+
+// =================================================================================================
+// SWF_MetaHandler::SWF_MetaHandler
+// ================================
+
+SWF_MetaHandler::SWF_MetaHandler ( XMPFiles * _parent )
+	: isCompressed(false), hasFileAttributes(false), hasMetadata(false), brokenSWF(false), expandedSize(0), firstTagOffset(0)
+{
+	this->parent = _parent;
+	this->handlerFlags = kSWF_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}
+
+// =================================================================================================
+// SWF_MetaHandler::~SWF_MetaHandler
+// =================================
+
+SWF_MetaHandler::~SWF_MetaHandler()
+{
+	// Nothing to do at this time.
+}
+
+// =================================================================================================
+// SWF_MetaHandler::CacheFileData
+// ==============================
+//
+// SWF files are pretty small, have simple metadata, and often have ZIP compression. Because they
+// are small and often compressed, we always cache the fully expanded SWF in memory. That is used
+// for both reading and updating. Note that SWF_CheckFormat has already done basic checks on the
+// size and signature, they don't need to be repeated here.
+//
+// Try to find the FileAttributes and Metadata tags, saving their offsets for later use if updating
+// the file. We need to be tolerant when reading, allowing the FileAttributes tag to be anywhere and
+// allowing Metadata without FileAttributes or with the HasMetadata flag clear. The SWF spec is not
+// clear enough about the rules for SWF 7 and earlier, there are 3rd party tools that don't put
+// FileAttributes first.
+
+void SWF_MetaHandler::CacheFileData() {
+
+	XMP_Assert ( (! this->processedXMP) && (! this->containsXMP) );
+	XMP_Assert ( this->expandedSWF.empty() );
+
+	XMP_IO * fileRef = this->parent->ioRef;
+	XMP_Int64 fileLength = fileRef->Length();
+	XMP_Enforce ( fileLength <= SWF_IO::MaxExpandedSize );
+
+	// Get the uncompressed SWF stream into memory.
+	
+	fileRef->Rewind();
+	XMP_Uns8 buffer [SWF_IO::HeaderPrefixSize];	// Read the uncompressed file header prefix.
+	fileRef->ReadAll ( buffer, SWF_IO::HeaderPrefixSize );
+
+	XMP_Uns32 signature = GetUns32LE ( &buffer[0] ) & 0xFFFFFF;	// Discard the version byte.
+	this->expandedSize = GetUns32LE ( &buffer[4] );
+	if ( signature == SWF_IO::CompressedSignature ) this->isCompressed = true;
+	
+	if ( this->isCompressed ) {
+	
+		// Expand the SWF file into memory.
+		this->expandedSWF.reserve ( this->expandedSize );	// Try to avoid reallocations.
+		SWF_IO::DecompressFileToMemory ( fileRef, &this->expandedSWF );
+		this->expandedSize = this->expandedSWF.size();	// Use the true length.
+	
+	} else {
+	
+		// Read the entire uncompressed file into memory.
+		this->expandedSize = (XMP_Uns32)fileLength;	// Use the true length.
+		this->expandedSWF.insert ( this->expandedSWF.end(), (size_t)fileLength, 0 );
+		fileRef->Rewind();
+		fileRef->ReadAll ( &this->expandedSWF[0], (XMP_Uns32)fileLength );
+	
+	}
+	
+	// Look for the FileAttributes and Metadata tags.
+	
+	this->firstTagOffset = SWF_IO::FileHeaderSize ( this->expandedSWF[SWF_IO::HeaderPrefixSize] );
+	
+	XMP_Uns32 currOffset = this->firstTagOffset;
+	SWF_IO::TagInfo currTag;
+	
+	for ( ; currOffset < this->expandedSize; currOffset = SWF_IO::NextTagOffset(currTag) ) {
+	
+		bool ok = SWF_IO::GetTagInfo ( this->expandedSWF, currOffset, &currTag );
+		if ( ! ok ) {
+			this->brokenSWF = true;	// Let the read finish, but refuse to update.
+			break;
+		}
+		
+		if ( currTag.tagID == SWF_IO::FileAttributesTagID ) {
+			this->fileAttributesTag = currTag;
+			this->hasFileAttributes = true;
+			if ( this->hasMetadata ) break;	// Exit if we have both.
+		}
+		
+		if ( currTag.tagID == SWF_IO::MetadataTagID ) {
+			this->metadataTag = currTag;
+			this->hasMetadata = true;
+			if ( this->hasFileAttributes ) break;	// Exit if we have both.
+		}
+		
+	}
+	
+	if ( this->hasMetadata ) {
+		this->packetInfo.offset = SWF_IO::ContentOffset ( this->metadataTag );
+		this->packetInfo.length = this->metadataTag.contentLength;
+		this->xmpPacket.assign ( (char*)&this->expandedSWF[(size_t)this->packetInfo.offset], (size_t)this->packetInfo.length );
+		FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+		this->containsXMP = true;
+	}
+	
+}	// SWF_MetaHandler::CacheFileData
+
+// =================================================================================================
+// SWF_MetaHandler::ProcessXMP
+// ===========================
+
+void SWF_MetaHandler::ProcessXMP()
+{
+
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	if ( ! this->xmpPacket.empty() ) {
+		XMP_Assert ( this->containsXMP );
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen)this->xmpPacket.size();
+		this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+	}
+
+}	// SWF_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// XMPFileHandler::GetSerializeOptions
+// ===================================
+//
+// Override default implementation to ensure omitting XMP wrapper.
+
+XMP_OptionBits SWF_MetaHandler::GetSerializeOptions()
+{
+
+	return (kXMP_OmitPacketWrapper | kXMP_OmitAllFormatting | kXMP_OmitXMPMetaElement);
+
+} // XMPFileHandler::GetSerializeOptions
+
+// =================================================================================================
+// SWF_MetaHandler::UpdateFile
+// ===========================
+//
+// Update the expanded SWF in memory, then write it to the file.
+
+void SWF_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+
+	if ( doSafeUpdate ) XMP_Throw ( "SWF_MetaHandler::UpdateFile: Safe update not supported", kXMPErr_Unavailable );
+
+	if ( ! this->needsUpdate ) return;
+	this->needsUpdate = false; // Don't come through here twice, even if there are errors.
+	
+	if ( this->brokenSWF ) {
+		XMP_Throw ( "SWF is broken, can't update.", kXMPErr_BadFileFormat );
+	}
+	
+	// Make sure there is a FileAttributes tag at the front, with the HasMetadata flag set.
+	
+	if ( ! this->hasFileAttributes ) {
+	
+		// Insert a new FileAttributes tag as the first tag.
+		
+		XMP_Uns8 buffer [6];	// Two byte header plus four byte content.
+		PutUns16LE ( ((SWF_IO::FileAttributesTagID << 6) | 4), &buffer[0] );
+		PutUns32LE ( SWF_IO::HasMetadataMask, &buffer[2] );
+		
+		this->expandedSWF.insert ( (this->expandedSWF.begin() + this->firstTagOffset), 6, 0 );
+		memcpy ( &this->expandedSWF[this->firstTagOffset], &buffer[0], 6 );
+
+		this->hasFileAttributes = true;
+		bool ok = SWF_IO::GetTagInfo ( this->expandedSWF, this->firstTagOffset, &this->fileAttributesTag );
+		XMP_Assert ( ok );
+		
+		if ( this->hasMetadata ) this->metadataTag.tagOffset += 6;	// The Metadata tag is now further back.
+
+	} else {
+		
+		// Make sure the HasMetadata flag is set.
+		if ( this->fileAttributesTag.contentLength > 0 ) {
+			XMP_Uns32 flagsOffset = SWF_IO::ContentOffset ( this->fileAttributesTag );
+			this->expandedSWF[flagsOffset] |= SWF_IO::HasMetadataMask;
+		}
+
+		// Make sure the FileAttributes tag is the first tag.
+		if ( this->fileAttributesTag.tagOffset != this->firstTagOffset ) {
+
+			RawDataBlock attrTag;
+			XMP_Uns32 attrTagLength = SWF_IO::FullTagLength ( this->fileAttributesTag );
+			attrTag.assign ( attrTagLength, 0 );
+			memcpy ( &attrTag[0], &this->expandedSWF[this->fileAttributesTag.tagOffset], attrTagLength );
+			
+			RawDataBlock::iterator attrTagPos = this->expandedSWF.begin() + this->fileAttributesTag.tagOffset;
+			RawDataBlock::iterator attrTagEnd = attrTagPos + attrTagLength;
+			this->expandedSWF.erase ( attrTagPos, attrTagEnd );	// Remove the old FileAttributes tag;
+			
+			if ( this->hasMetadata && (this->metadataTag.tagOffset < this->fileAttributesTag.tagOffset) ) {
+				this->metadataTag.tagOffset += attrTagLength;	// The FileAttributes tag will become in front.
+			}
+			
+			this->expandedSWF.insert ( (this->expandedSWF.begin() + this->firstTagOffset), attrTagLength, 0 );
+			memcpy ( &this->expandedSWF[this->firstTagOffset], &attrTag[0], attrTagLength );
+			
+			this->fileAttributesTag.tagOffset = this->firstTagOffset;
+
+		}
+
+	}
+	
+	// Make sure the XMP is as small as possible. Write the XMP as the second tag.
+	
+	XMP_Assert ( this->hasFileAttributes );
+	
+	XMP_OptionBits smallOptions = kXMP_OmitPacketWrapper | kXMP_UseCompactFormat | kXMP_OmitAllFormatting | kXMP_OmitXMPMetaElement;
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, smallOptions );
+	
+	if ( this->hasMetadata ) {
+		// Remove the old XMP, the size and location have probably changed.
+		XMP_Uns32 oldMetaLength = SWF_IO::FullTagLength ( this->metadataTag );
+		RawDataBlock::iterator oldMetaPos = this->expandedSWF.begin() + this->metadataTag.tagOffset;
+		RawDataBlock::iterator oldMetaEnd = oldMetaPos + oldMetaLength;
+		this->expandedSWF.erase ( oldMetaPos, oldMetaEnd );
+	}
+	
+	this->metadataTag.hasLongHeader = true;
+	this->metadataTag.tagID = SWF_IO::MetadataTagID;
+	this->metadataTag.tagOffset = SWF_IO::NextTagOffset ( this->fileAttributesTag );
+	this->metadataTag.contentLength = this->xmpPacket.size();
+
+	XMP_Uns32 newMetaLength = 6 + this->metadataTag.contentLength;	// Always use a long tag header.
+	this->expandedSWF.insert ( (this->expandedSWF.begin() + this->metadataTag.tagOffset), newMetaLength, 0 );
+
+	PutUns16LE ( ((SWF_IO::MetadataTagID << 6) | SWF_IO::TagLengthMask), &this->expandedSWF[this->metadataTag.tagOffset] );
+	PutUns32LE ( this->metadataTag.contentLength, &this->expandedSWF[this->metadataTag.tagOffset+2] );
+	memcpy ( &this->expandedSWF[this->metadataTag.tagOffset+6], this->xmpPacket.c_str(), this->metadataTag.contentLength );
+
+	this->hasMetadata = true;
+	
+	// Update the uncompressed file length and rewrite the file.
+	
+	PutUns32LE ( this->expandedSWF.size(), &this->expandedSWF[4] );
+
+	XMP_IO * fileRef = this->parent->ioRef;
+	fileRef->Rewind();
+	fileRef->Truncate ( 0 );
+	
+	if ( this->isCompressed ) {
+		SWF_IO::CompressMemoryToFile ( this->expandedSWF, fileRef );
+	} else {
+		fileRef->Write ( &this->expandedSWF[0], this->expandedSWF.size() );
+	}
+
+}	// SWF_MetaHandler::UpdateFile
+
+// =================================================================================================
+// SWF_MetaHandler::WriteTempFile
+// ==============================
+
+// ! See important notes in SWF_Handler.hpp about file handling.
+
+void SWF_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+
+	// ! WriteTempFile is not supposed to be called for SWF.
+	XMP_Throw ( "SWF_MetaHandler::WriteTempFile should not be called", kXMPErr_InternalFailure );
+
+}	// SWF_MetaHandler::WriteTempFile
diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.hpp b/XMPFiles/source/FileHandlers/SWF_Handler.hpp
new file mode 100644
index 0000000..f2ca7cb
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/SWF_Handler.hpp
@@ -0,0 +1,72 @@
+#ifndef __SWF_Handler_hpp__
+#define __SWF_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/SWF_Support.hpp"
+
+// =================================================================================================
+/// \file SWF_Handler.hpp
+/// \brief File format handler for SWF.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler* SWF_MetaHandlerCTor ( XMPFiles* parent );
+
+extern bool SWF_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+                              XMP_IO *       fileRef,
+                              XMPFiles *     parent );
+
+static const XMP_OptionBits kSWF_HandlerFlags = ( kXMPFiles_CanInjectXMP |
+												  kXMPFiles_CanExpand |
+												  kXMPFiles_PrefersInPlace |
+												  kXMPFiles_AllowsOnlyXMP |
+												  kXMPFiles_ReturnsRawPacket );
+
+class SWF_MetaHandler : public XMPFileHandler {
+
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	XMP_OptionBits GetSerializeOptions();
+
+	SWF_MetaHandler ( XMPFiles* parent );
+	virtual ~SWF_MetaHandler();
+	
+private:
+
+	SWF_MetaHandler() : isCompressed(false), hasFileAttributes(false), hasMetadata(false), brokenSWF(false),
+						expandedSize(0), firstTagOffset(0) {};
+
+	bool isCompressed, hasFileAttributes, hasMetadata, brokenSWF;
+	XMP_Uns32 expandedSize, firstTagOffset;
+	RawDataBlock expandedSWF;
+	
+	SWF_IO::TagInfo fileAttributesTag, metadataTag;
+
+};	// SWF_MetaHandler
+
+// =================================================================================================
+
+#endif /* __SWF_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/Scanner_Handler.cpp b/XMPFiles/source/FileHandlers/Scanner_Handler.cpp
new file mode 100644
index 0000000..2d6308d
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Scanner_Handler.cpp
@@ -0,0 +1,347 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FormatSupport/XMPScanner.hpp"
+#include "XMPFiles/source/FileHandlers/Scanner_Handler.hpp"
+
+#include <vector>
+
+using namespace std;
+
+#if EnablePacketScanning
+
+// =================================================================================================
+/// \file Scanner_Handler.cpp
+/// \brief File format handler for packet scanning.
+///
+/// This header ...
+///
+// =================================================================================================
+
+struct CandidateInfo {
+	XMP_PacketInfo packetInfo;
+	std::string    xmpPacket;
+	SXMPMeta *     xmpObj;
+};
+
+// =================================================================================================
+// Scanner_MetaHandlerCTor
+// =======================
+
+XMPFileHandler * Scanner_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new Scanner_MetaHandler ( parent );
+
+}	// Scanner_MetaHandlerCTor
+
+// =================================================================================================
+// Scanner_MetaHandler::Scanner_MetaHandler
+// ========================================
+
+Scanner_MetaHandler::Scanner_MetaHandler ( XMPFiles * _parent )
+{
+	this->parent = _parent;
+	this->handlerFlags = kScanner_HandlerFlags;
+
+}	// Scanner_MetaHandler::Scanner_MetaHandler
+
+// =================================================================================================
+// Scanner_MetaHandler::~Scanner_MetaHandler
+// =========================================
+
+Scanner_MetaHandler::~Scanner_MetaHandler()
+{
+	// ! Inherit the base cleanup.
+
+}	// Scanner_MetaHandler::~Scanner_MetaHandler
+
+// =================================================================================================
+// PickMainPacket
+// ==============
+//
+// Pick the main packet from the vector of candidates. The rules:
+//	1. Use the manifest find containment. Prune contained packets.
+//	2. Use the metadata date to pick the most recent.
+//	3. if lenient, pick the last writeable packet, or the last if all are read only.
+
+static int
+PickMainPacket ( std::vector<CandidateInfo>& candidates, bool beLenient )
+{
+	int pkt;		// ! Must be signed.
+	int	main = -1;	// Assume the worst.
+	XMP_OptionBits options;
+
+	int metaCount = (int)candidates.size();
+	if ( metaCount == 0 ) return -1;
+	if ( metaCount == 1 ) return 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// 1. Look at each packet to see if it has a manifest. If it does, prune all of the others that
+	// this one says it contains. Hopefully we'll end up with just one packet. Note that we have to
+	// mark all the children first, then prune. Pruning on the fly means that we won't do a proper
+	// tree discovery if we prune a parent before a child. This would happen if we happened to visit
+	// a grandparent first.
+
+	int child;
+
+	std::vector<bool> pruned ( metaCount, false );
+
+	for ( pkt = 0; pkt < (int)candidates.size(); ++pkt ) {
+
+		// First see if this candidate has a manifest.
+
+		try {
+			std::string voidValue;
+			bool found = candidates[pkt].xmpObj->GetProperty ( kXMP_NS_XMP_MM, "Manifest", &voidValue, &options );
+			if ( (! found) || (! XMP_PropIsArray ( options )) ) continue;	// No manifest, or not an array.
+		} catch ( ... ) {
+			continue;	// No manifest.
+		};
+
+		// Mark all other candidates that are referred to in this manifest.
+
+		for ( child = 0; child < (int)candidates.size(); ++child ) {
+			if ( pruned[child] || (child == pkt) ) continue; // Skip already pruned ones and self.
+		}
+
+	}
+
+	// Go ahead and actually remove the marked packets.
+
+	for ( pkt = 0; pkt < (int)candidates.size(); ++pkt ) {
+		if ( pruned[pkt] ) {
+			delete candidates[pkt].xmpObj;
+			candidates[pkt].xmpObj = 0;
+			metaCount -= 1;
+		}
+	}
+
+	// We're done if the containment pruning left us with 0 or 1 candidate.
+
+	if ( metaCount == 0 ) {
+		XMP_Throw ( "GetMainPacket/PickMainPacket: Recursive containment", kXMPErr_BadXMP );
+	} else if ( metaCount == 1 ) {
+		for ( pkt = 0; pkt < (int)candidates.size(); ++pkt ) {
+			if ( candidates[pkt].xmpObj != 0 ) {
+				main = pkt;
+				break;
+			}
+		}
+	}
+
+	if ( main != -1 ) return main;	// We found the main.
+
+	// -------------------------------------------------------------------------------------------
+	// 2. Pick the packet with the most recent metadata date. If we are being lenient then missing
+	// dates are older than any real date, and equal dates pick the last packet. If we are being
+	// strict then any missing or equal dates mean we can't pick.
+
+	XMP_DateTime latestTime, currTime;
+
+	for ( pkt = 0; pkt < (int)candidates.size(); ++pkt ) {
+
+		if ( candidates[pkt].xmpObj == 0 ) continue;	// This was pruned in the manifest stage.
+
+		bool haveDate = candidates[pkt].xmpObj->GetProperty_Date ( kXMP_NS_XMP, "MetadataDate", &currTime, &options );
+
+		if ( ! haveDate ) {
+
+			if ( ! beLenient ) return -1;
+			if ( main == -1 ) {
+				main = pkt;
+				memset ( &latestTime, 0, sizeof(latestTime) );
+			}
+
+		} else if ( main == -1 ) {
+
+			main = pkt;
+			latestTime = currTime;
+
+		} else {
+
+			int timeOp = SXMPUtils::CompareDateTime ( currTime, latestTime );
+
+			if ( timeOp > 0 ) {
+				main = pkt;
+				latestTime = currTime;
+			} else if ( timeOp == 0 ) {
+				if ( ! beLenient ) return -1;
+				main = pkt;
+				latestTime = currTime;
+			}
+
+		}
+
+	}
+
+	if ( main != -1 ) return main;	// We found the main.
+
+	// --------------------------------------------------------------------------------------------
+	// 3. If we're being lenient, pick the last writeable packet, or the last if all are read only.
+
+	if ( beLenient ) {
+
+		for ( pkt = (int)candidates.size()-1; pkt >= 0; --pkt ) {
+			if ( candidates[pkt].xmpObj == 0 ) continue;	// This was pruned in the manifest stage.
+			if ( candidates[pkt].packetInfo.writeable ) {
+				main = pkt;
+				break;
+			}
+		}
+
+		if ( main == -1 ) {
+			for ( pkt = (int)candidates.size()-1; pkt >= 0; --pkt ) {
+				if ( candidates[pkt].xmpObj != 0 ) {
+					main = pkt;
+					break;
+				}
+			}
+		}
+
+	}
+
+	return main;
+
+}	// PickMainPacket
+
+// =================================================================================================
+// Scanner_MetaHandler::CacheFileData
+// ==================================
+
+void Scanner_MetaHandler::CacheFileData()
+{
+	XMP_IO* fileRef   = this->parent->ioRef;
+	bool        beLenient = XMP_OptionIsClear ( this->parent->openFlags, kXMPFiles_OpenStrictly );
+
+	int			pkt;
+	XMP_Int64	bufPos;
+	size_t		bufLen;
+	SXMPMeta *	newMeta;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *            abortArg   = this->parent->abortArg;
+	const bool        checkAbort = (abortProc != 0);
+
+	std::vector<CandidateInfo> candidates;	// ! These have SXMPMeta* fields, don't leak on exceptions.
+
+	this->containsXMP = false;
+
+	try {
+
+		// ------------------------------------------------------
+		// Scan the entire file to find all of the valid packets.
+
+		XMP_Int64  fileLen = fileRef->Length();
+		XMPScanner scanner ( fileLen );
+
+		enum { kBufferSize = 64*1024 };
+		XMP_Uns8	buffer [kBufferSize];
+
+		fileRef->Rewind();
+
+		for ( bufPos = 0; bufPos < fileLen; bufPos += bufLen ) {
+			if ( checkAbort && abortProc(abortArg) ) {
+				XMP_Throw ( "Scanner_MetaHandler::LocateXMP - User abort", kXMPErr_UserAbort );
+			}
+			bufLen = fileRef->Read ( buffer, kBufferSize );
+			if ( bufLen == 0 ) XMP_Throw ( "Scanner_MetaHandler::LocateXMP: Read failure", kXMPErr_ExternalFailure );
+			scanner.Scan ( buffer, bufPos, bufLen );
+		}
+
+		// --------------------------------------------------------------
+		// Parse the valid packet snips, building a vector of candidates.
+
+		long snipCount = scanner.GetSnipCount();
+
+		XMPScanner::SnipInfoVector snips ( snipCount );
+		scanner.Report ( snips );
+
+		for ( pkt = 0; pkt < snipCount; ++pkt ) {
+
+			if ( checkAbort && abortProc(abortArg) ) {
+				XMP_Throw ( "Scanner_MetaHandler::LocateXMP - User abort", kXMPErr_UserAbort );
+			}
+
+			// Seek to the packet then try to parse it.
+
+			if ( snips[pkt].fState != XMPScanner::eValidPacketSnip ) continue;
+			fileRef->Seek ( snips[pkt].fOffset, kXMP_SeekFromStart );
+			newMeta = new SXMPMeta();
+			std::string xmpPacket;
+			xmpPacket.reserve ( (size_t)snips[pkt].fLength );
+
+			try {
+				for ( bufPos = 0; bufPos < snips[pkt].fLength; bufPos += bufLen ) {
+					bufLen = kBufferSize;
+					if ( (bufPos + bufLen) > (size_t)snips[pkt].fLength ) bufLen = size_t ( snips[pkt].fLength - bufPos );
+					(void) fileRef->ReadAll ( buffer, (XMP_Int32)bufLen );
+					xmpPacket.append ( (const char *)buffer, bufLen );
+					newMeta->ParseFromBuffer ( (char *)buffer, (XMP_StringLen)bufLen, kXMP_ParseMoreBuffers );
+				}
+				newMeta->ParseFromBuffer ( 0, 0, kXMP_NoOptions );
+			} catch ( ... ) {
+				delete newMeta;
+				if ( beLenient ) continue;	// Skip if we're being lenient, else rethrow.
+				throw;
+			}
+
+			// It parsed OK, add it to the array of candidates.
+
+			candidates.push_back ( CandidateInfo() );
+			CandidateInfo & newInfo = candidates.back();
+			newInfo.xmpObj = newMeta;
+			newInfo.xmpPacket.swap ( xmpPacket );
+			newInfo.packetInfo.offset = snips[pkt].fOffset;
+			newInfo.packetInfo.length = (XMP_Int32)snips[pkt].fLength;
+			newInfo.packetInfo.charForm  = snips[pkt].fCharForm;
+			newInfo.packetInfo.writeable = (snips[pkt].fAccess == 'w');
+
+		}
+
+		// ----------------------------------------
+		// Figure out which packet is the main one.
+
+		int main = PickMainPacket ( candidates, beLenient );
+
+		if ( main != -1 ) {
+			this->packetInfo = candidates[main].packetInfo;
+			this->xmpPacket.swap ( candidates[main].xmpPacket );
+			this->xmpObj = *candidates[main].xmpObj;
+			this->containsXMP = true;
+			this->processedXMP = true;
+		}
+
+		for ( pkt = 0; pkt < (int)candidates.size(); ++pkt ) {
+			if ( candidates[pkt].xmpObj != 0 ) delete candidates[pkt].xmpObj;
+		}
+
+	} catch ( ... ) {
+
+		// Clean up the SXMPMeta* fields from the vector of candidates.
+		for ( pkt = 0; pkt < (int)candidates.size(); ++pkt ) {
+			if ( candidates[pkt].xmpObj != 0 ) delete candidates[pkt].xmpObj;
+		}
+		throw;
+
+	}
+
+}	// Scanner_MetaHandler::CacheFileData
+
+// =================================================================================================
+
+#endif	// IncludePacketScanning
diff --git a/XMPFiles/source/FileHandlers/Scanner_Handler.hpp b/XMPFiles/source/FileHandlers/Scanner_Handler.hpp
new file mode 100644
index 0000000..53c4820
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Scanner_Handler.hpp
@@ -0,0 +1,42 @@
+#ifndef __Scanner_Handler_hpp__
+#define __Scanner_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "XMPFiles/source/FileHandlers/Trivial_Handler.hpp"
+
+// =================================================================================================
+/// \file Scanner_Handler.hpp
+/// \brief File format handler for packet scanning.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler * Scanner_MetaHandlerCTor ( XMPFiles * parent );
+
+static const XMP_OptionBits kScanner_HandlerFlags = kTrivial_HandlerFlags;
+
+class Scanner_MetaHandler : public Trivial_MetaHandler
+{
+public:
+
+	Scanner_MetaHandler () {};
+	Scanner_MetaHandler ( XMPFiles * parent );
+
+	~Scanner_MetaHandler();
+
+	void CacheFileData();
+
+};	// Scanner_MetaHandler
+
+// =================================================================================================
+
+#endif /* __Scanner_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp
new file mode 100644
index 0000000..17e5baf
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp
@@ -0,0 +1,952 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+#include "source/IOUtils.hpp"
+
+#include "XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/PackageFormat_Support.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+using namespace std;
+
+// =================================================================================================
+/// \file SonyHDV_Handler.cpp
+/// \brief Folder format handler for Sony HDV.
+///
+/// This handler is for the Sony HDV video format. This is a pseudo-package, visible files but with
+/// a very well-defined layout and naming rules.
+///
+/// A typical Sony HDV layout looks like:
+///
+/// .../MyMovie/
+/// 	VIDEO/
+/// 		HVR/
+/// 			00_0001_2007-08-06_165555.IDX
+/// 			00_0001_2007-08-06_165555.M2T
+/// 			00_0001_2007-08-06_171740.M2T
+/// 			00_0001_2007-08-06_171740.M2T.ese
+/// 			tracks.dat
+///
+/// The logical clip name can be "00_0001" or "00_0001_" plus anything. We'll find the .IDX file,
+/// which defines the existence of the clip. Full file names as input will pull out the camera/clip
+/// parts and match in the same way. The .XMP file will use the date/time suffix from the .IDX file.
+// =================================================================================================
+
+// =================================================================================================
+// SonyHDV_CheckFormat
+// ===================
+//
+// This version does fairly simple checks. The top level folder (.../MyMovie) must contain the
+// VIDEO/HVR subtree. The HVR folder must contain a .IDX file for the desired clip. The name checks
+// are case insensitive.
+//
+// The state of the string parameters depends on the form of the path passed by the client. If the
+// client passed a logical clip path, like ".../MyMovie/00_0001", the parameters are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - empty
+//   parentName - empty
+//   leafName   - "00_0001"
+//
+// If the client passed a full file path, like ".../MyMovie/VIDEO/HVR/00_0001_2007-08-06_165555.M2T",
+// they are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - "VIDEO"
+//   parentName - "HVR"
+//   leafName   - "00_0001_2007-08-06_165555.M2T"
+//
+// The logical clip name can be short like "00_0001", or long like "00_0001_2007-08-06_165555". We
+// only key off of the portion before a second underscore.
+
+// ! The common code has shifted the gpName, parentName, and leafName strings to upper case. It has
+// ! also made sure that for a logical clip path the rootPath is an existing folder, and that the
+// ! file exists for a full file path.
+
+bool SonyHDV_CheckFormat ( XMP_FileFormat format,
+						   const std::string & rootPath,
+						   const std::string & gpName,
+						   const std::string & parentName,
+						   const std::string & leafName,
+						   XMPFiles * parent )
+{
+	// Do some basic checks on the root path and component names.
+
+	if ( gpName.empty() != parentName.empty() ) return false;	// Must be both empty or both non-empty.
+
+	std::string tempPath = rootPath;
+	tempPath += kDirChar;
+	tempPath += "VIDEO";
+
+	if ( gpName.empty() ) {
+		// This is the logical clip path case. Look for VIDEO/HVR subtree.
+		if ( Host_IO::GetChildMode ( tempPath.c_str(), "HVR" ) != Host_IO::kFMode_IsFolder ) return false;
+	} else {
+		// This is the existing file case. Check the parent and grandparent names.
+		if ( (gpName != "VIDEO") || (parentName != "HVR") ) return false;
+	}
+
+	// Look for the clip's .IDX file. If found use that as the full clip name.
+
+	tempPath += kDirChar;
+	tempPath += "HVR";
+
+	std::string clipName = leafName;
+	
+#if 0
+
+	// Disabled until Sony HDV clip spanning is supported. Since segments of spanned clips are
+	// currently considered separate entities, information such as frame count needs to be
+	// considered on a per segment basis.
+
+	int usCount = 0;
+	size_t i, limit = leafName.size();
+	for ( i = 0; i < limit; ++i ) {
+		if ( clipName[i] == '_' ) {
+			++usCount;
+			if ( usCount == 2 ) break;
+		}
+	}
+	if ( i < limit ) clipName.erase ( i );
+	clipName += '_';	// Make sure a final '_' is there for the search comparisons.
+
+	Host_IO::AutoFolder aFolder;
+	std::string childName;
+	bool found = false;
+
+	aFolder.folder = Host_IO::OpenFolder ( tempPath.c_str() );
+	while ( (! found) && Host_IO::GetNextChild ( aFolder.folder, &childName ) ) {
+		size_t childLen = childName.size();
+		if ( childLen < 4 ) continue;
+		MakeUpperCase ( &childName );
+		if ( childName.compare ( childLen-4, 4, ".IDX" ) != 0 ) continue;
+		if ( childName.compare ( 0, clipName.size(), clipName ) == 0 ) {
+			found = true;
+			clipName = childName;
+			clipName.erase ( childLen-4 );
+		}
+	}
+	aFolder.Close();
+	if ( ! found ) return false;
+
+#endif
+
+	tempPath = rootPath;
+	tempPath += kDirChar;
+	tempPath += clipName;
+
+	size_t pathLen = tempPath.size() + 1;	// Include a terminating nul.
+	parent->tempPtr = malloc ( pathLen );
+	if ( parent->tempPtr == 0 ) XMP_Throw ( "No memory for SonyHDV clip info", kXMPErr_NoMemory );
+	memcpy ( parent->tempPtr, tempPath.c_str(), pathLen );	// AUDIT: Safe, allocated above.
+
+	return true;
+
+}	// SonyHDV_CheckFormat
+
+// =================================================================================================
+
+static void* CreatePseudoClipPath ( const std::string & clientPath ) {
+
+	// Used to create the clip pseudo path when the CheckFormat function is skipped.
+	
+	std::string pseudoPath = clientPath;
+
+	size_t pathLen;
+	void* tempPtr = 0;
+	
+	if ( Host_IO::Exists ( pseudoPath.c_str() ) ) {
+	
+		// The client passed a physical path. The logical clip name is the leaf name, with the
+		// extension removed. There are no extra suffixes on Sony HDV files. The movie root path ends
+		// two levels up.
+		
+		std::string clipName, ignored;
+		
+		XIO::SplitLeafName ( &pseudoPath, &clipName );	// Extract the logical clip name.
+		XIO::SplitFileExtension ( &clipName, &ignored );
+
+		XIO::SplitLeafName ( &pseudoPath, &ignored );	// Remove the 2 intermediate folder levels.
+		XIO::SplitLeafName ( &pseudoPath, &ignored );
+		
+		pseudoPath += kDirChar;
+		pseudoPath += clipName;
+	
+	}
+
+	pathLen = pseudoPath.size() + 1;	// Include a terminating nul.
+	tempPtr = malloc ( pathLen );
+	if ( tempPtr == 0 ) XMP_Throw ( "No memory for SonyHDV clip info", kXMPErr_NoMemory );
+	memcpy ( tempPtr, pseudoPath.c_str(), pathLen );
+	
+	return tempPtr;
+
+}	// CreatePseudoClipPath
+
+// =================================================================================================
+// ReadIDXFile
+// ===========
+
+#define ExtractTimeCodeByte(ch,mask)	( (((ch & mask) >> 4) * 10) + (ch & 0xF) )
+
+static bool ReadIDXFile ( const std::string& idxPath,
+						  const std::string& clipName,
+						  SXMPMeta* xmpObj,
+						  bool& containsXMP,
+						  MD5_CTX* md5Context,
+						  bool digestFound )
+{
+	bool result = true;
+	containsXMP = false;
+
+	if ( clipName.size() != 25 ) return false;
+
+	try {
+
+
+		Host_IO::FileRef hostRef = Host_IO::Open ( idxPath.c_str(), Host_IO::openReadOnly );
+		if ( hostRef == Host_IO::noFileRef ) return false;	// The open failed.
+		XMPFiles_IO idxFile ( hostRef, idxPath.c_str(), Host_IO::openReadOnly );
+
+		struct SHDV_HeaderBlock
+		{
+			char			mHeader[8];
+			unsigned char	mValidFlag;
+			unsigned char	mReserved;
+			unsigned char	mECCTB;
+			unsigned char   mSignalMode;
+			unsigned char	mFileThousands;
+			unsigned char	mFileHundreds;
+			unsigned char	mFileTens;
+			unsigned char	mFileUnits;
+		};
+
+		SHDV_HeaderBlock hdvHeaderBlock;
+		memset ( &hdvHeaderBlock, 0, sizeof(SHDV_HeaderBlock) );
+
+		idxFile.ReadAll ( hdvHeaderBlock.mHeader, 8 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mValidFlag, 1 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mReserved, 1 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mECCTB, 1 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mSignalMode, 1 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mFileThousands, 1 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mFileHundreds, 1 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mFileTens, 1 );
+		idxFile.ReadAll ( &hdvHeaderBlock.mFileUnits, 1 );
+
+		const int fileCount = (hdvHeaderBlock.mFileThousands - '0') * 1000 +
+							  (hdvHeaderBlock.mFileHundreds  - '0') *  100 +
+							  (hdvHeaderBlock.mFileTens      - '0') *   10 +
+							  (hdvHeaderBlock.mFileUnits     - '0');
+
+		// Read file info block.
+		struct	SHDV_FileBlock
+		{
+			char			mDT[2];
+			unsigned char	mFileNameYear;
+			unsigned char	mFileNameMonth;
+			unsigned char	mFileNameDay;
+			unsigned char	mFileNameHour;
+			unsigned char	mFileNameMinute;
+			unsigned char	mFileNameSecond;
+			unsigned char	mStartTimeCode[4];
+			unsigned char	mTotalFrame[4];
+		};
+
+		SHDV_FileBlock hdvFileBlock;
+		memset ( &hdvFileBlock, 0, sizeof(SHDV_FileBlock) );
+
+		char filenameBuffer[256];
+		std::string fileDateAndTime = clipName.substr(8);
+
+		bool foundFileBlock = false;
+
+		for ( int i=0; ((i < fileCount) && (! foundFileBlock)); ++i ) {
+
+			idxFile.ReadAll ( hdvFileBlock.mDT, 2 );
+			idxFile.ReadAll ( &hdvFileBlock.mFileNameYear, 1 );
+			idxFile.ReadAll ( &hdvFileBlock.mFileNameMonth, 1 );
+			idxFile.ReadAll ( &hdvFileBlock.mFileNameDay, 1 );
+			idxFile.ReadAll ( &hdvFileBlock.mFileNameHour, 1 );
+			idxFile.ReadAll ( &hdvFileBlock.mFileNameMinute, 1 );
+			idxFile.ReadAll ( &hdvFileBlock.mFileNameSecond, 1 );
+			idxFile.ReadAll ( &hdvFileBlock.mStartTimeCode, 4 );
+			idxFile.ReadAll ( &hdvFileBlock.mTotalFrame, 4 );
+
+			// Compose file name we expect from file contents and break out on match.
+			sprintf ( filenameBuffer, "%02d-%02d-%02d_%02d%02d%02d",
+					  hdvFileBlock.mFileNameYear + 2000,
+					  hdvFileBlock.mFileNameMonth,
+					  hdvFileBlock.mFileNameDay,
+					  hdvFileBlock.mFileNameHour,
+					  hdvFileBlock.mFileNameMinute,
+					  hdvFileBlock.mFileNameSecond );
+
+			foundFileBlock = (fileDateAndTime==filenameBuffer);
+
+		}
+
+		idxFile.Close();
+		if ( ! foundFileBlock ) return false;
+
+		// If digest calculation requested, calculate it and return.
+		if ( md5Context != 0 ) {
+			MD5Update ( md5Context, (XMP_Uns8*)(&hdvHeaderBlock), sizeof(SHDV_HeaderBlock) );
+			MD5Update ( md5Context, (XMP_Uns8*)(&hdvFileBlock), sizeof(SHDV_FileBlock) );
+		}
+
+		// The xmpObj parameter must be provided in order to extract XMP
+		if ( xmpObj == 0 ) return (md5Context != 0);
+
+		// Standard def?
+		const bool isSD = ((hdvHeaderBlock.mSignalMode == 0x80) || (hdvHeaderBlock.mSignalMode == 0));
+
+		// Progressive vs interlaced extracted from high bit of ECCTB byte
+		const bool clipIsProgressive = ((hdvHeaderBlock.mECCTB & 0x80) != 0);
+
+		// Lowest three bits contain frame rate information
+		const int sfr = (hdvHeaderBlock.mECCTB & 7) + (clipIsProgressive ? 0 : 8);
+
+		// Sample scale and sample size.
+		int clipSampleScale = 0;
+		int clipSampleSize  = 0;
+		std::string frameRate;
+
+		// Frame rate
+		switch ( sfr ) {
+			case 0	: break; // Not valid in spec, but it's happening in test files.
+			case 1	: clipSampleScale = 24000;	clipSampleSize = 1001; frameRate = "23.98p"; break;
+			case 3	: clipSampleScale = 25;		clipSampleSize = 1;	   frameRate =    "25p"; break;
+			case 4	: clipSampleScale = 30000;	clipSampleSize = 1001; frameRate = "29.97p"; break;
+			case 11	: clipSampleScale = 25;		clipSampleSize = 1;	   frameRate =    "50i"; break;
+			case 12	: clipSampleScale = 30000;	clipSampleSize = 1001; frameRate = "59.94i"; break;
+		}
+
+		containsXMP = true;
+
+		// Frame size and PAR for HD (not clear on SD yet).
+		std::string xmpString;
+		XMP_StringPtr xmpValue = 0;
+
+		if ( ! isSD ) {
+
+			if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "videoFrameSize" )) ) {
+
+				xmpValue = "1440";
+				xmpObj->GetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_DM, "w", &xmpString, 0 );
+				if ( xmpString != xmpValue ) {
+					xmpObj->SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "w", xmpValue, 0 );
+				}
+
+				xmpValue = "1080";
+				xmpObj->GetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_DM, "h", &xmpString, 0 );
+				if ( xmpString != xmpValue ) {
+					xmpObj->SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "h", xmpValue, 0 );
+				}
+
+				xmpValue = "pixels";
+				xmpObj->GetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_DM, "unit", &xmpString, 0 );
+				if ( xmpString != xmpValue ) {
+					xmpObj->SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "unit", xmpValue, 0 );
+				}
+			}
+
+			xmpValue = "4/3";
+			if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "videoPixelAspectRatio" )) ) {
+				xmpObj->SetProperty ( kXMP_NS_DM, "videoPixelAspectRatio", xmpValue, kXMP_DeleteExisting );
+			}
+
+		}
+
+		// Sample size and scale.
+		if ( clipSampleScale != 0 ) {
+
+			char buffer[255];
+
+			if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "startTimeScale" )) ) {
+				sprintf(buffer, "%d", clipSampleScale);
+				xmpValue = buffer;
+				xmpObj->SetProperty ( kXMP_NS_DM, "startTimeScale", xmpValue, kXMP_DeleteExisting );
+			}
+
+			if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "startTimeSampleSize" )) ) {
+				sprintf(buffer, "%d", clipSampleSize);
+				xmpValue = buffer;
+				xmpObj->SetProperty ( kXMP_NS_DM, "startTimeSampleSize", xmpValue, kXMP_DeleteExisting );
+			}
+
+			if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "duration" )) ) {
+
+				const int frameCount = (hdvFileBlock.mTotalFrame[0] << 24) + (hdvFileBlock.mTotalFrame[1] << 16) +
+									   (hdvFileBlock.mTotalFrame[2] << 8) + hdvFileBlock.mTotalFrame[3];
+
+				sprintf ( buffer, "%d", frameCount );
+				xmpValue = buffer;
+				xmpObj->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "value", xmpValue, 0 );
+
+				sprintf ( buffer, "%d/%d", clipSampleSize, clipSampleScale );
+				xmpValue = buffer;
+				xmpObj->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "scale", xmpValue, 0 );
+
+			}
+
+		}
+
+		// Time Code.
+		if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "startTimecode" )) ) {
+
+			if ( (clipSampleScale != 0) && (clipSampleSize != 0) ) {
+
+				const bool dropFrame = ( (0x40 & hdvFileBlock.mStartTimeCode[0]) != 0 ) && ( sfr == 4 || sfr == 12 );
+				const char chDF = dropFrame ? ';' : ':';
+				const int tcFrames  = ExtractTimeCodeByte ( hdvFileBlock.mStartTimeCode[0], 0x30 );
+				const int tcSeconds = ExtractTimeCodeByte ( hdvFileBlock.mStartTimeCode[1], 0x70 );
+				const int tcMinutes = ExtractTimeCodeByte ( hdvFileBlock.mStartTimeCode[2], 0x70 );
+				const int tcHours   = ExtractTimeCodeByte ( hdvFileBlock.mStartTimeCode[3], 0x30 );
+
+				// HH:MM:SS:FF or HH;MM;SS;FF
+				char timecode[256];
+				sprintf ( timecode, "%02d%c%02d%c%02d%c%02d", tcHours, chDF, tcMinutes, chDF, tcSeconds, chDF, tcFrames );
+				std::string sonyTimeString = timecode;
+
+				xmpObj->GetStructField ( kXMP_NS_DM, "startTimecode", kXMP_NS_DM, "timeValue", &xmpString, 0 );
+				if ( xmpString != sonyTimeString ) {
+
+					xmpObj->SetStructField ( kXMP_NS_DM, "startTimecode", kXMP_NS_DM, "timeValue", sonyTimeString, 0 );
+
+					std::string timeFormat;
+					if ( clipSampleSize == 1 ) {
+
+						// 24, 25, 40, 50, 60
+						switch ( clipSampleScale ) {
+							case 24 : timeFormat = "24"; break;
+							case 25 : timeFormat = "25"; break;
+							case 50 : timeFormat = "50"; break;
+							default : XMP_Assert ( false );
+						}
+
+						timeFormat += "Timecode";
+
+					} else {
+
+						// 23.976, 29.97, 59.94
+						XMP_Assert ( clipSampleSize == 1001 );
+						switch ( clipSampleScale ) {
+							case 24000 : timeFormat = "23976"; break;
+							case 30000 : timeFormat =  "2997"; break;
+							case 60000 : timeFormat =  "5994"; break;
+							default	   : XMP_Assert( false );  break;
+						}
+
+						timeFormat += dropFrame ? "DropTimecode" : "NonDropTimecode";
+
+					}
+
+					xmpObj->SetStructField ( kXMP_NS_DM, "startTimecode", kXMP_NS_DM, "timeFormat", timeFormat, 0 );
+
+				}
+
+			}
+
+		}
+
+		if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "CreateDate" )) ) {
+
+			// Clip has date and time in the case of DT (otherwise date and time haven't been set).
+			bool clipHasDate = ((hdvFileBlock.mDT[0] == 'D') && (hdvFileBlock.mDT[1] == 'T'));
+
+			// Creation date
+			if ( clipHasDate ) {
+
+				// YYYY-MM-DDThh:mm:ssZ
+				char date[256];
+				sprintf ( date, "%4d-%02d-%02dT%02d:%02d:%02dZ",
+						  hdvFileBlock.mFileNameYear + 2000,
+						  hdvFileBlock.mFileNameMonth,
+						  hdvFileBlock.mFileNameDay,
+						  hdvFileBlock.mFileNameHour,
+						  hdvFileBlock.mFileNameMinute,
+						  hdvFileBlock.mFileNameSecond );
+
+				XMP_StringPtr xmpDate = date;
+				xmpObj->SetProperty ( kXMP_NS_XMP, "CreateDate", xmpDate, kXMP_DeleteExisting );
+
+			}
+
+		}
+
+		// Frame rate.
+		if ( digestFound || (! xmpObj->DoesPropertyExist ( kXMP_NS_DM, "videoFrameRate" )) ) {
+
+			if ( frameRate.size() != 0 ) {
+				xmpString = frameRate;
+				xmpObj->SetProperty ( kXMP_NS_DM, "videoFrameRate", xmpString, kXMP_DeleteExisting );
+			}
+
+		}
+
+	} catch ( ... ) {
+
+		result = false;
+
+	}
+
+	return result;
+
+}	// ReadIDXFile
+
+// =================================================================================================
+// SonyHDV_MetaHandlerCTor
+// =======================
+
+XMPFileHandler * SonyHDV_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new SonyHDV_MetaHandler ( parent );
+
+}	// SonyHDV_MetaHandlerCTor
+
+// =================================================================================================
+// SonyHDV_MetaHandler::SonyHDV_MetaHandler
+// ========================================
+
+SonyHDV_MetaHandler::SonyHDV_MetaHandler ( XMPFiles * _parent )
+{
+
+	this->parent = _parent;	// Inherited, can't set in the prefix.
+	this->handlerFlags = kSonyHDV_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	// Extract the root path and clip name.
+
+	if ( this->parent->tempPtr == 0 ) {
+		// The CheckFormat call might have been skipped.
+		this->parent->tempPtr = CreatePseudoClipPath ( this->parent->GetFilePath() );
+	}
+
+	this->rootPath.assign ( (char*) this->parent->tempPtr );
+	free ( this->parent->tempPtr );
+	this->parent->tempPtr = 0;
+
+	XIO::SplitLeafName ( &this->rootPath, &this->clipName );
+
+}	// SonyHDV_MetaHandler::SonyHDV_MetaHandler
+
+// =================================================================================================
+// SonyHDV_MetaHandler::~SonyHDV_MetaHandler
+// =========================================
+
+SonyHDV_MetaHandler::~SonyHDV_MetaHandler()
+{
+
+	if ( this->parent->tempPtr != 0 ) {
+		free ( this->parent->tempPtr );
+		this->parent->tempPtr = 0;
+	}
+
+}	// SonyHDV_MetaHandler::~SonyHDV_MetaHandler
+
+// =================================================================================================
+// SonyHDV_MetaHandler::MakeClipFilePath
+// =====================================
+
+bool SonyHDV_MetaHandler::MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile /* = false */ )
+{
+
+	*path = this->rootPath;
+	*path += kDirChar;
+	*path += "VIDEO";
+	*path += kDirChar;
+	*path += "HVR";
+	*path += kDirChar;
+	*path += this->clipName;
+	*path += suffix;
+
+	if ( ! checkFile ) return true;
+	return Host_IO::Exists ( path->c_str() );
+
+}	// SonyHDV_MetaHandler::MakeClipFilePath
+
+// This method removes the timestamp information from a clip name. It returns the clip name with a following "_".
+// For example: The clip name "00_0001_2007-08-06_165555" becomes "00_0001_".
+static void RemoveTimeStampFromClipName(std::string &clipName)
+{
+	int usCount = 0;
+	size_t i, limit = clipName.size();
+
+	for ( i = 0; i < limit; ++i ) {
+		if ( clipName[i] == '_' ) {
+			++usCount;
+			if ( usCount == 2 ) break;
+		}
+	}
+
+	if ( i < limit ) clipName.erase ( i );
+	clipName += '_';	// Make sure a final '_' is there for the search comparisons.
+}
+
+// =================================================================================================
+// SonyHDV_MetaHandler::MakeIndexFilePath
+// ======================================
+
+bool SonyHDV_MetaHandler::MakeIndexFilePath ( std::string& idxPath, const std::string& rootPath, const std::string& leafName )
+{
+	std::string tempPath;
+	tempPath = rootPath;
+	tempPath += kDirChar;
+	tempPath += "VIDEO";
+	tempPath += kDirChar;
+	tempPath += "HVR";
+
+	idxPath = tempPath;
+	idxPath += kDirChar;
+	idxPath += leafName;
+	idxPath += ".IDX";
+
+	// Default case
+	if ( Host_IO::GetFileMode ( idxPath.c_str() ) == Host_IO::kFMode_IsFile ) return true;
+
+	// Spanned clip case
+
+	// Scanning code taken from SonyHDV_CheckFormat
+	// Can be isolated to a separate function.
+
+	std::string clipName = leafName;
+	RemoveTimeStampFromClipName(clipName);
+
+	Host_IO::AutoFolder aFolder;
+	std::string childName;
+	bool found = false;
+
+	aFolder.folder = Host_IO::OpenFolder ( tempPath.c_str() );
+	while ( (! found) && Host_IO::GetNextChild ( aFolder.folder, &childName ) ) {
+		size_t childLen = childName.size();
+		if ( childLen < 4 ) continue;
+		MakeUpperCase ( &childName );
+		if ( childName.compare ( childLen-4, 4, ".IDX" ) != 0 ) continue;
+		if ( childName.compare ( 0, clipName.size(), clipName ) == 0 ) {
+			found = true;
+			clipName = childName;
+			clipName.erase ( childLen-4 );
+		}
+	}
+	aFolder.Close();
+	if ( ! found ) return false;
+
+	idxPath = tempPath;
+	idxPath += kDirChar;
+	idxPath += clipName;
+	idxPath += ".IDX";
+
+	return true;
+
+}
+
+// =================================================================================================
+// SonyHDV_MetaHandler::MakeLegacyDigest
+// =====================================
+
+#define kHexDigits "0123456789ABCDEF"
+
+void SonyHDV_MetaHandler::MakeLegacyDigest ( std::string * digestStr )
+{
+	std::string idxPath;
+	if ( ! this->MakeIndexFilePath ( idxPath, this->rootPath, this->clipName ) ) return;
+
+	MD5_CTX context;
+	unsigned char digestBin [16];
+	bool dummy = false;
+	MD5Init ( &context );
+	ReadIDXFile ( idxPath, this->clipName, 0,  dummy, &context, false );
+	MD5Final ( digestBin, &context );
+
+	char buffer [40];
+	for ( int in = 0, out = 0; in < 16; in += 1, out += 2 ) {
+		XMP_Uns8 byte = digestBin[in];
+		buffer[out]   = kHexDigits [ byte >> 4 ];
+		buffer[out+1] = kHexDigits [ byte & 0xF ];
+	}
+	buffer[32] = 0;
+	digestStr->erase();
+	digestStr->append ( buffer, 32 );
+
+}	// MakeLegacyDigest
+
+// =================================================================================================
+// SonyHDV_MetaHandler::GetFileModDate
+// ===================================
+
+static inline bool operator< ( const XMP_DateTime & left, const XMP_DateTime & right ) {
+	int compare = SXMPUtils::CompareDateTime ( left, right );
+	return (compare < 0);
+}
+
+bool SonyHDV_MetaHandler::GetFileModDate ( XMP_DateTime * modDate )
+{
+
+	// The Sony HDV locations of metadata:
+	//	VIDEO/
+	//		HVR/
+	//			00_0001_2007-08-06_165555.IDX
+	//			00_0001_2007-08-06_165555.XMP
+
+	bool ok, haveDate = false;
+	std::string fullPath;
+	XMP_DateTime oneDate, junkDate;
+	if ( modDate == 0 ) modDate = &junkDate;
+
+	ok = this->MakeIndexFilePath ( fullPath, this->rootPath, this->clipName );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( *modDate < oneDate ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	ok = this->MakeClipFilePath ( &fullPath, ".XMP", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) || (*modDate < oneDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	return haveDate;
+
+}	// SonyHDV_MetaHandler::GetFileModDate
+
+// =================================================================================================
+// SonyHDV_MetaHandler::FillMetadataFiles
+// ================================
+void SonyHDV_MetaHandler::FillMetadataFiles ( std::vector<std::string>* metadataFiles )
+{
+	std::string noExtPath, filePath;
+
+	noExtPath = rootPath + kDirChar + "VIDEO" + kDirChar + "HVR" + kDirChar + clipName;
+
+	filePath = noExtPath + ".XMP";
+	metadataFiles->push_back ( filePath );
+	filePath = noExtPath + ".IDX";
+	metadataFiles->push_back ( filePath );
+
+}	// 	FillMetadataFiles_SonyHDV
+
+// =================================================================================================
+// SonyHDV_MetaHandler::IsMetadataWritable
+// =======================================
+
+bool SonyHDV_MetaHandler::IsMetadataWritable ( )
+{
+	std::vector<std::string> metadataFiles;
+	FillMetadataFiles(&metadataFiles);
+	std::vector<std::string>::iterator itr = metadataFiles.begin();
+	// Check whether sidecar is writable, if not then check if it can be created.
+	return Host_IO::Writable( itr->c_str(), true );
+}// SonyHDV_MetaHandler::IsMetadataWritable
+
+
+// =================================================================================================
+// SonyHDV_MetaHandler::FillAssociatedResources
+// ======================================
+//
+// This method returns all clip associated "media files","index files" whose name
+// starts with XX_CCCC_ and side cars starting with XX_CCCC.
+void SonyHDV_MetaHandler::FillAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	// The possible associated resources:
+	//	VIDEO/
+	//		HVR/
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.M2T	// HDV media
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.IDX	// Metadata Index file
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.XMP	// sidecar
+	//
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.AVI	// DV(AVI) medi
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.IDX	// Metadata Index file
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.XMP	// sidecar
+	//
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.DV	// DV(RAW) media
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.IDX	// Metadata Index file
+	//			XX_CCCC_YYYY-MM-DD_hhmmss.XMP	// sidecar
+	//
+	//			tracks.dat						// Clip database file
+
+	std:: string hvrPath = this->rootPath + kDirChar + "VIDEO" + kDirChar + "HVR";
+	std::string filePath;
+
+	//Add RootPath
+	filePath = this->rootPath + kDirChar;
+	PackageFormat_Support::AddResourceIfExists( resourceList, filePath );
+
+	// If XX_CCCC_YYYY-MM-DD_hhmmss is clip name then we remove YYYY-MM-DD_hhmmss from this and return
+	// all files starting with XX_CCCC_ and having required extension.
+	std::string clipNameWithoutTimeStamp = this->clipName;
+	RemoveTimeStampFromClipName(clipNameWithoutTimeStamp);
+
+	// Add media files.
+	// We don't know the extension of the media so we will check for all
+	// three possible extensions and add whichever is existing.
+	
+	// "AddResourceIfExists" will add all spanned clips that match the clip prefix "clipNameWithoutTimeStamp" 
+	// and specified extensions.
+	PackageFormat_Support::AddResourceIfExists(resourceList, hvrPath, clipNameWithoutTimeStamp.c_str(), ".M2T");
+
+	PackageFormat_Support::AddResourceIfExists(resourceList, hvrPath, clipNameWithoutTimeStamp.c_str(), ".AVI");
+
+	PackageFormat_Support::AddResourceIfExists(resourceList, hvrPath, clipNameWithoutTimeStamp.c_str(), ".DV");
+
+	// Add Index files.
+	PackageFormat_Support::AddResourceIfExists(resourceList, hvrPath, clipNameWithoutTimeStamp.c_str(), ".IDX");
+
+	// Add sidecars.
+	// For sidecars we will look for XX_CCCC*.XMP instead of XX_CCCC_*.XMP because we may generate such files
+	// in case of spanning (in future) or logical paths.
+	clipNameWithoutTimeStamp.erase(clipNameWithoutTimeStamp.end()-1);
+	PackageFormat_Support::AddResourceIfExists(resourceList, hvrPath, clipNameWithoutTimeStamp.c_str(), ".XMP");
+
+	//Add clip database file
+	filePath = hvrPath + kDirChar + "tracks.dat";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+}	// SonyHDV_MetaHandler::FillAssociatedResources
+
+
+// =================================================================================================
+// SonyHDV_MetaHandler::CacheFileData
+// ==================================
+
+void SonyHDV_MetaHandler::CacheFileData()
+{
+	XMP_Assert ( ! this->containsXMP );
+
+	if ( this->parent->UsesClientIO() ) {
+		XMP_Throw ( "SonyHDV cannot be used with client-managed I/O", kXMPErr_InternalFailure );
+	}
+
+	// See if the clip's .XMP file exists.
+
+	std::string xmpPath;
+	this->MakeClipFilePath ( &xmpPath, ".XMP" );
+	if ( ! Host_IO::Exists ( xmpPath.c_str() ) ) return;	// No XMP.
+
+	// Read the entire .XMP file. We know the XMP exists, New_XMPFiles_IO is supposed to return 0
+	// only if the file does not exist.
+
+	bool readOnly = XMP_OptionIsClear ( this->parent->openFlags, kXMPFiles_OpenForUpdate );
+
+	XMP_Assert ( this->parent->ioRef == 0 );
+	XMPFiles_IO* xmpFile =  XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), readOnly );
+	if ( xmpFile == 0 ) XMP_Throw ( "SonyHDV XMP file open failure", kXMPErr_InternalFailure );
+	this->parent->ioRef = xmpFile;
+
+	XMP_Int64 xmpLen = xmpFile->Length();
+	if ( xmpLen > 100*1024*1024 ) {
+		XMP_Throw ( "SonyHDV XMP is outrageously large", kXMPErr_InternalFailure );	// Sanity check.
+	}
+
+	this->xmpPacket.erase();
+	this->xmpPacket.append ( (size_t)xmpLen, ' ' );
+
+	XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen );
+
+	this->packetInfo.offset = 0;
+	this->packetInfo.length = (XMP_Int32)xmpLen;
+	FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+	this->containsXMP = true;
+
+}	// SonyHDV_MetaHandler::CacheFileData
+
+// =================================================================================================
+// SonyHDV_MetaHandler::ProcessXMP
+// ===============================
+
+void SonyHDV_MetaHandler::ProcessXMP()
+{
+	if ( this->processedXMP ) return;
+	this->processedXMP = true;	// Make sure only called once.
+
+	if ( this->containsXMP ) {
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	}
+
+	// Check the legacy digest.
+	std::string oldDigest, newDigest;
+	bool digestFound;
+	digestFound = this->xmpObj.GetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "SonyHDV", &oldDigest, 0 );
+	if ( digestFound ) {
+		this->MakeLegacyDigest ( &newDigest );
+		if ( oldDigest == newDigest ) return;
+	}
+
+	// Read the IDX legacy.
+	std::string idxPath;
+	if ( ! this->MakeIndexFilePath ( idxPath, this->rootPath, this->clipName ) ) return;
+	ReadIDXFile ( idxPath, this->clipName, &this->xmpObj,  this->containsXMP, 0, digestFound );
+
+}	// SonyHDV_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// SonyHDV_MetaHandler::UpdateFile
+// ===============================
+//
+// Note that UpdateFile is only called from XMPFiles::CloseFile, so it is OK to close the file here.
+
+void SonyHDV_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) return;
+	this->needsUpdate = false;	// Make sure only called once.
+
+	XMP_Assert ( this->parent->UsesLocalIO() );
+
+	std::string newDigest;
+	this->MakeLegacyDigest ( &newDigest );
+	this->xmpObj.SetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "SonyHDV", newDigest.c_str(), kXMP_DeleteExisting );
+
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, this->GetSerializeOptions() );
+
+	// -------------------------------------------------
+	// Update just the XMP file not the native IDX file.
+
+	std::string xmpPath;
+	this->MakeClipFilePath ( &xmpPath, ".XMP" );
+
+	bool haveXMP = Host_IO::Exists ( xmpPath.c_str() );
+	if ( ! haveXMP ) {
+		XMP_Assert ( this->parent->ioRef == 0 );
+		Host_IO::Create ( xmpPath.c_str() );
+		this->parent->ioRef = XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), Host_IO::openReadWrite );
+		if ( this->parent->ioRef == 0 ) XMP_Throw ( "Failure opening SonyHDV XMP file", kXMPErr_ExternalFailure );
+	}
+
+	XMP_IO* xmpFile = this->parent->ioRef;
+	XMP_Assert ( xmpFile != 0 );
+	XIO::ReplaceTextFile ( xmpFile, this->xmpPacket, (haveXMP & doSafeUpdate) );
+
+}	// SonyHDV_MetaHandler::UpdateFile
+
+// =================================================================================================
+// SonyHDV_MetaHandler::WriteTempFile
+// ==================================
+
+void SonyHDV_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+
+	// ! WriteTempFile is not supposed to be called for handlers that own the file.
+	XMP_Throw ( "SonyHDV_MetaHandler::WriteTempFile should not be called", kXMPErr_InternalFailure );
+
+}	// SonyHDV_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp
new file mode 100644
index 0000000..190930d
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp
@@ -0,0 +1,82 @@
+#ifndef __SonyHDV_Handler_hpp__
+#define __SonyHDV_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "source/ExpatAdapter.hpp"
+
+// =================================================================================================
+/// \file SonyHDV_Handler.hpp
+/// \brief Folder format handler for SonyHDV.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler * SonyHDV_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool SonyHDV_CheckFormat ( XMP_FileFormat format,
+								  const std::string & rootPath,
+								  const std::string & gpName,
+								  const std::string & parentName,
+								  const std::string & leafName,
+								  XMPFiles * parent );
+
+static const XMP_OptionBits kSonyHDV_HandlerFlags = (kXMPFiles_CanInjectXMP |
+													 kXMPFiles_CanExpand |
+													 kXMPFiles_CanRewrite |
+													 kXMPFiles_PrefersInPlace |
+													 kXMPFiles_CanReconcile |
+													 kXMPFiles_AllowsOnlyXMP |
+													 kXMPFiles_ReturnsRawPacket |
+													 kXMPFiles_HandlerOwnsFile |
+													 kXMPFiles_AllowsSafeUpdate |
+													 kXMPFiles_FolderBasedFormat);
+
+class SonyHDV_MetaHandler : public XMPFileHandler
+{
+public:
+
+	bool GetFileModDate ( XMP_DateTime * modDate );
+	void FillMetadataFiles(std::vector<std::string>* metadataFiles );
+	void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	bool IsMetadataWritable ( );
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	XMP_OptionBits GetSerializeOptions()	// *** These should be standard for standalone XMP files.
+		{ return (kXMP_UseCompactFormat | kXMP_OmitPacketWrapper); };
+
+	SonyHDV_MetaHandler ( XMPFiles * _parent );
+	virtual ~SonyHDV_MetaHandler();
+
+private:
+
+	SonyHDV_MetaHandler() {};	// Hidden on purpose.
+
+	bool MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false );
+	bool MakeIndexFilePath ( std::string& idxPath, const std::string& rootPath, const std::string& leafName );
+	void MakeLegacyDigest ( std::string * digestStr );
+
+	std::string rootPath, clipName;
+
+};	// SonyHDV_MetaHandler
+
+// =================================================================================================
+
+#endif /* __SonyHDV_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp
new file mode 100644
index 0000000..37e4ab1
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp
@@ -0,0 +1,422 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/TIFF_Handler.hpp"
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+#include "XMPFiles/source/FormatSupport/ReconcileLegacy.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+
+#include "third-party/zuid/interfaces/MD5.h"
+
+using namespace std;
+
+// =================================================================================================
+/// \file TIFF_Handler.cpp
+/// \brief File format handler for TIFF.
+///
+/// This handler ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// TIFF_CheckFormat
+// ================
+
+// For TIFF we just check for the II/42 or MM/42 in the first 4 bytes and that there are at least
+// 26 bytes of data (4+4+2+12+4).
+//
+// ! The CheckXyzFormat routines don't track the filePos, that is left to ScanXyzFile.
+
+bool TIFF_CheckFormat ( XMP_FileFormat format,
+	                    XMP_StringPtr  filePath,
+                        XMP_IO*    fileRef,
+                        XMPFiles *     parent )
+{
+	IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent);
+	XMP_Assert ( format == kXMP_TIFFFile );
+
+	enum { kMinimalTIFFSize = 4+4+2+12+4 };	// Header plus IFD with 1 entry.
+
+	fileRef->Rewind ( );
+	if ( ! XIO::CheckFileSpace ( fileRef, kMinimalTIFFSize ) ) return false;
+
+	XMP_Uns8 buffer [4];
+	fileRef->Read ( buffer, 4 );
+	
+	bool leTIFF = CheckBytes ( buffer, "\x49\x49\x2A\x00", 4 );
+	bool beTIFF = CheckBytes ( buffer, "\x4D\x4D\x00\x2A", 4 );
+
+	return (leTIFF | beTIFF);
+
+}	// TIFF_CheckFormat
+
+// =================================================================================================
+// TIFF_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * TIFF_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new TIFF_MetaHandler ( parent );
+
+}	// TIFF_MetaHandlerCTor
+
+// =================================================================================================
+// TIFF_MetaHandler::TIFF_MetaHandler
+// ==================================
+
+TIFF_MetaHandler::TIFF_MetaHandler ( XMPFiles * _parent ) : psirMgr(0), iptcMgr(0)
+{
+	this->parent = _parent;
+	this->handlerFlags = kTIFF_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+}	// TIFF_MetaHandler::TIFF_MetaHandler
+
+// =================================================================================================
+// TIFF_MetaHandler::~TIFF_MetaHandler
+// ===================================
+
+TIFF_MetaHandler::~TIFF_MetaHandler()
+{
+
+	if ( this->psirMgr != 0 ) delete ( this->psirMgr );
+	if ( this->iptcMgr != 0 ) delete ( this->iptcMgr );
+
+}	// TIFF_MetaHandler::~TIFF_MetaHandler
+
+// =================================================================================================
+// TIFF_MetaHandler::CacheFileData
+// ===============================
+//
+// The data caching for TIFF is easy to explain and implement, but does more processing than one
+// might at first expect. This seems unavoidable given the need to close the disk file after calling
+// CacheFileData. We parse the TIFF stream and cache the values for all tags of interest, and note
+// whether XMP is present. We do not parse the XMP, Photoshop image resources, or IPTC datasets.
+
+// *** This implementation simply returns when invalid TIFF is encountered. Should we throw instead?
+
+void TIFF_MetaHandler::CacheFileData()
+{
+	XMP_IO*      fileRef    = this->parent->ioRef;
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+	const bool    checkAbort = (abortProc != 0);
+
+	XMP_Assert ( ! this->containsXMP );
+	// Set containsXMP to true here only if the XMP tag is found.
+
+	if ( checkAbort && abortProc(abortArg) ) {
+		XMP_Throw ( "TIFF_MetaHandler::CacheFileData - User abort", kXMPErr_UserAbort );
+	}
+
+	this->tiffMgr.ParseFileStream ( fileRef );
+
+	TIFF_Manager::TagInfo dngInfo;
+	if ( this->tiffMgr.GetTag ( kTIFF_PrimaryIFD, kTIFF_DNGVersion, &dngInfo ) ) {
+
+		// Reject DNG files that are version 2.0 or beyond, this is being written at the time of
+		// DNG version 1.2. The DNG team says it is OK to use 2.0, not strictly 1.2. Use the
+		// DNGBackwardVersion if it is present, else the DNGVersion. Note that the version value is
+		// supposed to be type BYTE, so the file order is always essentially big endian.
+
+		XMP_Uns8 majorVersion = *((XMP_Uns8*)dngInfo.dataPtr);	// Start with DNGVersion.
+		if ( this->tiffMgr.GetTag ( kTIFF_PrimaryIFD, kTIFF_DNGBackwardVersion, &dngInfo ) ) {
+			majorVersion = *((XMP_Uns8*)dngInfo.dataPtr);	// Use DNGBackwardVersion if possible.
+		}
+		if ( majorVersion > 1 ) XMP_Throw ( "DNG version beyond 1.x", kXMPErr_BadTIFF );
+
+	}
+
+	TIFF_Manager::TagInfo xmpInfo;
+	bool found = this->tiffMgr.GetTag ( kTIFF_PrimaryIFD, kTIFF_XMP, &xmpInfo );
+
+	if ( found ) {
+
+		this->packetInfo.offset    = this->tiffMgr.GetValueOffset ( kTIFF_PrimaryIFD, kTIFF_XMP );
+		this->packetInfo.length    = xmpInfo.dataLen;
+		this->packetInfo.padSize   = 0;				// Assume for now, set these properly in ProcessXMP.
+		this->packetInfo.charForm  = kXMP_CharUnknown;
+		this->packetInfo.writeable = true;
+
+		this->xmpPacket.assign ( (XMP_StringPtr)xmpInfo.dataPtr, xmpInfo.dataLen );
+
+		this->containsXMP = true;
+
+	}
+
+}	// TIFF_MetaHandler::CacheFileData
+
+// =================================================================================================
+// TIFF_MetaHandler::ProcessXMP
+// ============================
+//
+// Process the raw XMP and legacy metadata that was previously cached. The legacy metadata in TIFF
+// is messy because there are 2 copies of the IPTC and because of a Photoshop 6 bug/quirk in the way
+// Exif metadata is saved.
+
+void TIFF_MetaHandler::ProcessXMP()
+{
+
+	this->processedXMP = true;	// Make sure we only come through here once.
+
+	// Set up everything for the legacy import, but don't do it yet. This lets us do a forced legacy
+	// import if the XMP packet gets parsing errors.
+
+	// ! Photoshop 6 wrote annoyingly wacky TIFF files. It buried a lot of the Exif metadata inside
+	// ! image resource 1058, itself inside of tag 34377 in the 0th IFD. Take care of this before
+	// ! doing any of the legacy metadata presence or priority analysis. Delete image resource 1058
+	// ! to get rid of the buried Exif, but don't mark the XMPFiles object as changed. This change
+	// ! should not trigger an update, but should be included as part of a normal update.
+
+	bool found;
+	bool readOnly = ((this->parent->openFlags & kXMPFiles_OpenForUpdate) == 0);
+
+	if ( readOnly ) {
+		this->psirMgr = new PSIR_MemoryReader();
+		this->iptcMgr = new IPTC_Reader();
+	} else {
+		this->psirMgr = new PSIR_FileWriter();
+		this->iptcMgr = new IPTC_Writer();	// ! Parse it later.
+	}
+
+	TIFF_Manager & tiff = this->tiffMgr;	// Give the compiler help in recognizing non-aliases.
+	PSIR_Manager & psir = *this->psirMgr;
+	IPTC_Manager & iptc = *this->iptcMgr;
+
+	TIFF_Manager::TagInfo psirInfo;
+	bool havePSIR = tiff.GetTag ( kTIFF_PrimaryIFD, kTIFF_PSIR, &psirInfo );
+
+	if ( havePSIR ) {	// ! Do the Photoshop 6 integration before other legacy analysis.
+		psir.ParseMemoryResources ( psirInfo.dataPtr, psirInfo.dataLen );
+		PSIR_Manager::ImgRsrcInfo buriedExif;
+		found = psir.GetImgRsrc ( kPSIR_Exif, &buriedExif );
+		if ( found ) {
+			tiff.IntegrateFromPShop6 ( buriedExif.dataPtr, buriedExif.dataLen );
+			if ( ! readOnly ) psir.DeleteImgRsrc ( kPSIR_Exif );
+		}
+	}
+
+	TIFF_Manager::TagInfo iptcInfo;
+	bool haveIPTC = tiff.GetTag ( kTIFF_PrimaryIFD, kTIFF_IPTC, &iptcInfo );	// The TIFF IPTC tag.
+	int iptcDigestState = kDigestMatches;
+
+	if ( haveIPTC ) {
+
+		bool haveDigest = false;
+		PSIR_Manager::ImgRsrcInfo digestInfo;
+		if ( havePSIR ) haveDigest = psir.GetImgRsrc ( kPSIR_IPTCDigest, &digestInfo );
+		if ( digestInfo.dataLen != 16 ) haveDigest = false;
+
+		if ( ! haveDigest ) {
+
+			iptcDigestState = kDigestMissing;
+
+		} else {
+
+			// Older versions of Photoshop wrote tag 33723 with type LONG, but ignored the trailing
+			// zero padding for the IPTC digest. If the full digest differs, recheck without the padding.
+
+			iptcDigestState = PhotoDataUtils::CheckIPTCDigest ( iptcInfo.dataPtr, iptcInfo.dataLen, digestInfo.dataPtr );
+			// See bug https://bugs.freedesktop.org/show_bug.cgi?id=105205
+			// if iptcInfo.dataLen is 0, then there is no digest.
+			if ( (iptcDigestState == kDigestDiffers) && (kTIFF_TypeSizes[iptcInfo.type] > 1) && iptcInfo.dataLen > 0 ) {
+				XMP_Uns8 * endPtr = (XMP_Uns8*)iptcInfo.dataPtr + iptcInfo.dataLen - 1;
+				XMP_Uns8 * minPtr = endPtr - kTIFF_TypeSizes[iptcInfo.type] + 1;
+				while ( (endPtr >= minPtr) && (*endPtr == 0) ) --endPtr;
+				XMP_Uns32 unpaddedLen = (XMP_Uns32) (endPtr - (XMP_Uns8*)iptcInfo.dataPtr + 1);
+				iptcDigestState = PhotoDataUtils::CheckIPTCDigest ( iptcInfo.dataPtr, unpaddedLen, digestInfo.dataPtr );
+			}
+
+		}
+
+	}
+
+	XMP_OptionBits options = k2XMP_FileHadExif;	// TIFF files are presumed to have Exif legacy.
+	if ( haveIPTC ) options |= k2XMP_FileHadIPTC;
+	if ( this->containsXMP ) options |= k2XMP_FileHadXMP;
+
+	// Process the XMP packet. If it fails to parse, do a forced legacy import but still throw an
+	// exception. This tells the caller that an error happened, but gives them recovered legacy
+	// should they want to proceed with that.
+
+	bool haveXMP = false;
+
+	if ( ! this->xmpPacket.empty() ) {
+		XMP_Assert ( this->containsXMP );
+		// Common code takes care of packetInfo.charForm, .padSize, and .writeable.
+		XMP_StringPtr packetStr = this->xmpPacket.c_str();
+		XMP_StringLen packetLen = (XMP_StringLen)this->xmpPacket.size();
+		try {
+			this->xmpObj.ParseFromBuffer ( packetStr, packetLen );
+		} catch ( ... ) { /* Ignore parsing failures, someday we hope to get partial XMP back. */ }
+		haveXMP = true;
+	}
+
+	// Process the legacy metadata.
+
+	if ( haveIPTC && (! haveXMP) && (iptcDigestState == kDigestMatches) ) iptcDigestState = kDigestMissing;
+	bool parseIPTC = (iptcDigestState != kDigestMatches) || (! readOnly);
+	if ( parseIPTC ) iptc.ParseMemoryDataSets ( iptcInfo.dataPtr, iptcInfo.dataLen );
+	ImportPhotoData ( tiff, iptc, psir, iptcDigestState, &this->xmpObj, options );
+
+	this->containsXMP = true;	// Assume we now have something in the XMP.
+
+}	// TIFF_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// TIFF_MetaHandler::UpdateFile
+// ============================
+//
+// There is very little to do directly in UpdateFile. ExportXMPtoJTP takes care of setting all of
+// the necessary TIFF tags, including things like the 2nd copy of the IPTC in the Photoshop image
+// resources in tag 34377. TIFF_FileWriter::UpdateFileStream does all of the update-by-append I/O.
+
+// *** Need to pass the abort proc and arg to TIFF_FileWriter::UpdateFileStream.
+
+void TIFF_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	XMP_Assert ( ! doSafeUpdate );	// This should only be called for "unsafe" updates.
+
+	XMP_IO*   destRef    = this->parent->ioRef;
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+
+	XMP_Int64 oldPacketOffset = this->packetInfo.offset;
+	XMP_Int32 oldPacketLength = this->packetInfo.length;
+
+	if ( oldPacketOffset == kXMPFiles_UnknownOffset ) oldPacketOffset = 0;	// ! Simplify checks.
+	if ( oldPacketLength == kXMPFiles_UnknownLength ) oldPacketLength = 0;
+
+	bool fileHadXMP = ((oldPacketOffset != 0) && (oldPacketLength != 0));
+
+	// Update the IPTC-IIM and native TIFF/Exif metadata. ExportPhotoData also trips the tiff: and
+	// exif: copies from the XMP, so reserialize the now final XMP packet.
+
+	ExportPhotoData ( kXMP_TIFFFile, &this->xmpObj, &this->tiffMgr, this->iptcMgr, this->psirMgr );
+
+	try {
+		XMP_OptionBits options = kXMP_UseCompactFormat;
+		if ( fileHadXMP ) options |= kXMP_ExactPacketLength;
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, options, oldPacketLength );
+	} catch ( ... ) {
+		this->xmpObj.SerializeToBuffer ( &this->xmpPacket, kXMP_UseCompactFormat );
+	}
+
+	// Decide whether to do an in-place update. This can only happen if all of the following are true:
+	//	- There is an XMP packet in the file.
+	//	- The are no changes to the legacy tags. (The IPTC and PSIR are in the TIFF tags.)
+	//	- The new XMP can fit in the old space.
+
+	bool doInPlace = (fileHadXMP && (this->xmpPacket.size() <= (size_t)oldPacketLength));
+	if ( this->tiffMgr.IsLegacyChanged() ) doInPlace = false;
+	
+	bool localProgressTracking = false;
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+
+	if ( ! doInPlace ) {
+
+		#if GatherPerformanceData
+			sAPIPerf->back().extraInfo += ", TIFF append update";
+		#endif
+
+		if ( (progressTracker != 0) && (! progressTracker->WorkInProgress()) ) {
+			localProgressTracking = true;
+			progressTracker->BeginWork();
+		}
+
+		this->tiffMgr.SetTag ( kTIFF_PrimaryIFD, kTIFF_XMP, kTIFF_UndefinedType, (XMP_Uns32)this->xmpPacket.size(), this->xmpPacket.c_str() );
+		this->tiffMgr.UpdateFileStream ( destRef, progressTracker );
+
+	} else {
+
+		#if GatherPerformanceData
+			sAPIPerf->back().extraInfo += ", TIFF in-place update";
+		#endif
+
+		if ( this->xmpPacket.size() < (size_t)this->packetInfo.length ) {
+			// They ought to match, cheap to be sure.
+			size_t extraSpace = (size_t)this->packetInfo.length - this->xmpPacket.size();
+			this->xmpPacket.append ( extraSpace, ' ' );
+		}
+
+		XMP_IO* liveFile = this->parent->ioRef;
+
+		XMP_Assert ( this->xmpPacket.size() == (size_t)oldPacketLength );	// ! Done by common PutXMP logic.
+
+		if ( progressTracker != 0 ) {
+			if ( progressTracker->WorkInProgress() ) {
+				progressTracker->AddTotalWork ( this->xmpPacket.size() );
+			} else {
+				localProgressTracking = true;
+				progressTracker->BeginWork ( this->xmpPacket.size() );
+			}
+		}
+
+		liveFile->Seek ( oldPacketOffset, kXMP_SeekFromStart  );
+		liveFile->Write ( this->xmpPacket.c_str(), (XMP_Int32)this->xmpPacket.size() );
+
+	}
+	
+	if ( localProgressTracking ) progressTracker->WorkComplete();
+	this->needsUpdate = false;
+
+}	// TIFF_MetaHandler::UpdateFile
+
+// =================================================================================================
+// TIFF_MetaHandler::WriteTempFile
+// ===============================
+//
+// The structure of TIFF makes it hard to do a sequential source-to-dest copy with interleaved
+// updates. So, copy the existing source to the destination and call UpdateFile.
+
+void TIFF_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_IO* origRef = this->parent->ioRef;
+
+	XMP_AbortProc abortProc  = this->parent->abortProc;
+	void *        abortArg   = this->parent->abortArg;
+
+	XMP_Int64 fileLen = origRef->Length();
+	if ( fileLen > 0xFFFFFFFFLL ) {	// Check before making a copy of the file.
+		XMP_Throw ( "TIFF fles can't exceed 4GB", kXMPErr_BadTIFF );
+	}
+	
+	XMP_ProgressTracker* progressTracker = this->parent->progressTracker;
+	if ( progressTracker != 0 ) progressTracker->BeginWork ( (float)fileLen );
+
+	origRef->Rewind ( );
+	tempRef->Truncate ( 0 );
+	XIO::Copy ( origRef, tempRef, fileLen, abortProc, abortArg );
+
+	try {
+		this->parent->ioRef = tempRef;	// ! Make UpdateFile update the temp.
+		this->UpdateFile ( false );
+		this->parent->ioRef = origRef;
+	} catch ( ... ) {
+		this->parent->ioRef = origRef;
+		throw;
+	}
+	
+	if ( progressTracker != 0 ) progressTracker->WorkComplete();
+
+}	// TIFF_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.hpp b/XMPFiles/source/FileHandlers/TIFF_Handler.hpp
new file mode 100644
index 0000000..bc653b2
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/TIFF_Handler.hpp
@@ -0,0 +1,69 @@
+#ifndef __TIFF_Handler_hpp__
+#define __TIFF_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+
+// =================================================================================================
+/// \file TIFF_Handler.hpp
+/// \brief File format handler for TIFF.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// *** Could derive from Basic_Handler - buffer file tail in a temp file.
+
+extern XMPFileHandler * TIFF_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool TIFF_CheckFormat ( XMP_FileFormat format,
+							   XMP_StringPtr  filePath,
+                               XMP_IO*    fileRef,
+                               XMPFiles *     parent );
+
+static const XMP_OptionBits kTIFF_HandlerFlags = (kXMPFiles_CanInjectXMP |
+                                                  kXMPFiles_CanExpand |
+                                                  kXMPFiles_CanRewrite |
+                                                  kXMPFiles_PrefersInPlace |
+                                                  kXMPFiles_CanReconcile |
+                                                  kXMPFiles_AllowsOnlyXMP |
+                                                  kXMPFiles_ReturnsRawPacket |
+                                                  kXMPFiles_AllowsSafeUpdate |
+												  kXMPFiles_CanNotifyProgress);
+
+class TIFF_MetaHandler : public XMPFileHandler
+{
+public:
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile    ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	TIFF_MetaHandler ( XMPFiles * parent );
+	virtual ~TIFF_MetaHandler();
+
+private:
+
+	TIFF_MetaHandler() : psirMgr(0), iptcMgr(0) {};	// Hidden on purpose.
+
+	TIFF_FileWriter tiffMgr;	// The TIFF part is always file-based.
+	PSIR_Manager *  psirMgr;	// Need to use pointers so we can properly select between read-only and
+	IPTC_Manager *  iptcMgr;	//	read-write modes of usage.
+
+};	// TIFF_MetaHandler
+
+// =================================================================================================
+
+#endif /* __TIFF_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/Trivial_Handler.cpp b/XMPFiles/source/FileHandlers/Trivial_Handler.cpp
new file mode 100644
index 0000000..ac8b468
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Trivial_Handler.cpp
@@ -0,0 +1,74 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/Trivial_Handler.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file Trivial_Handler.cpp
+/// \brief Base class for trivial handlers that only process in-place XMP.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// Trivial_MetaHandler::~Trivial_MetaHandler
+// =========================================
+
+Trivial_MetaHandler::~Trivial_MetaHandler()
+{
+	// Nothing to do.
+
+}	// Trivial_MetaHandler::~Trivial_MetaHandler
+
+// =================================================================================================
+// Trivial_MetaHandler::UpdateFile
+// ===============================
+
+void Trivial_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	IgnoreParam ( doSafeUpdate );
+	XMP_Assert ( ! doSafeUpdate );	// Not supported at this level.
+	if ( ! this->needsUpdate ) return;
+
+	XMP_IO*      fileRef    = this->parent->ioRef;
+	XMP_PacketInfo & packetInfo = this->packetInfo;
+	std::string &    xmpPacket  = this->xmpPacket;
+
+	fileRef->Seek ( packetInfo.offset, kXMP_SeekFromStart );
+	fileRef->Write ( xmpPacket.c_str(), packetInfo.length );
+	XMP_Assert ( xmpPacket.size() == (size_t)packetInfo.length );
+
+	this->needsUpdate = false;
+
+}	// Trivial_MetaHandler::UpdateFile
+
+// =================================================================================================
+// Trivial_MetaHandler::WriteTempFile
+// ==================================
+
+void Trivial_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	IgnoreParam ( tempRef );
+
+	XMP_Throw ( "Trivial_MetaHandler::WriteTempFile: Not supported", kXMPErr_Unavailable );
+
+}	// Trivial_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/Trivial_Handler.hpp b/XMPFiles/source/FileHandlers/Trivial_Handler.hpp
new file mode 100644
index 0000000..d9e0e15
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/Trivial_Handler.hpp
@@ -0,0 +1,47 @@
+#ifndef __Trivial_Handler_hpp__
+#define __Trivial_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "XMPFiles/source/XMPFiles_Impl.hpp"
+
+// =================================================================================================
+/// \file Trivial_Handler.hpp
+/// \brief Base class for trivial handlers that only process in-place XMP.
+///
+/// This header ...
+///
+/// \note There is no general promise here about crash-safe I/O. An update to an existing file might
+/// have invalid partial state while rewriting existing XMP in-place. Crash-safe updates are managed
+/// at a higher level of XMPFiles, using a temporary file and final swap of file content.
+///
+// =================================================================================================
+
+static const XMP_OptionBits kTrivial_HandlerFlags = ( kXMPFiles_AllowsOnlyXMP |
+                                                      kXMPFiles_ReturnsRawPacket |
+                                                      kXMPFiles_AllowsSafeUpdate );
+
+class Trivial_MetaHandler : public XMPFileHandler
+{
+public:
+
+	Trivial_MetaHandler() {};
+	~Trivial_MetaHandler();
+
+	virtual void CacheFileData() = 0;
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+};	// Trivial_MetaHandler
+
+// =================================================================================================
+
+#endif /* __Trivial_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.cpp b/XMPFiles/source/FileHandlers/UCF_Handler.cpp
new file mode 100644
index 0000000..d304bc2
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/UCF_Handler.cpp
@@ -0,0 +1,880 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FileHandlers/UCF_Handler.hpp"
+
+#include "third-party/zlib/zlib.h"
+
+#include <time.h>
+
+#ifdef DYNAMIC_CRC_TABLE
+	#error "unexpectedly DYNAMIC_CRC_TABLE defined."
+	//Must implement get_crc_table prior to any multi-threading (see notes there)
+#endif
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+using namespace std;
+
+// =================================================================================================
+/// \file UCF_Handler.cpp
+/// \brief UCF handler class
+// =================================================================================================
+const XMP_Uns16 xmpFilenameLen = 21;
+const char* xmpFilename = "META-INF/metadata.xml";
+
+// =================================================================================================
+// UCF_MetaHandlerCTor
+// ====================
+XMPFileHandler* UCF_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new UCF_MetaHandler ( parent );
+}	// UCF_MetaHandlerCTor
+
+// =================================================================================================
+// UCF_CheckFormat
+// ================
+// * lenght must at least be 114 bytes
+// * first bytes must be \x50\x4B\x03\x04 for *any* zip file
+// * at offset 30 it must spell "mimetype"
+
+#define MIN_UCF_LENGTH 114
+// zip minimum considerations:
+// the shortest legal zip is 100 byte:
+//  30+1* bytes file header
+//+ 0 byte content file (uncompressed)
+//+ 46+1* bytes central directory file header
+//+ 22 byte end of central directory record
+//-------
+//100 bytes
+//
+//1 byte is the shortest legal filename. anything below is no valid zip.
+//
+//==> the mandatory+first "mimetype" content file has a filename length of 8 bytes,
+//    thus even if empty (arguably incorrect but tolerable),
+//    the shortest legal UCF is 114 bytes (30 + 8 + 0 + 46 + 8 + 22 )
+//    anything below is with certainty not a valid ucf.
+
+bool UCF_CheckFormat (  XMP_FileFormat format,
+						XMP_StringPtr  filePath,
+						XMP_IO*    fileRef,
+						XMPFiles *     parent )
+{
+	// *not* using buffer functionality here, all we need
+	// to detect UCF securely is in the first 38 bytes...
+	IgnoreParam(filePath); IgnoreParam(parent);	//suppress warnings
+	XMP_Assert ( format == kXMP_UCFFile );								//standard assert
+
+	XMP_Uns8 buffer[MIN_UCF_LENGTH];
+
+	fileRef->Rewind();
+	if ( MIN_UCF_LENGTH != fileRef->Read ( buffer, MIN_UCF_LENGTH) ) //NO requireall (->no throw), just return false
+		return false;
+	if ( !CheckBytes ( &buffer[0], "\x50\x4B\x03\x04", 4 ) ) // "PK 03 04"
+		return false;
+	// UCF spec says: there must be a content file mimetype, and be first and be uncompressed...
+	if ( !CheckBytes ( &buffer[30], "mimetype", 8 ) )
+		return false;
+
+	//////////////////////////////////////////////////////////////////////////////
+	//figure out mimetype, decide on writeability
+	// grab mimetype
+	fileRef->Seek ( 18, kXMP_SeekFromStart  );
+	XMP_Uns32 mimeLength    = XIO::ReadUns32_LE ( fileRef );
+	XMP_Uns32 mimeCompressedLength = XIO::ReadUns32_LE ( fileRef );	 // must be same since uncompressed
+
+	XMP_Validate( mimeLength == mimeCompressedLength,
+				  "mimetype compressed and uncompressed length differ",
+				  kXMPErr_BadFileFormat );
+
+	XMP_Validate( mimeLength != 0, "0-byte mimetype", kXMPErr_BadFileFormat );
+
+	// determine writability based on mimetype
+	fileRef->Seek ( 30 + 8, kXMP_SeekFromStart  );
+	char* mimetype = new char[ mimeLength + 1 ];
+	fileRef->ReadAll ( mimetype, mimeLength );
+	mimetype[mimeLength] = '\0';
+
+	bool okMimetype;
+
+	// be lenient on extraneous CR (0xA) [non-XMP bug #16980028]
+	if ( mimeLength > 0 ) //avoid potential crash (will properly fail below anyhow)
+		if ( mimetype[mimeLength-1] == 0xA )
+			mimetype[mimeLength-1] = '\0';
+
+	if (
+		XMP_LitMatch( mimetype, "application/vnd.adobe.xfl"    ) ||  //Flash Diesel team
+		XMP_LitMatch( mimetype, "application/vnd.adobe.xfl+zip") ||  //Flash Diesel team
+		XMP_LitMatch( mimetype, "application/vnd.adobe.x-mars" ) ||  //Mars plugin(labs only), Acrobat8
+		XMP_LitMatch( mimetype, "application/vnd.adobe.pdfxml" ) ||  //Mars plugin(labs only), Acrobat 9
+		XMP_LitMatch( mimetype, "vnd.adobe.x-asnd"             ) ||  //Adobe Sound Document (Soundbooth Team)
+		XMP_LitMatch( mimetype, "application/vnd.adobe.indesign-idml-package" ) || //inCopy (inDesign) IDML Document
+		XMP_LitMatch( mimetype, "application/vnd.adobe.incopy-package"        ) ||  // InDesign Document
+		XMP_LitMatch( mimetype, "application/vnd.adobe.indesign-package"      ) ||  // InDesign Document
+		XMP_LitMatch( mimetype, "application/vnd.adobe.collage"    ) ||  //Adobe Collage
+		XMP_LitMatch( mimetype, "application/vnd.adobe.ideas"      ) ||  //Adobe Ideas
+		XMP_LitMatch( mimetype, "application/vnd.adobe.proto"      ) ||  //Adobe Proto
+		false ) // "sentinel"
+
+		// *** ==> unknown are also treated as not acceptable
+		okMimetype = true;
+	else
+		okMimetype = false;
+
+	// not accepted (neither read nor write
+	//.air  - Adobe Air Files
+	//application/vnd.adobe.air-application-installer-package+zip
+	//.airi - temporary Adobe Air Files
+	//application/vnd.adobe.air-application-intermediate-package+zip
+
+	delete [] mimetype;
+	return okMimetype;
+
+}	// UCF_CheckFormat
+
+// =================================================================================================
+// UCF_MetaHandler::UCF_MetaHandler
+// ==================================
+
+UCF_MetaHandler::UCF_MetaHandler ( XMPFiles * _parent )
+{
+	this->cdx2 = 0 ;
+	this->z = 0;
+	this->z2 = 0;
+	this->h = 0;
+	this->h2 = 0;
+	this->al = 0;
+	this->bl = 0;
+	this->xl = 0;
+	this->x2l = 0;
+	this->cdl = 0;
+	this->cd2l = 0;
+	this->cdxl = 0;
+	this->cdx2l = 0;
+	this->z2l = 0;
+	this->hl = 0;
+	this->fl = 0;
+	this->f2l = 0;
+	this->numCF = 0;
+	this->numCF2 = 0;
+	this->wasCompressed = false;
+	this->compressXMP = false;
+	this->inPlacePossible = false;
+	this->uncomprPacketLen = 0;
+	this->uncomprPacketStr = NULL;
+	this->finalPacketStr = NULL;
+	this->finalPacketLen = 0;
+	this->parent = _parent;
+	this->handlerFlags = kUCF_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+}	// UCF_MetaHandler::UCF_MetaHandler
+
+// =================================================================================================
+// UCF_MetaHandler::~UCF_MetaHandler
+// =====================================
+
+UCF_MetaHandler::~UCF_MetaHandler()
+{
+	// nothing
+}
+
+// =================================================================================================
+// UCF_MetaHandler::CacheFileData
+// ===============================
+//
+void UCF_MetaHandler::CacheFileData()
+{
+	//*** abort procedures
+	this->containsXMP = false;		//assume no XMP for now (beware of exceptions...)
+	XMP_IO* file = this->parent->ioRef;
+	XMP_PacketInfo &packetInfo = this->packetInfo;
+
+	// clear file positioning info ---------------------------------------------------
+	b=0;b2=0;x=0;x2=0;cd=0;cd2=0;cdx=0;cdx2=0;h=0;h2=0,fl=0;f2l=0;
+	al=0;bl=0;xl=0;x2l=0;cdl=0;cd2l=0;cdxl=0;cdx2l=0;hl=0,z=0,z2=0,z2l=0;
+	numCF=0;numCF2=0;
+	wasCompressed = false;
+
+	// -------------------------------------------------------------------------------
+	fl=file ->Length();
+	if ( fl < MIN_UCF_LENGTH )	XMP_Throw("file too short, can't be correct UCF",kXMPErr_Unimplemented);
+
+	//////////////////////////////////////////////////////////////////////////////
+	// find central directory before optional comment
+	// things have to go bottom-up, since description headers are allowed in UCF
+	// "scan backwards" until feasible field found (plus sig sanity check)
+	// OS buffering should be smart enough, so not doing anything on top
+	// plus almost all comments will be zero or rather short
+
+	//no need to check anything but the 21 chars of "METADATA-INF/metadata.xml"
+	char filenameToTest[22];
+	filenameToTest[21]='\0';
+
+	XMP_Int32 zipCommentLen = 0;
+	for ( ; zipCommentLen <= EndOfDirectory::COMMENT_MAX; zipCommentLen++ )
+	{
+		file->Seek ( -zipCommentLen -2, kXMP_SeekFromEnd  );
+		if ( XIO::ReadUns16_LE( file ) == zipCommentLen )	//found it?
+		{
+			//double check, might just look like comment length (actually be 'evil' comment)
+			file ->Seek ( - EndOfDirectory::FIXED_SIZE, kXMP_SeekFromCurrent  );
+			if ( XIO::ReadUns32_LE( file ) == EndOfDirectory::ID ) break; //heureka, directory ID
+			// 'else': pretend nothing happended, just go on
+		}
+	}
+	//was it a break or just not found ?
+	if ( zipCommentLen > EndOfDirectory::COMMENT_MAX ) XMP_Throw( "zip broken near end or invalid comment" , kXMPErr_BadFileFormat );
+
+	////////////////////////////////////////////////////////////////////////////
+	//read central directory
+	hl = zipCommentLen + EndOfDirectory::FIXED_SIZE;
+	h = fl - hl;
+	file ->Seek ( h , kXMP_SeekFromStart  );
+
+	if ( XIO::ReadUns32_LE( file ) != EndOfDirectory::ID )
+		XMP_Throw("directory header id not found. or broken comment",kXMPErr_BadFileFormat);
+	if ( XIO::ReadUns16_LE( file ) != 0 )
+		XMP_Throw("UCF must be 'first' zip volume",kXMPErr_BadFileFormat);
+	if ( XIO::ReadUns16_LE( file ) != 0 )
+		XMP_Throw("UCF must be single-volume zip",kXMPErr_BadFileFormat);
+
+	numCF = XIO::ReadUns16_LE( file ); //number of content files
+	if ( numCF != XIO::ReadUns16_LE( file ) )
+		XMP_Throw( "per volume and total number of dirs differ" , kXMPErr_BadFileFormat );
+	cdl = XIO::ReadUns32_LE( file );
+	cd = XIO::ReadUns32_LE( file );
+	file->Seek ( 2, kXMP_SeekFromCurrent  ); //skip comment len, needed since next LFA is kXMP_SeekFromCurrent !
+
+	//////////////////////////////////////////////////////////////////////////////
+	// check for zip64-end-of-CD-locator/ zip64-end-of-CD
+	// to to central directory
+	if ( cd == 0xffffffff )
+	{	// deal with zip 64, otherwise continue
+		XMP_Int64 tmp = file->Seek ( -(EndOfDirectory::FIXED_SIZE + Zip64Locator::TOTAL_SIZE),
+				  kXMP_SeekFromCurrent ); //go to begining of zip64 locator
+		//relative movement , absolute would imho only require another -zipCommentLen
+
+		if (  Zip64Locator::ID == XIO::ReadUns32_LE(file) ) // prevent 'coincidental length' ffffffff
+		{
+			XMP_Validate( 0 == XIO::ReadUns32_LE(file),
+					"zip64 CD disk must be 0", kXMPErr_BadFileFormat );
+
+			z = XIO::ReadUns64_LE(file);
+			XMP_Validate( z < 0xffffffffffffLL, "file in terrabyte range?", kXMPErr_BadFileFormat ); // 3* ffff, sanity test
+
+			XMP_Uns32 totalNumOfDisks = XIO::ReadUns32_LE(file);
+			/* tolerated while pkglib bug #1742179 */
+			XMP_Validate( totalNumOfDisks == 0 || totalNumOfDisks == 1,
+					"zip64 total num of disks must be 0", kXMPErr_BadFileFormat );
+
+			///////////////////////////////////////////////
+			/// on to end-of-CD itself
+			file->Seek ( z, kXMP_SeekFromStart  );
+			XMP_Validate( Zip64EndOfDirectory::ID == XIO::ReadUns32_LE(file),
+				   "invalid zip64 end of CD sig", kXMPErr_BadFileFormat );
+
+			XMP_Int64 sizeOfZip64EOD = XIO::ReadUns64_LE(file);
+			file->Seek ( 12, kXMP_SeekFromCurrent  );
+			//yes twice "total" and "per disk"
+			XMP_Int64 tmp64 = XIO::ReadUns64_LE(file);
+			XMP_Validate( tmp64 == numCF, "num of content files differs to zip64 (1)", kXMPErr_BadFileFormat );
+			tmp64 = XIO::ReadUns64_LE(file);
+			XMP_Validate( tmp64 == numCF, "num of content files differs to zip64 (2)", kXMPErr_BadFileFormat );
+			// cd length verification
+			tmp64 = XIO::ReadUns64_LE(file);
+			XMP_Validate( tmp64 == cdl, "CD length differs in zip64", kXMPErr_BadFileFormat );
+
+			cd = XIO::ReadUns64_LE(file); // wipe out invalid 0xffffffff with the real thing
+			//ignoring "extensible data sector (would need fullLength - fixed length) for now
+		}
+	} // of zip64 fork
+	/////////////////////////////////////////////////////////////////////////////
+	// parse central directory
+	// 'foundXMP' <=> cdx != 0
+
+	file->Seek ( cd, kXMP_SeekFromStart  );
+	XMP_Int64 cdx_suspect=0;
+	XMP_Int64 cdxl_suspect=0;
+	CDFileHeader curCDHeader;
+
+	for ( XMP_Uns16 entryNum=1 ; entryNum <= numCF  ; entryNum++ )
+	{
+		cdx_suspect =  file->Offset(); //just suspect for now
+		curCDHeader.read( file );
+
+		if ( GetUns32LE( &curCDHeader.fields[CDFileHeader::o_sig] ) != 0x02014b50 )
+			XMP_Throw("&invalid file header",kXMPErr_BadFileFormat);
+
+		cdxl_suspect = curCDHeader.FIXED_SIZE +
+			GetUns16LE(&curCDHeader.fields[CDFileHeader::o_fileNameLength]) +
+			GetUns16LE(&curCDHeader.fields[CDFileHeader::o_extraFieldLength]) +
+			GetUns16LE(&curCDHeader.fields[CDFileHeader::o_commentLength]);
+
+		// we only look 21 characters, that's META-INF/metadata.xml, no \0 attached
+		if ( curCDHeader.filenameLen == xmpFilenameLen /*21*/ )
+			if( XMP_LitNMatch( curCDHeader.filename , "META-INF/metadata.xml", 21 ) )
+				{
+					cdx  = cdx_suspect;
+					cdxl = cdxl_suspect;
+					break;
+				}
+		//hop to next
+		file->Seek ( cdx_suspect + cdxl_suspect , kXMP_SeekFromStart  );
+	} //for-loop, iterating *all* central directory headers (also beyond found)
+
+	if ( !cdx ) // not found xmp
+	{
+		// b and bl remain 0, x and xl remain 0
+		// ==> a is everything before directory
+		al = cd;
+		return;
+	}
+
+	// from here is if-found-only
+	//////////////////////////////////////////////////////////////////////////////
+	//CD values needed, most serve counter-validation purposes (below) only
+	// read whole object (incl. all 3 fields) again properly
+	//  to get extra Fields, etc
+	file->Seek ( cdx, kXMP_SeekFromStart  );
+	xmpCDHeader.read( file );
+
+	XMP_Validate( xmpFilenameLen == GetUns16LE( &xmpCDHeader.fields[CDFileHeader::o_fileNameLength]),
+		"content file length not ok", kXMPErr_BadFileFormat );
+
+	XMP_Uns16 CD_compression		= GetUns16LE( &xmpCDHeader.fields[CDFileHeader::o_compression] );
+	XMP_Validate(( CD_compression == 0 || CD_compression == 0x08),
+		"illegal compression, must be flate or none", kXMPErr_BadFileFormat );
+	XMP_Uns16 CD_flags				= GetUns16LE( &xmpCDHeader.fields[CDFileHeader::o_flags] );
+	XMP_Uns32 CD_crc				= GetUns32LE( &xmpCDHeader.fields[CDFileHeader::o_crc32] );
+
+	// parse (actual, non-CD!) file header ////////////////////////////////////////////////
+	x  = xmpCDHeader.offsetLocalHeader;
+	file ->Seek ( x , kXMP_SeekFromStart );
+	xmpFileHeader.read( file );
+	xl = xmpFileHeader.sizeHeader() + xmpCDHeader.sizeCompressed;
+
+	//values needed
+	XMP_Uns16 fileNameLength	= GetUns16LE( &xmpFileHeader.fields[FileHeader::o_fileNameLength] );
+	XMP_Uns16 extraFieldLength	= GetUns16LE( &xmpFileHeader.fields[FileHeader::o_extraFieldLength] );
+	XMP_Uns16 compression       = GetUns16LE( &xmpFileHeader.fields[FileHeader::o_compression] );
+	XMP_Uns32 sig				= GetUns32LE( &xmpFileHeader.fields[FileHeader::o_sig] );
+	XMP_Uns16 flags				= GetUns16LE( &xmpFileHeader.fields[FileHeader::o_flags] );
+	XMP_Uns32 sizeCompressed    = GetUns32LE( &xmpFileHeader.fields[FileHeader::o_sizeCompressed] );
+	XMP_Uns32 sizeUncompressed  = GetUns32LE( &xmpFileHeader.fields[FileHeader::o_sizeUncompressed] );
+	XMP_Uns32 crc				= GetUns32LE( &xmpFileHeader.fields[FileHeader::o_crc32] );
+
+	// check filename
+	XMP_Validate( fileNameLength == 21, "filename size contradiction" , kXMPErr_BadFileFormat );
+	XMP_Enforce ( xmpFileHeader.filename != 0 );
+	XMP_Validate( !memcmp( "META-INF/metadata.xml", xmpFileHeader.filename , xmpFilenameLen ) , "filename is cf header is not META-INF/metadata.xml" , kXMPErr_BadFileFormat );
+
+	// deal with data descriptor if needed
+	if ( flags & FileHeader::kdataDescriptorFlag )
+	{
+		if ( sizeCompressed!=0 || sizeUncompressed!=0 || crc!=0 )	XMP_Throw("data descriptor must mean 3x zero",kXMPErr_BadFileFormat);
+		file->Seek ( xmpCDHeader.sizeCompressed + fileNameLength + xmpCDHeader.extraFieldLen, kXMP_SeekFromCurrent ); //skip actual data to get to descriptor
+		crc = XIO::ReadUns32_LE( file );
+		if ( crc == 0x08074b50 ) //data descriptor may or may not have signature (see spec)
+		{
+			crc = XIO::ReadUns32_LE( file ); //if it does, re-read
+		}
+		sizeCompressed = XIO::ReadUns32_LE( file );
+		sizeUncompressed = XIO::ReadUns32_LE( file );
+		// *** cater for zip64 plus 'streamed' data-descriptor stuff
+	}
+
+	// more integrity checks (post data descriptor handling)
+	if ( sig != 0x04034b50 )						XMP_Throw("invalid content file header",kXMPErr_BadFileFormat);
+	if ( compression != CD_compression )			XMP_Throw("compression contradiction",kXMPErr_BadFileFormat);
+	if ( sizeUncompressed != xmpCDHeader.sizeUncompressed )	XMP_Throw("contradicting uncompressed lengths",kXMPErr_BadFileFormat);
+	if ( sizeCompressed != xmpCDHeader.sizeCompressed ) XMP_Throw("contradicting compressed lengths",kXMPErr_BadFileFormat);
+	if ( sizeUncompressed == 0 )					XMP_Throw("0-byte uncompressed size", kXMPErr_BadFileFormat );
+
+	////////////////////////////////////////////////////////////////////
+	// packet Info
+	this->packetInfo.charForm = stdCharForm;
+	this->packetInfo.writeable = false;
+	this->packetInfo.offset = kXMPFiles_UnknownOffset; // checksum!, hide position to not give funny ideas
+	this->packetInfo.length = kXMPFiles_UnknownLength;
+
+	////////////////////////////////////////////////////////////////////
+	// prepare packet (compressed or not)
+	this->xmpPacket.erase();
+	this->xmpPacket.reserve( sizeUncompressed );
+	this->xmpPacket.append( sizeUncompressed, ' ' );
+	XMP_StringPtr packetStr = XMP_StringPtr ( xmpPacket.c_str() );	// only set after reserving the space!
+
+	// go to packet offset
+	file->Seek ( x + xmpFileHeader.FIXED_SIZE + fileNameLength + extraFieldLength , kXMP_SeekFromStart);
+
+	// compression fork --------------------------------------------------
+	switch (compression)
+	{
+	case 0x8: // FLATE
+		{
+			wasCompressed = true;
+			XMP_Uns32 bytesRead = 0;
+			XMP_Uns32 bytesWritten = 0; // for writing into packetString
+			const unsigned int CHUNK = 16384;
+
+			int ret;
+			unsigned int have; //added type
+			z_stream strm;
+			unsigned char in[CHUNK];
+			unsigned char out[CHUNK];
+			// does need this intermediate stage, no direct compressio to packetStr possible,
+			// since also partially filled buffers must be picked up. That's how it works.
+			// in addition: internal zlib variables might have 16 bit limits...
+
+			/* allocate inflate state */
+			strm.zalloc = Z_NULL;
+			strm.zfree = Z_NULL;
+			strm.opaque = Z_NULL;
+			strm.avail_in = 0;
+			strm.next_in = Z_NULL;
+
+			/* must use windowBits = -15, for raw inflate, no zlib header */
+			ret = inflateInit2(&strm,-MAX_WBITS);
+
+			if (ret != Z_OK)
+				XMP_Throw("zlib error ",kXMPErr_ExternalFailure);
+
+			/* decompress until deflate stream ends or end of file */
+			do {
+				// must take care here not to read too much, thus whichever is smaller:
+				XMP_Int32 bytesRemaining = sizeCompressed - bytesRead;
+				if ( (XMP_Int32)CHUNK < bytesRemaining ) bytesRemaining = (XMP_Int32)CHUNK;
+				strm.avail_in=file ->ReadAll ( in , bytesRemaining  );
+				bytesRead += strm.avail_in; // NB: avail_in is "unsigned_int", so might be 16 bit (not harmfull)
+
+				if (strm.avail_in == 0) break;
+				strm.next_in = in;
+
+				do {
+					strm.avail_out = CHUNK;
+					strm.next_out = out;
+					ret = inflate(&strm, Z_NO_FLUSH);
+					XMP_Assert( ret != Z_STREAM_ERROR );	/* state not clobbered */
+					switch (ret)
+					{
+					case Z_NEED_DICT:
+						(void)inflateEnd(&strm);
+						XMP_Throw("zlib error: Z_NEED_DICT",kXMPErr_ExternalFailure);
+					case Z_DATA_ERROR:
+						(void)inflateEnd(&strm);
+						XMP_Throw("zlib error: Z_DATA_ERROR",kXMPErr_ExternalFailure);
+					case Z_MEM_ERROR:
+						(void)inflateEnd(&strm);
+						XMP_Throw("zlib error: Z_MEM_ERROR",kXMPErr_ExternalFailure);
+					}
+
+					have = CHUNK - strm.avail_out;
+					memcpy( (unsigned char*) packetStr + bytesWritten , out , have );
+					bytesWritten += have;
+
+				} while (strm.avail_out == 0);
+
+				/* it's done when inflate() says it's done */
+			} while (ret != Z_STREAM_END);
+
+			/* clean up and return */
+			(void)inflateEnd(&strm);
+			if (ret != Z_STREAM_END)
+				XMP_Throw("zlib error ",kXMPErr_ExternalFailure);
+			break;
+		}
+	case 0x0:	// no compression - read directly into the right place
+		{
+			wasCompressed = false;
+			XMP_Enforce( file->ReadAll ( (char*)packetStr, sizeUncompressed ) );
+			break;
+		}
+	}
+	this->containsXMP = true; // do this last, after all possible failure/execptions
+}
+
+
+// =================================================================================================
+// UCF_MetaHandler::ProcessXMP
+// ============================
+
+void UCF_MetaHandler::ProcessXMP()
+{
+	// we have no legacy, CacheFileData did all that was needed
+	// ==> default implementation is fine
+	XMPFileHandler::ProcessXMP();
+}
+
+// =================================================================================================
+// UCF_MetaHandler::UpdateFile
+// =============================
+
+// TODO: xmp packet with data descriptor
+
+void UCF_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	//sanity
+	XMP_Enforce( (x!=0) == (cdx!=0) );
+	if (!cdx)
+		xmpCDHeader.setXMPFilename();	//if new, set filename (impacts length, thus before computation)
+	if ( ! this->needsUpdate )
+		return;
+
+	// ***
+	if ( doSafeUpdate ) XMP_Throw ( "UCF_MetaHandler::UpdateFile: Safe update not supported", kXMPErr_Unavailable );
+
+	XMP_IO* file = this->parent->ioRef;
+
+	// final may mean compressed or not, whatever is to-be-embedded
+	uncomprPacketStr = xmpPacket.c_str();
+	uncomprPacketLen = (XMP_StringLen) xmpPacket.size();
+	finalPacketStr = uncomprPacketStr;		// will be overriden if compressedXMP==true
+	finalPacketLen = uncomprPacketLen;
+	std::string compressedPacket;	// moot if non-compressed, still here for scope reasons (having to keep a .c_str() alive)
+
+	if ( !x ) // if new XMP...
+	{
+		xmpFileHeader.clear();
+		xmpFileHeader.setXMPFilename();
+		// ZIP64 TODO: extra Fields, impact on cdxl2 and x2l
+	}
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// COMPRESSION DECISION
+
+	// for large files compression is bad:
+	// a) size of XMP becomes irrelevant on large files ==> why worry over compression ?
+	// b) more importantly: no such thing as padding possible, compression ==  ever changing sizes
+	//    => never in-place rewrites, *ugly* performance impact on large files
+	inPlacePossible = false; //assume for now
+
+	if ( !x )	// no prior XMP? -> decide on filesize
+		compressXMP = ( fl > 1024*50 /* 100 kB */ ) ? false : true;
+	else
+		compressXMP = wasCompressed;	// don't change a thing
+
+	if ( !wasCompressed && !compressXMP &&
+		( GetUns32LE( &xmpFileHeader.fields[FileHeader::o_sizeUncompressed] ) == uncomprPacketLen ))
+	{
+			inPlacePossible = true;
+	}
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// COMPRESS XMP
+	if ( compressXMP )
+	{
+		const unsigned int CHUNK = 16384;
+		int ret, flush;
+		unsigned int have;
+		z_stream strm;
+		unsigned char out[CHUNK];
+
+		/* allocate deflate state */
+		strm.zalloc = Z_NULL; strm.zfree = Z_NULL; strm.opaque = Z_NULL;
+		if ( deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8 /*memlevel*/, Z_DEFAULT_STRATEGY) )
+			XMP_Throw("zlib error ",kXMPErr_ExternalFailure);
+
+		//write at once, since we got it in mem anyway:
+		strm.avail_in = uncomprPacketLen;
+		flush = Z_FINISH; // that's all, folks
+		strm.next_in = (unsigned char*) uncomprPacketStr;
+
+		do {
+			strm.avail_out = CHUNK;
+			strm.next_out = out;
+
+			ret = deflate(&strm, flush);    /* no bad return value (!=0 acceptable) */
+			XMP_Enforce(ret != Z_STREAM_ERROR); /* state not clobbered */
+			//fwrite(buffer,size,count,file)
+			have = CHUNK - strm.avail_out;
+			compressedPacket.append( (const char*) out,  have);
+		} while (strm.avail_out == 0);
+
+		if (ret != Z_STREAM_END)
+			XMP_Throw("zlib stream incomplete ",kXMPErr_ExternalFailure);
+		XMP_Enforce(strm.avail_in == 0);		// all input will be used
+		(void)deflateEnd(&strm);				//clean up (do prior to checks)
+
+		finalPacketStr = compressedPacket.c_str();
+		finalPacketLen = (XMP_StringLen)compressedPacket.size();
+	}
+
+	PutUns32LE ( uncomprPacketLen,	&xmpFileHeader.fields[FileHeader::o_sizeUncompressed] );
+	PutUns32LE ( finalPacketLen,	&xmpFileHeader.fields[FileHeader::o_sizeCompressed]   );
+	PutUns16LE ( compressXMP ? 8:0,	&xmpFileHeader.fields[FileHeader::o_compression]      );
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// CRC (always of uncompressed data)
+	XMP_Uns32 crc = crc32( 0 , (Bytef*)uncomprPacketStr, uncomprPacketLen );
+	PutUns32LE( crc, &xmpFileHeader.fields[FileHeader::o_crc32] );
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// TIME calculation for timestamp
+	// will be applied both to xmp content file and CD header
+	XMP_Uns16 lastModTime, lastModDate;
+	XMP_DateTime time;
+	SXMPUtils::CurrentDateTime( &time );
+
+	if ( (time.year - 1900) < 80)
+	{
+		lastModTime = 0; // 1.1.1980 00:00h
+		lastModDate = 21;
+	}
+
+	// typedef unsigned short  ush; //2 bytes
+	lastModDate = (XMP_Uns16) (((time.year) - 1980 ) << 9  | ((time.month) << 5) | time.day);
+	lastModTime = ((XMP_Uns16)time.hour << 11) | ((XMP_Uns16)time.minute << 5) | ((XMP_Uns16)time.second >> 1);
+
+	PutUns16LE ( lastModDate,	&xmpFileHeader.fields[FileHeader::o_lastmodDate]      );
+	PutUns16LE ( lastModTime,	&xmpFileHeader.fields[FileHeader::o_lastmodTime]      );
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// adjustments depending on 4GB Border,
+	//   decisions on in-place update
+	//   so far only z, zl have been determined
+
+	// Zip64 related assurances, see (15)
+	XMP_Enforce(!z2);
+	XMP_Enforce(h+hl == fl );
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// COMPUTE MISSING VARIABLES
+	// A - based on xmp existence
+	//
+	// already known: x, xl, cd
+	// most left side vars,
+	//
+	// finalPacketStr, finalPacketLen
+
+	if ( x ) // previous xmp?
+	{
+		al = x;
+		b  = x + xl;
+		bl = cd - b;
+	}
+	else
+	{
+		al = cd;
+		//b,bl left at zero
+	}
+
+	if ( inPlacePossible )
+	{ // leave xmp right after A
+		x2 = al;
+		x2l = xmpFileHeader.sizeTotalCF(); //COULDDO: assert (x2l == xl)
+		if (b) b2 = x2 + x2l; // b follows x as last content part
+		cd2 = b2 + bl;	// CD follows B2
+	}
+	else
+	{ // move xmp to end
+		if (b) b2 = al; // b follows
+		// x follows as last content part (B existing or not)
+		x2 = al + bl;
+		x2l = xmpFileHeader.sizeTotalCF();
+		cd2 = x2 + x2l;	// CD follows X
+	}
+
+	/// create new XMP header ///////////////////////////////////////////////////
+	// written into actual fields + generation of extraField at .write()-time...
+	// however has impact on .size() computation  --  thus enter before cdx2l computation
+	xmpCDHeader.sizeUncompressed = uncomprPacketLen;
+	xmpCDHeader.sizeCompressed = finalPacketLen;
+	xmpCDHeader.offsetLocalHeader = x2;
+	PutUns32LE ( crc,				&xmpCDHeader.fields[CDFileHeader::o_crc32] );
+	PutUns16LE ( compressXMP ? 8:0,	&xmpCDHeader.fields[CDFileHeader::o_compression] );
+	PutUns16LE ( lastModDate,		&xmpCDHeader.fields[CDFileHeader::o_lastmodDate] );
+	PutUns16LE ( lastModTime,		&xmpCDHeader.fields[CDFileHeader::o_lastmodTime] );
+
+	// for
+	if ( inPlacePossible )
+	{
+		cdx2 = cdx;	//same, same
+		writeOut( file, file, false, true );
+		return;
+	}
+
+	////////////////////////////////////////////////////////////////////////
+	// temporarily store (those few, small) trailing things that might not survive the move around:
+	file->Seek ( cd, kXMP_SeekFromStart );	// seek to central directory
+	cdEntries.clear(); //mac precaution
+
+	//////////////////////////////////////////////////////////////////////////////
+	// parse headers
+	//   * stick together output header list
+	cd2l = 0; //sum up below
+
+	CDFileHeader tempHeader;
+	for( XMP_Uns16 pos=1 ; pos <= numCF ; pos++ )
+	{
+		if ( (cdx) && (file->Offset() == cdx) )
+		{
+			tempHeader.read( file ); //read, even if not use, to advance file pointer
+		}
+		else
+		{
+			tempHeader.read( file );
+			// adjust b2 offset for files that were behind the xmp:
+			//        may (if xmp moved to back)
+			//        or may not (inPlace Update) make a difference
+			if ( (x) && ( tempHeader.offsetLocalHeader > x) ) // if xmp existed before and this was a file behind it
+				tempHeader.offsetLocalHeader += b2 - b;
+			cd2l += tempHeader.size(); // prior offset change might have impact
+			cdEntries.push_back( tempHeader );
+		}
+	}
+
+	//push in XMP packet as last one (new or not)
+	cdEntries.push_back( xmpCDHeader );
+	cdx2l = xmpCDHeader.size();
+	cd2l += cdx2l; // true, no matter which order
+
+	//OLD  cd2l = : cdl - cdxl + cdx2l;	// (NB: cdxl might be 0)
+	numCF2 = numCF + ( (cdx)?0:1 );	//xmp packet for the first time? -> add one more CF
+
+	XMP_Validate( numCF2 > 0, "no content files", kXMPErr_BadFileFormat );
+	XMP_Validate( numCF2 <= 0xFFFE, "max number of 0xFFFE entries reached", kXMPErr_BadFileFormat );
+
+	cdx2 = cd2 + cd2l - cdx2l;	// xmp content entry comes last (since beyond inPlace Update)
+
+	// zip64 decision
+	if ( ( cd2 + cd2l + hl ) > 0xffffffff )	// predict non-zip size ==> do we need a zip-64?
+	{
+		z2 = cd2 + cd2l;
+		z2l = Zip64EndOfDirectory::FIXED_SIZE + Zip64Locator::TOTAL_SIZE;
+	}
+
+	// header and output length,
+	h2 = cd2 + cd2l + z2l; // (z2l might be 0)
+	f2l = h2 + hl;
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// read H (endOfCD), correct offset
+	file->Seek ( h, kXMP_SeekFromStart );
+
+	endOfCD.read( file );
+	if ( cd2 <= 0xffffffff )
+		PutUns32LE( (XMP_Int32) cd2 , &endOfCD.fields[ endOfCD.o_CdOffset ] );
+	else
+		PutUns32LE( 0xffffffff , &endOfCD.fields[ endOfCD.o_CdOffset ] );
+	PutUns16LE( numCF2, &endOfCD.fields[ endOfCD.o_CdNumEntriesDisk   ] );
+	PutUns16LE( numCF2, &endOfCD.fields[ endOfCD.o_CdNumEntriesTotal  ] );
+
+	XMP_Enforce( cd2l <= 0xffffffff ); // _size_ of directory itself certainly under 4GB
+	PutUns32LE( (XMP_Uns32)cd2l,   &endOfCD.fields[ endOfCD.o_CdSize ] );
+
+	////////////////////////////////////////////////////////////////////////////////////////////////
+	// MOVING
+	writeOut( file, file, false, false );
+
+	this->needsUpdate = false; //do last for safety reasons
+}	// UCF_MetaHandler::UpdateFile
+
+// =================================================================================================
+// UCF_MetaHandler::WriteTempFile
+// ==============================
+void UCF_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	IgnoreParam ( tempRef );
+	XMP_Throw ( "UCF_MetaHandler::WriteTempFile: TO BE IMPLEMENTED", kXMPErr_Unimplemented );
+}
+
+// =================================================================================================
+// own approach to unify Update and WriteFile:
+// ============================
+
+void UCF_MetaHandler::writeOut( XMP_IO* sourceFile, XMP_IO* targetFile, bool isRewrite, bool isInPlace)
+{
+	// isInPlace is only possible when it's not a complete rewrite
+	XMP_Enforce( (!isInPlace) || (!isRewrite) );
+
+	/////////////////////////////////////////////////////////
+	// A
+	if (isRewrite)	//move over A block
+		XIO::Move( sourceFile , 0 , targetFile, 0 , al );
+
+	/////////////////////////////////////////////////////////
+	// B / X (not necessarily in this order)
+	if ( !isInPlace ) // B does not change a thing (important optimization)
+	{
+		targetFile ->Seek ( b2 , kXMP_SeekFromStart  );
+		XIO::Move( sourceFile , b , targetFile, b2 , bl );
+	}
+
+	targetFile ->Seek ( x2 , kXMP_SeekFromStart  );
+	xmpFileHeader.write( targetFile );
+	targetFile->Write ( finalPacketStr, finalPacketLen  );
+	//TODO: cover reverse case / inplace ...
+
+	/////////////////////////////////////////////////////////
+	// CD
+	// No Seek here on purpose.
+	// This assert must still be valid
+
+	// if inPlace, the only thing that needs still correction is the CRC in CDX:
+	if ( isInPlace )
+	{
+		XMP_Uns32 crc;	//TEMP, not actually needed
+		crc = GetUns32LE( &xmpFileHeader.fields[FileHeader::o_crc32] );
+
+		// go there,
+		// do the job (take value directly from (non-CD-)fileheader),
+		// end of story.
+		targetFile ->Seek ( cdx2 + CDFileHeader::o_crc32 , kXMP_SeekFromStart  );
+		targetFile->Write ( &xmpFileHeader.fields[FileHeader::o_crc32], 4 );
+
+		return;
+	}
+
+	targetFile ->Seek ( cd2 , kXMP_SeekFromStart  );
+
+	std::vector<CDFileHeader>::iterator iter;
+	int tmptmp=1;
+	for( iter = cdEntries.begin(); iter != cdEntries.end(); iter++ ) {
+		CDFileHeader* p=&(*iter);
+		XMP_Int64 before = targetFile->Offset();
+		p->write( targetFile );
+		XMP_Int64 total = targetFile->Offset() - before;
+		XMP_Int64 tmpSize = p->size();
+		tmptmp++;
+	}
+
+	/////////////////////////////////////////////////////////
+	// Z
+	if ( z2 )  // yes, that simple
+	{
+		XMP_Assert( z2 == targetFile->Offset());
+		targetFile ->Seek ( z2 , kXMP_SeekFromStart  );
+
+		//no use in copying, always construct from scratch
+		Zip64EndOfDirectory zip64EndOfDirectory( cd2, cd2l, numCF2) ;
+		Zip64Locator zip64Locator( z2 );
+
+		zip64EndOfDirectory.write( targetFile );
+		zip64Locator.write( targetFile );
+	}
+
+	/////////////////////////////////////////////////////////
+	// H
+	XMP_Assert( h2 == targetFile->Offset());
+	endOfCD.write( targetFile );
+
+	XMP_Assert( f2l == targetFile->Offset());
+	if ( f2l< fl)
+		targetFile->Truncate ( f2l );	//file may have shrunk
+}
diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.hpp b/XMPFiles/source/FileHandlers/UCF_Handler.hpp
new file mode 100644
index 0000000..eee46ef
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/UCF_Handler.hpp
@@ -0,0 +1,723 @@
+#ifndef __UCF_Handler_hpp__
+#define __UCF_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+// =================================================================================================
+/// \file UCF_Handler.hpp
+//
+//  underlying math:
+//    __   0   ______    0    ______  __
+//            |  A   |       |  A   |
+//            |      |       |      |
+//         al |      |  (a2l)|      |
+//         x  |------|   b2  |------|
+//         xl |  X   |       |  B   |_
+//         b  |------|  (b2l)|      | |
+//            |  B   |   x2  |------| | B2 could also be
+//         bl |      |   x2l |  X2  | | _after_ X2
+//         cd |------|   cd2 |------|<'
+//            |//CD//|       |//CD2/|
+//        cdx |------|  cdx2 |------|
+//        cdxl|------|  cdx2l|------|
+//         cdl|//////|   cd2l|//////|
+//         z  |------|     z2|------|
+//            |      |       |      |
+//        [zl]|  Z   |   z2l |  Z2  |
+//         h  |------|   h2  |------|
+//    fl      |  H   |       |  H2  |  f2l
+//    __   hl |______|  (h2l)|______|  __
+//
+//    fl  file length pre (2 = post)
+//    numCf  number of content files prior to injection
+//    numCf2            "            post
+//
+//
+//    l	length variable, all else offset
+//    [ ] variable is not needed
+//    ( ) variable is identical to left
+//    a   content files prior to xmp (possibly: all)
+//    b   content files behind xmp (possibly: 0)
+//    x   xmp packet (possibly: 0)
+//    cd  central directory
+//    h   end of central directory
+//
+//    z   zip64 record and locator (if existing)
+//
+//    general rules:
+//    the bigger A, the less rewrite effort.
+//    (also within the CD)
+//    putting XMP at the end maximizes A.
+//
+//    bool previousXMP == x!=0
+//
+//    (x==0) == (cdx==0) == (xl==0) == (cdxl==0)
+//
+//    std::vector<XMP_Uns32> cdOffsetsPre;
+//
+//    -----------------
+//    asserts:
+//( 1)  a == a2 == 0,	making these variables obsolete
+//( 2)  a2l == al,		this block is not touched
+//( 3)  b2 <= b,		b is only moved closer to the beginning of file
+//( 4)  b2l == bl,		b does not change in size
+//( 5)  x2 >= x,		b is only moved further down in the file
+//
+//( 6) x != 0, x2l != 0, cd != 0, cdl != 0
+//    				none of these blocks is at the beginning ('mimetype' by spec),
+//    				nor is any of them zero byte long
+//( 7) h!=0, hl >= 22	header is not at the beginning, minimum size 22
+//
+//    file size computation:
+//( 8) al + bl + xl +cdl +hl = fl
+//( 9) al + bl + x2l+cd2l+hl = fl2
+//
+//(10) ( x==0 ) <=> ( cdx == 0 )
+//    				if there's a packet in the pre-file, or there isn't
+//(11) (x==0)	=> xl=0
+//(12) (cdx==0)=> cdx=0
+//
+//(13) x==0 ==> b,bl,b2,b2l==0
+//    				if there is no pre-xmp, B does not exist
+//(14) x!=0 ==> al:=x, b:=x+xl, bl:=cd-b
+//
+//    zip 64:
+//(15)  zl and z2l are basically equal, except _one_ of them is 0 :
+//
+//(16)  b2l is indeed never different t
+//
+//    FIXED_SIZE means the fixed (minimal) portion of a struct
+//    TOTAL_SIZE indicates, that this struct indeed has a fixed, known total length
+//
+// =================================================================================================
+
+extern XMPFileHandler* UCF_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool UCF_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+                              XMP_IO*    fileRef,
+                              XMPFiles *     parent );
+
+static const XMP_OptionBits kUCF_HandlerFlags = (
+						kXMPFiles_CanInjectXMP     |
+						kXMPFiles_CanExpand        |
+						kXMPFiles_CanRewrite       |
+						/* kXMPFiles_PrefersInPlace | removed, only reasonable for formats where difference is significant */
+						kXMPFiles_AllowsOnlyXMP    |
+						kXMPFiles_ReturnsRawPacket |
+						// *** kXMPFiles_AllowsSafeUpdate |
+						kXMPFiles_NeedsReadOnlyPacket //UCF/zip has checksums...
+						);
+
+enum {	// data descriptor
+	// may or may not have a signature: 0x08074b50
+	kUCF_DD_crc32				=   0,
+	kUCF_DD_sizeCompressed		=   4,
+	kUCF_DD_sizeUncompressed	=   8,
+};
+
+class UCF_MetaHandler : public XMPFileHandler
+{
+public:
+	UCF_MetaHandler ( XMPFiles * _parent );
+	~UCF_MetaHandler();
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+protected:
+	const static XMP_Uns16 xmpFilenameLen = 21;
+	const static char* xmpFilename;
+
+private:
+	class Zip64EndOfDirectory {
+	private:
+
+	public:
+		const static XMP_Uns16 o_sig				=	0;	// 0x06064b50
+		const static XMP_Uns16 o_size				=	4;	// of this, excluding leading 12 bytes
+				// == FIXED_SIZE -12, since we're never creating the extensible data sector...
+		const static XMP_Uns16 o_VersionMade		=	12;
+		const static XMP_Uns16 o_VersionNeededExtr	=	14;
+		const static XMP_Uns16 o_numDisk			=	16;	// force 0
+		const static XMP_Uns16 o_numCDDisk			=	20; // force 0
+		const static XMP_Uns16 o_numCFsThisDisk		=	24;
+		const static XMP_Uns16 o_numCFsTotal		=	32; // force equal
+		const static XMP_Uns16 o_sizeOfCD			=	40; // (regular one, not Z64)
+		const static XMP_Uns16 o_offsetCD			=	48; //           "
+
+		const static XMP_Int32 FIXED_SIZE = 56;
+		char  fields[FIXED_SIZE];
+
+		const static XMP_Uns32 ID = 0x06064b50;
+
+		Zip64EndOfDirectory( XMP_Int64 offsetCD, XMP_Int64 sizeOfCD, XMP_Uns64 numCFs )
+		{
+			memset(fields,'\0',FIXED_SIZE);
+
+			PutUns32LE(ID				,&fields[o_sig] );
+			PutUns64LE(FIXED_SIZE - 12,	&fields[o_size] );	//see above
+			PutUns16LE(	45	,&fields[o_VersionMade] );
+			PutUns16LE(	45	,&fields[o_VersionNeededExtr] );
+			// fine at 0:	o_numDisk
+			// fine at 0:	o_numCDDisk
+			PutUns64LE( numCFs, &fields[o_numCFsThisDisk] );
+			PutUns64LE( numCFs, &fields[o_numCFsTotal] );
+			PutUns64LE( sizeOfCD,	&fields[o_sizeOfCD] );
+			PutUns64LE( offsetCD,	&fields[o_offsetCD] );
+		}
+
+		void write(XMP_IO* file)
+		{
+			XMP_Validate( ID == GetUns32LE( &this->fields[o_sig] ), "invalid header on write", kXMPErr_BadFileFormat );
+			file ->Write ( fields , FIXED_SIZE  );
+		}
+
+	};
+
+	class Zip64Locator {
+	public:
+		const static XMP_Uns16 o_sig				=	0;	// 0x07064b50
+		const static XMP_Uns16 o_numDiskZ64CD		=	4;	// force 0
+		const static XMP_Uns16 o_offsZ64EOD			=   8;
+		const static XMP_Uns16 o_numDisks			=   16; // set 1, tolerate 0
+
+		const static XMP_Int32 TOTAL_SIZE			=	20;
+		char  fields[TOTAL_SIZE];
+
+		const static XMP_Uns32 ID = 0x07064b50;
+
+		Zip64Locator( XMP_Int64 offsetZ64EOD )
+		{
+			memset(fields,'\0',TOTAL_SIZE);
+			PutUns32LE(ID,				&fields[Zip64Locator::o_sig] );
+			PutUns32LE(0,				&fields[Zip64Locator::o_numDiskZ64CD] );
+			PutUns64LE(offsetZ64EOD,	&fields[Zip64Locator::o_offsZ64EOD] );
+			PutUns32LE(1,				&fields[Zip64Locator::o_numDisks] );
+		}
+
+		// writes structure to file (starting at current position)
+		void write(XMP_IO* file)
+		{
+			XMP_Validate( ID == GetUns32LE( &this->fields[o_sig] ), "invalid header on write", kXMPErr_BadFileFormat );
+			file ->Write ( fields , TOTAL_SIZE  );
+		}
+	};
+
+	struct EndOfDirectory {
+	public:
+		const static XMP_Int32 FIXED_SIZE = 22;	//32 bit type is important to not overrun on maxcomment
+		const static XMP_Uns32 ID = 0x06054b50;
+		const static XMP_Int32 COMMENT_MAX = 0xFFFF;
+		//offsets
+		const static XMP_Int32 o_CentralDirectorySize = 12;
+		const static XMP_Int32 o_CentralDirectoryOffset = 16;
+	};
+
+	class FileHeader {
+		private:
+			//TODO intergrate in clear()
+			void release() // avoid terminus free() since subject to a #define (mem-leak-check)
+			{
+				if (filename)	delete [] filename;
+				if (extraField)	delete [] extraField;
+				filename=0;
+				extraField=0;
+			}
+
+		public:
+			const static XMP_Uns32 SIG = 0x04034b50;
+			const static XMP_Uns16 kdataDescriptorFlag = 0x8;
+
+			const static XMP_Uns16 o_sig = 0;
+			const static XMP_Uns16 o_extractVersion		=	4;
+			const static XMP_Uns16 o_flags				=   6;
+			const static XMP_Uns16 o_compression		=   8;
+			const static XMP_Uns16 o_lastmodTime		=   10;
+			const static XMP_Uns16 o_lastmodDate		=   12;
+			const static XMP_Uns16 o_crc32				=   14;
+			const static XMP_Uns16 o_sizeCompressed		=   18;
+			const static XMP_Uns16 o_sizeUncompressed	=   22;
+			const static XMP_Uns16 o_fileNameLength		=   26;
+			const static XMP_Uns16 o_extraFieldLength	=   28;
+			// total									30
+
+			const static int FIXED_SIZE = 30;
+			char  fields[FIXED_SIZE];
+
+			char* filename;
+			char* extraField;
+			XMP_Uns16 filenameLen;
+			XMP_Uns16 extraFieldLen;
+
+			void clear()
+			{
+				this->release();
+				memset(fields,'\0',FIXED_SIZE);
+				//arm with minimal default values:
+				PutUns32LE(0x04034b50,	&fields[FileHeader::o_sig] );
+				PutUns16LE(0x14,		&fields[FileHeader::o_extractVersion] );
+			}
+
+			FileHeader() : filename(0),extraField(0),filenameLen(0),extraFieldLen(0)
+			{
+				clear();
+			}
+
+			// reads entire *FileHeader* structure from file (starting at current position)
+			void read(XMP_IO* file)
+			{
+				this->release();
+
+				file ->ReadAll ( fields , FIXED_SIZE  );
+
+				XMP_Uns32 tmp32 = GetUns32LE( &this->fields[FileHeader::o_sig] );
+				XMP_Validate( SIG == tmp32, "invalid header", kXMPErr_BadFileFormat );
+				filenameLen   = GetUns16LE( &this->fields[FileHeader::o_fileNameLength] );
+				extraFieldLen = GetUns16LE( &this->fields[FileHeader::o_extraFieldLength] );
+
+				// nb unlike the CDFileHeader the FileHeader will in practice never have
+				// extra fields. Reasoning: File headers never carry (their own) offsets,
+				// (un)compressed size of XMP will hardly ever reach 4 GB
+
+				if (filenameLen) {
+					filename = new char[filenameLen];
+					file->ReadAll ( filename, filenameLen );
+				}
+				if (extraFieldLen) {
+					extraField = new char[extraFieldLen];
+					file->ReadAll ( extraField, extraFieldLen );
+					// *** NB: this WOULD need parsing for content files that are
+					//   compressed or uncompressed >4GB (VERY unlikely for XMP)
+				}
+			}
+
+			// writes structure to file (starting at current position)
+			void write(XMP_IO* file)
+			{
+				XMP_Validate( SIG == GetUns32LE( &this->fields[FileHeader::o_sig] ), "invalid header on write", kXMPErr_BadFileFormat );
+
+				filenameLen   = GetUns16LE( &this->fields[FileHeader::o_fileNameLength] );
+				extraFieldLen = GetUns16LE( &this->fields[FileHeader::o_extraFieldLength] );
+
+				file ->Write ( fields , FIXED_SIZE  );
+				if (filenameLen)	file->Write ( filename, filenameLen    );
+				if (extraFieldLen)	file->Write ( extraField, extraFieldLen  );
+			}
+
+			void transfer(const FileHeader &orig)
+			{
+				memcpy(fields,orig.fields,FIXED_SIZE);
+				if (orig.extraField)
+				{
+					extraFieldLen=orig.extraFieldLen;
+					extraField = new char[extraFieldLen];
+					memcpy(extraField,orig.extraField,extraFieldLen);
+				}
+				if (orig.filename)
+				{
+					filenameLen=orig.filenameLen;
+					filename = new char[filenameLen];
+					memcpy(filename,orig.filename,filenameLen);
+				}
+			};
+
+			void setXMPFilename()
+			{
+				// only needed for fresh structs, thus enforcing rather than catering to memory issues
+				XMP_Enforce( (filenameLen==0) && (extraFieldLen == 0) );
+				filenameLen = xmpFilenameLen;
+				PutUns16LE(filenameLen,	&fields[FileHeader::o_fileNameLength] );
+				filename = new char[xmpFilenameLen];
+				memcpy(filename,"META-INF/metadata.xml",xmpFilenameLen);
+			}
+
+			XMP_Uns32 sizeHeader()
+			{
+				return this->FIXED_SIZE + this->filenameLen + this->extraFieldLen;
+			}
+
+			XMP_Uns32 sizeTotalCF()
+			{
+				//*** not zip64 bit safe yet, use only for non-large xmp packet
+				return this->sizeHeader() + GetUns32LE( &fields[FileHeader::o_sizeCompressed] );
+			}
+
+			~FileHeader()
+			{
+				this->release();
+			};
+
+	}; //class FileHeader
+
+	////// yes, this needs an own class
+	////// offsets must be extracted, added, modified,
+	////// come&go depending on being >0xffffff
+	////class extraField {
+	////	private:
+
+
+	class CDFileHeader {
+		private:
+			void release()  //*** needed or can go?
+			{
+				if (filename)	delete [] filename;
+				if (extraField)	delete [] extraField;
+				if (comment)	delete [] comment;
+				filename=0; filenameLen=0;
+				extraField=0; extraFieldLen=0;
+				comment=0; commentLen=0;
+			}
+
+			const static XMP_Uns32 SIG = 0x02014b50;
+
+		public:
+			const static XMP_Uns16	o_sig	=   0;	//0x02014b50
+			const static XMP_Uns16	o_versionMadeBy		=   4;
+			const static XMP_Uns16	o_extractVersion	=	6;
+			const static XMP_Uns16	o_flags				=   8;
+			const static XMP_Uns16	o_compression		=   10;
+			const static XMP_Uns16	o_lastmodTime		=   12;
+			const static XMP_Uns16	o_lastmodDate		=   14;
+			const static XMP_Uns16	o_crc32				=   16;
+			const static XMP_Uns16	o_sizeCompressed	=   20; // 16bit stub
+			const static XMP_Uns16	o_sizeUncompressed	=   24; // 16bit stub
+			const static XMP_Uns16	o_fileNameLength	=   28;
+			const static XMP_Uns16	o_extraFieldLength	=   30;
+			const static XMP_Uns16	o_commentLength		=   32;
+			const static XMP_Uns16	o_diskNo			=   34;
+			const static XMP_Uns16	o_internalAttribs	=   36;
+			const static XMP_Uns16	o_externalAttribs	=   38;
+			const static XMP_Uns16	o_offsetLocalHeader	=   42;	// 16bit stub
+			//					total size is 4+12+12+10+8=46
+
+			const static int FIXED_SIZE = 46;
+			char fields[FIXED_SIZE];
+
+			// do not bet on any zero-freeness,
+			// certainly no zero termination (pascal strings),
+			// treat as data blocks
+			char* filename;
+			char* extraField;
+			char* comment;
+			XMP_Uns16 filenameLen;
+			XMP_Uns16 extraFieldLen;
+			XMP_Uns16 commentLen;
+
+			// full, real, parsed 64 bit values
+			XMP_Int64 sizeUncompressed;
+			XMP_Int64 sizeCompressed;
+			XMP_Int64 offsetLocalHeader;
+
+			CDFileHeader() : filename(0),extraField(0),comment(0),filenameLen(0),
+				extraFieldLen(0),commentLen(0),sizeUncompressed(0),sizeCompressed(0),offsetLocalHeader(0)
+			{
+				memset(fields,'\0',FIXED_SIZE);
+				//already arm with appropriate values where applicable:
+				PutUns32LE(0x02014b50,	&fields[CDFileHeader::o_sig] );
+				PutUns16LE(0x14,		&fields[CDFileHeader::o_extractVersion] );
+			};
+
+			// copy constructor
+			CDFileHeader(const CDFileHeader& orig) : filename(0),extraField(0),comment(0),filenameLen(0),
+				extraFieldLen(0),commentLen(0),sizeUncompressed(0),sizeCompressed(0),offsetLocalHeader(0)
+			{
+				memcpy(fields,orig.fields,FIXED_SIZE);
+				if (orig.extraField)
+				{
+					extraFieldLen=orig.extraFieldLen;
+					extraField = new char[extraFieldLen];
+					memcpy(extraField , orig.extraField , extraFieldLen);
+				}
+				if (orig.filename)
+				{
+					filenameLen=orig.filenameLen;
+					filename = new char[filenameLen];
+					memcpy(filename , orig.filename , filenameLen);
+				}
+				if (orig.comment)
+				{
+					commentLen=orig.commentLen;
+					comment = new char[commentLen];
+					memcpy(comment , orig.comment , commentLen);
+				}
+
+				filenameLen   = orig.filenameLen;
+				extraFieldLen = orig.extraFieldLen;
+				commentLen    = orig.commentLen;
+
+				sizeUncompressed = orig.sizeUncompressed;
+				sizeCompressed = orig.sizeCompressed;
+				offsetLocalHeader = orig.offsetLocalHeader;
+			}
+
+			// Assignment operator
+			CDFileHeader& operator=(const CDFileHeader& obj)
+			{
+				XMP_Throw("not supported",kXMPErr_Unimplemented);
+			}
+
+			// reads entire structure from file (starting at current position)
+			void read(XMP_IO* file)
+			{
+				this->release();
+
+				file->ReadAll ( fields, FIXED_SIZE );
+				XMP_Validate( SIG == GetUns32LE( &this->fields[CDFileHeader::o_sig] ), "invalid header", kXMPErr_BadFileFormat );
+
+				filenameLen   = GetUns16LE( &this->fields[CDFileHeader::o_fileNameLength] );
+				extraFieldLen = GetUns16LE( &this->fields[CDFileHeader::o_extraFieldLength] );
+				commentLen    = GetUns16LE( &this->fields[CDFileHeader::o_commentLength] );
+
+				if (filenameLen) {
+					filename = new char[filenameLen];
+					file->ReadAll ( filename, filenameLen );
+				}
+				if (extraFieldLen) {
+					extraField = new char[extraFieldLen];
+					file->ReadAll ( extraField, extraFieldLen );
+				}
+				if (commentLen) {
+					comment = new char[commentLen];
+					file->ReadAll ( comment, commentLen );
+				}
+
+				////// GET ACTUAL 64 BIT VALUES //////////////////////////////////////////////
+				// get 32bit goodies first, correct later
+				sizeUncompressed		= GetUns32LE( &fields[o_sizeUncompressed] );
+				sizeCompressed			= GetUns32LE( &fields[o_sizeCompressed] );
+				offsetLocalHeader		= GetUns32LE( &fields[o_offsetLocalHeader] );
+
+				XMP_Int32 offset = 0;
+				while ( offset < extraFieldLen )
+				{
+					XMP_Validate( (extraFieldLen - offset) >= 4, "need 4 bytes for next header ID+len", kXMPErr_BadFileFormat);
+					XMP_Uns16 headerID = GetUns16LE( &extraField[offset] );
+					XMP_Uns16 dataSize = GetUns16LE( &extraField[offset+2] );
+					offset += 4;
+
+					XMP_Validate( (extraFieldLen - offset) <= dataSize,
+									"actual field lenght not given", kXMPErr_BadFileFormat);
+					if ( headerID == 0x1 ) //we only care about "Zip64 extended information extra field"
+					{
+						XMP_Validate( offset < extraFieldLen, "extra field too short", kXMPErr_BadFileFormat);
+						if (sizeUncompressed == 0xffffffff)
+						{
+							sizeUncompressed = GetUns64LE( &extraField[offset] );
+							offset += 8;
+						}
+						if (sizeCompressed == 0xffffffff)
+						{
+							sizeCompressed = GetUns64LE( &extraField[offset] );
+							offset += 8;
+						}
+						if (offsetLocalHeader == 0xffffffff)
+						{
+							offsetLocalHeader = GetUns64LE( &extraField[offset] );
+							offset += 8;
+						}
+					}
+					else
+					{
+						offset += dataSize;
+					} // if
+				} // while
+			} // read()
+
+			// writes structure to file (starting at current position)
+			void write(XMP_IO* file)
+			{
+				//// WRITE BACK REAL 64 BIT VALUES, CREATE EXTRA FIELD ///////////////
+				//may only wipe extra field after obtaining all Info from it
+				if (extraField)	delete [] extraField;
+				extraFieldLen=0;
+
+				if ( ( sizeUncompressed  > 0xffffffff ) ||
+					 ( sizeCompressed    > 0xffffffff ) ||
+					 ( offsetLocalHeader > 0xffffffff )  )
+				{
+					extraField = new char[64]; // actual maxlen is 32
+					extraFieldLen = 4; //first fields are for ID, size
+					if ( sizeUncompressed > 0xffffffff )
+					{
+						PutUns64LE( sizeUncompressed, &extraField[extraFieldLen] );
+						extraFieldLen += 8;
+						sizeUncompressed = 0xffffffff;
+					}
+					if ( sizeCompressed > 0xffffffff )
+					{
+						PutUns64LE( sizeCompressed, &extraField[extraFieldLen] );
+						extraFieldLen += 8;
+						sizeCompressed = 0xffffffff;
+					}
+					if ( offsetLocalHeader > 0xffffffff )
+					{
+						PutUns64LE( offsetLocalHeader, &extraField[extraFieldLen] );
+						extraFieldLen += 8;
+						offsetLocalHeader = 0xffffffff;
+					}
+
+					//write ID, dataSize
+					PutUns16LE( 0x0001, &extraField[0] );
+					PutUns16LE( extraFieldLen-4, &extraField[2] );
+					//extraFieldSize
+					PutUns16LE( extraFieldLen, &this->fields[CDFileHeader::o_extraFieldLength] );
+				}
+
+				// write out 32-bit ('ff-stubs' or not)
+				PutUns32LE( (XMP_Uns32)sizeUncompressed, &fields[o_sizeUncompressed] );
+				PutUns32LE( (XMP_Uns32)sizeCompressed, &fields[o_sizeCompressed] );
+				PutUns32LE( (XMP_Uns32)offsetLocalHeader, &fields[o_offsetLocalHeader] );
+
+				/// WRITE /////////////////////////////////////////////////////////////////
+				XMP_Enforce( SIG == GetUns32LE( &this->fields[CDFileHeader::o_sig] ) );
+
+				file ->Write ( fields , FIXED_SIZE  );
+				if (filenameLen)	file->Write ( filename   , filenameLen    );
+				if (extraFieldLen)	file->Write ( extraField , extraFieldLen  );
+				if (commentLen)		file->Write ( comment , commentLen  );
+			}
+
+			void setXMPFilename()
+			{
+				if (filename) delete [] filename;
+				filenameLen = xmpFilenameLen;
+				filename = new char[xmpFilenameLen];
+				PutUns16LE(filenameLen,	&fields[CDFileHeader::o_fileNameLength] );
+				memcpy(filename,"META-INF/metadata.xml",xmpFilenameLen);
+			}
+
+			XMP_Int64 size()
+			{
+				XMP_Int64 r = this->FIXED_SIZE + this->filenameLen + this->commentLen;
+				// predict serialization size
+				if (  (sizeUncompressed > 0xffffffff)||(sizeCompressed > 0xffffffff)||(offsetLocalHeader>0xffffffff) )
+				{
+					r += 4;		//extra fields necessary
+					if (sizeUncompressed > 0xffffffff) r += 8;
+					if (sizeCompressed > 0xffffffff) r += 8;
+					if (offsetLocalHeader > 0xffffffff) r += 8;
+				}
+				return r;
+			}
+
+			~CDFileHeader()
+			{
+				this->release();
+			};
+	}; // class CDFileHeader
+
+	class EndOfCD {
+	private:
+		const static XMP_Uns32 SIG = 0x06054b50;
+		void UCFECD_Free()
+		{
+			if(commentLen) delete [] comment;
+			commentLen = 0;
+			comment = 0;
+		}
+	public:
+		const static XMP_Int32 o_Sig = 0;
+		const static XMP_Int32 o_CdNumEntriesDisk = 8;  // same-same for UCF, since single-volume
+		const static XMP_Int32 o_CdNumEntriesTotal = 10;// must update both
+		const static XMP_Int32 o_CdSize = 12;
+		const static XMP_Int32 o_CdOffset = 16;
+		const static XMP_Int32 o_CommentLen = 20;
+
+		const static int FIXED_SIZE = 22;
+		char fields[FIXED_SIZE];
+
+		char* comment;
+		XMP_Uns16 commentLen;
+
+		EndOfCD() : comment(0), commentLen(0)
+		{
+			//nothing
+		};
+
+		void read (XMP_IO* file)
+		{
+			UCFECD_Free();
+
+			file->ReadAll ( fields, FIXED_SIZE );
+			XMP_Validate( this->SIG == GetUns32LE( &this->fields[o_Sig] ), "invalid header", kXMPErr_BadFileFormat );
+
+			commentLen = GetUns16LE( &this->fields[o_CommentLen] );
+			if(commentLen)
+			{
+				comment = new char[commentLen];
+				file->ReadAll ( comment, commentLen );
+			}
+		};
+
+		void write(XMP_IO* file)
+		{
+			XMP_Enforce( this->SIG == GetUns32LE( &this->fields[o_Sig] ) );
+			commentLen   = GetUns16LE( &this->fields[o_CommentLen] );
+			file ->Write ( fields , FIXED_SIZE  );
+			if (commentLen)
+				file->Write ( comment, commentLen );
+		}
+
+		~EndOfCD()
+		{
+			if (comment)	delete [] comment;
+		};
+	}; //class EndOfCD
+
+	////////////////////////////////////////////////////////////////////////////////////
+	// EMBEDDING MATH
+	//
+	// a = content files before xmp (always 0 thus ommited)
+	// b/b2 = content files behind xmp (before/after injection)
+	// x/x2 = offset xmp content header + content file (before/after injection)
+	// cd/cd = central directory
+	// h/h2 = end of central directory record
+	XMP_Int64	b,b2,x,x2,cd,cd2,cdx,cdx2,z,z2,h,h2,
+	// length thereof ('2' only where possibly different)
+	// using XMP_Int64 here also for length (not XMP_Int32),
+	// to be prepared for zip64, our LFA functions might need things in multiple chunks...
+				al,bl,xl,x2l,cdl,cd2l,cdxl,cdx2l,z2l,hl,fl,f2l;
+	XMP_Uns16	numCF,numCF2;
+
+	bool wasCompressed;	// ..before, false if no prior xmp
+	bool compressXMP;   // compress this time?
+	bool inPlacePossible;
+	/* bool isZip64; <=> z2 != 0 */
+
+	FileHeader		xmpFileHeader;
+	CDFileHeader	xmpCDHeader;
+
+	XMP_StringPtr uncomprPacketStr;
+	XMP_StringLen uncomprPacketLen;
+	XMP_StringPtr finalPacketStr;
+	XMP_StringLen finalPacketLen;
+	std::vector<CDFileHeader> cdEntries;
+	EndOfCD endOfCD;
+	void writeOut( XMP_IO* sourceFile, XMP_IO* targetFile, bool isRewrite, bool isInPlace);
+
+};	// UCF_MetaHandler
+
+// =================================================================================================
+
+#endif /* __UCF_Handler_hpp__ */
+
+
diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp
new file mode 100644
index 0000000..6f7f287
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp
@@ -0,0 +1,516 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FileHandlers/WAVE_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h"
+#include "XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h"
+#include "XMPFiles/source/NativeMetadataSupport/MetadataSet.h"
+#include "source/XIO.hpp"
+
+using namespace IFF_RIFF;
+
+// =================================================================================================
+/// \file WAVE_Handler.cpp
+/// \brief File format handler for WAVE.
+// =================================================================================================
+
+
+// =================================================================================================
+// WAVE_MetaHandlerCTor
+// ====================
+
+XMPFileHandler * WAVE_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new WAVE_MetaHandler ( parent );
+}
+
+// =================================================================================================
+// WAVE_CheckFormat
+// ===============
+//
+// Checks if the given file is a valid WAVE file.
+// The first 12 bytes are checked. The first 4 must be "RIFF"
+// Bytes 8 to 12 must be "WAVE"
+
+bool WAVE_CheckFormat ( XMP_FileFormat  format,
+					   XMP_StringPtr    filePath,
+			           XMP_IO*			file,
+			           XMPFiles*        parent )
+{
+	// Reset file pointer position
+	file->Rewind();
+
+	XMP_Uns8 buffer[12];
+	XMP_Int32 got = file->Read ( buffer, 12 );
+	// Reset file pointer position
+	file->Rewind();
+
+	// Need to have at least ID, size and Type of first chunk
+	if ( got < 12 ) 
+	{
+		return false;
+	}
+
+	XMP_Uns32 type = WAVE_MetaHandler::whatRIFFFormat( buffer );
+	if ( type != kChunk_RIFF && type != kChunk_RF64 ) 
+	{
+		return false;
+	}
+
+	const BigEndian& endian = BigEndian::getInstance();
+	if ( endian.getUns32(&buffer[8]) == kType_WAVE ) 
+	{
+		return true;
+	}
+
+	return false;
+}	// WAVE_CheckFormat
+
+
+// =================================================================================================
+// WAVE_MetaHandler::whatRIFFFormat
+// ===============
+
+XMP_Uns32 WAVE_MetaHandler::whatRIFFFormat( XMP_Uns8* buffer )
+{
+	XMP_Uns32 type = 0;
+
+	const BigEndian& endian = BigEndian::getInstance();
+
+	if( buffer != 0 )
+	{
+		if( endian.getUns32( buffer ) == kChunk_RIFF )
+		{
+			type = kChunk_RIFF;
+		}
+		else if( endian.getUns32( buffer ) == kChunk_RF64 )
+		{
+			type = kChunk_RF64;
+		}
+	}
+
+	return type;
+}	// whatRIFFFormat
+
+
+// Static inits
+
+// ChunkIdentifier
+// RIFF:WAVE/PMX_
+const ChunkIdentifier WAVE_MetaHandler::kRIFFXMP[2] = { { kChunk_RIFF, kType_WAVE }, { kChunk_XMP, kType_NONE} };
+// RIFF:WAVE/LIST:INFO
+const ChunkIdentifier WAVE_MetaHandler::kRIFFInfo[2] = { { kChunk_RIFF, kType_WAVE }, { kChunk_LIST, kType_INFO } };
+// RIFF:WAVE/DISP
+const ChunkIdentifier WAVE_MetaHandler::kRIFFDisp[2] = { { kChunk_RIFF, kType_WAVE }, { kChunk_DISP, kType_NONE } };
+// RIFF:WAVE/BEXT
+const ChunkIdentifier WAVE_MetaHandler::kRIFFBext[2] = { { kChunk_RIFF, kType_WAVE }, { kChunk_bext, kType_NONE } };
+// RIFF:WAVE/cart
+const ChunkIdentifier WAVE_MetaHandler::kRIFFCart[2] = { { kChunk_RIFF, kType_WAVE }, { kChunk_cart, kType_NONE } };
+// cr8r is not yet required for WAVE
+// RIFF:WAVE/Cr8r
+// const ChunkIdentifier WAVE_MetaHandler::kWAVECr8r[2] = { { kChunk_RIFF, kType_WAVE }, { kChunk_Cr8r, kType_NONE } };
+// RIFF:WAVE/iXML
+const ChunkIdentifier WAVE_MetaHandler::kRIFFiXML[2] = { { kChunk_RIFF, kType_WAVE }, { kChunk_iXML, kType_NONE } };
+// RF64:WAVE/PMX_
+const ChunkIdentifier WAVE_MetaHandler::kRF64XMP[2] = { { kChunk_RF64, kType_WAVE }, { kChunk_XMP, kType_NONE} };
+// RF64:WAVE/LIST:INFO
+const ChunkIdentifier WAVE_MetaHandler::kRF64Info[2] = { { kChunk_RF64, kType_WAVE }, { kChunk_LIST, kType_INFO } };
+// RF64:WAVE/DISP
+const ChunkIdentifier WAVE_MetaHandler::kRF64Disp[2] = { { kChunk_RF64, kType_WAVE }, { kChunk_DISP, kType_NONE } };
+// RF64:WAVE/BEXT
+const ChunkIdentifier WAVE_MetaHandler::kRF64Bext[2] = { { kChunk_RF64, kType_WAVE }, { kChunk_bext, kType_NONE } };
+// RF64:WAVE/cart
+const ChunkIdentifier WAVE_MetaHandler::kRF64Cart[2] = { { kChunk_RF64, kType_WAVE }, { kChunk_cart, kType_NONE } };
+// cr8r is not yet required for WAVE
+// RF64:WAVE/Cr8r
+// const ChunkIdentifier WAVE_MetaHandler::kRF64Cr8r[2] = { { kChunk_RF64, kType_WAVE }, { kChunk_Cr8r, kType_NONE } };
+const ChunkIdentifier WAVE_MetaHandler::kRF64iXML[2] = { { kChunk_RF64, kType_WAVE }, { kChunk_iXML, kType_NONE } };
+
+// =================================================================================================
+// WAVE_MetaHandler::WAVE_MetaHandler
+// ================================
+
+WAVE_MetaHandler::WAVE_MetaHandler ( XMPFiles * _parent )
+	: mChunkController(NULL), mChunkBehavior(NULL),
+	mINFOMeta(), mBEXTMeta(), mCartMeta(), mDISPMeta(), miXMLMeta(),
+	mXMPChunk(NULL), mINFOChunk(NULL),
+	mBEXTChunk(NULL), mCartChunk(NULL), mDISPChunk(NULL), miXMLChunk(NULL)
+{
+	this->parent = _parent;
+	this->handlerFlags = kWAVE_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	this->mChunkBehavior = new WAVEBehavior();
+	this->mChunkController = new ChunkController( mChunkBehavior, false );
+	miXMLMeta.SetErrorCallback( &parent->errorCallback );
+
+}	// WAVE_MetaHandler::WAVE_MetaHandler
+
+
+// =================================================================================================
+// WAVE_MetaHandler::~WAVE_MetaHandler
+// =================================
+
+WAVE_MetaHandler::~WAVE_MetaHandler()
+{
+	if( mChunkController != NULL )
+	{
+		delete mChunkController;
+	}
+
+	if( mChunkBehavior != NULL )
+	{
+		delete mChunkBehavior;
+	}
+}	// WAVE_MetaHandler::~WAVE_MetaHandler
+
+
+// =================================================================================================
+// WAVE_MetaHandler::CacheFileData
+// ==============================
+
+void WAVE_MetaHandler::CacheFileData()
+{
+	// Need to determine the file type, need the first four bytes of the file
+
+	// Reset file pointer position
+	this->parent->ioRef->Rewind();
+
+	XMP_Uns8 buffer[4];
+	XMP_Int32 got = this->parent->ioRef->Read ( buffer, 4 );
+	XMP_Assert( got == 4 );
+	
+	XMP_Uns32 type = WAVE_MetaHandler::whatRIFFFormat( buffer );
+	XMP_Assert( type == kChunk_RIFF || type == kChunk_RF64 );
+
+	// Reset file pointer position
+	this->parent->ioRef->Rewind();
+
+	// Add the relevant chunk paths for the determined RIFF format
+	if( type == kChunk_RIFF )
+	{
+		mWAVEXMPChunkPath.append( kRIFFXMP, SizeOfCIArray(kRIFFXMP) );
+		mWAVEInfoChunkPath.append( kRIFFInfo, SizeOfCIArray(kRIFFInfo) );
+		mWAVEDispChunkPath.append( kRIFFDisp, SizeOfCIArray(kRIFFDisp) );
+		mWAVEiXMLChunkPath.append( kRIFFiXML, SizeOfCIArray(kRIFFiXML) );
+		mWAVEBextChunkPath.append( kRIFFBext, SizeOfCIArray(kRIFFBext) );
+		mWAVECartChunkPath.append( kRIFFCart, SizeOfCIArray(kRIFFCart) );
+		// cr8r is not yet required for WAVE
+		//mWAVECr8rChunkPath.append( kWAVECr8r, SizeOfCIArray(kWAVECr8r) );
+	}
+	else // RF64
+	{
+		mWAVEXMPChunkPath.append( kRF64XMP, SizeOfCIArray(kRF64XMP) );
+		mWAVEInfoChunkPath.append( kRF64Info, SizeOfCIArray(kRF64Info) );
+		mWAVEDispChunkPath.append( kRF64Disp, SizeOfCIArray(kRF64Disp) );
+		mWAVEiXMLChunkPath.append( kRF64iXML, SizeOfCIArray(kRF64iXML) );
+		mWAVEBextChunkPath.append( kRF64Bext, SizeOfCIArray(kRF64Bext) );
+		mWAVECartChunkPath.append( kRF64Cart, SizeOfCIArray(kRF64Cart) );
+		// cr8r is not yet required for WAVE
+		//mWAVECr8rChunkPath.append( kRF64Cr8r, SizeOfCIArray(kRF64Cr8r) );
+	}
+
+	mChunkController->addChunkPath( mWAVEXMPChunkPath );
+	mChunkController->addChunkPath( mWAVEInfoChunkPath );
+	mChunkController->addChunkPath( mWAVEDispChunkPath );
+	mChunkController->addChunkPath( mWAVEiXMLChunkPath );
+	mChunkController->addChunkPath( mWAVEBextChunkPath );
+	mChunkController->addChunkPath( mWAVECartChunkPath );
+	// cr8r is not yet required for WAVE
+	//mChunkController->addChunkPath( mWAVECr8rChunkPath );
+
+	// Parse the given file
+	// Throws exception if the file cannot be parsed
+	mChunkController->parseFile( this->parent->ioRef, &this->parent->openFlags );
+
+	// Retrieve the file type, it must have at least FORM:WAVE
+	std::vector<XMP_Uns32> typeList = mChunkController->getTopLevelTypes();
+
+	// If file is neither WAVE, throw exception
+	XMP_Validate( typeList.at(0)  == kType_WAVE , "File is not of type WAVE", kXMPErr_BadFileFormat );
+
+	// Check if the file contains XMP (last if there are duplicates)
+	mXMPChunk = mChunkController->getChunk( mWAVEXMPChunkPath, true );
+	
+
+	// Retrieve XMP packet info
+	if( mXMPChunk != NULL )
+	{
+		this->packetInfo.length = static_cast<XMP_Int32>(mXMPChunk->getSize());
+		this->packetInfo.charForm  = kXMP_Char8Bit;
+		this->packetInfo.writeable = true;
+
+		// Get actual the XMP packet
+		this->xmpPacket.assign ( mXMPChunk->getString( this->packetInfo.length) );
+
+		// set state
+		this->containsXMP = true;
+	}
+} // WAVE_MetaHandler::CacheFileData
+
+
+// =================================================================================================
+// WAVE_MetaHandler::ProcessXMP
+// ============================
+
+void WAVE_MetaHandler::ProcessXMP()
+{
+	// Must be done only once
+	if ( this->processedXMP ) 
+	{
+		return;
+	}
+	// Set the status at start, in case something goes wrong in this method
+	this->processedXMP = true;
+
+	// Parse the XMP
+	if ( ! this->xmpPacket.empty() ) {
+	
+		XMP_Assert ( this->containsXMP );
+		
+		FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+
+		this->containsXMP = true;
+	}
+
+	// Then import native properties
+	MetadataSet metaSet;
+	WAVEReconcile recon;
+
+	// Parse the WAVE metadata object with values
+
+	const XMP_Uns8* buffer = NULL; // temporary buffer
+	XMP_Uns64 size = 0;
+	// Get LIST:INFO legacy chunk
+	mINFOChunk = mChunkController->getChunk( mWAVEInfoChunkPath, true );
+	if( mINFOChunk != NULL )
+	{			
+		size = mINFOChunk->getData( &buffer );
+		mINFOMeta.parse( buffer, size );
+	}
+
+	// Parse Bext legacy chunk
+	mBEXTChunk = mChunkController->getChunk( mWAVEBextChunkPath, true );
+	if( mBEXTChunk != NULL )
+	{	
+		size = mBEXTChunk->getData( &buffer );
+		mBEXTMeta.parse( buffer, size );
+	 }
+
+	// Parse cart legacy chunk
+	mCartChunk = mChunkController->getChunk( mWAVECartChunkPath, true );
+	if( mCartChunk != NULL )
+	{	
+		size = mCartChunk->getData( &buffer );
+		mCartMeta.parse( buffer, size );
+	 }
+
+	// Parse DISP legacy chunk
+	const std::vector<IChunkData*>& disps = mChunkController->getChunks( mWAVEDispChunkPath );
+
+	if( ! disps.empty() )
+	{
+		for( std::vector<IChunkData*>::const_reverse_iterator iter=disps.rbegin(); iter!=disps.rend(); iter++ )
+		{
+			size = (*iter)->getData( &buffer );
+			
+			if( DISPMetadata::isValidDISP( buffer, size ) )
+			{
+				mDISPChunk = (*iter);
+				break;
+			}
+		}
+	}
+
+	if( mDISPChunk != NULL )
+	{	
+		size = mDISPChunk->getData( &buffer );
+		mDISPMeta.parse( buffer, size );
+	}
+	
+	//cr8r is not yet required for WAVE
+	//// Parse Cr8r legacy chunk
+	//mCr8rChunk = mChunkController->getChunk( mWAVECr8rChunkPath );
+	//if( mCr8rChunk != NULL )
+	//{	
+	//	size = mCr8rChunk->getData( &buffer );
+	//	mCr8rMeta.parse( buffer, size );
+	//}
+	
+	// Parse iXML legacy chunk
+	miXMLChunk = mChunkController->getChunk( mWAVEiXMLChunkPath, true );
+	if( miXMLChunk != NULL )
+	{	
+		size = miXMLChunk->getData( &buffer );
+		miXMLMeta.parse( buffer, size );
+	}
+
+	// app legacy to the metadata list
+	metaSet.append( &mINFOMeta );
+	metaSet.append( &miXMLMeta );
+	metaSet.append( &mBEXTMeta );
+	metaSet.append( &mCartMeta );
+	metaSet.append( &mDISPMeta );
+
+	// cr8r is not yet required for WAVE
+	// metaSet.append( &mCr8rMeta );
+	
+	// Do the import
+	if( recon.importToXMP( this->xmpObj, metaSet ) )
+	{
+		// Remember if anything has changed
+		this->containsXMP = true;
+	}
+	
+} // WAVE_MetaHandler::ProcessXMP
+
+
+// =================================================================================================
+// RIFF_MetaHandler::UpdateFile
+// ===========================
+
+void WAVE_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) {	// If needsUpdate is set then at least the XMP changed.
+		return;
+	}
+
+	if ( doSafeUpdate )
+	{
+		XMP_Throw ( "WAVE_MetaHandler::UpdateFile: Safe update not supported", kXMPErr_Unavailable );
+	}
+
+	// Export XMP to legacy chunks. Create/delete them if necessary
+	MetadataSet metaSet;
+	WAVEReconcile recon;
+	
+	metaSet.append( &mINFOMeta );
+	metaSet.append( &miXMLMeta );
+	metaSet.append( &mBEXTMeta );
+	metaSet.append( &mCartMeta );
+	metaSet.append( &mDISPMeta );
+
+	// cr8r is not yet required for WAVE
+	// metaSet.append( &mCr8rMeta );
+
+	// If anything changes, update/create/delete the legacy chunks
+	if( recon.exportFromXMP( metaSet, this->xmpObj ) )
+	{		
+		if ( mINFOMeta.hasChanged( ))
+		{
+			updateLegacyChunk( &mINFOChunk, kChunk_LIST, kType_INFO, mINFOMeta );
+		}
+
+		if ( mBEXTMeta.hasChanged( ))
+		{
+			updateLegacyChunk( &mBEXTChunk, kChunk_bext, kType_NONE, mBEXTMeta );
+		}
+
+		if ( mCartMeta.hasChanged( ))
+		{
+			updateLegacyChunk( &mCartChunk, kChunk_cart, kType_NONE, mCartMeta );
+		}
+
+		if ( mDISPMeta.hasChanged( ))
+		{
+			updateLegacyChunk( &mDISPChunk, kChunk_DISP, kType_NONE, mDISPMeta );
+		}
+
+		//cr8r is not yet required for WAVE
+		//if ( mCr8rMeta.hasChanged( ))
+		//{
+		//	updateLegacyChunk( &mCr8rChunk, kChunk_Cr8r, kType_NONE, mCr8rMeta );
+		//}
+
+		if ( miXMLMeta.hasChanged( ))
+		{
+			updateLegacyChunk( &miXMLChunk, kChunk_iXML, kType_NONE, miXMLMeta );
+		}
+	}
+
+	//update/create XMP chunk
+	if( this->containsXMP )
+	{
+		this->xmpObj.SerializeToBuffer ( &(this->xmpPacket) );
+
+		if( mXMPChunk != NULL )
+		{
+			mXMPChunk->setData( reinterpret_cast<const XMP_Uns8 *>(this->xmpPacket.c_str()), this->xmpPacket.length() );
+		}
+		else // create XMP chunk
+		{
+			mXMPChunk = mChunkController->createChunk( kChunk_XMP, kType_NONE );
+			mXMPChunk->setData( reinterpret_cast<const XMP_Uns8 *>(this->xmpPacket.c_str()), this->xmpPacket.length() );
+			mChunkController->insertChunk( mXMPChunk );
+		}
+	}
+	// XMP Packet is never completely removed from the file.
+	
+	XMP_ProgressTracker* progressTracker=this->parent->progressTracker;
+	// local progess tracking required because  for Handlers incapable of 
+	// kXMPFiles_CanRewrite XMPFiles call this Update method after making
+	// a copy of the orignal file
+	bool localProgressTracking=false;
+	if ( progressTracker != 0 )
+	{
+		if ( ! progressTracker->WorkInProgress() ) 
+		{
+			localProgressTracking = true;
+			progressTracker->BeginWork ();
+		}
+	}
+	//write tree back to file
+	mChunkController->writeFile( this->parent->ioRef ,progressTracker);
+	if ( localProgressTracking && progressTracker != 0 ) progressTracker->WorkComplete();
+
+	this->needsUpdate = false;	// Make sure this is only called once.
+}	// WAVE_MetaHandler::UpdateFile
+
+
+void WAVE_MetaHandler::updateLegacyChunk( IChunkData **chunk, XMP_Uns32 chunkID, XMP_Uns32 chunkType, IMetadata &legacyData )
+{
+	// If there is a legacy value, update/create the appropriate chunk
+	if( ! legacyData.isEmpty() )
+	{
+		XMP_Uns8* buffer = NULL;
+		XMP_Uns64 size = legacyData.serialize( &buffer );
+
+		if( *chunk != NULL )
+		{			
+			(*chunk)->setData( buffer, size, false );
+		}
+		else
+		{
+			*chunk = mChunkController->createChunk( chunkID, chunkType );
+			(*chunk)->setData( buffer, size, false );
+			mChunkController->insertChunk( *chunk );
+		}
+
+		delete[] buffer;
+	}
+	else //delete chunk if existing
+	{
+		mChunkController->removeChunk ( *chunk );
+	}
+}//updateLegacyChunk
+
+
+// =================================================================================================
+// RIFF_MetaHandler::WriteFile
+// ==========================
+
+void WAVE_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+	XMP_Throw( "WAVE_MetaHandler::WriteTempFile is not Implemented!", kXMPErr_Unimplemented );
+}//WAVE_MetaHandler::WriteFile
diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.hpp b/XMPFiles/source/FileHandlers/WAVE_Handler.hpp
new file mode 100644
index 0000000..29c1c86
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/WAVE_Handler.hpp
@@ -0,0 +1,179 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 __WAVE_Handler_hpp__
+#define __WAVE_Handler_hpp__	1
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/IFF/ChunkController.h"
+#include "XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/IChunkData.h"
+#include "source/Endian.h"
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/CartMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h"
+#include "source/XIO.hpp"
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+using namespace IFF_RIFF;
+
+// =================================================================================================
+/// \file WAV_Handler.hpp
+/// \brief File format handler for AIFF.
+// =================================================================================================
+
+/**
+ * Contructor for the handler.
+ */
+extern XMPFileHandler * WAVE_MetaHandlerCTor ( XMPFiles * parent );
+
+/**
+ * Checks the format of the file, see common code.
+ */
+extern bool WAVE_CheckFormat ( XMP_FileFormat format,
+							  XMP_StringPtr  filePath,
+			                  XMP_IO*    fileRef,
+			                  XMPFiles *     parent );
+
+/** WAVE does not need kXMPFiles_CanRewrite as we can always use UpdateFile to either do
+ *  in-place update or append to the file. */
+static const XMP_OptionBits kWAVE_HandlerFlags = (kXMPFiles_CanInjectXMP | 
+												  kXMPFiles_CanExpand | 
+												  kXMPFiles_PrefersInPlace |
+												  kXMPFiles_CanReconcile |
+												  kXMPFiles_ReturnsRawPacket |
+												  kXMPFiles_AllowsSafeUpdate |
+												  kXMPFiles_CanNotifyProgress
+												 );
+
+/**
+ * Main class for the the WAVE file handler.
+ */
+class WAVE_MetaHandler : public XMPFileHandler
+{
+public:
+	WAVE_MetaHandler ( XMPFiles* parent );
+	~WAVE_MetaHandler();
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	/**
+	* Checks if the first 4 bytes of the given buffer are either type RIFF or RF64
+	* @param buffer a byte buffer that must contain at least 4 bytes and point to the correct byte
+	* @return Either kChunk_RIFF, kChunk_RF64 0 if no type could be determined
+	*/
+	static XMP_Uns32 whatRIFFFormat( XMP_Uns8* buffer );
+
+private:
+	/**
+	 * Updates/creates/deletes a given legacy chunk depending on the given new legacy value
+	 * If the Chunk exists and is not empty, it is updated. If it is empty the 
+	 * Chunk is removed from the tree. If the Chunk does not exist but a value is given, it is created
+	 * and initialized with that value
+	 *
+	 * @param chunk OUT pointer to the legacy chunk
+	 * @param chunkID Id of the Chunk if it needs to be created
+	 * @param chunkType Type of the Chunk if it needs to be created
+	 * @param legacyData the new legacy metadata object (can be empty)
+	 */
+	void updateLegacyChunk( IChunkData **chunk, XMP_Uns32 chunkID, XMP_Uns32 chunkType, IMetadata &legacyData  );
+
+	
+	/** private standard Ctor, not to be used */
+	WAVE_MetaHandler (): mChunkController(NULL), mChunkBehavior(NULL), 
+						mINFOMeta(), mBEXTMeta(), mCartMeta(), mDISPMeta(),
+						mXMPChunk(NULL), mINFOChunk(NULL),
+						mBEXTChunk(NULL), mCartChunk(NULL), mDISPChunk(NULL) {};
+
+	// ----- MEMBERS ----- //
+	
+	/** Controls the parsing and writing of the passed stream. */
+	ChunkController *mChunkController;
+	/** Represents the rules how chunks are added, removed or rearranged */
+	IChunkBehavior *mChunkBehavior;
+	/** container for Legacy metadata */
+	INFOMetadata mINFOMeta;
+	BEXTMetadata mBEXTMeta;
+	CartMetadata mCartMeta;
+	DISPMetadata mDISPMeta;
+	iXMLMetadata miXMLMeta;
+
+	// cr8r is not yet required for WAVE
+	// Cr8rMetadata mCr8rMeta;
+
+	/** pointer to the XMP chunk */
+	IChunkData *mXMPChunk;
+	/** pointer to legacy chunks */
+	IChunkData *mINFOChunk;
+	IChunkData *mBEXTChunk;
+	IChunkData *mCartChunk;
+	IChunkData *mDISPChunk;
+	IChunkData *miXMLChunk;
+
+	// cr8r is not yet required for WAVE
+	// IChunkData *mCr8rChunk;
+
+	// ----- CONSTANTS ----- //
+	
+	/** Chunk path identifier of interest in WAVE */
+	static const ChunkIdentifier kRIFFXMP[2];
+	static const ChunkIdentifier kRIFFInfo[2];
+	static const ChunkIdentifier kRIFFDisp[2];
+	static const ChunkIdentifier kRIFFBext[2];
+	static const ChunkIdentifier kRIFFCart[2];
+	static const ChunkIdentifier kRIFFiXML[2];
+	// cr8r is not yet required for WAVE
+	// static const ChunkIdentifier kWAVECr8r[2];
+
+	/** Chunk path identifier of interest in RF64 */
+	static const ChunkIdentifier kRF64XMP[2];
+	static const ChunkIdentifier kRF64Info[2];
+	static const ChunkIdentifier kRF64Disp[2];
+	static const ChunkIdentifier kRF64Bext[2];
+	static const ChunkIdentifier kRF64Cart[2];
+	static const ChunkIdentifier kRF64iXML[2];
+	// cr8r is not yet required for WAVE
+	// static const ChunkIdentifier kRF64Cr8r[2];
+	
+	/** Path to XMP chunk */
+	ChunkPath mWAVEXMPChunkPath;
+
+	/** Path to INFO chunk */
+	ChunkPath mWAVEInfoChunkPath;
+
+	/** Path to DISP chunk */
+	ChunkPath mWAVEDispChunkPath;
+
+	/** Path to BEXT chunk */
+	ChunkPath mWAVEBextChunkPath;
+
+	/** Path to cart chunk */
+	ChunkPath mWAVECartChunkPath;
+
+	/** Path to IXML chunk */
+	ChunkPath mWAVEiXMLChunkPath;
+
+	//cr8r is not yet required for WAVE
+	///** Path to Cr8r chunk */
+	//const ChunkPath mWAVECr8rChunkPath;
+
+};	// WAVE_MetaHandler
+
+// =================================================================================================
+
+#endif /* __WAVE_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/WEBP_Handler.cpp b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
new file mode 100644
index 0000000..921f5c2
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
@@ -0,0 +1,201 @@
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header.
+
+#include "XMPFiles/source/FileHandlers/WEBP_Handler.hpp"
+
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/ReconcileLegacy.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/WEBP_Support.hpp"
+#include "source/XIO.hpp"
+
+using namespace std;
+
+/// File format handler for WEBP.
+
+XMPFileHandler* WEBP_MetaHandlerCTor(XMPFiles* parent)
+{
+    return new WEBP_MetaHandler(parent);
+}
+
+// Check that the file begins with "RIFF", a 4 byte length, then the chunkType
+// (WEBP).
+bool WEBP_CheckFormat(XMP_FileFormat format, XMP_StringPtr filePath,
+                      XMP_IO* file, XMPFiles* parent)
+{
+    IgnoreParam(format);
+    IgnoreParam(parent);
+    XMP_Assert(format == kXMP_WEBPFile);
+
+    if (file->Length() < 12)
+        return false;
+    file->Rewind();
+
+    XMP_Uns8 chunkID[12];
+    file->ReadAll(chunkID, 12);
+    if (!CheckBytes(&chunkID[0], "RIFF", 4)) {
+        return false;
+    }
+    if (CheckBytes(&chunkID[8], "WEBP", 4) && format == kXMP_WEBPFile) {
+        return true;
+    }
+    return false;
+}
+
+WEBP_MetaHandler::WEBP_MetaHandler(XMPFiles* parent)
+  : mainChunk(NULL)
+  , xmpChunk(NULL)
+  , exifMgr(NULL)
+  , psirMgr(NULL)
+  , iptcMgr(NULL)
+{
+    this->parent = parent;
+    this->handlerFlags = kWEBP_HandlerFlags;
+    this->stdCharForm = kXMP_Char8Bit;
+
+    this->initialFileSize = 0;
+    this->mainChunk = 0;
+}
+
+WEBP_MetaHandler::~WEBP_MetaHandler()
+{
+    if (this->mainChunk) {
+        delete this->mainChunk;
+    }
+    if (this->exifMgr) {
+        delete this->exifMgr;
+    }
+    if (this->iptcMgr) {
+        delete this->iptcMgr;
+    }
+    if (this->psirMgr) {
+        delete this->psirMgr;
+    }
+}
+
+void WEBP_MetaHandler::CacheFileData()
+{
+    this->containsXMP = false; // assume for now
+
+    XMP_IO* file = this->parent->ioRef;
+    this->initialFileSize = file->Length();
+
+    file->Rewind();
+
+    XMP_Int64 filePos = 0;
+    while (filePos < this->initialFileSize) {
+        this->mainChunk = new WEBP::Container(this);
+        filePos = file->Offset();
+    }
+
+    // covered before => internal error if it occurs
+    XMP_Validate(file->Offset() == this->initialFileSize,
+                 "WEBP_MetaHandler::CacheFileData: unknown data at end of file",
+                 kXMPErr_InternalFailure);
+}
+
+void WEBP_MetaHandler::ProcessXMP()
+{
+    SXMPUtils::RemoveProperties(&this->xmpObj, 0, 0, kXMPUtil_DoAllProperties);
+
+    bool readOnly = false;
+    bool xmpOnly = false;
+    bool haveExif = false;
+    if (this->parent) {
+        readOnly =
+            !XMP_OptionIsSet(this->parent->openFlags, kXMPFiles_OpenForUpdate);
+        xmpOnly =
+            XMP_OptionIsSet(this->parent->openFlags, kXMPFiles_OpenOnlyXMP);
+    }
+    if (!xmpOnly) {
+        if (readOnly) {
+            this->exifMgr = new TIFF_MemoryReader();
+        }
+        else {
+            this->exifMgr = new TIFF_FileWriter();
+        }
+        this->psirMgr = new PSIR_MemoryReader();
+        this->iptcMgr = new IPTC_Reader();
+        if (this->parent) {
+            exifMgr->SetErrorCallback(&this->parent->errorCallback);
+        }
+        if (this->mainChunk) {
+            WEBP::Chunk* exifChunk = this->mainChunk->getExifChunk();
+            if (exifChunk != NULL) {
+                haveExif = true;
+                this->exifMgr->ParseMemoryStream(exifChunk->data.data() + 6,
+                                                 exifChunk->data.size() - 6);
+            }
+        }
+    }
+
+    if (this->containsXMP) {
+        this->xmpObj.ParseFromBuffer(this->xmpPacket.c_str(),
+                                     (XMP_StringLen) this->xmpPacket.size());
+    }
+    if (haveExif) {
+        XMP_OptionBits options = k2XMP_FileHadExif;
+        if (this->containsXMP) {
+            options |= k2XMP_FileHadXMP;
+        }
+        TIFF_Manager& exif = *this->exifMgr;
+        PSIR_Manager& psir = *this->psirMgr;
+        IPTC_Manager& iptc = *this->iptcMgr;
+        ImportPhotoData(exif, iptc, psir, kDigestMatches, &this->xmpObj,
+                        options);
+        // Assume that, since the file had EXIF data, some of it was mapped to
+        // XMP
+        this->containsXMP = true;
+    }
+    this->processedXMP = true;
+}
+
+void WEBP_MetaHandler::UpdateFile(bool doSafeUpdate)
+{
+    XMP_Validate(this->needsUpdate, "nothing to update",
+                 kXMPErr_InternalFailure);
+
+    bool xmpOnly = false;
+    if (this->parent) {
+        xmpOnly =
+            XMP_OptionIsSet(this->parent->openFlags, kXMPFiles_OpenOnlyXMP);
+    }
+
+    if (!xmpOnly && this->exifMgr) {
+        WEBP::Chunk* exifChunk = this->mainChunk->getExifChunk();
+        if (exifChunk != NULL) {
+            ExportPhotoData(kXMP_TIFFFile, &this->xmpObj, this->exifMgr, 0, 0);
+            if (this->exifMgr->IsLegacyChanged()) {
+                XMP_Uns8* exifPtr;
+                XMP_Uns32 exifLen =
+                    this->exifMgr->UpdateMemoryStream((void**)&exifPtr);
+                RawDataBlock exifData(&exifChunk->data[0], &exifChunk->data[6]);
+                exifData.insert(exifData.begin() + 6, &exifPtr[0],
+                                &exifPtr[exifLen]);
+                exifChunk->data = exifData;
+                exifChunk->size = exifLen + 6;
+                exifChunk->needsRewrite = true;
+            }
+        }
+    }
+
+    this->packetInfo.charForm = stdCharForm;
+    this->packetInfo.writeable = true;
+    this->packetInfo.offset = kXMPFiles_UnknownOffset;
+    this->packetInfo.length = kXMPFiles_UnknownLength;
+
+    this->xmpObj.SerializeToBuffer(&this->xmpPacket, kXMP_OmitPacketWrapper);
+
+    this->mainChunk->write(this);
+    this->needsUpdate = false; // do last for safety
+}
+
+void WEBP_MetaHandler::WriteTempFile(XMP_IO* tempRef)
+{
+    IgnoreParam(tempRef);
+    XMP_Throw("WEBP_MetaHandler::WriteTempFile: Not supported (must go through "
+              "UpdateFile)",
+              kXMPErr_Unavailable);
+}
diff --git a/XMPFiles/source/FileHandlers/WEBP_Handler.hpp b/XMPFiles/source/FileHandlers/WEBP_Handler.hpp
new file mode 100644
index 0000000..c5041ea
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/WEBP_Handler.hpp
@@ -0,0 +1,48 @@
+#ifndef __WEBP_Handler_hpp__
+#define __WEBP_Handler_hpp__ 1
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_Environment.h"
+
+#include "XMPFiles/source/FormatSupport/WEBP_Support.hpp"
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+
+#include "source/XIO.hpp"
+
+// File format handler for WEBP
+
+extern XMPFileHandler* WEBP_MetaHandlerCTor(XMPFiles* parent);
+
+extern bool WEBP_CheckFormat(XMP_FileFormat format, XMP_StringPtr filePath,
+                             XMP_IO* fileRef, XMPFiles* parent);
+
+static const XMP_OptionBits kWEBP_HandlerFlags =
+    (kXMPFiles_CanInjectXMP | kXMPFiles_CanExpand | kXMPFiles_PrefersInPlace |
+     kXMPFiles_AllowsOnlyXMP | kXMPFiles_ReturnsRawPacket |
+     kXMPFiles_CanReconcile);
+
+class WEBP_MetaHandler
+  : public XMPFileHandler {
+public:
+    WEBP_MetaHandler(XMPFiles* parent);
+    ~WEBP_MetaHandler();
+
+    void CacheFileData();
+    void ProcessXMP();
+    void UpdateFile(bool doSafeUpdate);
+    void WriteTempFile(XMP_IO* tempRef);
+
+    WEBP::Container* mainChunk;
+    WEBP::XMPChunk* xmpChunk;
+    XMP_Int64 initialFileSize;
+    TIFF_Manager* exifMgr;
+    // The PSIR_Manager and IPTC_Manager aren't actually used, but they need
+    // to be instantiated and passed to the function that reconciles EXIF and
+    // XMP data.
+    PSIR_Manager* psirMgr;
+    IPTC_Manager* iptcMgr;
+};
+
+#endif /* __WEBP_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp
new file mode 100644
index 0000000..826cc0b
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp
@@ -0,0 +1,1040 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+#include "source/IOUtils.hpp"
+
+#include "XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/XDCAM_Support.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+#include "XMPFiles/source/FormatSupport/PackageFormat_Support.hpp"
+
+using namespace std;
+
+// =================================================================================================
+/// \file XDCAMEX_Handler.cpp
+/// \brief Folder format handler for XDCAMEX.
+///
+/// This handler is for the XDCAMEX video format.
+///
+/// .../MyMovie/
+///		BPAV/
+///			MEDIAPRO.XML
+///			MEDIAPRO.BUP
+///			CLPR/
+///				709_001_01/
+///					709_001_01.SMI
+///					709_001_01.MP4
+///					709_001_01M01.XML
+///					709_001_01R01.BIM
+///					709_001_01I01.PPN
+///				709_001_02/
+///				709_002_01/
+///				709_003_01/
+///			TAKR/
+///				709_001/
+///					709_001.SMI
+///					709_001M01.XML
+///
+/// The Backup files (.BUP) are optional. No files or directories other than those listed are
+/// allowed in the BPAV directory. The CLPR (clip root) directory may contain only clip directories,
+/// which may only contain the clip files listed. The TAKR (take root) direcory may contail only
+/// take directories, which may only contain take files. The take root directory can be empty.
+/// MEDIPRO.XML contains information on clip and take management.
+///
+/// Each clip directory contains a media file (.MP4), a clip info file (.SMI), a real time metadata
+/// file (.BIM), a non real time metadata file (.XML), and a picture pointer file (.PPN). A take
+/// directory conatins a take info and non real time take metadata files.
+// =================================================================================================
+
+// =================================================================================================
+// XDCAMEX_CheckFormat
+// ===================
+//
+// This version checks for the presence of a top level BPAV directory, and the required files and
+// directories immediately within it. The CLPR and TAKR subfolders are required, as is MEDIAPRO.XML.
+//
+// The state of the string parameters depends on the form of the path passed by the client. If the
+// client passed a logical clip path, like ".../MyMovie/012_3456_01", the parameters are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - empty
+//   parentName - empty
+//   leafName   - "012_3456_01"
+// If the client passed a full file path, like ".../MyMovie/BPAV/CLPR/012_3456_01/012_3456_01M01.XML", they are:
+//   rootPath   - ".../MyMovie/BPAV"
+//   gpName     - "CLPR"
+//   parentName - "012_3456_01"
+//   leafName   - "012_3456_01M01"
+
+// ! The common code has shifted the gpName, parentName, and leafName strings to upper case. It has
+// ! also made sure that for a logical clip path the rootPath is an existing folder, and that the
+// ! file exists for a full file path.
+
+// ! Using explicit '/' as a separator when creating paths, it works on Windows.
+
+bool XDCAMEX_CheckFormat ( XMP_FileFormat format,
+						   const std::string & _rootPath,
+						   const std::string & gpName,
+						   const std::string & parentName,
+						   const std::string & _leafName,
+						   XMPFiles * parent )
+{
+	std::string rootPath = _rootPath;
+	std::string clipName = _leafName;
+	std::string grandGPName;
+
+	std::string bpavPath ( rootPath );
+
+	// Do some initial checks on the gpName and parentName.
+
+	if ( gpName.empty() != parentName.empty() ) return false;	// Must be both empty or both non-empty.
+
+	if ( gpName.empty() ) {
+
+		// This is the logical clip path case. Make sure .../MyMovie/BPAV/CLPR is a folder.
+		bpavPath += kDirChar;	// The rootPath was just ".../MyMovie".
+		bpavPath += "BPAV";
+		if ( Host_IO::GetChildMode ( bpavPath.c_str(), "CLPR" ) != Host_IO::kFMode_IsFolder ) return false;
+
+	} else {
+
+		// This is the explicit file case. Make sure the ancestry is OK, compare using the parent's
+		// length since the file can have a suffix like "M01". Use the leafName as the clipName to
+		// preserve lower case, but truncate to the parent's length to remove any suffix.
+
+		if ( gpName != "CLPR" ) return false;
+		XIO::SplitLeafName ( &rootPath, &grandGPName );
+		MakeUpperCase ( &grandGPName );
+		if ( grandGPName != "BPAV" ) return false;
+
+		if ( ! XMP_LitNMatch ( parentName.c_str(), clipName.c_str(), parentName.size() ) ) {
+			std::string tempName = clipName;
+			MakeUpperCase ( &tempName );
+			if ( ! XMP_LitNMatch ( parentName.c_str(), tempName.c_str(), parentName.size() ) ) return false;
+		}
+		
+		clipName.erase ( parentName.size() );
+
+	}
+
+	// Check the rest of the required general structure.
+	if ( Host_IO::GetChildMode ( bpavPath.c_str(), "TAKR" ) != Host_IO::kFMode_IsFolder ) return false;
+	if ( Host_IO::GetChildMode ( bpavPath.c_str(), "MEDIAPRO.XML" ) != Host_IO::kFMode_IsFile ) return false;
+
+	// Make sure the clip's .MP4 and .SMI files exist.
+	std::string tempPath ( bpavPath );
+	tempPath += kDirChar;
+	tempPath += "CLPR";
+	tempPath += kDirChar;
+	tempPath += clipName;
+	tempPath += kDirChar;
+	tempPath += clipName;
+	tempPath += ".MP4";
+	if ( Host_IO::GetFileMode ( tempPath.c_str() ) != Host_IO::kFMode_IsFile ) return false;
+	tempPath.erase ( tempPath.size()-3 );
+	tempPath += "SMI";
+	if ( Host_IO::GetFileMode ( tempPath.c_str() ) != Host_IO::kFMode_IsFile ) return false;
+
+	// And now save the psuedo path for the handler object.
+	tempPath = rootPath;
+	tempPath += kDirChar;
+	tempPath += clipName;
+	size_t pathLen = tempPath.size() + 1;	// Include a terminating nul.
+	parent->tempPtr = malloc ( pathLen );
+	if ( parent->tempPtr == 0 ) XMP_Throw ( "No memory for XDCAMEX clip info", kXMPErr_NoMemory );
+	memcpy ( parent->tempPtr, tempPath.c_str(), pathLen );
+
+	return true;
+
+}	// XDCAMEX_CheckFormat
+
+// =================================================================================================
+
+static void* CreatePseudoClipPath ( const std::string & clientPath ) 
+{
+
+	// Used to create the clip pseudo path when the CheckFormat function is skipped.
+	
+	std::string pseudoPath = clientPath;
+
+	size_t pathLen;
+	void* tempPtr = 0;
+	
+	if ( Host_IO::Exists ( pseudoPath.c_str() ) ) {
+	
+		// The client passed a physical path. The logical clip name is the last folder name, the
+		// parent of the file. This is best since some files have suffixes.
+		
+		std::string clipName, ignored;
+		
+		XIO::SplitLeafName ( &pseudoPath, &ignored );	// Split the file name.
+		XIO::SplitLeafName ( &pseudoPath, &clipName );	// Use the parent folder name.
+
+		XIO::SplitLeafName ( &pseudoPath, &ignored );	// Remove the 2 intermediate folder levels.
+		XIO::SplitLeafName ( &pseudoPath, &ignored );
+		
+		pseudoPath += kDirChar;
+		pseudoPath += clipName;
+	
+	}
+
+	pathLen = pseudoPath.size() + 1;	// Include a terminating nul.
+	tempPtr = malloc ( pathLen );
+	if ( tempPtr == 0 ) XMP_Throw ( "No memory for XDCAMEX clip info", kXMPErr_NoMemory );
+	memcpy ( tempPtr, pseudoPath.c_str(), pathLen );
+	
+	return tempPtr;
+
+}	// CreatePseudoClipPath
+
+// =================================================================================================
+// XDCAMEX_MetaHandlerCTor
+// =======================
+
+XMPFileHandler * XDCAMEX_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new XDCAMEX_MetaHandler ( parent );
+
+}	// XDCAMEX_MetaHandlerCTor
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::XDCAMEX_MetaHandler
+// ========================================
+
+XDCAMEX_MetaHandler::XDCAMEX_MetaHandler ( XMPFiles * _parent ) : expat(0),clipMetadata(0)
+{
+	this->parent = _parent;	// Inherited, can't set in the prefix.
+	this->handlerFlags = kXDCAMEX_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	// Extract the root path and clip name from tempPtr.
+
+	if ( this->parent->tempPtr == 0 ) {
+		// The CheckFormat call might have been skipped.
+		this->parent->tempPtr = CreatePseudoClipPath ( this->parent->GetFilePath() );
+	}
+
+	this->rootPath.assign ( (char*) this->parent->tempPtr );
+	free ( this->parent->tempPtr );
+	this->parent->tempPtr = 0;
+
+	XIO::SplitLeafName ( &this->rootPath, &this->clipName );
+
+}	// XDCAMEX_MetaHandler::XDCAMEX_MetaHandler
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::~XDCAMEX_MetaHandler
+// =========================================
+
+XDCAMEX_MetaHandler::~XDCAMEX_MetaHandler()
+{
+
+	this->CleanupLegacyXML();
+	if ( this->parent->tempPtr != 0 ) {
+		free ( this->parent->tempPtr );
+		this->parent->tempPtr = 0;
+	}
+
+}	// XDCAMEX_MetaHandler::~XDCAMEX_MetaHandler
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::MakeClipFilePath
+// =====================================
+
+bool XDCAMEX_MetaHandler::MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile /* = false */ )
+{
+
+	*path = this->rootPath;
+	*path += kDirChar;
+	*path += "BPAV";
+	*path += kDirChar;
+	*path += "CLPR";
+	*path += kDirChar;
+	*path += this->clipName;
+	*path += kDirChar;
+	*path += this->clipName;
+	*path += suffix;
+	
+	if ( ! checkFile ) return true;
+	return Host_IO::Exists ( path->c_str() );
+
+}	// XDCAMEX_MetaHandler::MakeClipFilePath
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::MakeMediaproPath
+// =====================================
+
+bool XDCAMEX_MetaHandler::MakeMediaproPath ( std::string * path, bool checkFile /* = false */ )
+{
+
+	*path = this->rootPath;
+	*path += kDirChar;
+	*path += "BPAV";
+	*path += kDirChar;
+	*path += "MEDIAPRO.XML";
+	
+	if ( ! checkFile ) return true;
+	return Host_IO::Exists ( path->c_str() );
+
+}	// XDCAMEX_MetaHandler::MakeMediaproPath
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::MakeLegacyDigest
+// =====================================
+
+// *** Early hack version.
+
+#define kHexDigits "0123456789ABCDEF"
+
+void XDCAMEX_MetaHandler::MakeLegacyDigest ( std::string * digestStr )
+{
+	digestStr->erase();
+	if ( this->clipMetadata == 0 ) return;	// Bail if we don't have any legacy XML.
+	XMP_Assert ( this->expat != 0 );
+
+	XMP_StringPtr xdcNS = this->xdcNS.c_str();
+	XML_NodePtr legacyContext, legacyProp;
+
+	legacyContext = this->clipMetadata->GetNamedElement ( xdcNS, "Access" );
+	if ( legacyContext == 0 ) return;
+
+	MD5_CTX    context;
+	unsigned char digestBin [16];
+	MD5Init ( &context );
+
+	legacyProp = legacyContext->GetNamedElement ( xdcNS, "Creator" );
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() && (! legacyProp->content.empty()) ) {
+		const XML_Node * xmlValue = legacyProp->content[0];
+		MD5Update ( &context, (XMP_Uns8*)xmlValue->value.c_str(), (unsigned int)xmlValue->value.size() );
+	}
+
+	legacyProp = legacyContext->GetNamedElement ( xdcNS, "CreationDate" );
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() && (! legacyProp->content.empty()) ) {
+		const XML_Node * xmlValue = legacyProp->content[0];
+		MD5Update ( &context, (XMP_Uns8*)xmlValue->value.c_str(), (unsigned int)xmlValue->value.size() );
+	}
+
+	legacyProp = legacyContext->GetNamedElement ( xdcNS, "LastUpdateDate" );
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() && (! legacyProp->content.empty()) ) {
+		const XML_Node * xmlValue = legacyProp->content[0];
+		MD5Update ( &context, (XMP_Uns8*)xmlValue->value.c_str(), (unsigned int)xmlValue->value.size() );
+	}
+
+	MD5Final ( digestBin, &context );
+
+	char buffer [40];
+	for ( int in = 0, out = 0; in < 16; in += 1, out += 2 ) {
+		XMP_Uns8 byte = digestBin[in];
+		buffer[out]   = kHexDigits [ byte >> 4 ];
+		buffer[out+1] = kHexDigits [ byte & 0xF ];
+	}
+	buffer[32] = 0;
+	digestStr->append ( buffer );
+
+}	// XDCAMEX_MetaHandler::MakeLegacyDigest
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::CleanupLegacyXML
+// =====================================
+
+void XDCAMEX_MetaHandler::CleanupLegacyXML()
+{
+
+	delete this->expat;
+	this->expat = 0;
+
+	clipMetadata = 0;	// ! Was a pointer into the expat tree.
+
+}	// XDCAMEX_MetaHandler::CleanupLegacyXML
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::GetFileModDate
+// ===================================
+
+static inline bool operator< ( const XMP_DateTime & left, const XMP_DateTime & right ) {
+	int compare = SXMPUtils::CompareDateTime ( left, right );
+	return (compare < 0);
+}
+
+bool XDCAMEX_MetaHandler::GetFileModDate ( XMP_DateTime * modDate )
+{
+
+	// The XDCAM EX locations of metadata:
+	//	BPAV/
+	//		MEDIAPRO.XML	// Has non-XMP metadata.
+	//		CLPR/
+	//			709_3001_01:
+	//				709_3001_01M01.XML	// Has non-XMP metadata.
+	//				709_3001_01M01.XMP
+
+	bool ok, haveDate = false;
+	std::string fullPath;
+	XMP_DateTime oneDate, junkDate;
+	if ( modDate == 0 ) modDate = &junkDate;
+
+	ok = this->MakeMediaproPath ( &fullPath, true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( *modDate < oneDate ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	ok = this->MakeClipFilePath ( &fullPath, "M01.XML", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) || (*modDate < oneDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	ok = this->MakeClipFilePath ( &fullPath, "M01.XMP", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) || (*modDate < oneDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	return haveDate;
+
+}	// XDCAMEX_MetaHandler::GetFileModDate
+
+// Adds all the associated resources for the specified clip only (not related spanned ones) 
+static void FillClipAssociatedResources( std::vector<std::string> * resourceList, std::string &clipPath, std::string &clipName )
+{
+	std::string filePath;
+	std::string spannedClipFolderPath = clipPath + clipName + kDirChar;
+	
+	std::string clipPathNoExt = spannedClipFolderPath + clipName;
+	// Get the files present inside clip folder.
+	std::vector<std::string> regExpStringVec;
+	std::string regExpString;
+	regExpString = "^" + clipName + ".MP4$";
+	regExpStringVec.push_back(regExpString);
+	regExpString = "^" + clipName + "M\\d\\d.XMP$";
+	regExpStringVec.push_back(regExpString);
+	regExpString = "^" + clipName + "M\\d\\d.XML$";
+	regExpStringVec.push_back(regExpString);
+	regExpString = "^" + clipName + "I\\d\\d.PPN$";
+	regExpStringVec.push_back(regExpString);
+	regExpString = "^" + clipName + "R\\d\\d.BIM$";
+	regExpStringVec.push_back(regExpString);
+	regExpString = "^" + clipName + ".SMI$";
+	regExpStringVec.push_back(regExpString);
+
+	IOUtils::GetMatchingChildren (*resourceList, spannedClipFolderPath, regExpStringVec, false, true, true );
+
+}
+
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::FillAssociatedResources
+// ======================================
+void XDCAMEX_MetaHandler::FillAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	// The possible associated resources:
+	//	BPAV/
+	//		MEDIAPRO.XML	
+	//		CUEUP.XML
+	//		CLPR/
+	//			MIXXXX_YY:			MI is MachineID, XXXX is TakeSerial, 
+	//								YY is ClipSuffix(as single take can be divided across multiple clips.)
+	//								In case of spanning, all the clip folders starting from "MIXXXX_" are looked for.
+	//				MIXXXX_YY.MP4
+	//				MIXXXX_YYMNN.XML	NN is a counter which will start from from 01 and can go upto 99 based 
+	//									on number of files present in this folder with same extension.
+	//				MIXXXX_YYMNN.XMP
+	//				MIXXXX_YYINN.PPN
+	//				MIXXXX_YYRNN.BIM
+	//				MXXXX_YY.SMI
+	//		TAKR/
+	//			MIXXXX:
+	//				MIXXXXMNN.XML		NN is a counter which will start from from 01 and can go upto 99 based 
+	//									on number of files present in this folder with same extension.
+	//				MIXXXX.SMI
+	//				MIXXXXUNN.SMI		NN is a counter which goes from 01 to N-1 where N is number of media, this
+	//									take is divided into. For Nth, MIXXXX.SMI shall be picked up.
+	XMP_VarString bpavPath = this->rootPath + kDirChar + "BPAV" + kDirChar;
+	XMP_VarString filePath;
+	//Add RootPath
+	filePath = this->rootPath + kDirChar;
+	PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+
+	// Get the files present directly inside BPAV folder.
+	filePath = bpavPath + "MEDIAPRO.XML";
+	PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	filePath = bpavPath + "MEDIAPRO.BUP";
+	PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	filePath = bpavPath + "CUEUP.XML";
+	PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+	filePath = bpavPath + "CUEUP.BUP";
+	PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+
+	XMP_VarString clipPath = bpavPath + "CLPR" + kDirChar;
+	size_t clipSuffixIndex = this->clipName.find_last_of('_');
+	XMP_VarString takeName = this->clipName.substr(0, clipSuffixIndex);
+
+	// Add spanned clip files. 
+	// Here, we iterate over all the folders present inside "/BPAV/CLPR/" and whose name starts from
+	// "MIXXXX_". All valid files present inside such folders are added to the list.
+	XMP_VarString regExpString;
+	regExpString = "^" + takeName + "_\\d\\d$";
+	XMP_StringVector list;
+
+	IOUtils::GetMatchingChildren ( list, clipPath, regExpString, true, false, false );
+	size_t spaningClipsCount = list.size();
+	for ( size_t index = 0; index < spaningClipsCount; index++ ) {
+		FillClipAssociatedResources ( resourceList, clipPath, list[index] );
+	}
+	list.clear();
+
+	size_t sizeWithoutTakeFiles = resourceList->size();
+	XMP_VarString takeFolderPath = bpavPath + "TAKR" + kDirChar + takeName + kDirChar;
+	XMP_StringVector regExpStringVec;
+
+	// Get the files present inside take folder.
+	regExpString = "^" + takeName + "M\\d\\d.XML$";
+	regExpStringVec.push_back ( regExpString );
+	regExpString = "^" + takeName + "U\\d\\d.SMI$";
+	regExpStringVec.push_back ( regExpString );
+	regExpString = "^" + takeName + ".SMI$";
+	regExpStringVec.push_back ( regExpString );
+	IOUtils::GetMatchingChildren ( *resourceList, takeFolderPath, regExpStringVec, false, true, true );
+
+	if ( sizeWithoutTakeFiles == resourceList->size() )
+	{
+		// no Take files added to resource list. But "TAKR" folder is necessary to recognize this format
+		// so let's add it to the list.
+		filePath = bpavPath + "TAKR" + kDirChar;
+		PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	}
+}	// XDCAMEX_MetaHandler::FillAssociatedResources
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::FillMetadataFiles
+// ======================================
+void XDCAMEX_MetaHandler::FillMetadataFiles ( std::vector<std::string> * metadataFiles )
+{
+	std::string noExtPath, filePath;
+
+	noExtPath = rootPath + kDirChar + "BPAV" + kDirChar + "CLPR" +
+						   kDirChar + clipName + kDirChar + clipName;
+
+	filePath = noExtPath + "M01.XMP";
+	metadataFiles->push_back ( filePath );
+	filePath = noExtPath + "M01.XML";
+	metadataFiles->push_back ( filePath );
+	filePath = rootPath + kDirChar + "BPAV" + kDirChar + "MEDIAPRO.XML";
+	metadataFiles->push_back ( filePath );
+
+}	// 	FillMetadataFiles_XDCAM_EX
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::IsMetadataWritable
+// =======================================
+
+bool XDCAMEX_MetaHandler::IsMetadataWritable ( )
+{
+	std::vector<std::string> metadataFiles;
+	FillMetadataFiles(&metadataFiles);
+	std::vector<std::string>::iterator itr = metadataFiles.begin();
+	// Check whether sidecar is writable, if not then check if it can be created.
+	XMP_Bool xmpWritable = Host_IO::Writable( itr->c_str(), true );
+	// Check for legacy metadata file.
+	XMP_Bool xmlWritable = Host_IO::Writable( (++itr)->c_str(), false );
+	return ( xmlWritable && xmpWritable );
+}// XDCAMEX_MetaHandler::IsMetadataWritable
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::CacheFileData
+// ==================================
+
+void XDCAMEX_MetaHandler::CacheFileData()
+{
+	XMP_Assert ( ! this->containsXMP );
+
+	if ( this->parent->UsesClientIO() ) {
+		XMP_Throw ( "XDCAMEX cannot be used with client-managed I/O", kXMPErr_InternalFailure );
+	}
+
+	// See if the clip's .XMP file exists.
+
+	std::string xmpPath;
+	this->MakeClipFilePath ( &xmpPath, "M01.XMP" );
+	if ( ! Host_IO::Exists ( xmpPath.c_str() ) ) return;	// No XMP.
+
+	// Read the entire .XMP file. We know the XMP exists, New_XMPFiles_IO is supposed to return 0
+	// only if the file does not exist.
+
+	bool readOnly = XMP_OptionIsClear ( this->parent->openFlags, kXMPFiles_OpenForUpdate );
+
+	XMP_Assert ( this->parent->ioRef == 0 );
+	XMPFiles_IO* xmpFile =  XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), readOnly );
+	if ( xmpFile == 0 ) XMP_Throw ( "XDCAMEX XMP file open failure", kXMPErr_InternalFailure );
+	this->parent->ioRef = xmpFile;
+
+	XMP_Int64 xmpLen = xmpFile->Length();
+	if ( xmpLen > 100*1024*1024 ) {
+		XMP_Throw ( "XDCAMEX XMP is outrageously large", kXMPErr_InternalFailure );	// Sanity check.
+	}
+
+	this->xmpPacket.erase();
+	this->xmpPacket.append ( (size_t)xmpLen, ' ' );
+
+	XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen );
+
+	this->packetInfo.offset = 0;
+	this->packetInfo.length = (XMP_Int32)xmpLen;
+	FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+	this->containsXMP = true;
+
+}	// XDCAMEX_MetaHandler::CacheFileData
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::GetTakeDuration
+// ====================================
+
+void XDCAMEX_MetaHandler::GetTakeDuration ( const std::string & takeURI, std::string & duration )
+{
+
+	// Some versions of gcc can't tolerate goto's across declarations.
+	// *** Better yet, avoid this cruft with self-cleaning objects.
+	#define CleanupAndExit	\
+		{									\
+			delete expatMediaPro;	        \
+			takeXMLFile.Close();			\
+			return;							\
+		}
+
+	duration.clear();
+
+	// Build a directory string to the take .xml file.
+
+	std::string takeDir ( takeURI );
+	takeDir.erase ( 0, 1 );	// Change the leading "//" to "/", then all '/' to kDirChar.
+	if ( kDirChar != '/' ) {
+		for ( size_t i = 0, limit = takeDir.size(); i < limit; ++i ) {
+			if ( takeDir[i] == '/' ) takeDir[i] = kDirChar;
+		}
+	}
+
+	std::string takePath ( this->rootPath );
+	takePath += kDirChar;
+	takePath += "BPAV";
+	takePath += takeDir;
+
+	// Replace .SMI with M01.XML.
+	if ( takePath.size() > 4 ) {
+		takePath.erase ( takePath.size() - 4, 4 );
+		takePath += "M01.XML";
+	}
+
+	// Parse MEDIAPRO.XML
+
+	XML_NodePtr takeRootElem = 0;
+	XML_NodePtr context = 0;
+
+	Host_IO::FileRef hostRef = Host_IO::Open ( takePath.c_str(), Host_IO::openReadOnly );
+	if ( hostRef == Host_IO::noFileRef ) return;	// The open failed.
+	XMPFiles_IO takeXMLFile ( hostRef, takePath.c_str(), Host_IO::openReadOnly );
+
+	ExpatAdapter * expatMediaPro = XMP_NewExpatAdapter ( ExpatAdapter::kUseLocalNamespaces );
+	if ( expatMediaPro == 0 ) return;
+
+	XMP_Uns8 buffer [64*1024];
+	while ( true ) {
+		XMP_Int32 ioCount = takeXMLFile.Read ( buffer, sizeof(buffer) );
+		if ( ioCount == 0 ) break;
+		expatMediaPro->ParseBuffer ( buffer, ioCount, false /* not the end */ );
+	}
+
+	expatMediaPro->ParseBuffer ( 0, 0, true );	// End the parse.
+	takeXMLFile.Close();
+
+	// Get the root node of the XML tree.
+
+	XML_Node & mediaproXMLTree = expatMediaPro->tree;
+	for ( size_t i = 0, limit = mediaproXMLTree.content.size(); i < limit; ++i ) {
+		if ( mediaproXMLTree.content[i]->kind == kElemNode ) {
+			takeRootElem = mediaproXMLTree.content[i];
+		}
+	}
+	if ( takeRootElem == 0 ) CleanupAndExit
+
+	XMP_StringPtr rlName = takeRootElem->name.c_str() + takeRootElem->nsPrefixLen;
+	if ( ! XMP_LitMatch ( rlName, "NonRealTimeMeta" ) ) CleanupAndExit
+
+	// MediaProfile, Contents
+	XMP_StringPtr ns = takeRootElem->ns.c_str();
+	context = takeRootElem->GetNamedElement ( ns, "Duration" );
+	if ( context != 0 ) {
+		XMP_StringPtr durationValue = context->GetAttrValue ( "value" );
+		if ( durationValue != 0 ) duration = durationValue;
+	}
+
+	CleanupAndExit
+	#undef CleanupAndExit
+
+}	// XDCAMEX_MetaHandler::GetTakeDuration
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::GetMediaProMetadata
+// ========================================
+
+bool XDCAMEX_MetaHandler::GetMediaProMetadata ( SXMPMeta * xmpObjPtr,
+											  	const std::string& clipUMID,
+											  	bool digestFound )
+{
+	// Build a directory string to the MEDIAPRO file.
+
+	std::string mediaproPath;
+	this->MakeMediaproPath ( &mediaproPath );
+	return XDCAM_Support::GetMediaProLegacyMetadata ( xmpObjPtr, clipUMID, mediaproPath, digestFound );
+
+}	// XDCAMEX_MetaHandler::GetMediaProMetadata
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::GetTakeUMID
+// ================================
+
+void XDCAMEX_MetaHandler::GetTakeUMID ( const std::string& clipUMID,
+										std::string&	   takeUMID,
+										std::string&	   takeXMLURI )
+{
+
+	// Some versions of gcc can't tolerate goto's across declarations.
+	// *** Better yet, avoid this cruft with self-cleaning objects.
+	#define CleanupAndExit	\
+		{									\
+			delete expatMediaPro;	        \
+			mediaproXMLFile.Close();		\
+			return;							\
+		}
+
+	takeUMID.clear();
+	takeXMLURI.clear();
+
+	// Build a directory string to the MEDIAPRO file.
+
+	std::string mediapropath ( this->rootPath );
+	mediapropath += kDirChar;
+	mediapropath += "BPAV";
+	mediapropath += kDirChar;
+	mediapropath += "MEDIAPRO.XML";
+
+	// Parse MEDIAPRO.XML.
+
+	XML_NodePtr mediaproRootElem = 0;
+	XML_NodePtr contentContext = 0, materialContext = 0;
+
+	Host_IO::FileRef hostRef = Host_IO::Open ( mediapropath.c_str(), Host_IO::openReadOnly );
+	if ( hostRef == Host_IO::noFileRef ) return;	// The open failed.
+	XMPFiles_IO mediaproXMLFile ( hostRef, mediapropath.c_str(), Host_IO::openReadOnly );
+
+	ExpatAdapter * expatMediaPro = XMP_NewExpatAdapter ( ExpatAdapter::kUseLocalNamespaces );
+	if ( expatMediaPro == 0 ) return;
+
+	XMP_Uns8 buffer [64*1024];
+	while ( true ) {
+		XMP_Int32 ioCount = mediaproXMLFile.Read ( buffer, sizeof(buffer) );
+		if ( ioCount == 0 ) break;
+		expatMediaPro->ParseBuffer ( buffer, ioCount, false /* not the end */ );
+	}
+
+	expatMediaPro->ParseBuffer ( 0, 0, true );	// End the parse.
+	mediaproXMLFile.Close();
+
+	// Get the root node of the XML tree.
+
+	XML_Node & mediaproXMLTree = expatMediaPro->tree;
+	for ( size_t i = 0, limit = mediaproXMLTree.content.size(); i < limit; ++i ) {
+		if ( mediaproXMLTree.content[i]->kind == kElemNode ) {
+			mediaproRootElem = mediaproXMLTree.content[i];
+		}
+	}
+
+	if ( mediaproRootElem == 0 ) CleanupAndExit
+	XMP_StringPtr rlName = mediaproRootElem->name.c_str() + mediaproRootElem->nsPrefixLen;
+	if ( ! XMP_LitMatch ( rlName, "MediaProfile" ) ) CleanupAndExit
+
+	//  MediaProfile, Contents
+
+	XMP_StringPtr ns = mediaproRootElem->ns.c_str();
+	contentContext = mediaproRootElem->GetNamedElement ( ns, "Contents" );
+
+	if ( contentContext != 0 ) {
+
+		size_t numMaterialElems = contentContext->CountNamedElements ( ns, "Material" );
+
+		for ( size_t i = 0; i < numMaterialElems; ++i ) {	// Iterate over Material tags.
+
+			XML_NodePtr materialElement = contentContext->GetNamedElement ( ns, "Material", i );
+			XMP_Assert ( materialElement != 0 );
+
+			XMP_StringPtr umid = materialElement->GetAttrValue ( "umid" );
+			XMP_StringPtr uri = materialElement->GetAttrValue ( "uri" );
+
+			if ( umid == 0 ) umid = "";
+			if ( uri == 0 ) uri = "";
+
+			size_t numComponents = materialElement->CountNamedElements ( ns, "Component" );
+
+			for ( size_t j = 0; j < numComponents; ++j ) {
+
+				XML_NodePtr componentElement = materialElement->GetNamedElement ( ns, "Component", j );
+				XMP_Assert ( componentElement != 0 );
+
+				XMP_StringPtr compUMID = componentElement->GetAttrValue ( "umid" );
+
+				if ( (compUMID != 0) && (compUMID == clipUMID) ) {
+					takeUMID = umid;
+					takeXMLURI = uri;
+					break;
+				}
+
+			}
+
+			if ( ! takeUMID.empty() ) break;
+
+		}
+
+	}
+
+	CleanupAndExit
+	#undef CleanupAndExit
+
+}
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::ProcessXMP
+// ===============================
+
+void XDCAMEX_MetaHandler::ProcessXMP()
+{
+
+	// Some versions of gcc can't tolerate goto's across declarations.
+	// *** Better yet, avoid this cruft with self-cleaning objects.
+	#define CleanupAndExit	\
+		{																								\
+			bool openForUpdate = XMP_OptionIsSet ( this->parent->openFlags, kXMPFiles_OpenForUpdate );	\
+			if ( ! openForUpdate ) this->CleanupLegacyXML();											\
+			xmlFile.Close();																			\
+			return;																						\
+		}
+
+	if ( this->processedXMP ) return;
+	this->processedXMP = true;	// Make sure only called once.
+
+	if ( this->containsXMP ) {
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	}
+
+	// NonRealTimeMeta -> XMP by schema.
+	std::string thisUMID, takeUMID, takeXMLURI, takeDuration;
+	std::string xmlPath;
+	this->MakeClipFilePath ( &xmlPath, "M01.XML" );
+
+	Host_IO::FileRef hostRef = Host_IO::Open ( xmlPath.c_str(), Host_IO::openReadOnly );
+	if ( hostRef == Host_IO::noFileRef ) return;	// The open failed.
+	XMPFiles_IO xmlFile ( hostRef, xmlPath.c_str(), Host_IO::openReadOnly );
+
+	this->expat = XMP_NewExpatAdapter ( ExpatAdapter::kUseLocalNamespaces );
+	if ( this->expat == 0 ) XMP_Throw ( "XDCAMEX_MetaHandler: Can't create Expat adapter", kXMPErr_NoMemory );
+
+	XMP_Uns8 buffer [64*1024];
+	while ( true ) {
+		XMP_Int32 ioCount = xmlFile.Read ( buffer, sizeof(buffer) );
+		if ( ioCount == 0 ) break;
+		this->expat->ParseBuffer ( buffer, ioCount, false /* not the end */ );
+	}
+	this->expat->ParseBuffer ( 0, 0, true );	// End the parse.
+
+	xmlFile.Close();
+
+	// The root element should be NonRealTimeMeta in some namespace. Take whatever this file uses.
+
+	XML_Node & xmlTree = this->expat->tree;
+	XML_NodePtr rootElem = 0;
+
+	for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+		if ( xmlTree.content[i]->kind == kElemNode ) rootElem = xmlTree.content[i];
+	}
+
+	if ( rootElem == 0 ) CleanupAndExit
+	XMP_StringPtr rootLocalName = rootElem->name.c_str() + rootElem->nsPrefixLen;
+	if ( ! XMP_LitMatch ( rootLocalName, "NonRealTimeMeta" ) ) CleanupAndExit
+
+	this->legacyNS = rootElem->ns;
+
+	// Check the legacy digest.
+
+	XMP_StringPtr legacyNS = this->legacyNS.c_str();
+	this->clipMetadata = rootElem;	// ! Save the NonRealTimeMeta pointer for other use.
+
+	std::string oldDigest, newDigest;
+	bool digestFound = this->xmpObj.GetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "XDCAMEX", &oldDigest, 0 );
+	if ( digestFound ) {
+		this->MakeLegacyDigest ( &newDigest );
+		if ( oldDigest == newDigest ) CleanupAndExit
+	}
+
+	// If we get here we need find and import the actual legacy elements using the current namespace.
+	// Either there is no old digest in the XMP, or the digests differ. In the former case keep any
+	// existing XMP, in the latter case take new legacy values.
+	this->containsXMP = XDCAM_Support::GetLegacyMetadata ( &this->xmpObj, rootElem, legacyNS, digestFound, thisUMID );
+
+	// If this clip is part of a take, add the take number to the relation field, and get the
+	// duration from the take metadata.
+	GetTakeUMID ( thisUMID, takeUMID, takeXMLURI );
+
+	// If this clip is part of a take, update the duration to reflect the take duration rather than
+	// the clip duration, and add the take name as a shot name.
+
+	if ( ! takeXMLURI.empty() ) {
+
+		// Update duration. This property already exists from clip legacy metadata.
+		GetTakeDuration ( takeXMLURI, takeDuration );
+		if ( ! takeDuration.empty() ) {
+			this->xmpObj.SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "value", takeDuration );
+			containsXMP = true;
+		}
+
+		if ( digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DM, "shotName" )) ) {
+
+			std::string takeName;
+			XIO::SplitLeafName ( &takeXMLURI, &takeName );
+
+			// Check for the xml suffix, and delete if it exists.
+			size_t pos = takeName.rfind(".SMI");
+			if ( pos != std::string::npos ) {
+
+				takeName.erase ( pos );
+
+				// delete the take number suffix if it exists.
+				if ( takeName.size() > 3 ) {
+
+					size_t suffix = takeName.size() - 3;
+					char c1 = takeName[suffix];
+					char c2 = takeName[suffix+1];
+					char c3 = takeName[suffix+2];
+					if ( ('U' == c1) && ('0' <= c2) && (c2 <= '9') && ('0' <= c3) && (c3 <= '9') ) {
+						takeName.erase ( suffix );
+					}
+
+					this->xmpObj.SetProperty ( kXMP_NS_DM, "shotName", takeName, kXMP_DeleteExisting );
+					containsXMP = true;
+
+				}
+
+			}
+
+		}
+
+	}
+
+	if ( (! takeUMID.empty()) &&
+		 (digestFound || (! this->xmpObj.DoesPropertyExist ( kXMP_NS_DC, "relation" ))) ) {
+		this->xmpObj.DeleteProperty ( kXMP_NS_DC, "relation" );
+		this->xmpObj.AppendArrayItem ( kXMP_NS_DC, "relation", kXMP_PropArrayIsUnordered, takeUMID );
+		this->containsXMP = true;
+	}
+
+	this->containsXMP |= GetMediaProMetadata ( &this->xmpObj, thisUMID, digestFound );
+
+	CleanupAndExit
+	#undef CleanupAndExit
+
+}	// XDCAMEX_MetaHandler::ProcessXMP
+
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::UpdateFile
+// ===============================
+//
+// Note that UpdateFile is only called from XMPFiles::CloseFile, so it is OK to close the file here.
+
+void XDCAMEX_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) return;
+	this->needsUpdate = false;	// Make sure only called once.
+
+	XMP_Assert ( this->parent->UsesLocalIO() );
+
+	// Update the internal legacy XML tree if we have one, and set the digest in the XMP.
+
+	bool updateLegacyXML = false;
+
+	if ( this->clipMetadata != 0 ) {
+		updateLegacyXML = XDCAM_Support::SetLegacyMetadata ( this->clipMetadata, &this->xmpObj, this->legacyNS.c_str());
+	}
+
+	std::string newDigest;
+	this->MakeLegacyDigest ( &newDigest );
+	this->xmpObj.SetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "XDCAMEX", newDigest.c_str(), kXMP_DeleteExisting );
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, this->GetSerializeOptions() );
+
+	// -----------------------------------------------------------------------
+	// Update the XMP file first, don't let legacy XML failures block the XMP.
+
+	std::string xmpPath;
+	this->MakeClipFilePath ( &xmpPath, "M01.XMP" );
+
+	bool haveXMP = Host_IO::Exists ( xmpPath.c_str() );
+	if ( ! haveXMP ) {
+		XMP_Assert ( this->parent->ioRef == 0 );
+		Host_IO::Create ( xmpPath.c_str() );
+		this->parent->ioRef = XMPFiles_IO::New_XMPFiles_IO ( xmpPath.c_str(), Host_IO::openReadWrite );
+		if ( this->parent->ioRef == 0 ) XMP_Throw ( "Failure opening XDCAMEX XMP file", kXMPErr_ExternalFailure );
+	}
+
+	XMP_IO* xmpFile = this->parent->ioRef;
+	XMP_Assert ( xmpFile != 0 );
+	XIO::ReplaceTextFile ( xmpFile, this->xmpPacket, (haveXMP & doSafeUpdate) );
+
+	// --------------------------------------------
+	// Now update the legacy XML file if necessary.
+
+	if ( updateLegacyXML ) {
+
+		std::string legacyXML, xmlPath;
+		this->expat->tree.Serialize ( &legacyXML );
+		this->MakeClipFilePath ( &xmlPath, "M01.XML" );
+
+		bool haveXML = Host_IO::Exists ( xmlPath.c_str() );
+		if ( ! haveXML ) Host_IO::Create ( xmlPath.c_str() );
+
+		Host_IO::FileRef hostRef = Host_IO::Open ( xmlPath.c_str(), Host_IO::openReadWrite );
+		if ( hostRef == Host_IO::noFileRef ) XMP_Throw ( "Failure opening XDCAMEX legacy XML file", kXMPErr_ExternalFailure );
+		XMPFiles_IO origXML ( hostRef, xmlPath.c_str(), Host_IO::openReadWrite );
+		XIO::ReplaceTextFile ( &origXML, legacyXML, (haveXML & doSafeUpdate) );
+		origXML.Close();
+
+	}
+
+}	// XDCAMEX_MetaHandler::UpdateFile
+
+// =================================================================================================
+// XDCAMEX_MetaHandler::WriteTempFile
+// ==================================
+
+void XDCAMEX_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+
+	// ! WriteTempFile is not supposed to be called for handlers that own the file.
+	XMP_Throw ( "XDCAMEX_MetaHandler::WriteTempFile should not be called", kXMPErr_InternalFailure );
+
+}	// XDCAMEX_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp
new file mode 100644
index 0000000..3673b1f
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp
@@ -0,0 +1,90 @@
+#ifndef __XDCAMEX_Handler_hpp__
+#define __XDCAMEX_Handler_hpp__	1
+
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "source/ExpatAdapter.hpp"
+
+// =================================================================================================
+/// \file XDCAMEX_Handler.hpp
+/// \brief Folder format handler for XDCAMEX.
+// =================================================================================================
+
+extern XMPFileHandler * XDCAMEX_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool XDCAMEX_CheckFormat ( XMP_FileFormat format,
+								  const std::string & rootPath,
+								  const std::string & gpName,
+								  const std::string & parentName,
+								  const std::string & leafName,
+								  XMPFiles * parent );
+
+static const XMP_OptionBits kXDCAMEX_HandlerFlags = (kXMPFiles_CanInjectXMP |
+													 kXMPFiles_CanExpand |
+													 kXMPFiles_CanRewrite |
+													 kXMPFiles_PrefersInPlace |
+													 kXMPFiles_CanReconcile |
+													 kXMPFiles_AllowsOnlyXMP |
+													 kXMPFiles_ReturnsRawPacket |
+													 kXMPFiles_HandlerOwnsFile |
+													 kXMPFiles_AllowsSafeUpdate |
+													 kXMPFiles_FolderBasedFormat);
+
+class XDCAMEX_MetaHandler : public XMPFileHandler
+{
+public:
+
+	bool GetFileModDate ( XMP_DateTime * modDate );
+	
+	void FillMetadataFiles ( std::vector<std::string> * metadataFiles );
+	void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	bool IsMetadataWritable ( );
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	XMP_OptionBits GetSerializeOptions()	// *** These should be standard for standalone XMP files.
+		{ return (kXMP_UseCompactFormat | kXMP_OmitPacketWrapper); };
+
+	XDCAMEX_MetaHandler ( XMPFiles * _parent );
+	virtual ~XDCAMEX_MetaHandler();
+
+private:
+
+	XDCAMEX_MetaHandler() : expat(0), clipMetadata(0) {};	// Hidden on purpose.
+
+	bool MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false );
+	bool MakeMediaproPath ( std::string * path, bool checkFile = false );
+	void MakeLegacyDigest ( std::string * digestStr );
+
+	void GetTakeUMID ( const std::string& clipUMID, std::string& takeUMID, std::string& takeXMLURI );
+	void GetTakeDuration ( const std::string& takeUMID, std::string& duration );
+	bool GetMediaProMetadata ( SXMPMeta * xmpObjPtr, const std::string& clipUMID, bool digestFound );
+
+	void CleanupLegacyXML();
+
+	std::string rootPath, clipName, xdcNS, legacyNS, clipUMID;
+
+	// Used to Parse the Non-XMP /non real time metadata file associated with the clip 
+	ExpatAdapter * expat;
+	XML_Node * clipMetadata;
+
+};	// XDCAMEX_MetaHandler
+
+// =================================================================================================
+
+#endif /* __XDCAMEX_Handler_hpp__ */
diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp
new file mode 100644
index 0000000..2a05be9
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp
@@ -0,0 +1,1620 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+#include "source/IOUtils.hpp"
+
+#include "XMPFiles/source/FileHandlers/XDCAM_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/XDCAM_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PackageFormat_Support.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+
+using namespace std;
+
+// =================================================================================================
+/// \file XDCAM_Handler.cpp
+/// \brief Folder format handler for XDCAM.
+///
+/// This handler is for the XDCAM video format. This is a pseudo-package, visible files but with a very
+/// well-defined layout and naming rules. There are 2 different layouts for XDCAM, called FAM and SAM.
+/// The FAM layout is used by "normal" XDCAM devices. The SAM layout is used by XDCAM-EX devices.
+///
+/// A typical FAM layout looks like (note mixed case for the nested folders):
+///
+/// .../MyMovie/
+/// 	INDEX.XML
+/// 	DISCMETA.XML
+/// 	MEDIAPRO.XML
+/// 	General/
+/// 		unknown files
+/// 	Clip/
+/// 		C0001.MXF
+/// 		C0001M01.XML
+/// 		C0001M01.XMP
+/// 		C0002.MXF
+/// 		C0002M01.XML
+/// 		C0002M01.XMP
+/// 	Sub/
+/// 		C0001S01.MXF
+/// 		C0002S01.MXF
+/// 	Edit/
+/// 		E0001E01.SMI
+/// 		E0001M01.XML
+/// 		E0002E01.SMI
+/// 		E0002M01.XML
+///
+/// A typical FAM XMPilot layout looks like (note mixed case for the nested folders):
+///
+/// .../MyMovie/
+/// 	DISCMETA.XML
+/// 	MEDIAPRO.XML
+/// 	General/
+/// 	Clip/
+/// 		Office_0001.MXF
+/// 		Office_0001M01.XML
+/// 		Office_0001M01.XMP
+/// 		Office_0002.MXF
+/// 		Office_0002M01.XML
+/// 		Office_0002M01.XMP
+/// 	Sub/
+/// 		Office_0001S01.MXF
+/// 		Office_0002S01.MXF
+/// 	Edit/
+///     UserData/
+///         unknown files
+///
+/// A typical FAM XDCAM Memory SxS layout looks like (note mixed case for the nested folders):
+///
+/// .../MyMovie/
+/// 	DISCMETA.XML
+/// 	MEDIAPRO.XML
+///     CUEUP.XML
+/// 	General/
+/// 	Clip/
+/// 		C0001.MXF
+/// 		C0001M01.XML
+/// 		C0001M01.XMP
+/// 		C0001R01.BIM
+/// 		C0002.MXF
+/// 		C0002M01.XML
+/// 		C0002M01.XMP
+/// 		C0001R01.BIM
+/// 	Sub/
+/// 		C0001S01.MXF
+/// 		C0002S01.MXF
+/// 	Edit/
+///		Take/
+/// 		T0001.SMI
+/// 		T0001M01.XML
+///     UserData/
+///
+/// A typical SAM layout looks like:
+///
+/// .../MyMovie/
+/// 	GENERAL/
+/// 		unknown files
+/// 	PROAV/
+/// 		INDEX.XML
+/// 		INDEX.BUP
+/// 		DISCMETA.XML
+/// 		DISCINFO.XML
+/// 		DISCINFO.BUP
+/// 		CLPR/
+/// 			C0001/
+/// 				C0001C01.SMI
+/// 				C0001V01.MXF
+/// 				C0001A01.MXF
+/// 				C0001A02.MXF
+/// 				C0001R01.BIM
+/// 				C0001I01.PPN
+/// 				C0001M01.XML
+/// 				C0001M01.XMP
+/// 				C0001S01.MXF
+/// 			C0002/
+/// 				...
+/// 		EDTR/
+/// 			E0001/
+/// 				E0001E01.SMI
+/// 				E0001M01.XML
+/// 			E0002/
+/// 				...
+///
+/// Note that the Sony documentation uses the folder names "General", "Clip", "Sub", and "Edit". We
+/// use all caps here. Common code has already shifted the names, we want to be case insensitive.
+///
+/// From the user's point of view, .../MyMovie contains XDCAM stuff, in this case 2 clips whose raw
+/// names are C0001 and C0002. There may be mapping information for nicer clip names to the raw
+/// names, but that can be ignored for now. Each clip is stored as a collection of files, each file
+/// holding some specific aspect of the clip's data.
+///
+/// The XDCAM handler operates on clips. The path from the client of XMPFiles can be either a logical
+/// clip path, like ".../MyMovie/C0001", or a full path to one of the files. In the latter case the
+/// handler must figure out the intended clip, it must not blindly use the named file.
+///
+/// Once the XDCAM structure and intended clip are identified, the handler only deals with the .XMP
+/// and .XML files in the CLIP or CLPR/<clip> folders. The .XMP file, if present, contains the XMP
+/// for the clip. The .XML file must be present to define the existance of the clip. It contains a
+/// variety of information about the clip, including some legacy metadata.
+///
+// =================================================================================================
+
+// =================================================================================================
+// XDCAM_CheckFormat
+// =================
+//
+// This version does fairly simple checks. The top level folder (.../MyMovie) must have exactly 1
+// child, a folder called CONTENTS. This must have a subfolder called CLIP. It may also have
+// subfolders called VIDEO, AUDIO, ICON, VOICE, and PROXY. Any mixture of these additional folders
+// is allowed, but no other children are allowed in CONTENTS. The CLIP folder must contain a .XML
+// file for the desired clip. The name checks are case insensitive.
+//
+// The state of the string parameters depends on the form of the path passed by the client. If the
+// client passed a logical clip path, like ".../MyMovie/C0001", the parameters are:
+//   rootPath   - ".../MyMovie"
+//   gpName     - empty
+//   parentName - empty
+//   leafName   - "C0001"
+//
+// If the client passed a FAM file path, like ".../MyMovie/Edit/E0001E01.SMI", they are:
+//   rootPath   - "..."
+//   gpName     - "MyMovie"
+//   parentName - "EDIT"	(common code has shifted the case)
+//   leafName   - "E0001E01"
+//
+// If the client passed a SAM file path, like ".../MyMovie/PROAV/CLPR/C0001/C0001A02.MXF", they are:
+//   rootPath   - ".../MyMovie/PROAV"
+//   gpName     - "CLPR"
+//   parentName - "C0001"
+//   leafName   - "C0001A02"
+//
+// For both FAM and SAM the leading character of the leafName for an existing file might be coerced
+// to 'C' to form the logical clip name. And suffix such as "M01" must be removed for FAM. We don't
+// need to worry about that for SAM, that uses the <clip> folder name.
+
+// ! The FAM format supports general clip file names through an ALIAS.XML mapping file. The simple
+// ! existence check has an edge case bug, left to be fixed later. If the ALIAS.XML file exists, but
+// ! some of the clips still have "raw" names, and we're passed an existing file path in the EDIT
+// ! folder, we will fail to do the leading 'E' to 'C' coercion. We might also erroneously remove a
+// ! suffix from a mapped essence file with a name like ClipX01.MXF.
+
+// ! The common code has shifted the gpName, parentName, and leafName strings to uppercase. It has
+// ! also made sure that for a logical clip path the rootPath is an existing folder, and that the
+// ! file exists for a full file path.
+
+bool XDCAM_CheckFormat ( XMP_FileFormat format,
+						 const std::string & _rootPath,
+						 const std::string & _gpName,
+						 const std::string & parentName,
+						 const std::string & leafName,
+						 XMPFiles * parent )
+{
+	std::string rootPath = _rootPath;	// ! Need tweaking in the existing file cases (FAM and SAM).
+	std::string gpName   = _gpName;
+
+	bool isFAM = false;
+
+	std::string tempPath, childName;
+
+	std::string clipName = leafName;
+
+	// Do some basic checks on the root path and component names. Decide if this is FAM or SAM.
+
+	if ( gpName.empty() != parentName.empty() ) return false;	// Must be both empty or both non-empty.
+
+	if ( gpName.empty() ) {
+
+		// This is the logical clip path case. Just look for PROAV to see if this is FAM or SAM.
+		if ( Host_IO::GetChildMode ( rootPath.c_str(), "PROAV" ) != Host_IO::kFMode_IsFolder ) isFAM = true;
+
+	} else {
+
+		// This is the existing file case. See if this is FAM or SAM, tweak the clip name as needed.
+
+		if ( (parentName == "CLIP") || (parentName == "EDIT") || (parentName == "SUB") ) {
+			// ! The standard says Clip/Edit/Sub, but the caller has already shifted to upper case.
+			isFAM = true;
+		} else if ( (gpName != "CLPR") && (gpName != "EDTR") ) {
+			return false;
+		}
+
+		if ( isFAM ) {
+
+			// Put the proper root path together. Clean up the clip name if needed.
+
+			if ( ! rootPath.empty() ) rootPath += kDirChar;
+			rootPath += gpName;
+			gpName.erase();
+
+			// XMPilot has no ALIAS.XML, but does have a UserData folder, don't change the first
+			// letter of the clip name for XMPilot.
+			if ( (Host_IO::GetChildMode ( rootPath.c_str(), "ALIAS.XML" ) != Host_IO::kFMode_IsFile) &&
+				 (Host_IO::GetChildMode ( rootPath.c_str(), "UserData" ) != Host_IO::kFMode_IsFolder) ) {
+				clipName[0] = 'C';	// ! See notes above about pending bug.
+			}
+
+			if ( clipName.size() > 3 ) {
+				size_t clipMid = clipName.size() - 3;
+				char c1 = clipName[clipMid];
+				char c2 = clipName[clipMid+1];
+				char c3 = clipName[clipMid+2];
+				if ( ('A' <= c1) && (c1 <= 'Z') &&
+					 ('0' <= c2) && (c2 <= '9') && ('0' <= c3) && (c3 <= '9') ) {
+					clipName.erase ( clipMid );
+				}
+			}
+
+		} else {
+
+			// Fix the clip name. Check for and strip the "PROAV" suffix on the root path.
+
+			clipName = parentName;	// ! We have a folder with the (almost) exact clip name.
+			clipName[0] = 'C';
+
+			std::string proav;
+			XIO::SplitLeafName ( &rootPath, &proav );
+			MakeUpperCase ( &proav );
+			if ( (rootPath.empty()) || (proav != "PROAV") ) return false;
+
+		}
+
+	}
+
+	// Make sure the general XDCAM package structure is legit. Set tempPath as a bogus path of the
+	// form <root>/<FAM-or-SAM>/<clip>, e.g. ".../MyMovie/FAM/C0001". This is passed the handler via
+	// the tempPtr hackery.
+
+	if ( isFAM ) {
+
+		if ( (format != kXMP_XDCAM_FAMFile) && (format != kXMP_UnknownFile) ) return false;
+
+		tempPath = rootPath;
+
+		// XMPilot does not have INDEX.XML but does have UserData.
+        if ( (Host_IO::GetChildMode ( tempPath.c_str(), "INDEX.XML" ) != Host_IO::kFMode_IsFile) &&
+			 !((Host_IO::GetChildMode ( rootPath.c_str(), "UserData" ) == Host_IO::kFMode_IsFolder)
+			 // Changes introduced by Sony for XDCAM Memory SxS format in the FAM file structure are 
+			 //	1) There is no INDEX.XML in the root directory for XDCAM Memory SxS.
+			 //	2) There is a new Take folder(similar to XDCAMEX) in the root directory.
+			 || (Host_IO::GetChildMode ( tempPath.c_str(), "Take" ) == Host_IO::kFMode_IsFolder))) return false;
+		if ( Host_IO::GetChildMode ( tempPath.c_str(), "DISCMETA.XML" ) != Host_IO::kFMode_IsFile ) return false;
+		if ( Host_IO::GetChildMode ( tempPath.c_str(), "MEDIAPRO.XML" ) != Host_IO::kFMode_IsFile ) return false;
+
+		tempPath += kDirChar;
+		tempPath += "Clip";	// ! Yes, mixed case.
+		tempPath += kDirChar;
+		tempPath += clipName;
+		tempPath += "M01.XML";
+		if ( Host_IO::GetFileMode ( tempPath.c_str() ) != Host_IO::kFMode_IsFile ) return false;
+
+		tempPath = rootPath;
+		tempPath += kDirChar;
+		tempPath += "FAM";
+		tempPath += kDirChar;
+		tempPath += clipName;
+
+	} else {
+
+		if ( (format != kXMP_XDCAM_SAMFile) && (format != kXMP_UnknownFile) ) return false;
+
+		// We already know about the PROAV folder, just check below it.
+
+		tempPath = rootPath;
+		tempPath += kDirChar;
+		tempPath += "PROAV";
+
+		if ( Host_IO::GetChildMode ( tempPath.c_str(), "INDEX.XML" ) != Host_IO::kFMode_IsFile ) return false;
+		if ( Host_IO::GetChildMode ( tempPath.c_str(), "DISCMETA.XML" ) != Host_IO::kFMode_IsFile ) return false;
+		if ( Host_IO::GetChildMode ( tempPath.c_str(), "DISCINFO.XML" ) != Host_IO::kFMode_IsFile ) return false;
+		if ( Host_IO::GetChildMode ( tempPath.c_str(), "CLPR" ) != Host_IO::kFMode_IsFolder ) return false;
+
+		tempPath += kDirChar;
+		tempPath += "CLPR";
+		tempPath += kDirChar;
+		tempPath += clipName;
+		if ( Host_IO::GetFileMode ( tempPath.c_str() ) != Host_IO::kFMode_IsFolder ) return false;
+
+		tempPath += kDirChar;
+		tempPath += clipName;
+		tempPath += "M01.XML";
+		if ( Host_IO::GetFileMode ( tempPath.c_str() ) != Host_IO::kFMode_IsFile ) return false;
+
+		tempPath = rootPath;
+		tempPath += kDirChar;
+		tempPath += "SAM";
+		tempPath += kDirChar;
+		tempPath += clipName;
+
+	}
+
+	// Save the pseudo-path for the handler object. A bit of a hack, but the only way to get info
+	// from here to there.
+
+	size_t pathLen = tempPath.size() + 1;	// Include a terminating nul.
+	parent->tempPtr = malloc ( pathLen );
+	if ( parent->tempPtr == 0 ) XMP_Throw ( "No memory for XDCAM clip info", kXMPErr_NoMemory );
+	memcpy ( parent->tempPtr, tempPath.c_str(), pathLen );	// AUDIT: Safe, allocated above.
+
+	return true;
+
+}	// XDCAM_CheckFormat
+
+// =================================================================================================
+
+static void* CreatePseudoClipPath ( const std::string & clientPath ) {
+
+	// Used to create the clip pseudo path when the CheckFormat function is skipped.
+	
+	std::string pseudoPath = clientPath;
+	std::string clipName;
+	bool isSAM;
+	
+	size_t pathLen;
+	void* tempPtr = 0;
+	
+	if ( ! Host_IO::Exists ( pseudoPath.c_str() ) ) {
+
+		// This is the logical clip path case. Look for PROAV to see if this is FAM or SAM.
+
+		XIO::SplitLeafName ( &pseudoPath, &clipName );	// Extract the logical clip name, no extension.
+		isSAM = ( Host_IO::GetChildMode ( pseudoPath.c_str(), "PROAV" ) == Host_IO::kFMode_IsFolder );
+	
+	} else {
+	
+		// The client passed a physical path. We have separate cases for FAM and SAM. If the last
+		// folder, the parent of the file, is Clip, Edit, or Sub (ignoring case) then this is FAM
+		// and things are a bit messy. For SAM, the parent folder is the almost clip name.
+		
+		std::string parentName, ignored;
+		
+		XIO::SplitLeafName ( &pseudoPath, &clipName );	// Extract the logical clip name.
+		XIO::SplitFileExtension ( &clipName, &ignored );
+
+		XIO::SplitLeafName ( &pseudoPath, &parentName );
+		MakeUpperCase ( &parentName );
+		isSAM = ( (parentName != "CLIP") && (parentName != "EDIT") && (parentName != "SUB") );
+		
+		if ( isSAM ) {
+		
+			// SAM is easy, the parent name is almost the clip name, the first letter gets coerced
+			// to 'C'. There are 2 other folders to remove from the path.
+
+			clipName = parentName;
+			clipName[0] = 'C';
+			XIO::SplitLeafName ( &pseudoPath, &ignored );	// Remove the 2 intermediate folder levels.
+			XIO::SplitLeafName ( &pseudoPath, &ignored );
+
+		} else {
+		
+			// FAM is a bit messy, study the comments and code of XDCAM_CheckFormat for details.
+
+			if ( Host_IO::GetChildMode ( pseudoPath.c_str(), "ALIAS.XML" ) != Host_IO::kFMode_IsFile ) {
+				clipName[0] = 'C';	// ! See notes in XDCAM_CheckFormat about pending bug.
+			}
+
+			if ( clipName.size() > 3 ) {
+				size_t clipMid = clipName.size() - 3;
+				char c1 = clipName[clipMid];
+				char c2 = clipName[clipMid+1];
+				char c3 = clipName[clipMid+2];
+				if ( ('A' <= c1) && (c1 <= 'Z') &&
+					 ('0' <= c2) && (c2 <= '9') && ('0' <= c3) && (c3 <= '9') ) {
+					clipName.erase ( clipMid );
+				}
+			}
+		
+		}
+	
+	}
+	
+	pseudoPath += kDirChar;
+	if ( isSAM ) {
+		pseudoPath += "SAM";
+	} else {
+		pseudoPath += "FAM";
+	}
+	pseudoPath += kDirChar;
+	pseudoPath += clipName;
+
+	pathLen = pseudoPath.size() + 1;	// Include a terminating nul.
+	tempPtr = malloc ( pathLen );
+	if ( tempPtr == 0 ) XMP_Throw ( "No memory for XDCAM clip info", kXMPErr_NoMemory );
+	memcpy ( tempPtr, pseudoPath.c_str(), pathLen );
+	
+	return tempPtr;
+
+}	// CreatePseudoClipPath
+
+// =================================================================================================
+// XDCAM_MetaHandlerCTor
+// =====================
+
+XMPFileHandler * XDCAM_MetaHandlerCTor ( XMPFiles * parent )
+{
+	return new XDCAM_MetaHandler ( parent );
+
+}	// XDCAM_MetaHandlerCTor
+
+
+// =================================================================================================
+// XDCAM_MetaHandler::SetSidecarPath
+// ====================================
+void XDCAM_MetaHandler::SetSidecarPath()
+{
+	// Here, we set the appropriate sidecar name for this format.
+	// If, the format if XMPilot (no INDEX.XML but UserData folder present) or
+	// SxS (no INDEX.XML but Take folder present) then sidecar name will be
+	// old name used by MXFHandler i.e, {clipName}.MXF.xmp or {clipname}.mxf.xmp
+	// For all other cases, new side car name i.e, {clipname}M01.XMP will be used.
+	
+	try
+	{
+		if(this->isFAM &&  Host_IO::GetChildMode ( this->rootPath.c_str(), "INDEX.XML" ) != Host_IO::kFMode_IsFile &&
+			(Host_IO::GetChildMode ( rootPath.c_str(), "UserData" ) == Host_IO::kFMode_IsFolder 
+			|| Host_IO::GetChildMode ( this->rootPath.c_str(), "Take" ) == Host_IO::kFMode_IsFolder) )
+		{
+			// this is either XMPilot or SxS format.
+			XMP_VarString mxfFilePath;
+			if(MakeClipFilePath ( &mxfFilePath , ".MXF", true ) ||  MakeClipFilePath ( &mxfFilePath , ".mxf", true ) )
+			{
+				Host_IO::FileRef hostRef = Host_IO::Open ( mxfFilePath.c_str(), Host_IO::openReadOnly );
+				if ( hostRef != Host_IO::noFileRef )
+				{
+						
+					XMPFiles_IO mxfFile ( hostRef, mxfFilePath.c_str() , Host_IO::openReadOnly );	
+
+					if ( Host_IO::Length(hostRef) >= 16 )
+					{
+						XMP_Uns8 buffer[16];
+						Host_IO::Seek(hostRef, 0, kXMP_SeekFromStart);
+						XMP_Uns32 readBytes = Host_IO::Read(hostRef, buffer, 16 );	
+
+						if ( ( readBytes == 16 ) && 
+							( GetUns32BE(&buffer[0]) == 0x060E2B34 ) &&
+							( GetUns32BE(&buffer[4]) == 0x02050101 ) &&
+							( GetUns32BE(&buffer[8]) == 0x0D010201 ) &&
+							( ( GetUns32BE(&buffer[12]) & 0xFFFF00FF ) == 0x01020000 )
+							)
+						{
+							std::string pathtomxfclip=Host_IO::GetCasePreservedName(mxfFilePath);
+							if ( pathtomxfclip != "" )
+							{
+								std::string ext;
+								XIO::SplitFileExtension( &pathtomxfclip, &ext , false);
+								ext="."+ext;
+								MakeClipFilePath ( &mxfFilePath , ext.c_str() , false );
+								this->sidecarPath = mxfFilePath + ".xmp";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	catch( ... )
+	{
+		// Use new side car name.
+	}
+	if(this->sidecarPath.empty())
+	{
+		MakeClipFilePath ( &this->sidecarPath , "M01.XMP", false ) ;
+	}
+}// XDCAM_MetaHandler::SetSidecarPath
+
+// =================================================================================================
+// XDCAM_MetaHandler::XDCAM_MetaHandler
+// ====================================
+
+XDCAM_MetaHandler::XDCAM_MetaHandler ( XMPFiles * _parent ) : isFAM(false), expat(0),clipMetadata(NULL)
+{
+
+	this->parent = _parent;	// Inherited, can't set in the prefix.
+	this->handlerFlags = kXDCAM_HandlerFlags;
+	this->stdCharForm  = kXMP_Char8Bit;
+
+	// Extract the root path, clip name, and FAM/SAM flag from tempPtr.
+
+	if ( this->parent->tempPtr == 0 ) {
+		// The CheckFormat call might have been skipped.
+		this->parent->tempPtr = CreatePseudoClipPath ( this->parent->GetFilePath() );
+	}
+
+	this->rootPath.assign ( (char*) this->parent->tempPtr );
+	free ( this->parent->tempPtr );
+	this->parent->tempPtr = 0;
+
+	XIO::SplitLeafName ( &this->rootPath, &this->clipName );
+
+	std::string temp;
+	XIO::SplitLeafName ( &this->rootPath, &temp );
+	XMP_Assert ( (temp == "FAM") || (temp == "SAM") );
+	if ( temp == "FAM" ) this->isFAM = true;
+	// backward compatibility ensured for XMPilot Clips
+	// XMPilot is FAM
+	this->SetSidecarPath();
+	XMP_Assert ( this->isFAM ? (this->parent->format == kXMP_XDCAM_FAMFile) : (this->parent->format == kXMP_XDCAM_SAMFile) );
+
+}	// XDCAM_MetaHandler::XDCAM_MetaHandler
+
+// =================================================================================================
+// XDCAM_MetaHandler::~XDCAM_MetaHandler
+// =====================================
+
+XDCAM_MetaHandler::~XDCAM_MetaHandler()
+{
+
+	this->CleanupLegacyXML();
+	if ( this->parent->tempPtr != 0 ) {
+		free ( this->parent->tempPtr );
+		this->parent->tempPtr = 0;
+	}
+
+}	// XDCAM_MetaHandler::~XDCAM_MetaHandler
+
+// =================================================================================================
+// XDCAM_MetaHandler::MakeClipFilePath
+// ===================================
+
+bool XDCAM_MetaHandler::MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile /* = false */ )
+{
+
+	*path = this->rootPath;
+	*path += kDirChar;
+
+	if ( this->isFAM ) {
+		*path += "Clip";	// ! Yes, mixed case.
+	} else {
+		*path += "PROAV";
+		*path += kDirChar;
+		*path += "CLPR";
+		*path += kDirChar;
+		*path += this->clipName;
+	}
+
+	*path += kDirChar;
+	*path += this->clipName;
+	*path += suffix;
+	
+	if ( ! checkFile ) return true;
+	return Host_IO::Exists ( path->c_str() );
+
+}	// XDCAM_MetaHandler::MakeClipFilePath
+
+// =================================================================================================
+// XDCAM_MetaHandler::MakeMediaproPath
+// ===================================
+
+bool XDCAM_MetaHandler::MakeMediaproPath ( std::string * path, bool checkFile /* = false */ )
+{
+
+	*path = this->rootPath;
+	*path += kDirChar;
+	*path += "MEDIAPRO.XML";
+	
+	if ( ! checkFile ) return true;
+	return Host_IO::Exists ( path->c_str() );
+
+}	// XDCAM_MetaHandler::MakeMediaproPath
+
+// =================================================================================================
+// XDCAM_MetaHandler::MakeLegacyDigest
+// ===================================
+
+// *** Early hack version.
+
+#define kHexDigits "0123456789ABCDEF"
+
+void XDCAM_MetaHandler::MakeLegacyDigest ( std::string * digestStr )
+{
+	digestStr->erase();
+	if ( this->clipMetadata == 0 ) return;	// Bail if we don't have any legacy XML.
+	XMP_Assert ( this->expat != 0 );
+
+	XMP_StringPtr xdcNS = this->xdcNS.c_str();
+	XML_NodePtr legacyContext, legacyProp;
+
+	legacyContext = this->clipMetadata->GetNamedElement ( xdcNS, "Access" );
+	if ( legacyContext == 0 ) return;
+
+	MD5_CTX    context;
+	unsigned char digestBin [16];
+	MD5Init ( &context );
+
+	legacyProp = legacyContext->GetNamedElement ( xdcNS, "Creator" );
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() && (! legacyProp->content.empty()) ) {
+		const XML_Node * xmlValue = legacyProp->content[0];
+		MD5Update ( &context, (XMP_Uns8*)xmlValue->value.c_str(), (unsigned int)xmlValue->value.size() );
+	}
+
+	legacyProp = legacyContext->GetNamedElement ( xdcNS, "CreationDate" );
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() && (! legacyProp->content.empty()) ) {
+		const XML_Node * xmlValue = legacyProp->content[0];
+		MD5Update ( &context, (XMP_Uns8*)xmlValue->value.c_str(), (unsigned int)xmlValue->value.size() );
+	}
+
+	legacyProp = legacyContext->GetNamedElement ( xdcNS, "LastUpdateDate" );
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() && (! legacyProp->content.empty()) ) {
+		const XML_Node * xmlValue = legacyProp->content[0];
+		MD5Update ( &context, (XMP_Uns8*)xmlValue->value.c_str(), (unsigned int)xmlValue->value.size() );
+	}
+
+	MD5Final ( digestBin, &context );
+
+	char buffer [40];
+	for ( int in = 0, out = 0; in < 16; in += 1, out += 2 ) {
+		XMP_Uns8 byte = digestBin[in];
+		buffer[out]   = kHexDigits [ byte >> 4 ];
+		buffer[out+1] = kHexDigits [ byte & 0xF ];
+	}
+	buffer[32] = 0;
+	digestStr->append ( buffer );
+
+}	// XDCAM_MetaHandler::MakeLegacyDigest
+
+// =================================================================================================
+// P2_MetaHandler::CleanupLegacyXML
+// ================================
+
+void XDCAM_MetaHandler::CleanupLegacyXML()
+{
+
+	if ( this->expat != 0 ) { delete ( this->expat ); this->expat = 0; }
+
+	clipMetadata = 0;	// ! Was a pointer into the expat tree.
+
+}	// XDCAM_MetaHandler::CleanupLegacyXML
+
+void  XDCAM_MetaHandler::readXMLFile( XMP_StringPtr filePath, ExpatAdapter* &expat )
+{
+	Host_IO::FileRef hostRef = Host_IO::Open ( filePath, Host_IO::openReadOnly );
+	if ( hostRef == Host_IO::noFileRef ) return;	// The open failed.
+	XMPFiles_IO xmlFile ( hostRef, filePath, Host_IO::openReadOnly );
+
+	expat = XMP_NewExpatAdapter ( ExpatAdapter::kUseLocalNamespaces );
+	if ( expat == 0 ) XMP_Throw ( "XDCAM_MetaHandler: Can't create Expat adapter", kXMPErr_NoMemory );
+
+	XMP_Uns8 buffer [64*1024];
+	while ( true ) {
+		XMP_Int32 ioCount = xmlFile.Read ( buffer, sizeof(buffer) );
+		if ( ioCount == 0 ) break;
+		expat->ParseBuffer ( buffer, ioCount, false /* not the end */ );
+	}
+	expat->ParseBuffer ( 0, 0, true );	// End the parse.
+
+	xmlFile.Close();
+}
+
+// =================================================================================================
+// XDCAM_MetaHandler::GetFileModDate
+// =================================
+
+static inline bool operator< ( const XMP_DateTime & left, const XMP_DateTime & right ) {
+	int compare = SXMPUtils::CompareDateTime ( left, right );
+	return (compare < 0);
+}
+
+bool XDCAM_MetaHandler::GetFileModDate ( XMP_DateTime * modDate )
+{
+
+	// The XDCAM FAM locations of metadata:
+	//	MEDIAPRO.XML	// Has non-XMP metadata.
+	//	Clip:
+	//		C0001_50i_DVCAM_43_4chM01.XML	// Has non-XMP metadata.
+	//		C0001_50i_DVCAM_43_4chM01.XMP
+
+	// The XDCAM SAM locations of metadata:
+	//	PROAV:
+	//		CLPR:
+	//			C0001:
+	//				C0001M01.XML	// Has non-XMP metadata.
+	//				C0001M01.XMP
+
+	bool ok, haveDate = false;
+	std::string fullPath;
+	XMP_DateTime oneDate, junkDate;
+	if ( modDate == 0 ) modDate = &junkDate;
+
+	std::string mediaproPath;
+	ok = MakeMediaproPath ( &mediaproPath, true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( mediaproPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	ok = this->MakeClipFilePath ( &fullPath, "M01.XML", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) || (*modDate < oneDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	ok = this->MakeClipFilePath ( &fullPath, "M01.XMP", true /* checkFile */ );
+	if ( ok ) ok = Host_IO::GetModifyDate ( fullPath.c_str(), &oneDate );
+	if ( ok ) {
+		if ( (! haveDate) || (*modDate < oneDate) ) *modDate = oneDate;
+		haveDate = true;
+	}
+
+	return haveDate;
+
+}	// XDCAM_MetaHandler::GetFileModDate
+
+
+// =================================================================================================
+// XDCAM_MetaHandler::GetClipUmid
+// ==============================
+bool XDCAM_MetaHandler::GetClipUmid ( std::string &clipUmid ) 
+{
+	std::string clipInfoPath;
+	ExpatAdapter* clipInfoExpat = 0 ;
+	bool umidFound = false;
+	XMP_StringPtr nameSpace = 0;
+	try {
+		this->MakeClipFilePath ( &clipInfoPath, "C01.SMI" ) ;
+		readXMLFile( clipInfoPath.c_str(), clipInfoExpat );
+		if ( clipInfoExpat != 0 )
+		{	
+			XML_Node & xmlTree = clipInfoExpat->tree;
+			XML_NodePtr rootElem = 0;
+
+			for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+				if ( xmlTree.content[i]->kind == kElemNode ) {
+					rootElem = xmlTree.content[i];
+				}
+			}
+			if ( rootElem != 0 )
+			{
+				XMP_StringPtr rootLocalName = rootElem->name.c_str() + rootElem->nsPrefixLen;
+				
+				if ( XMP_LitMatch ( rootLocalName, "smil" ) ) 
+				{
+					XMP_StringPtr umidValue = rootElem->GetAttrValue ( "umid" );
+					if ( umidValue != 0 ) {
+						clipUmid = umidValue;
+						umidFound = true;
+					}
+				}
+			}
+		}
+		if( ! umidFound )
+		{	//try to get the umid from the NRT metadata
+			delete ( clipInfoExpat ) ; clipInfoExpat = 0;
+			this->MakeClipFilePath ( &clipInfoPath, "M01.XML" ) ;
+			readXMLFile( clipInfoPath.c_str(), clipInfoExpat ) ;		
+			if ( clipInfoExpat != 0 )
+			{	
+				XML_Node & xmlTree = clipInfoExpat->tree;
+				XML_NodePtr rootElem = 0;
+				for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+					if ( xmlTree.content[i]->kind == kElemNode ) {
+						rootElem = xmlTree.content[i];
+					}
+				}
+				if ( rootElem != 0 )
+				{
+					XMP_StringPtr rootLocalName = rootElem->name.c_str() + rootElem->nsPrefixLen;
+					
+					if ( XMP_LitMatch ( rootLocalName, "NonRealTimeMeta" ) ) 
+					{	
+						nameSpace = rootElem->ns.c_str() ;
+						XML_NodePtr targetProp = rootElem->GetNamedElement ( nameSpace, "TargetMaterial" );
+						if ( (targetProp != 0) && targetProp->IsEmptyLeafNode() ) {
+							XMP_StringPtr umidValue = targetProp->GetAttrValue ( "umidRef" );
+							if ( umidValue != 0 ) {
+								clipUmid = umidValue;
+								umidFound = true;
+							}
+						}
+					}
+				}
+			}
+		}
+	} catch ( ... ) {
+	}
+	delete ( clipInfoExpat ) ;
+	return umidFound;
+}// XDCAM_MetaHandler::GetClipUmid
+
+// =================================================================================================
+// XDCAM_MetaHandler::IsClipsPlanning
+// ==================================
+bool XDCAM_MetaHandler::IsClipsPlanning ( std::string clipUmid , XMP_StringPtr planPath ) 
+{
+	ExpatAdapter* planniingExpat = 0 ;
+	XMP_StringPtr nameSpace = 0 ;
+	try {
+		readXMLFile( planPath, planniingExpat );
+		if ( planniingExpat != 0 )
+		{	
+			XML_Node & xmlTree = planniingExpat->tree;
+			XML_NodePtr rootElem = 0;
+
+			for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+				if ( xmlTree.content[i]->kind == kElemNode ) {
+					rootElem = xmlTree.content[i];
+				}
+			}
+			if ( rootElem != 0 )
+			{
+				XMP_StringPtr rootLocalName = rootElem->name.c_str() + rootElem->nsPrefixLen;
+				
+				if ( XMP_LitMatch ( rootLocalName, "PlanningMetadata" ) ) 
+				{
+					nameSpace = rootElem->ns.c_str() ;
+					size_t noOfMaterialGroups = rootElem->CountNamedElements ( nameSpace, "MaterialGroup" ) ;
+					while( noOfMaterialGroups-- )
+					{
+						XML_NodePtr mgNode = rootElem->GetNamedElement(  nameSpace, "MaterialGroup" );
+						size_t noOfMaterialElements = mgNode->CountNamedElements ( nameSpace, "Material" ) ;
+						while( noOfMaterialElements-- )
+						{
+							XML_NodePtr materialNode = mgNode->GetNamedElement(  nameSpace, "Material" );
+							XMP_StringPtr materialType = materialNode->GetAttrValue ( "type" );
+							if ( materialType  && XMP_LitMatch( materialType , "clip" ) ) 
+							{
+								XMP_StringPtr umidValue = materialNode->GetAttrValue ( "umidRef" );
+								if ( umidValue != 0 &&  XMP_LitMatch( umidValue , clipUmid.c_str()  ) )
+								{
+									delete ( planniingExpat ) ;
+									return true;
+								}
+							}
+							
+						}
+					}
+				}
+			}
+		}
+		
+	} catch ( ... ) {
+	}
+	delete ( planniingExpat ) ;
+	return false;
+} // XDCAM_MetaHandler::IsClipsPlanning
+
+
+// =================================================================================================
+// XDCAM_MetaHandler::RefersClipUmid
+// ==================================
+bool XDCAM_MetaHandler::RefersClipUmid ( std::string clipUmid , XMP_StringPtr editInfoPath ) 
+{
+	ExpatAdapter* editInfoExpat = 0 ;
+	XMP_StringPtr nameSpace = 0 ;
+	try {
+		readXMLFile( editInfoPath, editInfoExpat );
+		if ( editInfoExpat != 0 )
+		{	
+			XML_Node & xmlTree = editInfoExpat->tree;
+			XML_NodePtr rootElem = 0;
+
+			for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+				if ( xmlTree.content[i]->kind == kElemNode ) {
+					rootElem = xmlTree.content[i];
+				}
+			}
+			if ( rootElem != 0 )
+			{
+				XMP_StringPtr rootLocalName = rootElem->name.c_str() + rootElem->nsPrefixLen;
+				
+				if ( XMP_LitMatch ( rootLocalName, "smil" ) ) 
+				{
+					nameSpace = rootElem->ns.c_str() ;
+					size_t noOfBodyElements = rootElem->CountNamedElements ( nameSpace, "body" ) ;
+					while( noOfBodyElements-- )
+					{
+						XML_NodePtr bodyNode = rootElem->GetNamedElement(  nameSpace, "body" );
+						size_t noOfParElements = bodyNode->CountNamedElements ( nameSpace, "par" ) ;
+						while( noOfParElements-- )
+						{
+							XML_NodePtr parNode = bodyNode->GetNamedElement(  nameSpace, "par" );
+							size_t noOfRefElements = parNode->CountNamedElements ( nameSpace, "ref" ) ;
+							size_t whichElem = 0;
+							while( noOfRefElements-- )
+							{
+								XML_NodePtr refNode = parNode->GetNamedElement(  nameSpace, "ref" ,whichElem++ );
+								XMP_StringPtr umidValue = refNode->GetAttrValue ( "src" );
+								if ( umidValue != 0 && 
+										( XMP_LitMatch( umidValue , clipUmid.c_str() ) || 
+											( strlen(umidValue) > 15 && XMP_LitMatch( &umidValue[15] , clipUmid.c_str() ) ) 
+										)
+									)
+									{
+									delete ( editInfoExpat ) ;
+									return true;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		
+	} catch ( ... ) {
+	}
+	delete ( editInfoExpat ) ;
+	return false;
+} // XDCAM_MetaHandler::RefersClipUmid
+
+inline bool IsDigit( char c )
+{
+	return c >= '0' && c <= '9';
+}
+
+
+// =================================================================================================
+// XDCAM_MetaHandler::GetEditInfoFilesSAM
+// ======================================
+bool XDCAM_MetaHandler::GetEditInfoFilesSAM ( std::vector<std::string> &editInfoList ) 
+{
+	std::string clipUmid;
+	bool found = false;
+
+	if( GetClipUmid ( clipUmid ) )
+	{
+		std::string editFolderPath = this->rootPath + kDirChar + "PROAV" + kDirChar + "EDTR"  + kDirChar ;
+		if ( Host_IO::Exists( editFolderPath.c_str() ) && 
+			Host_IO::GetFileMode( editFolderPath.c_str() ) == Host_IO::kFMode_IsFolder 
+			)
+		{
+			Host_IO::AutoFolder edtrFolder, editFolder;
+			std::string edtrChildName, edlistChild;
+
+			edtrFolder.folder = Host_IO::OpenFolder ( editFolderPath.c_str() );
+			while (  Host_IO::GetNextChild ( edtrFolder.folder, &edtrChildName ) ) {
+				size_t childLen = edtrChildName.size();
+				std::string editListFolderPath = editFolderPath + edtrChildName + kDirChar ;
+				if ( ! ( childLen == 5 &&
+					edtrChildName[0] == 'E' &&
+					IsDigit( edtrChildName[1] ) &&
+					IsDigit( edtrChildName[2] ) &&
+					IsDigit( edtrChildName[3] ) &&
+					IsDigit( edtrChildName[4] ) &&
+					Host_IO::GetFileMode( editListFolderPath.c_str() ) == Host_IO::kFMode_IsFolder
+					) ) continue;
+				
+				editFolder.folder = Host_IO::OpenFolder ( editListFolderPath.c_str() );
+				while (  Host_IO::GetNextChild ( editFolder.folder, &edlistChild ) ) {
+					size_t filenamelen = edlistChild.size();
+					std::string editListFilePath = editListFolderPath + edlistChild ;
+					if ( ! ( filenamelen == 12 &&
+						edlistChild.compare ( filenamelen - 4, 4 , ".SMI" ) == 0 &&
+						edlistChild.compare ( 0, edtrChildName.size(), edtrChildName ) == 0 &&
+						Host_IO::GetFileMode( editListFilePath.c_str() ) == Host_IO::kFMode_IsFile
+					) ) continue;
+					if( RefersClipUmid ( clipUmid , editListFilePath.c_str() )  )
+					{
+						found = true ;
+						editInfoList.push_back( editListFilePath );
+					}
+				}
+			}
+		}
+	}
+	return found;
+} // XDCAM_MetaHandler::GetEditInfoFilesSAM
+
+// =================================================================================================
+// XDCAM_MetaHandler::GetInfoFilesFAM
+// ==================================
+bool XDCAM_MetaHandler::GetInfoFilesFAM ( std::vector<std::string> &editInfoList, std::string pathToFolder) 
+{
+	std::string clipUmid;
+	bool found = false;
+
+	if( GetClipUmid ( clipUmid ) )
+	{
+		if ( Host_IO::Exists( pathToFolder.c_str() ) && 
+			Host_IO::GetFileMode( pathToFolder.c_str() ) == Host_IO::kFMode_IsFolder 
+			)
+		{
+			Host_IO::AutoFolder editFolder;
+			std::string  edlistChild;
+
+			editFolder.folder = Host_IO::OpenFolder ( pathToFolder.c_str() );
+			while (  Host_IO::GetNextChild ( editFolder.folder, &edlistChild ) ) {
+				size_t filenamelen = edlistChild.size();
+				std::string editListFilePath = pathToFolder + edlistChild ;
+				if ( ! ( filenamelen > 7 && 
+					edlistChild.compare ( filenamelen - 4, 4 , ".SMI" ) == 0 &&
+					Host_IO::GetFileMode( editListFilePath.c_str() ) == Host_IO::kFMode_IsFile
+				) ) continue;
+				if( RefersClipUmid ( clipUmid , editListFilePath.c_str() )  )
+				{
+					found = true ;
+					editInfoList.push_back( editListFilePath );
+				}
+			}
+		}
+	}
+	return found;
+} // XDCAM_MetaHandler::GetInfoFilesFAM
+
+// =================================================================================================
+// XDCAM_MetaHandler::GetPlanningFilesFAM
+// ======================================
+bool XDCAM_MetaHandler::GetPlanningFilesFAM ( std::vector<std::string> &planInfoList, std::string pathToFolder) 
+{
+	std::string clipUmid;
+	bool found = false;
+
+	if( GetClipUmid ( clipUmid ) )
+	{
+		if ( Host_IO::Exists( pathToFolder.c_str() ) && 
+			Host_IO::GetFileMode( pathToFolder.c_str() ) == Host_IO::kFMode_IsFolder 
+			)
+		{
+			Host_IO::AutoFolder planFolder;
+			std::string  listChild;
+
+			planFolder.folder = Host_IO::OpenFolder ( pathToFolder.c_str() );
+			while (  Host_IO::GetNextChild ( planFolder.folder, &listChild ) ) {
+				size_t filenamelen = listChild.size();
+				std::string listFilePath = pathToFolder + listChild ;
+				if ( ! ( filenamelen > 4 && 
+					( listChild.compare ( filenamelen - 4, 4 , ".XML" ) == 0 
+					|| 
+					listChild.compare ( filenamelen - 4, 4 , ".xml" ) == 0
+					)
+					&&
+					Host_IO::GetFileMode( listFilePath.c_str() ) == Host_IO::kFMode_IsFile
+				) ) continue;
+				if( IsClipsPlanning ( clipUmid , listFilePath.c_str() )  )
+				{
+					found = true ;
+					planInfoList.push_back( listFilePath );
+				}
+			}
+		}
+	}
+	return found;
+} // XDCAM_MetaHandler::GetPlanningFilesFAM
+
+// =================================================================================================
+// XDCAM_MetaHandler::IsMetadataWritable
+// =======================================
+
+bool XDCAM_MetaHandler::IsMetadataWritable ( )
+{
+	std::vector<std::string> metadataFiles;
+	FillMetadataFiles(&metadataFiles);
+	std::vector<std::string>::iterator itr = metadataFiles.begin();
+	// Check whether sidecar is writable, if not then check if it can be created.
+	bool xmpWritable = Host_IO::Writable( itr->c_str(), true );
+	// Check for legacy metadata file.
+	bool xmlWritable = Host_IO::Writable( (++itr)->c_str(), false );
+	return ( xmlWritable && xmpWritable );
+}// XDCAM_MetaHandler::IsMetadataWritable
+
+// =================================================================================================
+// XDCAM_MetaHandler::FillFAMAssociatedResources
+// =============================================
+void XDCAM_MetaHandler::FillFAMAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	// The possible associated resources:
+    //  .../MyMovie/
+	//  	ALIAS.XML
+	//  	INDEX.XML
+	//  	DISCMETA.XML
+	//  	MEDIAPRO.XML
+	//  	MEDIAPRO.BUP
+	//      CUEUP.XML
+	//      CUEUP.BUP
+	//  	Clip/
+	//  		AAAAA.MXF                   AAAAA is the clipname with clipserial
+	//										XX is a counter which will start from from 01 and can go upto 99 based 
+	//				 					    on number of files present in this folder with same extension and same clipname/editListName/Takename.
+	//  		AAAAAMXX.XML  
+	//  		AAAAAMXX.XMP
+	//  		AAAAARXX.BIM
+	//  	Sub/
+	//  		AAAAASXX.MXF
+	//  	Local/
+	//  		AAAAACXX.SMI
+	//  		AAAAACXX.PPN
+	//  	Edit/                           DDDDD is the editListName
+	//  		DDDDDEXX.SMI
+	//  		DDDDDMXX.XML
+	// 		Take/							TTTTT is the Takename
+	//  		TTTTT.SMI
+	//			TTTTTUNN.SMI			NN is a counter which goes from 01 to N-1 where N is number of media, this
+	//									take is divided into. For Nth, TTTTT.SMI shall be picked up.
+	//  		TTTTTMXX.XML
+	//  	General/
+	//			Sony/
+	//				Planning/				AAAAA is the clipname without clipserial
+	//										YYYYMMDDHHMISS is DateTime
+	//						BBBBB_YYYYMMDDHHMISS.xml 
+	//      UserData/
+	//
+
+	//Add RootPath
+	std::string filePath = rootPath + kDirChar;
+	PackageFormat_Support::AddResourceIfExists( resourceList, filePath );
+
+	// Get the files present directly inside root folder.
+	filePath = rootPath + kDirChar + "ALIAS.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+	filePath = rootPath + kDirChar + "INDEX.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+	filePath = rootPath + kDirChar + "DISCMETA.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+	filePath = rootPath + kDirChar + "MEDIAPRO.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	filePath = rootPath + kDirChar + "MEDIAPRO.BUP";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+	filePath = rootPath + kDirChar + "CUEUP.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	filePath = rootPath + kDirChar + "CUEUP.BUP";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	
+	// Add the UserData folder which is used to identify the format in any way
+	filePath = rootPath + kDirChar + "UserData" + kDirChar;
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	
+	XMP_VarString clipPath = rootPath + kDirChar + "Clip" + kDirChar ;
+
+	size_t oldCount = resourceList->size();
+	// Get the files present inside clip folder.
+	XMP_VarString regExp;
+	XMP_StringVector regExpVec;
+	
+	regExp = "^" + clipName + ".MXF$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "M\\d\\d.XML$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "R\\d\\d.BIM$";
+	regExpVec.push_back ( regExp );
+	IOUtils::GetMatchingChildren ( *resourceList, clipPath, regExpVec, false, true, true ); 
+	PackageFormat_Support::AddResourceIfExists(resourceList, this->sidecarPath);
+	if ( resourceList->size() <= oldCount )
+	{
+		PackageFormat_Support::AddResourceIfExists(resourceList, clipPath);
+	}
+
+	//Get the files Under Sub folder
+	clipPath = rootPath + kDirChar + "Sub" + kDirChar ;
+	regExpVec.clear();
+	regExp = "^" + clipName + "S\\d\\d.MXF$";
+	regExpVec.push_back ( regExp );
+	oldCount = resourceList->size();
+	IOUtils::GetMatchingChildren ( *resourceList, clipPath, regExpVec, false, true, true );
+	// Add Sub folder if no file inside this, was added.
+	if ( resourceList->size() <= oldCount )
+	{
+		PackageFormat_Support::AddResourceIfExists(resourceList, clipPath);
+	}
+
+	//Get the files Under Local folder
+	clipPath = rootPath + kDirChar + "Local" + kDirChar ;
+	regExpVec.clear();
+	regExp = "^" + clipName + "C\\d\\d.SMI$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "I\\d\\d.PPN$";
+	regExpVec.push_back ( regExp );
+	oldCount = resourceList->size();
+	IOUtils::GetMatchingChildren ( *resourceList, clipPath, regExpVec, false, true, true );
+	
+	//Add the Edit lists associated to this clip
+	XMP_StringVector editInfoList;
+	bool atLeastOneFileAdded = false;
+	clipPath = rootPath + kDirChar + "Edit" + kDirChar ;
+	if ( GetInfoFilesFAM ( editInfoList , clipPath ) )
+	{
+		size_t noOfEditInfoFiles = editInfoList.size() ;
+		for( size_t count = 0; count < noOfEditInfoFiles; count++ )
+		{
+			atLeastOneFileAdded = PackageFormat_Support::AddResourceIfExists(resourceList, editInfoList[count]) ? true : atLeastOneFileAdded;
+			std::string editNRTFile = editInfoList[count] ;
+			size_t filenamelen = editInfoList[count].length() ;
+			editNRTFile[ filenamelen - 7 ] = 'M';
+			editNRTFile[ filenamelen - 3 ] = 'X';
+			editNRTFile[ filenamelen - 2 ] = 'M';
+			editNRTFile[ filenamelen - 1 ] = 'L';
+			atLeastOneFileAdded = PackageFormat_Support::AddResourceIfExists(resourceList, editNRTFile ) ? true : atLeastOneFileAdded;
+		}
+	}
+	// Add Edit folder if no file inside this, was added.
+	if ( !atLeastOneFileAdded )
+	{
+		PackageFormat_Support::AddResourceIfExists(resourceList, clipPath);
+	}
+
+	atLeastOneFileAdded = false;
+
+	//Add the Takes associated to this clip
+	XMP_StringVector takeList;
+	clipPath = rootPath + kDirChar + "Take" + kDirChar ;
+	if( GetInfoFilesFAM ( takeList  , clipPath ) )
+	{
+		size_t noOfTakes = takeList.size() ;
+		for( size_t count = 0; count < noOfTakes; count++ )
+		{
+			atLeastOneFileAdded = PackageFormat_Support::AddResourceIfExists(resourceList, takeList[count]) ? true : atLeastOneFileAdded;
+			XMP_VarString takeNRTFile = takeList[count] ;
+			size_t filenamelen = takeList[count].length() ;
+			if ( takeNRTFile[ filenamelen - 7 ] == 'U' 
+				&& IsDigit( takeNRTFile[ filenamelen - 6 ] ) 
+				&& IsDigit( takeNRTFile[ filenamelen - 5 ] ) )
+			{
+				takeNRTFile.erase( takeNRTFile.begin() + filenamelen - 7, takeNRTFile.end() ) ;
+			}
+			else
+			{
+				takeNRTFile.erase( takeNRTFile.begin() + filenamelen - 4, takeNRTFile.end() ) ;
+			}
+
+			XMP_VarString fileName;
+			size_t pos = takeNRTFile.find_last_of ( kDirChar );
+			fileName = takeNRTFile.substr ( pos + 1 );
+			XMP_VarString regExp = "^" + fileName + "M\\d\\d.XML$";
+			oldCount = resourceList->size();
+			IOUtils::GetMatchingChildren ( *resourceList, clipPath, regExp, false, true, true );
+			atLeastOneFileAdded = resourceList->size() > oldCount;
+		}
+	}
+	// Add Take folder if no file inside this, was added.
+	if(!atLeastOneFileAdded)
+	{
+		filePath = rootPath + kDirChar + "Take" + kDirChar;
+		PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	}
+
+	//Add the Planning Metadata Files associated to this clip
+	XMP_StringVector planList;
+	clipPath = rootPath + kDirChar + "General" + kDirChar + "Sony" + kDirChar+ "Planning" + kDirChar;
+	if( GetPlanningFilesFAM ( planList  , clipPath ) )
+	{
+		size_t noOfPlans = planList.size() ;
+		for( size_t count = 0; count < noOfPlans; count++ )
+		{
+			resourceList->push_back( planList[count] );
+		}
+	}
+} // XDCAM_MetaHandler::FillFAMAssociatedResources
+
+// =================================================================================================
+// XDCAM_MetaHandler::FillSAMAssociatedResources
+// =============================================
+void XDCAM_MetaHandler::FillSAMAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	// The possible associated resources:
+    //  .../MyMovie/
+	//	    PROAV/
+	//  	    INDEX.XML
+	//  	    INDEX.BUP
+	//  	    DISCMETA.XML
+	//  	    DISCINFO.XML
+	//  	    DISCINFO.BUP
+	//		    CLPR/
+	//			    CXXXX/			 XXXX is ClipSerial and NN is a counter which will start from from 01 and can go upto 99 based 
+	//				 					on number of files present in this folder with same extension.
+	//				    CXXXXCNN.SMI
+	//				    CXXXXVNN.MXF
+	//				    CXXXXANN.MXF
+	//				    CXXXXRNN.BIM
+	//				    CXXXXINN.PPN
+	//				    CXXXXMNN.XML
+	//				    CXXXXSNN.MXF
+	//		    EDTR/
+	//			    EXXXX:
+	//				    EXXXXENN.SMI	
+	//				    EXXXXMNN.XML		
+	//					
+	std::string proavPath = rootPath + kDirChar + "PROAV" + kDirChar;
+	std::string filePath;
+	//Add RootPath
+	filePath = rootPath + kDirChar;
+	PackageFormat_Support::AddResourceIfExists( resourceList, filePath );
+
+	// Get the files present directly inside PROAV folder.
+	filePath = proavPath + "INDEX.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	filePath = proavPath + "INDEX.BUP";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+	filePath = proavPath + "DISCINFO.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+	filePath = proavPath + "DISCINFO.BUP";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+	filePath = proavPath + "DISCMETA.XML";
+	PackageFormat_Support::AddResourceIfExists(resourceList, filePath);
+
+	XMP_VarString clipPath = proavPath + "CLPR" + kDirChar + clipName + kDirChar;
+	XMP_VarString regExp;
+	XMP_StringVector regExpVec;
+
+	regExp = "^" + clipName + "C\\d\\d.SMI$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "M\\d\\d.XML$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "V\\d\\d.MXF$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "A\\d\\d.MXF$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "R\\d\\d.BIM$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "I\\d\\d.PPN$";
+	regExpVec.push_back ( regExp );
+	regExp = "^" + clipName + "S\\d\\d.MXF$";
+	regExpVec.push_back ( regExp );
+	IOUtils::GetMatchingChildren ( *resourceList, clipPath, regExpVec, false, true, true );
+	PackageFormat_Support::AddResourceIfExists(resourceList, this->sidecarPath);
+	//Add the Edit lists that refer this clip
+	std::vector<std::string> editInfoList;
+	if( GetEditInfoFilesSAM ( editInfoList ) )
+	{
+		size_t noOfEditInfoFiles = editInfoList.size() ;
+		for( size_t count = 0; count < noOfEditInfoFiles; count++ )
+		{
+			PackageFormat_Support::AddResourceIfExists(resourceList, editInfoList[count]);
+			std::string editNRTFile = editInfoList[count].c_str() ;
+			size_t filenamelen = editInfoList[count].length() ;
+			editNRTFile[ filenamelen - 7 ] = 'M';
+			editNRTFile[ filenamelen - 3 ] = 'X';
+			editNRTFile[ filenamelen - 2 ] = 'M';
+			editNRTFile[ filenamelen - 1 ] = 'L';
+			PackageFormat_Support::AddResourceIfExists(resourceList, editNRTFile );
+		}
+	}
+}// XDCAM_MetaHandler::FillSAMAssociatedResources
+
+// =================================================================================================
+// XDCAM_MetaHandler::FillAssociatedResources
+// ======================================
+void XDCAM_MetaHandler::FillAssociatedResources ( std::vector<std::string> * resourceList )
+{
+	if( this->isFAM )
+		 FillFAMAssociatedResources ( resourceList );
+	else
+		 FillSAMAssociatedResources ( resourceList );
+}
+// =================================================================================================
+// XDCAM_MetaHandler::FillMetadataFiles
+// ====================================
+void XDCAM_MetaHandler::FillMetadataFiles ( std::vector<std::string> * metadataFiles )
+{
+	std::string noExtPath, filePath;
+
+	if(this->isFAM) {
+		noExtPath = rootPath + kDirChar + "Clip" + kDirChar + clipName;
+	} else {
+		noExtPath = rootPath + kDirChar + "PROAV" + kDirChar + "CLPR" +
+						   kDirChar + clipName + kDirChar + clipName;
+	}
+
+	metadataFiles->push_back ( this->sidecarPath );
+	filePath = noExtPath + "M01.XML";
+	metadataFiles->push_back ( filePath );
+
+}	// XDCAM_MetaHandler::FillMetadataFiles
+
+// =================================================================================================
+// XDCAM_MetaHandler::CacheFileData
+// ================================
+
+void XDCAM_MetaHandler::CacheFileData()
+{
+	XMP_Assert ( ! this->containsXMP );
+
+	if ( this->parent->UsesClientIO() ) {
+		XMP_Throw ( "XDCAM cannot be used with client-managed I/O", kXMPErr_InternalFailure );
+	}
+
+	// See if the clip's .XMP file exists.
+
+	if ( ! Host_IO::Exists ( this->sidecarPath.c_str() ) ) return;	// No XMP.
+
+	// Read the entire .XMP file. We know the XMP exists, New_XMPFiles_IO is supposed to return 0
+	// only if the file does not exist.
+
+	bool readOnly = XMP_OptionIsClear ( this->parent->openFlags, kXMPFiles_OpenForUpdate );
+
+	XMP_Assert ( this->parent->ioRef == 0 );
+	XMPFiles_IO* xmpFile =  XMPFiles_IO::New_XMPFiles_IO ( this->sidecarPath.c_str(), readOnly );
+	if ( xmpFile == 0 ) XMP_Throw ( "XDCAM XMP file open failure", kXMPErr_InternalFailure );
+	this->parent->ioRef = xmpFile;
+
+	XMP_Int64 xmpLen = xmpFile->Length();
+	if ( xmpLen > 100*1024*1024 ) {
+		XMP_Throw ( "XDCAM XMP is outrageously large", kXMPErr_InternalFailure );	// Sanity check.
+	}
+
+	this->xmpPacket.erase();
+	this->xmpPacket.append ( (size_t)xmpLen, ' ' );
+
+	XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen );
+
+	this->packetInfo.offset = 0;
+	this->packetInfo.length = (XMP_Int32)xmpLen;
+	FillPacketInfo ( this->xmpPacket, &this->packetInfo );
+
+	this->containsXMP = true;
+
+}	// XDCAM_MetaHandler::CacheFileData
+
+// =================================================================================================
+// XDCAM_MetaHandler::GetMediaProMetadata
+// ======================================
+
+bool XDCAM_MetaHandler::GetMediaProMetadata ( SXMPMeta * xmpObjPtr,
+											  const std::string& clipUMID,
+											  bool digestFound )
+{
+	if (!this->isFAM) return false;
+
+	// Build a directory string to the MEDIAPRO file.
+
+	std::string mediaproPath;
+	MakeMediaproPath ( &mediaproPath );
+	return XDCAM_Support::GetMediaProLegacyMetadata ( xmpObjPtr, clipUMID, mediaproPath, digestFound );
+
+}
+
+// =================================================================================================
+// XDCAM_MetaHandler::ProcessXMP
+// =============================
+
+void XDCAM_MetaHandler::ProcessXMP()
+{
+
+	// Some versions of gcc can't tolerate goto's across declarations.
+	// *** Better yet, avoid this cruft with self-cleaning objects.
+	#define CleanupAndExit	\
+		{																								\
+			bool openForUpdate = XMP_OptionIsSet ( this->parent->openFlags, kXMPFiles_OpenForUpdate );	\
+			if ( ! openForUpdate ) this->CleanupLegacyXML();											\
+			return;																						\
+		}
+
+	if ( this->processedXMP ) return;
+	this->processedXMP = true;	// Make sure only called once.
+
+	if ( this->containsXMP ) {
+		this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	}
+
+	// NonRealTimeMeta -> XMP by schema
+	std::string xmlPath, umid;
+	this->MakeClipFilePath ( &xmlPath, "M01.XML" );
+
+	readXMLFile( xmlPath.c_str(),this->expat );
+	if ( this->expat == 0 ) return;
+
+	// The root element should be NonRealTimeMeta in some namespace. Take whatever this file uses.
+
+	XML_Node & xmlTree = this->expat->tree;
+	XML_NodePtr rootElem = 0;
+
+	for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+		if ( xmlTree.content[i]->kind == kElemNode ) {
+			rootElem = xmlTree.content[i];
+		}
+	}
+
+	if ( rootElem == 0 ) CleanupAndExit
+	XMP_StringPtr rootLocalName = rootElem->name.c_str() + rootElem->nsPrefixLen;
+	if ( ! XMP_LitMatch ( rootLocalName, "NonRealTimeMeta" ) ) CleanupAndExit
+
+	this->legacyNS = rootElem->ns;
+
+	// Check the legacy digest.
+
+	XMP_StringPtr legacyNS = this->legacyNS.c_str();
+
+	this->clipMetadata = rootElem;	// ! Save the NonRealTimeMeta pointer for other use.
+
+	std::string oldDigest, newDigest;
+	bool digestFound = this->xmpObj.GetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "XDCAM", &oldDigest, 0 );
+	if ( digestFound ) {
+		this->MakeLegacyDigest ( &newDigest );
+		if ( oldDigest == newDigest ) CleanupAndExit
+	}
+
+	// If we get here we need find and import the actual legacy elements using the current namespace.
+	// Either there is no old digest in the XMP, or the digests differ. In the former case keep any
+	// existing XMP, in the latter case take new legacy values.
+
+	this->containsXMP = XDCAM_Support::GetLegacyMetadata ( &this->xmpObj, rootElem, legacyNS, digestFound, umid );
+	this->containsXMP |= GetMediaProMetadata ( &this->xmpObj, umid, digestFound );
+
+	CleanupAndExit
+	#undef CleanupAndExit
+
+}	// XDCAM_MetaHandler::ProcessXMP
+
+// =================================================================================================
+// XDCAM_MetaHandler::UpdateFile
+// =============================
+//
+// Note that UpdateFile is only called from XMPFiles::CloseFile, so it is OK to close the file here.
+
+void XDCAM_MetaHandler::UpdateFile ( bool doSafeUpdate )
+{
+	if ( ! this->needsUpdate ) return;
+	this->needsUpdate = false;	// Make sure only called once.
+
+	XMP_Assert ( this->parent->UsesLocalIO() );
+
+	// Update the internal legacy XML tree if we have one, and set the digest in the XMP.
+
+	bool updateLegacyXML = false;
+
+	if ( this->clipMetadata != 0 ) {
+		updateLegacyXML = XDCAM_Support::SetLegacyMetadata ( this->clipMetadata, &this->xmpObj, this->legacyNS.c_str());
+	}
+
+	std::string newDigest;
+	this->MakeLegacyDigest ( &newDigest );
+	this->xmpObj.SetStructField ( kXMP_NS_XMP, "NativeDigests", kXMP_NS_XMP, "XDCAM", newDigest.c_str(), kXMP_DeleteExisting );
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, this->GetSerializeOptions() );
+
+	// -----------------------------------------------------------------------
+	// Update the XMP file first, don't let legacy XML failures block the XMP.
+
+	
+
+	bool haveXMP = Host_IO::Exists ( this->sidecarPath.c_str() );
+	if ( ! haveXMP ) {
+		XMP_Assert ( this->parent->ioRef == 0 );
+		Host_IO::Create ( this->sidecarPath.c_str() );
+		this->parent->ioRef = XMPFiles_IO::New_XMPFiles_IO ( this->sidecarPath.c_str(), Host_IO::openReadWrite );
+		if ( this->parent->ioRef == 0 ) XMP_Throw ( "Failure opening XDCAM XMP file", kXMPErr_ExternalFailure );
+	}
+
+	XMP_IO* xmpFile = this->parent->ioRef;
+	XMP_Assert ( xmpFile != 0 );
+	XIO::ReplaceTextFile ( xmpFile, this->xmpPacket, (haveXMP & doSafeUpdate) );
+
+	// --------------------------------------------
+	// Now update the legacy XML file if necessary.
+
+	if ( updateLegacyXML ) {
+
+		std::string legacyXML, xmlPath;
+		this->expat->tree.Serialize ( &legacyXML );
+		this->MakeClipFilePath ( &xmlPath, "M01.XML" );
+
+		bool haveXML = Host_IO::Exists ( xmlPath.c_str() );
+		if ( ! haveXML ) Host_IO::Create ( xmlPath.c_str() );
+
+		Host_IO::FileRef hostRef = Host_IO::Open ( xmlPath.c_str(), Host_IO::openReadWrite );
+		if ( hostRef == Host_IO::noFileRef ) XMP_Throw ( "Failure opening XDCAM XML file", kXMPErr_ExternalFailure );
+		XMPFiles_IO origXML ( hostRef, xmlPath.c_str(), Host_IO::openReadWrite );
+		XIO::ReplaceTextFile ( &origXML, legacyXML, (haveXML & doSafeUpdate) );
+		origXML.Close();
+
+	}
+
+}	// XDCAM_MetaHandler::UpdateFile
+
+// =================================================================================================
+// XDCAM_MetaHandler::WriteTempFile
+// ================================
+
+void XDCAM_MetaHandler::WriteTempFile ( XMP_IO* tempRef )
+{
+
+	// ! WriteTempFile is not supposed to be called for handlers that own the file.
+	XMP_Throw ( "XDCAM_MetaHandler::WriteTempFile should not be called", kXMPErr_InternalFailure );
+
+}	// XDCAM_MetaHandler::WriteTempFile
+
+// =================================================================================================
diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp
new file mode 100644
index 0000000..f03ada8
--- /dev/null
+++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp
@@ -0,0 +1,102 @@
+#ifndef __XDCAM_Handler_hpp__
+#define __XDCAM_Handler_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "source/ExpatAdapter.hpp"
+
+// =================================================================================================
+/// \file XDCAM_Handler.hpp
+/// \brief Folder format handler for XDCAM.
+///
+/// This header ...
+///
+// =================================================================================================
+
+extern XMPFileHandler * XDCAM_MetaHandlerCTor ( XMPFiles * parent );
+
+extern bool XDCAM_CheckFormat ( XMP_FileFormat format,
+								const std::string & rootPath,
+								const std::string & gpName,
+								const std::string & parentName,
+								const std::string & leafName,
+								XMPFiles * parent );
+
+static const XMP_OptionBits kXDCAM_HandlerFlags = (kXMPFiles_CanInjectXMP |
+												   kXMPFiles_CanExpand |
+												   kXMPFiles_CanRewrite |
+												   kXMPFiles_PrefersInPlace |
+												   kXMPFiles_CanReconcile |
+												   kXMPFiles_AllowsOnlyXMP |
+												   kXMPFiles_ReturnsRawPacket |
+												   kXMPFiles_HandlerOwnsFile |
+												   kXMPFiles_AllowsSafeUpdate |
+												   kXMPFiles_FolderBasedFormat);
+
+class XDCAM_MetaHandler : public XMPFileHandler
+{
+public:
+
+	bool GetFileModDate ( XMP_DateTime * modDate );
+
+	void FillMetadataFiles ( std::vector<std::string> * metadataFiles );
+	void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	bool IsMetadataWritable ( ) ;
+
+	void CacheFileData();
+	void ProcessXMP();
+
+	void UpdateFile ( bool doSafeUpdate );
+    void WriteTempFile ( XMP_IO* tempRef );
+
+	XMP_OptionBits GetSerializeOptions()	// *** These should be standard for standalone XMP files.
+		{ return (kXMP_UseCompactFormat | kXMP_OmitPacketWrapper); };
+
+	XDCAM_MetaHandler ( XMPFiles * _parent );
+	virtual ~XDCAM_MetaHandler();
+
+private:
+
+	XDCAM_MetaHandler() : isFAM(false), expat(0), clipMetadata(0) {};	// Hidden on purpose.
+
+	bool MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false );
+	bool MakeMediaproPath ( std::string * path, bool checkFile = false );
+	void MakeLegacyDigest ( std::string * digestStr );
+	void CleanupLegacyXML();
+	void SetSidecarPath();
+	
+	void readXMLFile( XMP_StringPtr filePath,ExpatAdapter* &expat );
+    bool GetClipUmid ( std::string &clipUmid ) ;
+	bool IsClipsPlanning ( std::string clipUmid , XMP_StringPtr planPath ) ;
+	bool RefersClipUmid ( std::string clipUmid , XMP_StringPtr editInfoPath )  ;
+	bool GetInfoFilesFAM ( std::vector<std::string> &InfoList, std::string pathToFolder) ;
+	bool GetPlanningFilesFAM ( std::vector<std::string> &planInfoList, std::string pathToFolder) ;
+	bool GetEditInfoFilesSAM ( std::vector<std::string> &editInfoList ) ;
+	void FillFAMAssociatedResources ( std::vector<std::string> * resourceList );
+	void FillSAMAssociatedResources ( std::vector<std::string> * resourceList );
+
+	bool GetMediaProMetadata ( SXMPMeta * xmpObjPtr, const std::string& clipUMID, bool digestFound );	
+
+	std::string rootPath, clipName, xdcNS, legacyNS, sidecarPath;
+
+	bool isFAM;
+
+	ExpatAdapter * expat;
+	XML_Node * clipMetadata;	// ! Don't delete, points into the Expat tree.
+
+};	// XDCAM_MetaHandler
+
+// =================================================================================================
+
+#endif /* __XDCAM_Handler_hpp__ */
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp
new file mode 100644
index 0000000..a97c2b0
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp
@@ -0,0 +1,302 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/Chunk.h"
+#include "source/XMP_LibUtils.hpp"
+#include "source/XIO.hpp"
+
+#include <algorithm>
+
+using namespace IFF_RIFF;
+
+//
+// Static init
+//
+const BigEndian& AIFFBehavior::mEndian = BigEndian::getInstance();
+
+//-----------------------------------------------------------------------------
+// 
+// AIFFBehavior::getRealSize(...)
+// 
+// Purpose: Validate the passed in size value, identify the valid size if the 
+//			passed in isn't valid and return the valid size.
+//			Throw an exception if the passed in size isn't valid and there's 
+//			no way to identify a valid size.
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 AIFFBehavior::getRealSize( const XMP_Uns64 size, const ChunkIdentifier& id, IChunkContainer& tree, XMP_IO* stream )
+{
+	if( (size & 0x80000000) > 0 )
+	{
+		XMP_Throw( "Unknown size value", kXMPErr_BadFileFormat );
+	}
+
+	return size;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// AIFFBehavior::isValidTopLevelChunk(...)
+// 
+// Purpose: Return true if the passed identifier is valid for top-level chunks 
+//			of a certain format.
+// 
+//-----------------------------------------------------------------------------
+
+bool AIFFBehavior::isValidTopLevelChunk( const ChunkIdentifier& id, XMP_Uns32 chunkNo )
+{
+	return (chunkNo == 0) && (id.id == kChunk_FORM) && ((id.type == kType_AIFF) || (id.type == kType_AIFC));
+}
+
+//-----------------------------------------------------------------------------
+// 
+// AIFFBehavior::getMaxChunkSize(...)
+// 
+// Purpose: Return the maximum size of a single chunk, i.e. the maximum size 
+//			of a top-level chunk.
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 AIFFBehavior::getMaxChunkSize() const
+{
+	return 0x80000000LL;	// 2 GByte
+}
+
+//-----------------------------------------------------------------------------
+// 
+// AIFFBehavior::fixHierarchy(...)
+// 
+// Purpose: Fix the hierarchy of chunks depending ones based on size changes of 
+//			one or more chunks and second based on format specific rules.
+//			Throw an exception if the hierarchy can't be fixed.
+// 
+//-----------------------------------------------------------------------------
+
+void AIFFBehavior::fixHierarchy( IChunkContainer& tree )
+{
+	XMP_Validate( tree.numChildren() == 1, "AIFF files should only have one top level chunk (FORM)", kXMPErr_BadFileFormat);
+	Chunk* formChunk = tree.getChildAt(0);
+
+	XMP_Validate( (formChunk->getType() == kType_AIFF) || (formChunk->getType() == kType_AIFC), "Invalid type for AIFF/AIFC top level chunk (FORM)", kXMPErr_BadFileFormat);
+
+	if( formChunk->hasChanged() )
+	{
+		//
+		// none of the modified chunks should be smaller than 12Byte
+		//
+		for( XMP_Uns32 i=0; i<formChunk->numChildren(); i++ )
+		{
+			Chunk* chunk = formChunk->getChildAt(i);
+
+			if( chunk->hasChanged() && chunk->getSize() != chunk->getOriginalSize() )
+			{
+				XMP_Validate( chunk->getSize() >= Chunk::TYPE_SIZE, "Modified chunk smaller than 12bytes", kXMPErr_InternalFailure );
+			}
+		}
+
+		//
+		// move new added chunks to temporary container
+		//
+		Chunk* tmpContainer = Chunk::createChunk( mEndian );
+		this->moveChunks( *formChunk, *tmpContainer, formChunk->numChildren() - mChunksAdded );
+
+		//
+		// for all children chunks until the last child of the initial list is reached
+		// try to arrange the chunks at the current location using exisiting free space
+		// or FREE chunks around, otherwise move the chunk to the end
+		//
+		this->arrangeChunksInPlace( *formChunk, *tmpContainer );
+
+		//
+		// for all chunks that were moved to the end try to find a FREE chunk for them
+		//
+		this->arrangeChunksInTree( *tmpContainer, *formChunk );
+
+		//
+		// append all remaining new added chunks to the end of the tree
+		//
+		this->moveChunks( *tmpContainer, *formChunk, 0 );
+		delete tmpContainer;
+
+		//
+		// check for FREE chunks at the end
+		//
+		Chunk* endFREE = this->mergeFreeChunks( *formChunk, formChunk->numChildren() - 1 );
+
+		if( endFREE != NULL )
+		{
+			formChunk->removeChildAt( formChunk->numChildren() - 1 );
+			delete endFREE;
+		}
+
+		//
+		// Fix the offset values of all chunks. Throw an exception in the case that
+		// the offset of a non-modified chunk needs to be reset.
+		//
+		XMP_Validate( formChunk->getOffset() == 0, "Invalid offset for AIFF/AIFC top level chunk (FORM)", kXMPErr_InternalFailure );
+
+		this->validateOffsets( tree );
+	}
+}
+
+void AIFFBehavior::insertChunk( IChunkContainer& tree, Chunk& chunk )
+{
+	XMP_Validate( tree.numChildren() == 1, "AIFF files should only have one top level chunk (FORM)", kXMPErr_BadFileFormat);
+	Chunk* formChunk = tree.getChildAt(0);
+
+	XMP_Validate( (formChunk->getType() == kType_AIFF) || (formChunk->getType() == kType_AIFC), "Invalid type for AIFF/AIFC top level chunk (FORM)", kXMPErr_BadFileFormat);
+
+	// add new chunk to the end of the AIFF:FORM
+	formChunk->appendChild(&chunk);
+
+	mChunksAdded++;
+}
+
+bool AIFFBehavior::removeChunk( IChunkContainer& tree, Chunk& chunk )
+{
+	XMP_Validate( chunk.getID() != kChunk_FORM, "Can't remove FORM chunk!", kXMPErr_InternalFailure );
+	XMP_Validate( chunk.getChunkMode() != CHUNK_UNKNOWN, "Cant' remove UNKNOWN Chunk", kXMPErr_InternalFailure );
+	
+	XMP_Validate( tree.numChildren() == 1, "AIFF files should only have one top level chunk (FORM)", kXMPErr_BadFileFormat);	
+
+	Chunk* formChunk = tree.getChildAt(0);
+
+	XMP_Validate( (formChunk->getType() == kType_AIFF) || (formChunk->getType() == kType_AIFC), "Invalid type for AIFF/AIFC top level chunk (FORM)", kXMPErr_BadFileFormat);
+
+	XMP_Uns32 i = std::find( formChunk->firstChild(), formChunk->lastChild(), &chunk ) - formChunk->firstChild();
+
+	XMP_Validate( i < formChunk->numChildren(), "Invalid chunk in tree", kXMPErr_InternalFailure );
+
+	//
+	// adjust new chunks counter
+	//
+	if( i > formChunk->numChildren() - mChunksAdded - 1 )
+	{
+		mChunksAdded--;
+	}
+
+	if( i < formChunk->numChildren()-1 )
+	{
+		//
+		// fill gap with free chunk
+		//
+		Chunk* free = this->createFREE( chunk.getPadSize( true ) );
+		formChunk->replaceChildAt( i, free );
+		free->setAsNew();
+
+		//
+		// merge JUNK chunks
+		//
+		this->mergeFreeChunks( *formChunk, i );
+	}
+	else
+	{
+		//
+		// remove chunk from tree
+		//
+		formChunk->removeChildAt( i );
+	}
+
+	return true;
+}
+
+XMP_Bool AIFFBehavior::isFREEChunk( const Chunk& chunk ) const
+{
+	XMP_Bool ret = ( chunk.getID() == kChunk_APPL && chunk.getType() == kType_FREE );
+
+	//
+	// if the signature is not 'APPL':'FREE' the it could be an annotation chunk
+	// (ID: 'ANNO') which data area is smaller than 4bytes and the data is zero
+	//
+	if( !ret && chunk.getID() == kChunk_ANNO && chunk.getSize() < Chunk::TYPE_SIZE )
+	{
+		ret = chunk.getSize() == 0;
+		
+		if( !ret )
+		{
+			const XMP_Uns8* buffer;
+			chunk.getData( &buffer );
+
+			XMP_Uns8* data = new XMP_Uns8[static_cast<size_t>( chunk.getSize() )];
+			memset( data, 0, static_cast<size_t>( chunk.getSize() ) );
+
+			ret = ( memcmp( data, buffer, static_cast<size_t>( chunk.getSize() ) ) == 0 );
+
+			delete[] data;
+		}
+	}
+
+	return ret;
+}
+
+Chunk* AIFFBehavior::createFREE( XMP_Uns64 chunkSize )
+{
+	XMP_Int64 alloc = chunkSize - Chunk::HEADER_SIZE;
+
+	Chunk* chunk = NULL;
+	XMP_Uns8* data = NULL;
+
+	if( alloc > 0 )
+	{
+		data = new XMP_Uns8[static_cast<size_t>( alloc )];
+		memset( data, 0, static_cast<size_t>( alloc ) );
+	}
+
+	if( alloc < Chunk::TYPE_SIZE )
+	{
+		//
+		// if the required size is smaller than the minimum size of a 'APPL':'FREE' chunk
+		// then create an annotation chunk 'ANNO' and zero the data
+		//
+		if( alloc > 0 )
+		{
+			chunk = Chunk::createUnknownChunk( mEndian, kChunk_ANNO, 0, alloc );
+			chunk->setData( data, alloc );
+		}
+		else
+		{
+			chunk = Chunk::createHeaderChunk( mEndian, kChunk_ANNO );
+		}
+	}
+	else
+	{
+		//
+		// create a 'APPL':'FREE' chunk
+		//
+		alloc -= Chunk::TYPE_SIZE;
+
+		if( alloc > 0 )
+		{
+			chunk = Chunk::createUnknownChunk( mEndian, kChunk_APPL, kType_FREE, alloc+Chunk::TYPE_SIZE );
+			chunk->setData( data, alloc, true );
+		}
+		else
+		{
+			chunk = Chunk::createHeaderChunk( mEndian, kChunk_APPL, kType_FREE );
+		}
+	}
+
+	delete[] data;
+
+	// force set dirty flag
+	chunk->setChanged();
+
+	return chunk;
+}
+
+XMP_Uns64 AIFFBehavior::getMinFREESize() const
+{
+	// avoid creation of chunks with size==0
+	return static_cast<XMP_Uns64>( Chunk::HEADER_SIZE ) + 2;
+}
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h
new file mode 100644
index 0000000..deadac3
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h
@@ -0,0 +1,152 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _AIFFBEHAVIOR_h_
+#define _AIFFBEHAVIOR_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "source/Endian.h"
+
+namespace IFF_RIFF
+{
+
+/**
+	AIFF behavior class.
+
+	Implements the IChunkBehavior interface
+*/
+
+
+class AIFFBehavior : public IChunkBehavior
+{
+public:
+	/**
+		ctor/dtor
+	*/
+					 AIFFBehavior() : mChunksAdded(0) {}
+					~AIFFBehavior() {}
+
+	/**
+		Validate the passed in size value, identify the valid size if the passed in isn't valid
+		and return the valid size.
+		throw an exception if the passed in size isn't valid and there's no way to identify a
+		valid size.
+
+		@param	size	Size value
+		@param	id		Identifier of chunk
+		@param	tree	Chunk tree
+		@param	stream	Stream handle
+
+		@return		Valid size value.
+	*/
+	XMP_Uns64		getRealSize( const XMP_Uns64 size, const ChunkIdentifier& id, IChunkContainer& tree, XMP_IO* stream );
+
+	/**
+		Return the maximum size of a single chunk, i.e. the maximum size of a top-level chunk.
+
+		@return		Maximum size
+	*/
+	XMP_Uns64		getMaxChunkSize() const;
+
+	/**
+		Return true if the passed identifier is valid for top-level chunks of a certain format.
+
+		@param	id		Chunk identifier
+		@param	chunkNo	order number of top-level chunk
+		@return			true, if passed id is a valid top-level chunk
+	*/
+	bool			isValidTopLevelChunk( const ChunkIdentifier& id, XMP_Uns32 chunkNo );
+
+	/**
+		Fix the hierarchy of chunks depending ones based on size changes of one or more chunks
+		and second based on format specific rules.
+		Throw an exception if the hierarchy can't be fixed.
+
+		@param	tree		Vector of root chunks.
+	*/
+	void			fixHierarchy( IChunkContainer& tree );
+
+	/**
+		Insert a new chunk into the hierarchy of chunks. The behavior needs to decide the position
+		of the new chunk and has to do the insertion.
+
+		@param	tree	Chunk tree
+		@param	chunk	New chunk
+	*/
+	void			insertChunk( IChunkContainer& tree, Chunk& chunk )	;
+
+	/**
+		Remove the chunk described by the passed ChunkPath.
+
+		@param	tree	Chunk tree
+		@param	path	Path to the chunk that needs to be removed
+
+		@return			true if the chunk was removed and need to be deleted
+	*/
+	bool			removeChunk( IChunkContainer& tree, Chunk& chunk )	;
+
+private:
+
+
+	/**
+		Create a FREE chunk.
+		If the chunkSize is smaller than the header+type - size then create an annotation chunk.
+		If the passed size is odd, then add a pad byte.
+
+		@param chunkSize	Total size including header
+		@return				New FREE chunk
+	*/
+	Chunk*			createFREE( XMP_Uns64 chunkSize );
+
+	/**
+		Check if the passed chunk is a FREE chunk.
+		(Could be also a small annotation chunk with zero bytes in its data)
+
+		@param	chunk	A chunk
+
+		@return			true if the passed chunk is a FREE chunk
+	*/
+	XMP_Bool		isFREEChunk( const Chunk& chunk ) const;
+
+	/**
+		Retrieve the free space at the passed position in the child list of the parent tree. 
+		If there's a FREE chunk then return it.
+
+		@param outFreeBytes		On return it takes the number of free bytes
+		@param tree				Parent tree
+		@param index			Position in the child list of the parent tree
+
+		@return					FREE chunk if available
+	*/
+	Chunk*			getFreeSpace( XMP_Int64& outFreeBytes, const IChunkContainer& tree, XMP_Uns32 index ) const;
+
+	/**
+		Return the minimum size of a FREE chunk
+	*/
+	XMP_Uns64		getMinFREESize( ) const;
+
+private:
+	XMP_Uns32	mChunksAdded;
+
+	/** AIFF is always Big Endian */
+	static const BigEndian& mEndian;
+
+}; // IFF_RIFF
+
+}
+#endif
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp
new file mode 100644
index 0000000..8fadba3
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp
@@ -0,0 +1,46 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h"
+
+using namespace IFF_RIFF;
+
+//-----------------------------------------------------------------------------
+// 
+// AIFFMetadata::AIFFMetadata(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+AIFFMetadata::AIFFMetadata()
+{
+}
+
+AIFFMetadata::~AIFFMetadata()
+{
+}
+
+//-----------------------------------------------------------------------------
+// 
+// AIFFMetadata::isEmptyValue(...)
+// 
+// Purpose: Is the value of the passed ValueObject and its id "empty"?
+// 
+//-----------------------------------------------------------------------------
+
+bool AIFFMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj )
+{
+	TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+
+	return ( strObj == NULL || ( strObj != NULL && strObj->getValue().empty() ) );
+}
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h
new file mode 100644
index 0000000..13dbf1c
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h
@@ -0,0 +1,63 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _AIFFMetadata_h_
+#define _AIFFMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "source/XMP_LibUtils.hpp"
+
+#include "XMPFiles/source/FormatSupport/IFF/IChunkData.h"
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+
+namespace IFF_RIFF
+{
+
+/**
+ *	AIFF Metadata model.
+ *	Implements the IMetadata interface
+ */
+class AIFFMetadata : public IMetadata
+{
+public:
+	enum
+	{
+		kName,				// std::string
+		kAuthor,			// std::string
+		kCopyright,			// std::string
+		kAnnotation			// std::string
+	};
+
+public:
+	AIFFMetadata();
+	~AIFFMetadata();
+
+protected:
+	/**
+	 * @see IMetadata::isEmptyValue
+	 */
+	virtual	bool isEmptyValue( XMP_Uns32 id, ValueObject& valueObj );
+
+private:
+	// Operators hidden on purpose
+	AIFFMetadata( const AIFFMetadata& ) {};
+	AIFFMetadata& operator=( const AIFFMetadata& ) { return *this; };
+};
+
+} // namespace
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp
new file mode 100644
index 0000000..af91524
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp
@@ -0,0 +1,63 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h"
+#include "XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h"
+#include "XMPFiles/source/NativeMetadataSupport/MetadataSet.h"
+#include "source/XMP_LibUtils.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/XIO.hpp"
+
+
+using namespace IFF_RIFF;
+
+static const MetadataPropertyInfo kAIFFProperties[] =
+{
+//	  XMP NS		XMP Property Name	Native Metadata Identifier	Native Datatype			XMP Datatype		Delete	Priority	ExportPolicy
+	{ kXMP_NS_DC,	"title",			AIFFMetadata::kName,		kNativeType_StrUTF8,	kXMPType_Localized,	true,	false,		kExport_Always },	// dc:title <-> FORM:AIFF/NAME
+	{ kXMP_NS_DC,	"creator",			AIFFMetadata::kAuthor,		kNativeType_StrUTF8,	kXMPType_Array,		true,	false,		kExport_Always },	// dc:creator <-> FORM:AIFF/AUTH
+	{ kXMP_NS_DC,	"rights",			AIFFMetadata::kCopyright,	kNativeType_StrUTF8,	kXMPType_Localized,	true,	false,		kExport_Always },	// dc:rights <-> FORM:AIFF/(c)
+	{ kXMP_NS_DM,	"logComment",		AIFFMetadata::kAnnotation,	kNativeType_StrUTF8,	kXMPType_Simple,	true,	false,		kExport_Always },	// xmpDM:logComment <-> FORM:AIFF/ANNO
+	{ NULL }
+};
+
+XMP_Bool AIFFReconcile::importToXMP( SXMPMeta& outXMP, const MetadataSet& inMetaData )
+{
+	XMP_Bool changed = false;
+
+	// the reconciliation is based on the existing outXMP packet
+	AIFFMetadata *aiffMeta = inMetaData.get<AIFFMetadata>();
+	
+	if (aiffMeta != NULL)
+	{
+		changed = IReconcile::importNativeToXMP( outXMP, *aiffMeta, kAIFFProperties, false );
+	}
+
+	return changed;
+}//reconcile
+
+
+XMP_Bool AIFFReconcile::exportFromXMP( MetadataSet& outMetaData, SXMPMeta& inXMP )
+{
+	XMP_Bool changed = false;
+
+	// Get the appropriate metadata container
+	AIFFMetadata *aiffMeta = outMetaData.get<AIFFMetadata>();
+
+	// If the metadata container is not available, skip that part of the process
+	if( aiffMeta != NULL )
+	{
+		changed = IReconcile::exportXMPToNative( *aiffMeta, inXMP, kAIFFProperties );
+	}//if AIFF is set
+
+	return changed;
+}//dissolve
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h
new file mode 100644
index 0000000..41e5989
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h
@@ -0,0 +1,40 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _AIFFReconcile_h_
+#define _AIFFReconcile_h_
+
+#include "XMPFiles/source/NativeMetadataSupport/IReconcile.h"
+
+namespace IFF_RIFF
+{
+
+class AIFFReconcile : public IReconcile
+{
+public:
+	~AIFFReconcile() {};
+
+	/** 
+	* @see IReconcile::importToXMP
+	* Legacy values are always imported.
+	* If the values are not UTF-8 they will be converted to UTF-8 except in ServerMode
+	*/
+	XMP_Bool importToXMP( SXMPMeta& outXMP, const MetadataSet& inMetaData );
+
+	/** 
+	* @see IReconcile::exportFromXMP
+	* XMP values are always exported to Legacy as UTF-8 encoded
+	*/
+	XMP_Bool exportFromXMP( MetadataSet& outMetaData, SXMPMeta& inXMP );
+
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/ASF_Support.cpp b/XMPFiles/source/FormatSupport/ASF_Support.cpp
new file mode 100644
index 0000000..95fd192
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ASF_Support.cpp
@@ -0,0 +1,1444 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/ASF_Support.hpp"
+#include "source/UnicodeConversions.hpp"
+#include "source/XIO.hpp"
+
+#if XMP_WinBuild
+	#define snprintf _snprintf
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+	#pragma warning ( disable : 4267 )	// *** conversion (from size_t), possible loss of date (many 64 bit related)
+#endif
+
+// =============================================================================================
+
+// Platforms other than Win
+#if ! XMP_WinBuild
+int IsEqualGUID ( const GUID& guid1, const GUID& guid2 )
+{
+	return (memcmp ( &guid1, &guid2, sizeof(GUID) ) == 0);
+}
+#endif
+
+ASF_Support::ASF_Support() : legacyManager(0),progressTracker(0), posFileSizeInfo(0) {}
+
+ASF_Support::ASF_Support ( ASF_LegacyManager* _legacyManager,XMP_ProgressTracker* _progressTracker ) 
+	:legacyManager(_legacyManager),progressTracker(_progressTracker), posFileSizeInfo(0)
+{
+}
+
+ASF_Support::~ASF_Support()
+{
+	legacyManager = 0;
+}
+
+// =============================================================================================
+
+long ASF_Support::OpenASF ( XMP_IO* fileRef, ObjectState & inOutObjectState )
+{
+	XMP_Uns64 pos = 0;
+	XMP_Uns64 len;
+
+	try {
+		pos = fileRef->Rewind();
+	} catch ( ... ) {}
+
+	if ( pos != 0 ) return 0;
+
+	// read first and following chunks
+	while ( ReadObject ( fileRef, inOutObjectState, &len, pos) ) {}
+
+	return inOutObjectState.objects.size();
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::ReadObject ( XMP_IO* fileRef, ObjectState & inOutObjectState, XMP_Uns64 * objectLength, XMP_Uns64 & inOutPosition )
+{
+
+	try {
+
+		XMP_Uns64 startPosition = inOutPosition;
+		XMP_Uns32 bytesRead;
+		ASF_ObjectBase objectBase;
+
+		bytesRead = fileRef->ReadAll ( &objectBase, kASF_ObjectBaseLen );
+		if ( bytesRead != kASF_ObjectBaseLen ) return false;
+
+		*objectLength = GetUns64LE ( &objectBase.size );
+		inOutPosition += *objectLength;
+
+		ObjectData	newObject;
+
+		newObject.pos = startPosition;
+		newObject.len = *objectLength;
+		newObject.guid = objectBase.guid;
+
+		// xmpIsLastObject indicates, that the XMP-object is the last top-level object
+		// reset here, if any another object is read
+		inOutObjectState.xmpIsLastObject = false;
+
+		if ( IsEqualGUID ( ASF_Header_Object, newObject.guid ) ) {
+
+			// header object ?
+			this->ReadHeaderObject ( fileRef, inOutObjectState, newObject );
+
+		} else if ( IsEqualGUID ( ASF_XMP_Metadata, newObject.guid ) ) {
+
+			// check object for XMP GUID
+			inOutObjectState.xmpPos = newObject.pos + kASF_ObjectBaseLen;
+			inOutObjectState.xmpLen = newObject.len - kASF_ObjectBaseLen;
+			inOutObjectState.xmpIsLastObject = true;
+			inOutObjectState.xmpObject = newObject;
+			newObject.xmp = true;
+
+		}
+
+		inOutObjectState.objects.push_back ( newObject );
+
+		fileRef->Seek ( inOutPosition, kXMP_SeekFromStart );
+
+	} catch ( ... ) {
+
+		return false;
+
+	}
+
+	return true;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::ReadHeaderObject ( XMP_IO* fileRef, ObjectState& inOutObjectState, const ObjectData& newObject )
+{
+	if ( ! IsEqualGUID ( ASF_Header_Object, newObject.guid) || (! legacyManager ) ) return false;
+
+	std::string buffer;
+
+	legacyManager->SetPadding(0);
+
+	try {
+
+		// read header-object structure
+		XMP_Uns64 pos = newObject.pos;
+		XMP_Uns32 bufferSize = kASF_ObjectBaseLen + 6;
+
+		buffer.clear();
+		buffer.reserve ( bufferSize );
+		buffer.assign ( bufferSize, ' ' );
+		fileRef->Seek ( pos, kXMP_SeekFromStart );
+		fileRef->ReadAll ( const_cast<char*>(buffer.data()), bufferSize );
+
+		XMP_Uns64 read = bufferSize;
+		pos += bufferSize;
+
+		// read contained header objects
+		XMP_Uns32 numberOfHeaders = GetUns32LE ( &buffer[24] );
+		ASF_ObjectBase objectBase;
+
+		while ( read < newObject.len ) {
+
+			fileRef->Seek ( pos, kXMP_SeekFromStart );
+			if ( kASF_ObjectBaseLen != fileRef->Read ( &objectBase, kASF_ObjectBaseLen, true ) ) break;
+
+			fileRef->Seek ( pos, kXMP_SeekFromStart );
+			objectBase.size = GetUns64LE ( &objectBase.size );
+
+			if ( IsEqualGUID ( ASF_File_Properties_Object, objectBase.guid) && (objectBase.size >= 104 ) ) {
+
+				buffer.clear();
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				fileRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				// save position of filesize-information
+				posFileSizeInfo = (pos + 40);
+
+				// creation date
+				std::string sub ( buffer.substr ( 48, 8 ) );
+				legacyManager->SetField ( ASF_LegacyManager::fieldCreationDate, sub );
+
+				// broadcast flag set ?
+				XMP_Uns32 flags = GetUns32LE ( &buffer[88] );
+				inOutObjectState.broadcast = (flags & 1);
+				legacyManager->SetBroadcast ( inOutObjectState.broadcast );
+
+				legacyManager->SetObjectExists ( ASF_LegacyManager::objectFileProperties );
+
+			} else if ( IsEqualGUID ( ASF_Content_Description_Object, objectBase.guid) && (objectBase.size >= 34 ) ) {
+
+				buffer.clear();
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				fileRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				XMP_Uns16 titleLen = GetUns16LE ( &buffer[24] );
+				XMP_Uns16 authorLen = GetUns16LE ( &buffer[26] );
+				XMP_Uns16 copyrightLen = GetUns16LE ( &buffer[28] );
+				XMP_Uns16 descriptionLen = GetUns16LE ( &buffer[30] );
+				XMP_Uns16 ratingLen = GetUns16LE ( &buffer[32] );
+
+				XMP_Uns16 fieldPos = 34;
+
+				std::string titleStr = buffer.substr ( fieldPos, titleLen );
+				fieldPos += titleLen;
+				legacyManager->SetField ( ASF_LegacyManager::fieldTitle, titleStr );
+
+				std::string authorStr = buffer.substr ( fieldPos, authorLen );
+				fieldPos += authorLen;
+				legacyManager->SetField ( ASF_LegacyManager::fieldAuthor, authorStr );
+
+				std::string copyrightStr = buffer.substr ( fieldPos, copyrightLen );
+				fieldPos += copyrightLen;
+				legacyManager->SetField ( ASF_LegacyManager::fieldCopyright, copyrightStr );
+
+				std::string descriptionStr = buffer.substr ( fieldPos, descriptionLen );
+				fieldPos += descriptionLen;
+				legacyManager->SetField ( ASF_LegacyManager::fieldDescription, descriptionStr );
+
+				/* rating is currently not part of reconciliation
+				std::string ratingStr = buffer.substr ( fieldPos, ratingLen );
+				fieldPos += ratingLen;
+				legacyData.append ( titleStr );
+				*/
+
+				legacyManager->SetObjectExists ( ASF_LegacyManager::objectContentDescription );
+
+			} else if ( IsEqualGUID ( ASF_Content_Branding_Object, objectBase.guid ) ) {
+
+				buffer.clear();
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				fileRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				XMP_Uns32 fieldPos = 28;
+
+				// copyright URL is 3. element with variable size
+				for ( int i = 1; i <= 3 ; ++i ) {
+					XMP_Uns32 len = GetUns32LE ( &buffer[fieldPos] );
+					if ( i == 3 ) {
+						std::string copyrightURLStr = buffer.substr ( fieldPos + 4, len );
+						legacyManager->SetField ( ASF_LegacyManager::fieldCopyrightURL, copyrightURLStr );
+					}
+					fieldPos += (len + 4);
+				}
+
+				legacyManager->SetObjectExists ( ASF_LegacyManager::objectContentBranding );
+
+#if ! Exclude_LicenseURL_Recon
+
+			} else if ( IsEqualGUID ( ASF_Content_Encryption_Object, objectBase.guid ) ) {
+
+				buffer.clear();
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				fileRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				XMP_Uns32 fieldPos = 24;
+
+				// license URL is 4. element with variable size
+				for ( int i = 1; i <= 4 ; ++i ) {
+					XMP_Uns32 len = GetUns32LE ( &buffer[fieldPos] );
+					if ( i == 4 ) {
+						std::string licenseURLStr = buffer.substr ( fieldPos + 4, len );
+						legacyManager->SetField ( ASF_LegacyManager::fieldLicenseURL, licenseURLStr );
+					}
+					fieldPos += (len + 4);
+				}
+
+				legacyManager->SetObjectExists ( objectContentEncryption );
+
+#endif
+
+			} else if ( IsEqualGUID ( ASF_Padding_Object, objectBase.guid ) ) {
+
+				legacyManager->SetPadding ( legacyManager->GetPadding() + (objectBase.size - 24) );
+
+			} else if ( IsEqualGUID ( ASF_Header_Extension_Object, objectBase.guid ) ) {
+
+				this->ReadHeaderExtensionObject ( fileRef, inOutObjectState, pos, objectBase );
+
+			} else if (objectBase.size == 0) {
+				break;
+			}
+
+			pos += objectBase.size;
+			read += objectBase.size;
+		}
+
+	} catch ( ... ) {
+
+		return false;
+
+	}
+
+	legacyManager->ComputeDigest();
+
+	return true;
+}
+
+// =============================================================================================
+
+bool ASF_Support::WriteHeaderObject ( XMP_IO* sourceRef, XMP_IO* destRef, const ObjectData& object, ASF_LegacyManager& _legacyManager, bool usePadding )
+{
+	if ( ! IsEqualGUID ( ASF_Header_Object, object.guid ) ) return false;
+
+	std::string buffer;
+	XMP_Uns16 valueUns16LE;
+	XMP_Uns32 valueUns32LE;
+	XMP_Uns64 valueUns64LE;
+
+	try {
+
+		// read header-object structure
+		XMP_Uns64 pos = object.pos;
+		XMP_Uns32 bufferSize = kASF_ObjectBaseLen + 6;
+
+		buffer.clear();
+		buffer.reserve ( bufferSize );
+		buffer.assign ( bufferSize, ' ' );
+		sourceRef->Seek ( pos, kXMP_SeekFromStart );
+		sourceRef->ReadAll ( const_cast<char*>(buffer.data()), bufferSize );
+
+		XMP_Uns64 read = bufferSize;
+		pos += bufferSize;
+
+		// read contained header objects
+		XMP_Uns32 numberOfHeaders = GetUns32LE ( &buffer[24] );
+		ASF_ObjectBase objectBase;
+
+		// prepare new header in memory
+		std::string header;
+
+		int changedObjects = _legacyManager.changedObjects();
+		int exportedObjects = 0;
+		int writtenObjects = 0;
+
+		header.append ( buffer.c_str(), bufferSize );
+
+		while ( read < object.len ) {
+
+			sourceRef->Seek ( pos, kXMP_SeekFromStart );
+			if ( kASF_ObjectBaseLen != sourceRef->Read ( &objectBase, kASF_ObjectBaseLen, true ) ) break;
+
+			sourceRef->Seek ( pos, kXMP_SeekFromStart );
+			objectBase.size = GetUns64LE ( &objectBase.size );
+
+			int headerStartPos = header.size();
+
+			// save position of filesize-information
+			if ( IsEqualGUID ( ASF_File_Properties_Object, objectBase.guid ) ) {
+				posFileSizeInfo = (headerStartPos + 40);
+			}
+
+			// write objects
+			if ( IsEqualGUID ( ASF_File_Properties_Object, objectBase.guid ) &&
+				(objectBase.size >= 104) && (changedObjects & ASF_LegacyManager::objectFileProperties) ) {
+
+				// copy object and replace creation-date
+				buffer.reserve ( XMP_Uns32 ( objectBase.size ) );
+				buffer.assign ( XMP_Uns32 ( objectBase.size ), ' ' );
+				sourceRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+				header.append ( buffer, 0, XMP_Uns32( objectBase.size ) );
+
+				if ( ! _legacyManager.GetBroadcast() ) {
+					buffer = _legacyManager.GetField ( ASF_LegacyManager::fieldCreationDate );
+					ReplaceString ( header, buffer, (headerStartPos + 48), 8 );
+				}
+
+				exportedObjects |= ASF_LegacyManager::objectFileProperties;
+
+			} else if ( IsEqualGUID ( ASF_Content_Description_Object, objectBase.guid ) &&
+						(objectBase.size >= 34) && (changedObjects & ASF_LegacyManager::objectContentDescription) ) {
+
+				// re-create object with xmp-data
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				sourceRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+				// write header only 
+				header.append ( buffer, 0, XMP_Uns32( kASF_ObjectBaseLen ) );
+
+				// write length fields
+
+				XMP_Uns16 titleLen = _legacyManager.GetField ( ASF_LegacyManager::fieldTitle).size( );
+				valueUns16LE = MakeUns16LE ( titleLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				XMP_Uns16 authorLen = _legacyManager.GetField ( ASF_LegacyManager::fieldAuthor).size( );
+				valueUns16LE = MakeUns16LE ( authorLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				XMP_Uns16 copyrightLen = _legacyManager.GetField ( ASF_LegacyManager::fieldCopyright).size( );
+				valueUns16LE = MakeUns16LE ( copyrightLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				XMP_Uns16 descriptionLen = _legacyManager.GetField ( ASF_LegacyManager::fieldDescription).size( );
+				valueUns16LE = MakeUns16LE ( descriptionLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				// retrieve existing overall length of preceding fields
+				XMP_Uns16 precedingLen = 0;
+				precedingLen += GetUns16LE ( &buffer[24] ); // Title
+				precedingLen += GetUns16LE ( &buffer[26] ); // Author
+				precedingLen += GetUns16LE ( &buffer[28] ); // Copyright
+				precedingLen += GetUns16LE ( &buffer[30] ); // Description
+				// retrieve existing 'Rating' length
+				XMP_Uns16 ratingLen = GetUns16LE ( &buffer[32] ); // Rating
+				valueUns16LE = MakeUns16LE ( ratingLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				// write field contents
+
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldTitle ) );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldAuthor ) );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldCopyright ) );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldDescription ) );
+				header.append ( buffer, (34 + precedingLen), ratingLen );
+
+				// update new object size
+				valueUns64LE = MakeUns64LE ( header.size() - headerStartPos );
+				std::string newSize ( (const char*)&valueUns64LE, 8 );
+				ReplaceString ( header, newSize, (headerStartPos + 16), 8 );
+
+				exportedObjects |= ASF_LegacyManager::objectContentDescription;
+
+			} else if ( IsEqualGUID ( ASF_Content_Branding_Object, objectBase.guid ) &&
+						(changedObjects & ASF_LegacyManager::objectContentBranding) ) {
+
+				// re-create object with xmp-data
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				sourceRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				// calculate size of fields coming before 'Copyright URL'
+				XMP_Uns32 length = 28;
+				length += (GetUns32LE ( &buffer[length] ) + 4); // Banner Image Data
+				length += (GetUns32LE ( &buffer[length] ) + 4); // Banner Image URL
+
+				// write first part of header
+				header.append ( buffer, 0, length );
+
+				// copyright URL
+				length = _legacyManager.GetField ( ASF_LegacyManager::fieldCopyrightURL).size( );
+				valueUns32LE = MakeUns32LE ( length );
+				header.append ( (const char*)&valueUns32LE, 4 );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldCopyrightURL ) );
+
+				// update new object size
+				valueUns64LE = MakeUns64LE ( header.size() - headerStartPos );
+				std::string newSize ( (const char*)&valueUns64LE, 8 );
+				ReplaceString ( header, newSize, (headerStartPos + 16), 8 );
+
+				exportedObjects |= ASF_LegacyManager::objectContentBranding;
+
+#if ! Exclude_LicenseURL_Recon
+
+			} else if ( IsEqualGUID ( ASF_Content_Encryption_Object, objectBase.guid ) &&
+						(changedObjects & ASF_LegacyManager::objectContentEncryption) ) {
+
+				// re-create object with xmp-data
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				sourceRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				// calculate size of fields coming before 'License URL'
+				XMP_Uns32 length = 24;
+				length += (GetUns32LE ( &buffer[length] ) + 4); // Secret Data
+				length += (GetUns32LE ( &buffer[length] ) + 4); // Protection Type
+				length += (GetUns32LE ( &buffer[length] ) + 4); // Key ID
+
+				// write first part of header
+				header.append ( buffer, 0, length );
+
+				// License URL
+				length = _legacyManager.GetField ( ASF_LegacyManager::fieldLicenseURL).size( );
+				valueUns32LE = MakeUns32LE ( length );
+				header.append ( (const char*)&valueUns32LE, 4 );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldLicenseURL ) );
+
+				// update new object size
+				valueUns64LE = MakeUns64LE ( header.size() - headerStartPos );
+				std::string newSize ( (const char*)&valueUns64LE, 8 );
+				ReplaceString ( header, newSize, (headerStartPos + 16), 8 );
+
+				exportedObjects |= ASF_LegacyManager::objectContentEncryption;
+
+#endif
+
+			} else if ( IsEqualGUID ( ASF_Header_Extension_Object, objectBase.guid ) && usePadding ) {
+
+				// re-create object if padding needs to be used
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				sourceRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				ASF_Support::WriteHeaderExtensionObject ( buffer, &header, objectBase, 0 );
+
+			} else if ( IsEqualGUID ( ASF_Padding_Object, objectBase.guid ) && usePadding ) {
+
+				// eliminate padding (will be created as last object)
+
+			} else {
+
+				// simply copy all other objects
+				buffer.reserve ( XMP_Uns32( objectBase.size ) );
+				buffer.assign ( XMP_Uns32( objectBase.size ), ' ' );
+				sourceRef->ReadAll ( const_cast<char*>(buffer.data()), XMP_Int32(objectBase.size) );
+
+				header.append ( buffer, 0, XMP_Uns32( objectBase.size ) );
+
+			}
+
+			pos += objectBase.size;
+			read += objectBase.size;
+
+			writtenObjects ++;
+
+		}
+
+		// any objects to create ?
+		int newObjects = (changedObjects ^ exportedObjects);
+
+		if ( newObjects ) {
+
+			// create new objects with xmp-data
+			int headerStartPos;
+			ASF_ObjectBase newObjectBase;
+			XMP_Uns32 length;
+
+			if ( newObjects & ASF_LegacyManager::objectContentDescription ) {
+
+				headerStartPos = header.size();
+				newObjectBase.guid = ASF_Content_Description_Object;
+				newObjectBase.size = 0;
+
+				// write object header
+				header.append ( (const char*)&newObjectBase, kASF_ObjectBaseLen );
+
+				XMP_Uns16 titleLen = _legacyManager.GetField ( ASF_LegacyManager::fieldTitle).size( );
+				valueUns16LE = MakeUns16LE ( titleLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				XMP_Uns16 authorLen = _legacyManager.GetField ( ASF_LegacyManager::fieldAuthor).size( );
+				valueUns16LE = MakeUns16LE ( authorLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				XMP_Uns16 copyrightLen = _legacyManager.GetField ( ASF_LegacyManager::fieldCopyright).size( );
+				valueUns16LE = MakeUns16LE ( copyrightLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				XMP_Uns16 descriptionLen = _legacyManager.GetField ( ASF_LegacyManager::fieldDescription).size( );
+				valueUns16LE = MakeUns16LE ( descriptionLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				XMP_Uns16 ratingLen = 0;
+				valueUns16LE = MakeUns16LE ( ratingLen );
+				header.append ( (const char*)&valueUns16LE, 2 );
+
+				// write field contents
+
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldTitle ) );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldAuthor ) );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldCopyright ) );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldDescription ) );
+
+				// update new object size
+				valueUns64LE = MakeUns64LE ( header.size() - headerStartPos );
+				std::string newSize ( (const char*)&valueUns64LE, 8 );
+				ReplaceString ( header, newSize, (headerStartPos + 16), 8 );
+
+				newObjects &= ~ASF_LegacyManager::objectContentDescription;
+
+				writtenObjects ++;
+
+			}
+			
+			if ( newObjects & ASF_LegacyManager::objectContentBranding ) {
+
+				headerStartPos = header.size();
+				newObjectBase.guid = ASF_Content_Branding_Object;
+				newObjectBase.size = 0;
+
+				// write object header
+				header.append ( (const char*)&newObjectBase, kASF_ObjectBaseLen );
+
+				// write 'empty' fields
+				header.append ( 12, '\0' );
+
+				// copyright URL
+				length = _legacyManager.GetField ( ASF_LegacyManager::fieldCopyrightURL).size( );
+				valueUns32LE = MakeUns32LE ( length );
+				header.append ( (const char*)&valueUns32LE, 4 );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldCopyrightURL ) );
+
+				// update new object size
+				valueUns64LE = MakeUns64LE ( header.size() - headerStartPos );
+				std::string newSize ( (const char*)&valueUns64LE, 8 );
+				ReplaceString ( header, newSize, (headerStartPos + 16), 8 );
+
+				newObjects &= ~ASF_LegacyManager::objectContentBranding;
+
+				writtenObjects ++;
+
+			}
+
+#if ! Exclude_LicenseURL_Recon
+
+			if ( newObjects & ASF_LegacyManager::objectContentEncryption ) {
+
+				headerStartPos = header.size();
+				newObjectBase.guid = ASF_Content_Encryption_Object;
+				newObjectBase.size = 0;
+
+				// write object header
+				header.append ( (const char*)&newObjectBase, kASF_ObjectBaseLen );
+
+				// write 'empty' fields
+				header.append ( 12, '\0' );
+
+				// License URL
+				length = _legacyManager.GetField ( ASF_LegacyManager::fieldLicenseURL).size( );
+				valueUns32LE = MakeUns32LE ( length );
+				header.append ( (const char*)&valueUns32LE, 4 );
+				header.append ( _legacyManager.GetField ( ASF_LegacyManager::fieldLicenseURL ) );
+
+				// update new object size
+				valueUns64LE = MakeUns64LE ( header.size() - headerStartPos );
+				std::string newSize ( (const char*)&valueUns64LE, 8 );
+				ReplaceString ( header, newSize, (headerStartPos + 16), 8 );
+
+				newObjects &= ~ASF_LegacyManager::objectContentEncryption;
+
+				writtenObjects ++;
+
+			}
+
+#endif
+
+		}
+
+		// create padding object ?
+		if ( usePadding && (header.size ( ) < object.len ) ) {
+			ASF_Support::CreatePaddingObject ( &header, (object.len - header.size()) );
+			writtenObjects ++;
+		}
+
+		// update new header-object size
+		valueUns64LE = MakeUns64LE ( header.size() );
+		std::string newValue ( (const char*)&valueUns64LE, 8 );
+		ReplaceString ( header, newValue, 16, 8 );
+
+		// update new number of Header objects
+		valueUns32LE = MakeUns32LE ( writtenObjects );
+		newValue = std::string ( (const char*)&valueUns32LE, 4 );
+		ReplaceString ( header, newValue, 24, 4 );
+
+		// if we are operating on the same file (in-place update), place pointer before writing
+		if ( sourceRef == destRef ) destRef->Seek ( object.pos, kXMP_SeekFromStart );
+		if ( this->progressTracker != 0 ) 
+		{
+			XMP_Assert ( this->progressTracker->WorkInProgress() );
+			this->progressTracker->AddTotalWork ( (float)header.size() );
+		}
+		// write header
+		destRef->Write ( header.c_str(), header.size() );
+
+	} catch ( ... ) {
+
+		return false;
+
+	}
+
+	return true;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::UpdateHeaderObject ( XMP_IO* fileRef, const ObjectData& object, ASF_LegacyManager& _legacyManager )
+{
+	return ASF_Support::WriteHeaderObject ( fileRef, fileRef, object, _legacyManager, true );
+}
+
+// =============================================================================================
+
+bool ASF_Support::UpdateFileSize ( XMP_IO* fileRef )
+{
+	if ( fileRef == 0 ) return false;
+
+	XMP_Uns64 posCurrent = fileRef->Seek ( 0, kXMP_SeekFromCurrent );
+	XMP_Uns64 newSizeLE  = MakeUns64LE ( fileRef->Length() );
+
+	if ( this->posFileSizeInfo != 0 ) {
+
+		fileRef->Seek ( this->posFileSizeInfo, kXMP_SeekFromStart );
+	
+	} else {
+
+		// The position of the file size field is not known, find it.
+
+		ASF_ObjectBase objHeader;
+		
+		// Read the Header object at the start of the file.
+
+		fileRef->Rewind();
+		fileRef->ReadAll ( &objHeader, kASF_ObjectBaseLen );
+		if ( ! IsEqualGUID ( ASF_Header_Object, objHeader.guid ) ) return false;
+		
+		XMP_Uns32 childCount;
+		fileRef->ReadAll ( &childCount, 4 );
+		childCount = GetUns32LE ( &childCount );
+		
+		fileRef->Seek ( 2, kXMP_SeekFromCurrent );	// Skip the 2 reserved bytes.
+		
+		// Look for the File Properties object in the Header's children.
+
+		for ( ; childCount > 0; --childCount ) {
+			fileRef->ReadAll ( &objHeader, kASF_ObjectBaseLen );
+			if ( IsEqualGUID ( ASF_File_Properties_Object, objHeader.guid ) ) break;
+			XMP_Uns64 dataLen = GetUns64LE ( &objHeader.size ) - 24;
+			fileRef->Seek ( dataLen, kXMP_SeekFromCurrent );	// Skip this object's data.
+		}
+		if ( childCount == 0 ) return false;
+		
+		// Seek to the file size field.
+
+		XMP_Uns64 fpoSize = GetUns64LE ( &objHeader.size );
+		if ( fpoSize < (16+8+16+8) ) return false;
+		fileRef->Seek ( 16, kXMP_SeekFromCurrent );	// Skip to the file size field.
+
+	}
+
+	fileRef->Write ( &newSizeLE, 8 );	// Write the new file size.
+
+	fileRef->Seek ( posCurrent, kXMP_SeekFromStart );
+	return true;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::ReadHeaderExtensionObject ( XMP_IO* fileRef, ObjectState& inOutObjectState, const XMP_Uns64& _pos, const ASF_ObjectBase& _objectBase )
+{
+	if ( ! IsEqualGUID ( ASF_Header_Extension_Object, _objectBase.guid) || (! legacyManager ) ) return false;
+
+	try {
+
+		// read extended header-object structure beginning at the data part (offset = 46)
+		const XMP_Uns64 offset = 46;
+		XMP_Uns64 read = 0;
+		XMP_Uns64 data = (_objectBase.size - offset);
+		XMP_Uns64 pos = (_pos + offset);
+
+		ASF_ObjectBase objectBase;
+
+		while ( read < data ) {
+
+			fileRef->Seek ( pos, kXMP_SeekFromStart );
+			if ( kASF_ObjectBaseLen != fileRef->Read ( &objectBase, kASF_ObjectBaseLen, true ) ) break;
+
+			objectBase.size = GetUns64LE ( &objectBase.size );
+
+			if ( IsEqualGUID ( ASF_Padding_Object, objectBase.guid ) ) {
+				legacyManager->SetPadding ( legacyManager->GetPadding() + (objectBase.size - 24) );
+			}
+
+			pos += objectBase.size;
+			read += objectBase.size;
+
+		}
+
+	} catch ( ... ) {
+
+		return false;
+
+	}
+
+	return true;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::WriteHeaderExtensionObject ( const std::string& buffer, std::string* header, const ASF_ObjectBase& _objectBase, const int /*reservePadding*/ )
+{
+	if ( ! IsEqualGUID ( ASF_Header_Extension_Object, _objectBase.guid ) || (! header) || (buffer.size() < 46) ) return false;
+
+	const XMP_Uns64 offset = 46;
+	int startPos = header->size();
+
+	// copy header base
+	header->append ( buffer, 0, offset );
+
+	// read extended header-object structure beginning at the data part (offset = 46)
+	XMP_Uns64 read = 0;
+	XMP_Uns64 data = (_objectBase.size - offset);
+	XMP_Uns64 pos = offset;
+
+	ASF_ObjectBase objectBase;
+
+	while ( read < data ) {
+
+		memcpy ( &objectBase, &buffer[int(pos)], kASF_ObjectBaseLen );
+		objectBase.size = GetUns64LE ( &objectBase.size );
+
+		if ( IsEqualGUID ( ASF_Padding_Object, objectBase.guid ) ) {
+			// eliminate
+		} else {
+			// copy other objects
+			header->append ( buffer, XMP_Uns32(pos), XMP_Uns32(objectBase.size) );
+		}
+
+		pos += objectBase.size;
+		read += objectBase.size;
+
+	}
+
+	// update header extension data size
+	XMP_Uns32 valueUns32LE = MakeUns32LE ( header->size() - startPos - offset );
+	std::string newDataSize ( (const char*)&valueUns32LE, 4 );
+	ReplaceString ( *header, newDataSize, (startPos + 42), 4 );
+
+	// update new object size
+	XMP_Uns64 valueUns64LE = MakeUns64LE ( header->size() - startPos );
+	std::string newObjectSize ( (const char*)&valueUns64LE, 8 );
+	ReplaceString ( *header, newObjectSize, (startPos + 16), 8 );
+
+	return true;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::CreatePaddingObject ( std::string* header, const XMP_Uns64 size )
+{
+	if ( ( ! header) || (size < 24) ) return false;
+
+	ASF_ObjectBase newObjectBase;
+
+	newObjectBase.guid = ASF_Padding_Object;
+	newObjectBase.size = MakeUns64LE ( size );
+
+	// write object header
+	header->append ( (const char*)&newObjectBase, kASF_ObjectBaseLen );
+
+	// write 'empty' padding
+	header->append ( XMP_Uns32 ( size - 24 ), '\0' );
+
+	return true;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::WriteXMPObject ( XMP_IO* fileRef, XMP_Uns32 len, const char* inBuffer )
+{
+	bool ret = false;
+
+	ASF_ObjectBase objectBase = { ASF_XMP_Metadata, 0 };
+	objectBase.size = MakeUns64LE ( len + kASF_ObjectBaseLen );
+
+	try {
+		fileRef->Write ( &objectBase, kASF_ObjectBaseLen );
+		fileRef->Write ( inBuffer, len );
+		ret = true;
+	} catch ( ... ) {}
+
+	return ret;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::UpdateXMPObject ( XMP_IO* fileRef, const ObjectData& object, XMP_Uns32 len, const char * inBuffer )
+{
+	bool ret = false;
+
+	ASF_ObjectBase objectBase = { ASF_XMP_Metadata, 0 };
+	objectBase.size = MakeUns64LE ( len + kASF_ObjectBaseLen );
+
+	try {
+		fileRef->Seek ( object.pos, kXMP_SeekFromStart );
+		fileRef->Write ( &objectBase, kASF_ObjectBaseLen );
+		fileRef->Write ( inBuffer, len );
+		ret = true;
+	} catch ( ... ) {}
+
+	return ret;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::CopyObject ( XMP_IO* sourceRef, XMP_IO* destRef, const ObjectData& object )
+{
+	try {
+		sourceRef->Seek ( object.pos, kXMP_SeekFromStart );
+		XIO::Copy ( sourceRef, destRef, object.len );
+	} catch ( ... ) {
+		return false;
+	}
+
+	return true;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::ReadBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns64 len, char * outBuffer )
+{
+	try {
+
+		if ( (fileRef == 0) || (outBuffer == 0) ) return false;
+	
+		fileRef->Seek ( pos, kXMP_SeekFromStart  );
+		long bytesRead = fileRef->ReadAll ( outBuffer, XMP_Int32(len) );
+		if ( XMP_Uns32 ( bytesRead ) != len ) return false;
+
+		return true;
+
+	} catch ( ... ) {}
+
+	return false;
+
+}
+
+// =============================================================================================
+
+bool ASF_Support::WriteBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns32 len, const char * inBuffer )
+{
+	try {
+
+		if ( (fileRef == 0) || (inBuffer == 0) ) return false;
+	
+		fileRef->Seek ( pos, kXMP_SeekFromStart  );
+		fileRef->Write ( inBuffer, len  );
+	
+		return true;
+
+	} catch ( ... ) {}
+
+	return false;
+
+}
+
+// =================================================================================================
+
+std::string ASF_Support::ReplaceString ( std::string& operand, std::string& str, int offset, int count )
+{
+	std::basic_string<char>::iterator iterF1, iterL1, iterF2, iterL2;
+
+	iterF1 = operand.begin() + offset;
+	iterL1 = operand.begin() + offset + count;
+	iterF2 = str.begin();
+	iterL2 = str.begin() + count;
+
+	return operand.replace ( iterF1, iterL1, iterF2, iterL2 );
+
+}
+
+// =================================================================================================
+
+ASF_LegacyManager::ASF_LegacyManager() : fields(fieldLast), broadcastSet(false), digestComputed(false),
+										 imported(false), objectsExisting(0), objectsToExport(0), legacyDiff(0), padding(0)
+{
+	// Nothing more to do.
+}
+
+// =================================================================================================
+
+ASF_LegacyManager::~ASF_LegacyManager()
+{
+	// Nothing to do.
+}
+
+// =================================================================================================
+
+bool ASF_LegacyManager::SetField ( fieldType field, const std::string& value )
+{
+	if ( field >= fieldLast ) return false;
+
+	unsigned int maxSize = this->GetFieldMaxSize ( field );
+
+	if (value.size ( ) <= maxSize ) {
+		fields[field] = value;
+	} else {
+		fields[field] = value.substr ( 0, maxSize );
+	}
+
+	if ( field == fieldCopyrightURL ) NormalizeStringDisplayASCII ( fields[field] );
+
+	#if ! Exclude_LicenseURL_Recon
+		if ( field == fieldLicenseURL ) NormalizeStringDisplayASCII ( fields[field] );
+	#endif
+
+	return true;
+
+}
+
+// =================================================================================================
+
+std::string ASF_LegacyManager::GetField ( fieldType field )
+{
+	if ( field >= fieldLast ) return std::string();
+	return fields[field];
+}
+
+// =================================================================================================
+
+unsigned int ASF_LegacyManager::GetFieldMaxSize ( fieldType field )
+{
+	unsigned int maxSize = 0;
+
+	switch ( field ) {
+
+		case fieldCreationDate :
+			maxSize = 8;
+			break;
+
+		case fieldTitle :
+		case fieldAuthor :
+		case fieldCopyright :
+		case fieldDescription :
+			maxSize = 0xFFFF;
+			break;
+
+		case fieldCopyrightURL :
+#if ! Exclude_LicenseURL_Recon
+		case fieldLicenseURL :
+#endif
+			maxSize = 0xFFFFFFFF;
+			break;
+
+		default:
+			break;
+
+	}
+
+	return maxSize;
+
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::SetObjectExists ( objectType object )
+{
+	objectsExisting |= object;
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::SetBroadcast ( const bool broadcast )
+{
+	broadcastSet = broadcast;
+}
+
+// =================================================================================================
+
+bool ASF_LegacyManager::GetBroadcast()
+{
+	return broadcastSet;
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::ComputeDigest()
+{
+	MD5_CTX context;
+	MD5_Digest digest;
+	char buffer[40];
+
+	MD5Init ( &context );
+	digestStr.clear();
+	digestStr.reserve ( 160 );
+
+	for ( int type=0; type < fieldLast; ++type ) {
+
+		if (fields[type].size ( ) > 0 ) {
+			snprintf ( buffer, sizeof(buffer), "%d,", type );
+			digestStr.append ( buffer );
+			MD5Update ( &context, (XMP_Uns8*)fields[type].data(), fields[type].size() );
+		}
+
+	}
+
+	if( digestStr.size() > 0 ) digestStr[digestStr.size()-1] = ';';
+
+	MD5Final ( digest, &context );
+
+	size_t in, out;
+	for ( in = 0, out = 0; in < 16; in += 1, out += 2 ) {
+		XMP_Uns8 byte = digest[in];
+		buffer[out]   = ReconcileUtils::kHexDigits [ byte >> 4 ];
+		buffer[out+1] = ReconcileUtils::kHexDigits [ byte & 0xF ];
+	}
+	buffer[32] = 0;
+
+	digestStr.append ( buffer );
+
+	digestComputed = true;
+
+}
+
+// =================================================================================================
+
+bool ASF_LegacyManager::CheckDigest ( const SXMPMeta& xmp )
+{
+	bool ret = false;
+
+	if ( ! digestComputed ) this->ComputeDigest();
+
+	std::string oldDigest;
+
+	if ( xmp.GetProperty ( kXMP_NS_ASF, "NativeDigest", &oldDigest, 0 ) ) {
+		ret = (digestStr == oldDigest);
+	}
+
+	return ret;
+
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::SetDigest ( SXMPMeta* xmp )
+{
+	if ( ! digestComputed ) this->ComputeDigest();
+
+	xmp->SetProperty ( kXMP_NS_ASF, "NativeDigest", digestStr.c_str() );
+
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::ImportLegacy ( SXMPMeta* xmp )
+{
+	std::string utf8;
+
+	if ( ! broadcastSet ) {
+		ConvertMSDateToISODate ( fields[fieldCreationDate], &utf8 );
+		if ( ! utf8.empty() ) xmp->SetProperty ( kXMP_NS_XMP, "CreateDate", utf8.c_str(), kXMP_DeleteExisting );
+	}
+
+	FromUTF16 ( (UTF16Unit*)fields[fieldTitle].c_str(), (fields[fieldTitle].size() / 2), &utf8, false );
+	if ( ! utf8.empty() ) xmp->SetLocalizedText ( kXMP_NS_DC, "title", "", "x-default", utf8.c_str(), kXMP_DeleteExisting );
+
+	xmp->DeleteProperty ( kXMP_NS_DC, "creator" );
+	FromUTF16 ( (UTF16Unit*)fields[fieldAuthor].c_str(), (fields[fieldAuthor].size() / 2), &utf8, false );
+	if ( ! utf8.empty() ) SXMPUtils::SeparateArrayItems ( xmp, kXMP_NS_DC, "creator",
+														  (kXMP_PropArrayIsOrdered | kXMPUtil_AllowCommas), utf8.c_str() );
+
+	FromUTF16 ( (UTF16Unit*)fields[fieldCopyright].c_str(), (fields[fieldCopyright].size() / 2), &utf8, false );
+	if ( ! utf8.empty() ) xmp->SetLocalizedText ( kXMP_NS_DC, "rights", "", "x-default", utf8.c_str(), kXMP_DeleteExisting );
+
+	FromUTF16 ( (UTF16Unit*)fields[fieldDescription].c_str(), (fields[fieldDescription].size() / 2), &utf8, false );
+	if ( ! utf8.empty() ) xmp->SetLocalizedText ( kXMP_NS_DC, "description", "", "x-default", utf8.c_str(), kXMP_DeleteExisting );
+
+	if ( ! fields[fieldCopyrightURL].empty() ) xmp->SetProperty ( kXMP_NS_XMP_Rights, "WebStatement", fields[fieldCopyrightURL].c_str(), kXMP_DeleteExisting );
+
+#if ! Exclude_LicenseURL_Recon
+	if ( ! fields[fieldLicenseURL].empty() ) xmp->SetProperty ( kXMP_NS_XMP_Rights, "Certificate", fields[fieldLicenseURL].c_str(), kXMP_DeleteExisting );
+#endif
+
+	imported = true;
+
+}
+
+// =================================================================================================
+
+int ASF_LegacyManager::ExportLegacy ( const SXMPMeta& xmp )
+{
+	int changed = 0;
+	objectsToExport = 0;
+	legacyDiff = 0;
+
+	std::string utf8;
+	std::string utf16;
+	XMP_OptionBits flags;
+
+	if ( ! broadcastSet ) {
+		if ( xmp.GetProperty ( kXMP_NS_XMP, "CreateDate", &utf8, &flags ) ) {
+			std::string date;
+			ConvertISODateToMSDate ( utf8, &date );
+			if ( fields[fieldCreationDate] != date ) {
+				legacyDiff += date.size();
+				legacyDiff -= fields[fieldCreationDate].size();
+				this->SetField ( fieldCreationDate, date );
+				objectsToExport |= objectFileProperties;
+				changed ++;
+			}
+		}
+	}
+
+	if ( xmp.GetLocalizedText ( kXMP_NS_DC, "title", "", "x-default", 0, &utf8, &flags ) ) {
+		NormalizeStringTrailingNull ( utf8 );
+		ToUTF16 ( (const UTF8Unit*)utf8.data(), utf8.size(), &utf16, false );
+		if ( fields[fieldTitle] != utf16 ) {
+			legacyDiff += utf16.size();
+			legacyDiff -= fields[fieldTitle].size();
+			this->SetField ( fieldTitle, utf16 );
+			objectsToExport |= objectContentDescription;
+			changed ++;
+		}
+	}
+
+	utf8.clear();
+	SXMPUtils::CatenateArrayItems ( xmp, kXMP_NS_DC, "creator", 0, 0, kXMPUtil_AllowCommas, &utf8 );
+	if ( ! utf8.empty() ) {
+		NormalizeStringTrailingNull ( utf8 );
+		ToUTF16 ( (const UTF8Unit*)utf8.data(), utf8.size(), &utf16, false );
+		if ( fields[fieldAuthor] != utf16 ) {
+			legacyDiff += utf16.size();
+			legacyDiff -= fields[fieldAuthor].size();
+			this->SetField ( fieldAuthor, utf16 );
+			objectsToExport |= objectContentDescription;
+			changed ++;
+		}
+	}
+
+	if ( xmp.GetLocalizedText ( kXMP_NS_DC, "rights", "", "x-default", 0, &utf8, &flags ) ) {
+		NormalizeStringTrailingNull ( utf8 );
+		ToUTF16 ( (const UTF8Unit*)utf8.data(), utf8.size(), &utf16, false );
+		if ( fields[fieldCopyright] != utf16 ) {
+			legacyDiff += utf16.size();
+			legacyDiff -= fields[fieldCopyright].size();
+			this->SetField ( fieldCopyright, utf16 );
+			objectsToExport |= objectContentDescription;
+			changed ++;
+		}
+	}
+
+	if ( xmp.GetLocalizedText ( kXMP_NS_DC, "description", "", "x-default", 0, &utf8, &flags ) ) {
+		NormalizeStringTrailingNull ( utf8 );
+		ToUTF16 ( (const UTF8Unit*)utf8.data(), utf8.size(), &utf16, false );
+		if ( fields[fieldDescription] != utf16 ) {
+			legacyDiff += utf16.size();
+			legacyDiff -= fields[fieldDescription].size();
+			this->SetField ( fieldDescription, utf16 );
+			objectsToExport |= objectContentDescription;
+			changed ++;
+		}
+	}
+
+	if ( xmp.GetProperty ( kXMP_NS_XMP_Rights, "WebStatement", &utf8, &flags ) ) {
+		NormalizeStringTrailingNull ( utf8 );
+		if ( fields[fieldCopyrightURL] != utf8 ) {
+			legacyDiff += utf8.size();
+			legacyDiff -= fields[fieldCopyrightURL].size();
+			this->SetField ( fieldCopyrightURL, utf8 );
+			objectsToExport |= objectContentBranding;
+			changed ++;
+		}
+	}
+
+#if ! Exclude_LicenseURL_Recon
+	if ( xmp.GetProperty ( kXMP_NS_XMP_Rights, "Certificate", &utf8, &flags ) ) {
+		NormalizeStringTrailingNull ( utf8 );
+		if ( fields[fieldLicenseURL] != utf8 ) {
+			legacyDiff += utf8.size();
+			legacyDiff -= fields[fieldLicenseURL].size();
+			this->SetField ( fieldLicenseURL, utf8 );
+			objectsToExport |= objectContentEncryption;
+			changed ++;
+		}
+	}
+#endif
+
+	// find objects, that would need to be created on legacy export
+	int newObjects = (objectsToExport & !objectsExisting);
+
+	// calculate minimum storage for new objects, that might be created on export
+	if ( newObjects & objectContentDescription )
+		legacyDiff += sizeContentDescription;
+	if ( newObjects & objectContentBranding )
+		legacyDiff += sizeContentBranding;
+	if ( newObjects & objectContentEncryption )
+		legacyDiff += sizeContentEncryption;
+
+	ComputeDigest();
+
+	return changed;
+
+}
+
+// =================================================================================================
+
+bool ASF_LegacyManager::hasLegacyChanged()
+{
+	return (objectsToExport != 0);
+}
+
+// =================================================================================================
+
+XMP_Int64 ASF_LegacyManager::getLegacyDiff()
+{
+	return (this->hasLegacyChanged() ? legacyDiff : 0);
+}
+
+// =================================================================================================
+
+int ASF_LegacyManager::changedObjects()
+{
+	return objectsToExport;
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::SetPadding ( XMP_Int64 _padding )
+{
+	padding = _padding;
+}
+
+// =================================================================================================
+
+XMP_Int64 ASF_LegacyManager::GetPadding()
+{
+	return padding;
+}
+
+// =================================================================================================
+
+std::string ASF_LegacyManager::NormalizeStringDisplayASCII ( std::string& operand )
+{
+	std::basic_string<char>::iterator current = operand.begin();
+	std::basic_string<char>::iterator end = operand.end();;
+
+	for ( ; (current != end); ++current ) {
+		char element = *current;
+		if ( ( (element < 0x21) && (element != 0x00)) || (element > 0x7e) ) {
+			*current = '?';
+		}
+	}
+
+	return operand;
+
+}
+
+// =================================================================================================
+
+std::string ASF_LegacyManager::NormalizeStringTrailingNull ( std::string& operand )
+{
+	if ( ( operand.size() > 0) && (operand[operand.size() - 1] != '\0') ) {
+		operand.append ( 1, '\0' );
+	}
+
+	return operand;
+
+}
+
+// =================================================================================================
+
+int ASF_LegacyManager::DaysInMonth ( XMP_Int32 year, XMP_Int32 month )
+{
+
+	static short	daysInMonth[13] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+									   // Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec
+
+	int days = daysInMonth [ month ];
+	if ( (month == 2) && IsLeapYear ( year ) ) days += 1;
+	
+	return days;
+
+}
+
+// =================================================================================================
+
+bool ASF_LegacyManager::IsLeapYear ( long year )
+{
+
+	if ( year < 0 ) year = -year + 1;		// Fold the negative years, assuming there is a year 0.
+
+	if ( (year % 4) != 0 ) return false;	// Not a multiple of 4.
+	if ( (year % 100) != 0 ) return true;	// A multiple of 4 but not a multiple of 100. 
+	if ( (year % 400) == 0 ) return true;	// A multiple of 400.
+
+	return false;							// A multiple of 100 but not a multiple of 400. 
+
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::ConvertMSDateToISODate ( std::string& source, std::string* dest )
+{
+
+	XMP_Int64 creationDate = GetUns64LE ( source.c_str() );
+	XMP_Int64 totalSecs = creationDate / (10*1000*1000);
+	XMP_Int32 nanoSec = ( ( XMP_Int32) (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;
+
+	// A little more simple code converts this to an XMP date string:
+
+	XMP_DateTime date;
+	memset ( &date, 0, sizeof ( date ) );
+
+	date.year = 1601;       // The MS date origin.
+	date.month = 1;
+	date.day = 1;
+
+	date.day += days;   // Add in the delta.
+	date.hour = hour;
+	date.minute = minute;
+	date.second = second;
+	date.nanoSecond = nanoSec;
+
+	date.hasTimeZone = true;	// ! Needed for ConvertToUTCTime to do anything.
+	SXMPUtils::ConvertToUTCTime ( &date );   // Normalize the date/time.
+	SXMPUtils::ConvertFromDate ( date, dest );   // Convert to an ISO 8601 string.
+
+}
+
+// =================================================================================================
+
+void ASF_LegacyManager::ConvertISODateToMSDate ( std::string& source, std::string* dest )
+{
+	XMP_DateTime date;
+	SXMPUtils::ConvertToDate ( source, &date );
+	SXMPUtils::ConvertToUTCTime ( &date );
+
+	XMP_Int64 creationDate;
+	creationDate = date.nanoSecond / 100;
+	creationDate += (XMP_Int64 ( date.second) * (10*1000*1000) );
+	creationDate += (XMP_Int64 ( date.minute) * 60 * (10*1000*1000) );
+	creationDate += (XMP_Int64 ( date.hour) * 3600 * (10*1000*1000) );
+
+	XMP_Int32 days = (date.day - 1);
+
+	--date.month;
+	while ( date.month >= 1 ) {
+		days += DaysInMonth ( date.year, date.month );
+		--date.month;
+	}
+
+	--date.year;
+	while ( date.year >= 1601 ) {
+		days += (IsLeapYear ( date.year) ? 366 : 365 );
+		--date.year;
+	}
+
+	creationDate += (XMP_Int64 ( days) * 86400 * (10*1000*1000) );
+
+	creationDate = GetUns64LE ( &creationDate );
+	dest->assign ( (const char*)&creationDate, 8 );
+
+}
diff --git a/XMPFiles/source/FormatSupport/ASF_Support.hpp b/XMPFiles/source/FormatSupport/ASF_Support.hpp
new file mode 100644
index 0000000..3e170e3
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ASF_Support.hpp
@@ -0,0 +1,228 @@
+#ifndef __ASF_Support_hpp__
+#define __ASF_Support_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/XIO.hpp"
+#include "source/XMP_ProgressTracker.hpp"
+
+// currently exclude LicenseURL from reconciliation
+#define Exclude_LicenseURL_Recon 1
+#define EXCLUDE_LICENSEURL_RECON 1
+
+// Defines for platforms other than Win
+#if ! XMP_WinBuild
+
+	typedef struct _GUID
+	{
+		XMP_Uns32	Data1;
+		XMP_Uns16	Data2;
+		XMP_Uns16	Data3;
+		XMP_Uns8	Data4[8];
+	} GUID;
+
+	int IsEqualGUID ( const GUID& guid1, const GUID& guid2 );
+
+	static const GUID GUID_NULL = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } };
+
+#endif
+
+// header object
+static const GUID ASF_Header_Object = { MakeUns32LE(0x75b22630), MakeUns16LE(0x668e), MakeUns16LE(0x11cf), { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c } };
+// contains ...
+static const GUID ASF_File_Properties_Object = { MakeUns32LE(0x8cabdca1), MakeUns16LE(0xa947), MakeUns16LE(0x11cf), { 0x8e, 0xe4, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 } };
+static const GUID ASF_Content_Description_Object = { MakeUns32LE(0x75b22633), MakeUns16LE(0x668e), MakeUns16LE(0x11cf), { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c } };
+static const GUID ASF_Content_Branding_Object = { MakeUns32LE(0x2211b3fa), MakeUns16LE(0xbd23), MakeUns16LE(0x11d2), { 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e } };
+static const GUID ASF_Content_Encryption_Object = { MakeUns32LE(0x2211b3fb), MakeUns16LE(0xbd23), MakeUns16LE(0x11d2), { 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e } };
+// padding
+// Remark: regarding to Microsofts spec only the ASF_Header_Object contains a ASF_Padding_Object
+// Real world files show, that the ASF_Header_Extension_Object contains a ASF_Padding_Object
+static const GUID ASF_Header_Extension_Object = { MakeUns32LE(0x5fbf03b5), MakeUns16LE(0xa92e), MakeUns16LE(0x11cf), { 0x8e, 0xe3, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 } };
+static const GUID ASF_Padding_Object = { MakeUns32LE(0x1806d474), MakeUns16LE(0xcadf), MakeUns16LE(0x4509), { 0xa4, 0xba, 0x9a, 0xab, 0xcb, 0x96, 0xaa, 0xe8 } };
+
+// data object
+static const GUID ASF_Data_Object = { MakeUns32LE(0x75b22636), MakeUns16LE(0x668e), MakeUns16LE(0x11cf), { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c } };
+
+// XMP object
+static const GUID ASF_XMP_Metadata = { MakeUns32LE(0xbe7acfcb), MakeUns16LE(0x97a9), MakeUns16LE(0x42e8), { 0x9c, 0x71, 0x99, 0x94, 0x91, 0xe3, 0xaf, 0xac } };
+
+static const int guidLen = sizeof(GUID);
+
+typedef struct _ASF_ObjectBase
+{
+	GUID		guid;
+	XMP_Uns64	size;
+
+} ASF_ObjectBase;
+
+static const XMP_Uns32 kASF_ObjectBaseLen = (XMP_Uns32) sizeof(ASF_ObjectBase);
+
+// =================================================================================================
+
+class ASF_LegacyManager {
+public:
+
+	enum objectType {
+		objectFileProperties		= 1 << 0,
+		objectContentDescription	= 1 << 1,
+		objectContentBranding		= 1 << 2,
+		objectContentEncryption		= 1 << 3
+	};
+
+	enum minObjectSize {
+		sizeContentDescription	= 34,
+		sizeContentBranding		= 40,
+		sizeContentEncryption	= 40
+	};
+
+	enum fieldType {
+		// File_Properties_Object
+		fieldCreationDate = 0,
+		// Content_Description_Object
+		fieldTitle,
+		fieldAuthor,
+		fieldCopyright,
+		fieldDescription,
+		// Content_Branding_Object
+		fieldCopyrightURL,
+		#if ! Exclude_LicenseURL_Recon
+			// Content_Encryption_Object
+			fieldLicenseURL,
+		#endif
+		// last
+		fieldLast
+	};
+
+	ASF_LegacyManager();
+	virtual ~ASF_LegacyManager();
+
+	bool SetField ( fieldType field, const std::string& value );
+	std::string GetField ( fieldType field );
+	unsigned int GetFieldMaxSize ( fieldType field );
+
+	void SetObjectExists ( objectType object );
+
+	void SetBroadcast ( const bool broadcast );
+	bool GetBroadcast();
+
+	void ComputeDigest();
+	bool CheckDigest ( const SXMPMeta& xmp );
+	void SetDigest ( SXMPMeta* xmp );
+
+	void ImportLegacy ( SXMPMeta* xmp );
+	int ExportLegacy ( const SXMPMeta& xmp );
+	bool hasLegacyChanged();
+	XMP_Int64 getLegacyDiff();
+	int changedObjects();
+
+	void SetPadding ( XMP_Int64 padding );
+	XMP_Int64 GetPadding();
+
+private:
+
+	typedef std::vector<std::string> TFields;
+	TFields fields;
+	bool broadcastSet;
+
+	std::string digestStr;
+	bool digestComputed;
+
+	bool imported;
+	int objectsExisting;
+	int objectsToExport;
+	XMP_Int64 legacyDiff;
+	XMP_Int64 padding;
+
+	static std::string NormalizeStringDisplayASCII ( std::string& operand );
+	static std::string NormalizeStringTrailingNull ( std::string& operand );
+
+	static void ConvertMSDateToISODate ( std::string& source, std::string* dest );
+	static void ConvertISODateToMSDate ( std::string& source, std::string* dest );
+
+	static int DaysInMonth ( XMP_Int32 year, XMP_Int32 month );
+	static bool IsLeapYear ( long year );
+
+}; // class ASF_LegacyManager
+
+// =================================================================================================
+
+class ASF_Support {
+public:
+
+	class ObjectData {
+		public:
+			ObjectData() : pos(0), len(0), guid(GUID_NULL), xmp(false) {}
+			virtual ~ObjectData() {}
+			XMP_Uns64	pos;		// file offset of object
+			XMP_Uns64	len;		// length of object data
+			GUID		guid;		// object GUID
+			bool		xmp;		// object with XMP ?
+	};
+
+	typedef std::vector<ObjectData> ObjectVector;
+	typedef ObjectVector::iterator ObjectIterator;
+
+	class ObjectState {
+
+		public:
+			ObjectState() : xmpPos(0), xmpLen(0), xmpIsLastObject(false), broadcast(false) {}
+			virtual ~ObjectState() {}
+			XMP_Uns64		xmpPos;
+			XMP_Uns64		xmpLen;
+			bool			xmpIsLastObject;
+			bool			broadcast;
+			ObjectData		xmpObject;
+			ObjectVector	objects;
+	};
+
+	ASF_Support();
+	ASF_Support ( ASF_LegacyManager* legacyManager, XMP_ProgressTracker* _progressTracker);
+	virtual ~ASF_Support();
+
+	long OpenASF ( XMP_IO* fileRef, ObjectState & inOutObjectState );
+
+	bool ReadObject ( XMP_IO* fileRef, ObjectState & inOutObjectState, XMP_Uns64 * objectLength, XMP_Uns64 & inOutPosition );
+
+	bool ReadHeaderObject ( XMP_IO* fileRef, ObjectState& inOutObjectState, const ObjectData& newObject );
+	bool WriteHeaderObject ( XMP_IO* sourceRef, XMP_IO* destRef, const ObjectData& object, ASF_LegacyManager& legacyManager, bool usePadding );
+	bool UpdateHeaderObject ( XMP_IO* fileRef, const ObjectData& object, ASF_LegacyManager& legacyManager );
+
+	bool UpdateFileSize ( XMP_IO* fileRef );
+
+	bool ReadHeaderExtensionObject ( XMP_IO* fileRef, ObjectState& inOutObjectState, const XMP_Uns64& pos, const ASF_ObjectBase& objectBase );
+	static bool WriteHeaderExtensionObject ( const std::string& buffer, std::string* header, const ASF_ObjectBase& objectBase, const int reservePadding );
+
+	static bool CreatePaddingObject ( std::string* header, const XMP_Uns64 size );
+
+	static bool WriteXMPObject ( XMP_IO* fileRef, XMP_Uns32 len, const char* inBuffer );
+	static bool UpdateXMPObject ( XMP_IO* fileRef, const ObjectData& object, XMP_Uns32 len, const char * inBuffer );
+	static bool CopyObject ( XMP_IO* sourceRef, XMP_IO* destRef, const ObjectData& object );
+
+	static bool ReadBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns64 len, char * outBuffer );
+	static bool WriteBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns32 len, const char * inBuffer );
+
+private:
+
+	ASF_LegacyManager* legacyManager;
+	XMP_ProgressTracker* progressTracker;//not owned by ASF_Support
+	XMP_Uns64 posFileSizeInfo;
+
+	static std::string ReplaceString ( std::string& operand, std::string& str, int offset, int count );
+
+}; // class ASF_Support
+
+// =================================================================================================
+
+#endif	// __ASF_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/GIF_Support.cpp b/XMPFiles/source/FormatSupport/GIF_Support.cpp
new file mode 100644
index 0000000..4f2ac6c
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/GIF_Support.cpp
@@ -0,0 +1,352 @@
+// =================================================================================================
+// 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
+// of the Adobe license agreement accompanying it.
+//
+// Derived from PNG_Support.cpp by Ian Jacobi
+// Ported to the CS6 version by Hubert Figuiere
+// =================================================================================================
+
+#include "GIF_Support.hpp"
+#include <string.h>
+
+#include "source/XIO.hpp"
+
+typedef std::basic_string<unsigned char> filebuffer;
+
+// Don't need CRC.
+
+namespace GIF_Support
+{
+        // This only really counts for extension blocks.
+	enum blockType {
+		bGraphicControl = 0xF9,
+		bComment        = 0xFE,
+		bPlainText      = 0x01,
+		bApplication    = 0xFF,
+		// Hacky.  Don't like the following, but there's no easy way.
+		bImage          = 0x2C,
+		bExtension      = 0x21,
+		bTerminator     = 0x3B,
+		bHeader         = 0x47
+	};
+
+	// =============================================================================================
+
+	long OpenGIF (  XMP_IO* fileRef, BlockState & inOutBlockState )
+	{
+		XMP_Uns64 pos = 0;
+		unsigned char name;
+		XMP_Uns32 len;
+		BlockData newBlock;
+	
+		pos = fileRef->Seek ( 0, kXMP_SeekFromStart );
+		// header needs to be a block, mostly for our safe write.
+		pos = ReadHeader ( fileRef );
+		if (pos < 13)
+			return 0;
+		
+		newBlock.pos = 0;
+		newBlock.len = pos;
+		newBlock.type = bHeader;
+		inOutBlockState.blocks.push_back(newBlock);
+	
+		// read first and following blocks
+		while ( ReadBlock ( fileRef, inOutBlockState, &name, &len, pos) ) {}
+	
+		return inOutBlockState.blocks.size();
+
+	}
+
+	// =============================================================================================
+
+	long ReadHeader ( XMP_IO* fileRef )
+	{
+		long bytesRead;
+		long headerSize;
+		long tableSize = 0;
+		long bytesPerColor = 0;
+		unsigned char buffer[768];
+		
+		headerSize = 0;
+		bytesRead = fileRef->Read ( buffer, GIF_SIGNATURE_LEN );
+		if ( bytesRead != GIF_SIGNATURE_LEN ) return 0;
+		if ( memcmp ( buffer, GIF_SIGNATURE_DATA, GIF_SIGNATURE_LEN) != 0 ) return 0;
+		headerSize += bytesRead;
+		bytesRead = fileRef->Read ( buffer, 3 );
+		if ( bytesRead != 3 ) return 0;
+		if ( memcmp ( buffer, "87a", 3 ) != 0 && memcmp ( buffer, "89a", 3 ) != 0 ) return 0;
+		headerSize += bytesRead;
+		bytesRead = fileRef->Read ( buffer, 4 );
+		if ( bytesRead != 4 ) return 0;
+		headerSize += bytesRead;
+		bytesRead = fileRef->Read ( buffer, 3 );
+		if ( bytesRead != 3 ) return 0;
+		headerSize += bytesRead;
+		if ( buffer[0] & 0x80 ) tableSize = (1 << ((buffer[0] & 0x07) + 1)) * 3;
+		bytesRead = fileRef->Read ( buffer, tableSize );
+		if ( bytesRead != tableSize ) return 0;
+		headerSize += bytesRead;
+		
+		return headerSize;
+	}
+
+	// =============================================================================================
+
+	bool  ReadBlock ( XMP_IO* fileRef, BlockState & inOutBlockState, unsigned char * blockType, XMP_Uns32 * blockLength, XMP_Uns64 & inOutPosition )
+	{
+		try
+		{
+			XMP_Uns64 startPosition = inOutPosition;
+			long bytesRead;
+			long blockSize;
+			unsigned char buffer[768];
+
+			bytesRead = fileRef->Read ( buffer, 1 );
+			if ( bytesRead != 1 ) return false;
+			inOutPosition += 1;
+			if ( buffer[0] == bImage )
+			{
+				// Image is a special case.
+			        long tableSize = 0;
+				bytesRead = fileRef->Read ( buffer, 4 );
+				if ( bytesRead != 4 ) return false;
+				inOutPosition += 4;
+				bytesRead = fileRef->Read ( buffer, 4 );
+				if ( bytesRead != 4 ) return false;
+				inOutPosition += 4;
+				bytesRead = fileRef->Read ( buffer, 1 );
+				if ( bytesRead != 1 ) return false;
+				inOutPosition += 1;
+				if ( buffer[0] & 0x80 ) tableSize = (1 << ((buffer[0] & 0x07) + 1)) * 3;
+				bytesRead = fileRef->Read ( buffer, tableSize );
+				if ( bytesRead != tableSize ) return 0;
+				inOutPosition += tableSize;
+				bytesRead = fileRef->Read ( buffer, 1 );
+				if ( bytesRead != 1 ) return false;
+				inOutPosition += 1;
+				bytesRead = fileRef->Read ( buffer, 1 );
+				if ( bytesRead != 1 ) return false;
+				inOutPosition += 1;
+				tableSize = buffer[0];
+				while ( tableSize != 0x00 )
+				{
+					bytesRead = fileRef->Read ( buffer, tableSize );
+					if ( bytesRead != tableSize ) return false;
+					inOutPosition += tableSize;
+					bytesRead = fileRef->Read ( buffer, 1 );
+					if ( bytesRead != 1 ) return false;
+					inOutPosition += 1;
+					tableSize = buffer[0];
+				}
+
+				BlockData newBlock;
+
+				newBlock.pos = startPosition;
+				newBlock.len = inOutPosition - startPosition;
+				newBlock.type = bImage;
+
+				inOutBlockState.blocks.push_back ( newBlock );
+			}
+			else if ( buffer[0] == bExtension )
+			{
+				unsigned char type;
+				long tableSize = 0;
+
+				BlockData newBlock;
+
+				newBlock.pos = startPosition;
+
+				bytesRead = fileRef->Read ( buffer, 1 );
+				if ( bytesRead != 1 ) return false;
+				inOutPosition += 1;
+				type = buffer[0];
+				newBlock.type = type;
+
+				bytesRead = fileRef->Read ( buffer, 1 );
+				if ( bytesRead != 1 ) return false;
+				inOutPosition += 1;
+				tableSize = buffer[0];
+				while ( tableSize != 0x00 )
+				{
+					bytesRead = fileRef->Read ( buffer, tableSize );
+					if ( bytesRead != tableSize ) return false;
+					inOutPosition += tableSize;
+					if ( inOutPosition - startPosition == 14 && type == bApplication )
+					{
+						// Check for XMP identifier...
+						CheckApplicationBlockHeader ( fileRef, inOutBlockState, newBlock, inOutPosition );
+
+						if ( newBlock.xmp == true )
+						{
+							newBlock.len = inOutPosition - startPosition;
+
+							inOutBlockState.blocks.push_back ( newBlock );
+
+							return true;
+						}
+					}
+					bytesRead = fileRef->Read ( buffer, 1 );
+					if ( bytesRead != 1 ) return false;
+					inOutPosition += 1;
+					tableSize = buffer[0];
+				}
+
+				newBlock.len = inOutPosition - startPosition;
+
+				inOutBlockState.blocks.push_back ( newBlock );
+			}
+			else if ( buffer[0] == bTerminator )
+			{
+				BlockData newBlock;
+
+				newBlock.pos = startPosition;
+				newBlock.len = 1;
+				newBlock.type = buffer[0];
+
+				inOutBlockState.blocks.push_back ( newBlock );
+			}
+
+		} catch ( ... ) {
+
+			return false;
+
+		}
+	
+		return true;
+
+	}
+
+	// =============================================================================================
+
+	bool WriteXMPBlock ( XMP_IO* fileRef, XMP_Uns32 len, const char* inBuffer )
+	{
+		bool ret = false;
+		unsigned long datalen = (APPLICATION_HEADER_LEN + len + MAGIC_TRAILER_LEN);
+		unsigned char* buffer = new unsigned char[datalen];
+
+		try
+		{
+			size_t pos = 0;
+			memcpy(&buffer[pos], APPLICATION_HEADER_DATA, APPLICATION_HEADER_LEN);
+			pos += APPLICATION_HEADER_LEN;
+			memcpy(&buffer[pos], inBuffer, len);
+			pos += len;
+			memcpy(&buffer[pos], MAGIC_TRAILER_DATA, MAGIC_TRAILER_LEN);
+
+			fileRef->Write(buffer, datalen);
+
+			ret = true;
+		}
+		catch ( ... ) {}
+
+		delete [] buffer;
+
+		return ret;
+	}
+
+	// =============================================================================================
+
+	bool CopyBlock ( XMP_IO* sourceRef, XMP_IO* destRef, BlockData& block )
+	{
+		try
+		{
+			sourceRef->Seek ( block.pos, kXMP_SeekFromStart );
+			XIO::Copy (sourceRef, destRef, (block.len));
+
+		} catch ( ... ) {
+
+			return false;
+
+		}
+	
+		return true;
+	}
+
+	// =============================================================================================
+
+	// Don't need CRC.
+
+	// =============================================================================================
+
+	unsigned long CheckApplicationBlockHeader ( XMP_IO* fileRef, BlockState& inOutBlockState, BlockData& inOutBlockData, XMP_Uns64& inOutPosition )
+	{
+		try
+		{
+			fileRef->Seek((inOutBlockData.pos), kXMP_SeekFromStart);
+
+			unsigned char buffer[256];
+			long bytesRead = fileRef->Read ( buffer, APPLICATION_HEADER_LEN );
+
+			if (bytesRead == APPLICATION_HEADER_LEN)
+			{
+				if (memcmp(buffer, APPLICATION_HEADER_DATA, APPLICATION_HEADER_LEN) == 0)
+				{
+					// We still have to go through all of the data...
+					long tableSize = 0;
+					long xmpSize;
+					
+					inOutPosition = inOutBlockData.pos + APPLICATION_HEADER_LEN;
+					inOutBlockState.xmpPos = inOutPosition;
+					bytesRead = fileRef->Read ( buffer, 1 );
+					if ( bytesRead != 1 ) return 0;
+					inOutPosition += 1;
+					tableSize = buffer[0];
+					while ( tableSize != 0x00 )
+					{
+						bytesRead = fileRef->Read ( buffer, tableSize );
+						if ( bytesRead != tableSize ) return false;
+						inOutPosition += tableSize;
+						bytesRead = fileRef->Read ( buffer, 1 );
+						if ( bytesRead != 1 ) return false;
+						inOutPosition += 1;
+						tableSize = buffer[0];
+					}
+					inOutBlockState.xmpLen = inOutPosition - inOutBlockData.pos - APPLICATION_HEADER_LEN - MAGIC_TRAILER_LEN;
+					inOutBlockState.xmpBlock = inOutBlockData;
+					inOutBlockData.xmp = true;
+				}
+			}
+		}
+		catch ( ... ) {}
+	
+		return 0;
+	}
+
+	bool ReadBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns32 len, char * outBuffer )
+	{
+		try
+		{
+			if ( (fileRef == 0) || (outBuffer == 0) ) return false;
+		
+			fileRef->Seek ( pos, kXMP_SeekFromStart );
+			long bytesRead = fileRef->Read ( outBuffer, len );
+			if ( XMP_Uns32(bytesRead) != len ) return false;
+		
+			return true;
+		}
+		catch ( ... ) {}
+
+		return false;
+	}
+
+	bool WriteBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns32 len, const char * inBuffer )
+	{
+		try
+		{
+			if ( (fileRef == 0) || (inBuffer == 0) ) return false;
+		
+			fileRef->Seek ( pos, kXMP_SeekFromStart );
+			fileRef->Write( inBuffer, len );
+		
+			return true;
+		}
+		catch ( ... ) {}
+
+		return false;
+	}
+
+} // namespace GIF_Support
diff --git a/XMPFiles/source/FormatSupport/GIF_Support.hpp b/XMPFiles/source/FormatSupport/GIF_Support.hpp
new file mode 100644
index 0000000..aa81b8a
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/GIF_Support.hpp
@@ -0,0 +1,71 @@
+#ifndef __GIF_Support_hpp__
+#define __GIF_Support_hpp__ 1
+
+// =================================================================================================
+// 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
+// of the Adobe license agreement accompanying it
+//
+// Derived from PNG_Support.hpp by Ian Jacobi
+// =================================================================================================
+
+#include "XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#define GIF_SIGNATURE_LEN		3
+#define GIF_SIGNATURE_DATA		"\x47\x49\x46"
+
+#define APPLICATION_HEADER_LEN			14
+#define APPLICATION_HEADER_DATA		"\x21\xFF\x0B\x58\x4D\x50\x20\x44\x61\x74\x61\x58\x4D\x50"
+
+#define MAGIC_TRAILER_LEN		258
+#define MAGIC_TRAILER_DATA		"\x01\xFF\xFE\xFD\xFC\xFB\xFA\xF9\xF8\xF7\xF6\xF5\xF4\xF3\xF2\xF1\xF0\xEF\xEE\xED\xEC\xEB\xEA\xE9\xE8\xE7\xE6\xE5\xE4\xE3\xE2\xE1\xE0\xDF\xDE\xDD\xDC\xDB\xDA\xD9\xD8\xD7\xD6\xD5\xD4\xD3\xD2\xD1\xD0\xCF\xCE\xCD\xCC\xCB\xCA\xC9\xC8\xC7\xC6\xC5\xC4\xC3\xC2\xC1\xC0\xBF\xBE\xBD\xBC\xBB\xBA\xB9\xB8\xB7\xB6\xB5\xB4\xB3\xB2\xB1\xB0\xAF\xAE\xAD\xAC\xAB\xAA\xA9\xA8\xA7\xA6\xA5\xA4\xA3\xA2\xA1\xA0\x9F\x9E\x9D\x9C\x9B\x9A\x99\x98\x97\x96\x95\x94\x93\x92\x91\x90\x8F\x8E\x8D\x8C\x8B\x8A\x89\x88\x87\x86\x85\x84\x83\x82\x81\x80\x7F\x7E\x7D\x7C\x7B\x7A\x79\x78\x77\x76\x75\x74\x73\x72\x71\x70\x6F\x6E\x6D\x6C\x6B\x6A\x69\x68\x67\x66\x65\x64\x63\x62\x61\x60\x5F\x5E\x5D\x5C\x5B\x5A\x59\x58\x57\x56\x55\x54\x53\x52\x51\x50\x4F\x4E\x4D\x4C\x4B\x4A\x49\x48\x47\x46\x45\x44\x43\x42\x41\x40\x3F\x3E\x3D\x3C\x3B\x3A\x39\x38\x37\x36\x35\x34\x33\x32\x31\x30\x2F\x2E\x2D\x2C\x2B\x2A\x29\x28\x27\x26\x25\x24\x23\x22\x21\x20\x1F\x1E\x1D\x1C\x1B\x1A\x19\x18\x17\x16\x15\x14\x13\x12\x11\x10\x0F\x0E\x0D\x0C\x0B\x0A\x09\x08\x07\x06\x05\x04\x03\x02\x01\x00\x00"
+
+namespace GIF_Support 
+{
+	class BlockData
+	{
+		public:
+			BlockData() : pos(0), len(0), type(0), xmp(false) {}
+			virtual ~BlockData() {}
+
+			XMP_Uns64	pos;		// file offset of block
+			XMP_Uns32	len;		// length of block data, including extension introducer and label
+			char		type;		// name/type of block
+			bool		xmp;		// application extension block with XMP ?
+	};
+
+	typedef std::vector<BlockData> BlockVector;
+	typedef BlockVector::iterator BlockIterator;
+
+	class BlockState
+	{
+		public:
+			BlockState() : xmpPos(0), xmpLen(0) {}
+			virtual ~BlockState() {}
+
+			XMP_Uns64	xmpPos;
+			XMP_Uns32	xmpLen;
+			BlockData	xmpBlock;
+			BlockVector blocks;	/* vector of blocks */
+	};
+
+	long OpenGIF ( XMP_IO* fileRef, BlockState& inOutBlockState );
+
+	long ReadHeader ( XMP_IO* fileRef );
+	bool ReadBlock ( XMP_IO* fileRef, BlockState& inOutBlockState, unsigned char* blockType, XMP_Uns32* blockLength, XMP_Uns64& inOutPosition );
+	bool WriteXMPBlock ( XMP_IO* fileRef, XMP_Uns32 len, const char* inBuffer );
+	bool CopyBlock ( XMP_IO* sourceRef, XMP_IO* destRef, BlockData& block );
+
+	unsigned long CheckApplicationBlockHeader ( XMP_IO* fileRef, BlockState& inOutBlockState, BlockData& inOutBlockData, XMP_Uns64& inOutPosition );
+
+	bool ReadBuffer ( XMP_IO* fileRef, XMP_Uns64& pos, XMP_Uns32 len, char* outBuffer );
+	bool WriteBuffer ( XMP_IO* fileRef, XMP_Uns64& pos, XMP_Uns32 len, const char* inBuffer );
+
+} // namespace GIF_Support
+
+#endif	// __GIF_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/ID3_Support.cpp b/XMPFiles/source/FormatSupport/ID3_Support.cpp
new file mode 100644
index 0000000..dd19c16
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp
@@ -0,0 +1,892 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/ID3_Support.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+
+#include "source/UnicodeConversions.hpp"
+#include "source/XIO.hpp"
+
+#include <vector>
+
+#define MIN(a,b)	((a) < (b) ? (a) : (b))
+
+#if !XMP_WinBuild
+	int stricmp ( const char * left, const char * right )	// Case insensitive ASCII compare.
+	{
+		char chL = *left;	// ! Allow for 0 passes in the loop (one string is empty).
+		char chR = *right;	// ! Return -1 for stricmp ( "a", "Z" ).
+
+		for ( ; (*left != 0) && (*right != 0); ++left, ++right ) {
+			chL = *left;
+			chR = *right;
+			if ( chL == chR ) continue;
+			if ( ('A' <= chL) && (chL <= 'Z') ) chL |= 0x20;
+			if ( ('A' <= chR) && (chR <= 'Z') ) chR |= 0x20;
+			if ( chL != chR ) break;
+		}
+
+		if ( chL == chR ) return 0;
+		if ( chL < chR ) return -1;
+		return 1;
+	}
+#endif
+
+namespace ID3_Support {
+
+// =================================================================================================
+
+ID3GenreMap* kMapID3GenreCodeToName = 0;	// Map from a code like "21" or "RX" to the full name.
+ID3GenreMap* kMapID3GenreNameToCode = 0;	// Map from the full name to a code like "21" or "RX".
+
+static size_t numberedGenreCount = 0;	// Set in InitializeGlobals, used in ID3v1Tag::read and write.
+
+struct GenreInfo { const char * code; const char * name; };
+
+static const GenreInfo kAbbreviatedGenres[] = {	// ID3 v3 or v4 genre abbreviations.
+	{ "RX", "Remix" },
+	{ "CR", "Cover" },
+	{ 0, 0 }
+};
+
+static const GenreInfo kNumberedGenres[] = {	// Numeric genre codes from ID3 v1, complete range of 0..125.
+	{   "0", "Blues" },
+	{   "1", "Classic Rock" },
+	{   "2", "Country" },
+	{   "3", "Dance" },
+	{   "4", "Disco" },
+	{   "5", "Funk" },
+	{   "6", "Grunge" },
+	{   "7", "Hip-Hop" },
+	{   "8", "Jazz" },
+	{   "9", "Metal" },
+	{  "10", "New Age" },
+	{  "11", "Oldies" },
+	{  "12", "Other" },
+	{  "13", "Pop" },
+	{  "14", "R&B" },
+	{  "15", "Rap" },
+	{  "16", "Reggae" },
+	{  "17", "Rock" },
+	{  "18", "Techno" },
+	{  "19", "Industrial" },
+	{  "20", "Alternative" },
+	{  "21", "Ska" },
+	{  "22", "Death Metal" },
+	{  "23", "Pranks" },
+	{  "24", "Soundtrack" },
+	{  "25", "Euro-Techno" },
+	{  "26", "Ambient" },
+	{  "27", "Trip-Hop" },
+	{  "28", "Vocal" },
+	{  "29", "Jazz+Funk" },
+	{  "30", "Fusion" },
+	{  "31", "Trance" },
+	{  "32", "Classical" },
+	{  "33", "Instrumental" },
+	{  "34", "Acid" },
+	{  "35", "House" },
+	{  "36", "Game" },
+	{  "37", "Sound Clip" },
+	{  "38", "Gospel" },
+	{  "39", "Noise" },
+	{  "40", "AlternRock" },
+	{  "41", "Bass" },
+	{  "42", "Soul" },
+	{  "43", "Punk" },
+	{  "44", "Space" },
+	{  "45", "Meditative" },
+	{  "46", "Instrumental Pop" },
+	{  "47", "Instrumental Rock" },
+	{  "48", "Ethnic" },
+	{  "49", "Gothic" },
+	{  "50", "Darkwave" },
+	{  "51", "Techno-Industrial" },
+	{  "52", "Electronic" },
+	{  "53", "Pop-Folk" },
+	{  "54", "Eurodance" },
+	{  "55", "Dream" },
+	{  "56", "Southern Rock" },
+	{  "57", "Comedy" },
+	{  "58", "Cult" },
+	{  "59", "Gangsta" },
+	{  "60", "Top 40" },
+	{  "61", "Christian Rap" },
+	{  "62", "Pop/Funk" },
+	{  "63", "Jungle" },
+	{  "64", "Native American" },
+	{  "65", "Cabaret" },
+	{  "66", "New Wave" },
+	{  "67", "Psychadelic" },
+	{  "68", "Rave" },
+	{  "69", "Showtunes" },
+	{  "70", "Trailer" },
+	{  "71", "Lo-Fi" },
+	{  "72", "Tribal" },
+	{  "73", "Acid Punk" },
+	{  "74", "Acid Jazz" },
+	{  "75", "Polka" },
+	{  "76", "Retro" },
+	{  "77", "Musical" },
+	{  "78", "Rock & Roll" },
+	{  "79", "Hard Rock" },
+	{  "80", "Folk" },
+	{  "81", "Folk-Rock" },
+	{  "82", "National Folk" },
+	{  "83", "Swing" },
+	{  "84", "Fast Fusion" },
+	{  "85", "Bebob" },
+	{  "86", "Latin" },
+	{  "87", "Revival" },
+	{  "88", "Celtic" },
+	{  "89", "Bluegrass" },
+	{  "90", "Avantgarde" },
+	{  "91", "Gothic Rock" },
+	{  "92", "Progressive Rock" },
+	{  "93", "Psychedelic Rock" },
+	{  "94", "Symphonic Rock" },
+	{  "95", "Slow Rock" },
+	{  "96", "Big Band" },
+	{  "97", "Chorus" },
+	{  "98", "Easy Listening" },
+	{  "99", "Acoustic" },
+	{ "100", "Humour" },
+	{ "101", "Speech" },
+	{ "102", "Chanson" },
+	{ "103", "Opera" },
+	{ "104", "Chamber Music" },
+	{ "105", "Sonata" },
+	{ "106", "Symphony" },
+	{ "107", "Booty Bass" },
+	{ "108", "Primus" },
+	{ "109", "Porn Groove" },
+	{ "110", "Satire" },
+	{ "111", "Slow Jam" },
+	{ "112", "Club" },
+	{ "113", "Tango" },
+	{ "114", "Samba" },
+	{ "115", "Folklore" },
+	{ "116", "Ballad" },
+	{ "117", "Power Ballad" },
+	{ "118", "Rhythmic Soul" },
+	{ "119", "Freestyle" },
+	{ "120", "Duet" },
+	{ "121", "Punk Rock" },
+	{ "122", "Drum Solo" },
+	{ "123", "A capella" },	// ! Should be Acapella, keep space for compatibility with old code.
+	{ "124", "Euro-House" },
+	{ "125", "Dance Hall" },
+	{ 0, 0 }
+};
+
+// =================================================================================================
+
+bool InitializeGlobals()
+{
+
+	kMapID3GenreCodeToName = new ID3GenreMap;
+	if ( kMapID3GenreCodeToName == 0 ) return false;
+	kMapID3GenreNameToCode = new ID3GenreMap;
+	if ( kMapID3GenreNameToCode == 0 ) return false;
+	
+	ID3GenreMap::value_type newValue;
+	
+	size_t i;
+	
+	for ( i = 0; kNumberedGenres[i].code != 0; ++i ) {
+		XMP_Assert ( (long)i == strtol ( kNumberedGenres[i].code, 0, 10 ) );
+		ID3GenreMap::value_type code2Name ( kNumberedGenres[i].code, kNumberedGenres[i].name );
+		kMapID3GenreCodeToName->insert ( kMapID3GenreCodeToName->end(), code2Name );
+		ID3GenreMap::value_type name2Code ( kNumberedGenres[i].name, kNumberedGenres[i].code );
+		kMapID3GenreNameToCode->insert ( kMapID3GenreNameToCode->end(), name2Code );
+	}
+	
+	numberedGenreCount = i;	// Used in ID3v1Tag::read and write.
+	
+	for ( i = 0; kAbbreviatedGenres[i].code != 0; ++i ) {
+		ID3GenreMap::value_type code2Name ( kAbbreviatedGenres[i].code, kAbbreviatedGenres[i].name );
+		kMapID3GenreCodeToName->insert ( kMapID3GenreCodeToName->end(), code2Name );
+		ID3GenreMap::value_type name2Code ( kAbbreviatedGenres[i].name, kAbbreviatedGenres[i].code );
+		kMapID3GenreNameToCode->insert ( kMapID3GenreNameToCode->end(), name2Code );
+	}
+
+	return true;
+
+}	// InitializeGlobals
+
+// =================================================================================================
+
+void TerminateGlobals()
+{
+	delete kMapID3GenreCodeToName;
+	delete kMapID3GenreNameToCode;
+	kMapID3GenreCodeToName = kMapID3GenreNameToCode = 0;
+}
+
+// =================================================================================================
+// GenreUtils
+// =================================================================================================
+
+const char * GenreUtils::FindGenreName ( const std::string & code )
+{
+	// Lookup a genre code and return its name if known, otherwise 0.
+	
+	const char * name = 0;
+	ID3GenreMap::iterator mapPos = kMapID3GenreCodeToName->find ( code.c_str() );
+	if ( mapPos != kMapID3GenreCodeToName->end() ) name = mapPos->second;
+	return name;
+
+}
+
+// =================================================================================================
+	
+const char * GenreUtils::FindGenreCode ( const std::string & name )
+{
+	// Lookup a genre name and return its code if known, otherwise 0.
+	
+	const char * code = 0;
+	ID3GenreMap::iterator mapPos = kMapID3GenreNameToCode->find ( name.c_str() );
+	if ( mapPos != kMapID3GenreNameToCode->end() ) code = mapPos->second;
+	return code;
+
+}
+
+// =================================================================================================
+
+static void StripOutsideSpaces ( std::string * value )
+{
+	size_t length = value->size();
+	size_t first, last;
+	
+	for ( first = 0; ((first < length) && ((*value)[first] == ' ')); ++first ) {}
+	if ( first == length ) { value->erase(); return; }
+	XMP_Assert ( (first < length) && ((*value)[first] != ' ') );
+	
+	for ( last = length-1; ((last > first) && ((*value)[last] == ' ')); --last ) {}
+	if ( (first == 0) && (last == length-1) ) return;
+	
+	size_t newLen = last - first + 1;
+	if ( newLen < length ) *value = value->substr ( first, newLen );
+	
+}
+
+// =================================================================================================
+
+void GenreUtils::ConvertGenreToXMP ( const char * id3Genre, std::string * xmpGenre )
+{
+	// If the first character of TCON is not '(' then the entire TCON value is taken as the genre
+	// name and the suffix is empty.
+	//
+	// If the first character of TCON is '(' then the string up to ')' (or the end) is taken as the
+	// coded genre name. The rest of the TCON value after ')' is taken as the suffix.
+	//
+	// If the coded name is known then the corresponsing full name is used as the genre name, with
+	// no parens.
+	//
+	// If the coded name is not known then the coded name with parens is used as the genre name.
+	//
+	// The value of xmpDM:genre begins with the genre name. If the suffix is not empty we append
+	// "; " and the suffix. The known coded genre names currently do not use semicolon.
+	//
+	// Keeping the parens when importing unknown coded names might seem odd. But it preserves the
+	// ID3 syntax when exporting. Otherwise we would import "(XX)" and export "XX". We don't add
+	// parens all the time on export, that would import "Blues/R&B" and export "(Blues/R&B)".
+
+	xmpGenre->erase();
+	size_t id3Length = strlen ( id3Genre );
+	if ( id3Length == 0 ) return;
+	
+	if ( id3Genre[0] != '(' ) {
+		// No left paren, take the whole TCON value as the XMP value.
+		xmpGenre->assign ( id3Genre, id3Length );
+		StripOutsideSpaces ( xmpGenre );
+		return;
+	}
+	
+	// The first character of TCON is '(', process the coded part and the suffix.
+	
+	size_t codeEnd;
+	std::string genreCode, suffix;
+
+	for ( codeEnd = 1; ((codeEnd < id3Length) && (id3Genre[codeEnd] != ')')); ++codeEnd ) {}
+	genreCode.assign ( &id3Genre[1], codeEnd-1 );
+	if ( codeEnd < id3Length ) suffix.assign ( &id3Genre[codeEnd+1], id3Length-codeEnd-1 );
+
+	StripOutsideSpaces ( &genreCode );
+	StripOutsideSpaces ( &suffix );
+
+	if ( genreCode.empty() ) {
+
+		(*xmpGenre) = suffix;	// Degenerate case of "()suffix", treat as if "suffix".
+
+	} else {
+
+		const char * fullName = FindGenreName ( genreCode );
+
+		if ( fullName != 0 ) {
+			(*xmpGenre) = fullName;
+		} else {
+			(*xmpGenre) = '(';
+			(*xmpGenre) += genreCode;
+			(*xmpGenre) += ')';
+		}
+
+		if ( ! suffix.empty() ) {
+			(*xmpGenre) += "; ";
+			(*xmpGenre) += suffix;
+		}
+
+	}
+
+}
+
+// =================================================================================================
+
+void GenreUtils::ConvertGenreToID3 ( const char * xmpGenre, std::string * id3Genre )
+{
+	// The genre name is the xmpDM:genre value up to ';', with spaces at the front or back removed.
+	// The suffix is everything after ';', also with spaces at the front or back removed.
+	//
+	// If the genre name is known, it is replaced by the coded name in parens.
+	//
+	// The TCON value is the genre name plus the suffix. If the genre name does not end in ')' then
+	// a space is inserted.
+	
+	id3Genre->erase();
+	size_t xmpLength = strlen ( xmpGenre );
+	if ( xmpLength == 0 ) return;
+	
+	size_t nameEnd;
+	std::string genreName, suffix;
+	
+	for ( nameEnd = 0; ((nameEnd < xmpLength) && (xmpGenre[nameEnd] != ';')); ++nameEnd ) {}
+	genreName.assign ( xmpGenre, nameEnd );
+	if ( nameEnd < xmpLength ) suffix.assign ( &xmpGenre[nameEnd+1], xmpLength-nameEnd-1 );
+
+	StripOutsideSpaces ( &genreName );
+	StripOutsideSpaces ( &suffix );
+	
+	if ( genreName.empty() ) {
+
+		(*id3Genre) = suffix;	// Degenerate case of "; suffix", treat as if "suffix".
+
+	} else {
+
+		const char * codedName = FindGenreCode ( genreName );
+		if ( codedName != 0 ) {
+			genreName = '(';
+			genreName += codedName;
+			genreName += ')';
+		}
+		
+		(*id3Genre) = genreName;
+		if ( ! suffix.empty() ) {
+			if ( genreName[genreName.size()-1] != ')' ) (*id3Genre) += ' ';
+			(*id3Genre) += suffix;
+		}
+
+	}
+
+}
+
+// =================================================================================================
+// ID3Header
+// =================================================================================================
+
+bool ID3Header::read ( XMP_IO* file )
+{
+
+	XMP_Assert ( sizeof(fields) == kID3_TagHeaderSize );
+	file->ReadAll ( this->fields, kID3_TagHeaderSize );
+
+	if ( ! CheckBytes ( &this->fields[ID3Header::o_id], "ID3", 3 ) ) {
+		// chuck in default contents:
+		const static char defaultHeader[kID3_TagHeaderSize] = { 'I', 'D', '3', 3, 0, 0, 0, 0, 0, 0 };
+		memcpy ( this->fields, defaultHeader, kID3_TagHeaderSize );
+		return false; // no header found (o.k.) thus stick with new, default header constructed above
+	}
+
+	XMP_Uns8 major = this->fields[o_vMajor];
+	XMP_Uns8 minor = this->fields[o_vMinor];
+	XMP_Validate ( ((2 <= major) && (major <= 4)), "Invalid ID3 major version", kXMPErr_BadFileFormat );
+
+	return true;
+
+}
+
+// =================================================================================================
+
+void ID3Header::write ( XMP_IO* file, XMP_Int64 tagSize )
+{
+
+	XMP_Assert ( ((XMP_Int64)kID3_TagHeaderSize <= tagSize) && (tagSize < 256*1024*1024) );	// 256 MB limit due to synching.
+
+	XMP_Uns32 synchSize = int32ToSynch ( (XMP_Uns32)tagSize - kID3_TagHeaderSize );
+	PutUns32BE ( synchSize, &this->fields[ID3Header::o_size] );
+	file->Write ( this->fields, kID3_TagHeaderSize );
+
+}
+
+// =================================================================================================
+// ID3v2Frame
+// =================================================================================================
+
+#define frameDefaults	id(0), flags(0), content(0), contentSize(0), active(true), changed(false)
+
+ID3v2Frame::ID3v2Frame() : frameDefaults
+{
+	XMP_Assert ( sizeof(fields) == kV23_FrameHeaderSize );	// Only need to do this in one place.
+	memset ( this->fields, 0, kV23_FrameHeaderSize );
+}
+
+// =================================================================================================
+
+ID3v2Frame::ID3v2Frame ( XMP_Uns32 id ) : frameDefaults
+{
+	memset ( this->fields, 0, kV23_FrameHeaderSize );
+	this->id = id;
+	PutUns32BE ( id, &this->fields[o_id] );
+}
+
+// =================================================================================================
+
+void ID3v2Frame::release()
+{
+	if ( this->content != 0 ) delete [] this->content;
+	this->content = 0;
+	this->contentSize = 0;
+}
+
+// =================================================================================================
+
+void ID3v2Frame::setFrameValue ( const std::string& rawvalue, bool needDescriptor,
+											  bool utf16, bool isXMPPRIVFrame, bool needEncodingByte )
+{
+
+	std::string value;
+
+	if ( isXMPPRIVFrame ) {
+
+		XMP_Assert ( (! needDescriptor) && (! utf16) );
+
+		value.append ( "XMP\0", 4 );
+		value.append ( rawvalue );
+		value.append ( "\0", 1  ); // final zero byte
+
+	} else {
+
+		if ( needEncodingByte ) {
+			if ( utf16 ) {
+				value.append ( "\x1", 1  );
+			} else {
+				value.append ( "\x0", 1  );
+			}
+		}
+
+		if ( needDescriptor ) value.append ( "eng", 3 );
+
+		if ( utf16 ) {
+
+			if ( needDescriptor ) value.append ( "\xFF\xFE\0\0", 4 );
+
+			value.append ( "\xFF\xFE", 2 );
+			std::string utf16str;
+			ToUTF16 ( (XMP_Uns8*) rawvalue.c_str(), rawvalue.size(), &utf16str, false );
+			value.append ( utf16str );
+			value.append ( "\0\0", 2 );
+
+		} else {
+
+			std::string convertedValue;
+			ReconcileUtils::UTF8ToLatin1 ( rawvalue.c_str(), rawvalue.size(), &convertedValue );
+
+			if ( needDescriptor ) value.append ( "\0", 1 );
+			value.append ( convertedValue );
+			value.append ( "\0", 1  );
+
+		}
+
+	}
+
+	this->changed = true;
+	this->release();
+
+	this->contentSize = (XMP_Int32) value.size();
+	XMP_Validate ( (this->contentSize < 20*1024*1024), "XMP Property exceeds 20MB in size", kXMPErr_InternalFailure );
+	this->content = new char [ this->contentSize ];
+	memcpy ( this->content, value.c_str(), this->contentSize );
+
+}	// ID3v2Frame::setFrameValue
+
+// =================================================================================================
+
+XMP_Int64 ID3v2Frame::read ( XMP_IO* file, XMP_Uns8 majorVersion )
+{
+	XMP_Assert ( (2 <= majorVersion) && (majorVersion <= 4) );
+
+	this->release(); // ensures/allows reuse of 'curFrame'
+	XMP_Int64 start = file->Offset();
+	
+	if ( majorVersion > 2 ) {
+		file->ReadAll ( this->fields, kV23_FrameHeaderSize );
+	} else {
+		// Read the 6 byte v2.2 header into the 10 byte form.
+		memset ( this->fields, 0, kV23_FrameHeaderSize );	// Clear all of the bytes.
+		file->ReadAll ( &this->fields[o_id], 3 );		// Leave the low order byte as zero.
+		file->ReadAll ( &this->fields[o_size+1], 3 );	// Read big endian UInt24.
+	}
+
+	this->id = GetUns32BE ( &this->fields[o_id] );
+
+	if ( this->id == 0 ) {
+		file->Seek ( start, kXMP_SeekFromStart );	// Zero ID must mean nothing but padding.
+		return 0;
+	}
+
+	this->flags = GetUns16BE ( &this->fields[o_flags] );
+	XMP_Validate ( (0 == (this->flags & 0xEE)), "invalid lower bits in frame flags", kXMPErr_BadFileFormat );
+
+	//*** flag handling, spec :429ff aka line 431ff  (i.e. Frame should be discarded)
+	//  compression and all of that..., unsynchronisation
+	this->contentSize = GetUns32BE ( &this->fields[o_size] );
+	if ( majorVersion == 4 ) this->contentSize = synchToInt32 ( this->contentSize );
+
+	XMP_Validate ( (this->contentSize >= 0), "negative frame size", kXMPErr_BadFileFormat );
+	XMP_Validate ( (this->contentSize < 20*1024*1024), "single frame exceeds 20MB", kXMPErr_BadFileFormat );
+
+	this->content = new char [ this->contentSize ];
+
+	file->ReadAll ( this->content, this->contentSize );
+	return file->Offset() - start;
+
+}	// ID3v2Frame::read
+
+// =================================================================================================
+
+void ID3v2Frame::write ( XMP_IO* file, XMP_Uns8 majorVersion )
+{
+	XMP_Assert ( (2 <= majorVersion) && (majorVersion <= 4) );
+
+	if ( majorVersion < 4 ) {
+		PutUns32BE ( this->contentSize, &this->fields[o_size] );
+	} else {
+		PutUns32BE ( int32ToSynch ( this->contentSize ), &this->fields[o_size] );
+	}
+
+	if ( majorVersion > 2 ) {
+		file->Write ( this->fields, kV23_FrameHeaderSize );
+	} else {
+		file->Write ( &this->fields[o_id], 3 );
+		file->Write ( &this->fields[o_size+1], 3 );
+	}
+
+	file->Write ( this->content, this->contentSize );
+
+}	// ID3v2Frame::write
+
+// =================================================================================================
+		
+bool ID3v2Frame::advancePastCOMMDescriptor ( XMP_Int32& pos )
+{
+
+		if ( (this->contentSize - pos) <= 3 ) return false; // silent error, no room left behing language tag
+		if ( ! CheckBytes ( &this->content[pos], "eng", 3 ) ) return false; // not an error, but leave all non-eng tags alone...
+
+		pos += 3; // skip lang tag
+		if ( pos >= this->contentSize ) return false; // silent error
+
+		while ( pos < this->contentSize ) {
+			if ( this->content[pos++] == 0x00 ) break;
+		}
+		if ( (pos < this->contentSize) && (this->content[pos] == 0x00) ) pos++;
+
+		if ( (pos == 5) && (this->contentSize == 6) && (GetUns16BE(&this->content[4]) == 0x0031) ) {
+			return false;
+		}
+
+		if ( pos > 4 ) {
+			std::string descriptor = std::string ( &this->content[4], pos-1 );
+			if ( 0 == descriptor.substr(0,4).compare( "iTun" ) ) {	// begins with engiTun ?
+				return false; // leave alone, then
+			}
+		}
+
+		return true; //o.k., descriptor skipped, time for the real thing.
+
+}	// ID3v2Frame::advancePastCOMMDescriptor
+
+// =================================================================================================
+
+bool ID3v2Frame::getFrameValue ( XMP_Uns8 majorVersion, XMP_Uns32 logicalID, std::string* utf8string )
+{
+
+	XMP_Assert ( (this->content != 0) && (this->contentSize >= 0) && (this->contentSize < 20*1024*1024) );
+
+	if ( this->contentSize == 0 ) {
+		utf8string->erase();
+		return true; // ...it is "of interest", even if empty contents.
+	}
+
+	XMP_Int32 pos = 0;
+	XMP_Uns8 encByte = 0;
+	// WCOP does not have an encoding byte, for all others: use [0] as EncByte, advance pos
+	if ( logicalID != 0x57434F50 ) {
+		encByte = this->content[0];
+		pos++;
+	}
+
+	// mode specific forks, COMM or USLT
+	bool commMode = ( (logicalID == 0x434F4D4D) || (logicalID == 0x55534C54) );
+
+	switch ( encByte ) {
+
+		case 0: //ISO-8859-1, 0-terminated
+		{
+			if ( commMode && (! advancePastCOMMDescriptor ( pos )) ) return false; // not a frame of interest!
+
+			char* localPtr  = &this->content[pos];
+			size_t localLen = this->contentSize - pos;
+			ReconcileUtils::Latin1ToUTF8 ( localPtr, localLen, utf8string );
+			break;
+
+		}
+
+		case 1: // Unicode, v2.4: UTF-16 (undetermined Endianess), with BOM, terminated 0x00 00
+		case 2: // UTF-16BE without BOM, terminated 0x00 00
+		{
+
+			if ( commMode && (! advancePastCOMMDescriptor ( pos )) ) return false; // not a frame of interest!
+
+			std::string tmp ( this->content, this->contentSize );
+			bool bigEndian = true;	// assume for now (if no BOM follows)
+
+			if ( GetUns16BE ( &this->content[pos] ) == 0xFEFF ) {
+				pos += 2;
+				bigEndian = true;
+			} else if ( GetUns16BE ( &this->content[pos] ) == 0xFFFE ) {
+				pos += 2;
+				bigEndian = false;
+			}
+
+			FromUTF16 ( (UTF16Unit*)&this->content[pos], ((this->contentSize - pos)) / 2, utf8string, bigEndian );
+			break;
+
+		}
+
+		case 3: // UTF-8 unicode, terminated \0
+		{
+			if ( commMode && (! advancePastCOMMDescriptor ( pos )) ) return false; // not a frame of interest!
+		
+			if ( (GetUns32BE ( &this->content[pos]) & 0xFFFFFF00 ) == 0xEFBBBF00 ) {
+				pos += 3;	// swallow any BOM, just in case
+			}
+
+			utf8string->assign ( &this->content[pos], (this->contentSize - pos) );
+			break;
+		}
+
+		default:
+			XMP_Throw ( "unknown text encoding", kXMPErr_BadFileFormat ); //COULDDO assume latin-1 or utf-8 as best-effort
+			break;
+
+	}
+
+	return true;
+
+}	// ID3v2Frame::getFrameValue
+
+// =================================================================================================
+// ID3v1Tag
+// =================================================================================================
+
+bool ID3v1Tag::read ( XMP_IO* file, SXMPMeta* meta )
+{
+	// Returns true if ID3v1 (or v1.1) exists, otherwise false, sets XMP properties en route.
+
+	if ( file->Length() <= 128 ) return false;  // ensure sufficient room
+	file->Seek ( -128, kXMP_SeekFromEnd );
+
+	XMP_Uns32 tagID = XIO::ReadInt32_BE ( file );
+	tagID = tagID & 0xFFFFFF00; // wipe 4th byte
+	if ( tagID != 0x54414700 ) return false; // must be "TAG"
+	file->Seek ( -1, kXMP_SeekFromCurrent  ); //rewind 1
+
+	XMP_Uns8 buffer[31]; // nothing is bigger here, than 30 bytes (offsets [0]-[29])
+	buffer[30] = 0;		 // wipe last byte
+	std::string utf8string;
+
+	file->ReadAll ( buffer, 30 );
+	std::string title ( (char*) buffer ); //security: guaranteed to 0-terminate after 30 bytes
+	if ( ! title.empty() ) {
+		ReconcileUtils::Latin1ToUTF8 ( title.c_str(), title.size(), &utf8string );
+		meta->SetLocalizedText ( kXMP_NS_DC, "title", "", "x-default", utf8string.c_str() );
+	}
+
+	file->ReadAll ( buffer, 30 );
+	std::string artist( (char*) buffer );
+	if ( ! artist.empty() ) {
+		ReconcileUtils::Latin1ToUTF8 ( artist.c_str(), artist.size(), &utf8string );
+		meta->SetProperty ( kXMP_NS_DM, "artist", utf8string.c_str() );
+	}
+
+	file->ReadAll ( buffer, 30 );
+	std::string album( (char*) buffer );
+	if ( ! album.empty() ) {
+		ReconcileUtils::Latin1ToUTF8 ( album.c_str(), album.size(), &utf8string );
+		meta->SetProperty ( kXMP_NS_DM, "album", utf8string.c_str() );
+	}
+
+	file->ReadAll ( buffer, 4 );
+	buffer[4]=0; // ensure 0-term
+	std::string year( (char*) buffer );
+	if ( ! year.empty() ) {	// should be moot for a year, but let's be safe:
+		ReconcileUtils::Latin1ToUTF8 ( year.c_str(), year.size(), &utf8string );
+		meta->SetProperty ( kXMP_NS_XMP, "CreateDate",  utf8string.c_str() );
+	}
+
+	file->ReadAll ( buffer, 30 );
+	std::string comment( (char*) buffer );
+	if ( ! comment.empty() ) {
+		ReconcileUtils::Latin1ToUTF8 ( comment.c_str(), comment.size(), &utf8string );
+		meta->SetProperty ( kXMP_NS_DM, "logComment", utf8string.c_str() );
+	}
+
+	if ( buffer[28] == 0 ) {
+		XMP_Uns8 trackNo = buffer[29];
+		if ( trackNo > 0 ) {
+			std::string trackStr;
+			meta->SetProperty_Int ( kXMP_NS_DM, "trackNumber", trackNo );
+		}
+	}
+
+	XMP_Uns8 genreNo = XIO::ReadUns8 ( file );
+	if ( genreNo < numberedGenreCount ) {
+		meta->SetProperty ( kXMP_NS_DM, "genre", kNumberedGenres[genreNo].name );
+	} else {
+		char buffer[4];	// AUDIT: Big enough for UInt8.
+		snprintf ( buffer, 4, "%d", genreNo );
+		XMP_Assert ( strlen(buffer) == 3 );	// Should be in the range 126..255.
+		meta->SetProperty ( kXMP_NS_DM, "genre", buffer );
+	}
+
+	return true; // ID3Tag found
+
+}	// ID3v1Tag::read
+
+// =================================================================================================
+
+static inline bool GetDecimalUns32 ( const char * str, XMP_Uns32 * bin )
+{
+	XMP_Assert ( bin != 0 );
+	if ( (str == 0) || (str[0] == 0) ) return false;
+	
+	*bin = 0;
+	for ( size_t i = 0; str[i] != 0; ++i ) {
+		char ch = str[i];
+		if ( (ch < '0') || (ch > '9') ) return false;
+		*bin = (*bin * 10) + (ch - '0');
+	}
+	
+	return true;
+
+}
+
+// =================================================================================================
+
+void ID3v1Tag::write ( XMP_IO* file, SXMPMeta* meta )
+{
+
+	std::string zeros ( 128, '\0' );
+	std::string utf8, latin1;
+
+	file->Seek ( -128, kXMP_SeekFromEnd );
+	file->Write ( zeros.data(), 128 );
+
+	file->Seek ( -128, kXMP_SeekFromEnd );
+	XIO::WriteUns8 ( file, 'T' );
+	XIO::WriteUns8 ( file, 'A' );
+	XIO::WriteUns8 ( file, 'G' );
+
+	if ( meta->GetLocalizedText ( kXMP_NS_DC, "title", "", "x-default", 0, &utf8, 0 ) ) {
+		file->Seek ( (-128 + 3), kXMP_SeekFromEnd );
+		ReconcileUtils::UTF8ToLatin1 ( utf8.c_str(), utf8.size(), &latin1 );
+		file->Write ( latin1.c_str(), MIN ( 30, (XMP_Int32)latin1.size() ) );
+	}
+
+	if ( meta->GetProperty ( kXMP_NS_DM, "artist", &utf8, 0 ) ) {
+		file->Seek ( (-128 + 33), kXMP_SeekFromEnd );
+		ReconcileUtils::UTF8ToLatin1 ( utf8.c_str(), utf8.size(), &latin1 );
+		file->Write ( latin1.c_str(), MIN ( 30, (XMP_Int32)latin1.size() ) );
+	}
+
+	if ( meta->GetProperty ( kXMP_NS_DM, "album", &utf8, 0 ) ) {
+		file->Seek ( (-128 + 63), kXMP_SeekFromEnd );
+		ReconcileUtils::UTF8ToLatin1 ( utf8.c_str(), utf8.size(), &latin1 );
+		file->Write ( latin1.c_str(), MIN ( 30, (XMP_Int32)latin1.size() ) );
+	}
+
+	if ( meta->GetProperty ( kXMP_NS_XMP, "CreateDate", &utf8, 0 ) ) {
+		XMP_DateTime dateTime;
+		SXMPUtils::ConvertToDate( utf8, &dateTime );
+		if ( dateTime.hasDate ) {
+			SXMPUtils::ConvertFromInt ( dateTime.year, "", &latin1 );
+			file->Seek ( (-128 + 93), kXMP_SeekFromEnd );
+			file->Write ( latin1.c_str(), MIN ( 4, (XMP_Int32)latin1.size() ) );
+		}
+	}
+
+	if ( meta->GetProperty ( kXMP_NS_DM, "logComment", &utf8, 0 ) ) {
+		file->Seek ( (-128 + 97), kXMP_SeekFromEnd );
+		ReconcileUtils::UTF8ToLatin1 ( utf8.c_str(), utf8.size(), &latin1 );
+		file->Write ( latin1.c_str(), MIN ( 30, (XMP_Int32)latin1.size() ) );
+	}
+
+	if ( meta->GetProperty ( kXMP_NS_DM, "genre", &utf8, 0 ) ) {
+
+		// Write the first genre code as a UInt8.
+		size_t nameEnd;
+		std::string name;
+		
+		for ( nameEnd = 0; ((nameEnd < utf8.size()) && (utf8[nameEnd] != ';')); ++nameEnd ) {}
+		name.assign ( utf8.c_str(), nameEnd );
+		const char * code = GenreUtils::FindGenreCode ( name );
+
+		if ( code != 0 ) {
+			XMP_Uns32 value;
+			bool ok = GetDecimalUns32 ( code, &value );
+			if ( ok && (value <= 255) ) {
+				file->Seek ( (-128 + 127), kXMP_SeekFromEnd );
+				XIO::WriteUns8 ( file, (XMP_Uns8)value );
+			}
+		}
+
+	}
+
+	if ( meta->GetProperty ( kXMP_NS_DM, "trackNumber", &utf8, 0 ) ) {
+
+		XMP_Uns8 trackNo = 0;
+		try {
+			trackNo = (XMP_Uns8) SXMPUtils::ConvertToInt ( utf8.c_str() );
+			file->Seek ( (-128 + 125), kXMP_SeekFromEnd );
+			XIO::WriteUns8 ( file, 0 ); // ID3v1.1 extension
+			XIO::WriteUns8 ( file, trackNo );
+		} catch ( ... ) {
+			// forgive, just don't set this one.
+		}
+
+	}
+
+}	// ID3v1Tag::write
+
+// =================================================================================================
+
+};	// namespace ID3_Support
diff --git a/XMPFiles/source/FormatSupport/ID3_Support.hpp b/XMPFiles/source/FormatSupport/ID3_Support.hpp
new file mode 100644
index 0000000..1ca3107
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ID3_Support.hpp
@@ -0,0 +1,174 @@
+#ifndef __ID3_Support_hpp__
+#define __ID3_Support_hpp__ 1
+
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#if XMP_WinBuild
+	#define stricmp _stricmp
+#else
+	int stricmp ( const char * left, const char * right );	// Case insensitive ASCII compare.
+#endif
+
+// =================================================================================================
+
+namespace ID3_Support {
+
+	// =============================================================================================
+
+	inline XMP_Int32 synchToInt32 ( XMP_Uns32 rawDataBE ) {
+		XMP_Validate ( (0 == (rawDataBE & 0x80808080)), "input not synchsafe", kXMPErr_InternalFailure );
+		XMP_Int32 r = (rawDataBE & 0x0000007F) + ((rawDataBE >> 1) & 0x00003F80) +
+					  ((rawDataBE >> 2) & 0x001FC000) + ((rawDataBE >> 3) & 0x0FE00000);
+		return r;
+	}
+
+	inline XMP_Uns32 int32ToSynch ( XMP_Int32 value ) {
+		XMP_Validate ( (0 <= 0x0FFFFFFF), "value too big", kXMPErr_InternalFailure );
+		XMP_Uns32 r = (value & 0x0000007F) + ((value & 0x00003F80) << 1) +
+					  ((value & 0x001FC000) << 2) + ((value & 0x0FE00000) << 3);
+		return r;
+	}
+
+	// =============================================================================================
+	
+	bool InitializeGlobals();	// Initialize and terminate the known genre maps.
+	void TerminateGlobals();
+	
+	// =============================================================================================
+
+	namespace GenreUtils {	
+		
+		void ConvertGenreToXMP ( const char * id3Genre, std::string * xmpGenre );
+		void ConvertGenreToID3 ( const char * xmpGenre, std::string * id3Genre );
+
+		// Internal utilities, exposed for unit testing:
+		const char * FindGenreName ( const std::string & code );
+		const char * FindGenreCode ( const std::string & name );
+
+	};
+
+	// =============================================================================================
+
+	class ID3Header {	// Minimal support to read and write the ID3 header.
+	public:
+
+		const static size_t o_id     = 0;
+		const static size_t o_vMajor = 3;
+		const static size_t o_vMinor = 4;
+		const static size_t o_flags  = 5;
+		const static size_t o_size   = 6;
+
+		const static size_t kID3_TagHeaderSize = 10;	// This is the same in v2.2, v2.3, and v2.4.
+		char fields [kID3_TagHeaderSize];
+
+		~ID3Header() {};
+
+		// Read the v2 header into the fields buffer and check the version.
+		bool read ( XMP_IO* file );
+		
+		// Set the size and write the the v2 header from the fields buffer.
+		void write ( XMP_IO* file, XMP_Int64 tagSize );
+
+	};
+
+	// =============================================================================================
+
+	class ID3v2Frame {
+	public:
+	
+		// Applies to ID3 v2.2, v2.3, and v2.4. The metadata values are mostly the same, v2.2 has
+		// smaller frame headers and only supports UTF-16 Unicode.
+
+		const static XMP_Uns16 o_id = 0;
+		const static XMP_Uns16 o_size = 4; // size after unsync, excludes frame header.
+		const static XMP_Uns16 o_flags = 8;
+
+		const static int kV23_FrameHeaderSize = 10;	// The header for v2.3 and v2.4.
+		const static int kV22_FrameHeaderSize = 6;	// The header for v2.2.
+		char fields [kV23_FrameHeaderSize];
+
+		XMP_Uns32 id;
+		XMP_Uns16 flags;
+		
+		char* content;
+		XMP_Int32 contentSize; // size of variable content, right as its stored in o_size
+
+		bool active; //default: true. flag is lowered, if another frame with replaces this one as "last meaningful frame of its kind"
+		bool changed; //default: false. flag is raised, if setString() is used
+
+		ID3v2Frame();
+		ID3v2Frame ( XMP_Uns32 id );
+		
+		ID3v2Frame ( const ID3v2Frame& orig ) {
+			XMP_Throw ( "ID3v2Frame copy constructor not implemented", kXMPErr_InternalFailure );
+		}
+		
+		~ID3v2Frame() { this->release(); }
+
+		void release();
+		
+		void setFrameValue ( const std::string& rawvalue, bool needDescriptor = false,
+							 bool utf16 = false, bool isXMPPRIVFrame = false, bool needEncodingByte = true );
+		
+		XMP_Int64 read ( XMP_IO* file, XMP_Uns8 majorVersion );
+		void write ( XMP_IO* file, XMP_Uns8 majorVersion );
+
+		// two types of COMM frames should be preserved but otherwise ignored
+		// * a 6-field long header just having
+		//      encoding(1 byte),lang(3 bytes) and 0x00 31 (no descriptor, "1" as content")
+		//      perhaps only used to indicate client language
+		// * COMM frames whose description begins with engiTun, these are iTunes flags
+		//
+		// returns true: job done as expted
+		//         false: do not use this frame, but preserve (i.e. iTunes marker COMM frame)
+		bool advancePastCOMMDescriptor ( XMP_Int32& pos );
+
+		// returns the frame content as a proper UTF8 string
+		//    * w/o the initial encoding byte
+		//    * dealing with BOM's
+		//
+		// @returns: by value: character string with the value
+		//			as return value: false if frame is "not of intereset" despite a generally
+		//                            "interesting" frame ID, these are
+		//                                * iTunes-'marker' COMM frame
+		bool getFrameValue ( XMP_Uns8 majorVersion, XMP_Uns32 logicalID, std::string* utf8string );
+
+	};
+
+	// =============================================================================================
+
+	class ID3v1Tag {	// Support for the fixed length v1 tag found at the end of the file.
+	public:
+
+		const static XMP_Uns16 o_tag     =   0; // must be "TAG"
+		const static XMP_Uns16 o_title   =   3;
+		const static XMP_Uns16 o_artist  =  33;
+		const static XMP_Uns16 o_album   =  63;
+		const static XMP_Uns16 o_year    =  93;
+		const static XMP_Uns16 o_comment =  97;
+		const static XMP_Uns16 o_zero    = 125; // must be zero for trackNo to be valid
+		const static XMP_Uns16 o_trackNo = 126; // trackNo
+		const static XMP_Uns16 o_genre   = 127; // last byte: index, or 255
+
+		const static int kV1_TagSize = 128;
+
+		bool read ( XMP_IO* file, SXMPMeta* meta );
+		void write ( XMP_IO* file, SXMPMeta* meta );
+
+	};
+
+}
+
+#endif	// __ID3_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp
new file mode 100644
index 0000000..e8acc9f
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp
@@ -0,0 +1,1229 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/IFF/Chunk.h"
+#include "source/XMP_LibUtils.hpp"
+#include "source/XIO.hpp"
+
+#include <cstdio>
+#include <cstdlib>
+#include <typeinfo>
+
+using namespace IFF_RIFF;
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::createChunk(...)
+// 
+// Purpose: [static] Static factory to create an unknown chunk
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* Chunk::createChunk( const IEndian& endian )
+{
+	return new Chunk( endian );
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::createUnknownChunk(...)
+// 
+// Purpose: [static] Static factory to create an unknown chunk with initial id, 
+//					 sizes and offsets.
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* Chunk::createUnknownChunk(
+	const IEndian& endian,
+	const XMP_Uns32 id,
+	const XMP_Uns32 type,
+	const XMP_Uns64 size,
+	const XMP_Uns64 originalOffset,
+	const XMP_Uns64 offset
+)
+{
+	Chunk *chunk = new Chunk( endian );
+	chunk->setID( id );
+	chunk->mOriginalOffset = originalOffset;
+	chunk->mOffset = offset;
+
+	if (type != 0)
+	{
+		chunk->setType(type);
+	}
+
+	// sizes have to be set after type, otherwise the setType sets the size to 4.
+	chunk->mSize = chunk->mOriginalSize = size;
+	chunk->mChunkMode = CHUNK_UNKNOWN;
+	chunk->mDirty = false;
+	return chunk;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::createHeaderChunk(...)
+// 
+// Purpose: [static] Static factory to create a leaf chunk with no data area or
+//					 only the type in the data area
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* Chunk::createHeaderChunk( const IEndian& endian,	const XMP_Uns32 id,	const XMP_Uns32 type /*= kType_NONE*/)
+{
+	Chunk *chunk = new Chunk( endian );
+	chunk->setID( id );
+
+	XMP_Uns64 size = 0;
+
+	if( type != kType_NONE )
+	{
+		chunk->setType( type );
+		size += Chunk::TYPE_SIZE;
+	}
+
+	chunk->mSize			= size;
+	chunk->mOriginalSize	= size;
+	chunk->mChunkMode		= CHUNK_LEAF;
+	chunk->mDirty			= false;
+
+	return chunk;
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::Chunk(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+Chunk::Chunk( const IEndian& endian )
+: mEndian( endian )
+{
+	// initialize private instance variables
+	mChunkId.id		= kChunk_NONE;
+	mChunkId.type	= kType_NONE;
+	mSize			= 0;
+	mOriginalSize	= 0;
+	mBufferSize		= 0;
+	mData			= NULL;
+	mParent			= NULL;
+	mOriginalOffset	= 0;
+	mOffset			= 0;
+	mDirty			= false;
+	mChunkMode		= CHUNK_UNKNOWN;
+}
+
+
+Chunk::~Chunk()
+{
+	for( ChunkIterator iter = mChildren.begin(); iter != mChildren.end(); iter++ )
+	{
+		delete *iter;
+	}
+
+	// Free allocated data buffer
+	if( mData != NULL )
+	{
+		delete [] mData;
+	}
+}
+
+
+/************************ IChunk interface implementation ************************/
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::getData(...)
+// 
+// Purpose: access data area of Chunk
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 Chunk::getData( const XMP_Uns8** data ) const
+{
+	if( data == NULL )
+	{
+		XMP_Throw ( "Invalid data pointer.", kXMPErr_BadParam );
+	}
+
+	*data = mData;
+
+	return mBufferSize;
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::setData(...)
+// 
+// Purpose: Set new data for the chunk. 
+//			Will delete an existing internal buffer and recreate a new one
+//			and copy the given data into that new buffer.
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::setData( const XMP_Uns8* const data, XMP_Uns64 size, XMP_Bool writeType /*=false*/ )
+{
+	// chunk nodes cannot contain data
+	if ( mChunkMode == CHUNK_NODE )
+	{
+		XMP_Throw ( "A chunk node cannot contain data.", kXMPErr_BadParam );
+	}
+	else if ( data == NULL || size == 0 )
+	{
+		XMP_Throw ( "Invalid data pointer.", kXMPErr_BadParam );
+	}
+
+	if( mData != NULL )
+	{
+		delete [] mData;
+	}
+
+	if( writeType )
+	{
+		mBufferSize = size + TYPE_SIZE;
+		mData = new XMP_Uns8[static_cast<size_t>(mBufferSize)]; // Throws bad_alloc exception in case of being out of memory
+		setType( mChunkId.type );
+		memcpy( &mData[TYPE_SIZE], data, static_cast<size_t>(size) );
+	}
+	else
+	{
+		mBufferSize = size;
+		mData = new XMP_Uns8[static_cast<size_t>(mBufferSize)]; // Throws bad_alloc exception in case of being out of memory
+		// ! We assume that size IS the actual size of that input buffer, otherwise behavior is undefined
+		memcpy( mData, data, static_cast<size_t>(size) );
+
+		// set the type variable
+		if( mBufferSize >= TYPE_SIZE )
+		{
+			//Chunk type is always BE
+			//The first four bytes could be the type
+			mChunkId.type = BigEndian::getInstance().getUns32( mData );
+		}
+	}
+
+	mChunkMode = CHUNK_LEAF;
+	setChanged();
+	adjustSize();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::getUns32(...)
+// 
+// Purpose: The following methods are getter/setter for certain data types. 
+//			They always take care of little-endian/big-endian issues.
+//			The offset starts at the data area of the Chunk.
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns32 Chunk::getUns32( XMP_Uns64 offset ) const
+{
+	if( offset + sizeof(XMP_Uns32) > mBufferSize )
+	{
+		XMP_Throw ( "Data access out of bounds", kXMPErr_BadIndex );
+	}
+	return mEndian.getUns32( &mData[offset] );
+}
+
+
+void Chunk::setUns32( XMP_Uns32 value, XMP_Uns64 offset )
+{
+	// chunk nodes cannot contain data
+	if ( mChunkMode == CHUNK_NODE )
+	{
+		XMP_Throw ( "A chunk node cannot contain data.", kXMPErr_BadParam );
+	}
+
+	// If the new value exceeds the size of the buffer, recreate the buffer
+	adjustInternalBuffer( offset + sizeof(XMP_Uns32) );
+	// Write the new value
+	mEndian.putUns32( value, &mData[offset] );
+	// Chunk becomes leaf chunk when adding data
+	mChunkMode = CHUNK_LEAF;
+	// Flag the chunk as dirty
+	setChanged();
+	// If the buffer is bigger than the Chunk size, adjust the Chunk size
+	adjustSize();
+
+}
+
+
+XMP_Uns64 Chunk::getUns64( XMP_Uns64 offset ) const
+{
+	if( offset + sizeof(XMP_Uns64) > mBufferSize )
+	{
+		XMP_Throw ( "Data access out of bounds", kXMPErr_BadIndex );
+	}
+	return mEndian.getUns64( &mData[offset] );
+}
+
+
+void Chunk::setUns64( XMP_Uns64 value, XMP_Uns64 offset )
+{
+	// chunk nodes cannot contain data
+	if ( mChunkMode == CHUNK_NODE )
+	{
+		XMP_Throw ( "A chunk node cannot contain data.", kXMPErr_BadParam );
+	}
+
+	// If the new value exceeds the size of the buffer, recreate the buffer
+	adjustInternalBuffer( offset + sizeof(XMP_Uns64) );
+	// Write the new value
+	mEndian.putUns64( value, &mData[offset] );
+	// Chunk becomes leaf chunk when adding data
+	mChunkMode = CHUNK_LEAF;
+	// Flag the chunk as dirty
+	setChanged();
+	// If the buffer is bigger than the Chunk size, adjust the Chunk size
+	adjustSize();
+}
+
+
+XMP_Int32 Chunk::getInt32( XMP_Uns64 offset ) const
+{
+	if( offset + sizeof(XMP_Int32) > mBufferSize )
+	{
+		XMP_Throw ( "Data access out of bounds", kXMPErr_BadIndex );
+	}
+	return mEndian.getUns32( &mData[offset] );
+}
+
+
+void Chunk::setInt32( XMP_Int32 value, XMP_Uns64 offset )
+{
+	// chunk nodes cannot contain data
+	if ( mChunkMode == CHUNK_NODE )
+	{
+		XMP_Throw ( "A chunk node cannot contain data.", kXMPErr_BadParam );
+	}
+
+	// If the new value exceeds the size of the buffer, recreate the buffer
+	adjustInternalBuffer( offset + sizeof(XMP_Int32) );
+	// Write the new value
+	mEndian.putUns32( value, &mData[offset] );
+	// Chunk becomes leaf chunk when adding data
+	mChunkMode = CHUNK_LEAF;
+	// Flag the chunk as dirty
+	setChanged();
+	// If the buffer is bigger than the Chunk size, adjust the Chunk size
+	adjustSize();
+}
+
+
+XMP_Int64 Chunk::getInt64( XMP_Uns64 offset ) const
+{
+	if( offset + sizeof(XMP_Int64) > mBufferSize )
+	{
+		XMP_Throw ( "Data access out of bounds", kXMPErr_BadIndex );
+	}
+	return mEndian.getUns64( &mData[offset] );
+}
+
+
+void Chunk::setInt64( XMP_Int64 value, XMP_Uns64 offset )
+{
+	// chunk nodes cannot contain data
+	if ( mChunkMode == CHUNK_NODE )
+	{
+		XMP_Throw ( "A chunk node cannot contain data.", kXMPErr_BadParam );
+	}
+
+	// If the new value exceeds the size of the buffer, recreate the buffer
+	adjustInternalBuffer( offset + sizeof(XMP_Int64) );
+	// Write the new value
+	mEndian.putUns64( value, &mData[offset] );
+	// Chunk becomes leaf chunk when adding data
+	mChunkMode = CHUNK_LEAF;
+	// Flag the chunk as dirty
+	setChanged();
+	// If the buffer is bigger than the Chunk size, adjust the Chunk size
+	adjustSize();
+}
+
+
+std::string Chunk::getString( XMP_Uns64 size /*=0*/, XMP_Uns64 offset /*=0*/ ) const
+{
+	if( offset + size > mBufferSize )
+	{
+		XMP_Throw ( "Data access out of bounds", kXMPErr_BadIndex );
+	}
+
+	XMP_Uns64 requestedSize = size != 0 ? size : mBufferSize - offset;
+
+	std::string str((char *)&mData[offset],static_cast<size_t>(requestedSize));
+	
+	return str;
+}
+
+
+void Chunk::setString( std::string value, XMP_Uns64 offset )
+{
+	if ( mChunkMode == CHUNK_NODE )
+	{
+		XMP_Throw ( "A chunk node cannot contain data.", kXMPErr_BadParam );
+	}
+
+	// If the new value exceeds the size of the buffer, recreate the buffer
+	adjustInternalBuffer( offset + value.length() );
+	// Write the new value
+	memcpy( &mData[offset], value.data(), value.length() );
+	// Chunk becomes leaf chunk when adding data
+	mChunkMode = CHUNK_LEAF;
+	// Flag the chunk as dirty
+	setChanged();
+	// If the buffer is bigger than the Chunk size, adjust the Chunk size
+	adjustSize();
+}
+
+
+/************************ Chunk public methods ************************/
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::setID(...)
+// 
+// Purpose: Sets the chunk id.
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::setID( XMP_Uns32 id )
+{
+	mChunkId.id = id;
+	setChanged();
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::setType(...)
+// 
+// Purpose: Sets the chunk type
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::setType( XMP_Uns32 type )
+{
+	mChunkId.type = type;
+
+	// reserve space for type
+	// setChanged() and adjustSize() implicitly called
+	// make sure that no exception is thrown
+	ChunkMode existing = mChunkMode;
+	mChunkMode = CHUNK_UNKNOWN;
+	setUns32(0, 0);
+	mChunkMode = existing;
+
+	BigEndian::getInstance().putUns32( type, mData );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::getPadSize(...)
+// 
+// Purpose: Returns the original size of the Chunk including a pad byte if 
+//			the size isn't a even number
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 Chunk::getOriginalPadSize( bool includeHeader /*= false*/ ) const
+{
+	XMP_Uns64 ret = this->getOriginalSize( includeHeader );
+
+	if( ret & 1 )
+	{
+		ret++;
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::getPadSize(...)
+// 
+// Purpose: Returns the current size of the Chunk including a pad byte if the 
+//			size isn't a even number
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 Chunk::getPadSize( bool includeHeader /*= false*/ ) const
+{
+	XMP_Uns64 ret = this->getSize( includeHeader );
+
+	if( ret & 1 )
+	{
+		ret++;
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::calculateSize(...)
+// 
+// Purpose: Calculate the size of this chunks based on its children sizes. 
+//			If this chunk has no children then no new size will be calculated.
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 Chunk::calculateSize( bool setOriginal /*= false*/ )
+{
+	XMP_Uns64 size = 0LL;
+
+	//
+	// calculate only foe nodes
+	//
+	if( this->getChunkMode() == CHUNK_NODE )
+	{
+		//
+		// calculate size of all children
+		//
+		for( ChunkIterator iter = mChildren.begin(); iter != mChildren.end(); iter++ )
+		{
+			XMP_Uns64 childSize = (*iter)->getSize(true);
+
+			size += childSize;
+
+			//
+			// take account of pad byte
+			//
+			if( childSize & 1 )
+			{
+				size++;
+			}
+		}
+
+		//
+		// assume that we have a type
+		//
+		size += Chunk::TYPE_SIZE;
+
+		//
+		// set dirty flag only if something has changed
+		//
+		if( size != mSize || ( setOriginal && size != mOriginalSize ) )
+		{
+			this->setChanged();
+		}
+
+		//
+		// set new size(s)
+		//
+		if( setOriginal )
+		{
+			mOriginalSize = size;
+		}
+
+		mSize = size;
+	}
+	else
+		size = mSize;
+
+	return size;
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::calculateWriteSize(...)
+// 
+// Purpose: Calculate the size of the chunks that are dirty including the size 
+//			of its children
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Int64 Chunk::calculateWriteSize( ) const
+{
+	XMP_Int64 size=0;
+	if (hasChanged())
+	{
+		size+=(sizeof(XMP_Uns32)*2);
+		if (mChunkMode == CHUNK_LEAF)
+		{
+			if ( mSize % 2 == 1 )
+			{
+				// for odd file sizes, a pad byte is written
+				size+=(mSize+1);
+			}
+			else
+			{
+				size+=mSize;
+			}
+		}
+		else	// mChunkMode == CHUNK_NODE
+		{
+			// writes type if defined
+			if (mChunkId.type != kType_NONE)
+			{
+				size+=sizeof(XMP_Uns32);
+			}
+
+			 // calls calculateWriteSize recursively on it's children
+			for( ConstChunkIterator iter = mChildren.begin(); iter != mChildren.end(); iter++ )
+			{
+				size+=(*iter)->calculateWriteSize(  );
+			}
+		}
+	}
+
+	return size;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::setOffset(...)
+// 
+// Purpose: Adjust the offset that this chunk has within the file
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::setOffset (XMP_Uns64 newOffset)   // changes during rearranging
+{
+	XMP_Uns64 oldOffset = mOffset;
+	mOffset = newOffset;
+
+	if( mOffset != oldOffset )
+	{
+		setChanged();
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::resetChanges(...)
+// 
+// Purpose: Resets the dirty status for this chunk and its children to false
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::resetChanges()
+{
+	mDirty = false;
+
+	for( ChunkIterator iter = mChildren.begin(); iter != mChildren.end(); iter++ )
+	{
+		(*iter)->resetChanges();
+	}
+} //resetChanges
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::setAsNew(...)
+// 
+// Purpose: Sets all necessary member variables to flag this chunk as a new one 
+//			being inserted into the tree
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::setAsNew()
+{
+	mOriginalSize = mSize;
+	mOriginalOffset = mOffset;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::toString(...)
+// 
+// Purpose: Creates a string representation of the chunk (debug method)
+// 
+//-----------------------------------------------------------------------------
+
+std::string Chunk::toString( std::string tabs, XMP_Bool showOriginal )
+{
+	const BigEndian &BE = BigEndian::getInstance();
+	char buffer[256];
+	XMP_Uns32 id = BE.getUns32(&this->mChunkId.id);
+	XMP_Uns32 type = BE.getUns32(&this->mChunkId.type);
+
+	XMP_Uns64 size, offset;
+
+	if ( showOriginal )
+	{
+		size = mEndian.getUns64(&this->mOriginalSize);
+		offset = mEndian.getUns64(&this->mOriginalOffset);
+	}
+	else
+	{
+		size = mEndian.getUns64(&this->mSize);
+		offset = mEndian.getUns64(&this->mOffset);
+	}
+
+	snprintf( buffer, 255, "%.4s -- "
+								"size: 0x%.8llX,  "
+								"type: %.4s,  "
+								"offset: 0x%.8llX",
+				(char*)(&id),
+				size,
+				(char*)(&type),
+				offset );
+	std::string str(buffer);
+
+	// Dump children
+	if ( mChildren.size() > 0)
+	{
+		tabs.append("\t");
+	}
+
+	for( ChunkIterator iter = mChildren.begin(); iter != mChildren.end(); iter++ )
+	{
+		str += "\n";
+		str += tabs;
+		str += (*iter)->toString(tabs , showOriginal);
+	}
+
+	return str;
+}
+
+
+/************************ file access ************************/
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::readChunk(...)
+// 
+// Purpose: Read id, size and offset and create a chunk with mode CHUNK_UNKNOWN.
+//			The file is expected to be open and is not closed!
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::readChunk( XMP_IO* file )
+{
+	if( file == NULL )
+	{
+		XMP_Throw( "Chunk::readChunk: Must pass a valid file pointer", kXMPErr_BadParam );
+	}
+
+	if( mChunkId.id != kChunk_NONE )
+	{
+		XMP_Throw ( "readChunk must not be called more than once", kXMPErr_InternalFailure );
+	}
+	// error handling is done in the controller
+	// determine offset in the file
+	mOriginalOffset = mOffset = file->Offset();
+	//ID is always BE
+	mChunkId.id = XIO::ReadUns32_BE( file );
+	// Size can be both
+	if (typeid(mEndian) == typeid(LittleEndian))
+	{
+		mOriginalSize = mSize = XIO::ReadUns32_LE( file );
+
+	}
+	else
+	{
+		mOriginalSize = mSize = XIO::ReadUns32_BE( file );
+	}
+
+	// For Type do not assume any format as it could be data, read it as bytes
+	if (mSize >= TYPE_SIZE)
+	{
+		mData = new XMP_Uns8[TYPE_SIZE];
+
+		for ( XMP_Uns32 i = 0; i < TYPE_SIZE ; i++ )
+		{
+			mData[i] = XIO::ReadUns8( file );
+		}
+		//Chunk type is always BE
+		//The first four bytes could be the type
+		mChunkId.type = BigEndian::getInstance().getUns32( mData );
+	}
+
+	mDirty = false;
+}//readChunk
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::cacheChunkData(...)
+// 
+// Purpose: Stores the data in the class (only called if required).
+//			The file is expected to be open and is not closed!
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::cacheChunkData( XMP_IO* file )
+{
+	XMP_Enforce( file != NULL );
+
+	if( mChunkMode != CHUNK_UNKNOWN )
+	{
+		XMP_Throw ( "chunk already has either data or children.", kXMPErr_BadParam );
+	}
+
+	// error handling is done in the controller
+
+	// continue only when the chunk contains data
+	if (mSize != 0)
+	{
+		mBufferSize = mSize;
+		XMP_Uns8* tmp = new XMP_Uns8[XMP_Uns32(mSize)];
+
+		// Do we have a type?
+		if (mSize >= TYPE_SIZE)
+		{
+			// add type in front of new buffer
+			for ( XMP_Uns32 i = 0; i < TYPE_SIZE ; i++ )
+			{
+				tmp[i] = mData[i];
+			}
+			// Read rest of data from file
+			if( mSize != TYPE_SIZE )
+			{
+				// Chunks that are cached are very probably not bigger than 2GB, so cast is safe
+				file->ReadAll ( &tmp[TYPE_SIZE], static_cast<XMP_Int32>(mSize - TYPE_SIZE) );
+			}
+		}
+		else
+		{
+			// Chunks that are cached are very probably not bigger than 2GB, so cast is safe
+			file->ReadAll ( tmp, static_cast<XMP_Int32>(mSize) );
+		}
+		// deletes the existing array
+		delete [] mData;
+		//assign the new buffer
+		mData = tmp;
+	}
+
+	// Remember that this method has been called
+	mDirty = false;
+	mChunkMode = CHUNK_LEAF;
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::writeChunk(...)
+// 
+// Purpose: Write or updates chunk (new data, new size, new position).
+//			The file is expected to be open and is not closed!
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::writeChunk( XMP_IO* file )
+{
+	if( file == NULL )
+	{
+		XMP_Throw( "Chunk::writeChunk: Must pass a valid file pointer", kXMPErr_BadParam );
+	}
+
+	if (mChunkMode == CHUNK_UNKNOWN)
+	{
+		if (hasChanged())
+		{
+			XMP_Throw ( "A chunk with mode unknown must not be changed & written.", kXMPErr_BadParam );
+		}
+
+		// do nothing
+	}
+	else if (hasChanged())
+	{
+		// positions the file pointer
+		file->Seek ( mOffset, kXMP_SeekFromStart );
+
+
+		// ============ This part is identical for CHUNK_LEAF and CHUNK_TYPE ============
+
+		 // writes ID (starting with offset)
+		XIO::WriteInt32_BE( file, mChunkId.id );
+
+		// writes size, which is always 32bit
+		XMP_Uns32 outSize = ( mSize >= 0x00000000FFFFFFFF ? 0xFFFFFFFF : static_cast<XMP_Uns32>( mSize & 0x00000000FFFFFFFF ) );
+
+		if (typeid(mEndian) == typeid(LittleEndian))
+		{	
+			XIO::WriteUns32_LE( file, static_cast<XMP_Uns32>(mSize) );
+		}
+		else
+		{
+			XIO::WriteUns32_BE( file, static_cast<XMP_Uns32>(mSize) );
+		}
+
+
+		// ============ This part is different for CHUNK_LEAF and CHUNK_TYPE ============
+		if (mChunkMode == CHUNK_LEAF)
+		{
+			// writes buffer (including the optional type at the beginning)
+			// Cached chunks will very probably not be bigger than 2GB, so cast is safe
+			file->Write ( mData, static_cast<XMP_Int32>(mSize)  );
+			if ( mSize % 2 == 1 )
+			{
+				// for odd file sizes, a pad byte is written
+				XIO::WriteUns8 ( file, 0 );
+			}
+		}
+		else	// mChunkMode == CHUNK_NODE
+		{
+			// writes type if defined
+			if (mChunkId.type != kType_NONE)
+			{
+				XIO::WriteInt32_BE( file, mChunkId.type );
+			}
+
+			 // calls writeChunk on it's children
+			for( ChunkIterator iter = mChildren.begin(); iter != mChildren.end(); iter++ )
+			{
+				(*iter)->writeChunk( file );
+			}
+		}
+	}
+
+	// set back dirty state
+	mDirty = false;
+}
+
+
+/************************ children access ************************/
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::numChildren(...)
+// 
+// Purpose: Returns the number children chunks
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns32 Chunk::numChildren() const
+{
+	return static_cast<XMP_Uns32>( mChildren.size() );
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::getChildAt(...)
+// 
+// Purpose: Returns a child node
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* Chunk::getChildAt( XMP_Uns32 pos ) const
+{
+	try
+	{
+		return mChildren.at(pos);
+	}
+	catch( ... )
+	{
+		XMP_Throw ( "Non-existing child requested.", kXMPErr_BadIndex );
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::appendChild(...)
+// 
+// Purpose: Appends a child node at the end of the children list
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::appendChild( Chunk* child, XMP_Bool adjustSizes )
+{
+	if (mChunkMode == CHUNK_LEAF)
+	{
+		XMP_Throw ( "A chunk leaf cannot contain children.", kXMPErr_BadParam );
+	}
+
+	try
+	{
+		mChildren.push_back( child );
+		// make this the parent of the new node
+		child->mParent = this;
+		mChunkMode = CHUNK_NODE;
+
+		// set offset of new child
+		XMP_Uns64 childOffset = 0;
+
+		if( this->numChildren() == 1 )
+		{
+			// first added child
+			if( this->getID() != kChunk_NONE )
+			{
+				childOffset = this->getOffset() + Chunk::HEADER_SIZE + ( this->getType() == kType_NONE ? 0 : Chunk::TYPE_SIZE );
+			}
+		}
+		else
+		{
+			Chunk* predecessor = this->getChildAt( this->numChildren() - 2 );
+			childOffset = predecessor->getOffset() + predecessor->getPadSize( true );
+		}
+
+		child->setOffset( childOffset );
+
+		setChanged();
+		
+		if ( adjustSizes )
+		{
+			// to fix the sizes of this node and parents
+			adjustSize( child->getSize(true) );
+		}
+	}
+	catch (...)
+	{
+		XMP_Throw ( "Vector error in appendChild", kXMPErr_InternalFailure );
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::insertChildAt(...)
+// 
+// Purpose: Inserts a child node at a certain position
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::insertChildAt( XMP_Uns32 pos, Chunk* child )
+{
+	if (mChunkMode == CHUNK_LEAF)
+	{
+		XMP_Throw ( "A chunk leaf cannot contain children.", kXMPErr_BadParam );
+	}
+
+	try
+	{
+		if (pos <= mChildren.size())
+		{
+			mChildren.insert(mChildren.begin() + pos, child);
+			// make this the parent of the new node
+			child->mParent = this;
+			mChunkMode = CHUNK_NODE;
+
+			// set offset of new child
+			XMP_Uns64 childOffset = 0;
+
+			if( pos == 0 )
+			{
+				if( this->getID() != kChunk_NONE )
+				{
+					childOffset = this->getOffset() + Chunk::HEADER_SIZE + ( this->getType() == kType_NONE ? 0 : Chunk::TYPE_SIZE );
+				}
+			}
+			else
+			{
+				Chunk* predecessor = this->getChildAt( pos-1 );
+				childOffset = predecessor->getOffset() + predecessor->getPadSize( true );
+			}
+
+			child->setOffset( childOffset );
+
+			setChanged();
+
+			// to fix the sizes of this node and parents
+			adjustSize( child->getSize(true) );
+		}
+		else
+		{
+			XMP_Throw ( "Index not valid.", kXMPErr_BadIndex );
+		}
+	}
+	catch (...)
+	{
+		XMP_Throw ( "Index not valid.", kXMPErr_BadIndex );
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::removeChildAt(...)
+// 
+// Purpose: Removes a child node at a given position
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* Chunk::removeChildAt( XMP_Uns32 pos )
+{
+	Chunk* toDelete = NULL;
+
+	try
+	{
+		toDelete = mChildren.at(pos);
+		// to fix the size of this node
+		XMP_Int64 sizeDeleted = static_cast<XMP_Int64>(toDelete->getSize(true));
+		mChildren.erase(mChildren.begin() + pos);
+
+		setChanged();
+
+		// to fix the sizes of this node and parents
+		adjustSize(-sizeDeleted);
+	}
+	catch (...)
+	{
+		XMP_Throw ( "Index not valid.", kXMPErr_BadIndex );
+	}
+
+	return toDelete;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// replaceChildAt(...)
+// 
+// Purpose: Remove child at the passed position and insert the new chunk
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* Chunk::replaceChildAt( XMP_Uns32 pos, Chunk* child )
+{
+	Chunk* toDelete = NULL;
+
+	try
+	{
+		//
+		// removed old chunk
+		//
+		toDelete = mChildren.at(pos);
+		mChildren.erase(mChildren.begin() + pos);
+
+		//
+		// insert new chunk
+		//
+		mChildren.insert(mChildren.begin() + pos, child);
+		// make this the parent of the new node
+		child->mParent = this;
+		mChunkMode = CHUNK_NODE;
+
+		// set offset
+		child->setOffset( toDelete->getOffset() );
+
+		setChanged();
+
+		// to fix the sizes of this node and parents
+		adjustSize( child->getPadSize() - toDelete->getPadSize() );
+	}
+	catch (...)
+	{
+		XMP_Throw ( "Index not valid.", kXMPErr_BadIndex );
+	}
+
+	return toDelete;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::firstChild(...)
+// 
+// Purpose: iterators
+// 
+//-----------------------------------------------------------------------------
+
+Chunk::ConstChunkIterator Chunk::firstChild() const
+{
+	return mChildren.begin();
+}
+
+
+Chunk::ConstChunkIterator Chunk::lastChild() const
+{
+	return mChildren.end();
+}
+
+
+/******************* Private Methods ***************************/
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::setChanged(...)
+// 
+// Purpose: Sets this node and all of its parents up to the tree root dirty
+// 
+//-----------------------------------------------------------------------------
+
+void  Chunk::setChanged()
+{
+	mDirty = true;
+
+	if (mParent != NULL)
+	{
+		mParent->setChanged();
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::adjustInternalBuffer(...)
+// 
+// Purpose: Resizes the internal byte buffer to the given size if the new size 
+//			is bigger than the current one.
+//			If the new size is smaller, the buffer is not adjusted
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::adjustInternalBuffer( XMP_Uns64 newSize )
+{
+	// only adjust if the new size is bigger than the old one.
+	// If it is smaller, leave the buffer alone
+	if( newSize > mBufferSize )
+	{
+		XMP_Uns8 *tmp = new XMP_Uns8[static_cast<size_t>(newSize)]; // Might throw bad_alloc exception
+			
+		// Do we have an old buffer?
+		if( mData != NULL )
+		{
+			// Copy it to the new one and delete the old one
+			memcpy( tmp, mData, static_cast<size_t>(mBufferSize) );
+				
+			delete [] mData;
+		}
+		mData = tmp;
+		mBufferSize = newSize;
+	}
+}//adjustInternalBuffer
+
+
+//-----------------------------------------------------------------------------
+// 
+// Chunk::adjustSize(...)
+// 
+// Purpose: Adjusts the chunk size and the parents chunk sizes
+// 
+//-----------------------------------------------------------------------------
+
+void Chunk::adjustSize( XMP_Int64 sizeChange )
+{
+	// Calculate leaf sizeChange
+	if (mChunkMode == CHUNK_LEAF)
+	{
+		// Note: The leave nodes size is equal to the buffer size can have odd and even sizes.
+		XMP_Uns64 sizeInclPad = mSize + (mSize % 2);
+		sizeChange = mBufferSize - sizeInclPad;
+		mSize = mBufferSize;
+
+		// if the difference is odd, the corrected even size has be incremented by 1
+		sizeChange += std::abs(sizeChange % 2);
+	}
+	else // mChunkMode == CHUNK_NODE/CHUNK_UNKNOWN
+	{
+		// if the difference is odd, the corrected even size has be incremented by 1
+		// (or decremented by 1 when < 0).
+		sizeChange += sizeChange % 2;
+
+		// the chunk node gets the corrected (odd->even) size
+		mSize += sizeChange;
+	}
+
+
+	if (mParent != NULL)
+	{
+		// adjusts the parents size with the corrected (odd->even) size difference of this node
+		mParent->adjustSize(sizeChange);
+	}
+}//adjustSize
diff --git a/XMPFiles/source/FormatSupport/IFF/Chunk.h b/XMPFiles/source/FormatSupport/IFF/Chunk.h
new file mode 100644
index 0000000..ef2ba47
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/Chunk.h
@@ -0,0 +1,468 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _Chunk_h_
+#define _Chunk_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "source/Endian.h"
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "XMPFiles/source/FormatSupport/IFF/IChunkData.h"
+#include "XMPFiles/source/FormatSupport/IFF/IChunkContainer.h"
+
+namespace IFF_RIFF
+{
+	/**
+	 * CHUNK_UNKNOWN	= Either new chunk or a chunk that was read, but not cached
+	 *					  (it is not decided yet whether it becones a node or leaf or is not cached at all)
+	 * CHUNK_NODE		= Node chunk that contains children, but no own data (except the optional type)
+	 * CHUNK_LEAF		= Leaf chunk that contains data but no children
+	 */
+	enum ChunkMode { CHUNK_UNKNOWN = 0, CHUNK_NODE = 1, CHUNK_LEAF = 2 };
+
+/**
+ *	Each Chunk of the IFF/RIFF based file formats (e.g. WAVE, AVI, AIFF) are represented by
+ *	instances of the class Chunk.
+ *  A chunk can be a node chunk containing children, a leaf chunk containing data or an "unknown" chunk,
+ *	which means that its content has not cached/loaded yet (or will never be during the file handling);
+ *	see ChunkMode for more details.
+ *
+ *	Note: A Chunk can either have a chunk OR a list of child chunks, but never both.
+ *
+ *	This class provides access to the children or the data of a chunk, depending of the type.
+ *	It keeps track of its size. When the size is changed (by adding or removing data/ or children),
+ *  the size is also fixed for the parent hierarchy.
+ *
+ *  The dirty flag (hasChanged()) that is set for each change of a chunk is also promoted to the parents.
+ *  The chunk stores its original and new offset within the host file, but its *not* automatically correctin the offset;
+ *	this is done by the IChunkBehavior class.
+ *	The Chunk class provides an interface to iterate through the tree structure of Chunks.
+ *	There are methods to insert, remove and move Chunk's in its children tree structure.
+ *
+ *	The chunk can read itself from a host file (readChunk()), but it does not automatically read its children,
+ *	because they are not necessarily used by the file handler.
+ *	The method writeChunk() recurses through the complete chunk tree and writes the *changed* chunks back to the host file.
+ *	It is important that the offsets have been fixed before.
+ *
+ *	Table about endianess in the different RIFF file formats:
+ *
+ *			|	ID 		size 	type 	data
+ *	-----------------------------------------
+ *	AVI		|	BE		LE		BE		LE
+ *	WAV		|	BE		LE		BE		LE
+ *	AIFF	|	BE		BE		BE		BE
+ */
+class Chunk : public IChunkData,
+			  public IChunkContainer
+{
+	public:
+		/** Factory to create an empty chunk */
+		static Chunk* createChunk( const IEndian& endian );
+
+		/** Factory to create an empty chunk */
+		static Chunk* createUnknownChunk(
+			const IEndian& endian,
+			const XMP_Uns32 id,
+			const XMP_Uns32 type,
+			const XMP_Uns64 size,
+			const XMP_Uns64 originalOffset = 0,
+			const XMP_Uns64 offset = 0
+		);
+
+		/** Static factory to create a leaf chunk with no data area or only the type in the data area */
+		static Chunk* createHeaderChunk( const IEndian& endian,	const XMP_Uns32 id,	const XMP_Uns32 type = kType_NONE );
+
+		/**
+		 * dtor
+		 */
+		~Chunk();
+
+
+		//===================== IChunkData interface implementation ================
+
+		/**
+		 * Get the chunk ID
+		 *
+		 * @return	Return the ID, 0 if the chunk does not have an ID.
+		 */
+		inline XMP_Uns32 getID() const		{ return mChunkId.id; }
+
+		/**
+		 * Get the chunk type (if available)
+		 * (the first four data bytes of the chunk could be a chunk type)
+		 *
+		 * @return	Return the type, kType_NONE if the chunk does not contain data.
+		 */
+		inline XMP_Uns32 getType() const		{ return mChunkId.type; }
+
+		/**
+		 * Get the chunk identifier [id and type]
+		 *
+		 * @return	Return the identifier
+		 */
+		inline const ChunkIdentifier& getIdentifier() const		{ return mChunkId; }
+
+		/**
+		 * Access the data of the chunk.
+		 *
+		 * @param data OUT pointer to the byte array
+		 * @return size of the data block, 0 if no data is available
+		 */
+		XMP_Uns64 getData( const XMP_Uns8** data ) const;
+
+		/**
+		 * Set new data for the chunk.
+		 * Will delete an existing internal buffer and recreate a new one
+		 * and copy the given data into that new buffer.
+		 *
+		 * @param data pointer to the data to put into the chunk
+		 * @param size Size of the data block
+		 * @param writeType if true, the type of the chunk (getType()) is written in front of the data block.
+		 */
+		void setData( const XMP_Uns8* const data, XMP_Uns64 size, XMP_Bool writeType = false );
+
+		/**
+		* Returns the current size of the Chunk.
+		*
+		* @param includeHeader if set, the returned size will be the whole chunk size including the header
+		* @return Returns either the size of the data block of the chunk or size of the whole chunk, including the eight byte header.
+		*/
+		XMP_Uns64 getSize( bool includeHeader = false ) const		{ return includeHeader ? mSize + HEADER_SIZE : mSize; }
+
+		/**
+		 * Returns the current size of the Chunk including a pad byte if the size isn't a even number
+		 *
+		 * @param includeHeader		if set, the returned size will be the whole chunk size including the header
+		 * @return					Returns either the size of the data block of the chunk or size of the whole chunk, including the eight byte header.
+		 */
+		XMP_Uns64 getPadSize( bool includeHeader = false ) const;
+		/**
+		 * @return Returns the mode of the chunk (see ChunkMode definition).
+		 */
+		ChunkMode getChunkMode() const { return mChunkMode; }
+
+		/* The following methods are getter/setter for certain data types.
+		 * They always take care of little-endian/big-endian issues.
+		 * The offset starts at the data area of the Chunk. */
+
+		XMP_Uns32 getUns32( XMP_Uns64 offset=0 ) const;
+		void setUns32( XMP_Uns32 value, XMP_Uns64 offset=0 );
+
+		XMP_Uns64 getUns64( XMP_Uns64 offset=0 ) const;
+		void setUns64( XMP_Uns64 value, XMP_Uns64 offset=0 );
+
+		XMP_Int32 getInt32( XMP_Uns64 offset=0 ) const;
+		void setInt32( XMP_Int32 value, XMP_Uns64 offset=0 );
+
+		XMP_Int64 getInt64( XMP_Uns64 offset=0 ) const;
+		void setInt64( XMP_Int64 value, XMP_Uns64 offset=0 );
+
+		std::string getString( XMP_Uns64 size = 0, XMP_Uns64 offset=0 ) const;
+		void setString( std::string value, XMP_Uns64 offset=0 );
+
+
+		//===================== IChunk interface implementation ================
+
+		//FIXME XMP exception if size cast from 64 to 32 looses data
+
+		/**
+		 * Sets the chunk id.
+		 */
+		void setID( XMP_Uns32 id );
+
+		/**
+		 * Sets the chunk type.
+		 */
+		void setType( XMP_Uns32 type );
+
+		/** 
+		 * Sets the chunk size.
+		 * NOTE: Should only be used for repairing wrong sizes in files (repair flag).
+		 * Normally Size is changed by changing the data automatically!
+		 */
+		inline void setSize( XMP_Uns64 newSize, bool setOriginal = false )	{ mDirty = mSize != newSize; mSize = newSize; mOriginalSize = setOriginal ? newSize : mOriginalSize; }
+
+		/** 
+		 * Calculate the size of the chunks that are dirty including the size 
+		 * of its children
+		 */
+		XMP_Int64 calculateWriteSize( ) const;
+
+		/**
+		 * Calculate the size of this chunks based on its children sizes. 
+		 * If this chunk has no children then no new size will be calculated.
+		 */
+		XMP_Uns64 calculateSize( bool setOriginal = false );
+
+		/**
+		 * @return Returns the offset of the chunk within the stream.
+		 */
+		inline XMP_Uns64 getOffset () const		{ return mOffset; }
+
+		/**
+		 * @return Returns the original offset of the chunk within the stream.
+		 */
+		inline XMP_Uns64 getOriginalOffset () const		{ return mOriginalOffset; }
+
+		/**
+		* Returns the original size of the Chunk
+		*
+		 * @param includeHeader		if set, the returned original size will be the whole chunk size including the header
+		 * @return					Returns the original size of the chunk within the stream (inluding/excluding headerSize).
+		 */
+		inline XMP_Uns64 getOriginalSize( bool includeHeader = false ) const		{ return includeHeader ? mOriginalSize + HEADER_SIZE : mOriginalSize; }
+
+		/**
+		 * Returns the original size of the Chunk including a pad byte if the size isn't a even number
+		 *
+		 * @param includeHeader		if set, the returned size will be the whole chunk size including the header
+		 * @return					Returns either the size of the data block of the chunk or size of the whole chunk, including the eight byte header.
+		 */
+		XMP_Uns64 getOriginalPadSize( bool includeHeader = false ) const;
+		
+		/**
+		 * Adjust the offset that this chunk has within the file.
+		 *
+		 * @param	newOffset the new offset within the file stream
+		 */
+		void setOffset (XMP_Uns64 newOffset);   // changes during rearranging
+
+		/**
+		 * Has the Chunk class changes, or has the position within the file been changed?
+		 * If the result is true the chunk has to be written back to the file
+		 * (all parent chunks are also set to dirty in that case).
+		 *
+		 * @return		Returns true if the chunk node has been modified.
+		 */
+		XMP_Bool hasChanged() const		{ return mDirty; }
+
+		/**
+		 * Sets this node and all of its parents up to the tree root dirty.
+		 */
+		void setChanged();
+
+		/**
+		 * Resets the dirty status for this chunk and its children to false
+		 */
+		void resetChanges();
+
+		/**
+		 *Sets all necessary member variables to flag this chunk as a new one being inserted into the tree
+		 */
+		void setAsNew();
+
+		/**
+		 * @return Returns the parent chunk (can be NULL if this is the root of the tree).
+		 */
+		inline Chunk* getParent() const		{ return mParent; }
+
+		/**
+		 * Creates a string representation of the chunk (debug method).
+		 */
+		std::string toString( std::string tabs = std::string() , XMP_Bool showOriginal = false );
+
+
+		//-------------------
+		//  file access
+		//-------------------
+
+		/**
+		 * Read id, size and offset and create a chunk with mode CHUNK_UNKNOWN.
+		 * The file is expected to be open and is not closed!
+		 *
+		 * @param	file	File reference to read the chunk from
+		 */
+		void readChunk( XMP_IO* file );
+
+		/**
+		 * Stores the data in the class (only called if required).
+		 * The file is expected to be open and is not closed!
+		 *
+		 * @param	file	File reference to cache the chunk data
+		 */
+		void cacheChunkData( XMP_IO* file );
+
+		/**
+		 * Write or updates chunk (new data, new size, new position).
+		 * The file is expected to be open and is not closed!
+		 *
+		 * Behavior for the different chunk types:
+		 *
+		 * CHUNK_UNKNOWN:
+		 *     - does not write anything back
+		 *     - throws exception if hasChanged == true
+		 *
+		 * CHUNK_LEAF:
+		 *     - writes ID (starting with offset)
+		 *     - writes size
+		 *     - writes buffer (including the optional type at the beginning)
+		 *
+		 * CHUNK_NODE:
+		 *     - writes ID (starting with offset)
+		 *     - writes size
+		 *     - writes type if defined
+		 *     - calls writeChunk on it's children
+		 *
+		 * Note: readChunk() and optionally cacheChunkData() has to be called before!
+		 *
+		 * @param	file	File reference to write the chunk to
+		 */
+		void writeChunk( XMP_IO* file );
+
+
+		//-------------------
+		//  children access
+		//-------------------
+
+		/**
+		 * @return	Returns the number children chunks.
+		 */
+		XMP_Uns32 numChildren() const;
+
+		/**
+		 * Returns a child node.
+		 *
+		 * @param	pos		position of the child node to return
+		 * @return			Returns the child node at the given position.
+		 */
+		Chunk* getChildAt( XMP_Uns32 pos ) const;
+
+		/**
+		 * Appends a child node at the end of the children list.
+		 *
+		 * @param	node		the new node
+		 * @param	adjustSizes	adjust size of chunk and parents
+		 * @return				Returns the added node.
+		 */
+		void appendChild( Chunk* node, XMP_Bool adjustSizes = true );
+
+		/**
+		 * Inserts a child node at a certain position.
+		 *
+		 * @param	pos			position in the children list to add the new node
+		 * @param	node		the new node
+		 * @return				Returns the added node.
+		 */
+		void insertChildAt( XMP_Uns32 pos, Chunk* node );
+
+		/**
+		 * Removes a child node at a given position.
+		 *
+		 * @param	pos				position of the node to delete in the children list
+		 *
+		 * @return					The removed chunk
+		 */
+		Chunk* removeChildAt( XMP_Uns32 pos );
+
+		/**
+		 * Remove child at the passed position and insert the new chunk
+		 *
+		 * @param pos			Position of chunk that will be replaced
+		 * @param chunk			New chunk
+		 *
+		 * @return		Replaced chunk
+		 */
+		Chunk* replaceChildAt( XMP_Uns32 pos, Chunk* node );
+
+		//--------------------
+		//  children iteration
+		//--------------------
+
+		typedef std::vector<Chunk*>::iterator ChunkIterator;
+		typedef std::vector<Chunk*>::const_iterator ConstChunkIterator;
+
+		ConstChunkIterator firstChild() const;
+
+		ConstChunkIterator lastChild() const;
+
+		/** The size of the header (id+size) */
+		static const XMP_Uns8 HEADER_SIZE = 8;
+		/** The size of the type */
+		static const XMP_Uns8 TYPE_SIZE = 4;
+
+
+	private:
+		/** stores the chunk header */
+		ChunkIdentifier mChunkId;
+		/** Original size of chunk without the header */
+		XMP_Uns64 mOriginalSize;
+		/** size of chunk without the header */
+		XMP_Uns64 mSize;
+		/** size of the internal buffer */
+		XMP_Uns64 mBufferSize;
+		/** buffer for the chunk data without the header, but including the type (first 4 bytes). */
+		XMP_Uns8* mData;
+		/** Buffer to hold the first 4 bytes that are used for either the type or as data.
+		 * Only used for ReadChunk and CacheChunk */
+		ChunkMode mChunkMode;
+
+		/**
+		 * Current position in stream (file). Can only be changed by moving the chunks around
+		 * (by using an IChunkBehavior class).
+		 * Note: Sizes are stored in chunk because it can be changed by the handler (i.e. by changing the data)
+		 */
+		XMP_Uns64 mOriginalOffset;
+		/**
+		 * New position of the chunk in the stream.
+		 * It is initialized to MAXINT64 when there is no new offset.
+		 * If the offset has been changed the dirty flag has to be set.
+		 */
+		XMP_Uns64 mOffset;
+
+		/**
+		 * The dirty flag indicates that the chunk (and all parent chunks) has been modified or moved and
+		 * that it therefore needs to be written to file.
+		 */
+		XMP_Bool  mDirty; // has Chunk data changed? has Chunk position changed?
+
+		/** The parent of this node; only the root node does not have a parent. */
+		Chunk* mParent;
+
+		/** Stores the byte order for this node.
+		 *	Note: The endianess does not change within one file */
+		const IEndian& mEndian;
+
+		/** The list of child nodes. */
+		std::vector<Chunk*>	mChildren;
+
+		/**
+		 * private ctor, prevents direct invokation.
+		 *
+		 *	@param	endian	Endian util
+		 */
+        Chunk( const IEndian& endian );
+
+		/**
+		 * Resizes the internal byte buffer to the given size if the new size is bigger than the current one.
+		 * If the new size is smaller, the buffer is not adjusted
+		 */
+		void adjustInternalBuffer( XMP_Uns64 newSize );
+
+		/**
+		 * Adjusts the chunk size and the parents chunk sizes.
+		 * - Leaf chunks always have the size of their data, inluding the 4-byte type and excluding the header.
+		 *   Leaf chunks can have an ODD size!
+		 * - Node chunks have the added size of all of their children, including the childrens header, but excluding it's own header.
+		 *   IMPORTANT: When a leaf child node has an ODD size of data,
+		 *   a pad byte is added during the writing process and the parent's size INCLUDES the pad byte.
+		 */
+		void adjustSize( XMP_Int64 sizeChange = 0 );
+
+}; // Chunk
+
+} // namespace
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp
new file mode 100644
index 0000000..29dec94
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp
@@ -0,0 +1,733 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FormatSupport/IFF/ChunkController.h"
+#include "XMPFiles/source/FormatSupport/IFF/Chunk.h"
+
+#include <cstdio>
+
+using namespace IFF_RIFF;
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::ChunkController(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+ChunkController::ChunkController( IChunkBehavior* chunkBehavior, XMP_Bool bigEndian )
+: mEndian					(NULL), 
+  mChunkBehavior			(chunkBehavior), 
+  mFileSize					(0),
+  mRoot						(NULL), 
+  mTrailingGarbageOffset	(0),
+  mTrailingGarbageSize		(0)
+{
+	if (bigEndian)
+	{
+		mEndian = &BigEndian::getInstance();
+	} else {
+		mEndian = &LittleEndian::getInstance();
+	}
+
+	// create virtual root chunk
+	mRoot = Chunk::createChunk(*mEndian);
+
+	// share chunk paths with behavior
+	mChunkBehavior->setMovablePaths( &mChunkPaths );
+}
+
+ChunkController::~ChunkController()
+{
+	XMP_Validate( mRoot != NULL, "ERROR inserting Chunk. mRoot is NULL.", kXMPErr_InternalFailure );
+	XMP_Assert(dynamic_cast<Chunk*>(mRoot) == static_cast<Chunk*>(mRoot));
+	delete dynamic_cast<Chunk*>(mRoot);
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::addChunkPath(...)
+// 
+// Purpose: Adds the given path to the array of "Chunk's of interest"
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkController::addChunkPath( const ChunkPath& path )
+{
+	mChunkPaths.push_back(path);
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::compareChunkPaths(...)
+// 
+// Purpose: The function parses all the sibling chunks. For every chunk it 
+//			either caches the chunk, skips it, or calls the function recusivly 
+//			for the children chunks
+// 
+//-----------------------------------------------------------------------------
+
+ChunkPath::MatchResult ChunkController::compareChunkPaths(const ChunkPath& currentPath)
+{
+	ChunkPath::MatchResult result = ChunkPath::kNoMatch;
+
+	for( PathIterator iter = mChunkPaths.begin(); ( result == ChunkPath::kNoMatch ) && ( iter != mChunkPaths.end() ); iter++ )
+	{
+		result = iter->match(currentPath);
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::parseChunks(...)
+// 
+// Purpose: The function Parses all the sibling chunks. For every chunk it 
+//			either caches the chunk, skips it, or calls the function recusivly 
+//			for the children chunks
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkController::parseChunks( XMP_IO* stream, ChunkPath& currentPath, XMP_OptionBits* options /* = NULL */, Chunk* parent /* = NULL */)
+{
+	XMP_Uns64 filePos 		= stream->Offset();
+	XMP_Bool isRoot			= (parent == mRoot);
+	XMP_Uns64 parseLimit	= mFileSize;
+	XMP_Uns32 chunkCnt		= 0; 
+
+	XMP_Validate( mRoot != NULL, "ERROR inserting Chunk. mRoot is NULL.", kXMPErr_InternalFailure );
+	XMP_Assert(dynamic_cast<Chunk*>(mRoot) == static_cast<Chunk*>(mRoot));
+	parent = ( parent == NULL ? dynamic_cast<Chunk*>(mRoot) : parent );
+
+	//
+	// calculate the parse limit
+	//
+	if ( !isRoot )
+	{
+		parseLimit = parent->getOriginalOffset() + parent->getSize( true );
+
+		if( parseLimit > mFileSize )
+		{
+			parseLimit = mFileSize;
+		}
+	}
+
+	while ( filePos < parseLimit )
+	{
+		XMP_Uns64 fileTail = mFileSize - filePos;
+
+		//
+		// check if there is enough space (at least for id and size)
+		//
+		if ( fileTail < Chunk::HEADER_SIZE )
+		{
+			//preserve rest of bytes (fileTail)
+			mTrailingGarbageOffset = filePos;
+			mTrailingGarbageSize = fileTail;
+			break; // stop parsing
+		}
+		else
+		{
+			bool chunkJump = false;
+
+			//
+			// create a new Chunk
+			//
+			Chunk* chunk = Chunk::createChunk(* mEndian );
+			
+			bool readFailure = false;
+			//
+			// read the Chunk (id, size, [type]) without caching the data
+			//
+			try
+			{
+				chunk->readChunk( stream );
+			}
+			catch( ... )
+			{
+				// remember exception during reading the chunk
+				readFailure = true;
+			}
+
+			//
+			// validate chunk ID for top-level chunks
+			//
+			if( isRoot && ! mChunkBehavior->isValidTopLevelChunk( chunk->getIdentifier(), chunkCnt ) )
+			{
+				// notValid: preserve rest of bytes (fileTail)
+				mTrailingGarbageOffset = filePos;
+				mTrailingGarbageSize = fileTail;
+				//delete unused chunk (because these are undefined trailing bytes)
+				delete chunk; 
+				break; // stop parsing
+			}
+			else if ( readFailure )
+			{
+				delete chunk;
+				XMP_Throw ( "Bad RIFF chunk", kXMPErr_BadFileFormat );
+			}
+
+			//
+			// parenting 
+			// (as early as possible in order to be able to clean up 
+			// the tree correctly in the case of an exception)
+			//
+			parent->appendChild(chunk, false);
+
+			// count top-level chunks
+			if( isRoot )
+			{
+				chunkCnt++;
+			}
+
+			//
+			// check size if value exceeds 4GB border
+			//
+			if( chunk->getSize() >= 0x00000000FFFFFFFFLL )
+			{
+				// remember file position
+				XMP_Int64 currentFilePos = stream->Offset();
+
+				// ask for the "real" size value
+				XMP_Uns64 realSize = mChunkBehavior->getRealSize( chunk->getSize(), 
+																  chunk->getIdentifier(),
+																  *mRoot,
+																  stream );
+
+				// set new size at chunk
+				chunk->setSize( realSize, true );
+
+				// set flag if the file position changed
+				chunkJump = currentFilePos < stream->Offset();
+			}
+
+			//
+			// Repair if needed
+			//
+			if ( filePos + chunk->getSize(true) > mFileSize )
+			{
+				bool isUpdate =		( options != NULL ? XMP_OptionIsSet ( *options, kXMPFiles_OpenForUpdate ) : false );
+				bool repairFile =	( options != NULL ? XMP_OptionIsSet ( *options, kXMPFiles_OpenRepairFile ) : false );
+
+				if ( ( ! isUpdate ) || ( repairFile && isRoot ) ) 
+				{
+					chunk->setSize( mFileSize-filePos-Chunk::HEADER_SIZE, true );
+				} 
+				else 
+				{
+					XMP_Throw ( "Bad RIFF chunk size", kXMPErr_BadFileFormat );
+				}
+			}
+
+			// extend search path
+			currentPath.append( chunk->getIdentifier() );
+
+			// first 4 bytes might be already read by the chunk->readChunk function
+			XMP_Uns64 offsetOfChunkRead = stream->Offset() -  filePos - Chunk::HEADER_SIZE;
+
+			switch ( compareChunkPaths(currentPath) )
+			{
+				case ChunkPath::kFullMatch :
+				{
+					chunk->cacheChunkData( stream );
+				}
+				break;
+
+				case ChunkPath::kPartMatch :
+				{
+					parseChunks( stream, currentPath, options, chunk);
+					// recalculate the size based on the sizes of its children
+					chunk->calculateSize( true );
+				}
+				break;
+
+				case ChunkPath::kNoMatch :
+				{
+					// Not a chunk we are interested in, so mark it as not changed
+					// It will then be ignored by any further logic
+					chunk->resetChanges();
+
+					if ( !chunkJump && chunk->getSize() > 0) // if chunk not empty
+					{
+						XMP_Validate( stream->Offset() + chunk->getSize() - offsetOfChunkRead <= mFileSize , "ERROR: want's to skip beyond EOF", kXMPErr_InternalFailure);
+						stream->Seek ( chunk->getSize() - offsetOfChunkRead , kXMP_SeekFromCurrent );
+					}
+				}
+				break;
+			}
+
+			// remove last identifier from current path
+			currentPath.remove();
+
+			// update current file position
+			filePos = stream->Offset();
+
+			// skip pad byte if there is one (if size odd)
+			if( filePos < mFileSize &&
+				( ( chunkJump && ( stream->Offset() & 1 ) > 0 ) ||
+				( !chunkJump && ( chunk->getSize() & 1 ) > 0 ) ) )
+			{
+				stream->Seek ( 1 , kXMP_SeekFromCurrent );
+				filePos++;
+			}
+		}
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::parseFile(...)
+// 
+// Purpose: construct the tree, parse children for list of interesting Chunks
+//			All requested leaf chunks are cached, the parent chunks are created 
+//			but not cached and the rest is skipped
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkController::parseFile( XMP_IO* stream, XMP_OptionBits* options /* = NULL */ )
+{
+	// store file information in root node
+	mFileSize = stream ->Length();
+	ChunkPath currentPath;
+
+	// Make sure the tree is clean before parsing
+	cleanupTree();
+
+	try
+	{
+		parseChunks( stream, currentPath, options, dynamic_cast<Chunk*>(mRoot) );
+	}
+	catch( ... )
+	{
+		this->cleanupTree();
+		throw;
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::writeFile(...)
+// 
+// Purpose: Called by the handler to write back the changes to the file.
+// 
+//-----------------------------------------------------------------------------
+void ChunkController::writeFile( XMP_IO* stream ,XMP_ProgressTracker * progressTracker )
+
+{
+	//
+	// if any of the top-level chunks exceeds their maximum size then skip writing and throw an exception
+	//
+	for( XMP_Uns32 i=0; i<mRoot->numChildren(); i++ )
+	{
+		Chunk* toplevel = mRoot->getChildAt(i);
+		XMP_Validate( toplevel->getSize() < mChunkBehavior->getMaxChunkSize(), "Exceeded maximum chunk size.", kXMPErr_AssertFailure );
+	}
+
+	//
+	// if exception is thrown write chunk is skipped
+	//
+	mChunkBehavior->fixHierarchy(*mRoot);
+
+	if (mRoot->numChildren() > 0)
+	{
+		// The new file size (without trailing garbage) is the offset of the last top-level chunk + its size.
+		// NOTE: the padding bytes can be ignored, as the top-level chunk is always a node, not a leaf.
+		Chunk* lastChild = mRoot->getChildAt(mRoot->numChildren() - 1);
+		XMP_Uns64 newFileSize = lastChild->getOffset() + lastChild->getSize(true);
+		if ( progressTracker != 0 ) 
+		{
+			float fileWriteSize=0.0f;
+			for( XMP_Uns32 i = 0; i < mRoot->numChildren(); i++ )
+			{
+				Chunk* child = mRoot->getChildAt(i);
+				fileWriteSize+=child->calculateWriteSize(  );
+			}
+			XMP_Assert ( progressTracker->WorkInProgress() );
+			progressTracker->AddTotalWork ( fileWriteSize );
+		}
+
+		// Move garbage tail after last top-level chunk,
+		// BEFORE the chunks are written -- in case the file shrinks
+		if (mTrailingGarbageSize > 0  &&  newFileSize != mTrailingGarbageOffset)
+		{
+			if ( progressTracker != 0 ) 
+			{
+				XMP_Assert ( progressTracker->WorkInProgress() );
+				progressTracker->AddTotalWork ( (float)mTrailingGarbageSize );
+			}
+			XIO::Move( stream, mTrailingGarbageOffset, stream, newFileSize, mTrailingGarbageSize );
+			newFileSize += mTrailingGarbageSize;
+		}
+
+		// Write changed and new chunks to the file
+		for( XMP_Uns32 i = 0; i < mRoot->numChildren(); i++ )
+		{
+			Chunk* child = mRoot->getChildAt(i);
+			child->writeChunk( stream );
+		}
+
+		// file has been completely written,
+		// truncate the file it has been bigger before
+		if (newFileSize < mFileSize)
+		{
+			stream->Truncate ( newFileSize  );
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::getChunk(...)
+// 
+// Purpose: returns a certain Chunk
+// 
+//-----------------------------------------------------------------------------
+
+IChunkData* ChunkController::getChunk( const ChunkPath& path, XMP_Bool last ) const
+{
+	IChunkData* ret = NULL;
+
+	if( path.length() > 0 )
+	{
+		ChunkPath current;
+		ret = this->findChunk( path, current, *(dynamic_cast<Chunk*>(mRoot)), last );
+	}
+
+	return ret;
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::findChunk(...)
+// 
+// Purpose: Find a chunk described by path in the hierarchy of chunks starting 
+//			at the passed chunk.
+//			The position of chunk in the hierarchy is described by the parameter 
+//			currentPath.
+//			This method is supposed to be recursively.
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* ChunkController::findChunk( const ChunkPath& path, ChunkPath& currentPath, const Chunk& chunk, XMP_Bool last ) const
+{
+	Chunk* ret = NULL;
+	XMP_Uns32 cnt = 0;
+
+	if( path.length() > currentPath.length() )
+	{
+		for( XMP_Uns32 i=0; i<chunk.numChildren() && ret == NULL; i++ )
+		{
+			//if last is true go backwards
+			last ? cnt=chunk.numChildren()-1-i : cnt=i;
+
+			Chunk* child = NULL;
+
+			try
+			{
+				child = chunk.getChildAt(cnt);
+			}
+			catch(...)
+			{
+				child = NULL;
+			}
+
+			if( child != NULL )
+			{
+				currentPath.append( child->getIdentifier() );
+
+				switch( path.match( currentPath ) )
+				{
+					case ChunkPath::kFullMatch:
+					{
+						ret = child;
+					}
+					break;
+
+					case ChunkPath::kPartMatch:
+					{
+						ret = this->findChunk( path, currentPath, *child, last );
+					}
+					break;
+
+					case ChunkPath::kNoMatch:
+					{
+						// Nothing to do
+					}
+					break;
+				}
+
+				currentPath.remove();
+			}
+		}
+	}
+
+	return ret;
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::getChunks(...)
+// 
+// Purpose: Returns all chunks that match completely to the passed path.
+// 
+//-----------------------------------------------------------------------------
+
+const std::vector<IChunkData*>& ChunkController::getChunks( const ChunkPath& path )
+{
+	mSearchResults.clear();
+
+	if( path.length() > 0 )
+	{
+		ChunkPath current;
+		this->findChunks( path, current, *(dynamic_cast<Chunk*>(mRoot)) );
+	}
+
+	return mSearchResults;
+}//getChunks
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::getTopLevelTypes(...)
+// 
+// Purpose: Return an array containing the types of the top level nodes
+//			Top level nodes are the ones beneath ROOT
+// 
+//-----------------------------------------------------------------------------
+
+const std::vector<XMP_Uns32> ChunkController::getTopLevelTypes()
+{
+	std::vector<XMP_Uns32> typeList;
+
+	for( XMP_Uns32 i = 0; i < mRoot->numChildren(); i++ )
+	{
+		typeList.push_back( mRoot->getChildAt( i )->getType() );
+	}
+
+	return typeList;
+}// getTopLevelTypes
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::findChunks(...)
+// 
+// Purpose: Find all chunks described by path in the hierarchy of chunks starting 
+//			at the passed chunk.
+//			The position of chunks in the hierarchy is described by the parameter 
+//			currentPath. Found chunks that match to the path are stored in the 
+//			member mSearchResults.
+//			This method is supposed to be recursively.
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkController::findChunks( const ChunkPath& path, ChunkPath& currentPath, const Chunk& chunk )
+{
+	if( path.length() > currentPath.length() )
+	{
+		for( XMP_Uns32 i=0; i<chunk.numChildren(); i++ )
+		{
+			Chunk* child = NULL;
+
+			try
+			{
+				child = chunk.getChildAt(i);
+			}
+			catch(...)
+			{
+				child = NULL;
+			}
+
+			if( child != NULL )
+			{
+				currentPath.append( child->getIdentifier() );
+
+				switch( path.match( currentPath ) )
+				{
+					case ChunkPath::kFullMatch:
+					{
+						mSearchResults.push_back( child );
+					}
+					break;
+
+					case ChunkPath::kPartMatch:
+					{
+						this->findChunks( path, currentPath, *child );
+					}
+					break;
+
+					case ChunkPath::kNoMatch:
+					{
+						// Nothing to do
+					}
+					break; 
+				}
+
+				currentPath.remove();
+			}
+		}
+	}
+}//findChunks
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::cleanupTree(...)
+// 
+// Purpose: Cleanup function called from destructor and in case of an exception
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkController::cleanupTree()
+{
+	XMP_Validate( mRoot != NULL, "ERROR inserting Chunk. mRoot is NULL.", kXMPErr_InternalFailure );
+	XMP_Assert(dynamic_cast<Chunk*>(mRoot) == static_cast<Chunk*>(mRoot));
+	delete dynamic_cast<Chunk*>(mRoot);
+	mRoot = Chunk::createChunk(*mEndian);
+}
+
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::dumpTree(...)
+// 
+// Purpose: dumps the tree structure
+// 
+//-----------------------------------------------------------------------------
+
+std::string ChunkController::dumpTree( )
+{
+	std::string ret;
+	char buffer[256];
+
+	if ( mRoot != NULL )
+	{
+		ret = mRoot->toString();
+	}
+
+	if ( mTrailingGarbageSize != 0 )
+	{
+		snprintf( buffer, 255, "\n Trailing Bytes: %llu",	mTrailingGarbageSize );
+
+		std::string str(buffer);
+		ret.append(str);
+	}
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::createChunk(...)
+// 
+// Purpose: Create a new empty chunk
+// 
+//-----------------------------------------------------------------------------
+
+IChunkData* ChunkController::createChunk( XMP_Uns32 id, XMP_Uns32 type /*= kType_NONE*/ )
+{
+	Chunk* chunk = Chunk::createChunk(* mEndian );
+
+	chunk->setID( id );
+	if( type != kType_NONE )
+	{
+		chunk->setType( type );
+	}
+
+	return chunk;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::insertChunk(...)
+// 
+// Purpose: Insert a new chunk. The position of this new chunk within the 
+//			hierarchy is determined internally by the behavior.
+//			Throws an exception if a chunk cannot be inserted into the tree
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkController::insertChunk( IChunkData* chunk )
+{
+	XMP_Validate( chunk != NULL, "ERROR inserting Chunk. Chunk is NULL.", kXMPErr_InternalFailure );
+	XMP_Assert(dynamic_cast<Chunk*>(chunk) == static_cast<Chunk*>(chunk));
+
+	Chunk* ch = dynamic_cast<Chunk*>(chunk);
+	mChunkBehavior->insertChunk( *mRoot, *ch );
+	// sets OriginalSize = Size / OriginalOffset = Offset
+	ch->setAsNew();
+	// force set dirty flag
+	ch->setChanged();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::removeChunk(...)
+// 
+// Purpose: Delete a chunk or remove/delete it from the tree. 
+//			If the chunk exists within the chunk hierarchy the chunk gets removed 
+//			from the tree and deleted.
+//			If it is not in the tree, then it is only destroyed.
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkController::removeChunk( IChunkData* chunk )
+{
+	if( chunk != NULL )
+	{
+		Chunk* chk = dynamic_cast<Chunk*>(chunk);
+
+		if( this->isInTree( chk ) )
+		{
+			if( mChunkBehavior->removeChunk( *mRoot, *chk ) )
+			{
+				delete chk;
+			}
+		}
+		else
+		{
+			delete chk;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkController::isInTree(...)
+// 
+// Purpose: return true if the passed in Chunk is part of the Chunk tree
+// 
+//-----------------------------------------------------------------------------
+
+bool ChunkController::isInTree( Chunk* chunk )
+{
+	bool ret = ( mRoot == chunk );
+
+	if( !ret && chunk != NULL )
+	{
+		Chunk* parent = chunk->getParent();
+
+		while( !ret && parent != NULL )
+		{
+			ret = ( mRoot == parent );
+			parent = parent->getParent();
+		}
+	}
+
+	return ret;
+}
diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkController.h b/XMPFiles/source/FormatSupport/IFF/ChunkController.h
new file mode 100644
index 0000000..52dea42
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.h
@@ -0,0 +1,248 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _ChunkController_h_
+#define _ChunkController_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "source/XMP_LibUtils.hpp"
+#include "source/XMP_ProgressTracker.hpp"
+
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h"
+
+class IEndian;
+
+namespace IFF_RIFF
+{
+/**
+	The class ChunkController is supposed to act as an controller between the IRIFFHandler and the actual chunks (Chunk instances).
+	It controls the parsing and writing of the passed stream.
+*/
+
+class IChunkData;
+class IChunkContainer;
+class Chunk;
+
+class ChunkController
+{
+	public:
+		/**
+		 * Constructor:
+		 * Creates an IEndian based instance for further usage.
+		 *
+		 * @param	IChunkBehavior* chunkBehavior : for AVI the IChunkBehavior instance would be an instance of a IChunkBehavior class, that knows
+		 *				 about the 1,2,4 GB border, padding byte special cases, AVIX stuff and so on. That knowledge would
+		 *				 be used during writeFile()
+		 *				 In the case of WAVE it would be an instance of WAVEBehavior that would know how to get the 64bit
+		 *				 size values for RF64 if required. That knowledge would be used during parseFile()
+		 * @param	XMP_Bool bigEndian set True if file chunk data is big endian (e.g. AIFF).
+		 *				Must explicitely be set, so that handlers do not accidentaly use the wrong endianess
+		 */
+		ChunkController( IChunkBehavior* chunkBehavior, XMP_Bool bigEndian );
+
+		~ChunkController();
+
+		/**
+		 * Adds the given path to the array of "Chunk's of interest",
+		 *
+		 * @param path List of Paths that should be parsed
+		 * example AVI: [ RIFF:AVI/LIST:INFO , RIFF:AVIX/LIST:INFO, RIFF:AVI/LIST:TDAT  ]
+		 */
+		void addChunkPath( const ChunkPath& path );
+
+		/**
+		 * construct the tree, parse children for list of interesting Chunks
+		 * All requested leaf chunks are cached, the parent chunks are created but not cached
+		 * and the rest is skipped.
+		 *
+		 * @param stream the open [file] stream with file pointer at the beginning of the file
+		 *
+		 */
+		void parseFile( XMP_IO* stream, XMP_OptionBits* options  = NULL );
+
+		/**
+		 * Create a new empty chunk
+		 *
+		 * @param	id		Chunk identifier
+		 * @param	type	Chunk type [optional]
+		 * @return	New IChunkData with passed id/type
+		 */
+		IChunkData* createChunk( XMP_Uns32 id, XMP_Uns32 type = kType_NONE );
+
+		/**
+		 * Insert a new chunk. The position of this new chunk within the hierarchy
+		 * is determined internally by the behavior.
+		 * Throws an exception if a chunk cannot be inserted into the tree
+		 *
+		 * @param	chunk The chunk to insert into the tree
+		 */
+		void insertChunk( IChunkData* chunk );
+
+		/**
+		 * Delete a chunk or remove/delete it from the tree.
+		 * If the chunk exists within the chunk hierarchy the chunk gets removed from the tree and deleted.
+		 * If it is not in the tree, then it is only destroyed.
+		 *
+		 * @param	chunk	Chunk to remove/delete
+		 */
+		void removeChunk( IChunkData* chunk );
+
+		/**
+		 * Called by the handler to write back the changes to the file.
+		 * 1. fix the file tree (ChunkBehavior#fixHierarchy),
+		 *    offsets are corrected, no overlapping chunks;
+		 *    if rearranging fails, the file is not touched
+		 * 2. write the changed chunks to the file
+		 *
+		 * @param stream the open [file] stream for writing, the file pointer must be at the beginning
+		 * @param progressTracker Progress tracker to track the file write progress and reporting it to client
+		 */
+		void writeFile( XMP_IO* stream,XMP_ProgressTracker * progressTracker  );
+
+		/**
+		 * Returns the first (or last) Chunk that matches the passed path.
+		 *
+		 * @param path the path of the Chunk to return
+		 * @param last in case of duplicates return the last one
+		 * @return Returns Chunk or NULL
+		 */
+		IChunkData* getChunk( const ChunkPath& path, XMP_Bool last = false ) const;
+
+		/**
+		 * Returns all chunks that match completely to the passed path.
+		 * E.g. if FORM:AIFF/LIST is given, it would return all LIST chunks in FORM:AIFF
+		 *
+		 * @param path the path of the Chunk to return
+		 * @return list of found chunks or empty list
+		 */
+		const std::vector<IChunkData*>& getChunks( const ChunkPath& path );
+
+		/**
+		 * returns the number of the bytes after the last valid IFF chunk
+		 */
+		inline XMP_Int64 getTrailingGarbageSize() { return mTrailingGarbageSize; };
+
+		/**
+		 * returns the file size
+		 */
+		inline XMP_Int64 getFileSize() { return mFileSize; };
+
+		/**
+		 * Return an array containing the types of the top level nodes
+		 * Top level nodes are the ones beneath ROOT
+		 */
+		const std::vector<XMP_Uns32> getTopLevelTypes();
+
+		/**
+		 * dumps the tree structure
+		 *
+		 */
+		std::string dumpTree( );
+
+	protected:
+		/**
+		 * Standard Constructor:
+		 * Hidden on purpose. Must not be used!
+		 * A Controller must have a behavior!
+		 */
+		ChunkController() { XMP_Throw("Ctor hidden", kXMPErr_InternalFailure); }
+
+		/**
+		 * The function Parses all the sibling chunks. For every chunk it either caches the chunk,
+		 * skips it, or calls the function recusivly for the children chunks
+		 *
+		 * @param stream the file stream
+		 * @param currentPath the path/id of the Chunk to return
+		 * @param options handler options
+		 * @param parent pointer to the parent chunk
+		 */
+		void parseChunks( XMP_IO* stream, ChunkPath& currentPath, XMP_OptionBits* options = NULL, Chunk* parent = NULL );
+
+		/**
+		 * The function parses all the sibling chunks. For every chunk it either caches the chunk,
+		 * skips it, or calls the function recusivly for the children chunks
+		 *
+		 * @param ChunkPath& currentPath: the path/id of the Chunk to return
+		 */
+		ChunkPath::MatchResult compareChunkPaths( const ChunkPath& currentPath );
+
+		/**
+		 * Find a chunk described by path in the hierarchy of chunks starting at the passed chunk.
+		 * The position of chunk in the hierarchy is described by the parameter currentPath.
+		 * This method is supposed to be recursively.
+		 */
+		Chunk* findChunk( const ChunkPath& path, ChunkPath& currentPath, const Chunk& chunk, XMP_Bool last = false ) const;
+
+		/**
+		 * Find all chunks described by path in the hierarchy of chunks starting at the passed chunk.
+		 * The position of chunks in the hierarchy is described by the parameter currentPath.
+		 * Found chunks that match to the path are stored in the member mSearchResults.
+		 * This method is supposed to be recursively.
+		 */
+		void findChunks( const ChunkPath& path, ChunkPath& currentPath, const Chunk& chunk );
+
+		/**
+		 * Cleanup function called from destructor and in case of an exception
+		 */
+		void cleanupTree();
+
+		/**
+		 * return true if the passed in Chunk is part of the Chunk tree
+		 *
+		 * @param chunk the chunk that shall be checked.
+		 */
+		bool isInTree( Chunk* chunk );
+
+
+		// Members
+
+		/**
+		 * Endian class. Either BigEndian oder LittleEndian. Based on the file format.
+		 */
+		const IEndian* mEndian;
+
+		/**
+		 * Chunk behaviour class. Has file format specific function for getting the size and
+		 * rearranging the chunk tree.
+		 */
+		IChunkBehavior* mChunkBehavior;
+
+		/** The list of chunks wich should be cached. */
+		std::vector<ChunkPath>	mChunkPaths;
+
+		/** Iterator for the list of chunk paths */
+		typedef std::vector<ChunkPath>::iterator PathIterator;
+
+		/** The overall filesize after parsing the file stream */
+		XMP_Uns64 mFileSize;
+
+		/** The root of the Chunk Tree (top level list) */
+		IChunkContainer*	mRoot;
+
+		/** Offset of trailing garbage characters */
+		XMP_Uns64 mTrailingGarbageOffset;
+
+		/** Size of trailing garbage characters */
+		XMP_Uns64 mTrailingGarbageSize;
+
+		/** search results of method getChunks(...) */
+		ChunkPath mSearchPath;
+
+		/** Cached search results */
+		std::vector<IChunkData*> mSearchResults;
+}; // ChunkController
+
+} // namespace
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp b/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp
new file mode 100644
index 0000000..54680f8
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp
@@ -0,0 +1,239 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "source/XMP_LibUtils.hpp"
+
+#include <vector>
+
+using namespace IFF_RIFF;
+
+typedef std::vector<ChunkIdentifier>::size_type  ChunkSizeType;
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::ChunkPath(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+ChunkPath::ChunkPath( const ChunkIdentifier* path /*= NULL*/, XMP_Uns32 size /*=0*/ )
+{
+	if( path != NULL )
+	{
+		for( XMP_Uns32 i=0; i<size; i++ )
+		{
+			this->append( path[i] );
+		}
+	}
+}
+
+ChunkPath::ChunkPath( const ChunkPath& path )
+{
+	for( XMP_Int32 i=0; i<path.length(); i++ )
+	{
+		this->append( path.identifier(i) );
+	}
+}
+
+ChunkPath::ChunkPath( const ChunkIdentifier& identifier )
+{
+	this->append( identifier );
+}
+
+ChunkPath::~ChunkPath()
+{
+	this->clear();
+}
+
+
+ChunkPath &	ChunkPath::operator=( const ChunkPath &rhs )
+{
+	for( XMP_Int32 i = 0; i < rhs.length(); i++ )
+	{
+		this->append( rhs.identifier(i) );
+	}
+	
+	return *this;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::clear(...)
+// 
+// Purpose: Remove all ChunkIdentifier's from the path
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkPath::clear()
+{
+	mPath.clear();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::append(...)
+// 
+// Purpose: Append a ChunkIdentifier to the end of the path
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkPath::append( XMP_Uns32 id, XMP_Uns32 type /*= kType_NONE*/ )
+{
+	ChunkIdentifier ci;
+	
+	ci.id	 = id;
+	ci.type = type;
+	
+	mPath.push_back(ci);
+}
+
+
+void ChunkPath::append( const ChunkIdentifier& identifier )
+{
+	mPath.push_back(identifier);
+}
+
+
+void ChunkPath::append( const ChunkIdentifier* path, XMP_Uns32 size )
+{
+	if( path != NULL )
+	{
+		for( XMP_Uns32 i=0; i < size; i++ )
+		{
+			this->append( path[i] );
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::insert(...)
+// 
+// Purpose: Insert an identifier
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkPath::insert( const ChunkIdentifier& identifier, XMP_Uns32 pos /*= 0*/ )
+{
+	if( pos >= mPath.size() )
+	{
+		this->append( identifier );
+	}
+	else
+	{
+		mPath.insert( mPath.begin() + pos, identifier );
+	}
+}
+	
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::remove(...)
+// 
+// Purpose: Remove the endmost ChunkIdentifier from the path
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkPath::remove()
+{
+	mPath.pop_back();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::removeAt(...)
+// 
+// Purpose: Remove the ChunkIdentifier at the passed position in the path
+// 
+//-----------------------------------------------------------------------------
+
+void ChunkPath::removeAt( XMP_Int32 pos )
+{
+	if( ! mPath.empty() && pos >= 0 && (ChunkSizeType)pos < mPath.size() )
+	{
+		mPath.erase( mPath.begin() + pos );
+	}
+	else
+	{
+		XMP_Throw( "Index out of range.", kXMPErr_BadIndex );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::identifier(...)
+// 
+// Purpose: Return ChunkIdentifier at the passed position
+// 
+//-----------------------------------------------------------------------------
+
+const ChunkIdentifier& ChunkPath::identifier( XMP_Int32 pos ) const
+{
+	return mPath.at(pos);
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::length(...)
+// 
+// Purpose: Return the number of ChunkIdentifier's in the path
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Int32 ChunkPath::length() const
+{
+	return (XMP_Int32)mPath.size();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// ChunkPath::match(...)
+// 
+// Purpose: Compare the passed ChunkPath with this path.
+// 
+//-----------------------------------------------------------------------------
+
+ChunkPath::MatchResult ChunkPath::match( const ChunkPath& path ) const
+{
+	MatchResult ret			= kNoMatch;
+
+	if( path.length() > 0 )
+	{
+		XMP_Int32 depth			= ( this->length() > path.length() ? path.length() : this->length() );
+		XMP_Int32 matchCount	= 0;
+
+		for( XMP_Int32 i=0; i<depth; i++ )
+		{
+			const ChunkIdentifier& id1 = this->identifier(i);
+			const ChunkIdentifier& id2 = path.identifier(i);
+
+			if( id1.id == id2.id )
+			{
+				if( i == this->length() - 1 && id1.type == kType_NONE )
+				{
+					matchCount++;
+				}
+				else if( id1.type == id2.type )
+				{
+					matchCount++;
+				}
+			}
+			else
+				break;
+		}
+
+		if( matchCount == depth )
+		{
+			ret = ( path.length() >= this->length() ? kFullMatch : kPartMatch );
+		}
+	}
+
+	return ret;
+}
diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkPath.h b/XMPFiles/source/FormatSupport/IFF/ChunkPath.h
new file mode 100644
index 0000000..30ed3c0
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.h
@@ -0,0 +1,191 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _ChunkPath_h_
+#define _ChunkPath_h_
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+
+#include <limits.h>	// For UINT_MAX.
+#include <vector>
+
+namespace IFF_RIFF
+{
+
+/**
+	A ChunkPath describes one certain chunk in the hierarchy of chunks
+	of the IFF/RIFF file format.
+	Each chunks gets identified by a structure of the type ChunkIdentifier.
+	Which consists of the 4byte ID of the chunk and, if applicable, the 4byte
+	type of the chunk.
+*/
+
+// IFF/RIFF ids
+enum {
+	// invalid ID
+	kChunk_NONE = UINT_MAX,
+
+	// format chunks
+	kChunk_RIFF = 0x52494646,
+	kChunk_RF64 = 0x52463634,
+	kChunk_FORM = 0x464F524D,
+	kChunk_JUNK = 0x4A554E4B,
+	kChunk_JUNQ = 0x4A554E51,
+	
+
+	// other container chunks
+	kChunk_LIST = 0x4C495354,
+
+	// other relevant chunks
+	kChunk_XMP  = 0x5F504D58, // "_PMX"
+
+	kChunk_data	= 0x64617461,
+
+	//should occur only in AVI
+	kChunk_Cr8r = 0x43723872,
+	kChunk_PrmL = 0x50726D4C,
+
+	//should occur only in WAV
+	kChunk_DISP = 0x44495350,
+	kChunk_bext = 0x62657874,
+	kChunk_cart = 0x63617274,
+	kChunk_ds64 = 0x64733634,
+	kChunk_iXML = 0x69584D4C,
+
+	// AIFF
+	kChunk_APPL	= 0x4150504C,
+	kChunk_NAME = 0x4E414D45,
+	kChunk_AUTH = 0x41555448,
+	kChunk_CPR  = 0x28632920,
+	kChunk_ANNO = 0x414E4E4F
+};
+
+// IFF/RIFF types
+enum {
+	kType_AVI_ = 0x41564920,
+	kType_AVIX = 0x41564958,
+	kType_WAVE = 0x57415645,
+	kType_AIFF = 0x41494646,
+	kType_AIFC = 0x41494643,
+	kType_INFO = 0x494E464F,
+	kType_Tdat = 0x54646174,
+
+	// AIFF
+	kType_XMP  = 0x584D5020,
+	kType_FREE = 0x46524545,
+
+	kType_NONE = UINT_MAX
+};
+
+
+struct ChunkIdentifier
+{
+   XMP_Uns32 id;
+   XMP_Uns32 type;
+};
+
+/**
+* calculates the size of a ChunkIdentifier array.
+* Has to be a macro as the sizeof operator does nto work for pointer function parameters
+*/
+#define SizeOfCIArray(ciArray) ( sizeof(ciArray) / sizeof(ChunkIdentifier) )
+
+
+class ChunkPath
+{
+public:
+	/**
+	ctor/dtor
+	*/
+							ChunkPath( const ChunkIdentifier* path = NULL, XMP_Uns32 size = 0 );
+							ChunkPath( const ChunkPath& path );
+							ChunkPath( const ChunkIdentifier& identifier );
+						   ~ChunkPath();
+
+	ChunkPath &				operator=( const ChunkPath &rhs );
+
+	/**
+	Append a ChunkIdentifier to the end of the path
+
+	@param	id		4byte id of chunk
+	@param	type	4byte type of chunk
+	*/
+	void					append( XMP_Uns32 id, XMP_Uns32 type = kType_NONE );
+	void					append( const ChunkIdentifier& identifier );
+	
+	/**
+	Append a whole path
+	
+	@param path Array of ChunkIdentifiert objects
+	@param size number of elements in the given array
+	*/
+	void					append( const ChunkIdentifier* path = NULL, XMP_Uns32 size = 0 );
+
+	/**
+	Insert an identifier
+	
+	@param identifier	id and type
+	@param pos			position within the path
+	 */
+	void					insert( const ChunkIdentifier& identifier, XMP_Uns32 pos = 0 );
+
+	/**
+	Remove the endmost ChunkIdentifier from the path
+	*/
+	void					remove();
+	/**
+	Remove the ChunkIdentifier at the passed position in the path.
+	Throw exception if the position is out of range.
+
+	@param	pos		Position of ChunkIdentifier in the path
+	*/
+	void					removeAt( XMP_Int32 pos );
+
+	/**
+	Return ChunkIdentifier at the passed position
+
+	@param	pos		Position of ChunkIdentifier in the path
+	@return			ChunkIdentifier at passed position (throw exception if
+					the position is out of range)
+	*/
+	const ChunkIdentifier&	identifier( XMP_Int32 pos ) const;
+
+	/**
+	Return the number of ChunkIdentifier's in the path
+	*/
+	XMP_Int32				length() const;
+
+	/**
+	Remove all ChunkIdentifier's from the path
+	*/
+	void					clear();
+
+	/**
+	Compare the passed ChunkPath with this path.
+
+	@param	path	Path to compare with this path
+	@return			Match result
+	*/
+	enum MatchResult
+	{
+		kNoMatch	= 0,
+		kPartMatch	= 1,
+		kFullMatch	= 2
+	};
+
+	MatchResult				match( const ChunkPath& path ) const;
+
+private:
+	std::vector<ChunkIdentifier>	mPath;
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp
new file mode 100644
index 0000000..44159c2
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp
@@ -0,0 +1,595 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/Chunk.h"
+
+#include <algorithm>
+
+using namespace IFF_RIFF;
+
+//-----------------------------------------------------------------------------
+// 
+// getIndex(...)
+// 
+// Purpose: [static] Calculate index of chunk in tree
+// 
+//-----------------------------------------------------------------------------
+
+static XMP_Uns32 getIndex( const IChunkContainer& tree, const Chunk& chunk )
+{
+	const Chunk& parent = dynamic_cast<const Chunk&>( tree );
+
+	return std::find( parent.firstChild(), parent.lastChild(), &chunk ) - parent.firstChild();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::arrangeChunksInPlace(...)
+// 
+// Purpose: Try to arrange all chunks of the source tree at their current location. 
+//			In a loop the method takes each chunk of the srcTree.
+//			* If a chunk is a FREE chunk then it is removed.
+//			* If a chunk is a known movable chunk then adjust its offset so that there's
+//			  no gap to its previous chunk. If the chunk offset was adjusted and/or the
+//			  chunk grew/shrank in its size then remember the offset difference for
+//			  further processing
+//			* If the chunk is neither movable nor a FREE chunk and there is a offset 
+//			  difference then fill possible gaps with FREE chunk or move chunks to
+//			  the destTree.
+// 
+//-----------------------------------------------------------------------------
+
+void IChunkBehavior::arrangeChunksInPlace( IChunkContainer& srcTree, IChunkContainer& destTree )
+{
+	XMP_Validate( &srcTree != &destTree, "Source and destination tree mustn't be the same", kXMPErr_InternalFailure );
+
+	XMP_Int64 offsetAdjust = 0;
+
+	for( XMP_Int32 index=0; index<static_cast<XMP_Int32>( srcTree.numChildren() ); index++ )
+	{
+		Chunk* chunk = srcTree.getChildAt( index );
+
+		//
+		// Is chunk one that might be moved in the tree
+		// (and so it's a chunk that might be modified)
+		//
+		if( this->isMovable( *chunk ) )
+		{
+			//
+			// Are there FREE chunks above this chunk?
+			// Then remove it.
+			//
+			Chunk* freeChunk = NULL;
+
+			if( index > 0 )
+			{
+				// find FREE chunk and merge possible multiple FREE chunks to one chunk
+				freeChunk = this->mergeFreeChunks( srcTree, index-1 );
+			}
+
+			if( freeChunk != NULL )
+			{
+				// update running index
+				index = ::getIndex( srcTree, *chunk );
+
+				// subtract size of FREE chunk from offset adjust value
+				offsetAdjust -= static_cast<XMP_Int64>( freeChunk->getPadSize(true) );
+
+				// remove FREE chunk from the tree 
+				srcTree.removeChildAt( index-1 );
+				delete freeChunk;
+
+				// update running index because one chunk was removed from the tree
+				index--;
+			}
+
+			//
+			// offset needs to be adjusted
+			//
+			if( offsetAdjust != 0 )
+			{
+				chunk->setOffset( chunk->getOffset() + offsetAdjust );
+			}
+
+			//
+			// update adjust value if the size of the chunk has changed 
+			// (and so the offsets of following chunks needs to be adjusted)
+			//
+			offsetAdjust += chunk->getPadSize() - chunk->getOriginalPadSize();
+		}
+		else if( this->isFREEChunk( *chunk ) && offsetAdjust != 0 )
+		{
+			//
+			// chunk is a FREE chunk, just remove it
+			//
+
+			// merge FREE chunks
+			chunk = this->mergeFreeChunks( srcTree, index );
+
+			// update running index (in case multiple FREE chunk were merged)
+			index = ::getIndex( srcTree, *chunk );
+
+			// update adjust value about the total size of the FREE chunk
+			offsetAdjust -= static_cast<XMP_Int64>( chunk->getPadSize(true) );
+
+			// remove FREE chunk from tree
+			srcTree.removeChildAt( index );
+			delete chunk;
+
+			// update running index
+			index--;
+		}
+		else if( offsetAdjust != 0 )
+		{
+			//
+			// the current chunk can't be moved,
+			// so we can't adjust the offset of this chunk
+			//
+			XMP_Uns64 gap = 0;
+
+			if( offsetAdjust > 0 )
+			{
+				//
+				// One or more foregoing chunks grew in their seize and so
+				// the offset of following chunks needs to be adjusted.
+				// But since the current chunk can't be moved one or more previous
+				// chunks are now overlapping over the current chunk.
+				//
+				// So now one or more of the previous chunks needs to be removed 
+				// (moved to the destTree) so that the offset value of the current
+				// chunk can stay where it is.
+				// A possible gap will be filled with a FREE chunk.
+				//
+
+				Chunk* preChunk = NULL;
+
+				//
+				// count Chunks that needs to be moved
+				//
+				XMP_Validate( index-1 >= 0, "There shouldn't be an offset adjust value for the first chunk", kXMPErr_InternalFailure );
+
+				XMP_Int32 preIndex = index;
+				XMP_Uns64 preSize  = 0;
+
+				do 
+				{
+					preIndex--;
+					preChunk = srcTree.getChildAt( preIndex );
+
+					XMP_Validate( this->isMovable( *preChunk ) || this->isFREEChunk( *preChunk ), "Movable or FREE chunk expected", kXMPErr_InternalFailure );
+
+					preSize += preChunk->getPadSize( true );
+
+				} while( static_cast<XMP_Int64>( preSize ) < offsetAdjust && preIndex > 0 );
+
+				//
+				// move chunks
+				//
+				for( XMP_Uns32 rem=preIndex; rem<static_cast<XMP_Uns32>( index ); rem++ )
+				{
+					// always fetch chunk at the first index of the range because
+					// these chunks are removed from the tree
+					preChunk = srcTree.removeChildAt( preIndex );
+
+					if( this->isFREEChunk( *preChunk ) )
+					{
+						delete preChunk;
+					}
+					else
+					{
+						destTree.appendChild( preChunk, false );
+					}
+				}
+
+				// update current index
+				index = ::getIndex( srcTree, *chunk );
+
+				//
+				// calculate size of gap
+				//
+				XMP_Uns64 curOffset = chunk->getOffset();
+				XMP_Uns64 preOffset = Chunk::HEADER_SIZE + Chunk::TYPE_SIZE;
+
+				if( index > 0 )
+				{
+					preChunk = srcTree.getChildAt( index-1 );
+					preOffset = preChunk->getOffset() + preChunk->getPadSize( true );
+				}
+
+				gap = curOffset - preOffset;
+			}
+			else if( offsetAdjust < 0 )
+			{
+				//
+				// There is a gap between the previous chunk and the current one.
+				// Fill the gap with a FREE chunk.
+				//
+				gap = offsetAdjust * (-1);
+			}
+
+			//
+			// if there is a gap we need to fill it with a FREE chunk
+			//
+			if( gap > 0 )
+			{
+				//
+				// The gap must be at least as big as the minimum size of FREE chunks.
+				// If that's not the case we need to move more chunks to expand
+				// the gap.
+				//
+				while( gap < this->getMinFREESize() )
+				{
+					XMP_Validate( index > 0, "Not enough space to insert FREE chunk", kXMPErr_Unimplemented );
+
+					Chunk* preChunk = srcTree.removeChildAt( index-1 );
+					gap += preChunk->getPadSize(true);
+					destTree.appendChild( preChunk, false );
+
+					// update running index
+					index--;
+				}
+
+				//
+				// Fill the gap with a FREE chunk.
+				//
+				Chunk* freeChunk = this->createFREE( gap );
+				srcTree.insertChildAt( index, freeChunk );
+				freeChunk->setAsNew();
+
+				// update running index
+				index++;
+			}
+
+			// reset adjust value
+			offsetAdjust = 0;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::arrangeChunksInTree(...)
+// 
+// Purpose: This method proceeds the list of Chunks of the source tree in the 
+//			passed range and looks for FREE chunks in the destination tree to 
+//			move the source chunks to.
+//			Source tree and destination tree could be one and the same but it's 
+//			not required. If both trees are the	same then it's not allowed to 
+//			cross source and destination ranges.
+// 
+//-----------------------------------------------------------------------------
+
+void IChunkBehavior::arrangeChunksInTree( IChunkContainer& srcTree, IChunkContainer& destTree )
+{
+	XMP_Validate( &srcTree != &destTree, "Source and destination tree mustn't be the same", kXMPErr_InternalFailure );
+
+	if( srcTree.numChildren() > 0 )
+	{
+		//
+		// for all chunks that were moved to the end try to find a FREE chunk for them
+		//
+		for( XMP_Int32 index=srcTree.numChildren()-1; index>=0; index-- )
+		{
+			Chunk* chunk = srcTree.getChildAt(index);
+
+			//
+			// find a FREE chunk where the chunk would fit in
+			//
+			XMP_Int32 freeIndex = this->findFREEChunk( destTree, chunk->getSize(true) );
+
+			if( freeIndex >= 0 )
+			{
+				Chunk* freeChunk = destTree.getChildAt( freeIndex );
+
+				// remove chunk from source tree
+				srcTree.removeChildAt( index );
+
+				// insert chunk at new location
+				destTree.insertChildAt( freeIndex, chunk );
+
+				// remove the FREE chunk
+				destTree.removeChildAt( freeIndex+1 );
+
+				//
+				// if the size of the FREE chunk is larger than the size of the chunk then fill
+				// the gap with a new FREE chunk (the method findFREEChunk takes care that the
+				// remaining space is large enough for a new FREE chunk, but findFREEChunk also
+				// takes account of possible pad bytes in its calculations! Therefore following
+				// calculations have to take account of a possible pad byte as well!)
+				//
+				if( freeChunk->getPadSize( true ) > chunk->getPadSize( true ) )
+				{
+					Chunk* remainFreeChunk = this->createFREE( freeChunk->getPadSize( true ) - chunk->getPadSize( true ) );
+					destTree.insertChildAt( freeIndex+1, remainFreeChunk );
+					remainFreeChunk->setAsNew();
+				}
+
+				delete freeChunk;
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::validateOffsets(...)
+// 
+// Purpose: Fix recursively the offset values of all modified chunks. 
+//			At the same time the method checks the offset value of all not 
+//			modified chunks and throws an exception if there is any discrepance
+//			with the calculated offset.
+// 
+//-----------------------------------------------------------------------------
+
+void IChunkBehavior::validateOffsets( IChunkContainer& tree, XMP_Uns64 startOffset /*= 0*/ )
+{
+	XMP_Uns64 offset = startOffset;
+
+	//
+	// for all children of the tree
+	//
+	for( XMP_Uns32 i=0; i<tree.numChildren(); i++ )
+	{
+		Chunk* chunk = tree.getChildAt(i);
+
+		// the offset of a not modified chunk should match the calculated offset
+		XMP_Validate( chunk->getOffset() == offset, "Invalid offset", kXMPErr_InternalFailure );
+
+		if( !this->isMovable( *chunk ) )
+		{
+			XMP_Validate( chunk->getOffset() == chunk->getOriginalOffset(), "Invalid offset non-modified chunk", kXMPErr_InternalFailure );
+		}
+
+		// go through children
+		if( chunk->getChunkMode() == CHUNK_NODE )
+		{
+			this->validateOffsets( *chunk, offset + Chunk::HEADER_SIZE + Chunk::TYPE_SIZE );
+		}
+
+		// calculate next offset
+		offset += chunk->getPadSize(true);
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::getFreeSpace(...)
+// 
+// Purpose: Retrieve the free space at the passed position in the child list of 
+//			the parent tree. If there's	a FREE chunk then return it.
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* IChunkBehavior::getFreeSpace( XMP_Int64& outFreeBytes, const IChunkContainer& tree, XMP_Uns32 index ) const
+{
+	// validate index
+	XMP_Validate( index < tree.numChildren(), "Invalid index", kXMPErr_InternalFailure );
+
+	Chunk* ret = NULL;
+
+	Chunk* chunk = tree.getChildAt( index );
+
+	if( this->isFREEChunk( *chunk ) )
+	{
+		//
+		// chunk is a FREE chunk
+		//
+		outFreeBytes = chunk->getSize( true );
+		ret = chunk;
+	}
+	else if( chunk->getChunkMode() != CHUNK_UNKNOWN && chunk->hasChanged() )
+	{
+		//
+		// chunk is NOT a FREE chunk but the size of this chunk has changed
+		//
+		outFreeBytes = chunk->getOriginalSize() - chunk->getSize();
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::mergeFreeChunks(...)
+// 
+// Purpose: Try to merge existing FREE chunks at the passed position in the 
+//			child list of the passed parent tree. The algorithm looks at the 
+//			position, before the position and after the position.
+// 
+//-----------------------------------------------------------------------------
+
+Chunk* IChunkBehavior::mergeFreeChunks( IChunkContainer& tree, XMP_Uns32 index )
+{
+	// validate index
+	XMP_Validate( index < tree.numChildren(), "Invalid index", kXMPErr_InternalFailure );
+
+	Chunk* ret = NULL;
+
+	Chunk* chunk = tree.getChildAt( index );
+
+	//
+	// is chunk a FREE chunk
+	//
+	if( this->isFREEChunk( *chunk ) )
+	{
+		XMP_Uns32 indexStart	= index;
+		XMP_Uns32 indexEnd		= index;
+
+		XMP_Uns64 size			= chunk->getPadSize( true );
+
+		//
+		// find FREE chunks before start chunk
+		//
+		if( index > 0 )
+		{
+			XMP_Int32 i = XMP_Int32( index-1 );
+			Chunk* c	= NULL;
+
+			do
+			{
+				c = tree.getChildAt(i);
+
+				if( this->isFREEChunk( *c ) )
+				{
+					size += c->getPadSize( true );
+					indexStart = XMP_Uns32(i);
+					i--;
+				}
+				else
+				{
+					c = NULL;
+				}
+
+			} while( i >= 0 && c != NULL );
+		}
+
+		//
+		// find FREE chunks after start chunk
+		//
+		if( index+1 < tree.numChildren() )
+		{
+			XMP_Uns32 i = index+1;
+			Chunk* c	= NULL;
+
+			do
+			{
+				c = tree.getChildAt(i);
+
+				if( this->isFREEChunk( *c ) )
+				{
+					size += c->getPadSize( true );
+					indexEnd = i;
+					i++;
+				}
+				else
+				{
+					c = NULL;
+				}
+
+			} while( i < tree.numChildren() && c != NULL );
+		}
+
+		if( indexStart < indexEnd )
+		{
+			//
+			// more than one FREE chunks, so merge them
+			//
+			for( XMP_Uns32 i=indexStart; i<=indexEnd; i++ )
+			{
+				Chunk* f = tree.getChildAt( indexStart );
+				tree.removeChildAt( indexStart );
+				delete f;
+			}
+
+			ret  = this->createFREE( size );
+			tree.insertChildAt( indexStart, ret );
+			ret->setAsNew();
+		}
+		else
+		{
+			//
+			// one single FREE chunk
+			//
+			ret = chunk;
+		}
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::findFREEChunk(...)
+// 
+// Purpose: Find a FREE chunk with the passed total size (including header). 
+//			If the FREE chunk is found then take care of the fact that is has 
+//			to be that large (or larger) then the minimum size of a FREE chunk.
+//			The method takes also into account that the passed size probably 
+//			not includes a pad byte
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Int32 IChunkBehavior::findFREEChunk( const IChunkContainer& tree, XMP_Uns64 requiredSize /*including header*/ )
+{
+	XMP_Int32 ret = -1;
+
+	for( XMP_Uns32 i=0; i<tree.numChildren(); i++ )
+	{
+		Chunk* chunk = tree.getChildAt(i);
+
+		XMP_Uns64 requiredSizePad	= requiredSize + ( requiredSize % 2 );	// required size including pad byte
+
+		if( this->isFREEChunk( *chunk ) && 
+			( chunk->getPadSize( true ) == requiredSizePad || 
+			chunk->getPadSize( true ) >= requiredSizePad + getMinFREESize() ) )
+		{
+			ret = i;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::moveChunks(...)
+// 
+// Purpose: Move a range of chunks from one container to another.
+// 
+//-----------------------------------------------------------------------------
+
+void IChunkBehavior::moveChunks( IChunkContainer& srcTree, IChunkContainer& destTree, XMP_Uns32 start )
+{
+	XMP_Validate( &srcTree != &destTree, "Source tree and destination tree shouldn't be the same", kXMPErr_InternalFailure );
+
+	XMP_Uns32 end = srcTree.numChildren();
+
+	for( XMP_Uns32 index=start; index<end; index++ )
+	{
+		Chunk* chunk = srcTree.removeChildAt( start );
+		destTree.appendChild( chunk, true );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IChunkBehavior::isMovable(...)
+// 
+// Purpose: May we move a chunk of passed id/type
+// 
+//-----------------------------------------------------------------------------
+
+bool IChunkBehavior::isMovable( const Chunk& chunk ) const
+{
+	bool ret = false;
+
+	if( !this->isFREEChunk( chunk ) && mMovablePaths != NULL )
+	{
+		ChunkPath path( chunk.getIdentifier() );
+		Chunk* parent = chunk.getParent();
+
+		while( parent != NULL && parent->getID() != kChunk_NONE )
+		{
+			path.insert( parent->getIdentifier() );
+			parent = parent->getParent();
+		}
+
+		for( std::vector<ChunkPath>::iterator iter=mMovablePaths->begin(); iter!=mMovablePaths->end() && !ret; iter++ )
+		{
+			ret = ( iter->match( path ) == ChunkPath::kFullMatch );
+		}
+	}
+
+	return ret;
+}
diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h
new file mode 100644
index 0000000..418afb3
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h
@@ -0,0 +1,239 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _IChunkBehavior_h_
+#define _IChunkBehavior_h_
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+#include <vector>
+
+namespace IFF_RIFF
+{
+
+/**
+	The IChunkBehavior is an interface that provides access to algorithm
+	for the read and write process of IFF/RIFF formated streams.
+	A file format specific instance based on this interface gets injected into
+	the class ChunkController and offers format specific algorithm wherever
+	the processing of a certain file format differs from the general specification
+	of RIFF/IFF.
+	That is e.g. the RF64 format where it is possible that the size value of the
+	top level chunk doesn't represent the real size. Or AVI, where are special rules
+	if the size of a chunk exceed the 4GB border.
+*/
+
+class IChunkContainer;
+class Chunk;
+struct ChunkIdentifier;
+class ChunkPath;
+
+class IChunkBehavior
+{
+public:
+			 IChunkBehavior() : mMovablePaths(NULL) {}
+	virtual ~IChunkBehavior() {};
+
+	/**
+	 * Set list of chunk paths of chunks that might be moved within the hierarchy
+	 */
+	inline void setMovablePaths( std::vector<ChunkPath>* paths )		{ mMovablePaths = paths; }
+
+	/**
+		Validate the passed in size value, identify the valid size if the passed in isn't valid
+		and return the valid size.
+		throw an exception if the passed in size isn't valid and there's no way to identify a
+		valid size.
+
+		@param	size	Size value
+		@param	id		Identifier of chunk
+		@param	tree	Chunk tree
+		@param	stream	Stream handle
+
+		@return		Valid size value.
+	*/
+	virtual	XMP_Uns64		getRealSize( const XMP_Uns64 size, const ChunkIdentifier& id, IChunkContainer& tree, XMP_IO* stream )	= 0;
+
+	/**
+		Return the maximum size of a single chunk, i.e. the maximum size of a top-level chunk.
+
+		@return		Maximum size
+	*/
+	virtual XMP_Uns64		getMaxChunkSize() const																							= 0;
+
+	/**
+		Return true if the passed identifier is valid for top-level chunks of a certain format.
+
+		@param	id			Chunk identifier
+		@param	chunkNo		order number of top-level chunk
+		@return				true, if passed id is a valid top-level chunk
+	*/
+	virtual	bool			isValidTopLevelChunk( const ChunkIdentifier& id, XMP_Uns32 chunkNo )											= 0;
+
+	/**
+		Fix the hierarchy of chunks depending ones based on size changes of one or more chunks
+		and second based on format specific rules.
+		Throw an exception if the hierarchy can't be fixed.
+
+		@param	tree		Vector of root chunks.
+	*/
+	virtual	void			fixHierarchy( IChunkContainer& tree )																			= 0;
+
+	/**
+		Insert a new chunk into the hierarchy of chunks. The behavior needs to decide the position
+		of the new chunk and has to do the insertion.
+
+		@param	tree	Chunk tree
+		@param	chunk	New chunk
+	*/
+	virtual	void			insertChunk( IChunkContainer& tree, Chunk& chunk )																= 0;
+
+	/**
+		Remove the chunk described by the passed ChunkPath.
+
+		@param	tree	Chunk tree
+		@param	path	Path to the chunk that needs to be removed
+
+		@return			true if the chunk was removed and need to be deleted
+	*/
+	virtual	bool			removeChunk( IChunkContainer& tree, Chunk& chunk )																= 0;
+
+protected:
+		/**
+		Create a FREE chunk.
+		If the chunkSize is smaller than the header+type - size then create an annotation chunk.
+		If the passed size is odd, then add a pad byte.
+
+		@param chunkSize	Total size including header
+		@return				New FREE chunk
+	*/
+	virtual Chunk*			createFREE( XMP_Uns64 chunkSize )																				= 0;
+	
+	/**
+		Check if the passed chunk is a FREE chunk.
+		(Could be also a small annotation chunk with zero bytes in its data)
+
+		@param	chunk	A chunk
+
+		@return			true if the passed chunk is a FREE chunk
+	*/
+	virtual XMP_Bool		isFREEChunk( const Chunk& chunk ) const																			= 0;
+
+	/**
+		Return the minimum size of a FREE chunk
+	*/
+	virtual XMP_Uns64		getMinFREESize( ) const			
+																																			= 0;
+protected:
+	/************************************************************************/
+	/* END of Interface. The following are helper functions for all derived */
+	/* Behavior Classes                                                     */
+	/************************************************************************/
+
+	/**
+		Find a FREE chunk with the passed total size (including header). If the FREE chunk is found then
+		take care of the fact that is has to be that large (or larger) then the minimum size of a FREE chunk.
+		The method takes also into account that the passed size probably not includes a pad byte
+
+		@param	tree			Parent tree
+		@param	requiredSize	Required total size (including header)
+
+		@return					Index of found FREE chunk
+	*/
+	XMP_Int32		findFREEChunk( const IChunkContainer& tree, XMP_Uns64 requiredSize );
+	
+	/**
+		May we move a chunk of passed id/type
+
+		@param	identifier		id and type of chunk
+		@return					true if such a chunk might be moved within the tree
+	*/
+	bool			isMovable( const Chunk& chunk ) const;
+
+	/**
+		Validate recursively the offset values of all chunks. 
+		Throws an exception if there is any discrepancy with the calculated offset.
+
+		@param	tree			(Sub-)tree of chunks
+		@param	startOffset		First offset in the (sub-)tree
+	*/
+	void			validateOffsets( IChunkContainer& tree, XMP_Uns64 startOffset = 0 );
+
+	/**
+		Retrieve the free space at the passed position in the child list of the parent tree. 
+		If there's a FREE chunk then return it.
+
+		@param outFreeBytes		On return it takes the number of free bytes
+		@param tree				Parent tree
+		@param index			Position in the child list of the parent tree
+
+		@return					FREE chunk if available
+	*/
+	Chunk*			getFreeSpace( XMP_Int64& outFreeBytes, const IChunkContainer& tree, XMP_Uns32 index ) const ;
+
+	/**
+		Try to arrange all chunks of the source tree at their current location. 
+		The method looks for FREE chunk around or for size changes of the chunks around and try that space.
+		If a chunk can't be arrange at its location it is moved to the end of the destination tree.
+
+		@param srcTree		Tree that consists of the chunks that needs to be arranged
+		@param destTree		Tree where chunks are added to if they can't be arranged
+
+		@return				Index of last proceeded chunk
+		*/
+	void			arrangeChunksInPlace( IChunkContainer& srcTree, IChunkContainer& destTree );
+
+	/**
+		This method proceeds the list of Chunks of the source tree in the passed range and looks for FREE chunks
+		in the destination tree to move the source chunks to.
+		Source tree and destination tree could be one and the same but it's not required. If both trees are the
+		same then it's not allowed to cross source and destination ranges.
+
+		@param srcTree		Tree that consists of the chunks that needs to be arranged
+		@param destTree		Tree where the method looks for FREE chunks
+		@param srcStart		Start index within the source tree
+		@param srcEnd		End index within the source tree (if booth, srcStart and srcEnd are zero then the complete list
+							of the source tree is proceeded)
+		@param destStart	Start index within the destination tree
+		@param destEnd		End index within the destination tree (if booth, destStart and destEnd are zero then the complete list
+							of the destination tree is proceeded)
+	*/
+	void	 		arrangeChunksInTree( IChunkContainer& srcTree, IChunkContainer& destTree );
+
+	/**
+		Try to merge existing FREE chunks at the passed position in the child list
+		of the passed parent tree. 
+		The algorithm looks at the position, before the position and after the position.
+
+		@param tree			Parent tree
+		@param index		Position in the child list of the parent tree
+
+		@return				FREE chunk if available at the passed position (in case of a merge
+							the merged FREE chunk)
+	*/
+	Chunk*			mergeFreeChunks( IChunkContainer& tree, XMP_Uns32 index );
+
+	/**
+		Move a range of chunks from one container to another starting at the start index up to the
+		end of the srcTree.
+		 
+		@param srcTree		Source container
+		@param destTree		Destination container
+		@param start		Start index of source container
+	 */
+	void			moveChunks( IChunkContainer& srcTree, IChunkContainer& destTree, XMP_Uns32 start );
+
+private:
+	std::vector<ChunkPath>*	 mMovablePaths;
+};
+
+} // IChunkBehavior
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h b/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h
new file mode 100644
index 0000000..04ad425
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h
@@ -0,0 +1,87 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _IChunkContainer_h_
+#define _IChunkContainer_h_
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+namespace IFF_RIFF
+{
+
+/**
+	The interface IChunkContainer defines the access to child chunks of 
+	an existing chunk.
+*/
+
+class Chunk;
+
+class IChunkContainer
+{
+public:
+	virtual ~IChunkContainer() {};
+
+		/**
+		 * @return	Returns the number children chunks.
+		 */
+		virtual	XMP_Uns32 numChildren() const															= 0;
+		
+		/**
+		 * Returns a child node.
+		 *
+		 * @param	pos		position of the child node to return
+		 * @return			Returns the child node at the given position.
+		 */
+		virtual	Chunk* getChildAt( XMP_Uns32 pos ) const												= 0;
+
+		/**
+		 * Appends a child node at the end of the children list.
+		 *
+		 * @param	node		the new node
+		 * @param	adjustSizes	adjust size&offset of chunk and parents
+		 * @return				Returns the added node.
+		 */
+		virtual	void appendChild( Chunk* node, XMP_Bool adjustSizes = true )							= 0;
+
+		/**
+		 * Inserts a child node at a certain position.
+		 *
+		 * @param	pos			position in the children list to add the new node
+		 * @param	node		the new node
+		 * @return				Returns the added node.
+		 */
+		virtual	void insertChildAt( XMP_Uns32 pos, Chunk* node )			= 0;
+
+		/**
+		 * Removes a child node at a given position.
+		 *
+		 * @param	pos				position of the node to delete in the children list
+		 *
+		 * @return					The removed chunk
+		 */
+		virtual	Chunk* removeChildAt( XMP_Uns32 pos )						= 0;
+
+		/**
+		 * Remove child at the passed position and insert the new chunk
+		 *
+		 * @param pos			Position of chunk that will be replaced
+		 * @param chunk			New chunk
+		 *
+		 * @return				Replaced chunk
+		 */
+		virtual Chunk* replaceChildAt( XMP_Uns32 pos, Chunk* node )						= 0;
+
+		/** creates a string representation of the chunk and its children. 
+		*/
+		virtual std::string toString( std::string tab = std::string() , XMP_Bool showOriginal = false ) = 0;
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkData.h b/XMPFiles/source/FormatSupport/IFF/IChunkData.h
new file mode 100644
index 0000000..62674e6
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IFF/IChunkData.h
@@ -0,0 +1,108 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _IChunkData_h_
+#define _IChunkData_h_
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "source/Endian.h"
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include <string>
+
+namespace IFF_RIFF
+{
+
+/**
+ *	This interface allow access to only the data part of a chunk.
+ */
+class IChunkData
+{
+	public:		
+
+		virtual ~IChunkData() {};
+
+		/**
+		 * Get the chunk ID
+		 *
+		 * @return	Return the ID, 0 if the chunk does not have an ID.
+		 */
+		virtual XMP_Uns32 getID() const = 0;
+		
+		/**
+		 * Get the chunk type (if available)
+		 * (the first four data bytes of the chunk could be a chunk type)
+		 *
+		 * @return	Return the type, kType_NONE if the chunk does not contain data.
+		 */
+		virtual XMP_Uns32 getType() const = 0;
+
+		/**
+		 * Get the chunk identifier [id and type]
+		 *
+		 * @return	Return the identifier
+		 */
+		virtual const ChunkIdentifier& getIdentifier() const = 0;
+		
+		/**
+		 * Access the data of the chunk.
+		 *
+		 * @param data OUT pointer to the byte array
+		 * @return size of the data block, 0 if no data is available
+		 */
+		virtual XMP_Uns64 getData( const XMP_Uns8** data ) const = 0;
+
+		/**
+		 * Set new data for the chunk. 
+		 * Will delete an existing internal buffer and recreate a new one
+		 * and copy the given data into that new buffer.
+		 *
+		 * @param data pointer to the data to put into the chunk
+		 * @param size Size of the data block
+		 */
+		virtual void setData( const XMP_Uns8* const data, XMP_Uns64 size, XMP_Bool writeType = false ) = 0;
+		
+		/** 
+		 * Returns the current size of the Chunk without pad byte.
+		 *
+		 * @param includeHeader if set, the returned size will be the whole chunk size including the header
+		 * @return either size of the data block of the chunk or size of the whole chunk
+		 */
+		virtual XMP_Uns64 getSize( bool includeHeader = false ) const = 0; 
+		
+
+		/* The following methods are getter/setter for certain data types. 
+		  They always take care of little-endian/big-endian issues.
+		  The offset starts at the data area of the Chunk. */
+
+		virtual XMP_Uns32 getUns32( XMP_Uns64 offset=0 ) const = 0;
+		virtual void setUns32( XMP_Uns32 value, XMP_Uns64 offset=0 ) = 0;
+
+		virtual XMP_Uns64 getUns64( XMP_Uns64 offset=0 ) const = 0;
+		virtual void setUns64( XMP_Uns64 value, XMP_Uns64 offset=0 ) = 0;
+
+		virtual XMP_Int32 getInt32( XMP_Uns64 offset=0 ) const = 0;
+		virtual void setInt32( XMP_Int32 value, XMP_Uns64 offset=0 ) = 0;
+
+		virtual XMP_Int64 getInt64( XMP_Uns64 offset=0 ) const = 0;
+		virtual void setInt64( XMP_Int64 value, XMP_Uns64 offset=0 ) = 0;
+
+		virtual std::string getString( XMP_Uns64 size = 0, XMP_Uns64 offset=0 ) const = 0;
+		virtual void setString( std::string value, XMP_Uns64 offset=0 ) = 0;
+
+		/**
+		 * Creates a string representation of the chunk and its children.
+		 */
+		virtual std::string toString( std::string tabs = std::string() , XMP_Bool showOriginal = false ) = 0;
+	
+}; // IChunkData
+
+} // namespace
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/IPTC_Support.cpp b/XMPFiles/source/FormatSupport/IPTC_Support.cpp
new file mode 100644
index 0000000..fece006
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IPTC_Support.cpp
@@ -0,0 +1,758 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+#include "source/EndianUtils.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/XIO.hpp"
+
+// =================================================================================================
+/// \file IPTC_Support.cpp
+/// \brief XMPFiles support for IPTC (IIM) DataSets.
+///
+// =================================================================================================
+
+enum { kUTF8_IncomingMode = 0, kUTF8_LosslessMode = 1, kUTF8_AlwaysMode = 2 };
+#ifndef kUTF8_Mode
+	#define kUTF8_Mode kUTF8_AlwaysMode
+#endif
+
+const DataSetCharacteristics kKnownDataSets[] =
+	{ { kIPTC_ObjectType,        kIPTC_UnmappedText,   67, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_IntellectualGenre, kIPTC_MapSpecial,     68, kXMP_NS_IPTCCore,  "IntellectualGenre" },	// Only the name part is in the XMP.
+	  { kIPTC_Title,             kIPTC_MapLangAlt,     64, kXMP_NS_DC,        "title" },
+	  { kIPTC_EditStatus,        kIPTC_UnmappedText,   64, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_EditorialUpdate,   kIPTC_UnmappedText,    2, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_Urgency,           kIPTC_MapSimple,       1, kXMP_NS_Photoshop, "Urgency" },
+	  { kIPTC_SubjectCode,       kIPTC_MapSpecial,    236, kXMP_NS_IPTCCore,  "SubjectCode" },			// Only the reference number is in the XMP.
+	  { kIPTC_Category,          kIPTC_MapSimple,       3, kXMP_NS_Photoshop, "Category" },
+	  { kIPTC_SuppCategory,      kIPTC_MapArray,       32, kXMP_NS_Photoshop, "SupplementalCategories" },
+	  { kIPTC_FixtureIdentifier, kIPTC_UnmappedText,   32, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_Keyword,           kIPTC_MapArray,       64, kXMP_NS_DC,        "subject" },
+	  { kIPTC_ContentLocCode,    kIPTC_UnmappedText,    3, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ContentLocName,    kIPTC_UnmappedText,   64, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ReleaseDate,       kIPTC_UnmappedText,    8, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ReleaseTime,       kIPTC_UnmappedText,   11, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ExpDate,           kIPTC_UnmappedText,    8, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ExpTime,           kIPTC_UnmappedText,   11, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_Instructions,      kIPTC_MapSimple,     256, kXMP_NS_Photoshop, "Instructions" },
+	  { kIPTC_ActionAdvised,     kIPTC_UnmappedText,    2, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_RefService,        kIPTC_UnmappedText,   10, "",                "" },						// Not mapped to XMP. ! Interleave 2:45, 2:47, 2:50!
+	  { kIPTC_RefDate,           kIPTC_UnmappedText,    8, "",                "" },						// Not mapped to XMP. ! Interleave 2:45, 2:47, 2:50!
+	  { kIPTC_RefNumber,         kIPTC_UnmappedText,    8, "",                "" },						// Not mapped to XMP. ! Interleave 2:45, 2:47, 2:50!
+	  { kIPTC_DateCreated,       kIPTC_MapSpecial,      8, kXMP_NS_Photoshop, "DateCreated" },			// ! Reformatted date. Combined with 2:60, TimeCreated.
+	  { kIPTC_TimeCreated,       kIPTC_UnmappedText,   11, "",                "" },						// ! Combined with 2:55, DateCreated.
+	  { kIPTC_DigitalCreateDate, kIPTC_Map3Way,         8, "",                "" },						// ! 3 way Exif-IPTC-XMP date/time set. Combined with 2:63, DigitalCreateTime.
+	  { kIPTC_DigitalCreateTime, kIPTC_UnmappedText,   11, "",                "" },						// ! Combined with 2:62, DigitalCreateDate.
+	  { kIPTC_OriginProgram,     kIPTC_UnmappedText,   32, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ProgramVersion,    kIPTC_UnmappedText,   10, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ObjectCycle,       kIPTC_UnmappedText,    1, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_Creator,           kIPTC_Map3Way,        32, "",                "" },						// ! In the 3 way Exif-IPTC-XMP set.
+	  { kIPTC_CreatorJobtitle,   kIPTC_MapSimple,      32, kXMP_NS_Photoshop, "AuthorsPosition" },
+	  { kIPTC_City,              kIPTC_MapSimple,      32, kXMP_NS_Photoshop, "City" },
+	  { kIPTC_Location,          kIPTC_MapSimple,      32, kXMP_NS_IPTCCore,  "Location" },
+	  { kIPTC_State,             kIPTC_MapSimple,      32, kXMP_NS_Photoshop, "State" },
+	  { kIPTC_CountryCode,       kIPTC_MapSimple,       3, kXMP_NS_IPTCCore,  "CountryCode" },
+	  { kIPTC_Country,           kIPTC_MapSimple,      64, kXMP_NS_Photoshop, "Country" },
+	  { kIPTC_JobID,             kIPTC_MapSimple,      32, kXMP_NS_Photoshop, "TransmissionReference" },
+	  { kIPTC_Headline,          kIPTC_MapSimple,     256, kXMP_NS_Photoshop, "Headline" },
+	  { kIPTC_Provider,          kIPTC_MapSimple,      32, kXMP_NS_Photoshop, "Credit" },
+	  { kIPTC_Source,            kIPTC_MapSimple,      32, kXMP_NS_Photoshop, "Source" },
+	  { kIPTC_CopyrightNotice,   kIPTC_Map3Way,       128, "",                "" },						// ! In the 3 way Exif-IPTC-XMP set.
+	  { kIPTC_Contact,           kIPTC_UnmappedText,  128, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_Description,       kIPTC_Map3Way,      2000, "",                "" },						// ! In the 3 way Exif-IPTC-XMP set.
+	  { kIPTC_DescriptionWriter, kIPTC_MapSimple,      32, kXMP_NS_Photoshop, "CaptionWriter" },
+	  { kIPTC_RasterizedCaption, kIPTC_UnmappedBin,  7360, "",                "" },						// Not mapped to XMP. ! Binary data!
+	  { kIPTC_ImageType,         kIPTC_UnmappedText,    2, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_ImageOrientation,  kIPTC_UnmappedText,    1, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_LanguageID,        kIPTC_UnmappedText,    3, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_AudioType,         kIPTC_UnmappedText,    2, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_AudioSampleRate,   kIPTC_UnmappedText,    6, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_AudioSampleRes,    kIPTC_UnmappedText,    2, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_AudioDuration,     kIPTC_UnmappedText,    6, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_AudioOutcue,       kIPTC_UnmappedText,   64, "",                "" },						// Not mapped to XMP.
+	  { kIPTC_PreviewFormat,     kIPTC_UnmappedBin,     2, "",                "" },						// Not mapped to XMP. ! Binary data!
+	  { kIPTC_PreviewFormatVers, kIPTC_UnmappedBin,     2, "",                "" },						// Not mapped to XMP. ! Binary data!
+	  { kIPTC_PreviewData,       kIPTC_UnmappedBin, 256000, "",               "" },						// Not mapped to XMP. ! Binary data!
+	  { 255,                     kIPTC_MapSpecial,      0, 0,                 0 } };					// ! Must be last as a sentinel.
+
+// A combination of the IPTC "Subject Reference System Guidelines" and IIMv4.1 Appendix G.
+const IntellectualGenreMapping kIntellectualGenreMappings[] =
+{ { "001", "Current" },
+  { "002", "Analysis" },
+  { "003", "Archive material" },
+  { "004", "Background" },
+  { "005", "Feature" },
+  { "006", "Forecast" },
+  { "007", "History" },
+  { "008", "Obituary" },
+  { "009", "Opinion" },
+  { "010", "Polls and surveys" },
+  { "010", "Polls & Surveys" },
+  { "011", "Profile" },
+  { "012", "Results listings and statistics" },
+  { "012", "Results Listings & Tables" },
+  { "013", "Side bar and supporting information" },
+  { "013", "Side bar & Supporting information" },
+  { "014", "Summary" },
+  { "015", "Transcript and verbatim" },
+  { "015", "Transcript & Verbatim" },
+  { "016", "Interview" },
+  { "017", "From the scene" },
+  { "017", "From the Scene" },
+  { "018", "Retrospective" },
+  { "019", "Synopsis" },
+  { "019", "Statistics" },
+  { "020", "Update" },
+  { "021", "Wrapup" },
+  { "021", "Wrap-up" },
+  { "022", "Press release" },
+  { "022", "Press Release" },
+  { "023", "Quote" },
+  { "024", "Press-digest" },
+  { "025", "Review" },
+  { "026", "Curtain raiser" },
+  { "027", "Actuality" },
+  { "028", "Question and answer" },
+  { "029", "Music" },
+  { "030", "Response to a question" },
+  { "031", "Raw sound" },
+  { "032", "Scener" },
+  { "033", "Text only" },
+  { "034", "Voicer" },
+  { "035", "Fixture" },
+  { 0,     0 } };	// ! Must be last as a sentinel. 
+  
+// =================================================================================================
+// FindKnownDataSet
+// ================
+
+static const DataSetCharacteristics* FindKnownDataSet ( XMP_Uns8 dsNum )
+{
+	size_t i = 0;
+
+	while ( kKnownDataSets[i].dsNum < dsNum ) ++i;	// The list is short enough for a linear search.
+	
+	if ( kKnownDataSets[i].dsNum != dsNum ) return 0;
+	return &kKnownDataSets[i];	
+
+}	// FindKnownDataSet
+
+// =================================================================================================
+// IPTC_Manager::ParseMemoryDataSets
+// =================================
+//
+// Parse the IIM block. All datasets are put into the map, although we only really care about 1:90
+// and the known 2:xx ones. This approach is tolerant of ill-formed IIM where the datasets are not
+// sorted by ascending record number.
+
+void IPTC_Manager::ParseMemoryDataSets ( const void* data, XMP_Uns32 length, bool copyData /* = true */ )
+{
+	// Get rid of any existing data.
+
+	DataSetMap::iterator dsPos = this->dataSets.begin();
+	DataSetMap::iterator dsEnd = this->dataSets.end();
+	
+	for ( ; dsPos != dsEnd; ++dsPos ) this->DisposeLooseValue ( dsPos->second );
+
+	this->dataSets.clear();
+	
+	if ( this->ownedContent ) free ( this->iptcContent );
+	this->ownedContent = false;	// Set to true later if the content is copied.
+	this->iptcContent = 0;
+	this->iptcLength = 0;
+
+	this->changed = false;
+	
+	if ( length == 0 ) return;
+	if ( (data == 0) || (*((XMP_Uns8*)data) != 0x1C) ) XMP_Throw ( "Not valid IPTC, no leading 0x1C", kXMPErr_BadIPTC );
+	
+	// Allocate space for the full in-memory data and copy it.
+	
+	if ( length > 10*1024*1024 ) XMP_Throw ( "Outrageous length for memory-based IPTC", kXMPErr_BadIPTC );
+	this->iptcLength = length;
+	
+	if ( ! copyData ) {
+		this->iptcContent = (XMP_Uns8*)data;
+	} else {
+		this->iptcContent = (XMP_Uns8*) malloc(length);
+		if ( this->iptcContent == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( this->iptcContent, data, length );	// AUDIT: Safe, malloc'ed length bytes above.
+		this->ownedContent = true;
+	}
+	
+	// Build the map of the DataSets. The records should be in ascending order, but we tolerate out
+	// of order IIM produced by some unknown apps. The DataSets in a record can be in any order.
+	// There are no record markers, just DataSets, so the ordering is really just clumping of
+	// DataSets by record. A normal DataSet has a 5 byte header followed by the value. An extended
+	// DataSet has a special length in the header, a variable sized value length, and the value.
+	//
+	// Normal DataSet
+	// 0	uint8	0x1C
+	// 1	uint8	record number
+	// 2	uint8	DataSet number
+	// 3	uint16	big endian value size, 0..32767, larger means extended DataSet
+	//
+	// In an extended DataSet the extended length size is the low 15 bits of the standard size. The
+	// extended length follows as a big endian unsigned number. The IPTC does not specify, but we
+	// require the extended length size to be in the range 1..4. It should only be 3 or 4, we allow
+	// the degenerate cases.
+	
+	XMP_Uns8* iptcPtr   = this->iptcContent;
+	XMP_Uns8* iptcEnd   = iptcPtr + length;
+	XMP_Uns8* iptcLimit = iptcEnd - kMinDataSetSize;
+	XMP_Uns32 dsLen;	// ! The large form can have values up to 4GB in length.
+	
+	this->utf8Encoding = false;
+	
+	for ( ; iptcPtr <= iptcLimit; iptcPtr += dsLen ) {
+	
+		// iptcLimit - last possible DataSet, 5 bytes before IIM block end
+	
+		// iptcPtr	- working pointer to the current byte of interest
+		// dsPtr	- pointer to the current DataSet's header
+		// dsLen	- value length, does not include extended size bytes
+	
+		XMP_Uns8* dsPtr  = iptcPtr;
+		XMP_Uns8  oneC   = *iptcPtr;
+		XMP_Uns8  recNum = *(iptcPtr+1);
+		XMP_Uns8  dsNum  = *(iptcPtr+2);
+
+		if ( oneC != 0x1C ) break;	// No more DataSets.
+		
+		dsLen  = GetUns16BE ( iptcPtr+3 );	// ! Compute dsLen before any "continue", needed for loop increment!
+		iptcPtr += 5;	// Advance to the data (or extended length).
+		
+		if ( (dsLen & 0x8000) != 0 ) {
+			XMP_Assert ( dsLen <= 0xFFFF );
+			XMP_Uns32 lenLen = dsLen & 0x7FFF;
+			if ( (lenLen == 0) || (lenLen > 4) ) break;	// Bad DataSet, can't find the next so quit.
+			if ( iptcPtr > (iptcEnd - lenLen) ) break;	// Bad final DataSet. Throw instead?
+			dsLen = 0;
+			for ( XMP_Uns16 i = 0; i < lenLen; ++i, ++iptcPtr ) {
+				dsLen = (dsLen << 8) + *iptcPtr;
+			}
+		}
+		
+		if ( iptcPtr > (iptcEnd - dsLen) ) break;	// Bad final DataSet. Throw instead?
+
+		// Make a special check for 1:90 denoting UTF-8 text.
+		if ( (recNum == 1) && (dsNum == 90) ) {
+			if ( (dsLen == 3) && (memcmp ( iptcPtr, "\x1B\x25\x47", 3 ) == 0) ) this->utf8Encoding = true;
+		}
+
+		XMP_Uns16 mapID = recNum*1000 + dsNum;	
+		DataSetInfo dsInfo ( recNum, dsNum, dsLen, iptcPtr );
+		DataSetMap::iterator dsPos = this->dataSets.find ( mapID );
+		
+		bool repeatable = false;
+		
+		const DataSetCharacteristics* knownDS = FindKnownDataSet ( dsNum );
+
+		if ( (knownDS == 0) || (knownDS->mapForm == kIPTC_MapArray) ) {
+			repeatable = true;	// Allow repeats for unknown DataSets.
+		} else if ( (dsNum == kIPTC_Creator) || (dsNum == kIPTC_SubjectCode) ) {
+			repeatable = true;
+		}
+		
+		if ( repeatable || (dsPos == this->dataSets.end()) ) {
+			DataSetMap::value_type mapValue ( mapID, dsInfo );
+			(void) this->dataSets.insert ( this->dataSets.upper_bound ( mapID ), mapValue );
+		} else {
+			this->DisposeLooseValue ( dsPos->second );
+			dsPos->second = dsInfo;	// Keep the last copy of illegal repeats.
+		}
+	
+	}
+
+}	// IPTC_Manager::ParseMemoryDataSets
+
+// =================================================================================================
+// IPTC_Manager::GetDataSet
+// ========================
+
+size_t IPTC_Manager::GetDataSet ( XMP_Uns8 dsNum, DataSetInfo* info, size_t which /* = 0 */ ) const
+{
+
+	XMP_Uns16 mapID = 2000 + dsNum;	// ! Only deal with 2:xx datasets.
+	DataSetMap::const_iterator dsPos = this->dataSets.lower_bound ( mapID );
+	if ( (dsPos == this->dataSets.end()) || (dsPos->second.recNum != 2) || (dsNum != dsPos->second.dsNum) ) return 0;
+	
+	size_t dsCount = this->dataSets.count ( mapID );
+	if ( which >= dsCount ) return 0;	// Valid range for which is 0 .. count-1.
+	
+	if ( info != 0 ) {
+		for ( size_t i = 0; i < which; ++i ) ++dsPos;	// Can't do "dsPos += which", no iter+int operator.
+		*info = dsPos->second;
+	}
+	
+	return dsCount;
+
+}	// IPTC_Manager::GetDataSet
+
+// =================================================================================================
+// IPTC_Manager::GetDataSet_UTF8
+// =============================
+	
+size_t IPTC_Manager::GetDataSet_UTF8 ( XMP_Uns8 dsNum, std::string * utf8Str, size_t which /* = 0 */ ) const
+{
+	if ( utf8Str != 0 ) utf8Str->erase();
+	
+	DataSetInfo dsInfo;
+	size_t dsCount = GetDataSet ( dsNum, &dsInfo, which );
+	if ( dsCount == 0 ) return 0;
+	
+	if ( utf8Str != 0 ) {
+		if ( this->utf8Encoding ) {
+			utf8Str->assign ( (char*)dsInfo.dataPtr, dsInfo.dataLen );
+		} else if ( ! ignoreLocalText ) {
+			ReconcileUtils::LocalToUTF8 ( dsInfo.dataPtr, dsInfo.dataLen, utf8Str );
+		} else if ( ReconcileUtils::IsASCII ( dsInfo.dataPtr, dsInfo.dataLen ) ) {
+			utf8Str->assign ( (char*)dsInfo.dataPtr, dsInfo.dataLen );
+		}
+	}
+	
+	return dsCount;
+	
+}	// IPTC_Manager::GetDataSet_UTF8
+
+// =================================================================================================
+// IPTC_Manager::DisposeLooseValue
+// ===============================
+//
+// Dispose of loose values from SetDataSet calls after the last UpdateMemoryDataSets.
+
+// ! Don't try to make the DataSetInfo struct be self-cleaning. It is a primary public type, returned
+// ! from GetDataSet. Making it self-cleaning would get into nasty assignment and pointer ownership
+// ! issues, far worse than doing this explicit cleanup.
+
+void IPTC_Manager::DisposeLooseValue ( DataSetInfo & dsInfo )
+{
+	if ( dsInfo.dataLen == 0 || dsInfo.dataPtr == NULL ) return;
+	
+	XMP_Uns8* dataBegin = this->iptcContent;
+	XMP_Uns8* dataEnd   = dataBegin + this->iptcLength;
+	
+	if ( ((XMP_Uns8*)dsInfo.dataPtr < dataBegin) || ((XMP_Uns8*)dsInfo.dataPtr >= dataEnd) ) {
+		free ( (void*) dsInfo.dataPtr );
+		dsInfo.dataPtr = NULL;
+	}
+	
+}	// IPTC_Manager::DisposeLooseValue
+
+// =================================================================================================
+// IPTC_Manager::AppendDataSet
+//
+// ! Calling instance must make sure that dsPtr is large enough to hold data from dsInfo !
+// ===========================
+
+XMP_Uns8* IPTC_Manager::AppendDataSet ( XMP_Uns8* dsPtr, const DataSetInfo & dsInfo ) {
+	
+	dsPtr[0] = 0x1C;
+	dsPtr[1] = dsInfo.recNum;
+	dsPtr[2] = dsInfo.dsNum;
+	dsPtr += 3;
+	
+	XMP_Uns32 dsLen = dsInfo.dataLen;
+	if ( dsLen <= 0x7FFF ) {
+		PutUns16BE ( (XMP_Uns16)dsLen, dsPtr );
+		dsPtr += 2;
+	} else {
+		PutUns16BE ( 0x8004, dsPtr );
+		PutUns32BE ( dsLen, dsPtr+2 );
+		dsPtr += 6;
+	}
+	// AUDIT: Calling instance must make sure that dsPtr is large enough.
+	// Currently this function is only called from UpdateMemoryDataSets where the size of dsPtr 
+	// is calculated including all data sets in the list, so the dsInfo data should always fit.
+	memcpy ( dsPtr, dsInfo.dataPtr, dsLen );	
+	dsPtr += dsLen;
+
+	return dsPtr;
+	
+}	// IPTC_Manager::AppendDataSet
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// IPTC_Writer::~IPTC_Writer
+// =========================
+//
+// Dispose of loose values from SetDataSet calls after the last UpdateMemoryDataSets.
+
+IPTC_Writer::~IPTC_Writer()
+{
+	DataSetMap::iterator dsPos = this->dataSets.begin();
+	DataSetMap::iterator dsEnd = this->dataSets.end();
+	
+	for ( ; dsPos != dsEnd; ++dsPos ) this->DisposeLooseValue ( dsPos->second );
+	
+}	// IPTC_Writer::~IPTC_Writer
+
+// =================================================================================================
+// IPTC_Writer::SetDataSet_UTF8
+// ============================
+
+void IPTC_Writer::SetDataSet_UTF8 ( XMP_Uns8 dsNum, const void* utf8Ptr, XMP_Uns32 utf8Len, long which /* = -1 */ )
+{
+	const DataSetCharacteristics* knownDS = FindKnownDataSet ( dsNum );
+	if ( knownDS == 0 ) XMP_Throw ( "Can only set known IPTC DataSets", kXMPErr_InternalFailure );
+	
+	// Decide which character encoding to use and get a temporary pointer to the value.
+	
+	XMP_Uns8 *  tempPtr;
+	XMP_Uns32   dataLen;
+	std::string localStr;
+	
+	if ( kUTF8_Mode == kUTF8_AlwaysMode ) {
+
+		// Always use UTF-8.
+		if ( ! this->utf8Encoding ) this->ConvertToUTF8();
+		tempPtr = (XMP_Uns8*) utf8Ptr;
+		dataLen = utf8Len;
+	
+	} else if ( kUTF8_Mode == kUTF8_IncomingMode ) {
+
+		// Only use UTF-8 if that was what the parsed block used.
+		if ( this->utf8Encoding ) {
+			tempPtr = (XMP_Uns8*) utf8Ptr;
+			dataLen = utf8Len;
+		} else if ( ! ignoreLocalText ) {
+			ReconcileUtils::UTF8ToLocal ( utf8Ptr, utf8Len, &localStr );
+			tempPtr = (XMP_Uns8*) localStr.data();
+			dataLen = (XMP_Uns32) localStr.size();
+		} else {
+			if ( ! ReconcileUtils::IsASCII ( utf8Ptr, utf8Len ) ) return;
+			tempPtr = (XMP_Uns8*) utf8Ptr;
+			dataLen = utf8Len;
+		}
+	
+	} else if ( kUTF8_Mode == kUTF8_LosslessMode ) {
+	
+		// Convert to UTF-8 if needed to prevent round trip loss.
+		if ( this->utf8Encoding ) {
+			tempPtr = (XMP_Uns8*) utf8Ptr;
+			dataLen = utf8Len;
+		} else if ( ! ignoreLocalText ) {
+			std::string rtStr;
+			ReconcileUtils::UTF8ToLocal ( utf8Ptr, utf8Len, &localStr );
+			ReconcileUtils::LocalToUTF8 ( localStr.data(), localStr.size(), &rtStr );
+			if ( (rtStr.size() == utf8Len) && (memcmp ( rtStr.data(), utf8Ptr, utf8Len ) == 0) ) {
+				tempPtr = (XMP_Uns8*) localStr.data();	// No loss, keep local encoding.
+				dataLen = (XMP_Uns32) localStr.size();
+			} else {
+				this->ConvertToUTF8();	// Had loss, change everything to UTF-8.
+				XMP_Assert ( this->utf8Encoding );
+				tempPtr = (XMP_Uns8*) utf8Ptr;
+				dataLen = utf8Len;
+			}
+		} else {
+			if ( ! ReconcileUtils::IsASCII ( utf8Ptr, utf8Len ) ) return;
+			tempPtr = (XMP_Uns8*) utf8Ptr;
+			dataLen = utf8Len;
+		}
+		
+	}
+	
+	// Set the value for this DataSet, making a non-transient copy of the value. Respect UTF-8 character
+	// boundaries when truncating. This is easy to check. If the first truncated byte has 10 in the
+	// high order 2 bits then we are in the middle of a UTF-8 multi-byte character.
+	// Back up to just before a byte with 11 in the high order 2 bits.
+
+	if ( dataLen > knownDS->maxLen ) {
+		dataLen = (XMP_Uns32)knownDS->maxLen;
+		if ( this->utf8Encoding && ((tempPtr[dataLen] >> 6) == 2) ) {
+			for ( ; (dataLen > 0) && ((tempPtr[dataLen] >> 6) != 3); --dataLen ) {}
+		}
+	}
+	
+	XMP_Uns16 mapID = 2000 + dsNum;	// ! Only deal with 2:xx datasets.
+	DataSetMap::iterator dsPos = this->dataSets.find ( mapID );
+	long currCount = (long) this->dataSets.count ( mapID );
+	
+	bool repeatable = false;
+		
+	if ( knownDS->mapForm == kIPTC_MapArray ) {
+		repeatable = true;
+	} else if ( (dsNum == kIPTC_Creator) || (dsNum == kIPTC_SubjectCode) ) {
+		repeatable = true;
+	}
+	
+	if ( ! repeatable ) {
+
+		if ( which > 0 ) XMP_Throw ( "Non-repeatable IPTC DataSet", kXMPErr_BadParam );
+
+	} else {
+	
+		if ( which < 0 ) which = currCount;	// The default is to append.
+
+		if ( which > currCount ) {
+			XMP_Throw ( "Invalid index for IPTC DataSet", kXMPErr_BadParam );
+		} else if ( which == currCount ) {
+			dsPos = this->dataSets.end();	// To make later checks do the right thing.
+		} else {
+			dsPos = this->dataSets.lower_bound ( mapID );
+			for ( ; which > 0; --which ) ++dsPos;
+		}
+	
+	}
+
+	if ( dsPos != this->dataSets.end() ) {
+		if ( (dsPos->second.dataLen == dataLen) && (memcmp ( dsPos->second.dataPtr, tempPtr, dataLen ) == 0) ) {
+			return;	// ! New value matches the old, don't update.
+		}
+	}
+	
+	XMP_Uns8 * dataPtr = dataLen ? (XMP_Uns8*) malloc ( dataLen ) : NULL;
+	if ( dataPtr == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+	memcpy ( dataPtr, tempPtr, dataLen );	// AUDIT: Safe, malloc'ed dataLen bytes above.
+	
+	DataSetInfo dsInfo ( 2, dsNum, dataLen, dataPtr );
+
+	if ( dsPos != this->dataSets.end() ) {
+		this->DisposeLooseValue ( dsPos->second );
+		dsPos->second = dsInfo;
+	} else {
+		DataSetMap::value_type mapValue ( mapID, dsInfo );
+		(void) this->dataSets.insert ( this->dataSets.upper_bound ( mapID ), mapValue );
+	}
+	
+	this->changed = true;
+
+}	// IPTC_Writer::SetDataSet_UTF8
+
+// =================================================================================================
+// IPTC_Writer::DeleteDataSet
+// ==========================
+
+void IPTC_Writer::DeleteDataSet ( XMP_Uns8 dsNum, long which /* = -1 */ )
+{
+	XMP_Uns16 mapID = 2000 + dsNum;	// ! Only deal with 2:xx datasets.
+	DataSetMap::iterator dsBegin = this->dataSets.lower_bound ( mapID );	// Set for which == -1.
+	DataSetMap::iterator dsEnd   = this->dataSets.upper_bound ( mapID );
+	
+	if ( dsBegin == dsEnd ) return;	// Nothing to delete.
+
+	if ( which >= 0 ) {
+		long currCount = (long) this->dataSets.count ( mapID );
+		if ( which >= currCount ) return;	// Nothing to delete.
+		for ( ; which > 0; --which ) ++dsBegin;
+		dsEnd = dsBegin; ++dsEnd;	// ! Can't do "dsEnd = dsBegin+1"!
+	}
+
+	for ( DataSetMap::iterator dsPos = dsBegin; dsPos != dsEnd; ++dsPos ) {
+		this->DisposeLooseValue ( dsPos->second );
+	}
+
+	this->dataSets.erase ( dsBegin, dsEnd );
+	this->changed = true;
+
+}	// IPTC_Writer::DeleteDataSet
+
+// =================================================================================================
+// IPTC_Writer::UpdateMemoryDataSets
+// =================================
+//
+// Reconstruct the entire IIM block. This does not include any final alignment padding, that is an
+// artifact of some specific wrappers such as Photoshop image resources.
+
+void IPTC_Writer::UpdateMemoryDataSets()
+{
+	if ( ! this->changed ) return;
+
+	DataSetMap::iterator dsPos;
+	DataSetMap::iterator dsEnd = this->dataSets.end();
+	
+	if ( kUTF8_Mode == kUTF8_LosslessMode ) {
+		if ( this->utf8Encoding ) {
+			if ( ! this->CheckRoundTripLoss() ) this->ConvertToLocal();
+		} else {
+			if ( this->CheckRoundTripLoss() ) this->ConvertToUTF8();
+		}
+	}
+	
+	// Compute the length of the new IIM block. All DataSets other than 1:90 and 2:xx are preserved
+	// as-is. If local text is used then 1:90 is omitted, if UTF-8 text is used then 1:90 is written
+	// to say so. The map key of (record*1000 + dataset) provides the desired overall order.
+
+	XMP_Uns32 newLength = (5+2);	// We always write 2:00 for the IIM version.
+	if ( this->utf8Encoding ) newLength += (5+3);	// For 1:90, if written.
+	
+	for ( dsPos = this->dataSets.begin(); dsPos != dsEnd; ++dsPos ) {	// Accumulate the other sizes.
+		const XMP_Uns16 mapID = dsPos->first;
+		if ( (mapID == 1090) || (mapID == 2000) ) continue;	// Already dealt with 1:90 and 2:00.
+		XMP_Uns32 dsLen = dsPos->second.dataLen;
+		newLength += (5 + dsLen);
+		if ( dsLen > 0x7FFF ) newLength += 4;	// We always use a 4 byte extended length for big values.
+	}
+		
+	// Allocate the new IIM block.
+	
+	XMP_Uns8* newContent = (XMP_Uns8*) malloc ( newLength );
+	if ( newContent == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+	
+	XMP_Uns8* dsPtr = newContent;
+
+	// Write the record 0 DataSets. There should not be any, but let's be safe.
+	
+	for ( dsPos = this->dataSets.begin(); dsPos != dsEnd; ++dsPos ) {
+		const DataSetInfo & currDS = dsPos->second;
+		if ( currDS.recNum > 0 ) break;
+		dsPtr = AppendDataSet ( dsPtr, currDS );
+	}
+	
+	// Write 1:90 then any other record 1 DataSets.
+	
+	if ( this->utf8Encoding ) {	// Write 1:90 only if text is UTF-8.
+		memcpy ( dsPtr, "\x1C\x01\x5A\x00\x03\x1B\x25\x47", (5+3) );	// AUDIT: Within range of allocation.
+		dsPtr += (5+3);
+	}
+	
+	for ( ; dsPos != dsEnd; ++dsPos ) {
+		const DataSetInfo & currDS = dsPos->second;
+		if ( currDS.recNum > 1 ) break;
+		XMP_Assert ( currDS.recNum == 1 );
+		if ( currDS.dsNum == 90 ) continue;
+		dsPtr = AppendDataSet ( dsPtr, currDS );
+	}
+	
+	// Write 2:00 then all of the other DataSets from all records.
+	
+	if ( this->utf8Encoding ) {
+		// Start with 2:00 for version 4.
+		memcpy ( dsPtr, "\x1C\x02\x00\x00\x02\x00\x04", (5+2) );	// AUDIT: Within range of allocation.
+		dsPtr += (5+2);
+	} else {
+		// Start with 2:00 for version 2.
+		// *** We should probably write version 4 all the time. This is a late CS3 change, don't want
+		// *** to risk breaking other apps that might be strict about version checking.
+		memcpy ( dsPtr, "\x1C\x02\x00\x00\x02\x00\x02", (5+2) );	// AUDIT: Within range of allocation.
+		dsPtr += (5+2);
+	}
+	
+	for ( ; dsPos != dsEnd; ++dsPos ) {
+		const DataSetInfo & currDS = dsPos->second;
+		XMP_Assert ( currDS.recNum > 1 );
+		if ( dsPos->first == 2000 ) continue;	// Check both the record number and DataSet number.
+		dsPtr = AppendDataSet ( dsPtr, currDS );
+	}
+	
+	XMP_Assert ( dsPtr == (newContent + newLength) );
+	
+	// Parse the new block, it is the best way to reset internal info and rebuild the map. 
+	
+	this->ParseMemoryDataSets ( newContent, newLength, false );	// Don't make another copy of the content.
+	XMP_Assert ( this->iptcLength == newLength );
+	this->ownedContent = (newLength > 0);	// We really do own the new content, if not empty.
+
+}	// IPTC_Writer::UpdateMemoryDataSets
+
+// =================================================================================================
+// IPTC_Writer::ConvertToUTF8
+// ==========================
+//
+// Convert the values of existing text DataSets to UTF-8. For now we only accept text DataSets.
+
+void IPTC_Writer::ConvertToUTF8()
+{
+	XMP_Assert ( ! this->utf8Encoding );
+	std::string utf8Str;
+
+	DataSetMap::iterator dsPos = this->dataSets.begin();
+	DataSetMap::iterator dsEnd = this->dataSets.end();
+	
+	for ( ; dsPos != dsEnd; ++dsPos ) {
+
+		DataSetInfo & dsInfo = dsPos->second;
+
+		ReconcileUtils::LocalToUTF8 ( dsInfo.dataPtr, dsInfo.dataLen, &utf8Str );
+		this->DisposeLooseValue ( dsInfo );
+
+		dsInfo.dataLen = (XMP_Uns32)utf8Str.size();
+		dsInfo.dataPtr = (XMP_Uns8*) malloc ( dsInfo.dataLen );
+		if ( dsInfo.dataPtr == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( dsInfo.dataPtr, utf8Str.data(), dsInfo.dataLen );	// AUDIT: Safe, malloc'ed dataLen bytes above.
+
+	}
+	
+	this->utf8Encoding = true;
+
+}	// IPTC_Writer::ConvertToUTF8
+
+// =================================================================================================
+// IPTC_Writer::ConvertToLocal
+// ===========================
+//
+// Convert the values of existing text DataSets to local. For now we only accept text DataSets.
+
+void IPTC_Writer::ConvertToLocal()
+{
+	XMP_Assert ( this->utf8Encoding );
+	std::string localStr;
+
+	DataSetMap::iterator dsPos = this->dataSets.begin();
+	DataSetMap::iterator dsEnd = this->dataSets.end();
+	
+	for ( ; dsPos != dsEnd; ++dsPos ) {
+
+		DataSetInfo & dsInfo = dsPos->second;
+
+		ReconcileUtils::UTF8ToLocal ( dsInfo.dataPtr, dsInfo.dataLen, &localStr );
+		this->DisposeLooseValue ( dsInfo );
+
+		dsInfo.dataLen = (XMP_Uns32)localStr.size();
+		dsInfo.dataPtr = (XMP_Uns8*) malloc ( dsInfo.dataLen );
+		if ( dsInfo.dataPtr == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( dsInfo.dataPtr, localStr.data(), dsInfo.dataLen );	// AUDIT: Safe, malloc'ed dataLen bytes above.
+
+	}
+	
+	this->utf8Encoding = false;
+
+}	// IPTC_Writer::ConvertToLocal
+
+// =================================================================================================
+// IPTC_Writer::CheckRoundTripLoss
+// ===============================
+//
+// See if we still need UTF-8 because of round-trip loss. Returns true if there is loss.
+
+bool IPTC_Writer::CheckRoundTripLoss()
+{
+	XMP_Assert ( this->utf8Encoding );
+	std::string localStr, rtStr;
+
+	DataSetMap::iterator dsPos = this->dataSets.begin();
+	DataSetMap::iterator dsEnd = this->dataSets.end();
+	
+	for ( ; dsPos != dsEnd; ++dsPos ) {
+
+		DataSetInfo & dsInfo = dsPos->second;
+
+		XMP_StringPtr utf8Ptr = (XMP_StringPtr) dsInfo.dataPtr;
+		XMP_StringLen utf8Len = dsInfo.dataLen;
+
+		ReconcileUtils::UTF8ToLocal ( utf8Ptr, utf8Len, &localStr );
+		ReconcileUtils::LocalToUTF8 ( localStr.data(), localStr.size(), &rtStr );
+
+		if ( (rtStr.size() != utf8Len) || (memcmp ( rtStr.data(), utf8Ptr, utf8Len ) != 0) ) {
+			return true; // Had round-trip loss, keep UTF-8.
+		}
+
+	}
+	
+	return false;	// No loss.
+
+}	// IPTC_Writer::CheckRoundTripLoss
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/IPTC_Support.hpp b/XMPFiles/source/FormatSupport/IPTC_Support.hpp
new file mode 100644
index 0000000..4c2d2bc
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/IPTC_Support.hpp
@@ -0,0 +1,305 @@
+#ifndef __IPTC_Support_hpp__
+#define __IPTC_Support_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include <map>
+
+#include "public/include/XMP_Const.h"
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/EndianUtils.hpp"
+
+// =================================================================================================
+/// \file IPTC_Support.hpp
+/// \brief XMPFiles support for IPTC (IIM) DataSets.
+///
+/// This header provides IPTC (IIM) DataSet support specific to the needs of XMPFiles. This is not
+/// intended for general purpose IPTC processing. There is a small tree of derived classes, 1
+/// virtual base class and 2 concrete leaf classes:
+/// \code
+/// 	IPTC_Manager - The root virtual base class.
+///			IPTC_Reader - A derived concrete leaf class for memory-based read-only access.
+///			IPTC_Writer - A derived concrete leaf class for memory-based read-write access.
+/// \endcode
+///
+/// \c IPTC_Manager declares all of the public methods except for specialized constructors in the
+/// leaf classes. The read-only classes throw an XMP_Error exception for output methods like
+/// \c SetDataSet. They return appropriate values for "safe" methods, \c IsChanged will return false
+/// for example.
+///
+/// The IPTC DataSet organization differs from TIFF tags and Photoshop image resources in allowing
+/// muultiple occurrences for some IDs. The C++ STL multimap is a natural data structure for IPTC.
+///
+/// Support is only provided for DataSet 1:90 to decide if local or UTF-8 text encoding is used, and
+/// the following text valued DataSets: 2:05, 2:10, 2:15, 2:20, 2:25, 2:40, 2:55, 2:80, 2:85, 2:90,
+/// 2:95, 2:101, 2:103, 2:105, 2:110, 2:115, 2:116, 2:120, and 2:122. DataSet 2:00 is ignored when
+/// reading but always written.
+///
+/// \note Unlike the TIFF_Manager and PSIR_Manager class trees, IPTC_Manager only provides in-memory
+/// implementations. The total size of IPTC data is small enough to make this reasonable.
+///
+/// \note These classes are for use only when directly compiled and linked. They should not be
+/// packaged in a DLL by themselves. They do not provide any form of C++ ABI protection.
+// =================================================================================================
+
+
+// =================================================================================================
+// =================================================================================================
+
+enum {	// List of recognized 2:* IIM DataSets. The names are from IIMv4 and IPTC4XMP.
+	kIPTC_ObjectType        =   3,
+	kIPTC_IntellectualGenre =   4,
+	kIPTC_Title             =   5,
+	kIPTC_EditStatus        =   7,
+	kIPTC_EditorialUpdate   =   8,
+	kIPTC_Urgency           =  10,
+	kIPTC_SubjectCode       =  12,
+	kIPTC_Category          =  15,
+	kIPTC_SuppCategory      =  20,
+	kIPTC_FixtureIdentifier =  22,
+	kIPTC_Keyword           =  25,
+	kIPTC_ContentLocCode    =  26,
+	kIPTC_ContentLocName    =  27,
+	kIPTC_ReleaseDate       =  30,
+	kIPTC_ReleaseTime       =  35,
+	kIPTC_ExpDate           =  37,
+	kIPTC_ExpTime           =  38,
+	kIPTC_Instructions      =  40,
+	kIPTC_ActionAdvised     =  42,
+	kIPTC_RefService        =  45,
+	kIPTC_RefDate           =  47,
+	kIPTC_RefNumber         =  50,
+	kIPTC_DateCreated       =  55,
+	kIPTC_TimeCreated       =  60,
+	kIPTC_DigitalCreateDate =  62,
+	kIPTC_DigitalCreateTime =  63,
+	kIPTC_OriginProgram     =  65,
+	kIPTC_ProgramVersion    =  70,
+	kIPTC_ObjectCycle       =  75,
+	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_Contact           = 118,
+	kIPTC_Description       = 120,
+	kIPTC_DescriptionWriter = 122,
+	kIPTC_RasterizedCaption = 125,
+	kIPTC_ImageType         = 130,
+	kIPTC_ImageOrientation  = 131,
+	kIPTC_LanguageID        = 135,
+	kIPTC_AudioType         = 150,
+	kIPTC_AudioSampleRate   = 151,
+	kIPTC_AudioSampleRes    = 152,
+	kIPTC_AudioDuration     = 153,
+	kIPTC_AudioOutcue       = 154,
+	kIPTC_PreviewFormat     = 200,
+	kIPTC_PreviewFormatVers = 201,
+	kIPTC_PreviewData       = 202
+};
+
+enum {	// Forms of mapping legacy IPTC to XMP. Order is significant, see PhotoDataUtils::Import2WayIPTC!
+	kIPTC_MapSimple,	// The XMP is simple, the last DataSet occurrence is kept.
+	kIPTC_MapLangAlt,	// The XMP is a LangAlt x-default item, the last DataSet occurrence is kept.
+	kIPTC_MapArray,		// The XMP is an unordered array, all DataSets are kept.
+	kIPTC_MapSpecial,	// The mapping requires DataSet specific code.
+	kIPTC_Map3Way,		// Has a 3 way mapping between Exif, IPTC, and XMP. 
+	kIPTC_UnmappedText,	// A text DataSet that is not mapped to XMP.
+	kIPTC_UnmappedBin	// A binary DataSet that is not mapped to XMP.
+};
+
+struct DataSetCharacteristics {
+	XMP_Uns8 dsNum;
+	XMP_Uns8 mapForm;
+	size_t   maxLen;
+	XMP_StringPtr xmpNS;
+	XMP_StringPtr xmpProp;
+};
+
+extern const DataSetCharacteristics kKnownDataSets[];
+
+struct IntellectualGenreMapping {
+	XMP_StringPtr refNum;	// The reference number as a 3 digit string.
+	XMP_StringPtr name;		// The intellectual genre name.
+};
+
+extern const IntellectualGenreMapping kIntellectualGenreMappings[];
+
+// =================================================================================================
+// IPTC_Manager
+// ============
+
+class IPTC_Manager {
+public:
+
+	// ---------------------------------------------------------------------------------------------
+	// Types and constants.
+
+	struct DataSetInfo {
+		XMP_Uns8   recNum, dsNum;
+		XMP_Uns32  dataLen;
+		XMP_Uns8 * dataPtr;	// ! The data is read-only. Raw data pointer, beware of character encoding.
+		DataSetInfo() : recNum(0), dsNum(0), dataLen(0), dataPtr(0) {};
+		DataSetInfo ( XMP_Uns8 _recNum, XMP_Uns8 _dsNum, XMP_Uns32 _dataLen, XMP_Uns8 * _dataPtr )
+			: recNum(_recNum), dsNum(_dsNum), dataLen(_dataLen), dataPtr(_dataPtr) {};
+	};
+
+	// ---------------------------------------------------------------------------------------------
+	// Parse a binary IPTC (IIM) block.
+	
+	void ParseMemoryDataSets ( const void* data, XMP_Uns32 length, bool copyData = true );
+	
+	// ---------------------------------------------------------------------------------------------
+	// Get the information about a 2:xx DataSet. Returns the number of occurrences. The "which"
+	// parameter selects the occurrence, they are numbered from 0 to count-1. Returns 0 if which is
+	// too large.
+
+	size_t GetDataSet ( XMP_Uns8 dsNum, DataSetInfo* info, size_t which = 0 ) const;
+	
+	// ---------------------------------------------------------------------------------------------
+	// Get the value of a text 2:xx DataSet as UTF-8. The returned pointer must be treated as
+	// read-only. Calls GetDataSet then does a local to UTF-8 conversion if necessary.
+	
+	size_t GetDataSet_UTF8 ( XMP_Uns8 dsNum, std::string * utf8Str, size_t which = 0 ) const;
+	
+	// ---------------------------------------------------------------------------------------------
+	// Set the value of a text 2:xx DataSet from a UTF-8 string. Does a UTF-8 to local conversion if
+	// necessary. If the encoding mode is currently local and this value has round-trip loss, then
+	// the encoding mode will be changed to UTF-8 and all existing values will be converted.
+	// Modifies an existing occurrence if "which" is within range. Adds an occurrence if which
+	// equals the current count, or which is -1 and repeats are allowed. Throws an exception if
+	// which is too large. The dataPtr provides the raw data, text must be in the right encoding.
+
+	virtual void SetDataSet_UTF8 ( XMP_Uns8 dsNum, const void* utf8Ptr, XMP_Uns32 utf8Len, long which = -1 ) = 0;
+	
+	// ---------------------------------------------------------------------------------------------
+	// Delete an existing 2:xx DataSet. Deletes all occurrences if which is -1.
+
+	virtual void DeleteDataSet ( XMP_Uns8 dsNum, long which = -1 ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// Determine if any 2:xx DataSets are changed.
+
+	virtual bool IsChanged() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// Determine if UTF-8 or local text encoding is being used.
+	
+	bool UsingUTF8() const { return this->utf8Encoding; };
+
+	// --------------------------------------------------
+	// Update all DataSets to reflect the changed values.
+
+	virtual void UpdateMemoryDataSets() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// Get the location and size of the full IPTC block. The client must call UpdateMemoryDataSets
+	// first if appropriate. The returned dataPtr must be treated as read only. It exists until the
+	// IPTC_Manager destructor is called.
+
+	XMP_Uns32 GetBlockInfo ( void** dataPtr ) const
+		{ if ( dataPtr != 0 ) *dataPtr = this->iptcContent; return this->iptcLength; };
+
+	// ---------------------------------------------------------------------------------------------
+
+	virtual ~IPTC_Manager() { if ( this->ownedContent ) free ( this->iptcContent ); };
+
+protected:
+	
+	enum { kMinDataSetSize = 5 };	// 1+1+1+2
+	
+	typedef std::multimap<XMP_Uns16,DataSetInfo>  DataSetMap;
+	DataSetMap dataSets;	// ! All datasets are in the map, key is (record*1000 + dataset).
+
+	XMP_Uns8* iptcContent;
+	XMP_Uns32 iptcLength;
+
+	bool changed;
+	bool ownedContent;	// True if IPTC_Manager destructor needs to release the content block.
+	bool utf8Encoding;	// True if text values are encoded as UTF-8.
+
+	IPTC_Manager() : iptcContent(0), iptcLength(0),
+					 changed(false), ownedContent(false), utf8Encoding(false) {};
+	
+	void DisposeLooseValue ( DataSetInfo & dsInfo );
+	XMP_Uns8* AppendDataSet ( XMP_Uns8* dsPtr, const DataSetInfo & dsInfo );
+
+};	// IPTC_Manager
+
+
+// =================================================================================================
+// =================================================================================================
+
+
+// =================================================================================================
+// IPTC_Reader
+// ===========
+
+class IPTC_Reader : public IPTC_Manager {
+public:
+
+	IPTC_Reader() {};
+		
+	void SetDataSet_UTF8 ( XMP_Uns8 dsNum, const void* utf8Ptr, XMP_Uns32 utf8Len, long which = -1 ) { NotAppropriate(); };
+	
+	void DeleteDataSet ( XMP_Uns8 dsNum, long which = -1 ) { NotAppropriate(); };
+
+	bool IsChanged() { return false; };
+	
+	void UpdateMemoryDataSets() { NotAppropriate(); };
+
+	virtual ~IPTC_Reader() {};
+	
+private:
+
+	static inline void NotAppropriate() { XMP_Throw ( "Not appropriate for IPTC_Reader", kXMPErr_InternalFailure ); };
+
+};	// IPTC_Reader
+
+// =================================================================================================
+// IPTC_Writer
+// ===========
+
+class IPTC_Writer : public IPTC_Manager {
+public:
+		
+	void SetDataSet_UTF8 ( XMP_Uns8 dsNum, const void* utf8Ptr, XMP_Uns32 utf8Len, long which = -1 );
+	
+	void DeleteDataSet ( XMP_Uns8 dsNum, long which = -1 );
+
+	bool IsChanged() { return changed; };
+	
+	void UpdateMemoryDataSets ();
+
+	IPTC_Writer() {};
+
+	virtual ~IPTC_Writer();
+
+private:
+
+	void ConvertToUTF8();
+	void ConvertToLocal();
+
+	bool CheckRoundTripLoss();
+
+};	// IPTC_Writer
+
+// =================================================================================================
+
+#endif	// __IPTC_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp
new file mode 100644
index 0000000..d4a8076
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp
@@ -0,0 +1,172 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp"
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+
+// =================================================================================================
+/// \file ISOBaseMedia_Support.cpp
+/// \brief Manager for parsing and serializing ISO Base Media files ( MPEG-4 and JPEG-2000).
+///
+// =================================================================================================
+
+namespace ISOMedia {
+
+typedef  std::set<XMP_Uns32> KnownBoxList;
+static KnownBoxList boxList;
+#define ISOboxType(x,y) boxList.insert(y)
+#define SEPARATOR ;
+	bool IsKnownBoxType(XMP_Uns32 boxType) {
+		if (boxList.empty()){
+			ISOBoxList ISOBoxPrivateList ;
+		}
+		if (boxList.find(boxType)!=boxList.end()){
+			return true;
+		}
+		return false;
+	}
+	void TerminateGlobals()
+	{
+		boxList.clear();
+	}
+#undef ISOboxType
+#undef SEPARATOR
+static BoxInfo voidInfo;
+
+// =================================================================================================
+// GetBoxInfo - from memory
+// ========================
+
+const XMP_Uns8 * GetBoxInfo ( const XMP_Uns8 * boxPtr, const XMP_Uns8 * boxLimit,
+							  BoxInfo * info, bool throwErrors /* = false */ )
+{
+	XMP_Uns32 u32Size;
+	
+	if ( info == 0 ) info = &voidInfo;
+	info->boxType = info->headerSize = 0;
+	info->contentSize = 0;
+	
+	if ( boxPtr >= boxLimit ) XMP_Throw ( "Bad offset to GetBoxInfo", kXMPErr_InternalFailure );
+	
+	if ( (boxLimit - boxPtr) < 8 ) {	// Is there enough space for a standard box header?
+		if ( throwErrors ) XMP_Throw ( "No space for ISO box header", kXMPErr_BadFileFormat );
+		info->headerSize = (XMP_Uns32) (boxLimit - boxPtr);
+		return boxLimit;
+	}
+	
+	u32Size = GetUns32BE ( boxPtr );
+	info->boxType = GetUns32BE ( boxPtr+4 );
+
+	if ( u32Size >= 8 ) {
+		info->headerSize  = 8;	// Normal explicit size case.
+		info->contentSize = u32Size - 8;
+	} else if ( u32Size == 0 ) {
+		info->headerSize  = 8;	// The box goes to EoF - treat it as "to limit".
+		info->contentSize = (boxLimit - boxPtr) - 8;
+	} else if ( u32Size != 1 ) {
+		if ( throwErrors ) XMP_Throw ( "Bad ISO box size, 2..7", kXMPErr_BadFileFormat );
+		info->headerSize  = 8;	// Bad total size in the range of 2..7, treat as 8.
+		info->contentSize = 0;
+	} else {
+		if ( (boxLimit - boxPtr) < 16 ) {	// Is there enough space for an extended box header?
+			if ( throwErrors ) XMP_Throw ( "No space for ISO extended header", kXMPErr_BadFileFormat );
+			info->headerSize = (XMP_Uns32) (boxLimit - boxPtr);
+			return boxLimit;
+		}
+		XMP_Uns64 u64Size = GetUns64BE ( boxPtr+8 );
+		if ( u64Size < 16 ) {
+			if ( throwErrors ) XMP_Throw ( "Bad ISO extended box size, < 16", kXMPErr_BadFileFormat );
+			u64Size = 16;	// Treat bad total size as 16.
+		}
+		info->headerSize  = 16;
+		info->contentSize = u64Size - 16;
+	}
+	
+	XMP_Assert ( (XMP_Uns64)(boxLimit - boxPtr) >= (XMP_Uns64)info->headerSize );
+	if ( info->contentSize > (XMP_Uns64)((boxLimit - boxPtr) - info->headerSize) ) {
+		if ( throwErrors ) XMP_Throw ( "Bad ISO box content size", kXMPErr_BadFileFormat );
+		info->contentSize = ((boxLimit - boxPtr) - info->headerSize);	// Trim a bad content size to the limit.
+	}
+	
+	return (boxPtr + info->headerSize + info->contentSize);
+
+}	// GetBoxInfo
+
+// =================================================================================================
+// GetBoxInfo - from a file
+// ========================
+
+XMP_Uns64 GetBoxInfo ( XMP_IO* fileRef, const XMP_Uns64 boxOffset, const XMP_Uns64 boxLimit,
+					   BoxInfo * info, bool doSeek /* = true */, bool throwErrors /* = false */ )
+{
+	XMP_Uns8  buffer [8];
+	XMP_Uns32 u32Size;
+	
+	if ( info == 0 ) info = &voidInfo;
+	info->boxType = info->headerSize = 0;
+	info->contentSize = 0;
+	
+	if ( boxOffset >= boxLimit ) XMP_Throw ( "Bad offset to GetBoxInfo", kXMPErr_InternalFailure );
+	
+	if ( (boxLimit - boxOffset) < 8 ) {	// Is there enough space for a standard box header?
+		if ( throwErrors ) XMP_Throw ( "No space for ISO box header", kXMPErr_BadFileFormat );
+		info->headerSize = (XMP_Uns32) (boxLimit - boxOffset);
+		return boxLimit;
+	}
+	
+	if ( doSeek ) fileRef->Seek ( boxOffset, kXMP_SeekFromStart );
+	(void) fileRef->ReadAll ( buffer, 8 );
+
+	u32Size = GetUns32BE ( &buffer[0] );
+	info->boxType = GetUns32BE ( &buffer[4] );
+
+	if ( u32Size >= 8 ) {
+		info->headerSize  = 8;	// Normal explicit size case.
+		info->contentSize = u32Size - 8;
+	} else if ( u32Size == 0 ) {
+		info->headerSize  = 8;	// The box goes to EoF.
+		info->contentSize = fileRef->Length() - (boxOffset + 8);
+	} else if ( u32Size != 1 ) {
+		if ( throwErrors ) XMP_Throw ( "Bad ISO box size, 2..7", kXMPErr_BadFileFormat );
+		info->headerSize  = 8;	// Bad total size in the range of 2..7, treat as 8.
+		info->contentSize = 0;
+	} else {
+		if ( (boxLimit - boxOffset) < 16 ) {	// Is there enough space for an extended box header?
+			if ( throwErrors ) XMP_Throw ( "No space for ISO extended header", kXMPErr_BadFileFormat );
+			info->headerSize = (XMP_Uns32) (boxLimit - boxOffset);
+			return boxLimit;
+		}
+		(void) fileRef->ReadAll ( buffer, 8 );
+		XMP_Uns64 u64Size = GetUns64BE ( &buffer[0] );
+		if ( u64Size < 16 ) {
+			if ( throwErrors ) XMP_Throw ( "Bad ISO extended box size, < 16", kXMPErr_BadFileFormat );
+			u64Size = 16;	// Treat bad total size as 16.
+		}
+		info->headerSize  = 16;
+		info->contentSize = u64Size - 16;
+	}
+	
+	XMP_Assert ( (boxLimit - boxOffset) >= info->headerSize );
+	if ( info->contentSize > (boxLimit - boxOffset - info->headerSize) ) {
+		if ( throwErrors ) XMP_Throw ( "Bad ISO box content size", kXMPErr_BadFileFormat );
+		info->contentSize = (boxLimit - boxOffset - info->headerSize);	// Trim a bad content size to the limit.
+	}
+	
+	return (boxOffset + info->headerSize + info->contentSize);
+
+}	// GetBoxInfo
+
+}	// namespace ISO_Media
+
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp
new file mode 100644
index 0000000..728293f
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp
@@ -0,0 +1,123 @@
+#ifndef __ISOBaseMedia_Support_hpp__
+#define __ISOBaseMedia_Support_hpp__     1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"     // ! This must be the first include.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include <set>
+
+// =================================================================================================
+/// \file ISOBaseMedia_Support.hpp
+/// \brief XMPFiles support for the ISO Base Media File Format.
+///
+/// \note These classes are for use only when directly compiled and linked. They should not be
+/// packaged in a DLL by themselves. They do not provide any form of C++ ABI protection.
+// =================================================================================================
+
+namespace ISOMedia {
+
+#define ISOBoxList \
+	ISOboxType(k_ftyp,0x66747970UL)SEPARATOR /* File header Box, no version/flags.*/ \
+	\
+	ISOboxType(k_mp41,0x6D703431UL)SEPARATOR /* Compatible brand codes*/             \
+	ISOboxType(k_mp42,0x6D703432UL)SEPARATOR \
+	ISOboxType(k_f4v ,0x66347620UL)SEPARATOR \
+	ISOboxType(k_avc1,0x61766331UL)SEPARATOR \
+	ISOboxType(k_qt  ,0x71742020UL)SEPARATOR \
+	\
+	ISOboxType(k_moov,0x6D6F6F76UL)SEPARATOR /* Container Box, no version/flags. */ \
+	ISOboxType(k_mvhd,0x6D766864UL)SEPARATOR /* Data FullBox, has version/flags. */ \
+	ISOboxType(k_hdlr,0x68646C72UL)SEPARATOR \
+	ISOboxType(k_udta,0x75647461UL)SEPARATOR /* Container Box, no version/flags. */ \
+	ISOboxType(k_cprt,0x63707274UL)SEPARATOR /* Data FullBox, has version/flags. */ \
+	ISOboxType(k_uuid,0x75756964UL)SEPARATOR /* Data Box, no version/flags.      */ \
+	ISOboxType(k_free,0x66726565UL)SEPARATOR /* Free space Box, no version/flags.*/ \
+	ISOboxType(k_mdat,0x6D646174UL)SEPARATOR  /* Media data Box, no version/flags.*/ \
+	\
+	ISOboxType(k_trak,0x7472616BUL)SEPARATOR /* Types for the QuickTime timecode track.*/ \
+	ISOboxType(k_tkhd,0x746B6864UL)SEPARATOR \
+	ISOboxType(k_edts,0x65647473UL)SEPARATOR \
+	ISOboxType(k_elst,0x656C7374UL)SEPARATOR \
+	ISOboxType(k_mdia,0x6D646961UL)SEPARATOR \
+	ISOboxType(k_mdhd,0x6D646864UL)SEPARATOR \
+	ISOboxType(k_tmcd,0x746D6364UL)SEPARATOR \
+	ISOboxType(k_mhlr,0x6D686C72UL)SEPARATOR \
+	ISOboxType(k_minf,0x6D696E66UL)SEPARATOR \
+	ISOboxType(k_stbl,0x7374626CUL)SEPARATOR \
+	ISOboxType(k_stsd,0x73747364UL)SEPARATOR \
+	ISOboxType(k_stsc,0x73747363UL)SEPARATOR \
+	ISOboxType(k_stco,0x7374636FUL)SEPARATOR \
+	ISOboxType(k_co64,0x636F3634UL)SEPARATOR \
+	ISOboxType(k_dinf,0x64696E66UL)SEPARATOR \
+	ISOboxType(k_dref,0x64726566UL)SEPARATOR \
+	ISOboxType(k_alis,0x616C6973UL)SEPARATOR \
+	\
+	ISOboxType(k_meta,0x6D657461UL)SEPARATOR /* Types for the iTunes metadata boxes.*/ \
+	ISOboxType(k_ilst,0x696C7374UL)SEPARATOR \
+	ISOboxType(k_mdir,0x6D646972UL)SEPARATOR \
+	ISOboxType(k_mean,0x6D65616EUL)SEPARATOR \
+	ISOboxType(k_name,0x6E616D65UL)SEPARATOR \
+	ISOboxType(k_data,0x64617461UL)SEPARATOR \
+	ISOboxType(k_hyphens,0x2D2D2D2DUL)SEPARATOR \
+	\
+	ISOboxType(k_skip,0x736B6970UL)SEPARATOR /* Additional classic QuickTime top level boxes.*/ \
+	ISOboxType(k_wide,0x77696465UL)SEPARATOR \
+	ISOboxType(k_pnot,0x706E6F74UL)SEPARATOR \
+	\
+	ISOboxType(k_XMP_,0x584D505FUL) /* The QuickTime variant XMP box.*/ 
+
+#define ISOBoxPrivateList 
+#define ISOboxType(x,y) x=y
+#define SEPARATOR ,
+	enum {
+		ISOBoxList
+		ISOBoxPrivateList
+	};
+#undef ISOboxType
+#undef SEPARATOR
+
+
+	bool IsKnownBoxType(XMP_Uns32 boxType) ;
+	void TerminateGlobals();
+
+	static XMP_Uns32 k_xmpUUID [4] = { MakeUns32BE ( 0xBE7ACFCBUL ),
+		                               MakeUns32BE ( 0x97A942E8UL ),
+		                               MakeUns32BE ( 0x9C719994UL ),
+		                               MakeUns32BE ( 0x91E3AFACUL ) };
+
+	struct BoxInfo {
+		XMP_Uns32 boxType;         // In memory as native endian!
+		XMP_Uns32 headerSize;      // Normally 8 or 16, less than 8 if available space is too small.
+		XMP_Uns64 contentSize;     // Always the real size, never 0 for "to EoF".
+		BoxInfo() : boxType(0), headerSize(0), contentSize(0) {};
+	};
+
+	// Get basic info about a box in memory, returning a pointer to the following box.
+	const XMP_Uns8 * GetBoxInfo ( const XMP_Uns8 * boxPtr, const XMP_Uns8 * boxLimit,
+		                          BoxInfo * info, bool throwErrors = false );
+
+	// Get basic info about a box in a file, returning the offset of the following box. The I/O
+	// pointer is left at the start of the box's content. Returns the offset of the following box.
+	XMP_Uns64 GetBoxInfo ( XMP_IO* fileRef, const XMP_Uns64 boxOffset, const XMP_Uns64 boxLimit,
+		                   BoxInfo * info, bool doSeek = true, bool throwErrors = false );
+
+	//     XMP_Uns32 CountChildBoxes ( XMP_IO* fileRef, const XMP_Uns64 childOffset, const XMP_Uns64 childLimit );
+
+}      // namespace ISO_Media
+
+// =================================================================================================
+
+#endif // __ISOBaseMedia_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/MOOV_Support.cpp b/XMPFiles/source/FormatSupport/MOOV_Support.cpp
new file mode 100644
index 0000000..959df44
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/MOOV_Support.cpp
@@ -0,0 +1,555 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "XMPFiles/source/FormatSupport/MOOV_Support.hpp"
+
+#include "XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp"
+
+#include <string.h>
+
+// =================================================================================================
+/// \file MOOV_Support.cpp
+/// \brief XMPFiles support for the 'moov' box in MPEG-4 and QuickTime files.
+// =================================================================================================
+
+// =================================================================================================
+// =================================================================================================
+// MOOV_Manager - The parsing and reading routines are all commmon
+// =================================================================================================
+// =================================================================================================
+
+#ifndef TraceParseMoovTree
+	#define TraceParseMoovTree 0
+#endif
+
+#ifndef TraceUpdateMoovTree
+	#define TraceUpdateMoovTree 0
+#endif
+
+// =================================================================================================
+// MOOV_Manager::PickContentPtr
+// ============================
+
+XMP_Uns8 * MOOV_Manager::PickContentPtr ( const BoxNode & node ) const
+{
+	if ( node.contentSize == 0 ) {
+		return 0;
+	} else if ( node.changed ) {
+		return (XMP_Uns8*) &node.changedContent[0];
+	} else {
+		return (XMP_Uns8*) &this->fullSubtree[0] + node.offset + node.headerSize;
+	}
+}	// MOOV_Manager::PickContentPtr
+
+// =================================================================================================
+// MOOV_Manager::FillBoxInfo
+// =========================
+
+void MOOV_Manager::FillBoxInfo ( const BoxNode & node, BoxInfo * info ) const
+{
+	if ( info == 0 ) return;
+
+	info->boxType = node.boxType;
+	info->childCount = (XMP_Uns32)node.children.size();
+	info->contentSize = node.contentSize;
+	info->content = PickContentPtr ( node );
+
+}	// MOOV_Manager::FillBoxInfo
+
+// =================================================================================================
+// MOOV_Manager::GetBoxInfo
+// =========================
+
+void MOOV_Manager::GetBoxInfo ( const BoxRef ref, BoxInfo * info ) const
+{
+
+	this->FillBoxInfo ( *((BoxNode*)ref), info );
+
+}	// MOOV_Manager::GetBoxInfo
+
+// =================================================================================================
+// MOOV_Manager::GetBox
+// ====================
+//
+// Find a box given the type path. Pick the first child of each type.
+
+MOOV_Manager::BoxRef MOOV_Manager::GetBox ( const char * boxPath, BoxInfo * info ) const
+{
+	size_t pathLen = strlen(boxPath);
+	XMP_Assert ( (pathLen >= 4) && XMP_LitNMatch ( boxPath, "moov", 4 ) );
+	if ( info != 0 ) memset ( info, 0, sizeof(BoxInfo) );
+	
+	const char * pathPtr = boxPath + 5;	// Skip the "moov/" portion.
+	const char * pathEnd = boxPath + pathLen;
+	
+	BoxRef currRef = &this->moovNode;
+	
+	while ( pathPtr < pathEnd ) {
+	
+		XMP_Assert ( (pathEnd - pathPtr) >= 4 );		
+		XMP_Uns32 boxType = GetUns32BE ( pathPtr );
+		pathPtr += 5;	// ! Don't care that the last step goes 1 too far.
+		
+		currRef = this->GetTypeChild ( currRef, boxType, 0 );
+		if ( currRef == 0 ) return 0;
+	
+	}
+
+	this->FillBoxInfo ( *((BoxNode*)currRef), info );
+	return currRef;
+	
+}	// MOOV_Manager::GetBox
+
+// =================================================================================================
+// MOOV_Manager::GetNthChild
+// =========================
+
+MOOV_Manager::BoxRef MOOV_Manager::GetNthChild ( BoxRef parentRef, size_t childIndex, BoxInfo * info ) const
+{
+	XMP_Assert ( parentRef != 0 );
+	const BoxNode & parent = *((BoxNode*)parentRef);
+	if ( info != 0 ) memset ( info, 0, sizeof(BoxInfo) );
+	
+	if ( childIndex >= parent.children.size() ) return 0;
+
+	const BoxNode & currNode = parent.children[childIndex];
+
+	this->FillBoxInfo ( currNode, info );
+	return &currNode;
+
+}	// MOOV_Manager::GetNthChild
+
+// =================================================================================================
+// MOOV_Manager::GetTypeChild
+// ==========================
+
+MOOV_Manager::BoxRef MOOV_Manager::GetTypeChild ( BoxRef parentRef, XMP_Uns32 childType, BoxInfo * info ) const
+{
+	XMP_Assert ( parentRef != 0 );
+	const BoxNode & parent = *((BoxNode*)parentRef);
+	if ( info != 0 ) memset ( info, 0, sizeof(BoxInfo) );
+	if ( parent.children.empty() ) return 0;
+
+	size_t i = 0, limit = parent.children.size();
+	for ( ; i < limit; ++i ) {
+		const BoxNode & currNode = parent.children[i];
+		if ( currNode.boxType == childType ) {
+			this->FillBoxInfo ( currNode, info );
+			return &currNode;
+		}
+	}
+	
+	return 0;
+
+}	// MOOV_Manager::GetTypeChild
+
+// =================================================================================================
+// MOOV_Manager::GetParsedOffset
+// =============================
+
+XMP_Uns32 MOOV_Manager::GetParsedOffset ( BoxRef ref ) const
+{
+	XMP_Assert ( ref != 0 );
+	const BoxNode & node = *((BoxNode*)ref);
+	
+	if ( node.changed ) return 0;
+	return node.offset;
+	
+}	// MOOV_Manager::GetParsedOffset
+
+// =================================================================================================
+// MOOV_Manager::GetHeaderSize
+// ===========================
+
+XMP_Uns32 MOOV_Manager::GetHeaderSize ( BoxRef ref ) const
+{
+	XMP_Assert ( ref != 0 );
+	const BoxNode & node = *((BoxNode*)ref);
+	
+	if ( node.changed ) return 0;
+	return node.headerSize;
+	
+}	// MOOV_Manager::GetHeaderSize
+
+// =================================================================================================
+// MOOV_Manager::ParseMemoryTree
+// =============================
+//
+// Parse the fullSubtree data, building the BoxNode tree for the stuff that we care about. Tolerate
+// errors like content ending too soon, make a best effoert to parse what we can.
+
+void MOOV_Manager::ParseMemoryTree ( XMP_Uns8 fileMode )
+{
+	this->fileMode = fileMode;
+	
+	this->moovNode.offset = this->moovNode.boxType = 0;
+	this->moovNode.headerSize = this->moovNode.contentSize = 0;
+	this->moovNode.children.clear();
+	this->moovNode.changedContent.clear();
+	this->moovNode.changed = false;
+
+	if ( this->fullSubtree.empty() ) return;
+	
+	ISOMedia::BoxInfo moovInfo;
+	const XMP_Uns8 * moovOrigin = &this->fullSubtree[0];
+	const XMP_Uns8 * moovLimit  = moovOrigin + this->fullSubtree.size();
+
+	(void) ISOMedia::GetBoxInfo ( moovOrigin, moovLimit, &moovInfo );
+	XMP_Enforce ( moovInfo.boxType == ISOMedia::k_moov );
+	
+	XMP_Uns64 fullMoovSize = moovInfo.headerSize + moovInfo.contentSize;
+	if ( fullMoovSize > moovBoxSizeLimit ) {	// From here on we know 32-bit offsets are safe.
+		XMP_Throw ( "Oversize 'moov' box", kXMPErr_EnforceFailure );
+	}
+	
+	this->moovNode.boxType = ISOMedia::k_moov;
+	this->moovNode.headerSize = moovInfo.headerSize;
+	this->moovNode.contentSize = (XMP_Uns32)moovInfo.contentSize;
+
+	bool ignoreMetaBoxes = (fileMode == kFileIsTraditionalQT);	// ! Don't want, these don't follow ISO spec.
+	#if TraceParseMoovTree
+		fprintf ( stderr, "Parsing 'moov' subtree, moovNode @ 0x%X, ignoreMetaBoxes = %d\n",
+				  &this->moovNode, ignoreMetaBoxes );
+	#endif
+	this->ParseNestedBoxes ( &this->moovNode, "moov", ignoreMetaBoxes );
+	
+}	// MOOV_Manager::ParseMemoryTree
+
+// =================================================================================================
+// MOOV_Manager::ParseNestedBoxes
+// ==============================
+//
+// Add the current level of child boxes to the parent node, recurse as appropriate.
+
+void MOOV_Manager::ParseNestedBoxes ( BoxNode * parentNode, const std::string & parentPath, bool ignoreMetaBoxes )
+{
+	ISOMedia::BoxInfo isoInfo;
+	const XMP_Uns8 * moovOrigin = &this->fullSubtree[0];
+	const XMP_Uns8 * childOrigin = moovOrigin + parentNode->offset + parentNode->headerSize;
+	const XMP_Uns8 * childLimit  = childOrigin + parentNode->contentSize;
+	const XMP_Uns8 * nextChild;
+	
+	parentNode->contentSize = 0;	// Exclude nested box size.
+	if ( parentNode->boxType == ISOMedia::k_meta ) {	// ! The 'meta' box is a FullBox.
+		parentNode->contentSize = 4;
+		childOrigin += 4;
+	}
+
+	for ( const XMP_Uns8 * currChild = childOrigin; currChild < childLimit; currChild = nextChild ) {
+	
+		nextChild = ISOMedia::GetBoxInfo ( currChild, childLimit, &isoInfo );
+		if ( (isoInfo.boxType == 0) &&
+			 (isoInfo.headerSize < 8) &&
+			 (isoInfo.contentSize == 0) ) continue;	// Skip trailing padding that QT sometimes writes.
+		
+		XMP_Uns32 childOffset = (XMP_Uns32) (currChild - moovOrigin);
+		parentNode->children.push_back ( BoxNode ( childOffset, isoInfo.boxType, isoInfo.headerSize, (XMP_Uns32)isoInfo.contentSize ) );
+		BoxNode * newChild = &parentNode->children.back();
+		
+		#if TraceParseMoovTree
+			size_t depth = (parentPath.size()+1) / 5;
+			for ( size_t i = 0; i < depth; ++i ) fprintf ( stderr, "  " );
+			XMP_Uns32 be32 = MakeUns32BE ( newChild->boxType );
+			XMP_Uns32 addr32 = (XMP_Uns32) this->PickContentPtr ( *newChild );
+			fprintf ( stderr, "  Parsed %s/%.4s, offset 0x%X, size %d, content @ 0x%X, BoxNode @ 0x%X\n",
+					  parentPath.c_str(), &be32, newChild->offset, newChild->contentSize, addr32, newChild );
+		#endif
+		
+		const char * pathSuffix = 0;	// Set to non-zero for boxes of interest.
+		char buffer[6];	buffer[0] = 0;
+		
+			switch ( isoInfo.boxType ) {	// Want these boxes regardless of parent.
+				case ISOMedia::k_udta : pathSuffix = "/udta"; break;
+				case ISOMedia::k_meta : pathSuffix = "/meta"; break;
+				case ISOMedia::k_ilst : pathSuffix = "/ilst"; break;
+				case ISOMedia::k_trak : pathSuffix = "/trak"; break;
+				case ISOMedia::k_edts : pathSuffix = "/edts"; break;
+				case ISOMedia::k_mdia : pathSuffix = "/mdia"; break;
+				case ISOMedia::k_minf : pathSuffix = "/minf"; break;
+				case ISOMedia::k_dinf : pathSuffix = "/dinf"; break;
+				case ISOMedia::k_stbl : pathSuffix = "/stbl"; break;
+			}
+		if ( pathSuffix != 0 ) {
+			this->ParseNestedBoxes ( newChild, (parentPath + pathSuffix), ignoreMetaBoxes );
+		}
+	
+	}
+
+}	// MOOV_Manager::ParseNestedBoxes
+
+// =================================================================================================
+// MOOV_Manager::NoteChange
+// ========================
+
+void MOOV_Manager::NoteChange()
+{
+
+	this->moovNode.changed = true;
+
+}	// MOOV_Manager::NoteChange
+
+// =================================================================================================
+// MOOV_Manager::SetBox
+// ====================
+//
+// Save the new data, set this box's changed flag, and set the top changed flag.
+
+void MOOV_Manager::SetBox ( BoxRef theBox, const void* dataPtr, XMP_Uns32 size )
+{
+	XMP_Enforce ( size < moovBoxSizeLimit );
+	BoxNode * node = (BoxNode*)theBox;
+	
+	if ( node->contentSize == size ) {
+	
+		XMP_Uns8 * oldContent = PickContentPtr ( *node );
+		if ( memcmp ( oldContent, dataPtr, size ) == 0 ) return;	// No change.
+		memcpy ( oldContent, dataPtr, size );	// Update the old content in-place
+		this->moovNode.changed = true;
+		
+		#if TraceUpdateMoovTree
+			XMP_Uns32 be32 = MakeUns32BE ( node->boxType );
+			fprintf ( stderr, "Updated '%.4s', parse offset 0x%X, same size\n", &be32, node->offset );
+		#endif
+	
+	} else {
+	
+		node->changedContent.assign ( size, 0 );	// Fill with 0's first to get the storage.
+		memcpy ( &node->changedContent[0], dataPtr, size );
+		node->contentSize = size;
+		node->changed = true;
+		this->moovNode.changed = true;
+		
+		#if TraceUpdateMoovTree
+			XMP_Uns32 be32 = MakeUns32BE ( node->boxType );
+			XMP_Uns32 addr32 = (XMP_Uns32) this->PickContentPtr ( *node );
+			fprintf ( stderr, "Updated '%.4s', parse offset 0x%X, new size %d, new content @ 0x%X\n",
+					  &be32, node->offset, node->contentSize, addr32 );
+		#endif
+	
+	}
+
+}	// MOOV_Manager::SetBox
+
+// =================================================================================================
+// MOOV_Manager::SetBox
+// ====================
+//
+// Like above, but create the path to the box if necessary.
+
+void MOOV_Manager::SetBox ( const char * boxPath, const void* dataPtr, XMP_Uns32 size )
+{
+	XMP_Enforce ( size < moovBoxSizeLimit );
+
+	size_t pathLen = strlen(boxPath);
+	XMP_Assert ( (pathLen >= 4) && XMP_LitNMatch ( boxPath, "moov", 4 ) );
+	
+	const char * pathPtr = boxPath + 5;	// Skip the "moov/" portion.
+	const char * pathEnd = boxPath + pathLen;
+	
+	BoxRef parentRef = 0;
+	BoxRef currRef   = &this->moovNode;
+	
+	while ( pathPtr < pathEnd ) {
+	
+		XMP_Assert ( (pathEnd - pathPtr) >= 4 );		
+		XMP_Uns32 boxType = GetUns32BE ( pathPtr );
+		pathPtr += 5;	// ! Don't care that the last step goes 1 too far.
+		
+		parentRef = currRef;
+		currRef = this->GetTypeChild ( parentRef, boxType, 0 );
+		if ( currRef == 0 ) currRef = this->AddChildBox ( parentRef, boxType, 0, 0 );
+	
+	}
+
+	this->SetBox ( currRef, dataPtr, size );
+	
+}	// MOOV_Manager::SetBox
+
+// =================================================================================================
+// MOOV_Manager::AddChildBox
+// =========================
+
+MOOV_Manager::BoxRef MOOV_Manager::AddChildBox ( BoxRef parentRef, XMP_Uns32 childType, const void* dataPtr, XMP_Uns32 size )
+{
+	BoxNode * parent = (BoxNode*)parentRef;
+	XMP_Assert ( parent != 0 );
+	
+	parent->children.push_back ( BoxNode ( 0, childType, 0, 0 ) );
+	BoxNode * newNode = &parent->children.back();
+	this->SetBox ( newNode, dataPtr, size );
+	
+	return newNode;
+	
+}	// MOOV_Manager::AddChildBox
+
+// =================================================================================================
+// MOOV_Manager::DeleteNthChild
+// ============================
+
+bool MOOV_Manager::DeleteNthChild ( BoxRef parentRef, size_t childIndex )
+{
+	BoxNode * parent = (BoxNode*)parentRef;
+	
+	if ( childIndex >= parent->children.size() ) return false;
+
+	parent->children.erase ( parent->children.begin() + childIndex );
+	return true;
+	
+}	// MOOV_Manager::DeleteNthChild
+
+// =================================================================================================
+// MOOV_Manager::DeleteTypeChild
+// =============================
+
+bool MOOV_Manager::DeleteTypeChild ( BoxRef parentRef, XMP_Uns32 childType )
+{
+	BoxNode * parent = (BoxNode*)parentRef;
+	
+	BoxListPos child = parent->children.begin();
+	BoxListPos limit = parent->children.end();
+	
+	for ( ; child != limit; ++child ) {
+		if ( child->boxType == childType ) {
+			parent->children.erase ( child );
+			this->moovNode.changed = true;
+			return true;
+		}
+	}
+	
+	return false;
+	
+}	// MOOV_Manager::DeleteTypeChild
+
+// =================================================================================================
+// MOOV_Manager::NewSubtreeSize
+// ============================
+//
+// Determine the new (changed) size of a subtree. Ignore 'free' and 'wide' boxes.
+
+XMP_Uns32 MOOV_Manager::NewSubtreeSize ( const BoxNode & node, const std::string & parentPath )
+{
+	XMP_Uns32 subtreeSize = 8 + node.contentSize;	// All boxes will have 8 byte headers.
+
+	if ( (node.boxType == ISOMedia::k_free) || (node.boxType == ISOMedia::k_wide) ) {
+	}
+
+	for ( size_t i = 0, limit = node.children.size(); i < limit; ++i ) {
+
+		char suffix[6];
+		suffix[0] = '/';
+		PutUns32BE ( node.boxType, &suffix[1] );
+		suffix[5] = 0;
+		std::string nodePath = parentPath + suffix;
+		
+		subtreeSize += this->NewSubtreeSize ( node.children[i], nodePath );
+		XMP_Enforce ( subtreeSize < moovBoxSizeLimit );
+
+	}
+
+	return subtreeSize;
+	
+}	// MOOV_Manager::NewSubtreeSize
+
+// =================================================================================================
+// MOOV_Manager::AppendNewSubtree
+// ==============================
+//
+// Append this node's header, content, and children. Because the 'meta' box is a FullBox with nested
+// boxes, there can be both content and children. Ignore 'free' and 'wide' boxes.
+
+#define IncrNewPtr(count)	{ newPtr += count; XMP_Enforce ( newPtr <= newEnd ); }
+
+#if TraceUpdateMoovTree
+	static XMP_Uns8 * newOrigin;
+#endif
+
+XMP_Uns8 * MOOV_Manager::AppendNewSubtree ( const BoxNode & node, const std::string & parentPath,
+											XMP_Uns8 * newPtr, XMP_Uns8 * newEnd )
+{
+	if ( (node.boxType == ISOMedia::k_free) || (node.boxType == ISOMedia::k_wide) ) {
+	}
+	
+	XMP_Assert ( (node.boxType != ISOMedia::k_meta) ? (node.children.empty() || (node.contentSize == 0)) :
+													  (node.children.empty() || (node.contentSize == 4)) );
+	
+	XMP_Enforce ( (XMP_Uns32)(newEnd - newPtr) >= (8 + node.contentSize) );
+
+	#if TraceUpdateMoovTree
+		XMP_Uns32 be32 = MakeUns32BE ( node.boxType );
+		XMP_Uns32 newOffset = (XMP_Uns32) (newPtr - newOrigin);
+		XMP_Uns32 addr32 = (XMP_Uns32) this->PickContentPtr ( node );
+		fprintf ( stderr, "  Appending %s/%.4s @ 0x%X, size %d, content @ 0x%X\n",
+				  parentPath.c_str(), &be32, newOffset, node.contentSize, addr32 );
+	#endif
+
+	// Leave the size as 0 for now, append the type and content.
+	
+	XMP_Uns8 * boxOrigin = newPtr;	// Save origin to fill in the final size.
+	PutUns32BE ( node.boxType, (newPtr + 4) );
+	IncrNewPtr ( 8 );
+	
+	if ( node.contentSize != 0 ) {
+		const XMP_Uns8 * content = PickContentPtr( node );
+		memcpy ( newPtr, content, node.contentSize );
+		IncrNewPtr ( node.contentSize );
+	}
+	
+	// Append the nested boxes.
+	
+	if ( ! node.children.empty() ) {
+
+		char suffix[6];
+		suffix[0] = '/';
+		PutUns32BE ( node.boxType, &suffix[1] );
+		suffix[5] = 0;
+		std::string nodePath = parentPath + suffix;
+		
+		for ( size_t i = 0, limit = node.children.size(); i < limit; ++i ) {
+			newPtr = this->AppendNewSubtree ( node.children[i], nodePath, newPtr, newEnd );
+		}
+
+	}
+	
+	// Fill in the final size.
+	
+	PutUns32BE ( (XMP_Uns32)(newPtr - boxOrigin), boxOrigin );
+	
+	return newPtr;
+	
+}	// MOOV_Manager::AppendNewSubtree
+
+// =================================================================================================
+// MOOV_Manager::UpdateMemoryTree
+// ==============================
+
+void MOOV_Manager::UpdateMemoryTree()
+{
+	if ( ! this->IsChanged() ) return;
+	
+	XMP_Uns32 newSize = this->NewSubtreeSize ( this->moovNode, "" );
+	XMP_Enforce ( newSize < moovBoxSizeLimit );
+	
+	RawDataBlock newData;
+	newData.assign ( newSize, 0 );	// Prefill with zeroes, can't append multiple items to a vector.
+	
+	XMP_Uns8 * newPtr = &newData[0];
+	XMP_Uns8 * newEnd = newPtr + newSize;
+
+	#if TraceUpdateMoovTree
+		fprintf ( stderr, "Starting MOOV_Manager::UpdateMemoryTree\n" );
+		newOrigin = newPtr;
+	#endif
+	
+	XMP_Uns8 * trueEnd = this->AppendNewSubtree ( this->moovNode, "", newPtr, newEnd );
+	XMP_Enforce ( trueEnd == newEnd );
+	
+	this->fullSubtree.swap ( newData );
+	this->ParseMemoryTree ( this->fileMode );
+	
+}	// MOOV_Manager::UpdateMemoryTree
diff --git a/XMPFiles/source/FormatSupport/MOOV_Support.hpp b/XMPFiles/source/FormatSupport/MOOV_Support.hpp
new file mode 100644
index 0000000..7d34ca2
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/MOOV_Support.hpp
@@ -0,0 +1,223 @@
+#ifndef __MOOV_Support_hpp__
+#define __MOOV_Support_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+
+#include "source/EndianUtils.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include <vector>
+
+#define moovBoxSizeLimit 100*1024*1024
+
+// =================================================================================================
+// MOOV_Manager
+// ============
+
+class MOOV_Manager {
+public:
+
+	// ---------------------------------------------------------------------------------------------
+	// Types and constants
+
+	enum {	// Values for fileMode.
+		kFileIsNormalISO = 0,		// A "normal" MPEG-4 file, no 'qt  ' compatible brand.
+		kFileIsModernQT  = 1,		// Has an 'ftyp' box and 'qt  ' compatible brand.
+		kFileIsTraditionalQT = 2	// Old QuickTime, no 'ftyp' box.
+	};
+
+	typedef const void * BoxRef;	// Valid until a sibling or higher box is added or deleted.
+
+	struct BoxInfo {
+		XMP_Uns32 boxType;			// In memory as native endian, compares work with ISOMedia::k_* constants.
+		XMP_Uns32 childCount;		// ! A 'meta' box has both content (version/flags) and children!
+		XMP_Uns32 contentSize;		// Does not include the size of nested boxes.
+		const XMP_Uns8 * content;	// Null if contentSize is zero.
+		BoxInfo() : boxType(0), childCount(0), contentSize(0), content(0) {};
+	};
+
+	// ---------------------------------------------------------------------------------------------
+	// GetBox - Pick a box given a '/' separated list of box types. Picks the 1st of each type.
+	// GetBoxInfo - Get the info if we already have the ref.
+	// GetNthChild - Pick the overall n-th child of the parent, zero based.
+	// GetTypeChild - Pick the first child of the given type.
+	// GetParsedOffset - Get the box's offset in the parsed tree, 0 if changed since parsing.
+	// GetHeaderSize - Get the box's header size in the parsed tree, 0 if changed since parsing.
+
+	BoxRef GetBox ( const char * boxPath, BoxInfo * info ) const;
+	
+	void GetBoxInfo ( const BoxRef ref, BoxInfo * info ) const;
+
+	BoxRef GetNthChild  ( BoxRef parentRef, size_t childIndex, BoxInfo * info ) const;
+	BoxRef GetTypeChild ( BoxRef parentRef, XMP_Uns32 childType, BoxInfo * info ) const;
+
+	XMP_Uns32 GetParsedOffset ( BoxRef ref ) const;
+	XMP_Uns32 GetHeaderSize ( BoxRef ref ) const;
+
+	// ---------------------------------------------------------------------------------------------
+	// NoteChange - Note overall change, value was directly replaced.
+	// SetBox(ref) - Replace the content with a copy of the given data.
+	// SetBox(path) - Like above, but creating path to the box if necessary.
+	// AddChildBox - Add a child of the given type, using a copy of the given data (may be null)
+
+	void NoteChange();
+
+	void SetBox ( BoxRef theBox, const void* dataPtr, XMP_Uns32 size );
+	void SetBox ( const char * boxPath, const void* dataPtr, XMP_Uns32 size );
+
+	BoxRef AddChildBox ( BoxRef parentRef, XMP_Uns32 childType, const void * dataPtr, XMP_Uns32 size );
+
+	// ---------------------------------------------------------------------------------------------
+	// DeleteNthChild - Delete the overall n-th child, return true if there was one.
+	// DeleteTypeChild - Delete the first child of the given type, return true if there was one.
+
+	bool DeleteNthChild ( BoxRef parentRef, size_t childIndex );
+	bool DeleteTypeChild ( BoxRef parentRef, XMP_Uns32 childType );
+
+	// ---------------------------------------------------------------------------------------------
+
+	bool IsChanged() const { return this->moovNode.changed; };
+
+	// ---------------------------------------------------------------------------------------------
+	// The client is expected to fill in fullSubtree before calling ParseMemoryTree, and directly
+	// use fullSubtree after calling UpdateMemoryTree.
+	//
+	// IMPORTANT: We only support cases where the 'moov' subtree is significantly less than 4 GB, in
+	// particular with a threshold of probably 100 MB. This has 2 big impacts: we can safely use
+	// 32-bit offsets and sizes, and comfortably assume everything will fit in available heap space.
+
+	RawDataBlock fullSubtree;	// The entire 'moov' box, straight from the file or from UpdateMemoryTree.
+
+	void ParseMemoryTree ( XMP_Uns8 fileMode );
+	void UpdateMemoryTree();
+
+	// ---------------------------------------------------------------------------------------------
+
+	#pragma pack (push, 1)	// ! These must match the file layout!
+
+	struct Content_mvhd_0 {
+		XMP_Uns32 vFlags;			//   0
+		XMP_Uns32 creationTime;		//   4
+		XMP_Uns32 modificationTime;	//   8
+		XMP_Uns32 timescale;		//  12
+		XMP_Uns32 duration;			//  16
+		XMP_Int32 rate;				//  20
+		XMP_Int16 volume;			//  24
+		XMP_Uns16 pad_1;			//  26
+		XMP_Uns32 pad_2, pad_3;		//  28
+		XMP_Int32 matrix [9];		//  36
+		XMP_Uns32 preDef [6];		//  72
+		XMP_Uns32 nextTrackID;		//  96
+	};								// 100
+
+	struct Content_mvhd_1 {
+		XMP_Uns32 vFlags;			//   0
+		XMP_Uns64 creationTime;		//   4
+		XMP_Uns64 modificationTime;	//  12
+		XMP_Uns32 timescale;		//  20
+		XMP_Uns64 duration;			//  24
+		XMP_Int32 rate;				//  32
+		XMP_Int16 volume;			//  36
+		XMP_Uns16 pad_1;			//  38
+		XMP_Uns32 pad_2, pad_3;		//  40
+		XMP_Int32 matrix [9];		//  48
+		XMP_Uns32 preDef [6];		//  84
+		XMP_Uns32 nextTrackID;		// 108
+	};								// 112
+
+	struct Content_hdlr {	// An 'hdlr' box as defined by ISO 14496-12. Maps OK to the QuickTime box.
+		XMP_Uns32 versionFlags;	//  0
+		XMP_Uns32 preDef;		//  4
+		XMP_Uns32 handlerType;	//  8
+		XMP_Uns32 reserved [3];	// 12
+		// Plus optional component name string, null terminated UTF-8.
+	};							// 24
+
+	struct Content_stsd_entry {
+		XMP_Uns32 entrySize;		//  0
+		XMP_Uns32 format;			//  4
+		XMP_Uns8  reserved_1 [6];	//  8
+		XMP_Uns16 dataRefIndex;		// 14
+		XMP_Uns32 reserved_2;		// 16
+		XMP_Uns32 flags;			// 20
+		XMP_Uns32 timeScale;		// 24
+		XMP_Uns32 frameDuration;	// 28
+		XMP_Uns8  frameCount;		// 32
+		XMP_Uns8  reserved_3;		// 33
+		// Plus optional trailing ISO boxes.
+	};								// 34
+
+	struct Content_stsc_entry {
+		XMP_Uns32 firstChunkNumber;	//  0
+		XMP_Uns32 samplesPerChunk;	//  4
+		XMP_Uns32 sampleDescrID;	//  8
+	};								// 12
+
+	#pragma pack( pop )
+
+#if SUNOS_SPARC || XMP_IOS_ARM
+	#pragma pack( )
+#endif //#if SUNOS_SPARC || XMP_IOS_ARM
+
+	// ---------------------------------------------------------------------------------------------
+
+	MOOV_Manager() : fileMode(0)
+	{
+		XMP_Assert ( sizeof ( Content_mvhd_0 ) == 100 );	// Make sure the structs really are packed.
+		XMP_Assert ( sizeof ( Content_mvhd_1 ) == 112 );
+		XMP_Assert ( sizeof ( Content_hdlr ) == 24 );
+		XMP_Assert ( sizeof ( Content_stsd_entry ) == 34 );
+		XMP_Assert ( sizeof ( Content_stsc_entry ) == 12 );
+	};
+
+	virtual ~MOOV_Manager() {};
+
+private:
+
+	struct BoxNode;
+	typedef std::vector<BoxNode> BoxList;
+	typedef BoxList::iterator    BoxListPos;
+
+	struct BoxNode {
+		// ! Don't have a parent link, it will get destroyed by vector growth!
+
+		XMP_Uns32 offset;		// The offset in the fullSubtree, 0 if not in the parse.
+		XMP_Uns32 boxType;
+		XMP_Uns32 headerSize;	// The actual header size in the fullSubtree, 0 if not in the parse.
+		XMP_Uns32 contentSize;	// The current content size, does not include nested boxes.
+		BoxList   children;
+		RawDataBlock changedContent;	// Might be empty even if changed is true.
+		bool changed;	// If true, the content is in changedContent, else in fullSubtree.
+
+		BoxNode() : offset(0), boxType(0), headerSize(0), contentSize(0), changed(false) {};
+		BoxNode ( XMP_Uns32 _offset, XMP_Uns32 _boxType, XMP_Uns32 _headerSize, XMP_Uns32 _contentSize )
+			: offset(_offset), boxType(_boxType), headerSize(_headerSize), contentSize(_contentSize), changed(false) {};
+
+	};
+
+	XMP_Uns8 fileMode;
+	BoxNode moovNode;
+
+	void ParseNestedBoxes ( BoxNode * parentNode, const std::string & parentPath, bool ignoreMetaBoxes );
+
+	XMP_Uns8 * PickContentPtr ( const BoxNode & node ) const;
+	void FillBoxInfo ( const BoxNode & node, BoxInfo * info ) const;
+
+	XMP_Uns32  NewSubtreeSize ( const BoxNode & node, const std::string & parentPath );
+	XMP_Uns8 * AppendNewSubtree ( const BoxNode & node, const std::string & parentPath,
+										 XMP_Uns8 * newPtr, XMP_Uns8 * newEnd );
+
+};	// MOOV_Manager
+
+#endif	// __MOOV_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/MacScriptExtracts.h b/XMPFiles/source/FormatSupport/MacScriptExtracts.h
new file mode 100644
index 0000000..9856183
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/MacScriptExtracts.h
@@ -0,0 +1,244 @@
+#ifndef __MacScriptExtracts__
+#define __MacScriptExtracts__
+
+// Extracts of script (smXyz) and language (langXyz) enums from Apple's old Script.h.
+// These are used to support "traditional" QuickTime metadata processing.
+
+/*
+   Script codes:
+   These specify a Mac OS encoding that is related to a FOND ID range.
+   Some of the encodings have several variants (e.g. for different localized systems)
+    which all share the same script code.
+   Not all of these script codes are currently supported by Apple software.
+   Notes:
+   - Script code 0 (smRoman) is also used (instead of smGreek) for the Greek encoding
+     in the Greek localized system.
+   - Script code 28 (smEthiopic) is also used for the Inuit encoding in the Inuktitut
+     system.
+*/
+enum {
+  smRoman                       = 0,
+  smJapanese                    = 1,
+  smTradChinese                 = 2,    /* Traditional Chinese*/
+  smKorean                      = 3,
+  smArabic                      = 4,
+  smHebrew                      = 5,
+  smGreek                       = 6,
+  smCyrillic                    = 7,
+  smRSymbol                     = 8,    /* Right-left symbol*/
+  smDevanagari                  = 9,
+  smGurmukhi                    = 10,
+  smGujarati                    = 11,
+  smOriya                       = 12,
+  smBengali                     = 13,
+  smTamil                       = 14,
+  smTelugu                      = 15,
+  smKannada                     = 16,   /* Kannada/Kanarese*/
+  smMalayalam                   = 17,
+  smSinhalese                   = 18,
+  smBurmese                     = 19,
+  smKhmer                       = 20,   /* Khmer/Cambodian*/
+  smThai                        = 21,
+  smLao                         = 22,
+  smGeorgian                    = 23,
+  smArmenian                    = 24,
+  smSimpChinese                 = 25,   /* Simplified Chinese*/
+  smTibetan                     = 26,
+  smMongolian                   = 27,
+  smEthiopic                    = 28,
+  smGeez                        = 28,   /* Synonym for smEthiopic*/
+  smCentralEuroRoman            = 29,   /* For Czech, Slovak, Polish, Hungarian, Baltic langs*/
+  smVietnamese                  = 30,
+  smExtArabic                   = 31,   /* extended Arabic*/
+  smUninterp                    = 32    /* uninterpreted symbols, e.g. palette symbols*/
+};
+
+/* Extended script code for full Unicode input*/
+enum {
+  smUnicodeScript               = 0x7E
+};
+
+/* Obsolete script code names (kept for backward compatibility):*/
+enum {
+  smChinese                     = 2,    /* (Use smTradChinese or smSimpChinese)*/
+  smRussian                     = 7,    /* Use smCyrillic*/
+                                        /* smMaldivian = 25: deleted, no code for Maldivian*/
+  smLaotian                     = 22,   /* Use smLao                                     */
+  smAmharic                     = 28,   /* Use smEthiopic or smGeez*/
+  smSlavic                      = 29,   /* Use smCentralEuroRoman*/
+  smEastEurRoman                = 29,   /* Use smCentralEuroRoman*/
+  smSindhi                      = 31,   /* Use smExtArabic*/
+  smKlingon                     = 32
+};
+
+/*
+   Language codes:
+   These specify a language implemented using a particular Mac OS encoding.
+   Not all of these language codes are currently supported by Apple software.
+*/
+enum {
+  langEnglish                   = 0,    /* smRoman script*/
+  langFrench                    = 1,    /* smRoman script*/
+  langGerman                    = 2,    /* smRoman script*/
+  langItalian                   = 3,    /* smRoman script*/
+  langDutch                     = 4,    /* smRoman script*/
+  langSwedish                   = 5,    /* smRoman script*/
+  langSpanish                   = 6,    /* smRoman script*/
+  langDanish                    = 7,    /* smRoman script*/
+  langPortuguese                = 8,    /* smRoman script*/
+  langNorwegian                 = 9,    /* (Bokmal) smRoman script*/
+  langHebrew                    = 10,   /* smHebrew script*/
+  langJapanese                  = 11,   /* smJapanese script*/
+  langArabic                    = 12,   /* smArabic script*/
+  langFinnish                   = 13,   /* smRoman script*/
+  langGreek                     = 14,   /* Greek script (monotonic) using smRoman script code*/
+  langIcelandic                 = 15,   /* modified smRoman/Icelandic script*/
+  langMaltese                   = 16,   /* Roman script*/
+  langTurkish                   = 17,   /* modified smRoman/Turkish script*/
+  langCroatian                  = 18,   /* modified smRoman/Croatian script*/
+  langTradChinese               = 19,   /* Chinese (Mandarin) in traditional characters*/
+  langUrdu                      = 20,   /* smArabic script*/
+  langHindi                     = 21,   /* smDevanagari script*/
+  langThai                      = 22,   /* smThai script*/
+  langKorean                    = 23    /* smKorean script*/
+};
+
+enum {
+  langLithuanian                = 24,   /* smCentralEuroRoman script*/
+  langPolish                    = 25,   /* smCentralEuroRoman script*/
+  langHungarian                 = 26,   /* smCentralEuroRoman script*/
+  langEstonian                  = 27,   /* smCentralEuroRoman script*/
+  langLatvian                   = 28,   /* smCentralEuroRoman script*/
+  langSami                      = 29,   /* language of the Sami people of N. Scandinavia             */
+  langFaroese                   = 30,   /* modified smRoman/Icelandic script                      */
+  langFarsi                     = 31,   /* modified smArabic/Farsi script*/
+  langPersian                   = 31,   /* Synonym for langFarsi*/
+  langRussian                   = 32,   /* smCyrillic script*/
+  langSimpChinese               = 33,   /* Chinese (Mandarin) in simplified characters*/
+  langFlemish                   = 34,   /* smRoman script*/
+  langIrishGaelic               = 35,   /* smRoman or modified smRoman/Celtic script (without dot above)   */
+  langAlbanian                  = 36,   /* smRoman script*/
+  langRomanian                  = 37,   /* modified smRoman/Romanian script*/
+  langCzech                     = 38,   /* smCentralEuroRoman script*/
+  langSlovak                    = 39,   /* smCentralEuroRoman script*/
+  langSlovenian                 = 40,   /* modified smRoman/Croatian script*/
+  langYiddish                   = 41,   /* smHebrew script*/
+  langSerbian                   = 42,   /* smCyrillic script*/
+  langMacedonian                = 43,   /* smCyrillic script*/
+  langBulgarian                 = 44,   /* smCyrillic script*/
+  langUkrainian                 = 45,   /* modified smCyrillic/Ukrainian script*/
+  langByelorussian              = 46,   /* smCyrillic script*/
+  langBelorussian               = 46    /* Synonym for langByelorussian                          */
+};
+
+enum {
+  langUzbek                     = 47,   /* Cyrillic script*/
+  langKazakh                    = 48,   /* Cyrillic script*/
+  langAzerbaijani               = 49,   /* Azerbaijani in Cyrillic script*/
+  langAzerbaijanAr              = 50,   /* Azerbaijani in Arabic script*/
+  langArmenian                  = 51,   /* smArmenian script*/
+  langGeorgian                  = 52,   /* smGeorgian script*/
+  langMoldavian                 = 53,   /* smCyrillic script*/
+  langKirghiz                   = 54,   /* Cyrillic script*/
+  langTajiki                    = 55,   /* Cyrillic script*/
+  langTurkmen                   = 56,   /* Cyrillic script*/
+  langMongolian                 = 57,   /* Mongolian in smMongolian script*/
+  langMongolianCyr              = 58,   /* Mongolian in Cyrillic script*/
+  langPashto                    = 59,   /* Arabic script*/
+  langKurdish                   = 60,   /* smArabic script*/
+  langKashmiri                  = 61,   /* Arabic script*/
+  langSindhi                    = 62,   /* Arabic script*/
+  langTibetan                   = 63,   /* smTibetan script*/
+  langNepali                    = 64,   /* smDevanagari script*/
+  langSanskrit                  = 65,   /* smDevanagari script*/
+  langMarathi                   = 66,   /* smDevanagari script*/
+  langBengali                   = 67,   /* smBengali script*/
+  langAssamese                  = 68,   /* smBengali script*/
+  langGujarati                  = 69,   /* smGujarati script*/
+  langPunjabi                   = 70    /* smGurmukhi script*/
+};
+
+enum {
+  langOriya                     = 71,   /* smOriya script*/
+  langMalayalam                 = 72,   /* smMalayalam script*/
+  langKannada                   = 73,   /* smKannada script*/
+  langTamil                     = 74,   /* smTamil script*/
+  langTelugu                    = 75,   /* smTelugu script*/
+  langSinhalese                 = 76,   /* smSinhalese script*/
+  langBurmese                   = 77,   /* smBurmese script*/
+  langKhmer                     = 78,   /* smKhmer script*/
+  langLao                       = 79,   /* smLao script*/
+  langVietnamese                = 80,   /* smVietnamese script*/
+  langIndonesian                = 81,   /* smRoman script*/
+  langTagalog                   = 82,   /* Roman script*/
+  langMalayRoman                = 83,   /* Malay in smRoman script*/
+  langMalayArabic               = 84,   /* Malay in Arabic script*/
+  langAmharic                   = 85,   /* smEthiopic script*/
+  langTigrinya                  = 86,   /* smEthiopic script*/
+  langOromo                     = 87,   /* smEthiopic script*/
+  langSomali                    = 88,   /* smRoman script*/
+  langSwahili                   = 89,   /* smRoman script*/
+  langKinyarwanda               = 90,   /* smRoman script*/
+  langRuanda                    = 90,   /* synonym for langKinyarwanda*/
+  langRundi                     = 91,   /* smRoman script*/
+  langNyanja                    = 92,   /* smRoman script*/
+  langChewa                     = 92,   /* synonym for langNyanja*/
+  langMalagasy                  = 93,   /* smRoman script*/
+  langEsperanto                 = 94    /* Roman script*/
+};
+
+enum {
+  langWelsh                     = 128,  /* modified smRoman/Celtic script*/
+  langBasque                    = 129,  /* smRoman script*/
+  langCatalan                   = 130,  /* smRoman script*/
+  langLatin                     = 131,  /* smRoman script*/
+  langQuechua                   = 132,  /* smRoman script*/
+  langGuarani                   = 133,  /* smRoman script*/
+  langAymara                    = 134,  /* smRoman script*/
+  langTatar                     = 135,  /* Cyrillic script*/
+  langUighur                    = 136,  /* Arabic script*/
+  langDzongkha                  = 137,  /* (lang of Bhutan) smTibetan script*/
+  langJavaneseRom               = 138,  /* Javanese in smRoman script*/
+  langSundaneseRom              = 139,  /* Sundanese in smRoman script*/
+  langGalician                  = 140,  /* smRoman script*/
+  langAfrikaans                 = 141   /* smRoman script                                   */
+};
+
+enum {
+  langBreton                    = 142,  /* smRoman or modified smRoman/Celtic script                 */
+  langInuktitut                 = 143,  /* Inuit script using smEthiopic script code                 */
+  langScottishGaelic            = 144,  /* smRoman or modified smRoman/Celtic script                 */
+  langManxGaelic                = 145,  /* smRoman or modified smRoman/Celtic script                 */
+  langIrishGaelicScript         = 146,  /* modified smRoman/Gaelic script (using dot above)               */
+  langTongan                    = 147,  /* smRoman script                                   */
+  langGreekAncient              = 148,  /* Classical Greek, polytonic orthography                    */
+  langGreenlandic               = 149,  /* smRoman script                                   */
+  langAzerbaijanRoman           = 150,  /* Azerbaijani in Roman script                             */
+  langNynorsk                   = 151   /* Norwegian Nyorsk in smRoman*/
+};
+
+enum {
+  langUnspecified               = 32767 /* Special code for use in resources (such as 'itlm')           */
+};
+
+/*
+   Obsolete language code names (kept for backward compatibility):
+   Misspelled, ambiguous, misleading, considered pejorative, archaic, etc.
+*/
+enum {
+  langPortugese                 = 8,    /* Use langPortuguese*/
+  langMalta                     = 16,   /* Use langMaltese*/
+  langYugoslavian               = 18,   /* (use langCroatian, langSerbian, etc.)*/
+  langChinese                   = 19,   /* (use langTradChinese or langSimpChinese)*/
+  langLettish                   = 28,   /* Use langLatvian                                     */
+  langLapponian                 = 29,   /* Use langSami*/
+  langLappish                   = 29,   /* Use langSami*/
+  langSaamisk                   = 29,   /* Use langSami                                    */
+  langFaeroese                  = 30,   /* Use langFaroese                                     */
+  langIrish                     = 35,   /* Use langIrishGaelic                                  */
+  langGalla                     = 87,   /* Use langOromo                                 */
+  langAfricaans                 = 141,  /* Use langAfrikaans                                */
+  langGreekPoly                 = 148   /* Use langGreekAncient*/
+};
+
+#endif /* __MacScriptExtracts__ */
diff --git a/XMPFiles/source/FormatSupport/Makefile.am b/XMPFiles/source/FormatSupport/Makefile.am
new file mode 100644
index 0000000..8916332
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/Makefile.am
@@ -0,0 +1,82 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+noinst_LTLIBRARIES = libformatsupport.la
+noinst_HEADERS = IPTC_Support.hpp  PSIR_Support.hpp\
+	Reconcile_Impl.hpp   RIFF_Support.hpp  XMPScanner.hpp\
+	ID3_Support.hpp  PNG_Support.hpp   QuickTime_Support.hpp\
+	ReconcileLegacy.hpp  TIFF_Support.hpp  GIF_Support.hpp
+
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+AM_CPPFLAGS = -I$(top_srcdir) \
+	-I$(top_srcdir)/public/include/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+libformatsupport_la_SOURCES = \
+	PackageFormat_Support.cpp PackageFormat_Support.hpp \
+	PostScript_Support.cpp PostScript_Support.hpp \
+	PSIR_FileWriter.cpp    Reconcile_Impl.cpp \
+	ReconcileTIFF.cpp    TIFF_MemoryReader.cpp \
+	IPTC_Support.cpp  PSIR_MemoryReader.cpp  ReconcileIPTC.cpp   \
+	RIFF.cpp RIFF.hpp ID3_Support.cpp ID3_Support.hpp\
+	RIFF_Support.cpp     TIFF_Support.cpp \
+	ISOBaseMedia_Support.hpp ISOBaseMedia_Support.cpp \
+	PNG_Support.cpp   ReconcileLegacy.cpp  \
+	GIF_Support.cpp \
+	SWF_Support.hpp SWF_Support.cpp\
+	XDCAM_Support.hpp XDCAM_Support.cpp\
+	TIFF_FileWriter.cpp  XMPScanner.cpp \
+	MOOV_Support.cpp MOOV_Support.hpp \
+	QuickTime_Support.cpp \
+	ASF_Support.hpp ASF_Support.cpp \
+	MacScriptExtracts.h \
+	TimeConversionUtils.cpp TimeConversionUtils.hpp \
+	AIFF/AIFFBehavior.cpp  AIFF/AIFFBehavior.h \
+	AIFF/AIFFMetadata.cpp  AIFF/AIFFMetadata.h \
+	AIFF/AIFFReconcile.cpp  AIFF/AIFFReconcile.h \
+	IFF/ChunkController.cpp  IFF/Chunk.cpp  IFF/ChunkPath.cpp  IFF/IChunkBehavior.cpp  IFF/IChunkContainer.h \
+	IFF/ChunkController.h    IFF/Chunk.h    IFF/ChunkPath.h    IFF/IChunkBehavior.h    IFF/IChunkData.h \
+	WAVE/BEXTMetadata.cpp  WAVE/CartMetadata.h    WAVE/DISPMetadata.cpp  WAVE/INFOMetadata.h    WAVE/WAVEBehavior.cpp   WAVE/WAVEReconcile.h \
+	WAVE/BEXTMetadata.h    WAVE/Cr8rMetadata.cpp  WAVE/DISPMetadata.h    WAVE/PrmLMetadata.cpp  WAVE/WAVEBehavior.h \
+	WAVE/CartMetadata.cpp  WAVE/Cr8rMetadata.h    WAVE/INFOMetadata.cpp  WAVE/PrmLMetadata.h    WAVE/WAVEReconcile.cpp \
+	WAVE/iXMLMetadata.h WAVE/iXMLMetadata.cpp \
+	P2_Support.hpp P2_Support.cpp \
+	WEBP_Support.hpp WEBP_Support.cpp \
+	$(NULL)
+
+
diff --git a/XMPFiles/source/FormatSupport/Makefile.in b/XMPFiles/source/FormatSupport/Makefile.in
new file mode 100644
index 0000000..1e73f25
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/Makefile.in
@@ -0,0 +1,833 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFiles/source/FormatSupport
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libformatsupport_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libformatsupport_la_OBJECTS = PackageFormat_Support.lo \
+	PostScript_Support.lo PSIR_FileWriter.lo Reconcile_Impl.lo \
+	ReconcileTIFF.lo TIFF_MemoryReader.lo IPTC_Support.lo \
+	PSIR_MemoryReader.lo ReconcileIPTC.lo RIFF.lo ID3_Support.lo \
+	RIFF_Support.lo TIFF_Support.lo ISOBaseMedia_Support.lo \
+	PNG_Support.lo ReconcileLegacy.lo GIF_Support.lo \
+	SWF_Support.lo XDCAM_Support.lo TIFF_FileWriter.lo \
+	XMPScanner.lo MOOV_Support.lo QuickTime_Support.lo \
+	ASF_Support.lo TimeConversionUtils.lo AIFF/AIFFBehavior.lo \
+	AIFF/AIFFMetadata.lo AIFF/AIFFReconcile.lo \
+	IFF/ChunkController.lo IFF/Chunk.lo IFF/ChunkPath.lo \
+	IFF/IChunkBehavior.lo WAVE/BEXTMetadata.lo \
+	WAVE/DISPMetadata.lo WAVE/WAVEBehavior.lo WAVE/Cr8rMetadata.lo \
+	WAVE/PrmLMetadata.lo WAVE/CartMetadata.lo WAVE/INFOMetadata.lo \
+	WAVE/WAVEReconcile.lo WAVE/iXMLMetadata.lo P2_Support.lo \
+	WEBP_Support.lo
+libformatsupport_la_OBJECTS = $(am_libformatsupport_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libformatsupport_la_SOURCES)
+DIST_SOURCES = $(libformatsupport_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libformatsupport.la
+noinst_HEADERS = IPTC_Support.hpp  PSIR_Support.hpp\
+	Reconcile_Impl.hpp   RIFF_Support.hpp  XMPScanner.hpp\
+	ID3_Support.hpp  PNG_Support.hpp   QuickTime_Support.hpp\
+	ReconcileLegacy.hpp  TIFF_Support.hpp  GIF_Support.hpp
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+	-I$(top_srcdir)/public/include/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+libformatsupport_la_SOURCES = \
+	PackageFormat_Support.cpp PackageFormat_Support.hpp \
+	PostScript_Support.cpp PostScript_Support.hpp \
+	PSIR_FileWriter.cpp    Reconcile_Impl.cpp \
+	ReconcileTIFF.cpp    TIFF_MemoryReader.cpp \
+	IPTC_Support.cpp  PSIR_MemoryReader.cpp  ReconcileIPTC.cpp   \
+	RIFF.cpp RIFF.hpp ID3_Support.cpp ID3_Support.hpp\
+	RIFF_Support.cpp     TIFF_Support.cpp \
+	ISOBaseMedia_Support.hpp ISOBaseMedia_Support.cpp \
+	PNG_Support.cpp   ReconcileLegacy.cpp  \
+	GIF_Support.cpp \
+	SWF_Support.hpp SWF_Support.cpp\
+	XDCAM_Support.hpp XDCAM_Support.cpp\
+	TIFF_FileWriter.cpp  XMPScanner.cpp \
+	MOOV_Support.cpp MOOV_Support.hpp \
+	QuickTime_Support.cpp \
+	ASF_Support.hpp ASF_Support.cpp \
+	MacScriptExtracts.h \
+	TimeConversionUtils.cpp TimeConversionUtils.hpp \
+	AIFF/AIFFBehavior.cpp  AIFF/AIFFBehavior.h \
+	AIFF/AIFFMetadata.cpp  AIFF/AIFFMetadata.h \
+	AIFF/AIFFReconcile.cpp  AIFF/AIFFReconcile.h \
+	IFF/ChunkController.cpp  IFF/Chunk.cpp  IFF/ChunkPath.cpp  IFF/IChunkBehavior.cpp  IFF/IChunkContainer.h \
+	IFF/ChunkController.h    IFF/Chunk.h    IFF/ChunkPath.h    IFF/IChunkBehavior.h    IFF/IChunkData.h \
+	WAVE/BEXTMetadata.cpp  WAVE/CartMetadata.h    WAVE/DISPMetadata.cpp  WAVE/INFOMetadata.h    WAVE/WAVEBehavior.cpp   WAVE/WAVEReconcile.h \
+	WAVE/BEXTMetadata.h    WAVE/Cr8rMetadata.cpp  WAVE/DISPMetadata.h    WAVE/PrmLMetadata.cpp  WAVE/WAVEBehavior.h \
+	WAVE/CartMetadata.cpp  WAVE/Cr8rMetadata.h    WAVE/INFOMetadata.cpp  WAVE/PrmLMetadata.h    WAVE/WAVEReconcile.cpp \
+	WAVE/iXMLMetadata.h WAVE/iXMLMetadata.cpp \
+	P2_Support.hpp P2_Support.cpp \
+	WEBP_Support.hpp WEBP_Support.cpp \
+	$(NULL)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFiles/source/FormatSupport/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFiles/source/FormatSupport/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+AIFF/$(am__dirstamp):
+	@$(MKDIR_P) AIFF
+	@: > AIFF/$(am__dirstamp)
+AIFF/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) AIFF/$(DEPDIR)
+	@: > AIFF/$(DEPDIR)/$(am__dirstamp)
+AIFF/AIFFBehavior.lo: AIFF/$(am__dirstamp) \
+	AIFF/$(DEPDIR)/$(am__dirstamp)
+AIFF/AIFFMetadata.lo: AIFF/$(am__dirstamp) \
+	AIFF/$(DEPDIR)/$(am__dirstamp)
+AIFF/AIFFReconcile.lo: AIFF/$(am__dirstamp) \
+	AIFF/$(DEPDIR)/$(am__dirstamp)
+IFF/$(am__dirstamp):
+	@$(MKDIR_P) IFF
+	@: > IFF/$(am__dirstamp)
+IFF/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) IFF/$(DEPDIR)
+	@: > IFF/$(DEPDIR)/$(am__dirstamp)
+IFF/ChunkController.lo: IFF/$(am__dirstamp) \
+	IFF/$(DEPDIR)/$(am__dirstamp)
+IFF/Chunk.lo: IFF/$(am__dirstamp) IFF/$(DEPDIR)/$(am__dirstamp)
+IFF/ChunkPath.lo: IFF/$(am__dirstamp) IFF/$(DEPDIR)/$(am__dirstamp)
+IFF/IChunkBehavior.lo: IFF/$(am__dirstamp) \
+	IFF/$(DEPDIR)/$(am__dirstamp)
+WAVE/$(am__dirstamp):
+	@$(MKDIR_P) WAVE
+	@: > WAVE/$(am__dirstamp)
+WAVE/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) WAVE/$(DEPDIR)
+	@: > WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/BEXTMetadata.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/DISPMetadata.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/WAVEBehavior.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/Cr8rMetadata.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/PrmLMetadata.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/CartMetadata.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/INFOMetadata.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/WAVEReconcile.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+WAVE/iXMLMetadata.lo: WAVE/$(am__dirstamp) \
+	WAVE/$(DEPDIR)/$(am__dirstamp)
+
+libformatsupport.la: $(libformatsupport_la_OBJECTS) $(libformatsupport_la_DEPENDENCIES) $(EXTRA_libformatsupport_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libformatsupport_la_OBJECTS) $(libformatsupport_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f AIFF/*.$(OBJEXT)
+	-rm -f AIFF/*.lo
+	-rm -f IFF/*.$(OBJEXT)
+	-rm -f IFF/*.lo
+	-rm -f WAVE/*.$(OBJEXT)
+	-rm -f WAVE/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ASF_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GIF_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ID3_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IPTC_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ISOBaseMedia_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MOOV_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/P2_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PNG_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSIR_FileWriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSIR_MemoryReader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PackageFormat_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PostScript_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuickTime_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RIFF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RIFF_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReconcileIPTC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReconcileLegacy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReconcileTIFF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Reconcile_Impl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SWF_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TIFF_FileWriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TIFF_MemoryReader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TIFF_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeConversionUtils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WEBP_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XDCAM_Support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPScanner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AIFF/$(DEPDIR)/AIFFBehavior.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AIFF/$(DEPDIR)/AIFFMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AIFF/$(DEPDIR)/AIFFReconcile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@IFF/$(DEPDIR)/Chunk.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@IFF/$(DEPDIR)/ChunkController.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@IFF/$(DEPDIR)/ChunkPath.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@IFF/$(DEPDIR)/IChunkBehavior.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/BEXTMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/CartMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/Cr8rMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/DISPMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/INFOMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/PrmLMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/WAVEBehavior.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/WAVEReconcile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@WAVE/$(DEPDIR)/iXMLMetadata.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf AIFF/.libs AIFF/_libs
+	-rm -rf IFF/.libs IFF/_libs
+	-rm -rf WAVE/.libs WAVE/_libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f AIFF/$(DEPDIR)/$(am__dirstamp)
+	-rm -f AIFF/$(am__dirstamp)
+	-rm -f IFF/$(DEPDIR)/$(am__dirstamp)
+	-rm -f IFF/$(am__dirstamp)
+	-rm -f WAVE/$(DEPDIR)/$(am__dirstamp)
+	-rm -f WAVE/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR) AIFF/$(DEPDIR) IFF/$(DEPDIR) WAVE/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR) AIFF/$(DEPDIR) IFF/$(DEPDIR) WAVE/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFiles/source/FormatSupport/P2_Support.cpp b/XMPFiles/source/FormatSupport/P2_Support.cpp
new file mode 100644
index 0000000..fc5a334
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/P2_Support.cpp
@@ -0,0 +1,566 @@
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2014 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+#include "source/ExpatAdapter.hpp"
+
+#include "source/IOUtils.hpp"
+
+#include "XMPFiles/source/FormatSupport/P2_Support.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+#include <sstream>
+
+P2_Clip::P2_Clip(const std::string & p2ClipMetadataFilePath)
+	try :headContentCached(false),p2XMLParser(0),p2Root(0)
+	,p2ClipContent(0),filePath(p2ClipMetadataFilePath)
+{
+	Host_IO::FileRef hostRef = Host_IO::Open ( p2ClipMetadataFilePath.c_str(), Host_IO::openReadOnly );
+	XMPFiles_IO xmlFile ( hostRef, p2ClipMetadataFilePath.c_str(), Host_IO::openReadOnly );
+	CreateExpatParser(xmlFile);
+	xmlFile.Close();
+}
+catch(...)
+{
+	DestroyExpatParser();
+	throw;
+}
+
+P2_Clip::~P2_Clip()
+{
+	DestroyExpatParser();
+}
+
+void P2_Clip::CreateExpatParser(XMPFiles_IO &xmlFile)
+{
+	this->p2XMLParser = XMP_NewExpatAdapter ( ExpatAdapter::kUseLocalNamespaces );
+	if ( this->p2XMLParser == 0 ) XMP_Throw ( "P2_MetaHandler: Can't create Expat adapter", kXMPErr_NoMemory );
+
+	XMP_Uns8 buffer [64*1024];
+	while ( true ) {
+		XMP_Int32 ioCount = xmlFile.Read ( buffer, sizeof(buffer) );
+		if ( ioCount == 0 ) break;
+		this->p2XMLParser->ParseBuffer ( buffer, ioCount, false /* not the end */ );
+	}
+	this->p2XMLParser->ParseBuffer ( 0, 0, true );	
+}
+
+void P2_Clip::DestroyExpatParser()
+{
+	 delete this->p2XMLParser; 
+	 this->p2XMLParser = 0; 
+	 p2Root=0;
+	 headContent.reset();
+	 headContentCached = false;
+}
+
+XML_NodePtr P2_Clip::GetP2RootNode()
+{
+	if (p2Root!=0) return p2Root;
+	// The root element should be P2Main in some namespace. At least 2 different namespaces are in
+	// use (ending in "v3.0" and "v3.1"). Take whatever this file uses.
+
+	XML_Node & xmlTree = this->p2XMLParser->tree;
+	XML_NodePtr rootElem = 0;
+
+	for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+		if ( xmlTree.content[i]->kind == kElemNode ) {
+			rootElem = xmlTree.content[i];
+		}
+	}
+
+	if ( rootElem == 0 ) return 0;
+	XMP_StringPtr rootLocalName = rootElem->name.c_str() + rootElem->nsPrefixLen;
+	if ( ! XMP_LitMatch ( rootLocalName, "P2Main" ) ) return 0;
+
+	this->p2Root = rootElem;
+	return p2Root;
+}
+static void  GetElementLocation(XML_NodePtr p2node,std::string*& elemLoc ) 
+{
+	if ( p2node != 0 && p2node->IsLeafContentNode() ) 
+	{
+		elemLoc= p2node->GetLeafContentPtr();
+	}
+}
+
+static void GetElementValue(XML_NodePtr p2node, XMP_Uns32 &value) 
+{
+	if ( p2node != 0 && p2node->IsLeafContentNode() ) 
+	{
+		value =atoi(p2node->GetLeafContentValue());
+	}
+}
+void P2_Clip::CacheClipContent()
+{
+	if (headContentCached) return;
+	headContentCached = true;
+	XMP_StringPtr p2NameSpace=GetP2RootNode()->ns.c_str();
+	p2ClipContent = GetP2RootNode()->GetNamedElement ( p2NameSpace, "ClipContent" );
+	if ( p2ClipContent == 0 )  return;
+	XML_NodePtr  p2node;
+
+	p2node= p2ClipContent->GetNamedElement ( p2NameSpace, "GlobalClipID" );
+	GetElementLocation(p2node,headContent.clipId );
+
+	p2node= p2ClipContent->GetNamedElement ( p2NameSpace, "ClipName" );
+	GetElementLocation(p2node,headContent.clipTitle );
+
+	p2node= p2ClipContent->GetNamedElement ( p2NameSpace, "Duration" );
+	GetElementValue(p2node,headContent.duration );
+
+	p2node= p2ClipContent->GetNamedElement ( p2NameSpace, "EditUnit" );
+	GetElementLocation(p2node,headContent.scaleUnit );
+
+	headContent.clipMetadata= p2ClipContent->GetNamedElement ( p2NameSpace, "ClipMetadata" );
+	headContent.essenceList= p2ClipContent->GetNamedElement ( p2NameSpace, "EssenceList" );
+
+	p2node= p2ClipContent->GetNamedElement ( p2NameSpace, "Relation" );
+	if ( p2node != 0 )
+	{
+		XML_NodePtr p2Offset= p2node->GetNamedElement ( p2NameSpace, "OffsetInShot" );
+		GetElementValue(p2Offset,headContent.OffsetInShot );		
+		p2Offset= p2node->GetNamedElement ( p2NameSpace, "GlobalShotID" );
+		GetElementLocation(p2Offset,headContent.shotId );
+		XML_NodePtr p2connection= p2node->GetNamedElement ( p2NameSpace, "Connection" );
+		if ( p2node != 0 )
+		{
+			p2node= p2connection->GetNamedElement ( p2NameSpace, "Top" );
+			if ( p2node != 0 )
+			{
+				p2node= p2node->GetNamedElement ( p2NameSpace, "GlobalClipID" );
+				GetElementLocation(p2node,headContent.topClipId );
+			}			
+			p2node= p2connection->GetNamedElement ( p2NameSpace, "Next" );
+			if ( p2node != 0 )
+			{
+				p2node= p2node->GetNamedElement ( p2NameSpace, "GlobalClipID" );
+				GetElementLocation(p2node,headContent.nextClipId );
+			}			
+			p2node= p2connection->GetNamedElement ( p2NameSpace, "Previous" );
+			if ( p2node != 0 )
+			{
+				p2node= p2node->GetNamedElement ( p2NameSpace, "GlobalClipID" );
+				GetElementLocation(p2node,headContent.prevClipId );
+			}
+		}
+	}
+}
+
+bool P2_Clip::IsValidClip()
+{
+	this->CacheClipContent();
+	return headContent.clipId != 0;
+}
+bool P2_Clip::IsSpannedClip()
+{
+	return IsValidClip() && headContent.topClipId != 0 &&( headContent.prevClipId != 0 || headContent.nextClipId!=0 );
+
+}
+
+bool P2_Clip::IsTopClip()
+{
+	return IsValidClip() && headContent.topClipId != 0  &&  *(headContent.topClipId) == *(headContent.clipId);
+}
+
+XMP_Uns32 P2_Clip::GetOffsetInShot() 
+{
+	this->CacheClipContent();
+	return this->headContent.OffsetInShot;
+}
+
+XMP_Uns32 P2_Clip::GetDuration()
+{
+	this->CacheClipContent();
+	return this->headContent.duration;
+}
+
+std::string* P2_Clip::GetClipId()
+{
+	this->CacheClipContent();
+	return this->headContent.clipId;
+}
+
+std::string* P2_Clip::GetClipName()
+{
+  if ( this->clipName == "" )
+  {
+    std::string tempPath = this->filePath;		
+    XIO::SplitLeafName(&tempPath, &this->clipName);
+    std::string ext;
+    XIO::SplitFileExtension(&this->clipName, &ext);		
+  }
+  return &this->clipName;
+}
+
+std::string P2_Clip::GetClipTitle()
+{  
+  this->CacheClipContent();
+  if ( ! this->headContent.clipTitle ) return std::string("");
+  return *this->headContent.clipTitle;
+}
+std::string* P2_Clip::GetNextClipId()
+{
+	this->CacheClipContent();
+	return this->headContent.nextClipId;
+}
+
+std::string* P2_Clip::GetPreviousClipId()
+{
+	this->CacheClipContent();
+	return this->headContent.prevClipId;
+}
+
+std::string* P2_Clip::GetTopClipId()
+{
+	this->CacheClipContent();
+	return this->headContent.topClipId;
+}
+
+std::string* P2_Clip::GetShotId()
+{
+	this->CacheClipContent();
+	return this->headContent.shotId;
+}
+
+std::string* P2_Clip::GetEditUnit()
+{
+	this->CacheClipContent();
+	return this->headContent.scaleUnit;
+}
+
+XML_NodePtr P2_Clip::GetClipContentNode()
+{
+	this->CacheClipContent();
+	return this->p2ClipContent;
+}
+
+XML_NodePtr P2_Clip::GetClipMetadataNode()
+{
+	this->CacheClipContent();
+	return this->headContent.clipMetadata;
+}
+
+XML_NodePtr P2_Clip::GetEssenceListNode()
+{
+	this->CacheClipContent();
+	return this->headContent.essenceList;
+}
+
+std::string P2_Clip::GetXMPFilePath()
+{
+	std::string ClipMetadataPath =  this->GetClipPath();
+	std::string ignoreext;
+	XIO::SplitFileExtension(&ClipMetadataPath,&ignoreext);
+	return ClipMetadataPath+ ".XMP";
+}
+
+void P2_Clip::CreateDigest ( std::string * digestStr )
+{
+	return;
+}
+
+void  P2_Clip::SerializeP2ClipContent(std::string& xmlContentData) 
+{
+	this->p2XMLParser->tree.Serialize ( &xmlContentData );
+}
+
+
+P2_SpannedClip::P2_SpannedClip(const std::string & p2ClipMetadataFilePath):
+	P2_Clip(p2ClipMetadataFilePath)
+{
+	P2_Clip* p2Clip= dynamic_cast<P2_Clip*>(this);
+	spannedP2Clip.insert(p2Clip);
+	if (p2Clip->GetClipId())
+		addedClipIds.insert(*p2Clip->GetClipId());
+}
+
+bool P2_SpannedClip::AddIfRelated(P2_Clip* newClip)
+{
+	std::string* tClipId = newClip->GetTopClipId();
+	if( tClipId != 0 && *(tClipId)==*this->GetTopClipId() && 
+		newClip->IsValidClip() && addedClipIds.find(*newClip->GetClipId()) == addedClipIds.end())
+	{
+		spannedP2Clip.insert(newClip);
+		addedClipIds.insert(*newClip->GetClipId());
+		return true;
+	}
+	return false;
+}
+
+bool P2_SpannedClip::IsComplete() const
+{
+	RelatedP2ClipList::iterator iter=spannedP2Clip.begin();
+	if (! (*iter)->IsTopClip() ) return false;
+	std::string* next=(*iter)->GetNextClipId();
+	while(++iter != spannedP2Clip.end() &&
+		next != 0 && (*iter)->IsValidClip() &&
+		*next == *( (*iter)->GetClipId() ) 
+	)
+		next = (*iter)->GetNextClipId();
+	if ( iter != spannedP2Clip.end() || next != 0 )
+	{
+		iter=spannedP2Clip.begin();
+		std::string* prev= (*iter)->GetClipId();
+		while(++iter != spannedP2Clip.end() &&
+			prev != 0 &&  (*iter)->GetPreviousClipId() !=0 &&
+			*prev == *( (*iter)->GetPreviousClipId() ) 
+		)
+			prev= (*iter)->GetClipId();
+		if ( iter != spannedP2Clip.end() ) return false;
+	}
+	return true;
+}
+
+std::string P2_SpannedClip::GetXMPFilePath()
+{	
+	if (  this->IsComplete() )
+	{
+		std::string ClipMetadataPath =  (*spannedP2Clip.begin())->GetClipPath();
+		std::string ignoreext;
+		XIO::SplitFileExtension(&ClipMetadataPath,&ignoreext);
+		return ClipMetadataPath+ ".XMP";
+	}else
+	{
+		return P2_Clip::GetXMPFilePath();
+	}
+}
+
+void P2_SpannedClip::DigestElement( MD5_CTX & md5Context, XML_NodePtr legacyContext, XMP_StringPtr legacyPropName )
+{
+	XML_NodePtr legacyProp = legacyContext->GetNamedElement ( this->GetP2RootNode()->ns.c_str(), legacyPropName );
+
+	if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() && (! legacyProp->content.empty()) ) {
+		const XML_Node * xmlValue = legacyProp->content[0];
+		MD5Update ( &md5Context, (XMP_Uns8*)xmlValue->value.c_str(), (unsigned int)xmlValue->value.size() );
+	}
+
+}	// P2_MetaHandler::DigestLegacyItem
+#define kHexDigits "0123456789ABCDEF"
+
+void P2_SpannedClip::CreateDigest ( std::string * digestStr )
+{
+	digestStr->erase();
+	if ( this->headContent.clipMetadata == 0 ) return;	// Bail if we don't have any legacy XML.
+
+	XMP_StringPtr p2NS = this->GetP2RootNode()->ns.c_str();
+	XML_NodePtr legacyContext;
+	MD5_CTX    md5Context;
+	unsigned char digestBin [16];
+	MD5Init ( &md5Context );
+	
+	MD5Update ( &md5Context, (XMP_Uns8*)this->GetClipTitle().c_str(), (unsigned int)this->GetClipTitle().size() );
+	if ( headContent.clipId )
+		MD5Update ( &md5Context, (XMP_Uns8*)headContent.clipId->c_str(), (unsigned int)headContent.clipId->size() );
+
+	XMP_Uns32 totalDuration=this->GetDuration();
+	std::ostringstream ostr;
+	ostr << totalDuration;
+	if ( totalDuration )
+		MD5Update ( &md5Context, (XMP_Uns8*)ostr.str().c_str(), (unsigned int)ostr.str().size() );
+	if ( headContent.scaleUnit )
+		MD5Update ( &md5Context, (XMP_Uns8*)headContent.scaleUnit->c_str(), (unsigned int)headContent.scaleUnit->size() );
+
+	if ( headContent.shotId )
+		MD5Update ( &md5Context, (XMP_Uns8*)headContent.shotId->c_str(), (unsigned int)headContent.shotId->size() );
+	if ( headContent.topClipId )
+		MD5Update ( &md5Context, (XMP_Uns8*)headContent.topClipId->c_str(), (unsigned int)headContent.topClipId->size() );
+	if ( headContent.prevClipId )
+		MD5Update ( &md5Context, (XMP_Uns8*)headContent.prevClipId->c_str(), (unsigned int)headContent.prevClipId->size() );
+	if ( headContent.nextClipId )
+		MD5Update ( &md5Context, (XMP_Uns8*)headContent.nextClipId->c_str(), (unsigned int)headContent.nextClipId->size() );
+
+	if ( this->headContent.essenceList != 0 ) {
+
+		XML_NodePtr videoContext = this->headContent.essenceList->GetNamedElement ( p2NS, "Video" );
+
+		if ( videoContext != 0 ) {
+			this->DigestElement ( md5Context, videoContext, "AspectRatio" );
+			this->DigestElement ( md5Context, videoContext, "Codec" );
+			this->DigestElement ( md5Context, videoContext, "FrameRate" );
+			this->DigestElement ( md5Context, videoContext, "StartTimecode" );
+		}
+
+		XML_NodePtr audioContext = this->headContent.essenceList->GetNamedElement ( p2NS, "Audio" );
+
+		if ( audioContext != 0 ) {
+			this->DigestElement ( md5Context, audioContext, "SamplingRate" );
+			this->DigestElement ( md5Context, audioContext, "BitsPerSample" );
+		}
+
+	}
+
+	legacyContext = this->headContent.clipMetadata;
+	this->DigestElement ( md5Context, legacyContext, "UserClipName" );
+	this->DigestElement ( md5Context, legacyContext, "ShotMark" );
+
+	legacyContext = this->headContent.clipMetadata->GetNamedElement ( p2NS, "Access" );
+	/* Rather return than create the digest because the "Access" element is listed as "required" in the P2 spec.
+	So a P2 file without an "Access" element does not follow the spec and might be corrupt.*/
+	if ( legacyContext == 0 ) return;
+
+	this->DigestElement ( md5Context, legacyContext, "Creator" );
+	this->DigestElement ( md5Context, legacyContext, "CreationDate" );
+	this->DigestElement ( md5Context, legacyContext, "LastUpdateDate" );
+
+	legacyContext = this->headContent.clipMetadata->GetNamedElement ( p2NS, "Shoot" );
+
+	if ( legacyContext != 0 ) {
+		this->DigestElement ( md5Context, legacyContext, "Shooter" );
+
+		legacyContext = legacyContext->GetNamedElement ( p2NS, "Location" );
+
+		if ( legacyContext != 0 ) {
+			this->DigestElement ( md5Context, legacyContext, "PlaceName" );
+			this->DigestElement ( md5Context, legacyContext, "Longitude" );
+			this->DigestElement ( md5Context, legacyContext, "Latitude" );
+			this->DigestElement ( md5Context, legacyContext, "Altitude" );
+		}
+	}
+
+	legacyContext = this->headContent.clipMetadata->GetNamedElement ( p2NS, "Scenario" );
+
+	if ( legacyContext != 0 ) {
+		this->DigestElement ( md5Context, legacyContext, "SceneNo." );
+		this->DigestElement ( md5Context, legacyContext, "TakeNo." );
+	}
+
+	legacyContext = this->headContent.clipMetadata->GetNamedElement ( p2NS, "Device" );
+
+	if ( legacyContext != 0 ) {
+		this->DigestElement ( md5Context, legacyContext, "Manufacturer" );
+		this->DigestElement ( md5Context, legacyContext, "SerialNo." );
+		this->DigestElement ( md5Context, legacyContext, "ModelName" );
+	}
+
+	MD5Final ( digestBin, &md5Context );
+
+	char buffer [40];
+	for ( int in = 0, out = 0; in < 16; in += 1, out += 2 ) {
+		XMP_Uns8 byte = digestBin[in];
+		buffer[out]   = kHexDigits [ byte >> 4 ];
+		buffer[out+1] = kHexDigits [ byte & 0xF ];
+	}
+	buffer[32] = 0;
+	digestStr->append ( buffer );
+
+}
+
+P2_SpannedClip::~P2_SpannedClip()
+{
+	RelatedP2ClipList::iterator iter = spannedP2Clip.begin();
+	for(;iter!=spannedP2Clip.end();iter++)
+	{
+		if (GetClipPath() != (*iter)->GetClipPath())
+			delete *iter;
+	}
+	spannedP2Clip.clear();
+}
+
+P2_Clip* P2_SpannedClip::TopP2Clip()
+{
+	if ( this->IsComplete() && spannedP2Clip.size() > 1 )
+	{
+		return *spannedP2Clip.begin();
+	}
+	return this;	
+}
+
+XMP_Uns32 P2_SpannedClip::GetDuration()
+{	
+	if ( IsComplete() )
+	{
+		RelatedP2ClipList::iterator iter = this->spannedP2Clip.begin();
+		XMP_Uns32 totalDuration=0;
+		for(;iter!=spannedP2Clip.end();iter++)
+			totalDuration+=(*iter)->GetDuration();
+		return totalDuration;
+	}
+	return P2_Clip::GetDuration();
+}
+
+void P2_SpannedClip::GetAllClipNames(std::vector <std::string> & clipNameList)
+{
+	clipNameList.clear();
+	if ( IsComplete() )
+	{
+		RelatedP2ClipList::iterator iter = this->spannedP2Clip.begin();
+		for(;iter!=spannedP2Clip.end();iter++)
+       clipNameList.push_back(*( (*iter)->GetClipName() ) );
+	}else
+	{
+		clipNameList.push_back(*( this->GetClipName() ) );
+	}
+}
+
+P2_Manager::P2_Manager():spannedClips(0)
+{
+
+}
+
+P2_Manager::~P2_Manager()
+{
+	delete this->spannedClips;
+	this->spannedClips    = 0;
+}
+
+void P2_Manager::ProcessClip(std::string & clipPath)
+{
+	this->spannedClips = new P2_SpannedClip(clipPath);
+	if ( this->spannedClips->IsSpannedClip())
+	{
+		std::string clipFolder,filename,regExp;
+		XMP_StringVector  clipFileList,regExpVec;
+		clipFolder=clipPath;
+		XIO::SplitLeafName ( &clipFolder, &filename );
+		regExp = "^\\d\\d\\d\\d\\d\\d.XML$";
+		regExpVec.push_back ( regExp );
+		regExp = "^\\d\\d\\d\\d\\W\\W.XML$";
+		regExpVec.push_back ( regExp );
+		regExp = "^\\d\\d\\d\\d\\d\\W.XML$";
+		regExpVec.push_back ( regExp );
+		regExp = "^\\d\\d\\d\\d\\W\\d.XML$";
+		regExpVec.push_back ( regExp );
+		IOUtils::GetMatchingChildren ( clipFileList,  clipFolder, regExpVec, false, true, true );
+		for(XMP_StringVector::iterator iter=clipFileList.begin();
+			iter!=clipFileList.end();iter++)
+		{ 
+			P2_Clip * tempClip= new P2_Clip(*iter);
+			if ( ! spannedClips->AddIfRelated(tempClip) )
+				delete tempClip;
+		}
+		if(spannedClips->IsComplete())
+		{
+			return;
+		}
+	}
+}
+
+bool P2_Manager::IsValidP2()
+{
+	return spannedClips!= 0;
+}
+
+P2_Clip* P2_Manager::GetManagedClip()
+{
+	return spannedClips->TopP2Clip();
+}
+	
+P2_SpannedClip* P2_Manager::GetSpannedClip()
+{
+	return spannedClips;
+}
+
diff --git a/XMPFiles/source/FormatSupport/P2_Support.hpp b/XMPFiles/source/FormatSupport/P2_Support.hpp
new file mode 100644
index 0000000..8375d32
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/P2_Support.hpp
@@ -0,0 +1,135 @@
+#ifndef __P2_Support_hpp__
+#define __P2_Support_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2014 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 "public/include/XMP_Environment.h"	
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+#include <set>
+
+class P2_Clip {
+public:
+	P2_Clip(const std::string & p2ClipMetadataFilePath);
+	bool IsSpannedClip() ;
+	bool IsTopClip() ;
+	bool IsValidClip() ;
+	virtual void CreateDigest ( std::string * digestStr );
+	XMP_Uns32 GetOffsetInShot();
+	XMP_Uns32 GetDuration();
+	std::string* GetClipName();
+	std::string GetClipTitle();
+	std::string* GetClipId();
+	std::string* GetNextClipId();
+	std::string* GetPreviousClipId();
+	std::string* GetTopClipId();
+	std::string* GetShotId();
+	std::string* GetEditUnit();
+	std::string GetClipPath(){return filePath;}
+	virtual std::string GetXMPFilePath();
+	XML_NodePtr GetClipContentNode();
+	XML_NodePtr GetClipMetadataNode();
+	XML_NodePtr GetEssenceListNode();
+	XML_NodePtr GetP2RootNode() ;
+	void  SerializeP2ClipContent(std::string& xmlContentData) ;
+	virtual ~P2_Clip();
+protected:
+	class ClipContent
+	{ 
+	public:
+		ClipContent():clipTitle(0),clipId(0),scaleUnit(0),
+			duration(0),OffsetInShot(0),topClipId(0),nextClipId(0),
+			prevClipId(0),shotId(0),clipMetadata(0),essenceList(0){}
+		std::string* clipTitle;
+		std::string* clipId;
+		std::string* scaleUnit;
+		XMP_Uns32    duration;
+		XMP_Uns32    OffsetInShot;
+		std::string* topClipId;
+		std::string* nextClipId;
+		std::string* prevClipId;
+		std::string* shotId;
+		XML_NodePtr  clipMetadata;
+		XML_NodePtr  essenceList;
+		void reset(){*this=ClipContent();}
+	};
+	ClipContent    headContent;
+private:
+	void DestroyExpatParser();
+	void CreateExpatParser(XMPFiles_IO &xmlFile);
+	void CacheClipContent();
+
+	bool headContentCached;
+	ExpatAdapter * p2XMLParser;
+	XML_NodePtr    p2Root;
+	XML_NodePtr    p2ClipContent;
+	std::string    filePath;
+	std::string    clipName;
+
+}; // class P2_Clip
+struct P2SpannedClip_Order
+{
+	bool operator()( P2_Clip* lhs,  P2_Clip* rhs)   
+	{  
+		return lhs->GetOffsetInShot() < rhs->GetOffsetInShot();
+	}
+
+};
+
+class P2_SpannedClip : public  P2_Clip{
+public:
+	P2_SpannedClip(const std::string & p2ClipMetadataFilePath);
+	bool AddIfRelated(P2_Clip* openedClip);
+	bool IsComplete()const;
+	XMP_Uns32 GetDuration();
+	P2_Clip* TopP2Clip() ;
+	std::string GetXMPFilePath();
+	void CreateDigest ( std::string * digestStr );
+	void GetAllClipNames(std::vector <std::string> & clipNameList);
+	virtual ~P2_SpannedClip();
+private:
+	P2_SpannedClip(const P2_SpannedClip &);
+	P2_SpannedClip operator=(const P2_SpannedClip &);
+
+	void DigestElement( MD5_CTX & md5Context, XML_NodePtr legacyContext, XMP_StringPtr legacyPropName );
+
+	typedef std::multiset<P2_Clip*,P2SpannedClip_Order> RelatedP2ClipList;
+	std::set<std::string> addedClipIds;
+	RelatedP2ClipList spannedP2Clip;
+
+}; // class P2_SpannedClip
+
+// =================================================================================================
+class P2_Manager {
+public:
+	P2_Manager();
+	void ProcessClip(std::string & clipPath);
+	P2_Clip* GetManagedClip();
+	P2_SpannedClip* GetSpannedClip();
+	bool IsValidP2();
+	~P2_Manager();
+
+private:
+
+	P2_SpannedClip* spannedClips;
+
+}; // class P2_Manager
+
+
+// =================================================================================================
+
+
+
+// =================================================================================================
+
+#endif	// __P2_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/PNG_Support.cpp b/XMPFiles/source/FormatSupport/PNG_Support.cpp
new file mode 100644
index 0000000..c58fc87
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PNG_Support.cpp
@@ -0,0 +1,341 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/PNG_Support.hpp"
+
+#include "source/XIO.hpp"
+
+#include <string.h>
+
+typedef std::basic_string<unsigned char> filebuffer;
+
+namespace CRC
+{
+	/* Table of CRCs of all 8-bit messages. */
+	static unsigned long crc_table[256];
+
+	/* Flag: has the table been computed? Initially false. */
+	static int crc_table_computed = 0;
+
+	/* Make the table for a fast CRC. */
+	static void make_crc_table(void)
+	{
+		unsigned long c;
+		int n, k;
+
+		for (n = 0; n < 256; n++)
+		{
+			c = (unsigned long) n;
+			for (k = 0; k < 8; k++)
+			{
+				if (c & 1)
+				{
+					c = 0xedb88320L ^ (c >> 1);
+				}
+				else
+				{
+					c = c >> 1;
+				}
+			}
+			crc_table[n] = c;
+		}
+		crc_table_computed = 1;
+	}
+
+	/* Update a running CRC with the bytes buf[0..len-1]--the CRC
+	  should be initialized to all 1's, and the transmitted value
+	  is the 1's complement of the final running CRC (see the
+	  crc() routine below). */
+
+	static unsigned long update_crc(unsigned long crc, unsigned char *buf, int len)
+	{
+		unsigned long c = crc;
+		int n;
+
+		if (!crc_table_computed)
+		{
+			make_crc_table();
+		}
+
+		for (n = 0; n < len; n++)
+		{
+			c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
+		}
+
+		return c;
+	}
+
+	/* Return the CRC of the bytes buf[0..len-1]. */
+	static unsigned long crc(unsigned char *buf, int len)
+	{
+		return update_crc(0xffffffffL, buf, len) ^ 0xffffffffL;
+	}
+} // namespace CRC
+
+namespace PNG_Support
+{
+	enum chunkType {
+		// Critical chunks - (shall appear in this order, except PLTE is optional)
+		IHDR = 'IHDR',
+		PLTE = 'PLTE',
+		IDAT = 'IDAT',
+		IEND = 'IEND',
+		// Ancillary chunks - (need not appear in this order)
+		cHRM = 'cHRM',
+		gAMA = 'gAMA',
+		iCCP = 'iCCP',
+		sBIT = 'sBIT',
+		sRGB = 'sRGB',
+		bKGD = 'bKGD',
+		hIST = 'hIST',
+		tRNS = 'tRNS',
+		pHYs = 'pHYs',
+		sPLT = 'sPLT',
+		tIME = 'tIME',
+		iTXt = 'iTXt',
+		tEXt = 'tEXt',
+		zTXt = 'zTXt'
+
+	};
+
+	// =============================================================================================
+
+	long OpenPNG ( XMP_IO* fileRef, ChunkState & inOutChunkState )
+	{
+		XMP_Uns64 pos = 0;
+		long name;
+		XMP_Uns32 len;
+	
+		pos = fileRef->Seek ( 8, kXMP_SeekFromStart );
+		if (pos != 8) return 0;
+	
+		// read first and following chunks
+		while ( ReadChunk ( fileRef, inOutChunkState, &name, &len, pos) ) {}
+	
+		return (long)inOutChunkState.chunks.size();
+
+	}
+
+	// =============================================================================================
+
+	bool  ReadChunk ( XMP_IO* fileRef, ChunkState & inOutChunkState, long * chunkType, XMP_Uns32 * chunkLength, XMP_Uns64 & inOutPosition )
+	{
+		try
+		{
+			XMP_Uns64 startPosition = inOutPosition;
+			long bytesRead;
+			char buffer[4];
+
+			bytesRead = fileRef->Read ( buffer, 4 );
+			if ( bytesRead != 4 ) return false;
+			inOutPosition += 4;
+			*chunkLength = GetUns32BE(buffer);
+
+			bytesRead = fileRef->Read ( buffer, 4 );
+			if ( bytesRead != 4 ) return false;
+			inOutPosition += 4;
+			*chunkType = GetUns32BE(buffer);
+
+			inOutPosition += *chunkLength;
+
+			bytesRead = fileRef->Read ( buffer, 4 );
+			if ( bytesRead != 4 ) return false;
+			inOutPosition += 4;
+			long crc = GetUns32BE(buffer);
+
+			ChunkData	newChunk;
+	
+			newChunk.pos = startPosition;
+			newChunk.len = *chunkLength;
+			newChunk.type = *chunkType;
+
+			// check for XMP in iTXt-chunk
+			if (newChunk.type == iTXt)
+			{
+				CheckiTXtChunkHeader(fileRef, inOutChunkState, newChunk);
+			}
+
+			inOutChunkState.chunks.push_back ( newChunk );
+
+			fileRef->Seek ( inOutPosition, kXMP_SeekFromStart );
+
+		} catch ( ... ) {
+
+			return false;
+
+		}
+	
+		return true;
+
+	}
+
+	// =============================================================================================
+
+	bool WriteXMPChunk ( XMP_IO* fileRef, XMP_Uns32 len, const char* inBuffer )
+	{
+		bool ret = false;
+		unsigned long datalen = (4 + ITXT_HEADER_LEN + len);
+		unsigned char* buffer = new unsigned char[datalen];
+
+		try
+		{
+			size_t pos = 0;
+			memcpy(&buffer[pos], ITXT_CHUNK_TYPE, 4);
+			pos += 4;
+			memcpy(&buffer[pos], ITXT_HEADER_DATA, ITXT_HEADER_LEN);
+			pos += ITXT_HEADER_LEN;
+			memcpy(&buffer[pos], inBuffer, len);
+
+			unsigned long crc_value = MakeUns32BE( CalculateCRC( buffer, datalen ));
+			datalen -= 4;
+			unsigned long len_value = MakeUns32BE( datalen );
+			datalen += 4;
+
+			fileRef->Write ( &len_value, 4 );
+			fileRef->Write ( buffer, datalen );
+			fileRef->Write ( &crc_value, 4 );
+
+			ret = true;
+		}
+		catch ( ... ) {}
+
+		delete [] buffer;
+
+		return ret;
+	}
+
+	// =============================================================================================
+
+	bool CopyChunk ( XMP_IO* sourceRef, XMP_IO* destRef, ChunkData& chunk )
+	{
+		try
+		{
+			sourceRef->Seek ( chunk.pos, kXMP_SeekFromStart  );
+			XIO::Copy (sourceRef, destRef, (chunk.len + 12));
+
+		} catch ( ... ) {
+
+			return false;
+
+		}
+	
+		return true;
+	}
+
+	// =============================================================================================
+
+	unsigned long UpdateChunkCRC( XMP_IO* fileRef, ChunkData& inOutChunkData )
+	{
+		unsigned long ret = 0;
+		unsigned long datalen = (inOutChunkData.len + 4);
+		unsigned char* buffer = new unsigned char[datalen];
+
+		try
+		{
+			fileRef->Seek ( (inOutChunkData.pos + 4), kXMP_SeekFromStart );
+
+			size_t pos = 0;
+			long bytesRead = fileRef->Read ( &buffer[pos], (inOutChunkData.len + 4) );
+
+			unsigned long crc = CalculateCRC( buffer, (inOutChunkData.len + 4) );
+			unsigned long crc_value = MakeUns32BE( crc );
+
+			fileRef->Seek ( (inOutChunkData.pos + 4 + 4 + inOutChunkData.len), kXMP_SeekFromStart );
+			fileRef->Write ( &crc_value, 4 );
+
+			ret = crc;
+		}
+		catch ( ... ) {}
+
+		delete [] buffer;
+
+		return ret;
+	}
+
+	// =============================================================================================
+
+	bool CheckIHDRChunkHeader ( ChunkData& inOutChunkData )
+	{
+		return (inOutChunkData.type == IHDR);
+	}
+
+	// =============================================================================================
+
+	unsigned long CheckiTXtChunkHeader ( XMP_IO* fileRef, ChunkState& inOutChunkState, ChunkData& inOutChunkData )
+	{
+		try
+		{
+			fileRef->Seek ( (inOutChunkData.pos + 8), kXMP_SeekFromStart );
+
+			char buffer[ITXT_HEADER_LEN];
+			long bytesRead = fileRef->Read ( buffer, ITXT_HEADER_LEN );
+
+			if (bytesRead == ITXT_HEADER_LEN)
+			{
+				if (memcmp(buffer, ITXT_HEADER_DATA, ITXT_HEADER_LEN) == 0)
+				{
+					// return length of XMP
+					if (inOutChunkData.len > ITXT_HEADER_LEN)
+					{
+						inOutChunkState.xmpPos = inOutChunkData.pos + 8 + ITXT_HEADER_LEN;
+						inOutChunkState.xmpLen = inOutChunkData.len - ITXT_HEADER_LEN;
+						inOutChunkState.xmpChunk = inOutChunkData;
+						inOutChunkData.xmp = true;
+
+						return inOutChunkState.xmpLen;
+					}
+				}
+			}
+		}
+		catch ( ... ) {}
+	
+		return 0;
+	}
+
+	bool ReadBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns32 len, char * outBuffer )
+	{
+		try
+		{
+			if ( (fileRef == 0) || (outBuffer == 0) ) return false;
+		
+			fileRef->Seek ( pos, kXMP_SeekFromStart  );
+			long bytesRead = fileRef->Read ( outBuffer, len );
+			if ( XMP_Uns32(bytesRead) != len ) return false;
+		
+			return true;
+		}
+		catch ( ... ) {}
+
+		return false;
+	}
+
+	bool WriteBuffer ( XMP_IO* fileRef, XMP_Uns64 & pos, XMP_Uns32 len, const char * inBuffer )
+	{
+		try
+		{
+			if ( (fileRef == 0) || (inBuffer == 0) ) return false;
+		
+			fileRef->Seek ( pos, kXMP_SeekFromStart  );
+			fileRef->Write ( inBuffer, len  );
+		
+			return true;
+		}
+		catch ( ... ) {}
+
+		return false;
+	}
+
+	unsigned long CalculateCRC( unsigned char* inBuffer, XMP_Uns32 len )
+	{
+		return CRC::update_crc(0xffffffffL, inBuffer, len) ^ 0xffffffffL;
+	}
+
+} // namespace PNG_Support
diff --git a/XMPFiles/source/FormatSupport/PNG_Support.hpp b/XMPFiles/source/FormatSupport/PNG_Support.hpp
new file mode 100644
index 0000000..6b0afbf
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PNG_Support.hpp
@@ -0,0 +1,78 @@
+#ifndef __PNG_Support_hpp__
+#define __PNG_Support_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#define PNG_SIGNATURE_LEN		8
+#define PNG_SIGNATURE_DATA		"\x89\x50\x4E\x47\x0D\x0A\x1A\x0A"
+
+#define ITXT_CHUNK_TYPE			"iTXt"
+
+#define ITXT_HEADER_LEN			22
+#define ITXT_HEADER_DATA		"XML:com.adobe.xmp\0\0\0\0\0"
+
+namespace PNG_Support
+{
+	class ChunkData
+	{
+		public:
+			ChunkData() : pos(0), len(0), type(0), xmp(false) {}
+			virtual ~ChunkData() {}
+
+			// | length |  type  |    data     | crc(type+data) |
+			// |   4    |   4    | val(length) |       4        |
+			//
+			XMP_Uns64	pos;		// file offset of chunk
+			XMP_Uns32	len;		// length of chunk data
+			long		type;		// name/type of chunk
+			bool		xmp;		// iTXt-chunk with XMP ?
+	};
+
+	typedef std::vector<ChunkData> ChunkVector;
+	typedef ChunkVector::iterator ChunkIterator;
+
+	class ChunkState
+	{
+		public:
+			ChunkState() : xmpPos(0), xmpLen(0) {}
+			virtual ~ChunkState() {}
+
+			XMP_Uns64	xmpPos;
+			XMP_Uns32	xmpLen;
+			ChunkData	xmpChunk;
+			ChunkVector chunks;	/* vector of chunks */
+	};
+
+	long OpenPNG ( XMP_IO* fileRef, ChunkState& inOutChunkState );
+
+	bool ReadChunk ( XMP_IO* fileRef, ChunkState& inOutChunkState, long* chunkType, XMP_Uns32* chunkLength, XMP_Uns64& inOutPosition );
+	bool WriteXMPChunk ( XMP_IO* fileRef, XMP_Uns32 len, const char* inBuffer );
+	bool CopyChunk ( XMP_IO* sourceRef, XMP_IO* destRef, ChunkData& chunk );
+	unsigned long UpdateChunkCRC( XMP_IO* fileRef, ChunkData& inOutChunkData );
+
+	bool CheckIHDRChunkHeader ( ChunkData& inOutChunkData );
+	unsigned long CheckiTXtChunkHeader ( XMP_IO* fileRef, ChunkState& inOutChunkState, ChunkData& inOutChunkData );
+
+	bool ReadBuffer ( XMP_IO* fileRef, XMP_Uns64& pos, XMP_Uns32 len, char* outBuffer );
+	bool WriteBuffer ( XMP_IO* fileRef, XMP_Uns64& pos, XMP_Uns32 len, const char* inBuffer );
+
+	unsigned long CalculateCRC( unsigned char* inBuffer, XMP_Uns32 len );
+
+} // namespace PNG_Support
+
+#endif	// __PNG_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp
new file mode 100644
index 0000000..f8ab565
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp
@@ -0,0 +1,615 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "source/EndianUtils.hpp"
+#include "source/XIO.hpp"
+
+#include <string.h>
+
+// =================================================================================================
+/// \file PSIR_FileWriter.cpp
+/// \brief Implementation of the file-based or read-write form of PSIR_Manager.
+// =================================================================================================
+
+// =================================================================================================
+// IsMetadataImgRsrc
+// =================
+
+static inline bool IsMetadataImgRsrc ( XMP_Uns16 id )
+{
+	if ( id == 0 ) return false;
+
+	int i;
+	for ( i = 0; id < kPSIR_MetadataIDs[i]; ++i ) {}
+	if ( id == kPSIR_MetadataIDs[i] ) return true;
+	return false;
+
+}	// IsMetadataImgRsrc
+
+// =================================================================================================
+// PSIR_FileWriter::DeleteExistingInfo
+// ===================================
+//
+// Delete all existing info about image resources.
+
+void PSIR_FileWriter::DeleteExistingInfo()
+{
+	XMP_Assert ( ! (this->memParsed && this->fileParsed) );
+
+	if ( this->memParsed ) {
+		if ( this->ownedContent ) free ( this->memContent );
+	} else if ( this->fileParsed ) {
+		InternalRsrcMap::iterator irPos = this->imgRsrcs.begin();
+		InternalRsrcMap::iterator irEnd = this->imgRsrcs.end();
+		for ( ; irPos != irEnd; ++irPos ) irPos->second.changed = true;	// Fool the InternalRsrcInfo destructor.
+	}
+
+	this->imgRsrcs.clear();
+
+	this->memContent = 0;
+	this->memLength  = 0;
+
+	this->changed = false;
+	this->legacyDeleted = false;
+	this->memParsed = false;
+	this->fileParsed = false;
+	this->ownedContent = false;
+
+}	// PSIR_FileWriter::DeleteExistingInfo
+
+// =================================================================================================
+// PSIR_FileWriter::~PSIR_FileWriter
+// =================================
+
+PSIR_FileWriter::~PSIR_FileWriter()
+{
+	XMP_Assert ( ! (this->memParsed && this->fileParsed) );
+
+	if ( this->ownedContent ) {
+		XMP_Assert ( this->memContent != 0 );
+		free ( this->memContent );
+	}
+
+}	// PSIR_FileWriter::~PSIR_FileWriter
+
+// =================================================================================================
+// PSIR_FileWriter::GetImgRsrc
+// ===========================
+
+bool PSIR_FileWriter::GetImgRsrc ( XMP_Uns16 id, ImgRsrcInfo* info ) const
+{
+	InternalRsrcMap::const_iterator rsrcPos = this->imgRsrcs.find ( id );
+	if ( rsrcPos == this->imgRsrcs.end() ) return false;
+
+	const InternalRsrcInfo & rsrcInfo = rsrcPos->second;
+
+	if ( info != 0 ) {
+		info->id = rsrcInfo.id;
+		info->dataLen = rsrcInfo.dataLen;
+		info->dataPtr = rsrcInfo.dataPtr;
+		info->origOffset = rsrcInfo.origOffset;
+	}
+
+	return true;
+
+}	// PSIR_FileWriter::GetImgRsrc
+
+// =================================================================================================
+// PSIR_FileWriter::SetImgRsrc
+// ===========================
+
+void PSIR_FileWriter::SetImgRsrc ( XMP_Uns16 id, const void* clientPtr, XMP_Uns32 length )
+{
+	InternalRsrcInfo* rsrcPtr = 0;
+	InternalRsrcMap::iterator rsrcPos = this->imgRsrcs.find ( id );
+
+	if ( rsrcPos == this->imgRsrcs.end() ) {
+
+		// This resource is not yet in the map, create the map entry.
+		InternalRsrcMap::value_type mapValue ( id, InternalRsrcInfo ( id, length, this->fileParsed ) );
+		rsrcPos = this->imgRsrcs.insert ( rsrcPos, mapValue );
+		rsrcPtr = &rsrcPos->second;
+
+	} else {
+
+		rsrcPtr = &rsrcPos->second;
+
+		// The resource already exists, make sure the value is actually changing.
+		if ( (length == rsrcPtr->dataLen) &&
+			 (memcmp ( rsrcPtr->dataPtr, clientPtr, length ) == 0) ) {
+			return;
+		}
+
+		rsrcPtr->FreeData();		// Release any existing data allocation.
+		rsrcPtr->dataLen = length;	// And this might be changing.
+
+	}
+
+	rsrcPtr->changed = true;
+	rsrcPtr->dataPtr = malloc ( length );
+	if ( rsrcPtr->dataPtr == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+	memcpy ( rsrcPtr->dataPtr, clientPtr, length );	// AUDIT: Safe, malloc'ed length bytes above.
+
+	this->changed = true;
+
+}	// PSIR_FileWriter::SetImgRsrc
+
+// =================================================================================================
+// PSIR_FileWriter::DeleteImgRsrc
+// ==============================
+
+void PSIR_FileWriter::DeleteImgRsrc ( XMP_Uns16 id )
+{
+	InternalRsrcMap::iterator rsrcPos = this->imgRsrcs.find ( id );
+	if ( rsrcPos == this->imgRsrcs.end() ) return;	// Nothing to delete.
+
+	this->imgRsrcs.erase ( id );
+	this->changed = true;
+	if ( id != kPSIR_XMP ) this->legacyDeleted = true;
+
+}	// PSIR_FileWriter::DeleteImgRsrc
+
+// =================================================================================================
+// PSIR_FileWriter::IsLegacyChanged
+// ================================
+
+bool PSIR_FileWriter::IsLegacyChanged()
+{
+
+	if ( ! this->changed ) return false;
+	if ( this->legacyDeleted ) return true;
+
+	InternalRsrcMap::iterator irPos = this->imgRsrcs.begin();
+	InternalRsrcMap::iterator irEnd = this->imgRsrcs.end();
+
+	for ( ; irPos != irEnd; ++irPos ) {
+		const InternalRsrcInfo & rsrcInfo = irPos->second;
+		if ( rsrcInfo.changed && (rsrcInfo.id != kPSIR_XMP) ) return true;
+	}
+
+	return false;	// Can get here if the XMP is the only thing changed.
+
+}	// PSIR_FileWriter::IsLegacyChanged
+
+// =================================================================================================
+// PSIR_FileWriter::ParseMemoryResources
+// =====================================
+
+void PSIR_FileWriter::ParseMemoryResources ( const void* data, XMP_Uns32 length, bool copyData /* = true */ )
+{
+	this->DeleteExistingInfo();
+	this->memParsed = true;
+	if ( length == 0 ) return;
+
+	// Allocate space for the full in-memory data and copy it.
+
+	if ( ! copyData ) {
+		this->memContent = (XMP_Uns8*) data;
+		XMP_Assert ( ! this->ownedContent );
+	} else {
+		if ( length > 100*1024*1024 ) XMP_Throw ( "Outrageous length for memory-based PSIR", kXMPErr_BadPSIR );
+		this->memContent = (XMP_Uns8*) malloc ( length );
+		if ( this->memContent == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( this->memContent, data, length );	// AUDIT: Safe, malloc'ed length bytes above.
+		this->ownedContent = true;
+	}
+	this->memLength = length;
+
+	// Capture the info for all of the resources. We're using a map keyed by ID, so only one
+	// resource of each ID is recognized. Redundant resources are not legit, but have been seen in
+	// the field. In particular, one case has been seen of a duplicate IIM block with one empty.
+	// In general we keep the first seen copy to be compatible with Photoshop. A later non-empty
+	// copy will be taken though if the current one is empty.
+	
+	// ! Don't use map[id] to lookup, that creates a default entry if none exists!
+
+	XMP_Uns8* psirPtr   = this->memContent;
+	XMP_Uns8* psirEnd   = psirPtr + length;
+	XMP_Uns8* psirLimit = psirEnd - kMinImgRsrcSize;
+
+	while ( psirPtr <= psirLimit ) {
+
+		XMP_Uns8* origin = psirPtr;	// The beginning of this resource.
+		XMP_Uns32 type = GetUns32BE(psirPtr);
+		XMP_Uns16 id = GetUns16BE(psirPtr+4);
+		psirPtr += 6;	// Advance to the resource name.
+
+		XMP_Uns8* namePtr = psirPtr;
+		XMP_Uns16 nameLen = namePtr[0];			// ! The length for the Pascal string, w/ room for "+2".
+		psirPtr += ((nameLen + 2) & 0xFFFE);	// ! Round up to an even offset. Yes, +2!
+
+		if ( psirPtr > psirEnd-4 ) break;	// Bad image resource. Throw instead?
+
+		XMP_Uns32 dataLen = GetUns32BE(psirPtr);
+		psirPtr += 4;	// Advance to the resource data.
+
+		XMP_Uns32 dataOffset = (XMP_Uns32) ( psirPtr - this->memContent );
+		XMP_Uns8* nextRsrc   = psirPtr + ((dataLen + 1) & 0xFFFFFFFEUL);	// ! Round up to an even offset.
+
+		if ( (dataLen > length) || (psirPtr > psirEnd-dataLen) ) break;	// Bad image resource. Throw instead?
+
+		if ( type != k8BIM ) {
+
+			XMP_Uns32 rsrcOffset = XMP_Uns32( origin - this->memContent );
+			XMP_Uns32 rsrcLength = XMP_Uns32( nextRsrc - origin );	// Includes trailing pad.
+			XMP_Assert ( (rsrcLength & 1) == 0 );
+			this->otherRsrcs.push_back ( OtherRsrcInfo ( rsrcOffset, rsrcLength ) );
+
+		} else {
+
+			InternalRsrcInfo newInfo ( id, dataLen, kIsMemoryBased );
+			newInfo.dataPtr = psirPtr;
+			newInfo.origOffset = dataOffset;
+			if ( nameLen != 0 ) newInfo.rsrcName = namePtr;
+
+			InternalRsrcMap::iterator rsrcPos = this->imgRsrcs.find ( id );
+			if ( rsrcPos == this->imgRsrcs.end() ) {
+				this->imgRsrcs.insert ( rsrcPos, InternalRsrcMap::value_type ( id, newInfo ) );
+			} else if ( (rsrcPos->second.dataLen == 0) && (newInfo.dataLen != 0) ) {
+				rsrcPos->second = newInfo;
+			}
+
+		}
+
+		psirPtr = nextRsrc;
+
+	}
+
+}	// PSIR_FileWriter::ParseMemoryResources
+
+// =================================================================================================
+// PSIR_FileWriter::ParseFileResources
+// ===================================
+
+void PSIR_FileWriter::ParseFileResources ( XMP_IO* fileRef, XMP_Uns32 length )
+{
+	// Parse the image resource block. We're using a map keyed by ID, so only one resource of each
+	// ID is recognized. Redundant resources are not legit, but have been seen in the field. In
+	// particular, one case has been seen of a duplicate IIM block with one empty. In general we
+	// keep the first seen copy to be compatible with Photoshop. A later non-empty copy will be
+	// taken though if the current one is empty.
+	
+	// ! Don't use map[id] to lookup, that creates a default entry if none exists!
+	
+	// PSIR layout:
+	//	- Uns32 type, usually '8BIM'
+	//	- Uns16 ID
+	//	- PString name
+	//	- Uns8 optional pad for even alignment
+	//	- Uns32 data size
+	//	- data
+	//	- Uns8 optional pad for even alignment
+
+	static const size_t kMinPSIRSize = 12;	// 4+2+1+1+4
+	
+	this->DeleteExistingInfo();
+	this->fileParsed = true;
+	if ( length == 0 ) return;
+
+	XMP_Int64 psirOrigin = fileRef->Offset();	// Need this to determine the resource data offsets.
+	XMP_Int64 fileEnd = psirOrigin + length;
+
+	char nameBuffer [260];	// The name is a PString, at 1+255+1 including length and pad.
+
+	while ( fileRef->Offset() < fileEnd ) {
+
+		if ( ! XIO::CheckFileSpace ( fileRef, kMinPSIRSize ) ) break;	// Bad image resource.
+
+		XMP_Int64 thisRsrcPos = fileRef->Offset();
+
+		XMP_Uns32 type = XIO::ReadUns32_BE ( fileRef );
+		XMP_Uns16 id   = XIO::ReadUns16_BE ( fileRef );
+
+		XMP_Uns8 nameLen = XIO::ReadUns8 ( fileRef );	// ! The length for the Pascal string.
+		XMP_Uns16 paddedLen = (nameLen + 2) & 0xFFFE;	// ! Round up to an even total. Yes, +2!
+		if ( ! XIO::CheckFileSpace ( fileRef, paddedLen+4 ) ) break;	// Bad image resource.
+
+		nameBuffer[0] = nameLen;
+		fileRef->ReadAll ( &nameBuffer[1], paddedLen-1 );	// Include the pad byte, present for zero nameLen.
+
+		XMP_Uns32 dataLen   = XIO::ReadUns32_BE ( fileRef );
+		XMP_Uns32 dataTotal = ((dataLen + 1) & 0xFFFFFFFEUL);	// Round up to an even total.
+		// See bug https://bugs.freedesktop.org/show_bug.cgi?id=105204
+		// If dataLen is 0xffffffff, then dataTotal might be 0
+		// and therefor make the CheckFileSpace test pass.
+		if (dataTotal < dataLen) {
+			break;
+		}
+		if ( ! XIO::CheckFileSpace ( fileRef, dataTotal ) ) break;	// Bad image resource.
+
+		XMP_Int64 thisDataPos = fileRef->Offset();
+		XMP_Int64 nextRsrcPos = thisDataPos + dataTotal;
+
+		if ( type != k8BIM ) {
+			XMP_Uns32 fullRsrcLen = (XMP_Uns32) (nextRsrcPos - thisRsrcPos);
+			this->otherRsrcs.push_back ( OtherRsrcInfo ( (XMP_Uns32)thisRsrcPos, fullRsrcLen ) );
+			fileRef->Seek ( nextRsrcPos, kXMP_SeekFromStart );
+			continue;
+		}
+
+		InternalRsrcInfo newInfo ( id, dataLen, kIsFileBased );
+		InternalRsrcMap::iterator rsrcPos = this->imgRsrcs.find ( id );
+		if ( rsrcPos == this->imgRsrcs.end() ) {
+			rsrcPos = this->imgRsrcs.insert ( rsrcPos, InternalRsrcMap::value_type ( id, newInfo ) );
+		} else if ( (rsrcPos->second.dataLen == 0) && (newInfo.dataLen != 0) ) {
+			rsrcPos->second = newInfo;
+		} else {
+			fileRef->Seek ( nextRsrcPos, kXMP_SeekFromStart );
+			continue;
+		}
+		InternalRsrcInfo* rsrcPtr = &rsrcPos->second;
+
+		rsrcPtr->origOffset = (XMP_Uns32)thisDataPos;
+
+		if ( nameLen > 0 ) {
+			rsrcPtr->rsrcName = (XMP_Uns8*) malloc ( paddedLen );
+			if ( rsrcPtr->rsrcName == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+			memcpy ( (void*)rsrcPtr->rsrcName, nameBuffer, paddedLen );	// AUDIT: Safe, allocated enough bytes above.
+		}
+
+		if ( ! IsMetadataImgRsrc ( id ) ) {
+			fileRef->Seek ( nextRsrcPos, kXMP_SeekFromStart );
+			continue;
+		}
+
+		rsrcPtr->dataPtr = malloc ( dataTotal );	// ! Allocate after the IsMetadataImgRsrc check.
+		if ( rsrcPtr->dataPtr == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		fileRef->ReadAll ( (void*)rsrcPtr->dataPtr, dataTotal );
+
+	}
+
+	#if 0
+	{
+		printf ( "\nPSIR_FileWriter::ParseFileResources, count = %d\n", this->imgRsrcs.size() );
+		InternalRsrcMap::iterator irPos = this->imgRsrcs.begin();
+		InternalRsrcMap::iterator irEnd = this->imgRsrcs.end();
+		for ( ; irPos != irEnd; ++irPos ) {
+			InternalRsrcInfo& thisRsrc = irPos->second;
+			printf ( "  #%d, dataLen %d, origOffset %d (0x%X)%s\n",
+					 thisRsrc.id, thisRsrc.dataLen, thisRsrc.origOffset, thisRsrc.origOffset,
+					 (thisRsrc.changed ? ", changed" : "") );
+		}
+	}
+	#endif
+
+}	// PSIR_FileWriter::ParseFileResources
+
+// =================================================================================================
+// PSIR_FileWriter::UpdateMemoryResources
+// ======================================
+
+XMP_Uns32 PSIR_FileWriter::UpdateMemoryResources ( void** dataPtr )
+{
+	if ( this->fileParsed ) XMP_Throw ( "Not memory based", kXMPErr_EnforceFailure );
+
+	// Compute the size and allocate the new image resource block.
+
+	XMP_Uns32 newLength = 0;
+
+	InternalRsrcMap::iterator irPos = this->imgRsrcs.begin();
+	InternalRsrcMap::iterator irEnd = this->imgRsrcs.end();
+
+	for ( ; irPos != irEnd; ++irPos ) {	// Add in the lengths for the 8BIM resources.
+		const InternalRsrcInfo & rsrcInfo = irPos->second;
+		newLength += 10;
+		newLength += ((rsrcInfo.dataLen + 1) & 0xFFFFFFFEUL);
+		if ( rsrcInfo.rsrcName == 0 ) {
+			newLength += 2;
+		} else {
+			XMP_Uns32 nameLen = rsrcInfo.rsrcName[0];
+			newLength += ((nameLen + 2) & 0xFFFFFFFEUL);	// ! Yes, +2 for the length and rounding.
+		}
+	}
+
+	for ( size_t i = 0; i < this->otherRsrcs.size(); ++i ) {	// Add in the non-8BIM resources.
+		newLength += this->otherRsrcs[i].rsrcLength;
+	}
+
+	XMP_Uns8* newContent = newLength ? (XMP_Uns8*) malloc ( newLength ) : NULL;
+	if ( newContent == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+
+	// Fill in the new image resource block.
+
+	XMP_Uns8* rsrcPtr = newContent;
+
+	for ( irPos = this->imgRsrcs.begin(); irPos != irEnd; ++irPos ) {	// Do the 8BIM resources.
+
+		const InternalRsrcInfo & rsrcInfo = irPos->second;
+
+		PutUns32BE ( k8BIM, rsrcPtr );
+		rsrcPtr += 4;
+		PutUns16BE ( rsrcInfo.id, rsrcPtr );
+		rsrcPtr += 2;
+
+		if ( rsrcInfo.rsrcName == 0 ) {
+			PutUns16BE ( 0, rsrcPtr );
+			rsrcPtr += 2;
+		} else {
+			XMP_Uns32 nameLen = rsrcInfo.rsrcName[0];
+			XMP_Assert ( nameLen > 0 );
+			if ( (nameLen+1) > (newLength - (rsrcPtr - newContent)) ) {
+				XMP_Throw ( "Buffer overrun", kXMPErr_InternalFailure );
+			}
+			memcpy ( rsrcPtr, rsrcInfo.rsrcName, nameLen+1 );	// AUDIT: Protected by the above check.
+			rsrcPtr += nameLen+1;
+			if ( (nameLen & 1) == 0 ) {
+				*rsrcPtr = 0;	// Round to an even total.
+				++rsrcPtr;
+			}
+		}
+
+		PutUns32BE ( rsrcInfo.dataLen, rsrcPtr );
+		rsrcPtr += 4;
+		if ( rsrcInfo.dataLen > (newLength - (rsrcPtr - newContent)) ) {
+			XMP_Throw ( "Buffer overrun", kXMPErr_InternalFailure );
+		}
+		memcpy ( rsrcPtr, rsrcInfo.dataPtr, rsrcInfo.dataLen );	// AUDIT: Protected by the above check.
+		rsrcPtr += rsrcInfo.dataLen;
+		if ( (rsrcInfo.dataLen & 1) != 0 ) {	// Pad to an even length if necessary.
+			*rsrcPtr = 0;
+			++rsrcPtr;
+		}
+
+	}
+
+	for ( size_t i = 0; i < this->otherRsrcs.size(); ++i ) {	// Do the non-8BIM resources.
+		XMP_Uns8* srcPtr = this->memContent + this->otherRsrcs[i].rsrcOffset;
+		XMP_Uns32 srcLen = this->otherRsrcs[i].rsrcLength;
+		if ( srcLen > (newLength - (rsrcPtr - newContent)) ) {
+			XMP_Throw ( "Buffer overrun", kXMPErr_InternalFailure );
+		}
+		memcpy ( rsrcPtr, srcPtr, srcLen );	// AUDIT: Protected by the above check.
+		rsrcPtr += srcLen;	// No need to pad, included in the original resource length.
+	}
+
+	XMP_Assert ( rsrcPtr == (newContent + newLength) );
+
+	// Parse the rebuilt image resource block. This is the easiest way to reconstruct the map.
+
+	this->ParseMemoryResources ( newContent, newLength, false );
+	this->ownedContent = (newLength > 0);	// ! We really do own the new content, if not empty.
+
+	if ( dataPtr != 0 ) *dataPtr = newContent;
+	return newLength;
+
+}	// PSIR_FileWriter::UpdateMemoryResources
+
+// =================================================================================================
+// PSIR_FileWriter::UpdateFileResources
+// ====================================
+
+XMP_Uns32 PSIR_FileWriter::UpdateFileResources ( XMP_IO* sourceRef, XMP_IO* destRef,
+												 XMP_AbortProc abortProc, void * abortArg,
+												 XMP_ProgressTracker* progressTracker )
+{
+	const XMP_Uns32 zero32 = 0;
+	const bool checkAbort = (abortProc != 0);
+
+	struct RsrcHeader {
+		XMP_Uns32 type;
+		XMP_Uns16 id;
+	};
+	XMP_Assert ( (offsetof(RsrcHeader,type) == 0) && (offsetof(RsrcHeader,id) == 4) );
+
+	if ( this->memParsed ) XMP_Throw ( "Not file based", kXMPErr_EnforceFailure );
+
+	InternalRsrcMap::const_iterator rsrcPos;
+	InternalRsrcMap::const_iterator rsrcEnd = this->imgRsrcs.end();
+
+	if ( progressTracker != 0 ) {
+
+		float totalLength = 8;
+		for ( rsrcPos = this->imgRsrcs.begin(); rsrcPos != rsrcEnd; ++rsrcPos ) {
+			 const InternalRsrcInfo& currRsrc = rsrcPos->second;
+			totalLength += (currRsrc.dataLen + 12);
+		}
+
+		size_t sizeOtherRsrc = this->otherRsrcs.size();
+		for ( size_t i = 0; i < sizeOtherRsrc; ++i ) { 
+			totalLength += this->otherRsrcs[i].rsrcLength;	
+		}
+
+		XMP_Assert ( progressTracker->WorkInProgress() );
+		progressTracker->AddTotalWork ( totalLength );
+
+	}
+
+	XMP_Uns32 destLength = 0;
+	XMP_Int64 destLenOffset = destRef->Offset();
+	destRef->Write ( &destLength, 4 );	// Write a placeholder for the new PSIR section length.
+
+	#if 0
+	{
+		printf ( "\nPSIR_FileWriter::UpdateFileResources, count = %d\n", this->imgRsrcs.size() );
+		InternalRsrcMap::iterator irPos = this->imgRsrcs.begin();
+		InternalRsrcMap::iterator irEnd = this->imgRsrcs.end();
+		for ( ; irPos != irEnd; ++irPos ) {
+			InternalRsrcInfo& thisRsrc = irPos->second;
+			printf ( "  #%d, dataLen %d, origOffset %d (0x%X)%s\n",
+					 thisRsrc.id, thisRsrc.dataLen, thisRsrc.origOffset, thisRsrc.origOffset,
+					 (thisRsrc.changed ? ", changed" : "") );
+		}
+	}
+	#endif
+
+	// First write all of the '8BIM' resources from the map. Use the internal data if present, else
+	// copy the data from the file.
+
+	RsrcHeader outHeader;
+	outHeader.type  = MakeUns32BE ( k8BIM );
+
+	// printf ( "\nPSIR_FileWriter::UpdateFileResources - 8BIM resources\n" );
+	for ( rsrcPos = this->imgRsrcs.begin(); rsrcPos != rsrcEnd; ++rsrcPos ) {
+
+		const InternalRsrcInfo& currRsrc = rsrcPos->second;
+
+		outHeader.id = MakeUns16BE ( currRsrc.id );
+		destRef->Write ( &outHeader, 6 );
+		destLength += 6;
+
+		if ( currRsrc.rsrcName == 0 ) {
+			destRef->Write ( &zero32, 2 );
+			destLength += 2;
+		} else {
+			XMP_Uns16 nameLen = currRsrc.rsrcName[0];	// ! Include room for +1.
+			XMP_Assert ( nameLen > 0 );
+			XMP_Uns16 paddedLen = (nameLen + 2) & 0xFFFE;	// ! Round up to an even total. Yes, +2!
+			destRef->Write ( currRsrc.rsrcName, paddedLen );
+			destLength += paddedLen;
+		}
+
+		XMP_Uns32 dataLen = MakeUns32BE ( currRsrc.dataLen );
+		destRef->Write ( &dataLen, 4 );
+		// printf ( "  #%d, offset %d (0x%X), dataLen %d\n", currRsrc.id, destLength, destLength, currRsrc.dataLen );
+
+		if ( currRsrc.dataPtr != 0 ) {
+			destRef->Write ( currRsrc.dataPtr, currRsrc.dataLen );
+		} else {
+			sourceRef->Seek ( currRsrc.origOffset, kXMP_SeekFromStart  );
+			XIO::Copy ( sourceRef, destRef, currRsrc.dataLen );
+		}
+
+		destLength += 4 + currRsrc.dataLen;
+
+		if ( (currRsrc.dataLen & 1) != 0 ) {
+			destRef->Write ( &zero32, 1 );	// ! Pad the data to an even length.
+			++destLength;
+		}
+
+	}
+
+	// Now write all of the non-8BIM resources. Copy the entire resource chunk from the source file.
+
+	// printf ( "\nPSIR_FileWriter::UpdateFileResources - other resources\n" );
+	for ( size_t i = 0; i < this->otherRsrcs.size(); ++i ) {
+		// printf ( "  offset %d (0x%X), length %d",
+		//		 this->otherRsrcs[i].rsrcOffset, this->otherRsrcs[i].rsrcOffset, this->otherRsrcs[i].rsrcLength );
+		sourceRef->Seek ( this->otherRsrcs[i].rsrcOffset, kXMP_SeekFromStart  );
+		XIO::Copy ( sourceRef, destRef, this->otherRsrcs[i].rsrcLength );
+		destLength += this->otherRsrcs[i].rsrcLength;	// Alignment padding is already included.
+	}
+
+	// Write the final PSIR section length, seek back to the end of the file, return the length.
+
+	// printf ( "\nPSIR_FileWriter::UpdateFileResources - final length %d (0x%X)\n", destLength, destLength );
+	destRef->Seek ( destLenOffset, kXMP_SeekFromStart  );
+	XMP_Uns32 outLen = MakeUns32BE ( destLength );
+	destRef->Write ( &outLen, 4 );
+	destRef->Seek ( 0, kXMP_SeekFromEnd  );
+
+	// *** Not rebuilding the internal map - turns out we never want it, why pay for the I/O.
+	// *** Should probably add an option for all of these cases, memory and file based.
+
+	return destLength;
+
+}	// PSIR_FileWriter::UpdateFileResources
diff --git a/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp b/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp
new file mode 100644
index 0000000..7432554
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp
@@ -0,0 +1,112 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "source/EndianUtils.hpp"
+#include "source/XIO.hpp"
+
+#include <string.h>
+
+// =================================================================================================
+/// \file PSIR_MemoryReader.cpp
+/// \brief Implementation of the memory-based read-only form of PSIR_Manager.
+// =================================================================================================
+
+// =================================================================================================
+// PSIR_MemoryReader::GetImgRsrc
+// =============================
+
+bool PSIR_MemoryReader::GetImgRsrc ( XMP_Uns16 id, ImgRsrcInfo* info ) const
+{
+	ImgRsrcMap::const_iterator rsrcPos = this->imgRsrcs.find ( id );
+	if ( rsrcPos == this->imgRsrcs.end() ) return false;
+	
+	if ( info != 0 ) *info = rsrcPos->second;
+	return true;
+	
+}	// PSIR_MemoryReader::GetImgRsrc
+
+// =================================================================================================
+// PSIR_MemoryReader::ParseMemoryResources
+// =======================================
+
+void PSIR_MemoryReader::ParseMemoryResources ( const void* data, XMP_Uns32 length, bool copyData /* = true */ )
+{
+	// Get rid of any existing image resources.
+	
+	if ( this->ownedContent ) free ( this->psirContent );
+	this->ownedContent = false;
+	this->psirContent  = 0;
+	this->psirLength   = 0;
+	this->imgRsrcs.clear();
+	
+	if ( length == 0 ) return;
+	
+	// Allocate space for the full in-memory data and copy it.
+	
+	if ( ! copyData ) {
+		this->psirContent = (XMP_Uns8*) data;
+		XMP_Assert ( ! this->ownedContent );
+	} else {
+		if ( length > 100*1024*1024 ) XMP_Throw ( "Outrageous length for memory-based PSIR", kXMPErr_BadPSIR );
+		this->psirContent = (XMP_Uns8*) malloc(length);
+		if ( this->psirContent == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( this->psirContent, data, length );	// AUDIT: Safe, malloc'ed length bytes above.
+		this->ownedContent = true;
+	}
+
+	this->psirLength = length;
+	
+	// Capture the info for all of the resources. We're using a map keyed by ID, so only one
+	// resource of each ID is recognized. Redundant resources are not legit, but have been seen in
+	// the field. In particular, one case has been seen of a duplicate IIM block with one empty.
+	// In general we keep the first seen copy to be compatible with Photoshop. A later non-empty
+	// copy will be taken though if the current one is empty.
+	
+	// ! Don't use map[id] to lookup, that creates a default entry if none exists!
+	
+	XMP_Uns8* psirPtr   = this->psirContent;
+	XMP_Uns8* psirEnd   = psirPtr + length;
+	XMP_Uns8* psirLimit = psirEnd - kMinImgRsrcSize;
+	
+	while ( psirPtr <= psirLimit ) {
+	
+		XMP_Uns32 type = GetUns32BE(psirPtr);
+		XMP_Uns16 id = GetUns16BE(psirPtr+4);
+		psirPtr += 6;	// Advance to the resource name.
+
+		XMP_Uns16 nameLen = psirPtr[0];			// ! The length for the Pascal string, w/ room for "+2".
+		psirPtr += ((nameLen + 2) & 0xFFFE);	// ! Round up to an even offset. Yes, +2!
+		
+		if ( psirPtr > psirEnd-4 ) break;	// Bad image resource. Throw instead?
+
+		XMP_Uns32 dataLen = GetUns32BE(psirPtr);
+		psirPtr += 4;	// Advance to the resource data.
+		XMP_Uns32 psirOffset = (XMP_Uns32) (psirPtr - this->psirContent);
+		
+		if ( (dataLen > length) || (psirPtr > psirEnd-dataLen) ) break;	// Bad image resource. Throw instead?
+		
+		if ( type == k8BIM ) {	// For read-only usage we ignore everything other than '8BIM' resources.
+			ImgRsrcInfo newInfo ( id, dataLen, psirPtr, psirOffset );
+			ImgRsrcMap::iterator rsrcPos = this->imgRsrcs.find ( id );
+			if ( rsrcPos == this->imgRsrcs.end() ) {
+				this->imgRsrcs.insert ( rsrcPos, ImgRsrcMap::value_type ( id, newInfo ) );
+			} else if ( (rsrcPos->second.dataLen == 0) && (newInfo.dataLen != 0) ) {
+				rsrcPos->second = newInfo;
+			}
+		}
+		
+		psirPtr += ((dataLen + 1) & 0xFFFFFFFEUL);	// ! Round up to an even offset.
+	
+	}
+
+}	// PSIR_MemoryReader::ParseMemoryResources
diff --git a/XMPFiles/source/FormatSupport/PSIR_Support.hpp b/XMPFiles/source/FormatSupport/PSIR_Support.hpp
new file mode 100644
index 0000000..bd231b3
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PSIR_Support.hpp
@@ -0,0 +1,329 @@
+#ifndef __PSIR_Support_hpp__
+#define __PSIR_Support_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "source/EndianUtils.hpp"
+#include "source/XMP_ProgressTracker.hpp"
+
+#include <map>
+
+// =================================================================================================
+/// \file PSIR_Support.hpp
+/// \brief XMPFiles support for Photoshop image resources.
+///
+/// This header provides Photoshop image resource (PSIR) support specific to the needs of XMPFiles.
+/// This is not intended for general purpose PSIR processing. PSIR_Manager is an abstract base
+/// class with 2 concrete derived classes, PSIR_MemoryReader and PSIR_FileWriter.
+///
+/// PSIR_MemoryReader provides read-only support for PSIR streams that are small enough to be kept
+/// entirely in memory. This allows optimizations to reduce heap usage and processing code. It is
+/// sufficient for browsing access to the image resources (mainly the IPTC) in JPEG files. Think of
+/// PSIR_MemoryReader as "memory-based AND read-only".
+///
+/// PSIR_FileWriter is for cases where updates are needed or the PSIR stream is too large to be kept
+/// entirely in memory. Think of PSIR_FileWriter as "file-based OR read-write".
+///
+/// The needs of XMPFiles are well defined metadata access. Only a few image resources are handled.
+/// This is the case for all of the derived classes, even though the memory based ones happen to
+/// have all of the image resources in memory. Being "handled" means being in the image resource
+/// map used by GetImgRsrc. The handled image resources are:
+/// \li 1028 - IPTC
+/// \li 1034 - Copyrighted flag
+/// \li 1035 - Copyright information URL
+/// \li 1058 - Exif metadata
+/// \li 1060 - XMP
+/// \li 1061 - IPTC digest
+///
+/// \note These classes are for use only when directly compiled and linked. They should not be
+/// packaged in a DLL by themselves. They do not provide any form of C++ ABI protection.
+// =================================================================================================
+
+
+// These aren't inside PSIR_Manager because the static array can't be initialized there.
+
+enum {
+	k8BIM = 0x3842494DUL,		// The 4 ASCII characters '8BIM'.
+	kMinImgRsrcSize = 4+2+2+4	// The minimum size for an image resource.
+};
+
+enum {
+	kPSIR_IPTC           = 1028,
+	kPSIR_CopyrightFlag  = 1034,
+	kPSIR_CopyrightURL   = 1035,
+	kPSIR_Exif           = 1058,
+	kPSIR_XMP            = 1060,
+	kPSIR_IPTCDigest     = 1061
+};
+
+enum { kPSIR_MetadataCount = 6 };
+static const XMP_Uns16 kPSIR_MetadataIDs[] =	// ! Must be in descending order with 0 sentinel.
+	{ kPSIR_IPTCDigest, kPSIR_XMP, kPSIR_Exif, kPSIR_CopyrightURL, kPSIR_CopyrightFlag, kPSIR_IPTC, 0 };
+
+// =================================================================================================
+// =================================================================================================
+
+// NOTE: Although Photoshop image resources have a type and ID, for metadatya we only care about
+// those of type "8BIM". Resources of other types are preserved in files, but can't be individually
+// accessed through the PSIR_Manager API.
+
+// =================================================================================================
+// PSIR_Manager
+// ============
+
+class PSIR_Manager {	// The abstract base class.
+public:
+
+	// ---------------------------------------------------------------------------------------------
+	// Types and constants
+
+	struct ImgRsrcInfo {
+		XMP_Uns16   id;
+		XMP_Uns32   dataLen;
+		const void* dataPtr;	// ! The data is read-only!
+		XMP_Uns32   origOffset;	// The offset (at parse time) of the resource data.
+		ImgRsrcInfo() : id(0), dataLen(0), dataPtr(0), origOffset(0) {};
+		ImgRsrcInfo ( XMP_Uns16 _id, XMP_Uns32 _dataLen, void* _dataPtr, XMP_Uns32 _origOffset )
+			: id(_id), dataLen(_dataLen), dataPtr(_dataPtr), origOffset(_origOffset) {};
+	};
+
+	// The origOffset is the absolute file offset for file parses, the memory block offset for
+	// memory parses. It is the offset of the resource data portion, not the overall resource.
+
+	// ---------------------------------------------------------------------------------------------
+	// Get the information about a "handled" image resource. Returns false if the image resource is
+	// not handled, even if it was present in the parsed input.
+
+	virtual bool GetImgRsrc ( XMP_Uns16 id, ImgRsrcInfo* info ) const = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// Set the value for an image resource. It can be any resource, even one not originally handled.
+
+	virtual void SetImgRsrc ( XMP_Uns16 id, const void* dataPtr, XMP_Uns32 length ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// Delete an image resource. Does nothing if the image resource does not exist.
+
+	virtual void DeleteImgRsrc ( XMP_Uns16 id ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// Determine if the image resources are changed.
+
+	virtual bool IsChanged() = 0;
+	virtual bool IsLegacyChanged() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+
+	virtual void ParseMemoryResources ( const void* data, XMP_Uns32 length, bool copyData = true ) = 0;
+	virtual void ParseFileResources   ( XMP_IO* fileRef, XMP_Uns32 length ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// Update the image resources to reflect the changed values. Both \c UpdateMemoryResources and
+	// \c UpdateFileResources return the new size of the image resource block. The dataPtr returned
+	// by \c UpdateMemoryResources must be treated as read only. It exists until the PSIR_Manager
+	// destructor is called. UpdateMemoryResources can be used on a read-only instance to get the
+	// raw data block info.
+
+	virtual XMP_Uns32 UpdateMemoryResources ( void** dataPtr ) = 0;
+	virtual XMP_Uns32 UpdateFileResources   ( XMP_IO* sourceRef, XMP_IO* destRef,
+											  XMP_AbortProc abortProc, void * abortArg,
+											  XMP_ProgressTracker* progressTracker ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+
+	virtual ~PSIR_Manager() {};
+
+protected:
+
+	PSIR_Manager() {};
+
+};	// PSIR_Manager
+
+
+// =================================================================================================
+// =================================================================================================
+
+
+// =================================================================================================
+// PSIR_MemoryReader
+// =================
+
+class PSIR_MemoryReader : public PSIR_Manager {	// The leaf class for memory-based read-only access.
+public:
+
+	bool GetImgRsrc ( XMP_Uns16 id, ImgRsrcInfo* info ) const;
+
+	void SetImgRsrc ( XMP_Uns16 id, const void* dataPtr, XMP_Uns32 length ) { NotAppropriate(); };
+
+	void DeleteImgRsrc ( XMP_Uns16 id ) { NotAppropriate(); };
+
+	bool IsChanged() { return false; };
+	bool IsLegacyChanged() { return false; };
+
+	void ParseMemoryResources ( const void* data, XMP_Uns32 length, bool copyData = true );
+	void ParseFileResources   ( XMP_IO* file, XMP_Uns32 length ) { NotAppropriate(); };
+
+	XMP_Uns32 UpdateMemoryResources ( void** dataPtr ) { if ( dataPtr != 0 ) *dataPtr = psirContent; return psirLength; };
+	XMP_Uns32 UpdateFileResources ( XMP_IO* sourceRef, XMP_IO* destRef,
+									XMP_AbortProc abortProc, void * abortArg,
+									XMP_ProgressTracker* progressTracker ) { NotAppropriate(); return 0; };
+
+	PSIR_MemoryReader() : ownedContent(false), psirLength(0), psirContent(0) {};
+
+	virtual ~PSIR_MemoryReader() { if ( this->ownedContent ) free ( this->psirContent ); };
+
+private:
+
+	// Memory usage notes: PSIR_MemoryReader is for memory-based read-only usage (both apply). There
+	// is no need to ever allocate separate blocks of memory, everything is used directly from the
+	// PSIR stream.
+
+	bool ownedContent;
+
+	XMP_Uns32 psirLength;
+	XMP_Uns8* psirContent;
+
+	typedef std::map<XMP_Uns16,ImgRsrcInfo>  ImgRsrcMap;
+
+	ImgRsrcMap imgRsrcs;
+
+	static inline void NotAppropriate() { XMP_Throw ( "Not appropriate for PSIR_Reader", kXMPErr_InternalFailure ); };
+
+};	// PSIR_MemoryReader
+
+
+// =================================================================================================
+// =================================================================================================
+
+
+// =================================================================================================
+// PSIR_FileWriter
+// ===============
+
+class PSIR_FileWriter : public PSIR_Manager {	// The leaf class for file-based read-write access.
+public:
+
+	bool GetImgRsrc ( XMP_Uns16 id, ImgRsrcInfo* info ) const;
+
+	void SetImgRsrc ( XMP_Uns16 id, const void* dataPtr, XMP_Uns32 length );
+
+	void DeleteImgRsrc ( XMP_Uns16 id );
+
+	bool IsChanged() { return this->changed; };
+
+	bool IsLegacyChanged();
+
+	void ParseMemoryResources ( const void* data, XMP_Uns32 length, bool copyData = true );
+	void ParseFileResources   ( XMP_IO* file, XMP_Uns32 length );
+
+	XMP_Uns32 UpdateMemoryResources ( void** dataPtr );
+	XMP_Uns32 UpdateFileResources   ( XMP_IO* sourceRef, XMP_IO* destRef,
+									  XMP_AbortProc abortProc, void * abortArg,
+									  XMP_ProgressTracker* progressTracker );
+
+	PSIR_FileWriter() : changed(false), legacyDeleted(false), memParsed(false), fileParsed(false),
+						ownedContent(false), memLength(0), memContent(0) {};
+
+	virtual ~PSIR_FileWriter();
+
+	// Memory usage notes: PSIR_FileWriter is for file-based OR read/write usage. For memory-based
+	// streams the dataPtr and rsrcName are initially into the stream. The dataPtr becomes a
+	// separate allocation when SetImgRsrc is called, the rsrcName stays into the original stream.
+	// For file-based streams the dataPtr and rsrcName are always a separate allocation. Again,
+	// the dataPtr changes when SetImgRsrc is called, the rsrcName stays unchanged.
+
+	// ! The working data values are always big endian, no matter where stored. It is the client's
+	// ! responsibility to flip them as necessary.
+
+	static const bool kIsFileBased   = true;	// For use in the InternalRsrcInfo constructor.
+	static const bool kIsMemoryBased = false;
+
+	struct InternalRsrcInfo {
+	public:
+
+		bool      changed;
+		bool      fileBased;
+		XMP_Uns16 id;
+		XMP_Uns32 dataLen;
+		void*     dataPtr;		// ! Null if the value is not captured!
+		XMP_Uns32 origOffset;	// The offset (at parse time) of the resource data.
+		XMP_Uns8* rsrcName;		// ! A Pascal string, leading length byte, no nul terminator!
+
+		inline void FreeData() {
+			if ( this->fileBased || this->changed ) {
+				if ( this->dataPtr != 0 ) { free ( this->dataPtr ); this->dataPtr = 0; }
+			}
+		}
+
+		inline void FreeName() {
+			if ( this->fileBased && (this->rsrcName != 0) ) {
+				free ( this->rsrcName );
+				this->rsrcName = 0;
+			}
+		}
+
+		InternalRsrcInfo ( XMP_Uns16 _id, XMP_Uns32 _dataLen, bool _fileBased )
+			: changed(false), fileBased(_fileBased), id(_id), dataLen(_dataLen), dataPtr(0),
+			  origOffset(0), rsrcName(0) {};
+		~InternalRsrcInfo() { this->FreeData(); this->FreeName(); };
+
+		void operator= ( const InternalRsrcInfo & in )
+		{
+			// ! Gag! Transfer ownership of the dataPtr and rsrcName!
+			this->FreeData();
+			memcpy ( this, &in, sizeof(*this) );	// AUDIT: Use of sizeof(InternalRsrcInfo) is safe.
+			*((void**)&in.dataPtr) = 0;		// The pointer is now owned by "this".
+			*((void**)&in.rsrcName) = 0;	// The pointer is now owned by "this".
+		};
+
+	private:
+
+		InternalRsrcInfo()	// Hidden on purpose, fileBased must be properly set.
+			: changed(false), fileBased(false), id(0), dataLen(0), dataPtr(0), origOffset(0), rsrcName(0) {};
+
+	};
+
+	// The origOffset is the absolute file offset for file parses, the memory block offset for
+	// memory parses. It is the offset of the resource data portion, not the overall resource.
+
+private:
+
+	bool changed, legacyDeleted;
+	bool memParsed, fileParsed;
+	bool ownedContent;
+
+	XMP_Uns32 memLength;
+	XMP_Uns8* memContent;
+
+	typedef std::map<XMP_Uns16,InternalRsrcInfo>  InternalRsrcMap;
+	InternalRsrcMap imgRsrcs;
+
+	struct OtherRsrcInfo {		// For the resources of types other than "8BIM".
+		XMP_Uns32 rsrcOffset;	// The offset of the resource origin, the type field.
+		XMP_Uns32 rsrcLength;	// The full length of the resource, offset to the next resource.
+		OtherRsrcInfo() : rsrcOffset(0), rsrcLength(0) {};
+		OtherRsrcInfo ( XMP_Uns32 _rsrcOffset, XMP_Uns32 _rsrcLength )
+			: rsrcOffset(_rsrcOffset), rsrcLength(_rsrcLength) {};
+	};
+	std::vector<OtherRsrcInfo> otherRsrcs;
+
+	void DeleteExistingInfo();
+
+};	// PSIR_FileWriter
+
+#endif	// __PSIR_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp b/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp
new file mode 100644
index 0000000..9405293
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp
@@ -0,0 +1,124 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2013 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/PackageFormat_Support.hpp"
+#include <algorithm>
+
+// =================================================================================================
+/// \file PackageFormat_Support.cpp
+///
+// =================================================================================================
+
+
+// =================================================================================================
+// PackageFormat_Support::GetPostfixRange
+// ================================
+
+#if 0
+XMP_Bool PackageFormat_Support::GetPostfixRange ( XMP_FileFormat format , XMP_StringPtr extension, XMP_Uns32 * range )
+{
+	switch ( format ) {
+		case kXMP_XDCAM_EXFile:
+			range[0] = 1; range[1] = 99;
+			break;
+		case kXMP_CanonXFFile:
+			range[0] = 1; range[1] = 99;
+			break;
+		case kXMP_XDCAM_SAMFile:
+		case kXMP_XDCAM_FAMFile:
+			range[0] = 1; range[1] = 99;
+			break;
+		case kXMP_P2File:
+			range[0] = 0; range[1] = 99;// for voice memo files
+			if(strcmp(extension, ".MXF") == 0)
+				range[1] = 15;// for audio essence files
+			break;
+		default:
+			return false;
+	}
+	return true;
+}	// PackageFormat_Support::GetPostfixRange
+#endif
+
+// =================================================================================================
+// PackageFormat_Support::AddResourceIfExists
+// ================================
+
+bool PackageFormat_Support::AddResourceIfExists ( XMP_StringVector * resourceList, const XMP_VarString & file )
+{
+	if ( Host_IO::Exists ( file.c_str() ) ) {
+		resourceList->push_back ( file );
+		return true;
+	}
+	return false;
+}	// PackageFormat_Support::AddResourceIfExists
+
+#if 0
+// =================================================================================================
+// PackageFormat_Support::AddResourceIfExists
+// ================================
+
+bool PackageFormat_Support::AddResourceIfExists ( XMP_StringVector * resourceList, const XMP_VarString & noExtPath,
+	XMP_StringPtr extension, XMP_FileFormat format )
+{
+	XMP_Uns32 range[2];
+	XMP_Bool atLeastOneFileAdded = false, fileAdded = false;
+	XMP_VarString iStr, filePath;
+	if ( GetPostfixRange ( format, extension, range ) ) {
+		for( XMP_Uns32 index = range[0]; index <= range[1] ; ++index )
+		{
+			SXMPUtils::ConvertFromInt ( index, NULL, &iStr ) ;
+			if ( index < LEAST_TWO_DIGIT_INT )
+				iStr = '0' + iStr;
+			filePath = noExtPath + iStr + extension;
+			fileAdded = AddResourceIfExists ( resourceList, filePath );
+			atLeastOneFileAdded  |= fileAdded ;
+		}
+	}
+	return atLeastOneFileAdded;
+}	// PackageFormat_Support::AddResourceIfExists
+
+#endif
+// =================================================================================================
+// PackageFormat_Support::AddResourceIfExists
+// ================================
+bool PackageFormat_Support::AddResourceIfExists ( XMP_StringVector * resourceList, const XMP_VarString & folderPath,
+	XMP_StringPtr prefix, XMP_StringPtr postfix )
+{
+	Host_IO::FolderRef folderHandle = Host_IO::OpenFolder ( folderPath.c_str() );
+	if ( folderHandle == Host_IO::noFolderRef || !prefix || !postfix )
+		return false;// can't open folder.
+	XMP_VarString fileName, filePath;
+	size_t fileNameLength;
+	size_t prefixLength = strlen ( prefix );
+	size_t postfixLength = strlen ( postfix );
+	bool atleastOneFileAdded = false;
+	while ( Host_IO::GetNextChild ( folderHandle, &fileName ) )
+	{
+		fileNameLength = fileName.length();
+		// Check if the file name starts with prefix and ends with postfix
+		if ( fileNameLength >= ( prefixLength + postfixLength ) && 
+			fileName.compare ( fileNameLength-postfixLength, postfixLength, postfix ) == 0 && 
+			fileName.compare ( 0, prefixLength, prefix ) == 0)
+		{
+			filePath = folderPath + kDirChar + fileName;
+			PackageFormat_Support::AddResourceIfExists ( resourceList, filePath );
+			atleastOneFileAdded = true;
+		}
+	}
+	// close folder
+	Host_IO::CloseFolder ( folderHandle );
+	return atleastOneFileAdded;
+}	// PackageFormat_Support::AddResourceIfExists
+
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp b/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp
new file mode 100644
index 0000000..8883c9e
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp
@@ -0,0 +1,39 @@
+#ifndef __PackageFormat_Support_hpp__
+#define __PackageFormat_Support_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2013 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "source/XMP_LibUtils.hpp"
+
+// =================================================================================================
+/// \file PackageFormat_Support.hpp
+/// \brief XMPFiles support for folder based formats.
+///
+// =================================================================================================
+
+namespace PackageFormat_Support 
+{
+
+	// Checks if the file at path "file" exists.
+	// If it exists then it adds to "resourceList" and returns true.
+	bool AddResourceIfExists ( XMP_StringVector * resourceList, const XMP_VarString & file );
+
+	// This function adds all the existing files in the specified folder whose name starts with prefix and ends with postfix.
+	bool AddResourceIfExists ( XMP_StringVector * resourceList, const XMP_VarString & folderPath,
+		XMP_StringPtr prefix, XMP_StringPtr postfix);
+
+
+} // namespace PackageFormat_Support
+
+// =================================================================================================
+
+#endif	// __PackageFormat_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/PostScript_Support.cpp b/XMPFiles/source/FormatSupport/PostScript_Support.cpp
new file mode 100644
index 0000000..029ff0c
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PostScript_Support.cpp
@@ -0,0 +1,1101 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2012 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 "XMPFiles/source/FormatSupport/PostScript_Support.hpp"
+#include "XMP.hpp"
+#include <algorithm>
+#include <climits>
+
+// =================================================================================================
+// PostScript_Support::HasCodesGT127
+// =================================
+//
+// function to detect character codes greater than 127 in a string
+bool PostScript_Support::HasCodesGT127(const std::string & value)
+{
+	size_t vallen=value.length();
+	for (size_t index=0;index<vallen;index++)
+	{
+		if ((unsigned char)value[index]>127)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+// =================================================================================================
+// PostScript_Support::SkipTabsAndSpaces
+// =====================================
+//
+// function moves the file pointer ahead such that it skips all tabs and spaces 
+bool  PostScript_Support::SkipTabsAndSpaces(XMP_IO* file,IOBuffer& ioBuf)
+{
+	while ( true ) 
+	{	
+		if ( ! CheckFileSpace ( file, &ioBuf, 1 ) ) return false;
+		if ( ! IsSpaceOrTab ( *ioBuf.ptr ) ) break;
+		++ioBuf.ptr;
+	}
+	return true;
+}
+
+// =================================================================================================
+// PostScript_Support::SkipUntilNewline
+// ====================================
+//
+// function moves the file pointer ahead such that it skips all characters until a newline 
+bool PostScript_Support::SkipUntilNewline(XMP_IO* file,IOBuffer& ioBuf)
+{
+	char ch;
+	do 
+	{
+		if ( ! CheckFileSpace ( file, &ioBuf, 1 ) ) return false;
+		ch = *ioBuf.ptr;
+		++ioBuf.ptr;
+	} while ( ! IsNewline ( ch ) );
+	if (ch==kCR &&*ioBuf.ptr==kLF)
+	{
+		if ( ! CheckFileSpace ( file, &ioBuf, 1 ) ) return false;
+		++ioBuf.ptr;
+	}
+	return true;
+}
+
+
+// =================================================================================================
+// RevRefillBuffer and RevCheckFileSpace
+// ======================================
+//
+// These helpers are similar to RefillBuffer and CheckFileSpace with the difference that the it traverses
+// the file stream in reverse order
+void PostScript_Support::RevRefillBuffer ( XMP_IO* fileRef, IOBuffer* ioBuf )
+{
+	// Refill including part of the current data, seek back to the new buffer origin and read.
+	size_t reverseSeek = ioBuf->limit - ioBuf->ptr;
+	if (ioBuf->filePos>kIOBufferSize)
+	{
+		ioBuf->filePos = fileRef->Seek ( -((XMP_Int64)(kIOBufferSize+reverseSeek)), kXMP_SeekFromCurrent );
+		ioBuf->len = fileRef->Read ( &ioBuf->data[0], kIOBufferSize );
+		ioBuf->ptr = &ioBuf->data[0]+ioBuf->len;
+		ioBuf->limit = ioBuf->ptr ;
+	}
+	else
+	{
+		XMP_Int64 rev = (ioBuf->ptr-&ioBuf->data[0]) + ioBuf->filePos;
+		ioBuf->filePos = fileRef->Seek ( 0, kXMP_SeekFromStart );		
+		ioBuf->len = fileRef->Read ( &ioBuf->data[0], kIOBufferSize );
+		if ( rev > (XMP_Int64)ioBuf->len )throw XMP_Error ( kXMPErr_ExternalFailure, "Seek failure in FillBuffer" );
+		ioBuf->ptr = &ioBuf->data[0]+rev;
+		ioBuf->limit = &ioBuf->data[0]+ioBuf->len;
+	}
+
+
+}
+bool PostScript_Support::RevCheckFileSpace ( XMP_IO* fileRef, IOBuffer* ioBuf, size_t neededLen )
+{
+	if ( size_t(ioBuf->ptr -  &ioBuf->data[0]) < size_t(neededLen) ) 
+	{	// ! Avoid VS.Net compare warnings.
+		PostScript_Support::RevRefillBuffer ( fileRef, ioBuf );
+	}
+	return (size_t(ioBuf->ptr -  &ioBuf->data[0]) >= size_t(neededLen));
+}
+
+// =================================================================================================
+// SearchBBoxInTrailer
+// ===================
+//
+// Function searches the Bounding Box in the comments after the %Trailer
+// this function gets called when the DSC comment BoundingBox: value is
+// (atend)
+// returns true if atleast one BoundingBox: is found after %Trailer
+inline static bool SearchBBoxInTrailer(XMP_IO* fileRef,IOBuffer& ioBuf)
+{
+	bool bboxfoundintrailer=false;
+	if ( !  PostScript_Support::SkipTabsAndSpaces( fileRef, ioBuf ) ) return false;
+	if ( ! IsNewline ( *ioBuf.ptr ) ) return false;
+	++ioBuf.ptr;
+	// Scan for all the %%Trailer outside %%BeginDocument: & %%EndDocument comments
+	while(true)
+	{
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsBeginDocString.length() ) ) return false;
+		if ( CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsTrailerString.c_str()), kPSContainsTrailerString.length() )) 
+		{
+			//found %%Trailer now search for proper %%BoundingBox
+			ioBuf.ptr+=kPSContainsTrailerString.length();
+			//skip chars after  %%Trailer till newline
+			if ( !  PostScript_Support::SkipUntilNewline( fileRef, ioBuf ) ) return false;
+			while(true)
+			{
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsBBoxString.length() ) ) return false;
+				//check for  "%%BoundingBox:"
+				if (CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsBBoxString.c_str()), kPSContainsBBoxString.length() ) )
+				{
+					//found  "%%BoundingBox:"
+					ioBuf.ptr+=kPSContainsBBoxString.length();
+					// Skip leading spaces and tabs.
+					if ( !  PostScript_Support::SkipTabsAndSpaces( fileRef, ioBuf ) ) return false;
+					if ( IsNewline ( *ioBuf.ptr ) ) return false;	// Reached the end of the %%BoundingBox comment.
+					bboxfoundintrailer=true;
+					break;
+				}
+				//skip chars till newline
+				if ( !  PostScript_Support::SkipUntilNewline( fileRef, ioBuf ) ) return false;
+			}
+
+			break;
+		} 
+		else if (  CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsBeginDocString.c_str()), kPSContainsBeginDocString.length() ) )
+		{
+			//"%%BeginDocument:" Found search for "%%EndDocument"
+			ioBuf.ptr+=kPSContainsBeginDocString.length();
+			//skip chars after "%%BeginDocument:" till newline
+			if ( !  PostScript_Support::SkipUntilNewline( fileRef, ioBuf ) ) return false;
+			while(true)
+			{
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsEndDocString.length() ) ) return false;
+				//check for  "%%EndDocument"
+				if (CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsEndDocString.c_str()), kPSContainsEndDocString.length() ) )
+				{
+					//found  "%%EndDocument"
+					ioBuf.ptr+=kPSContainsEndDocString.length();
+					break;
+				}
+				//skip chars till newline
+				if ( !  PostScript_Support::SkipUntilNewline( fileRef, ioBuf ) ) return false;
+			}// while to search %%EndDocument
+
+		} //else if to consume a pair of %%BeginDocument: and %%EndDocument
+		//skip chars till newline
+		if ( !  PostScript_Support::SkipUntilNewline( fileRef, ioBuf ) ) return false;
+	}// while for scanning %%BoundingBox after %%Trailer
+	if (!bboxfoundintrailer) return false;
+	return true;
+}
+
+// =================================================================================================
+// PostScript_Support::IsValidPSFile
+// =================================
+//
+// Determines if the file is a valid PostScript or EPS file
+// Checks done
+//		Looks for a valid Poscript header
+//		For EPS file checks for a valid Bounding Box comment
+bool PostScript_Support::IsValidPSFile(XMP_IO*    fileRef,XMP_FileFormat &format)
+{
+	IOBuffer ioBuf;
+	XMP_Int64 psOffset;
+	size_t    psLength;
+	XMP_Uns32 fileheader,psMajorVer, psMinorVer,epsMajorVer,epsMinorVer;
+	char ch;
+	// Check for the binary EPSF preview header.
+
+	fileRef->Rewind();
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, 4 ) ) return false;
+	fileheader = GetUns32BE ( ioBuf.ptr );
+
+	if ( fileheader == 0xC5D0D3C6 ) 
+	{
+
+		if ( ! CheckFileSpace ( fileRef, &ioBuf, 30 ) ) return false;
+
+		psOffset = GetUns32LE ( ioBuf.ptr+4 );	// PostScript offset.
+		psLength = GetUns32LE ( ioBuf.ptr+8 );	// PostScript length.
+
+		FillBuffer ( fileRef, psOffset, &ioBuf );	// Make sure buffer starts at psOffset for length check.
+		if ( (ioBuf.len < kIOBufferSize) && (ioBuf.len < psLength) ) return false;	// Not enough PostScript.
+
+	}
+
+	// Check the start of the PostScript DSC header comment.
+
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, (kPSFileTag.length() + 3 + 1) ) ) return false;
+	if ( ! CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSFileTag.c_str()), kPSFileTag.length() ) ) return false;
+	ioBuf.ptr += kPSFileTag.length();
+
+	// Check the PostScript DSC major version number.
+
+	psMajorVer = 0;
+	while ( (ioBuf.ptr < ioBuf.limit) && IsNumeric( *ioBuf.ptr ) ) 
+	{
+		psMajorVer = (psMajorVer * 10) + (*ioBuf.ptr - '0');
+		if ( psMajorVer > 1000 ) return false;	// Overflow.
+		ioBuf.ptr += 1;
+	}
+	if ( psMajorVer < 3 ) return false;	// The version must be at least 3.0.
+
+	if ( ! CheckFileSpace ( fileRef, &ioBuf, 3 ) ) return false;
+	if ( *ioBuf.ptr != '.' ) return false;	// No minor number.
+	ioBuf.ptr += 1;
+
+	// Check the PostScript DSC minor version number.
+
+	psMinorVer = 0;
+	while ( (ioBuf.ptr < ioBuf.limit) && IsNumeric( *ioBuf.ptr ) ) 
+	{
+		psMinorVer = (psMinorVer * 10) + (*ioBuf.ptr - '0');
+		if ( psMinorVer > 1000 ) return false;	// Overflow.
+		ioBuf.ptr += 1;
+	}
+
+	switch( format ) 
+	{
+		case kXMP_PostScriptFile:
+		{
+			// Almost done for plain PostScript, check for whitespace.
+
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			if ( ! IsWhitespace(*ioBuf.ptr) ) return false;
+			ioBuf.ptr += 1;
+		
+			break;
+		}
+		case kXMP_UnknownFile:
+		{
+			if ( ! SkipTabsAndSpaces ( fileRef, ioBuf ) ) return false;
+
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 5 ) ) return false;
+			// checked PS header to this point Atkleast a PostScript File
+			format=kXMP_PostScriptFile;
+			//return true if no "EPSF-" is found as it is a valid PS atleast
+			if ( ! CheckBytes ( ioBuf.ptr, Uns8Ptr("EPSF-"), 5 ) ) return true;
+
+		}//intentional fall through for further checking of unknown files
+		case kXMP_EPSFile:
+		{
+
+			if ( ! SkipTabsAndSpaces ( fileRef, ioBuf ) ) return false;
+			// Check for the EPSF keyword on the header comment.
+
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 5+3+1 ) ) return false;
+			if ( ! CheckBytes ( ioBuf.ptr, Uns8Ptr("EPSF-"), 5 ) ) return false;
+			ioBuf.ptr += 5;
+
+			// Check the EPS major version number.
+
+			epsMajorVer = 0;
+			while ( (ioBuf.ptr < ioBuf.limit) &&IsNumeric( *ioBuf.ptr ) ) {
+				epsMajorVer = (epsMajorVer * 10) + (*ioBuf.ptr - '0');
+				if ( epsMajorVer > 1000 ) return false;	// Overflow.
+				ioBuf.ptr += 1;
+			}
+			if ( epsMajorVer < 3 ) return false;	// The version must be at least 3.0.
+
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 3 ) ) return false;
+			if ( *ioBuf.ptr != '.' ) return false;	// No minor number.
+			ioBuf.ptr += 1;
+
+			// Check the EPS minor version number.
+
+			epsMinorVer = 0;
+			while ( (ioBuf.ptr < ioBuf.limit) && IsNumeric( *ioBuf.ptr ) ) {
+				epsMinorVer = (epsMinorVer * 10) + (*ioBuf.ptr - '0');
+				if ( epsMinorVer > 1000 ) return false;	// Overflow.
+				ioBuf.ptr += 1;
+			}
+		
+			if ( ! SkipTabsAndSpaces ( fileRef, ioBuf ) ) return false;
+			if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			if ( ! IsNewline( *ioBuf.ptr ) ) return false;
+			ch=*ioBuf.ptr;
+			ioBuf.ptr += 1;
+			if (ch==kCR &&*ioBuf.ptr==kLF)
+			{
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+				++ioBuf.ptr;
+			}
+
+
+			while ( true ) 
+			{
+				if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsBBoxString.length() ) ) return false;
+
+				if ( CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSEndCommentString.c_str()), kPSEndCommentString.length() ) //explicit endcommentcheck
+					|| *ioBuf.ptr!='%' || !(*(ioBuf.ptr+1)>32 && *(ioBuf.ptr+1)<=126 )) // implicit endcomment check
+				{
+					// Found "%%EndComments", don't look any further.
+					return false;
+				} 
+				else if ( ! CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsBBoxString.c_str()), kPSContainsBBoxString.length() ) )
+				{
+					// Not "%%EndComments" or "%%BoundingBox:", skip past the end of this line.
+					 if ( ! SkipUntilNewline ( fileRef, ioBuf ) ) return true;
+				} 
+				else 
+				{
+
+					// Found "%%BoundingBox:", look for llx lly urx ury.
+					ioBuf.ptr += kPSContainsBBoxString.length();
+					//Check for atleast a mandatory space b/w "%%BoundingBox:" and llx lly urx ury
+					if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+					if ( ! IsSpaceOrTab ( *ioBuf.ptr ) ) return false;
+					ioBuf.ptr++;
+
+					while ( true ) 
+					{
+						// Skip leading spaces and tabs.
+						if ( ! SkipTabsAndSpaces( fileRef, ioBuf ) ) return false;
+						if ( IsNewline ( *ioBuf.ptr ) ) return false;	// Reached the end of the %%BoundingBox comment.
+
+						//if the comment is %%BoundingBox: (atend) go past the %%Trailer to check BBox
+						bool bboxfoundintrailer=false;
+						if (*ioBuf.ptr=='(')
+						{
+							if ( ! CheckFileSpace ( fileRef, &ioBuf, kPSContainsAtendString.length() ) ) return false;
+
+							if ( CheckBytes ( ioBuf.ptr, Uns8Ptr(kPSContainsAtendString.c_str()), kPSContainsAtendString.length() ) ) 
+							{
+								// search for Bounding Box Past Trailer
+								ioBuf.ptr += kPSContainsAtendString.length();
+								bboxfoundintrailer=SearchBBoxInTrailer( fileRef, ioBuf );
+							}
+						
+							if (!bboxfoundintrailer)
+								return false;
+
+						}//if (*ioBuf.ptr=='(')
+
+						int noOfIntegers=0;
+						// verifies for llx lly urx ury.
+						while(true)
+						{
+							if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+							if(IsPlusMinusSign(*ioBuf.ptr ))
+								++ioBuf.ptr;
+							bool atleastOneNumeric=false;
+							while ( true) 
+							{
+								if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+								if (!IsNumeric ( *ioBuf.ptr ) ) break;
+								++ioBuf.ptr;
+								atleastOneNumeric=true;
+							}
+							if (!atleastOneNumeric) return false;
+						
+							if ( ! SkipTabsAndSpaces( fileRef, ioBuf ) ) return false;
+							noOfIntegers++;
+							if ( IsNewline ( *ioBuf.ptr ) ) break;
+						}
+						if (noOfIntegers!=4) 
+							return false;
+						format=kXMP_EPSFile;
+						return true;
+					}	
+
+				}	//Found "%%BoundingBox:"
+
+			}	// Outer marker loop.
+		}
+		default:
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+
+// =================================================================================================
+// PostScript_Support::IsSFDFilterUsed
+// =================================
+//
+// Determines Whether the metadata is embedded using the Sub-FileDecode Approach or no
+//	In case of Sub-FileDecode filter approach the metaData can be easily extended without
+//	the need to inject a new XMP packet before the existing Packet.
+// 
+bool PostScript_Support::IsSFDFilterUsed(XMP_IO* &fileRef, XMP_Int64 xpacketOffset)
+{
+	IOBuffer ioBuf;
+	fileRef->Rewind();
+	fileRef->Seek((xpacketOffset/kIOBufferSize)*kIOBufferSize,kXMP_SeekFromStart);
+	if ( ! CheckFileSpace ( fileRef, &ioBuf,xpacketOffset%kIOBufferSize ) ) return false;
+	ioBuf.ptr+=(xpacketOffset%kIOBufferSize);
+	//skip white spaces
+	while(true)
+	{
+		if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+		if (!IsWhitespace(*ioBuf.ptr)) break;
+		--ioBuf.ptr;
+	} 
+	std::string temp;
+	bool filterFound=false;
+	while(true)
+	{
+		if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+		if (*ioBuf.ptr==')')
+		{
+			--ioBuf.ptr;
+			while(true)
+			{
+				//get the string till '('
+				if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false ;
+				temp+=*ioBuf.ptr;
+				--ioBuf.ptr;
+				if (*ioBuf.ptr=='(')
+				{
+					if(filterFound)
+					{
+						reverse(temp.begin(), temp.end());
+						if(!temp.compare("SubFileDecode"))
+							return true;
+					}
+					if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false ;
+					--ioBuf.ptr;
+					temp.clear();
+					break;
+				}
+			}
+			
+			filterFound=false;
+		}
+		else if(*ioBuf.ptr=='[')
+		{
+			//end of SubFileDecode Filter parsing
+			return false;
+		}
+		else if(*ioBuf.ptr=='k' )
+		{
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 4 ) ) return false;
+			if(IsWhitespace(*(ioBuf.ptr-4))&& *(ioBuf.ptr-3)=='m'
+				&& *(ioBuf.ptr-2)=='a' && *(ioBuf.ptr-1)=='r' )
+				//end of SubFileDecode Filter parsing
+				return false;
+			while(true)//ignore till any special mark
+			{
+				if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 4 ) ) return false;
+				if (IsWhitespace(*(ioBuf.ptr))||*(ioBuf.ptr)=='['||
+					*(ioBuf.ptr)=='<' ||*(ioBuf.ptr)=='>') break;
+				--ioBuf.ptr;
+			}
+			filterFound=false;
+		}
+		else if(*ioBuf.ptr=='<')
+		{
+			--ioBuf.ptr;
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			if (*(ioBuf.ptr)=='<')
+			{
+				//end of SubFileDecode Filter parsing
+				return false;
+			}
+			while(true)//ignore till any special mark
+			{
+				if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 4 ) ) return false;
+				if (IsWhitespace(*(ioBuf.ptr))||*(ioBuf.ptr)=='['||
+					*(ioBuf.ptr)=='<' ||*(ioBuf.ptr)=='>') break;
+				--ioBuf.ptr;
+			}
+			filterFound=false;
+		}
+		else if(*ioBuf.ptr=='>')
+		{
+			--ioBuf.ptr;
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			if (*(ioBuf.ptr)=='>')//ignore the dictionary
+			{
+				--ioBuf.ptr;
+				XMP_Int16 count=1;
+				while(true)
+				{
+					if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 2 ) ) return false;
+					if(*(ioBuf.ptr)=='<' && *(ioBuf.ptr-1)=='<')
+					{
+						count--;
+						ioBuf.ptr-=2;
+					}
+					else if(*(ioBuf.ptr)=='>' && *(ioBuf.ptr-1)=='>')
+					{
+						count++;
+						ioBuf.ptr-=2;
+					}
+					else
+					{
+						ioBuf.ptr-=1;
+					}
+					if(count==0)
+						break;
+				}
+			}
+			filterFound=false;
+		}
+		else
+		{
+			while(true)
+			{
+				if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+				temp+=(*ioBuf.ptr);
+				--ioBuf.ptr;
+				if (*ioBuf.ptr=='/')
+				{
+					if(filterFound)
+					{
+						reverse(temp.begin(), temp.end());
+						if(!temp.compare("SubFileDecode"))
+							return true;
+					}
+					temp.clear();
+					filterFound=false;
+					break;
+				}
+				else if(IsWhitespace(*ioBuf.ptr))
+				{
+					reverse(temp.begin(), temp.end());
+					if(!temp.compare("filter")&&!filterFound)
+						filterFound=true;
+					else
+						filterFound=false;
+					temp.clear();
+					break;
+				}
+			}
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+				--ioBuf.ptr;
+		}
+		while(true)
+		{
+			if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false;
+			if (!IsWhitespace(*ioBuf.ptr)) break;
+			--ioBuf.ptr;
+		} 
+						
+	}
+	return false;
+
+}
+
+
+// =================================================================================================
+// constructDateTime
+// =================================
+//
+// If input string date is of the format D:YYYYMMDDHHmmSSOHH'mm' and valid
+// output format YYYY-MM-DDThh:mm:ssTZD is returned
+// 
+static void constructDateTime(const std::string &input,std::string& outDate)
+{
+	std::string date;
+	XMP_DateTime datetime;
+	std::string verdate;
+	size_t start =0;
+	if(input[0]=='D' && input[1]==':')
+		start=2;
+	if (input.length() >=14+start)
+	{
+		for(int x=0;x<4;x++)
+		{
+			date+=input[start+x];//YYYY
+		}
+		date+='-';
+		start+=4;
+		for(int x=0;x<2;x++)
+		{
+			date+=input[start+x];//MM
+		}
+		date+='-';
+		start+=2;
+		for(int x=0;x<2;x++)
+		{
+			date+=input[start+x];//DD
+		}
+		date+='T';
+		start+=2;
+		for(int x=0;x<2;x++)
+		{
+			date+=input[start+x];//HH
+		}
+		
+		date+=':';
+		start+=2;
+		for(int x=0;x<2;x++)
+		{
+			date+=input[start+x];//MM
+		}
+		
+		date+=':';
+		start+=2;
+		for(int x=0;x<2;x++)
+		{
+			date+=input[start+x];//SS
+		}
+		start+=2;
+		if ((input[start]=='+' || input[start]=='-' )&&input.length() ==19+start)
+		{
+			date+=input[start];
+			start++;
+			for(int x=0;x<2;x++)
+			{
+				date+=input[start+x];//hh
+			}
+			date+=':';
+			start+=2;
+			for(int x=0;x<2;x++)
+			{
+				date+=input[start+x];//mm
+			}
+		}
+		else
+		{
+			date+='Z';
+		}
+		
+		try
+		{
+			SXMPUtils::ConvertToDate ( date.c_str(),&datetime);
+			SXMPUtils::ConvertFromDate (datetime,&verdate);
+		}
+		catch(...)
+		{
+			return;
+		}
+		outDate=verdate;
+	}
+	
+}
+
+// =================================================================================================
+// GetNumber
+// =========
+//
+// Extracts number from a char string
+// 
+static short GetNumber(const char **inString,short noOfChars=SHRT_MAX)
+{
+	const char* inStr=*inString;
+	short number=0;
+	while(IsNumeric ( *inStr )&& noOfChars--)
+	{
+		number=number*10 +inStr[0]-'0';
+		inStr++;
+	}
+	*inString=inStr;
+	return number;
+}
+
+// =================================================================================================
+// tokeniseDateString
+// ==================
+//
+// Parses Date string and tokenizes it for extracting different parts of a date
+// 
+static bool tokeniseDateString(const char* inString,std::vector<PostScript_Support::DateTimeTokens>  &tokens )
+{
+	const char* inStr= inString;
+	PostScript_Support::DateTimeTokens dttoken;
+	//skip leading whitespace
+	while ( inStr[0]!='\0' ) 
+	{	
+		while( IsSpaceOrTab ( *inStr ) || *inStr =='(' 
+			||*inStr ==')' ||*inStr==',')
+		{
+			++inStr;
+		}
+		if (*inStr=='\0') return true;
+		dttoken=PostScript_Support::DateTimeTokens();
+		if (IsNumeric(*inStr))
+		{
+			while(IsNumeric(*inStr)||(IsDelimiter(*inStr)&&dttoken.noOfDelimiter==0)||
+				(dttoken.delimiter==*inStr && dttoken.noOfDelimiter!=0))
+			{
+				if (IsDelimiter(*inStr))
+				{
+					dttoken.delimiter=inStr[0];
+					dttoken.noOfDelimiter++;
+				}
+				dttoken.token+=*(inStr++);
+			}
+			tokens.push_back(dttoken);
+		}
+		else if (IsAlpha(*inStr))
+		{
+			if(*inStr=='D'&& *(inStr+1)==':')
+			{
+				inStr+=2;
+				while( IsNumeric(*inStr))
+				{
+					dttoken.token+=*(inStr++);
+				}
+			}
+			else
+			{
+				while( IsAlpha(*inStr))
+				{
+					dttoken.token+=*(inStr++);
+				}
+
+			}
+			tokens.push_back(dttoken);
+		}
+		else if (*inStr=='-' ||*inStr=='+')
+		{
+			dttoken.token+=*(inStr++);
+			while( IsNumeric(*inStr)||*inStr==':')
+			{
+				if (*inStr==':')
+				{
+					dttoken.delimiter=inStr[0];
+					dttoken.noOfDelimiter++;
+				}
+				dttoken.token+=*(inStr++);
+			}
+			tokens.push_back(dttoken);
+		}
+		else
+		{
+			++inStr;
+		}
+	}
+	return true;
+}
+
+// =================================================================================================
+// SwapMonthDateIfNeeded
+// =====================
+//
+// Swaps month and date value if it creates a possible valid date
+// 
+static void SwapMonthDateIfNeeded(short &day, short&month)
+{
+	if(month>12&& day<13)
+	{
+		short temp=month;
+		month=day;
+		day=temp;
+	}
+}
+
+// =================================================================================================
+// AdjustYearIfNeeded
+// =====================
+//
+// Guess the year for a two digit year in a date
+//
+static void AdjustYearIfNeeded(short &year)
+{
+	if (year<100)
+	{
+		if (year >40)
+		{
+			year=1900+year;
+		}
+		else
+		{
+			year=2000+year;
+		}
+	}
+}
+
+static bool IsLeapYear ( XMP_Int32 year )
+{
+	if ( year < 0 ) year = -year + 1;		// Fold the negative years, assuming there is a year 0.
+	if ( (year % 4) != 0 ) return false;	// Not a multiple of 4.
+	if ( (year % 100) != 0 ) return true;	// A multiple of 4 but not a multiple of 100.
+	if ( (year % 400) == 0 ) return true;	// A multiple of 400.
+	return false;							// A multiple of 100 but not a multiple of 400.
+}
+// =================================================================================================
+// PostScript_Support::ConvertToDate
+// =================================
+//
+// Converts date string from native of Postscript to YYYY-MM-DDThh:mm:ssTZD if a valid date is identified
+//
+std::string PostScript_Support::ConvertToDate(const char* inString)
+{
+	PostScript_Support::Date date(0,0,0,0,0,0);
+	std::string dateTimeString; 
+	short number=0;
+	std::vector<PostScript_Support::DateTimeTokens>   tokenzs;
+    tokeniseDateString(inString,tokenzs );
+	std::vector<PostScript_Support::DateTimeTokens>:: const_iterator itr=tokenzs.begin();
+	for(;itr!=tokenzs.end();itr++)
+	{
+		// token[0] is invalid on an empty string. -- Hub
+		if(!itr->token.empty() && (itr->token[0]=='+' ||itr->token[0]=='-'))
+		{
+			const char *str=itr->token.c_str();
+			date.offsetSign=*(str++);
+			date.offsetHour=GetNumber(&str,2);
+			if (*str==':')str++;
+			date.offsetMin=GetNumber(&str,2);
+			if (!(date.offsetHour<=12 && date.offsetHour>=0
+				&&date.offsetMin>=0 && date.offsetMin<=59))
+			{
+				date.offsetSign='+';
+				date.offsetHour=0;
+				date.offsetMin=0;
+			}
+			else
+			{
+				date.containsOffset= true;
+			}
+		}
+		else if(itr->noOfDelimiter!=0)
+		{//either a date or time token
+			if(itr->noOfDelimiter==2 && itr->delimiter=='/')
+			{
+				if(date.day==0&& date.month==0 && date.year==0)
+				{
+					const char *str=itr->token.c_str();
+					number=GetNumber(&str);
+					str++;
+					if (number<32)
+					{
+						date.month=number;
+						date.day=GetNumber(&str);
+						SwapMonthDateIfNeeded(date.day, date.month);
+						str++;
+						date.year=GetNumber(&str);
+						AdjustYearIfNeeded(date.year);
+					}
+					else
+					{
+						date.year=number;
+						AdjustYearIfNeeded(date.year);
+						date.month=GetNumber(&str);
+						str++;
+						date.day=GetNumber(&str);
+						SwapMonthDateIfNeeded(date.day, date.month);
+					}
+				}
+			}
+			else if(itr->noOfDelimiter==2 && itr->delimiter==':')
+			{
+				const char *str=itr->token.c_str();
+				date.hours=GetNumber(&str);
+				str++;
+				date.minutes=GetNumber(&str);
+				str++;
+				date.seconds=GetNumber(&str);
+				if (date.hours>23|| date.minutes>59|| date.seconds>59)
+				{
+					date.hours=0;
+					date.minutes=0;
+					date.seconds=0;
+				}
+			}
+			else if(itr->noOfDelimiter==1 && itr->delimiter==':')
+			{
+				const char *str=itr->token.c_str();
+				date.hours=GetNumber(&str);
+				str++;
+				date.minutes=GetNumber(&str);
+				if (date.hours>23|| date.minutes>59)
+				{
+					date.hours=0;
+					date.minutes=0;
+				}
+			}
+			else if(itr->noOfDelimiter==2 && itr->delimiter=='-')
+			{
+				const char *str=itr->token.c_str();
+				number=GetNumber(&str);
+				str++;
+				if (number>31)
+				{
+					date.year=number;
+					AdjustYearIfNeeded(date.year);
+					date.month=GetNumber(&str);
+					str++;
+					date.day=GetNumber(&str);
+					SwapMonthDateIfNeeded(date.day, date.month);
+				}
+				else
+				{
+					date.month=number;
+					date.day=GetNumber(&str);
+					str++;
+					SwapMonthDateIfNeeded(date.day, date.month);
+					date.year=GetNumber(&str);
+					AdjustYearIfNeeded(date.year);
+				}
+			}
+			else if(itr->noOfDelimiter==2 && itr->delimiter=='.')
+			{
+				const char *str=itr->token.c_str();
+				date.year=GetNumber(&str);
+				str++;
+				AdjustYearIfNeeded(date.year);
+				date.month=GetNumber(&str);
+				str++;
+				date.day=GetNumber(&str);
+				SwapMonthDateIfNeeded(date.day, date.month);
+				
+			}
+		}
+		else if (IsAlpha(itr->token[0]))
+		{	//this can be a name of the Month
+			// name of the day is ignored
+			short month=0;
+			std::string lowerToken=itr->token;
+			std::transform(lowerToken.begin(), lowerToken.end(), lowerToken.begin(), ::tolower);
+			if(!lowerToken.compare("jan")||!lowerToken.compare("january"))
+			{
+				month=1;
+			}
+			else if (!lowerToken.compare("feb")||!lowerToken.compare("february"))
+			{
+				month=2;
+			}
+			else if (!lowerToken.compare("mar")||!lowerToken.compare("march"))
+			{
+				month=3;
+			}
+			else if (!lowerToken.compare("apr")||!lowerToken.compare("april"))
+			{
+				month=4;
+			}
+			else if (!lowerToken.compare("may"))
+			{
+				month=5;
+			}
+			else if (!lowerToken.compare("jun")||!lowerToken.compare("june"))
+			{
+				month=6;
+			}
+			else if (!lowerToken.compare("jul")||!lowerToken.compare("july"))
+			{
+				month=7;
+			}
+			else if (!lowerToken.compare("aug")||!lowerToken.compare("august"))
+			{
+				month=8;
+			}
+			else if (!lowerToken.compare("sep")||!lowerToken.compare("september"))
+			{
+				month=9;
+			}
+			else if (!lowerToken.compare("oct")||!lowerToken.compare("october"))
+			{
+				month=10;
+			}
+			else if (!lowerToken.compare("nov")||!lowerToken.compare("november"))
+			{
+				month=11;
+			}
+			else if (!lowerToken.compare("dec")||!lowerToken.compare("december"))
+			{
+				month=12;
+			}
+			else if (!lowerToken.compare("pm"))
+			{
+				if (date.hours<13)
+				{
+					date.hours+=12;
+				}
+			}
+			else if (itr->token.length()>14)
+			{
+				constructDateTime(itr->token,dateTimeString);
+			}
+			if(month!=0 && date.month==0)
+			{
+				date.month=month;
+				if(date.day==0)
+				{
+					if(itr!=tokenzs.begin())
+					{
+						--itr;
+						if (itr->noOfDelimiter==0 && IsNumeric(itr->token[0]) )
+						{
+							const char * str=itr->token.c_str();
+							short day= GetNumber(&str);
+							if (day<=31 &&day >=1)
+							{
+								date.day=day;
+							}
+						}
+						++itr;
+					}
+					if(itr!=tokenzs.end())
+					{
+						++itr;
+						if (itr == tokenzs.end())
+						{
+							// bug 101914 - corrupt file make us
+							// reach the end. -- Hub
+							// https://bugs.freedesktop.org/show_bug.cgi?id=101914
+							break;
+						}
+						if (itr->noOfDelimiter==0 && IsNumeric(itr->token[0]) )
+						{
+							const char * str=itr->token.c_str();
+							short day= GetNumber(&str);
+							if (day<=31 &&day >=1)
+							{
+								date.day=day;
+							}
+						}
+					}
+				}
+			}
+		}
+		else if (IsNumeric(itr->token[0]) && date.year==0&&itr->token.length()==4)
+		{//this is the year
+			const char * str=itr->token.c_str();
+			date.year=GetNumber(&str);
+		}
+		else if (itr->token.length()>=14)
+		{
+			constructDateTime(itr->token,dateTimeString);
+		}
+	}
+	if (dateTimeString.length()==0)
+	{
+		char dtstr[100];
+		XMP_DateTime datetime;
+		if ( date.year < 10000 && date.month < 13 && date.month > 0 && date.day > 0 )
+		{
+			bool isValidDate=true;
+			if ( date.month == 2 )
+			{
+				if ( IsLeapYear ( date.year ) )
+				{
+					if ( date.day > 29 )  isValidDate=false;
+				}
+				else
+				{
+					if ( date.day > 28 )  isValidDate=false;
+				}
+			}
+			else if ( date.month == 4 || date.month == 6 || date.month == 9
+				|| date.month == 11 )
+			{
+				if ( date.day > 30 )  isValidDate=false;
+			}
+			else
+			{
+				if ( date.day > 31 )  isValidDate=false;
+			}
+			if( isValidDate && ! ( date == PostScript_Support::Date ( 0, 0, 0, 0, 0, 0 ) ) )
+			{
+				if ( date.containsOffset )
+				{
+					sprintf(dtstr,"%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",date.year,date.month,date.day,
+							date.hours,date.minutes,date.seconds,date.offsetSign,date.offsetHour,date.offsetMin);
+				}
+				else
+				{
+					sprintf(dtstr,"%04d-%02d-%02dT%02d:%02d:%02dZ",date.year,date.month,date.day,
+							date.hours,date.minutes,date.seconds);
+				}
+				try
+				{
+			
+					SXMPUtils::ConvertToDate ( dtstr, &datetime ) ;
+					SXMPUtils::ConvertFromDate ( datetime, &dateTimeString ) ;
+				}
+				catch(...)
+				{
+				}
+			}
+		}
+	}
+	
+	return dateTimeString;
+}
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/PostScript_Support.hpp b/XMPFiles/source/FormatSupport/PostScript_Support.hpp
new file mode 100644
index 0000000..688fa6d
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/PostScript_Support.hpp
@@ -0,0 +1,266 @@
+#ifndef __PostScript_Support_hpp__
+#define __PostScript_Support_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2012 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 "public/include/XMP_Environment.h"	
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+
+#define MAX_NO_MARK 100
+#define IsNumeric( ch ) ( ch >='0' && ch<='9' )
+#define Uns8Ptr(p) ((XMP_Uns8 *) (p))
+#define IsPlusMinusSign(ch)  ( ch =='+' || ch=='-' )
+#define IsDateDelimiter( ch ) ( ((ch) == '/') || ((ch) == '-') || ((ch) == '.') )
+#define IsTimeDelimiter( ch ) ( ((ch) == ':') )
+#define IsDelimiter(ch) (IsDateDelimiter( ch ) || IsTimeDelimiter( ch ))
+#define IsAlpha(ch) ((ch>=97 &&ch <=122) || (ch>=65 && ch<=91))
+
+
+enum {
+	kPSHint_NoMarker  = 0,
+	kPSHint_NoMain    = 1,
+	kPSHint_MainFirst = 2,
+	kPSHint_MainLast  = 3
+};
+
+enum UpdateMethod{
+	kPS_None			= 0,
+	kPS_Inplace			= 1,
+	kPS_ExpandSFDFilter = 2,
+	kPS_InjectNew		= 3
+};
+
+enum TokenFlag{
+	// --------------------
+	// Flags for native Metadata  and DSC commnents in EPS format
+
+	/// No Native MetaData
+	kPS_NoData			=   0x00000001,
+	/// Document Creator tool
+	kPS_CreatorTool		=   0x00000002,
+	/// Document Creation Date
+	kPS_CreateDate		=   0x00000004,
+	/// Document Modify Date
+	kPS_ModifyDate		=   0x00000008,
+	/// Document Creator/Author
+	kPS_Creator			=   0x00000010,
+	/// Document Title
+	kPS_Title			=   0x00000020,
+	/// Document Desciption
+	kPS_Description		=   0x00000040,
+	/// Document Subject/Keywords
+	kPS_Subject			=   0x00000080,
+	/// ADO_ContainsXMP hint
+	kPS_ADOContainsXMP	=   0x00000100,
+	/// End Comments
+	kPS_EndComments		=   0x00000200,
+	/// Begin Prolog
+	kPS_BeginProlog		=   0x00000400,
+	/// End Prolog
+	kPS_EndProlog	    =   0x00000800,
+	/// Begin Setup
+	kPS_BeginSetup	    =   0x00001000,
+	/// End Setup
+	kPS_EndSetup	    =   0x00002000,
+	/// Page
+	kPS_Page	        =   0x00004000,
+	/// End Page Comments
+	kPS_EndPageComments	=   0x00008000,
+	/// Begin Page SetUp
+	kPS_BeginPageSetup	=   0x00010000,
+	/// End Page SetUp
+	kPS_EndPageSetup	=   0x00020000,
+	/// Trailer
+	kPS_Trailer			=   0x00040000,
+	/// EOF
+	kPS_EOF				=   0x00080000,
+	/// End PostScript
+	kPS_EndPostScript	=   0x00100000,
+	/// Max Token
+	kPS_MaxToken		=   0x00200000
+};
+
+enum NativeMetadataIndex{
+	// --------------------
+	// Index native Metadata ina PS file
+	kPS_dscCreator			= 0, 
+	kPS_dscCreateDate		= 1,
+	kPS_dscFor				= 2,
+	kPS_dscTitle			= 3,
+	kPS_docInfoCreator		= 4,
+	kPS_docInfoCreateDate	= 5,
+	kPS_docInfoModDate		= 6,
+	kPS_docInfoAuthor		= 7,
+	kPS_docInfoTitle		= 8,
+	kPS_docInfoSubject		= 9,
+	kPS_docInfoKeywords		= 10,
+	kPS_MaxNativeIndexValue 
+};
+
+static XMP_Uns64 nativeIndextoFlag[]={	kPS_CreatorTool,
+										kPS_CreateDate,
+										kPS_Creator,
+										kPS_Title,
+										kPS_CreatorTool,
+										kPS_CreateDate,
+										kPS_ModifyDate,
+										kPS_Creator,
+										kPS_Title,
+										kPS_Description,
+										kPS_Subject
+									};
+
+static const std::string kPSFileTag    = "%!PS-Adobe-";
+static const std::string kPSContainsXMPString = "%ADO_ContainsXMP:";
+static const std::string kPSContainsBBoxString = "%%BoundingBox:";
+static const std::string kPSContainsBeginDocString = "%%BeginDocument:";
+static const std::string kPSContainsEndDocString = "%%EndDocument";
+static const std::string kPSContainsTrailerString = "%%Trailer";
+static const std::string kPSContainsCreatorString = "%%Creator:";
+static const std::string kPSContainsCreateDateString = "%%CreationDate:";
+static const std::string kPSContainsForString = "%%For:";
+static const std::string kPSContainsTitleString = "%%Title:";
+static const std::string kPSContainsAtendString = "(atend)";
+static const std::string kPSEndCommentString  = "%%EndComments";	// ! Assumed shorter than kPSContainsXMPString.
+static const std::string kPSContainsDocInfoString  = "/DOCINFO";	
+static const std::string kPSContainsPdfmarkString  = "pdfmark";	
+static const std::string kPS_XMPHintMainFirst="%ADO_ContainsXMP: MainFirst\n";
+static const std::string kPS_XMPHintMainLast="%ADO_ContainsXMP: MainLast\n";
+
+// For new xpacket injection into the EPS file is done in Postscript using the pdfmark operator
+// There are different conventions described for EPS and PS files in XMP Spec part 3.
+// The tokens kEPS_Injectdata1, kEPS_Injectdata2 and kEPS_Injectdata3 are used to
+// embedd xpacket in EPS files.the xpacket is written inbetween kEPS_Injectdata1 and kEPS_Injectdata2.
+// The tokens kPS_Injectdata1 and kPS_Injectdata2 are used to embedd xpacket in DSC compliant PS files
+// The code inside the tokens is taken from examples in XMP Spec part 3 
+// section 2.6.2 PS, EPS (PostScript� and Encapsulated PostScript)
+static const std::string kEPS_Injectdata1="\n/currentdistillerparams where\n"
+"{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse\n"
+"{userdict /EPSHandler1_pdfmark /cleartomark load put\n"
+"userdict /EPSHandler1_ReadMetadata_pdfmark {flushfile cleartomark} bind put}\n"
+"{ userdict /EPSHandler1_pdfmark /pdfmark load put\n"
+"userdict /EPSHandler1_ReadMetadata_pdfmark {/PUT pdfmark} bind put } ifelse\n"
+"[/NamespacePush EPSHandler1_pdfmark\n"
+"[/_objdef {eps_metadata_stream} /type /stream /OBJ EPSHandler1_pdfmark\n"
+"[{eps_metadata_stream} 2 dict begin\n"
+"/Type /Metadata def /Subtype /XML def currentdict end /PUT EPSHandler1_pdfmark\n"
+"[{eps_metadata_stream}\n"
+"currentfile 0 (% &&end EPS XMP packet marker&&)\n"
+"/SubFileDecode filter EPSHandler1_ReadMetadata_pdfmark\n";
+
+static const std::string kPS_Injectdata1="\n/currentdistillerparams where\n"
+"{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse\n"
+"{userdict /PSHandler1_pdfmark /cleartomark load put\n"
+"userdict /PSHandler1_ReadMetadata_pdfmark {flushfile cleartomark} bind put}\n"
+"{ userdict /PSHandler1_pdfmark /pdfmark load put\n"
+"userdict /PSHandler1_ReadMetadata_pdfmark {/PUT pdfmark} bind put } ifelse\n"
+"[/NamespacePush PSHandler1_pdfmark\n"
+"[/_objdef {ps_metadata_stream} /type /stream /OBJ PSHandler1_pdfmark\n"
+"[{ps_metadata_stream} 2 dict begin\n"
+"/Type /Metadata def /Subtype /XML def currentdict end /PUT PSHandler1_pdfmark\n"
+"[{ps_metadata_stream}\n"
+"currentfile 0 (% &&end PS XMP packet marker&&)\n"
+"/SubFileDecode filter PSHandler1_ReadMetadata_pdfmark\n";
+
+static const std::string kEPS_Injectdata2="\n% &&end EPS XMP packet marker&&\n"
+"[/Document\n"
+"1 dict begin /Metadata {eps_metadata_stream} def\n"
+"currentdict end /BDC EPSHandler1_pdfmark\n"
+"[/NamespacePop EPSHandler1_pdfmark\n";
+
+
+static const std::string kPS_Injectdata2="\n% &&end PS XMP packet marker&&\n"
+"[{Catalog} {ps_metadata_stream} /Metadata PSHandler1_pdfmark\n"
+"[/NamespacePop PSHandler1_pdfmark\n";
+
+static const std::string  kEPS_Injectdata3="\n/currentdistillerparams where\n"
+	"{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse\n"
+	"{userdict /EPSHandler1_pdfmark /cleartomark load put}\n"
+	"{ userdict /EPSHandler1_pdfmark /pdfmark load put} ifelse\n"
+	"[/EMC EPSHandler1_pdfmark\n";
+
+
+namespace PostScript_Support
+{
+	struct Date
+	{
+		short day;
+		short month;
+		short year;
+		short hours;
+		short minutes;
+		short seconds;
+		bool containsOffset;
+		char offsetSign;
+		short offsetHour;
+		short offsetMin;
+		Date(short pday=1,short pmonth=1,short pyear=1900,short phours=0,
+			short pminutes=0,short pseconds=0):day(pday),month(pmonth),
+			year(pyear),hours(phours),minutes(pminutes),seconds(pseconds),
+			containsOffset(false),offsetSign('+'),offsetHour(0),offsetMin(0)
+		{
+		}
+		bool operator==(const Date &a)
+		{
+			return this->day==a.day &&
+				this->month==a.month &&
+				this->year==a.year &&
+				this->hours==a.hours &&
+				this->minutes==a.minutes &&
+				this->seconds==a.seconds &&
+				this->containsOffset==a.containsOffset &&
+				this->offsetSign==a.offsetSign &&
+				this->offsetHour==a.offsetHour &&
+				this->offsetMin==a.offsetMin;
+		}
+	};
+	struct DateTimeTokens
+	{
+		std::string token;
+		short noOfDelimiter;
+		char delimiter;
+		DateTimeTokens(std::string ptoken="",short pnoOfDelimiter=0,char pdelimiter=0):
+		token(ptoken),noOfDelimiter(pnoOfDelimiter),delimiter(pdelimiter)
+		{
+		}
+	};
+
+	//function to parse strings and get date out of it
+	std::string ConvertToDate(const char* inString);
+	// These helpers are similar to RefillBuffer and CheckFileSpace with the difference that the it traverses
+	// the file stream in reverse order
+	void RevRefillBuffer ( XMP_IO* fileRef, IOBuffer* ioBuf );
+	bool RevCheckFileSpace ( XMP_IO* fileRef, IOBuffer* ioBuf, size_t neededLen );
+
+	// function to detect character codes greater than 127 in a string
+	bool HasCodesGT127(const std::string & value);
+	
+	// function moves the file pointer ahead such that it skips all tabs and spaces 
+	bool  SkipTabsAndSpaces(XMP_IO* file,IOBuffer& ioBuf);
+	
+	// function moves the file pointer ahead such that it skips all characters until a newline 
+	bool SkipUntilNewline(XMP_IO* file,IOBuffer& ioBuf);
+	
+	// function to detect character codes greater than 127 in a string
+	bool IsValidPSFile(XMP_IO*    fileRef,XMP_FileFormat &format);
+	
+	// Determines Whether the metadata is embedded using the Sub-FileDecode Approach or no
+	bool IsSFDFilterUsed(XMP_IO* &fileRef, XMP_Int64 xpacketOffset);
+
+} // namespace PostScript_Support
+
+#endif	// __PostScript_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/QuickTime_Support.cpp b/XMPFiles/source/FormatSupport/QuickTime_Support.cpp
new file mode 100644
index 0000000..c735693
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/QuickTime_Support.cpp
@@ -0,0 +1,1332 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#if XMP_MacBuild
+	#include <CoreServices/CoreServices.h>
+#elif XMP_iOSBuild
+    #include <CoreFoundation/CoreFoundation.h>
+    #include "XMPFiles/source/FormatSupport/MacScriptExtracts.h"
+#else
+	#include "XMPFiles/source/FormatSupport/MacScriptExtracts.h"
+#endif
+
+#include "XMPFiles/source/FormatSupport/QuickTime_Support.hpp"
+
+#include "source/UnicodeConversions.hpp"
+#include "source/UnicodeInlines.incl_cpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/XIO.hpp"
+#include "source/EndianUtils.hpp"
+
+// =================================================================================================
+
+static const char * kMacRomanUTF8 [128] = {	// UTF-8 mappings for MacRoman 80..FF.
+	"\xC3\x84", "\xC3\x85", "\xC3\x87", "\xC3\x89", "\xC3\x91", "\xC3\x96", "\xC3\x9C", "\xC3\xA1",
+	"\xC3\xA0", "\xC3\xA2", "\xC3\xA4", "\xC3\xA3", "\xC3\xA5", "\xC3\xA7", "\xC3\xA9", "\xC3\xA8",
+	"\xC3\xAA", "\xC3\xAB", "\xC3\xAD", "\xC3\xAC", "\xC3\xAE", "\xC3\xAF", "\xC3\xB1", "\xC3\xB3",
+	"\xC3\xB2", "\xC3\xB4", "\xC3\xB6", "\xC3\xB5", "\xC3\xBA", "\xC3\xB9", "\xC3\xBB", "\xC3\xBC",
+	"\xE2\x80\xA0", "\xC2\xB0", "\xC2\xA2", "\xC2\xA3", "\xC2\xA7", "\xE2\x80\xA2", "\xC2\xB6", "\xC3\x9F",
+	"\xC2\xAE", "\xC2\xA9", "\xE2\x84\xA2", "\xC2\xB4", "\xC2\xA8", "\xE2\x89\xA0", "\xC3\x86", "\xC3\x98",
+	"\xE2\x88\x9E", "\xC2\xB1", "\xE2\x89\xA4", "\xE2\x89\xA5", "\xC2\xA5", "\xC2\xB5", "\xE2\x88\x82", "\xE2\x88\x91",
+	"\xE2\x88\x8F", "\xCF\x80", "\xE2\x88\xAB", "\xC2\xAA", "\xC2\xBA", "\xCE\xA9", "\xC3\xA6", "\xC3\xB8",
+	"\xC2\xBF", "\xC2\xA1", "\xC2\xAC", "\xE2\x88\x9A", "\xC6\x92", "\xE2\x89\x88", "\xE2\x88\x86", "\xC2\xAB",
+	"\xC2\xBB", "\xE2\x80\xA6", "\xC2\xA0", "\xC3\x80", "\xC3\x83", "\xC3\x95", "\xC5\x92", "\xC5\x93",
+	"\xE2\x80\x93", "\xE2\x80\x94", "\xE2\x80\x9C", "\xE2\x80\x9D", "\xE2\x80\x98", "\xE2\x80\x99", "\xC3\xB7", "\xE2\x97\x8A",
+	"\xC3\xBF", "\xC5\xB8", "\xE2\x81\x84", "\xE2\x82\xAC", "\xE2\x80\xB9", "\xE2\x80\xBA", "\xEF\xAC\x81", "\xEF\xAC\x82",
+	"\xE2\x80\xA1", "\xC2\xB7", "\xE2\x80\x9A", "\xE2\x80\x9E", "\xE2\x80\xB0", "\xC3\x82", "\xC3\x8A", "\xC3\x81",
+	"\xC3\x8B", "\xC3\x88", "\xC3\x8D", "\xC3\x8E", "\xC3\x8F", "\xC3\x8C", "\xC3\x93", "\xC3\x94",
+	"\xEF\xA3\xBF", "\xC3\x92", "\xC3\x9A", "\xC3\x9B", "\xC3\x99", "\xC4\xB1", "\xCB\x86", "\xCB\x9C",
+	"\xC2\xAF", "\xCB\x98", "\xCB\x99", "\xCB\x9A", "\xC2\xB8", "\xCB\x9D", "\xCB\x9B", "\xCB\x87"
+};
+
+static const XMP_Uns32 kMacRomanCP [128] = {	// Unicode codepoints for MacRoman 80..FF.
+	0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
+	0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
+	0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3,
+	0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC,
+	0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF,
+	0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8,
+	0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211,
+	0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8,
+	0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB,
+	0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153,
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA,
+	0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02,
+	0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1,
+	0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4,
+	0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC,	// ! U+F8FF is private use solid Apple icon.
+	0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7
+};
+
+// -------------------------------------------------------------------------------------------------
+
+static const XMP_Uns16 kMacLangToScript_0_94 [95] = {
+
+	/* langEnglish (0) */		smRoman,
+	/* langFrench (1) */		smRoman,
+	/* langGerman (2) */		smRoman,
+	/* langItalian (3) */		smRoman,
+	/* langDutch (4) */			smRoman,
+	/* langSwedish (5) */		smRoman,
+	/* langSpanish (6) */		smRoman,
+	/* langDanish (7) */		smRoman,
+	/* langPortuguese (8) */	smRoman,
+	/* langNorwegian (9) */		smRoman,
+
+	/* langHebrew (10) */		smHebrew,
+	/* langJapanese (11) */		smJapanese,
+	/* langArabic (12) */		smArabic,
+	/* langFinnish (13) */		smRoman,
+	/* langGreek (14) */		smRoman,
+	/* langIcelandic (15) */	smRoman,
+	/* langMaltese (16) */		smRoman,
+	/* langTurkish (17) */		smRoman,
+	/* langCroatian (18) */		smRoman,
+	/* langTradChinese (19) */	smTradChinese,
+
+	/* langUrdu (20) */			smArabic,
+	/* langHindi (21) */		smDevanagari,
+	/* langThai (22) */			smThai,
+	/* langKorean (23) */		smKorean,
+	/* langLithuanian (24) */	smCentralEuroRoman,
+	/* langPolish (25) */		smCentralEuroRoman,
+	/* langHungarian (26) */	smCentralEuroRoman,
+	/* langEstonian (27) */		smCentralEuroRoman,
+	/* langLatvian (28) */		smCentralEuroRoman,
+	/* langSami (29) */			kNoMacScript,	// ! Not known, missing from Apple comments.
+
+	/* langFaroese (30) */		smRoman,
+	/* langFarsi (31) */		smArabic,
+	/* langRussian (32) */		smCyrillic,
+	/* langSimpChinese (33) */	smSimpChinese,
+	/* langFlemish (34) */		smRoman,
+	/* langIrishGaelic (35) */	smRoman,
+	/* langAlbanian (36) */		smRoman,
+	/* langRomanian (37) */		smRoman,
+	/* langCzech (38) */		smCentralEuroRoman,
+	/* langSlovak (39) */		smCentralEuroRoman,
+
+	/* langSlovenian (40) */	smRoman,
+	/* langYiddish (41) */		smHebrew,
+	/* langSerbian (42) */		smCyrillic,
+	/* langMacedonian (43) */	smCyrillic,
+	/* langBulgarian (44) */	smCyrillic,
+	/* langUkrainian (45) */	smCyrillic,
+	/* langBelorussian (46) */	smCyrillic,
+	/* langUzbek (47) */		smCyrillic,
+	/* langKazakh (48) */		smCyrillic,
+	/* langAzerbaijani (49) */	smCyrillic,
+
+	/* langAzerbaijanAr (50) */	smArabic,
+	/* langArmenian (51) */		smArmenian,
+	/* langGeorgian (52) */		smGeorgian,
+	/* langMoldavian (53) */	smCyrillic,
+	/* langKirghiz (54) */		smCyrillic,
+	/* langTajiki (55) */		smCyrillic,
+	/* langTurkmen (56) */		smCyrillic,
+	/* langMongolian (57) */	smMongolian,
+	/* langMongolianCyr (58) */	smCyrillic,
+	/* langPashto (59) */		smArabic,
+
+	/* langKurdish (60) */		smArabic,
+	/* langKashmiri (61) */		smArabic,
+	/* langSindhi (62) */		smArabic,
+	/* langTibetan (63) */		smTibetan,
+	/* langNepali (64) */		smDevanagari,
+	/* langSanskrit (65) */		smDevanagari,
+	/* langMarathi (66) */		smDevanagari,
+	/* langBengali (67) */		smBengali,
+	/* langAssamese (68) */		smBengali,
+	/* langGujarati (69) */		smGujarati,
+
+	/* langPunjabi (70) */		smGurmukhi,
+	/* langOriya (71) */		smOriya,
+	/* langMalayalam (72) */	smMalayalam,
+	/* langKannada (73) */		smKannada,
+	/* langTamil (74) */		smTamil,
+	/* langTelugu (75) */		smTelugu,
+	/* langSinhalese (76) */	smSinhalese,
+	/* langBurmese (77) */		smBurmese,
+	/* langKhmer (78) */		smKhmer,
+	/* langLao (79) */			smLao,
+
+	/* langVietnamese (80) */	smVietnamese,
+	/* langIndonesian (81) */	smRoman,
+	/* langTagalog (82) */		smRoman,
+	/* langMalayRoman (83) */	smRoman,
+	/* langMalayArabic (84) */	smArabic,
+	/* langAmharic (85) */		smEthiopic,
+	/* langTigrinya (86) */		smEthiopic,
+	/* langOromo (87) */		smEthiopic,
+	/* langSomali (88) */		smRoman,
+	/* langSwahili (89) */		smRoman,
+
+	/* langKinyarwanda (90) */	smRoman,
+	/* langRundi (91) */		smRoman,
+	/* langNyanja (92) */		smRoman,
+	/* langMalagasy (93) */		smRoman,
+	/* langEsperanto (94) */	smRoman
+
+};	// kMacLangToScript_0_94
+
+static const XMP_Uns16 kMacLangToScript_128_151 [24] = {
+
+	/* langWelsh (128) */				smRoman,
+	/* langBasque (129) */				smRoman,
+
+	/* langCatalan (130) */				smRoman,
+	/* langLatin (131) */				smRoman,
+	/* langQuechua (132) */				smRoman,
+	/* langGuarani (133) */				smRoman,
+	/* langAymara (134) */				smRoman,
+	/* langTatar (135) */				smCyrillic,
+	/* langUighur (136) */				smArabic,
+	/* langDzongkha (137) */			smTibetan,
+	/* langJavaneseRom (138) */			smRoman,
+	/* langSundaneseRom (139) */		smRoman,
+
+	/* langGalician (140) */			smRoman,
+	/* langAfrikaans (141) */			smRoman,
+	/* langBreton (142) */				smRoman,
+	/* langInuktitut (143) */			smEthiopic,
+	/* langScottishGaelic (144) */		smRoman,
+	/* langManxGaelic (145) */			smRoman,
+	/* langIrishGaelicScript (146) */	smRoman,
+	/* langTongan (147) */				smRoman,
+	/* langGreekAncient (148) */		smGreek,
+	/* langGreenlandic (149) */			smRoman,
+
+	/* langAzerbaijanRoman (150) */		smRoman,
+	/* langNynorsk (151) */				smRoman
+	
+};	// kMacLangToScript_128_151
+
+// -------------------------------------------------------------------------------------------------
+
+static const char * kMacToXMPLang_0_94 [95] = {
+
+	/* langEnglish (0) */		"en",
+	/* langFrench (1) */		"fr",
+	/* langGerman (2) */		"de",
+	/* langItalian (3) */		"it",
+	/* langDutch (4) */			"nl",
+	/* langSwedish (5) */		"sv",
+	/* langSpanish (6) */		"es",
+	/* langDanish (7) */		"da",
+	/* langPortuguese (8) */	"pt",
+	/* langNorwegian (9) */		"no",
+
+	/* langHebrew (10) */		"he",
+	/* langJapanese (11) */		"ja",
+	/* langArabic (12) */		"ar",
+	/* langFinnish (13) */		"fi",
+	/* langGreek (14) */		"el",
+	/* langIcelandic (15) */	"is",
+	/* langMaltese (16) */		"mt",
+	/* langTurkish (17) */		"tr",
+	/* langCroatian (18) */		"hr",
+	/* langTradChinese (19) */	"zh",
+
+	/* langUrdu (20) */			"ur",
+	/* langHindi (21) */		"hi",
+	/* langThai (22) */			"th",
+	/* langKorean (23) */		"ko",
+	/* langLithuanian (24) */	"lt",
+	/* langPolish (25) */		"pl",
+	/* langHungarian (26) */	"hu",
+	/* langEstonian (27) */		"et",
+	/* langLatvian (28) */		"lv",
+	/* langSami (29) */			"se",
+
+	/* langFaroese (30) */		"fo",
+	/* langFarsi (31) */		"fa",
+	/* langRussian (32) */		"ru",
+	/* langSimpChinese (33) */	"zh",
+	/* langFlemish (34) */		"nl",
+	/* langIrishGaelic (35) */	"ga",
+	/* langAlbanian (36) */		"sq",
+	/* langRomanian (37) */		"ro",
+	/* langCzech (38) */		"cs",
+	/* langSlovak (39) */		"sk",
+
+	/* langSlovenian (40) */	"sl",
+	/* langYiddish (41) */		"yi",
+	/* langSerbian (42) */		"sr",
+	/* langMacedonian (43) */	"mk",
+	/* langBulgarian (44) */	"bg",
+	/* langUkrainian (45) */	"uk",
+	/* langBelorussian (46) */	"be",
+	/* langUzbek (47) */		"uz",
+	/* langKazakh (48) */		"kk",
+	/* langAzerbaijani (49) */	"az",
+
+	/* langAzerbaijanAr (50) */	"az",
+	/* langArmenian (51) */		"hy",
+	/* langGeorgian (52) */		"ka",
+	/* langMoldavian (53) */	"ro",
+	/* langKirghiz (54) */		"ky",
+	/* langTajiki (55) */		"tg",
+	/* langTurkmen (56) */		"tk",
+	/* langMongolian (57) */	"mn",
+	/* langMongolianCyr (58) */	"mn",
+	/* langPashto (59) */		"ps",
+
+	/* langKurdish (60) */		"ku",
+	/* langKashmiri (61) */		"ks",
+	/* langSindhi (62) */		"sd",
+	/* langTibetan (63) */		"bo",
+	/* langNepali (64) */		"ne",
+	/* langSanskrit (65) */		"sa",
+	/* langMarathi (66) */		"mr",
+	/* langBengali (67) */		"bn",
+	/* langAssamese (68) */		"as",
+	/* langGujarati (69) */		"gu",
+
+	/* langPunjabi (70) */		"pa",
+	/* langOriya (71) */		"or",
+	/* langMalayalam (72) */	"ml",
+	/* langKannada (73) */		"kn",
+	/* langTamil (74) */		"ta",
+	/* langTelugu (75) */		"te",
+	/* langSinhalese (76) */	"si",
+	/* langBurmese (77) */		"my",
+	/* langKhmer (78) */		"km",
+	/* langLao (79) */			"lo",
+
+	/* langVietnamese (80) */	"vi",
+	/* langIndonesian (81) */	"id",
+	/* langTagalog (82) */		"tl",
+	/* langMalayRoman (83) */	"ms",
+	/* langMalayArabic (84) */	"ms",
+	/* langAmharic (85) */		"am",
+	/* langTigrinya (86) */		"ti",
+	/* langOromo (87) */		"om",
+	/* langSomali (88) */		"so",
+	/* langSwahili (89) */		"sw",
+
+	/* langKinyarwanda (90) */	"rw",
+	/* langRundi (91) */		"rn",
+	/* langNyanja (92) */		"ny",
+	/* langMalagasy (93) */		"mg",
+	/* langEsperanto (94) */	"eo"
+
+};	// kMacToXMPLang_0_94
+
+static const char * kMacToXMPLang_128_151 [24] = {
+
+	/* langWelsh (128) */				"cy",
+	/* langBasque (129) */				"eu",
+
+	/* langCatalan (130) */				"ca",
+	/* langLatin (131) */				"la",
+	/* langQuechua (132) */				"qu",
+	/* langGuarani (133) */				"gn",
+	/* langAymara (134) */				"ay",
+	/* langTatar (135) */				"tt",
+	/* langUighur (136) */				"ug",
+	/* langDzongkha (137) */			"dz",
+	/* langJavaneseRom (138) */			"jv",
+	/* langSundaneseRom (139) */		"su",
+
+	/* langGalician (140) */			"gl",
+	/* langAfrikaans (141) */			"af",
+	/* langBreton (142) */				"br",
+	/* langInuktitut (143) */			"iu",
+	/* langScottishGaelic (144) */		"gd",
+	/* langManxGaelic (145) */			"gv",
+	/* langIrishGaelicScript (146) */	"ga",
+	/* langTongan (147) */				"to",
+	/* langGreekAncient (148) */		"",		// ! Has no ISO 639-1 2 letter code.
+	/* langGreenlandic (149) */			"kl",
+
+	/* langAzerbaijanRoman (150) */		"az",
+	/* langNynorsk (151) */				"nn"
+	
+};	// kMacToXMPLang_128_151
+
+// -------------------------------------------------------------------------------------------------
+
+#if XMP_WinBuild
+
+static UINT kMacScriptToWinCP[33] = {
+	/* smRoman (0) */				10000,	// There don't seem to be symbolic constants.
+	/* smJapanese (1) */			10001,	// From http://msdn.microsoft.com/en-us/library/dd317756(VS.85).aspx
+	/* smTradChinese (2) */			10002,
+	/* smKorean (3) */				10003,
+	/* smArabic (4) */				10004,
+	/* smHebrew (5) */				10005,
+	/* smGreek (6) */				10006,
+	/* smCyrillic (7) */			10007,
+	/* smRSymbol (8) */				0,
+	/* smDevanagari (9) */			0,
+	/* smGurmukhi (10) */			0,
+	/* smGujarati (11) */			0,
+	/* smOriya (12) */				0,
+	/* smBengali (13) */			0,
+	/* smTamil (14) */				0,
+	/* smTelugu (15) */				0,
+	/* smKannada (16) */			0,
+	/* smMalayalam (17) */			0,
+	/* smSinhalese (18) */			0,
+	/* smBurmese (19) */			0,
+	/* smKhmer (20) */				0,
+	/* smThai (21) */				10021,
+	/* smLao (22) */				0,
+	/* smGeorgian (23) */			0,
+	/* smArmenian (24) */			0,
+	/* smSimpChinese (25) */		10008,
+	/* smTibetan (26) */			0,
+	/* smMongolian (27) */			0,
+	/* smEthiopic/smGeez (28) */	0,
+	/* smCentralEuroRoman (29) */	10029,
+	/* smVietnamese (30) */			0,
+	/* smExtArabic (31) */			0,
+	/* smUninterp (32) */			0
+};	// kMacScriptToWinCP
+
+static UINT kMacToWinCP_0_94 [95] = {
+
+	/* langEnglish (0) */		0,
+	/* langFrench (1) */		0,
+	/* langGerman (2) */		0,
+	/* langItalian (3) */		0,
+	/* langDutch (4) */			0,
+	/* langSwedish (5) */		0,
+	/* langSpanish (6) */		0,
+	/* langDanish (7) */		0,
+	/* langPortuguese (8) */	0,
+	/* langNorwegian (9) */		0,
+
+	/* langHebrew (10) */		10005,
+	/* langJapanese (11) */		10001,
+	/* langArabic (12) */		10004,
+	/* langFinnish (13) */		0,
+	/* langGreek (14) */		10006,
+	/* langIcelandic (15) */	10079,
+	/* langMaltese (16) */		0,
+	/* langTurkish (17) */		10081,
+	/* langCroatian (18) */		10082,
+	/* langTradChinese (19) */	10002,
+
+	/* langUrdu (20) */			0,
+	/* langHindi (21) */		0,
+	/* langThai (22) */			10021,
+	/* langKorean (23) */		10003,
+	/* langLithuanian (24) */	0,
+	/* langPolish (25) */		0,
+	/* langHungarian (26) */	0,
+	/* langEstonian (27) */		0,
+	/* langLatvian (28) */		0,
+	/* langSami (29) */			0,
+
+	/* langFaroese (30) */		0,
+	/* langFarsi (31) */		0,
+	/* langRussian (32) */		0,
+	/* langSimpChinese (33) */	10008,
+	/* langFlemish (34) */		0,
+	/* langIrishGaelic (35) */	0,
+	/* langAlbanian (36) */		0,
+	/* langRomanian (37) */		10010,
+	/* langCzech (38) */		0,
+	/* langSlovak (39) */		0,
+
+	/* langSlovenian (40) */	0,
+	/* langYiddish (41) */		0,
+	/* langSerbian (42) */		0,
+	/* langMacedonian (43) */	0,
+	/* langBulgarian (44) */	0,
+	/* langUkrainian (45) */	10017,
+	/* langBelorussian (46) */	0,
+	/* langUzbek (47) */		0,
+	/* langKazakh (48) */		0,
+	/* langAzerbaijani (49) */	0,
+
+	/* langAzerbaijanAr (50) */	0,
+	/* langArmenian (51) */		0,
+	/* langGeorgian (52) */		0,
+	/* langMoldavian (53) */	0,
+	/* langKirghiz (54) */		0,
+	/* langTajiki (55) */		0,
+	/* langTurkmen (56) */		0,
+	/* langMongolian (57) */	0,
+	/* langMongolianCyr (58) */	0,
+	/* langPashto (59) */		0,
+
+	/* langKurdish (60) */		0,
+	/* langKashmiri (61) */		0,
+	/* langSindhi (62) */		0,
+	/* langTibetan (63) */		0,
+	/* langNepali (64) */		0,
+	/* langSanskrit (65) */		0,
+	/* langMarathi (66) */		0,
+	/* langBengali (67) */		0,
+	/* langAssamese (68) */		0,
+	/* langGujarati (69) */		0,
+
+	/* langPunjabi (70) */		0,
+	/* langOriya (71) */		0,
+	/* langMalayalam (72) */	0,
+	/* langKannada (73) */		0,
+	/* langTamil (74) */		0,
+	/* langTelugu (75) */		0,
+	/* langSinhalese (76) */	0,
+	/* langBurmese (77) */		0,
+	/* langKhmer (78) */		0,
+	/* langLao (79) */			0,
+
+	/* langVietnamese (80) */	0,
+	/* langIndonesian (81) */	0,
+	/* langTagalog (82) */		0,
+	/* langMalayRoman (83) */	0,
+	/* langMalayArabic (84) */	0,
+	/* langAmharic (85) */		0,
+	/* langTigrinya (86) */		0,
+	/* langOromo (87) */		0,
+	/* langSomali (88) */		0,
+	/* langSwahili (89) */		0,
+
+	/* langKinyarwanda (90) */	0,
+	/* langRundi (91) */		0,
+	/* langNyanja (92) */		0,
+	/* langMalagasy (93) */		0,
+	/* langEsperanto (94) */	0
+
+};	// kMacToWinCP_0_94
+
+#endif
+
+
+#if XMP_iOSBuild
+
+static XMP_Uns32 kMacScriptToIOSEncodingCF[33] = {
+	/* smRoman (0) */				kCFStringEncodingMacRoman,
+	/* smJapanese (1) */			kCFStringEncodingMacJapanese,
+	/* smTradChinese (2) */			kCFStringEncodingMacChineseTrad,
+	/* smKorean (3) */				kCFStringEncodingMacKorean,
+	/* smArabic (4) */				kCFStringEncodingMacArabic,
+	/* smHebrew (5) */				kCFStringEncodingMacHebrew,
+	/* smGreek (6) */				kCFStringEncodingMacGreek,
+	/* smCyrillic (7) */			kCFStringEncodingMacCyrillic,
+	/* smRSymbol (8) */				kCFStringEncodingMacSymbol,
+	/* smDevanagari (9) */			kCFStringEncodingMacDevanagari,
+	/* smGurmukhi (10) */			kCFStringEncodingMacGurmukhi,
+	/* smGujarati (11) */			kCFStringEncodingMacGujarati,
+	/* smOriya (12) */				kCFStringEncodingMacOriya,
+	/* smBengali (13) */			kCFStringEncodingMacBengali,
+	/* smTamil (14) */				kCFStringEncodingMacTamil,
+	/* smTelugu (15) */				kCFStringEncodingMacTelugu,
+	/* smKannada (16) */			kCFStringEncodingMacKannada,
+	/* smMalayalam (17) */			kCFStringEncodingMacMalayalam,
+	/* smSinhalese (18) */			kCFStringEncodingMacSinhalese,
+	/* smBurmese (19) */			kCFStringEncodingMacBurmese,
+	/* smKhmer (20) */				kCFStringEncodingMacKhmer,
+	/* smThai (21) */				kCFStringEncodingMacThai,
+	/* smLao (22) */				kCFStringEncodingMacLaotian,
+	/* smGeorgian (23) */			kCFStringEncodingMacGeorgian,
+	/* smArmenian (24) */			kCFStringEncodingMacArmenian,
+	/* smSimpChinese (25) */		kCFStringEncodingMacChineseSimp,
+	/* smTibetan (26) */			kCFStringEncodingMacTibetan,
+	/* smMongolian (27) */			kCFStringEncodingMacMongolian,
+	/* smEthiopic/smGeez (28) */	kCFStringEncodingMacEthiopic,
+	/* smCentralEuroRoman (29) */	kCFStringEncodingMacCentralEurRoman,
+	/* smVietnamese (30) */			kCFStringEncodingMacVietnamese,
+	/* smExtArabic (31) */			kCFStringEncodingMacExtArabic,
+	/* smUninterp (32) */           kCFStringEncodingMacVT100
+};	// kMacScriptToIOSEncodingCF
+
+static XMP_Uns32 kMacToIOSEncodingCF_0_94 [95] = {
+    
+	/* langEnglish (0) */		kCFStringEncodingMacRoman,
+	/* langFrench (1) */		kCFStringEncodingMacRoman,
+	/* langGerman (2) */		kCFStringEncodingMacRoman,
+	/* langItalian (3) */		kCFStringEncodingMacRoman,
+	/* langDutch (4) */			kCFStringEncodingMacRoman,
+	/* langSwedish (5) */		kCFStringEncodingMacRoman,
+	/* langSpanish (6) */		kCFStringEncodingMacRoman,
+	/* langDanish (7) */		kCFStringEncodingMacRoman,
+	/* langPortuguese (8) */	kCFStringEncodingMacRoman,
+	/* langNorwegian (9) */		kCFStringEncodingMacRoman,
+    
+	/* langHebrew (10) */		kCFStringEncodingMacHebrew,
+	/* langJapanese (11) */		kCFStringEncodingMacJapanese,
+	/* langArabic (12) */		kCFStringEncodingMacArabic,
+	/* langFinnish (13) */		kCFStringEncodingMacRoman,
+	/* langGreek (14) */		kCFStringEncodingMacGreek,
+	/* langIcelandic (15) */	kCFStringEncodingMacIcelandic,
+	/* langMaltese (16) */		kCFStringEncodingMacRoman,
+	/* langTurkish (17) */		kCFStringEncodingMacTurkish,
+	/* langCroatian (18) */		kCFStringEncodingMacCroatian,
+	/* langTradChinese (19) */	kCFStringEncodingMacChineseTrad,
+    
+	/* langUrdu (20) */			kCFStringEncodingMacArabic,
+	/* langHindi (21) */		kCFStringEncodingMacDevanagari,
+	/* langThai (22) */			kCFStringEncodingMacThai,
+	/* langKorean (23) */		kCFStringEncodingMacKorean,
+	/* langLithuanian (24) */	kCFStringEncodingMacCentralEurRoman,
+	/* langPolish (25) */		kCFStringEncodingMacCentralEurRoman,
+	/* langHungarian (26) */	kCFStringEncodingMacCentralEurRoman,
+	/* langEstonian (27) */		kCFStringEncodingMacCentralEurRoman,
+	/* langLatvian (28) */		kCFStringEncodingMacCentralEurRoman,
+	/* langSami (29) */			kCFStringEncodingInvalidId,
+    
+	/* langFaroese (30) */		kCFStringEncodingMacRoman,
+	/* langFarsi (31) */		kCFStringEncodingMacFarsi,
+	/* langRussian (32) */		kCFStringEncodingMacCyrillic,
+	/* langSimpChinese (33) */	kCFStringEncodingMacChineseSimp,
+	/* langFlemish (34) */		kCFStringEncodingMacRoman,
+	/* langIrishGaelic (35) */	kCFStringEncodingMacRoman,
+	/* langAlbanian (36) */		kCFStringEncodingMacRoman,
+	/* langRomanian (37) */		kCFStringEncodingMacRomanian,
+	/* langCzech (38) */		kCFStringEncodingMacCentralEurRoman,
+	/* langSlovak (39) */		kCFStringEncodingMacCentralEurRoman,
+    
+	/* langSlovenian (40) */	kCFStringEncodingMacRoman,
+	/* langYiddish (41) */		kCFStringEncodingMacHebrew,
+	/* langSerbian (42) */		kCFStringEncodingMacCyrillic,
+	/* langMacedonian (43) */	kCFStringEncodingMacCyrillic,
+	/* langBulgarian (44) */	kCFStringEncodingMacCyrillic,
+	/* langUkrainian (45) */	kCFStringEncodingMacUkrainian,
+	/* langBelorussian (46) */	kCFStringEncodingMacCyrillic,
+	/* langUzbek (47) */		kCFStringEncodingMacCyrillic,
+	/* langKazakh (48) */		kCFStringEncodingMacCyrillic,
+	/* langAzerbaijani (49) */	kCFStringEncodingMacCyrillic,
+    
+	/* langAzerbaijanAr (50) */	kCFStringEncodingMacArabic,
+	/* langArmenian (51) */		kCFStringEncodingMacArmenian,
+	/* langGeorgian (52) */		kCFStringEncodingMacGeorgian,
+	/* langMoldavian (53) */	kCFStringEncodingMacCyrillic,
+	/* langKirghiz (54) */		kCFStringEncodingMacCyrillic,
+	/* langTajiki (55) */		kCFStringEncodingMacCyrillic,
+	/* langTurkmen (56) */		kCFStringEncodingMacCyrillic,
+	/* langMongolian (57) */	kCFStringEncodingMacMongolian,
+	/* langMongolianCyr (58) */	kCFStringEncodingMacCyrillic,
+	/* langPashto (59) */		kCFStringEncodingMacArabic,
+    
+	/* langKurdish (60) */		kCFStringEncodingMacArabic,
+	/* langKashmiri (61) */		kCFStringEncodingMacArabic,
+	/* langSindhi (62) */		kCFStringEncodingMacArabic,
+	/* langTibetan (63) */		kCFStringEncodingMacTibetan,
+	/* langNepali (64) */		kCFStringEncodingMacDevanagari,
+	/* langSanskrit (65) */		kCFStringEncodingMacDevanagari,
+	/* langMarathi (66) */		kCFStringEncodingMacDevanagari,
+	/* langBengali (67) */		kCFStringEncodingMacBengali,
+	/* langAssamese (68) */		kCFStringEncodingMacBengali,
+	/* langGujarati (69) */		kCFStringEncodingMacGujarati,
+    
+	/* langPunjabi (70) */		kCFStringEncodingMacGurmukhi,
+	/* langOriya (71) */		kCFStringEncodingMacOriya,
+	/* langMalayalam (72) */	kCFStringEncodingMacMalayalam,
+	/* langKannada (73) */		kCFStringEncodingMacKannada,
+	/* langTamil (74) */		kCFStringEncodingMacTamil,
+	/* langTelugu (75) */		kCFStringEncodingMacTelugu,
+	/* langSinhalese (76) */	kCFStringEncodingMacSinhalese,
+	/* langBurmese (77) */		kCFStringEncodingMacBurmese,
+	/* langKhmer (78) */		kCFStringEncodingMacKhmer,
+	/* langLao (79) */			kCFStringEncodingMacLaotian,
+    
+	/* langVietnamese (80) */	kCFStringEncodingMacVietnamese,
+	/* langIndonesian (81) */	kCFStringEncodingMacRoman,
+	/* langTagalog (82) */		kCFStringEncodingMacRoman,
+	/* langMalayRoman (83) */	kCFStringEncodingMacRoman,
+	/* langMalayArabic (84) */	kCFStringEncodingMacArabic,
+	/* langAmharic (85) */		kCFStringEncodingMacEthiopic,
+	/* langTigrinya (86) */		kCFStringEncodingMacEthiopic,
+	/* langOromo (87) */		kCFStringEncodingMacEthiopic,
+	/* langSomali (88) */		kCFStringEncodingMacRoman,
+	/* langSwahili (89) */		kCFStringEncodingMacRoman,
+    
+	/* langKinyarwanda (90) */	kCFStringEncodingMacRoman,
+	/* langRundi (91) */		kCFStringEncodingMacRoman,
+	/* langNyanja (92) */		kCFStringEncodingMacRoman,
+	/* langMalagasy (93) */		kCFStringEncodingMacRoman,
+	/* langEsperanto (94) */	kCFStringEncodingMacRoman
+    
+};	// kMacToIOSEncodingCF_0_94
+
+#endif
+
+// =================================================================================================
+// GetMacScript
+// ============
+
+static XMP_Uns16 GetMacScript ( XMP_Uns16 macLang )
+{
+	XMP_Uns16 macScript = kNoMacScript;
+	
+	if ( macLang <= 94 ) {
+		macScript = kMacLangToScript_0_94[macLang];
+	} else if ( (128 <= macLang) && (macLang <= 151) ) {
+		macScript = kMacLangToScript_128_151[macLang-128];
+	}
+	
+	return macScript;
+	
+}	// GetMacScript
+
+
+#if XMP_iOSBuild
+// =================================================================================================
+// GetIOSEncodingCF
+// ========
+
+static XMP_Uns32 GetIOSEncodingCF ( XMP_Uns16 macLang )
+{
+	XMP_Uns32 encCF = kCFStringEncodingInvalidId;
+	
+	if ( macLang <= 94 ) encCF = kMacToIOSEncodingCF_0_94[macLang];
+	
+	if ( encCF == kCFStringEncodingInvalidId || !CFStringIsEncodingAvailable(encCF)) {
+		XMP_Uns16 macScript = GetMacScript ( macLang );
+		if ( macScript != kNoMacScript ) encCF = kMacScriptToIOSEncodingCF[macScript];
+	}
+	
+	return encCF;
+	
+}	// GetIOSEncodingCF
+#endif
+
+// =================================================================================================
+// GetWinCP
+// ========
+
+#if XMP_WinBuild
+
+static UINT GetWinCP ( XMP_Uns16 macLang )
+{
+	UINT winCP = 0;
+	
+	if ( macLang <= 94 ) winCP = kMacToWinCP_0_94[macLang];
+	
+	if ( winCP == 0 ) {
+		XMP_Uns16 macScript = GetMacScript ( macLang );
+		if ( macScript != kNoMacScript ) winCP = kMacScriptToWinCP[macScript];
+	}
+	
+	return winCP;
+	
+}	// GetWinCP
+
+#endif
+
+// =================================================================================================
+// GetXMPLang
+// ==========
+
+static XMP_StringPtr GetXMPLang ( XMP_Uns16 macLang )
+{
+	XMP_StringPtr xmpLang = "";
+	
+	if ( macLang <= 94 ) {
+		xmpLang = kMacToXMPLang_0_94[macLang];
+	} else if ( (128 <= macLang) && (macLang <= 151) ) {
+		xmpLang = kMacToXMPLang_128_151[macLang-128];
+	}
+	
+	return xmpLang;
+	
+}	// GetXMPLang
+
+// =================================================================================================
+// GetMacLang
+// ==========
+
+static XMP_Uns16 GetMacLang ( std::string * xmpLang )
+{
+	if ( *xmpLang == "" ) return kNoMacLang;
+	
+	size_t hyphenPos = xmpLang->find ( '-' );	// Make sure the XMP language is "generic".
+	if ( hyphenPos != std::string::npos ) xmpLang->erase ( hyphenPos );
+	
+	for ( XMP_Uns16 i = 0; i <= 94; ++i ) {	// Using std::map would be faster.
+		if ( *xmpLang == kMacToXMPLang_0_94[i] ) return i;
+	}
+	
+	for ( XMP_Uns16 i = 128; i <= 151; ++i ) {	// Using std::map would be faster.
+		if ( *xmpLang == kMacToXMPLang_128_151[i-128] ) return i;
+	}
+	
+	return kNoMacLang;
+	
+}	// GetMacLang
+
+// =================================================================================================
+// MacRomanToUTF8
+// ==============
+
+static void MacRomanToUTF8 ( const std::string & macRoman, std::string * utf8 )
+{
+	utf8->erase();
+	
+	for ( XMP_Uns8* chPtr = (XMP_Uns8*)macRoman.c_str(); *chPtr != 0; ++chPtr ) {	// ! Don't trust that char is unsigned.
+		if ( *chPtr < 0x80 ) {
+			(*utf8) += (char)*chPtr;
+		} else {
+			(*utf8) += kMacRomanUTF8[(*chPtr)-0x80];
+		}
+	}
+
+}	// MacRomanToUTF8
+
+// =================================================================================================
+// UTF8ToMacRoman
+// ==============
+
+static void UTF8ToMacRoman ( const std::string & utf8, std::string * macRoman )
+{
+	macRoman->erase();
+	bool inNonMRSpan = false;
+	
+	for ( const XMP_Uns8 * chPtr = (XMP_Uns8*)utf8.c_str(); *chPtr != 0; ++chPtr ) {	// ! Don't trust that char is unsigned.
+		if ( *chPtr < 0x80 ) {
+			(*macRoman) += (char)*chPtr;
+			inNonMRSpan = false;
+		} else {
+			XMP_Uns32 cp = GetCodePoint ( &chPtr );
+			--chPtr;	// Make room for the loop increment.
+			XMP_Uns8  mr;
+			for ( mr = 0; (mr < 0x80) && (cp != kMacRomanCP[mr]); ++mr ) {};	// Using std::map would be faster.
+			if ( mr < 0x80 ) {
+				(*macRoman) += (char)(mr+0x80);
+				inNonMRSpan = false;
+			} else if ( ! inNonMRSpan ) {
+				(*macRoman) += '?';
+				inNonMRSpan = true;
+			}
+		}
+	}
+
+}	// UTF8ToMacRoman
+
+// =================================================================================================
+// IsMacLangKnown
+// ==============
+
+static inline bool IsMacLangKnown ( XMP_Uns16 macLang )
+{
+	XMP_Uns16 macScript = GetMacScript ( macLang );
+	if ( macScript == kNoMacScript ) return false;
+
+	#if XMP_UNIXBuild
+		if ( macScript != smRoman ) return false;
+	#elif XMP_WinBuild
+		if ( GetWinCP(macLang) == 0 ) return false;
+	#endif
+	
+	return true;
+
+}	// IsMacLangKnown
+
+// =================================================================================================
+// ConvertToMacLang
+// ================
+
+bool ConvertToMacLang ( const std::string & utf8Value, XMP_Uns16 macLang, std::string * macValue )
+{
+	macValue->erase();
+	if ( macLang == kNoMacLang ) macLang = 0;	// *** Zero is English, ought to use the "active" OS lang.
+	if ( ! IsMacLangKnown ( macLang ) ) return false;
+
+	#if XMP_MacBuild
+		XMP_Uns16 macScript = GetMacScript ( macLang );
+		ReconcileUtils::UTF8ToMacEncoding ( macScript, macLang, (XMP_Uns8*)utf8Value.c_str(), utf8Value.size(), macValue );
+	#elif XMP_UNIXBuild
+		UTF8ToMacRoman ( utf8Value, macValue );
+	#elif XMP_WinBuild
+		UINT winCP = GetWinCP ( macLang );
+		ReconcileUtils::UTF8ToWinEncoding ( winCP, (XMP_Uns8*)utf8Value.c_str(), utf8Value.size(), macValue );
+    #elif XMP_iOSBuild
+        XMP_Uns32 iosEncCF = GetIOSEncodingCF(macLang);
+        ReconcileUtils::IOSConvertEncoding(kCFStringEncodingUTF8, iosEncCF, (XMP_Uns8*)utf8Value.c_str(), utf8Value.size(), macValue);
+    #endif
+	
+	return true;
+
+}	// ConvertToMacLang
+
+// =================================================================================================
+// ConvertFromMacLang
+// ==================
+
+bool ConvertFromMacLang ( const std::string & macValue, XMP_Uns16 macLang, std::string * utf8Value )
+{
+	utf8Value->erase();
+	if ( ! IsMacLangKnown ( macLang ) ) return false;
+	
+	#if XMP_MacBuild
+		XMP_Uns16 macScript = GetMacScript ( macLang );
+		ReconcileUtils::MacEncodingToUTF8 ( macScript, macLang, (XMP_Uns8*)macValue.c_str(), macValue.size(), utf8Value );
+	#elif XMP_UNIXBuild
+		MacRomanToUTF8 ( macValue, utf8Value );
+	#elif XMP_WinBuild
+		UINT winCP = GetWinCP ( macLang );
+		ReconcileUtils::WinEncodingToUTF8 ( winCP, (XMP_Uns8*)macValue.c_str(), macValue.size(), utf8Value );
+    #elif XMP_iOSBuild
+        XMP_Uns32 iosEncCF = GetIOSEncodingCF(macLang);
+        ReconcileUtils::IOSConvertEncoding(iosEncCF, kCFStringEncodingUTF8, (XMP_Uns8*)macValue.c_str(), macValue.size(), utf8Value);
+#endif
+	
+	return true;
+
+}	// ConvertFromMacLang
+
+// =================================================================================================
+// =================================================================================================
+// TradQT_Manager
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// TradQT_Manager::ParseCachedBoxes
+// ================================
+//
+// Parse the cached '�...' children of the 'moov'/'udta' box. The contents of each cached box are
+// a sequence of "mini boxes" analogous to XMP AltText arrays. Each mini box has a 16-bit size,
+// 16-bit language code, and text. The size is only the text size. The language codes are Macintosh
+// Script Manager langXyz codes. The text encoding is implicit in the language, see comments in
+// Apple's Script.h header.
+
+bool TradQT_Manager::ParseCachedBoxes ( const MOOV_Manager & moovMgr )
+{
+	MOOV_Manager::BoxInfo udtaInfo;
+	MOOV_Manager::BoxRef  udtaRef = moovMgr.GetBox ( "moov/udta", &udtaInfo );
+	if ( udtaRef == 0 ) return false;
+
+	for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) {
+
+		MOOV_Manager::BoxInfo currInfo;
+		MOOV_Manager::BoxRef  currRef = moovMgr.GetNthChild ( udtaRef, i, &currInfo );
+		if ( currRef == 0 ) break;	// Sanity check, should not happen.
+		if ( (currInfo.boxType >> 24) != 0xA9 ) continue;
+		if ( currInfo.contentSize < 2+2+1 ) continue;	// Want enough for a non-empty value.
+		
+		InfoMapPos newInfo = this->parsedBoxes.insert ( this->parsedBoxes.end(),
+														InfoMap::value_type ( currInfo.boxType, ParsedBoxInfo ( currInfo.boxType ) ) );
+		std::vector<ValueInfo> * newValues = &newInfo->second.values;
+		
+		XMP_Uns8 * boxPtr = (XMP_Uns8*) currInfo.content;
+		XMP_Uns8 * boxEnd = boxPtr + currInfo.contentSize;
+		XMP_Uns16 miniLen, macLang;
+
+		for ( ; boxPtr < boxEnd-4; boxPtr += miniLen ) {
+
+			miniLen = 4 + GetUns16BE ( boxPtr );	// ! Include header in local miniLen.
+			macLang  = GetUns16BE ( boxPtr+2);
+			if ( (miniLen <= 4) || (miniLen > (boxEnd - boxPtr)) )
+				break;	// Ignore bad or empty values.
+			
+			XMP_StringPtr valuePtr = (char*)(boxPtr+4);
+			size_t valueLen = miniLen - 4;
+
+			newValues->push_back ( ValueInfo() );
+			ValueInfo * newValue = &newValues->back();
+			
+			// Only set the XMP language if the Mac script is known, i.e. the value can be converted.
+			
+			newValue->macLang = macLang;
+			if ( IsMacLangKnown ( macLang ) ) newValue->xmpLang = GetXMPLang ( macLang );
+			newValue->macValue.assign ( valuePtr, valueLen );
+
+		}
+
+	}
+	
+	return (! this->parsedBoxes.empty());
+
+}	// TradQT_Manager::ParseCachedBoxes
+
+// =================================================================================================
+// TradQT_Manager::ImportSimpleXMP
+// ===============================
+//
+// Update a simple XMP property if the QT value looks newer.
+
+bool TradQT_Manager::ImportSimpleXMP ( XMP_Uns32 id, SXMPMeta * xmp, XMP_StringPtr ns, XMP_StringPtr prop ) const
+{
+
+	try {
+
+		InfoMapCPos infoPos = this->parsedBoxes.find ( id );
+		if ( infoPos == this->parsedBoxes.end() ) return false;
+		if ( infoPos->second.values.empty() ) return false;
+		
+		std::string xmpValue, tempValue;
+		XMP_OptionBits flags;
+		bool xmpExists = xmp->GetProperty ( ns, prop, &xmpValue, &flags );
+		if ( xmpExists && (! XMP_PropIsSimple ( flags )) ) {
+			XMP_Throw ( "TradQT_Manager::ImportSimpleXMP - XMP property must be simple", kXMPErr_BadParam );
+		}
+		
+		bool convertOK;
+		const ValueInfo & qtItem = infoPos->second.values[0];	// ! Use the first QT entry.
+	
+		if ( xmpExists ) {
+			convertOK = ConvertToMacLang ( xmpValue, qtItem.macLang, &tempValue );
+			if ( ! convertOK ) return false;	// throw?
+			if ( tempValue == qtItem.macValue ) return false;	// QT value matches back converted XMP value.
+		}
+	
+		convertOK = ConvertFromMacLang ( qtItem.macValue, qtItem.macLang, &tempValue );
+		if ( ! convertOK ) return false;	// throw?
+		xmp->SetProperty ( ns, prop, tempValue.c_str() );
+		return true;
+	
+	} catch ( ... ) {
+
+		return false;	// Don't let one failure abort other imports.	
+	
+	}
+		
+}	// TradQT_Manager::ImportSimpleXMP
+
+// =================================================================================================
+// TradQT_Manager::ImportLangItem
+// ==============================
+//
+// Update a specific XMP AltText item if the QuickTime value looks newer.
+
+bool TradQT_Manager::ImportLangItem ( const ValueInfo & qtItem, SXMPMeta * xmp,
+									  XMP_StringPtr ns, XMP_StringPtr langArray ) const
+{
+
+	try {
+
+		XMP_StringPtr genericLang, specificLang;
+		if ( qtItem.xmpLang[0] != 0 ) {
+			genericLang  = qtItem.xmpLang;
+			specificLang = qtItem.xmpLang;
+		} else {
+			genericLang  = "";
+			specificLang = "x-default";
+		}
+	
+		bool convertOK;
+		std::string xmpValue, tempValue, actualLang;
+		bool xmpExists = xmp->GetLocalizedText ( ns, langArray, genericLang, specificLang, &actualLang, &xmpValue, 0 );
+		if ( xmpExists ) {
+			convertOK = ConvertToMacLang ( xmpValue, qtItem.macLang, &tempValue );
+			if ( ! convertOK ) return false;	// throw?
+			if ( tempValue == qtItem.macValue ) return true;	// QT value matches back converted XMP value.
+			specificLang = actualLang.c_str();
+		}
+	
+		convertOK = ConvertFromMacLang ( qtItem.macValue, qtItem.macLang, &tempValue );
+		if ( ! convertOK ) return false;	// throw?
+		xmp->SetLocalizedText ( ns, langArray, "", specificLang, tempValue.c_str() );
+		return true;
+	
+	} catch ( ... ) {
+
+		return false;	// Don't let one failure abort other imports.	
+	
+	}
+
+}	// TradQT_Manager::ImportLangItem
+
+// =================================================================================================
+// TradQT_Manager::ImportLangAltXMP
+// ================================
+//
+// Update items in the XMP array if the QT value looks newer.
+
+bool TradQT_Manager::ImportLangAltXMP ( XMP_Uns32 id, SXMPMeta * xmp, XMP_StringPtr ns, XMP_StringPtr langArray ) const
+{
+
+	try {
+
+		InfoMapCPos infoPos = this->parsedBoxes.find ( id );
+		if ( infoPos == this->parsedBoxes.end() ) return false;
+		if ( infoPos->second.values.empty() ) return false;	// Quit now if there are no values.
+		
+		XMP_OptionBits flags;
+		bool xmpExists = xmp->GetProperty ( ns, langArray, 0, &flags );
+		if ( ! xmpExists ) {
+			xmp->SetProperty ( ns, langArray, 0, kXMP_PropArrayIsAltText );
+		} else if ( ! XMP_ArrayIsAltText ( flags ) ) {
+			XMP_Throw ( "TradQT_Manager::ImportLangAltXMP - XMP array must be AltText", kXMPErr_BadParam );
+		}
+	
+		// Process all of the QT values, looking up the appropriate XMP language for each.
+		
+		bool haveMappings = false;
+		const ValueVector & qtValues = infoPos->second.values;
+		
+		for ( size_t i = 0, limit = qtValues.size(); i < limit; ++i ) {
+			const ValueInfo & qtItem = qtValues[i];
+			if ( *qtItem.xmpLang == 0 ) continue;	// Only do known mappings in the loop.
+			haveMappings |= this->ImportLangItem ( qtItem, xmp, ns, langArray );
+		}
+		
+		if ( ! haveMappings ) {
+			// If nothing mapped, process the first QT item to XMP's "x-default".
+			haveMappings = this->ImportLangItem ( qtValues[0], xmp, ns, langArray );	// ! No xmpLang implies "x-default".
+		}
+	
+		return haveMappings;
+	
+	} catch ( ... ) {
+
+		return false;	// Don't let one failure abort other imports.	
+	
+	}
+
+}	// TradQT_Manager::ImportLangAltXMP
+
+// =================================================================================================
+// TradQT_Manager::ExportSimpleXMP
+// ===============================
+//
+// Export a simple XMP value to the first existing QuickTime item. Delete all of the QT values if the
+// XMP value is empty or the XMP does not exist.
+
+// ! We don't create new QuickTime items since we don't know the language.
+
+void TradQT_Manager::ExportSimpleXMP ( XMP_Uns32 id, const SXMPMeta & xmp, XMP_StringPtr ns, XMP_StringPtr prop,
+									   bool createWithZeroLang /* = false */  )
+{
+	std::string xmpValue, macValue;
+
+	InfoMapPos infoPos = this->parsedBoxes.find ( id );
+	bool qtFound = (infoPos != this->parsedBoxes.end()) && (! infoPos->second.values.empty());
+
+	bool xmpFound = xmp.GetProperty ( ns, prop, &xmpValue, 0 );
+	if ( (! xmpFound) || (xmpValue.empty()) ) {
+		if ( qtFound ) {
+			this->parsedBoxes.erase ( infoPos );
+			this->changed = true;
+		}
+		return;
+	}
+	
+	XMP_Assert ( xmpFound );
+	if ( ! qtFound ) {
+		if ( ! createWithZeroLang ) return;
+		infoPos = this->parsedBoxes.insert ( this->parsedBoxes.end(),
+											 InfoMap::value_type ( id, ParsedBoxInfo ( id ) ) );
+		ValueVector * newValues = &infoPos->second.values;
+		newValues->push_back ( ValueInfo() );
+		ValueInfo * newValue = &newValues->back();
+		newValue->macLang = 0;	// Happens to be langEnglish.
+		newValue->xmpLang = kMacToXMPLang_0_94[0];
+		this->changed = infoPos->second.changed = true;
+	}
+		
+	ValueInfo * qtItem = &infoPos->second.values[0];	// ! Use the first QT entry.
+	if ( ! IsMacLangKnown ( qtItem->macLang ) ) return;
+	
+	bool convertOK = ConvertToMacLang ( xmpValue, qtItem->macLang, &macValue );
+	if ( convertOK && (macValue != qtItem->macValue) ) {
+		qtItem->macValue = macValue;
+		this->changed = infoPos->second.changed = true;
+	}
+	
+}	// TradQT_Manager::ExportSimpleXMP
+
+// =================================================================================================
+// TradQT_Manager::ExportLangAltXMP
+// ================================
+//
+// Export XMP LangAlt array items to QuickTime, where the language and encoding mappings are known.
+// If there are no known language and encoding mappings, map the XMP default item to the first
+// existing QuickTime item.
+
+void TradQT_Manager::ExportLangAltXMP ( XMP_Uns32 id, const SXMPMeta & xmp, XMP_StringPtr ns, XMP_StringPtr langArray )
+{
+	bool haveMappings = false;
+	std::string xmpPath, xmpValue, xmpLang, macValue;
+
+	InfoMapPos infoPos = this->parsedBoxes.find ( id );
+	if ( infoPos == this->parsedBoxes.end() ) {
+		infoPos = this->parsedBoxes.insert ( this->parsedBoxes.end(), 
+											 InfoMap::value_type ( id, ParsedBoxInfo ( id ) ) );
+	}
+	
+	ValueVector * qtValues = &infoPos->second.values;
+	XMP_Index xmpCount = xmp.CountArrayItems ( ns, langArray );
+	bool convertOK;
+
+	if ( xmpCount == 0 ) {
+		// Delete the "mappable" QuickTime items if there are no XMP values. Leave the others alone.
+		for ( int i = (int)qtValues->size()-1; i > 0; --i ) {	// ! Need a signed index.
+			if ( (*qtValues)[i].xmpLang[0] != 0 ) {
+				qtValues->erase ( qtValues->begin() + i );
+				this->changed = infoPos->second.changed = true;
+			}
+		}
+		return;
+	}
+	
+	// Go through the XMP and look for a related macLang QuickTime item to update or create.
+	
+	for ( XMP_Index xmpIndex = 1; xmpIndex <= xmpCount; ++xmpIndex ) {	// ! XMP index starts at 1!
+
+		SXMPUtils::ComposeArrayItemPath ( ns, langArray, xmpIndex, &xmpPath );
+		if ( !xmp.GetProperty ( ns, xmpPath.c_str(), &xmpValue, 0 ) ) continue;
+		xmp.GetQualifier ( ns, xmpPath.c_str(), kXMP_NS_XML, "lang", &xmpLang, 0 );
+		if ( xmpLang == "x-default" ) continue;
+		
+		XMP_Uns16 macLang = GetMacLang ( &xmpLang );
+		if ( macLang == kNoMacLang ) continue;
+		
+		size_t qtIndex, qtLimit;
+		for ( qtIndex = 0, qtLimit = qtValues->size(); qtIndex < qtLimit; ++qtIndex ) {
+			if ( (*qtValues)[qtIndex].macLang == macLang ) break;
+		}
+
+		if ( qtIndex == qtLimit ) {
+			// No existing QuickTime item, try to create one.
+			if ( ! IsMacLangKnown ( macLang ) ) continue;
+			qtValues->push_back ( ValueInfo() );
+			qtIndex = qtValues->size() - 1;
+			ValueInfo * newItem = &((*qtValues)[qtIndex]);
+			newItem->macLang = macLang;
+			newItem->xmpLang = GetXMPLang ( macLang );	// ! Use the 2 character root language.
+		}
+		
+		ValueInfo * qtItem = &((*qtValues)[qtIndex]);
+		qtItem->marked = true;	// Mark it whether updated or not, don't delete it in the next pass.
+
+		convertOK = ConvertToMacLang ( xmpValue, qtItem->macLang, &macValue );
+		if ( convertOK && (macValue != qtItem->macValue) ) {
+			qtItem->macValue.swap ( macValue );	// No need to make a copy.
+			haveMappings = true;
+		}
+
+	}
+	this->changed |= haveMappings;
+	infoPos->second.changed |= haveMappings;
+	
+	// Go through the QuickTime items that are unmarked and delete those that have an xmpLang
+	// and known macScript. Clear all marks.
+
+	for ( int i = (int)qtValues->size()-1; i > 0; --i ) {	// ! Need a signed index.
+		ValueInfo * qtItem = &((*qtValues)[i]);
+		if ( qtItem->marked ) {
+			qtItem->marked = false;
+		} else if ( (qtItem->xmpLang[0] != 0) && IsMacLangKnown ( qtItem->macLang ) ) {
+			qtValues->erase ( qtValues->begin() + i );
+			this->changed = infoPos->second.changed = true;
+		}
+	}
+	
+	// If there were no mappings, export the XMP default item to the first QT item.
+
+	if ( (! haveMappings) && (! qtValues->empty()) ) {
+	
+		bool ok = xmp.GetLocalizedText ( ns, langArray, "", "x-default", 0, &xmpValue, 0 );
+		if ( ! ok ) return;
+		
+		ValueInfo * qtItem = &((*qtValues)[0]);
+		if ( ! IsMacLangKnown ( qtItem->macLang ) ) return;
+		
+		convertOK = ConvertToMacLang ( xmpValue, qtItem->macLang, &macValue );
+		if ( convertOK && (macValue != qtItem->macValue) ) {
+			qtItem->macValue.swap ( macValue );	// No need to make a copy.
+			this->changed = infoPos->second.changed = true;
+		}
+
+	}
+
+}	// TradQT_Manager::ExportLangAltXMP
+
+// =================================================================================================
+// TradQT_Manager::UpdateChangedBoxes
+// ==================================
+
+void TradQT_Manager::UpdateChangedBoxes ( MOOV_Manager * moovMgr )
+{
+	MOOV_Manager::BoxInfo udtaInfo;
+	MOOV_Manager::BoxRef  udtaRef = moovMgr->GetBox ( "moov/udta", &udtaInfo );
+	XMP_Assert ( (udtaRef != 0) || (udtaInfo.childCount == 0) );
+	
+	if ( udtaRef != 0 ) {	// Might not have been a moov/udta box in the parse.
+
+		// First go through the moov/udta/�... children and delete those that are not in the map.
+	
+		for ( XMP_Uns32 ordinal = udtaInfo.childCount; ordinal > 0; --ordinal ) {	// ! Go backwards because of deletions.
+	
+			MOOV_Manager::BoxInfo currInfo;
+			MOOV_Manager::BoxRef  currRef = moovMgr->GetNthChild ( udtaRef, (ordinal-1), &currInfo );
+			if ( currRef == 0 ) break;	// Sanity check, should not happen.
+			if ( (currInfo.boxType >> 24) != 0xA9 ) continue;
+			if ( currInfo.contentSize < 2+2+1 ) continue;	// These were skipped by ParseCachedBoxes.
+			
+			InfoMapPos infoPos = this->parsedBoxes.find ( currInfo.boxType );
+			if ( infoPos == this->parsedBoxes.end() ) moovMgr->DeleteNthChild ( udtaRef, (ordinal-1) );
+		
+		}
+	
+	}
+	
+	// Now go through the changed items in the map and update them in the moov/udta subtree.
+	
+	InfoMapCPos infoPos = this->parsedBoxes.begin();
+	InfoMapCPos infoEnd = this->parsedBoxes.end();
+	
+	for ( ; infoPos != infoEnd; ++infoPos ) {
+
+		ParsedBoxInfo * qtItem = (ParsedBoxInfo*) &infoPos->second;
+		if ( ! qtItem->changed ) continue;
+		qtItem->changed = false;
+		
+		XMP_Uns32 qtTotalSize = 0;	// Total size of the QT values, ignoring empty values.
+		for ( size_t i = 0, limit = qtItem->values.size(); i < limit; ++i ) {
+			if ( ! qtItem->values[i].macValue.empty() ) {
+				if ( qtItem->values[i].macValue.size() > 0xFFFF ) qtItem->values[i].macValue.erase ( 0xFFFF );
+				qtTotalSize += (XMP_Uns32)(2+2 + qtItem->values[i].macValue.size());
+			}
+		}
+		
+		if ( udtaRef == 0 ) {	// Might not have been a moov/udta box in the parse.
+			moovMgr->SetBox ( "moov/udta", 0, 0 );
+			udtaRef = moovMgr->GetBox ( "moov/udta", &udtaInfo );
+			XMP_Assert ( udtaRef != 0 );
+		}
+		
+		if ( qtTotalSize == 0 ) {
+		
+			moovMgr->DeleteTypeChild ( udtaRef, qtItem->id );
+		
+		} else {
+		
+			// Compose the complete box content.
+			
+			RawDataBlock fullValue;
+			fullValue.assign ( qtTotalSize, 0 );
+			XMP_Uns8 * valuePtr = &fullValue[0];
+		
+			for ( size_t i = 0, limit = qtItem->values.size(); i < limit; ++i ) {
+				XMP_Assert ( qtItem->values[i].macValue.size() <= 0xFFFF );
+				XMP_Uns16 textSize = (XMP_Uns16)qtItem->values[i].macValue.size();
+				if ( textSize == 0 ) continue;
+				PutUns16BE ( textSize, valuePtr );									valuePtr += 2;
+				PutUns16BE ( qtItem->values[i].macLang, valuePtr );					valuePtr += 2;
+				memcpy ( valuePtr, qtItem->values[i].macValue.c_str(), textSize );	valuePtr += textSize;
+			}
+			
+			// Look for an existing box to update, else add a new one.
+
+			MOOV_Manager::BoxInfo itemInfo;
+			MOOV_Manager::BoxRef  itemRef = moovMgr->GetTypeChild ( udtaRef, qtItem->id, &itemInfo );
+			
+			if ( itemRef != 0 ) {
+				moovMgr->SetBox ( itemRef, &fullValue[0], qtTotalSize );
+			} else {
+				moovMgr->AddChildBox ( udtaRef, qtItem->id, &fullValue[0], qtTotalSize );
+			}
+			
+		}
+
+	}
+
+}	// TradQT_Manager::UpdateChangedBoxes
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/QuickTime_Support.hpp b/XMPFiles/source/FormatSupport/QuickTime_Support.hpp
new file mode 100644
index 0000000..691e746
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/QuickTime_Support.hpp
@@ -0,0 +1,105 @@
+#ifndef __QuickTime_Support_hpp__
+#define __QuickTime_Support_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include <string>
+#include <vector>
+#include <map>
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp"
+#include "XMPFiles/source/FormatSupport/MOOV_Support.hpp"
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// TradQT_Manager
+// ==============
+
+// Support for selected traditional QuickTime metadata items. The supported items are the children
+// of the 'moov'/'udta' box whose type begins with 0xA9, a MacRoman copyright symbol. Each of these
+// is a box whose contents are a sequence of "mini boxes" analogous to XMP AltText arrays. Each mini
+// box has a 16-bit size, 16-bit language code, and text. The language code values are the old
+// Macintosh Script Manager langXyz codes, the text encoding is implicit, see Mac Script.h.
+
+enum {	// List of recognized items from the QuickTime 'moov'/'udta' box.
+	// These items are defined by Adobe.
+	kQTilst_Reel        = 0xA952454CUL, // '�REL'
+	kQTilst_Timecode    = 0xA954494DUL, // '�TIM'
+	kQTilst_TimeScale   = 0xA9545343UL, // '�TSC'
+	kQTilst_TimeSize    = 0xA954535AUL  // '�TSZ'
+};
+
+enum {
+	kNoMacLang   = 0xFFFF,
+	kNoMacScript = 0xFFFF
+};
+
+extern bool ConvertToMacLang ( const std::string & utf8Value, XMP_Uns16 macLang, std::string * macValue );
+extern bool ConvertFromMacLang ( const std::string & macValue, XMP_Uns16 macLang, std::string * utf8Value );
+
+class TradQT_Manager {
+public:
+
+	TradQT_Manager() : changed(false) {};
+
+	bool ParseCachedBoxes ( const MOOV_Manager & moovMgr );
+
+	bool ImportSimpleXMP  ( XMP_Uns32 id, SXMPMeta * xmp, XMP_StringPtr ns, XMP_StringPtr prop ) const;
+	bool ImportLangAltXMP ( XMP_Uns32 id, SXMPMeta * xmp, XMP_StringPtr ns, XMP_StringPtr langArray ) const;
+
+	void ExportSimpleXMP  ( XMP_Uns32 id, const SXMPMeta & xmp, XMP_StringPtr ns, XMP_StringPtr prop,
+							bool createWithZeroLang = false );
+	void ExportLangAltXMP ( XMP_Uns32 id, const SXMPMeta & xmp, XMP_StringPtr ns, XMP_StringPtr langArray );
+
+	bool IsChanged() const { return this->changed; };
+
+	void UpdateChangedBoxes ( MOOV_Manager * moovMgr );
+
+private:
+
+	struct ValueInfo {
+		bool marked;
+		XMP_Uns16 macLang;
+		XMP_StringPtr xmpLang;	// ! Only set if macLang is known, i.e. the value can be converted.
+		std::string   macValue;
+		ValueInfo() : marked(false), macLang(kNoMacLang), xmpLang("") {};
+	};
+	typedef std::vector<ValueInfo> ValueVector;
+	typedef ValueVector::iterator ValueInfoPos;
+	typedef ValueVector::const_iterator ValueInfoCPos;
+
+	struct ParsedBoxInfo {
+		XMP_Uns32 id;
+		ValueVector values;
+		bool changed;
+		ParsedBoxInfo() : id(0), changed(false) {};
+		ParsedBoxInfo ( XMP_Uns32 _id ) : id(_id), changed(false) {};
+	};
+
+	typedef std::map < XMP_Uns32, ParsedBoxInfo > InfoMap;	// Metadata item kind and content info.
+	typedef InfoMap::iterator InfoMapPos;
+	typedef InfoMap::const_iterator InfoMapCPos;
+
+	InfoMap parsedBoxes;
+	bool changed;
+
+	bool ImportLangItem ( const ValueInfo & qtItem, SXMPMeta * xmp, XMP_StringPtr ns, XMP_StringPtr langArray ) const;
+
+};	// TradQT_Manager
+
+#endif	// __QuickTime_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/RIFF.cpp b/XMPFiles/source/FormatSupport/RIFF.cpp
new file mode 100644
index 0000000..93a318c
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/RIFF.cpp
@@ -0,0 +1,884 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+// must have access to handler class fields...
+#include "XMPFiles/source/FormatSupport/RIFF.hpp"
+#include "XMPFiles/source/FormatSupport/RIFF_Support.hpp"
+#include "XMPFiles/source/FileHandlers/RIFF_Handler.hpp"
+
+#include <utility>
+
+using namespace RIFF;
+
+namespace RIFF {
+
+// GENERAL STATIC FUNCTIONS ////////////////////////////////////////
+
+Chunk* getChunk ( ContainerChunk* parent, RIFF_MetaHandler* handler )
+{
+	XMP_IO* file = handler->parent->ioRef;
+	XMP_Uns8 level = handler->level;
+	XMP_Uns32 peek = XIO::PeekUns32_LE ( file );
+
+	if ( level == 0 )
+	{
+		XMP_Validate( peek == kChunk_RIFF, "expected RIFF chunk not found", kXMPErr_BadFileFormat );
+		XMP_Enforce( parent == NULL );
+	}
+	else
+	{
+		XMP_Validate( peek != kChunk_RIFF, "unexpected RIFF chunk below top-level", kXMPErr_BadFileFormat );
+		XMP_Enforce( parent != NULL );
+	}
+
+	switch( peek )
+	{
+	case kChunk_RIFF:
+		return new ContainerChunk( parent, handler );
+	case kChunk_LIST:
+		{
+		if ( level != 1 ) break; // only care on this level
+
+			// look further (beyond 4+4 = beyond id+size) to check on relevance
+			file->Seek ( 8, kXMP_SeekFromCurrent  );
+			XMP_Uns32 containerType = XIO::PeekUns32_LE ( file );
+			file->Seek ( -8, kXMP_SeekFromCurrent  );
+
+		bool isRelevantList = ( containerType== kType_INFO || containerType == kType_Tdat );
+		if ( !isRelevantList ) break;
+
+				return new ContainerChunk( parent, handler );
+		}
+	case kChunk_XMP:
+		if ( level != 1 ) break; // ignore on inappropriate levels (might be compound metadata?)
+		return new XMPChunk( parent, handler );
+	case kChunk_DISP:
+		{
+			if ( level != 1 ) break; // only care on this level
+			// peek even further to see if type is 0x001 and size is reasonable
+			file ->Seek ( 4, kXMP_SeekFromCurrent  ); // jump DISP
+			XMP_Uns32 dispSize = XIO::ReadUns32_LE( file );
+			XMP_Uns32 dispType = XIO::ReadUns32_LE( file );
+			file ->Seek ( -12, kXMP_SeekFromCurrent ); // rewind, be in front of chunkID again
+
+			// only take as a relevant disp if both criteria met,
+			// otherwise treat as generic chunk!
+			if ( (dispType == 0x0001) && ( dispSize < 256 * 1024 ) )
+			{
+				ValueChunk* r = new ValueChunk( parent, handler );
+				handler->dispChunk = r;
+				return r;
+			}
+			break; // treat as irrelevant (non-0x1) DISP chunks as generic chunk
+		}
+	case kChunk_bext:
+		{
+			if ( level != 1 ) break; // only care on this level
+			// store for now in a value chunk
+			ValueChunk* r = new ValueChunk( parent, handler );
+			handler->bextChunk = r;
+			return r;
+		}
+	case kChunk_PrmL:
+		{
+			if ( level != 1 ) break; // only care on this level
+			ValueChunk* r = new ValueChunk( parent, handler );
+			handler->prmlChunk = r;
+			return r;
+		}
+	case kChunk_Cr8r:
+		{
+			if ( level != 1 ) break; // only care on this level
+			ValueChunk* r = new ValueChunk( parent, handler );
+			handler->cr8rChunk = r;
+			return r;
+		}
+	case kChunk_JUNQ:
+	case kChunk_JUNK:
+		{
+			JunkChunk* r = new JunkChunk( parent, handler );
+			return r;
+		}
+	}
+	// this "default:" section must be ouside switch bracket, to be
+	// reachable by all those break statements above:
+
+
+	// digest 'valuable' container chunks: LIST:INFO, LIST:Tdat
+	bool insideRelevantList = ( level==2 && parent->id == kChunk_LIST
+		&& ( parent->containerType== kType_INFO || parent->containerType == kType_Tdat ));
+
+	if ( insideRelevantList )
+	{
+		ValueChunk* r = new ValueChunk( parent, handler );
+		return r;
+	}
+
+	// general chunk of no interest, treat as unknown blob
+	return new Chunk( parent, handler, true, chunk_GENERAL );
+}
+
+// BASE CLASS CHUNK ///////////////////////////////////////////////
+// ad hoc creation
+Chunk::Chunk( ContainerChunk* parent, ChunkType c, XMP_Uns32 id )
+{
+	this->hasChange = false;
+	this->chunkType = c; // base class assumption
+	this->parent = parent;
+	this->id = id;
+	this->oldSize = 0;
+	this->newSize = 8;
+	this->oldPos = 0; // inevitable for ad-hoc
+	this->needSizeFix = false;
+
+	// good parenting for latter destruction
+	if ( this->parent != NULL )
+	{
+		this->parent->children.push_back( this );
+		if( this->chunkType == chunk_VALUE )
+			this->parent->childmap.insert( std::make_pair( this->id, (ValueChunk*) this ) );
+	}
+}
+
+// parsing creation
+Chunk::Chunk( ContainerChunk* parent, RIFF_MetaHandler* handler, bool skip, ChunkType c )
+{
+	chunkType = c; // base class assumption
+	this->parent = parent;
+	this->oldSize = 0;
+	this->hasChange = false; // [2414649] valid assumption at creation time
+
+	XMP_IO* file = handler->parent->ioRef;
+
+	this->oldPos = file->Offset();
+	this->id = XIO::ReadUns32_LE( file );
+	this->oldSize = XIO::ReadUns32_LE( file );
+	this->oldSize += 8;
+
+	// Make sure the size is within expected bounds.
+	XMP_Int64 chunkEnd = this->oldPos + this->oldSize;
+	XMP_Int64 chunkLimit = handler->oldFileSize;
+	if ( parent != 0 ) chunkLimit = parent->oldPos + parent->oldSize;
+	if ( chunkEnd > chunkLimit ) {
+		bool isUpdate = XMP_OptionIsSet ( handler->parent->openFlags, kXMPFiles_OpenForUpdate );
+		bool repairFile = XMP_OptionIsSet ( handler->parent->openFlags, kXMPFiles_OpenRepairFile );
+		if ( (! isUpdate) || (repairFile && (parent == 0)) ) {
+			this->oldSize = chunkLimit - this->oldPos;
+		} else {
+			XMP_Throw ( "Bad RIFF chunk size", kXMPErr_BadFileFormat );
+		}
+	}
+
+	this->newSize = this->oldSize;
+	this->needSizeFix = false;
+
+	if ( skip ) file->Seek ( (this->oldSize - 8), kXMP_SeekFromCurrent );
+
+	// "good parenting", essential for latter destruction.
+	if ( this->parent != NULL )
+	{
+		this->parent->children.push_back( this );
+		if( this->chunkType == chunk_VALUE )
+			this->parent->childmap.insert( std::make_pair( this->id, (ValueChunk*) this ) );
+	}
+}
+
+void Chunk::changesAndSize( RIFF_MetaHandler* handler )
+{
+	// only unknown chunks should reach this method,
+	// all others must reach overloads, hence little to do here:
+	hasChange = false; // unknown chunk ==> no change, naturally
+	this->newSize = this->oldSize;
+}
+
+std::string Chunk::toString(XMP_Uns8 level )
+{
+	char buffer[256];
+	snprintf( buffer, 255, "%.4s -- "
+							"oldSize: 0x%.8llX,  "
+							"newSize: 0x%.8llX,  "
+							"oldPos: 0x%.8llX\n",
+		(char*)(&this->id), this->oldSize, this->newSize, this->oldPos );
+	return std::string(buffer);
+}
+
+void Chunk::write( RIFF_MetaHandler* handler, XMP_IO* file , bool isMainChunk )
+{
+	throw new XMP_Error(kXMPErr_InternalFailure, "Chunk::write never to be called for unknown chunks.");
+}
+
+Chunk::~Chunk()
+{
+	//nothing
+}
+
+// CONTAINER CHUNK /////////////////////////////////////////////////
+// a) creation
+// [2376832] expectedSize - minimum padding "parking size" to use, if not available append to end
+ContainerChunk::ContainerChunk( ContainerChunk* parent, XMP_Uns32 id, XMP_Uns32 containerType ) : Chunk( NULL /* !! */, chunk_CONTAINER, id )
+{
+	// accept no unparented ConatinerChunks
+	XMP_Enforce( parent != NULL );
+
+	this->containerType = containerType;
+	this->newSize = 12;
+	this->parent = parent;
+
+	chunkVect* siblings = &parent->children;
+
+	// add at end. ( oldSize==0 will flag optimization later in the process)
+	siblings->push_back( this );
+}
+
+// b) parsing
+ContainerChunk::ContainerChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chunk( parent, handler, false, chunk_CONTAINER )
+{
+	bool repairMode = ( 0 != ( handler->parent->openFlags & kXMPFiles_OpenRepairFile ));
+
+	try
+	{
+		XMP_IO* file = handler->parent->ioRef;
+		XMP_Uns8 level = handler->level;
+
+		// get type of container chunk
+		this->containerType = XIO::ReadUns32_LE( file );
+
+		// ensure legality of top-level chunks
+		if ( level == 0 && handler->riffChunks.size() > 0 )
+		{
+			XMP_Validate( handler->parent->format == kXMP_AVIFile, "only AVI may have multiple top-level chunks", kXMPErr_BadFileFormat );
+			XMP_Validate( this->containerType == kType_AVIX, "all chunks beyond main chunk must be type AVIX", kXMPErr_BadFileFormat );
+		}
+
+		// has *relevant* subChunks? (there might be e.g. non-INFO LIST chunks we don't care about)
+		bool hasSubChunks = ( ( this->id == kChunk_RIFF ) ||
+							  ( this->id == kChunk_LIST && this->containerType == kType_INFO ) ||
+							  ( this->id == kChunk_LIST && this->containerType == kType_Tdat )
+						  );
+		XMP_Int64 endOfChunk = this->oldPos + this->oldSize;
+
+		// this statement catches beyond-EoF-offsets on any level
+		// exception: level 0, tolerate if in repairMode
+		if ( (level == 0) && repairMode && (endOfChunk > handler->oldFileSize) )
+		{
+			endOfChunk = handler->oldFileSize; // assign actual file size
+			this->oldSize = endOfChunk - this->oldPos; //reversely calculate correct oldSize
+		}
+
+		XMP_Validate( endOfChunk <= handler->oldFileSize, "offset beyond EoF", kXMPErr_BadFileFormat );
+
+		Chunk* curChild = 0;
+		if ( hasSubChunks )
+		{
+			handler->level++;
+			while ( file->Offset() < endOfChunk )
+			{
+				curChild = RIFF::getChunk( this, handler );
+
+				// digest pad byte - no value validation (0), since some 3rd party files have non-0-padding.
+				if ( file->Offset() % 2 == 1 )
+				{
+					// [1521093] tolerate missing pad byte at very end of file:
+					XMP_Uns8 pad;
+					file->Read ( &pad, 1 );  // Read the pad, tolerate being at EOF.
+
+				}
+
+				// within relevant LISTs, relentlesly delete junk chunks (create a single one
+				// at end as part of updateAndChanges()
+				if ( (containerType== kType_INFO || containerType == kType_Tdat)
+						&& ( curChild->chunkType == chunk_JUNK ) )
+				{
+						this->children.pop_back();
+						delete curChild;
+				} // for other chunks: join neighouring Junk chunks into one
+				else if ( (curChild->chunkType == chunk_JUNK) && ( this->children.size() >= 2 ) )
+				{
+					// nb: if there are e.g 2 chunks, then last one is at(1), prev one at(0) ==> '-2'
+					Chunk* prevChunk = this->children.at( this->children.size() - 2 );
+					if ( prevChunk->chunkType == chunk_JUNK )
+					{
+						// stack up size to prior chunk
+						prevChunk->oldSize += curChild->oldSize;
+						prevChunk->newSize += curChild->newSize;
+						XMP_Enforce( prevChunk->oldSize == prevChunk->newSize );
+						// destroy current chunk
+						this->children.pop_back();
+						delete curChild;
+					}
+				}
+			}
+			handler->level--;
+			XMP_Validate( file->Offset() == endOfChunk, "subchunks exceed outer chunk size", kXMPErr_BadFileFormat );
+
+			// pointers for later legacy processing
+			if ( level==1 && this->id==kChunk_LIST && this->containerType == kType_INFO )
+				handler->listInfoChunk = this;
+			if ( level==1 && this->id==kChunk_LIST && this->containerType == kType_Tdat )
+				handler->listTdatChunk = this;
+		}
+		else // skip non-interest container chunk
+		{
+			file->Seek ( (this->oldSize - 8 - 4), kXMP_SeekFromCurrent );
+		} // if - else
+
+	} // try
+	catch (XMP_Error& e) {
+		this->release(); // free resources
+		if ( this->parent != 0)
+			this->parent->children.pop_back(); // hereby taken care of, so removing myself...
+
+		throw e;         // re-throw
+	}
+}
+
+void ContainerChunk::changesAndSize( RIFF_MetaHandler* handler )
+{
+
+	// Walk the container subtree adjusting the children that have size changes. The only containers
+	// are RIFF and LIST chunks, they are treated differently.
+	//
+	// LISTs get recomposed as a whole. Existing JUNK children of a LIST are removed, existing real
+	// children are left in order with their new size, new children have already been appended. The
+	// LIST as a whole gets a new size that is the sum of the final children.
+	//
+	// Special rules apply to various children of a RIFF container. FIrst, adjacent JUNK children
+	// are combined, this simplifies maximal reuse. The children are recursively adjusted in order
+	// to get their final size.
+	//
+	// Try to determine the final placement of each RIFF child using general rules:
+	//	- if the size is unchanged: leave at current location
+	//	- if the chunk is at the end of the last RIFF chunk and grows: leave at current location
+	//	- if there is enough following JUNK: add part of the JUNK, adjust remaining JUNK size
+	//	- if it shrinks by 9 bytes or more: carve off trailing JUNK
+	//	- try to find adequate JUNK in the current parent
+	//
+	// Use child-specific rules as a last resort:
+	//	- if it is LIST:INFO: delete it, must be in first RIFF chunk
+	//	- for others: move to end of last RIFF chunk, make old space JUNK
+
+	// ! Don't create any junk chunks of exactly 8 bytes, just a header and no content. That has a
+	// ! size field of zero, which hits a crashing bug in some versions of Windows Media Player.
+
+	bool isRIFFContainer = (this->id == kChunk_RIFF);
+	bool isLISTContainer = (this->id == kChunk_LIST);
+	XMP_Enforce ( isRIFFContainer | isLISTContainer );
+
+	XMP_Index childIndex;	// Could be local to the loops, this simplifies debuging. Need a signed type!
+	Chunk * currChild;
+
+	if ( this->children.empty() ) {
+		if ( isRIFFContainer) {
+			this->newSize = 12;	// Keep a minimal size container.
+		} else {
+			this->newSize = 0;	// Will get removed from parent in outer call.
+		}
+		this->hasChange = true;
+		return;	// Nothing more to do without children.
+	}
+
+	// Collapse adjacent RIFF junk children, remove all LIST junk children. Work back to front to
+	// simplify the effect of .erase() on the loop. Purposely ignore the first chunk.
+
+	for ( childIndex = (XMP_Index)this->children.size() - 1; childIndex > 0; --childIndex ) {
+
+		currChild = this->children[childIndex];
+		if ( currChild->chunkType != chunk_JUNK ) continue;
+
+		if ( isRIFFContainer ) {
+			Chunk * prevChild = this->children[childIndex-1];
+			if ( prevChild->chunkType != chunk_JUNK ) continue;
+			prevChild->oldSize += currChild->oldSize;
+			prevChild->newSize += currChild->newSize;
+			prevChild->hasChange = true;
+		}
+
+		this->children.erase ( this->children.begin() + childIndex );
+		delete currChild;
+		this->hasChange = true;
+
+	}
+
+	// Process the children of RIFF and LIST containers to get their final size. Remove empty
+	// children. Work back to front to simplify the effect of .erase() on the loop. Do not ignore
+	// the first chunk.
+
+	for ( childIndex = (XMP_Index)this->children.size() - 1; childIndex >= 0; --childIndex ) {
+
+		currChild = this->children[childIndex];
+
+		++handler->level;
+		currChild->changesAndSize ( handler );
+		--handler->level;
+
+		if ( (currChild->newSize == 8) || (currChild->newSize == 0) ) {	// ! The newSIze is supposed to include the header.
+			this->children.erase ( this->children.begin() + childIndex );
+			delete currChild;
+			this->hasChange = true;
+		} else {
+			this->hasChange |= currChild->hasChange;
+			currChild->needSizeFix = (currChild->newSize != currChild->oldSize);
+			if ( currChild->needSizeFix && (currChild->newSize > currChild->oldSize) &&
+				 (this == handler->lastChunk) && (childIndex+1 == (XMP_Index)this->children.size()) ) {
+				// Let an existing last-in-file chunk grow in-place. Shrinking is conceptually OK,
+				// but complicates later sanity check that the main AVI chunk is not OK to append
+				// other chunks later. Ignore new chunks, they might reuse junk space.
+				if ( currChild->oldSize != 0 ) currChild->needSizeFix = false;
+			}
+		}
+
+	}
+
+	// Go through the children of a RIFF container, adjusting the placement as necessary. In brief,
+	// things can only grow at the end of the last RIFF chunk, and non-junk chunks can't be shifted.
+
+	if ( isRIFFContainer ) {
+
+		for ( childIndex = 0; childIndex < (XMP_Index)this->children.size(); ++childIndex ) {
+
+			currChild = this->children[childIndex];
+			if ( ! currChild->needSizeFix ) continue;
+			currChild->needSizeFix = false;
+
+			XMP_Int64 sizeDiff = currChild->newSize - currChild->oldSize;	// Positive for growth.
+			XMP_Uns8  padSize = (currChild->newSize & 1);	// Need a pad for odd size.
+
+			// See if the following chunk is junk that can be utilized.
+
+			Chunk * nextChild = 0;
+			if ( childIndex+1 < (XMP_Index)this->children.size() ) nextChild = this->children[childIndex+1];
+
+			if ( (nextChild != 0) && (nextChild->chunkType == chunk_JUNK) ) {
+				if ( nextChild->newSize >= (9 + sizeDiff + padSize) ) {
+
+					// Incorporate part of the trailing junk, or make the trailing junk grow.
+					nextChild->newSize -= sizeDiff;
+					nextChild->newSize -= padSize;
+					nextChild->hasChange = true;
+					continue;
+
+				} else if (  nextChild->newSize == (sizeDiff + padSize)  ) {
+
+					// Incorporate all of the trailing junk.
+					this->children.erase ( this->children.begin() + childIndex + 1 );
+					delete nextChild;
+					continue;
+
+				}
+			}
+
+			// See if the chunk shrinks enough to turn the leftover space into junk.
+
+			if ( (sizeDiff + padSize) <= -9 ) {
+				this->children.insert ( (this->children.begin() + childIndex + 1), new JunkChunk ( NULL, ((-sizeDiff) - padSize) ) );
+				continue;
+			}
+
+			// Look through the parent for a usable span of junk.
+
+			XMP_Index junkIndex;
+			Chunk * junkChunk = 0;
+			for ( junkIndex = 0; junkIndex < (XMP_Index)this->children.size(); ++junkIndex ) {
+				junkChunk = this->children[junkIndex];
+				if ( junkChunk->chunkType != chunk_JUNK ) continue;
+				if ( (junkChunk->newSize >= (9 + currChild->newSize + padSize)) ||
+					 (junkChunk->newSize == (currChild->newSize + padSize)) ) break;
+			}
+
+			if ( junkIndex < (XMP_Index)this->children.size() ) {
+
+				// Use part or all of the junk for the relocated chunk, replace the old space with junk.
+
+				if ( junkChunk->newSize == (currChild->newSize + padSize) ) {
+
+					// The found junk is an exact fit.
+					this->children[junkIndex] = currChild;
+					delete junkChunk;
+
+				} else {
+
+					// The found junk has excess space. Insert the moving chunk and shrink the junk.
+					XMP_Assert ( junkChunk->newSize >= (9 + currChild->newSize + padSize) );
+					junkChunk->newSize -= (currChild->newSize + padSize);
+					junkChunk->hasChange = true;
+					this->children.insert ( (this->children.begin() + junkIndex), currChild );
+					if ( junkIndex < childIndex ) ++childIndex;	// The insertion moved the current child.
+
+				}
+
+				if ( currChild->oldSize != 0 ) {
+					this->children[childIndex] = new JunkChunk ( 0, currChild->oldSize );	// Replace the old space with junk.
+				} else {
+					this->children.erase ( this->children.begin() + childIndex );	// Remove the newly created chunk's old location.
+					--childIndex;	// Make the next loop iteration not skip a chunk.
+				}
+
+				continue;
+
+			}
+
+			// If this is a LIST:INFO chunk not in the last of multiple RIFF chunks, then give up
+			// and replace it with oldSize junk. Preserve the first RIFF chunk's original size.
+
+			bool isListInfo = (currChild->id == kChunk_LIST) && (currChild->chunkType == chunk_CONTAINER) &&
+							  (((ContainerChunk*)currChild)->containerType == kType_INFO);
+
+			if ( isListInfo && (handler->riffChunks.size() > 1) &&
+				 (this->id == kChunk_RIFF) && (this != handler->lastChunk) ) {
+
+				if ( currChild->oldSize != 0 ) {
+					this->children[childIndex] = new JunkChunk ( 0, currChild->oldSize );
+				} else {
+					this->children.erase ( this->children.begin() + childIndex );
+					--childIndex;	// Make the next loop iteration not skip a chunk.
+				}
+
+				delete currChild;
+				continue;
+
+			}
+
+			// Move the chunk to the end of the last RIFF chunk and make the old space junk.
+
+			if ( (this == handler->lastChunk) && (childIndex+1 == (XMP_Index)this->children.size()) ) continue;	// Already last.
+
+			handler->lastChunk->children.push_back( currChild );
+			if ( currChild->oldSize != 0 ) {
+				this->children[childIndex] = new JunkChunk ( 0, currChild->oldSize );	// Replace the old space with junk.
+			} else {
+				this->children.erase ( this->children.begin() + childIndex );	// Remove the newly created chunk's old location.
+				--childIndex;	// Make the next loop iteration not skip a chunk.
+			}
+
+		}
+
+	}
+
+	// Compute the finished container's new size (for both RIFF and LIST).
+
+	this->newSize = 12;	// Start with standard container header.
+	for ( childIndex = 0; childIndex < (XMP_Index)this->children.size(); ++childIndex ) {
+		currChild = this->children[childIndex];
+		this->newSize += currChild->newSize;
+		this->newSize += (this->newSize & 1);	// Round up if odd.
+	}
+
+	XMP_Validate ( (this->newSize <= 0xFFFFFFFFLL), "No single chunk may be above 4 GB", kXMPErr_Unimplemented );
+
+}
+
+std::string ContainerChunk::toString(XMP_Uns8 level )
+{
+	XMP_Int64 offset= 12; // compute offsets, just for informational purposes
+	// (actually only correct for first chunk)
+
+	char buffer[256];
+	snprintf( buffer, 255, "%.4s:%.4s, "
+			"oldSize: 0x%8llX, "
+			"newSize: 0x%.8llX, "
+			"oldPos: 0x%.8llX\n",
+			(char*)(&this->id), (char*)(&this->containerType), this->oldSize, this->newSize, this->oldPos );
+
+	std::string r(buffer);
+	chunkVectIter iter;
+	for( iter = this->children.begin(); iter != this->children.end(); iter++ )
+	{
+		char buffer[256];
+		snprintf( buffer, 250, "offset 0x%.8llX", offset );
+		r += std::string ( level*4, ' ' ) + std::string( buffer ) + ":" + (*iter)->toString( level + 1 );
+		offset += (*iter)->newSize;
+		if ( offset % 2 == 1 )
+			offset++;
+	}
+	return std::string(r);
+}
+
+void ContainerChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk )
+{
+	if ( isMainChunk )
+		file ->Rewind();
+
+	// enforce even position
+	XMP_Int64 chunkStart = file->Offset();
+	XMP_Int64 chunkEnd = chunkStart + this->newSize;
+	XMP_Enforce( chunkStart % 2 == 0 );
+	chunkVect *rc = &this->children;
+
+	// [2473303] have to write back-to-front to avoid stomp-on-feet
+	XMP_Int64 childStart = chunkEnd;
+	for ( XMP_Int32 chunkNo = (XMP_Int32)(rc->size() -1); chunkNo >= 0; chunkNo-- )
+	{
+		Chunk* cur = rc->at(chunkNo);
+
+		// pad byte first
+		if ( cur->newSize % 2 == 1 )
+		{
+			childStart--;
+			file->Seek ( childStart, kXMP_SeekFromStart  );
+			XIO::WriteUns8( file, 0 );
+		}
+
+		// then contents
+		childStart-= cur->newSize;
+		file->Seek ( childStart, kXMP_SeekFromStart  );
+		switch ( cur->chunkType )
+		{
+			case chunk_GENERAL: //COULDDO enfore no change, since not write-out-able
+				if ( cur->oldPos != childStart )
+					XIO::Move( file, cur->oldPos, file, childStart, cur->oldSize );
+				break;
+			default:
+				cur->write( handler, file, false );
+				break;
+		} // switch
+
+	} // for
+	XMP_Enforce ( chunkStart + 12 == childStart);
+	file->Seek ( chunkStart, kXMP_SeekFromStart );
+
+	XIO::WriteUns32_LE( file, this->id );
+	XIO::WriteUns32_LE( file, (XMP_Uns32) this->newSize - 8 ); // validated in changesAndSize() above
+	XIO::WriteUns32_LE( file, this->containerType );
+
+}
+
+void ContainerChunk::release()
+{
+	// free subchunks
+	Chunk* curChunk;
+	while( ! this->children.empty() )
+	{
+		curChunk = this->children.back();
+		delete curChunk;
+		this->children.pop_back();
+	}
+}
+
+ContainerChunk::~ContainerChunk()
+{
+	this->release(); // free resources
+}
+
+// XMP CHUNK ///////////////////////////////////////////////
+// a) create
+
+// a) creation
+XMPChunk::XMPChunk( ContainerChunk* parent ) : Chunk( parent, chunk_XMP , kChunk_XMP )
+{
+	// nothing
+}
+
+// b) parse
+XMPChunk::XMPChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chunk( parent, handler, false, chunk_XMP )
+{
+	chunkType = chunk_XMP;
+	XMP_IO* file = handler->parent->ioRef;
+	XMP_Uns8 level = handler->level;
+
+	handler->packetInfo.offset = this->oldPos + 8;
+	handler->packetInfo.length = (XMP_Int32) this->oldSize - 8;
+
+	handler->xmpPacket.reserve ( handler->packetInfo.length );
+	handler->xmpPacket.assign ( handler->packetInfo.length, ' ' );
+	file->ReadAll ( (void*)handler->xmpPacket.data(), handler->packetInfo.length );
+
+	handler->containsXMP = true; // last, after all possible failure
+
+	// pointer for later processing
+	handler->xmpChunk = this;
+}
+
+void XMPChunk::changesAndSize( RIFF_MetaHandler* handler )
+{
+	XMP_Enforce( &handler->xmpPacket != 0 );
+	XMP_Enforce( handler->xmpPacket.size() > 0 );
+	this->newSize = 8 + handler->xmpPacket.size();
+
+	XMP_Validate( this->newSize <= 0xFFFFFFFFLL, "no single chunk may be above 4 GB", kXMPErr_InternalFailure );
+
+	// a complete no-change would have been caught in XMPFiles common code anyway
+	this->hasChange = true;
+}
+
+void XMPChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk )
+{
+	XIO::WriteUns32_LE( file, kChunk_XMP );
+	XIO::WriteUns32_LE( file, (XMP_Uns32) this->newSize - 8 ); // validated in changesAndSize() above
+	file->Write ( handler->xmpPacket.data(), (XMP_Int32)handler->xmpPacket.size()  );
+}
+
+// Value CHUNK ///////////////////////////////////////////////
+// a) creation
+ValueChunk::ValueChunk( ContainerChunk* parent, std::string value, XMP_Uns32 id ) : Chunk( parent, chunk_VALUE, id )
+{
+	this->oldValue = std::string();
+	this->SetValue( value );
+}
+
+// b) parsing
+ValueChunk::ValueChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chunk( parent, handler, false, chunk_VALUE )
+{
+	// set value: -----------------
+	XMP_IO* file = handler->parent->ioRef;
+	XMP_Uns8 level = handler->level;
+
+	// unless changed through reconciliation, assume for now.
+	// IMPORTANT to stay true to the original (no \0 cleanup or similar)
+	// since unknown value chunks might not be fully understood,
+	// hence must be precisely preserved !!!
+
+	XMP_Int32 length = (XMP_Int32) this->oldSize - 8;
+	this->oldValue.reserve( length );
+	this->oldValue.assign( length + 1, '\0' );
+	file->ReadAll ( (void*)this->oldValue.data(), length );
+
+	this->newValue = this->oldValue;
+	this->newSize = this->oldSize;
+}
+
+void ValueChunk::SetValue( std::string value, bool optionalNUL /* = false */ )
+{
+	this->newValue.assign( value );
+	if ( (! optionalNUL) || ((value.size() & 1) == 1) ) {
+		// ! The NUL should be optional in WAV to avoid a parsing bug in Audition 3 - can't handle implicit pad byte.
+		this->newValue.append( 1, '\0' ); // append zero termination as explicit part of string
+	}
+	this->newSize = this->newValue.size() + 8;
+}
+
+void ValueChunk::changesAndSize( RIFF_MetaHandler* handler )
+{
+	// Don't simply assign to this->hasChange, it might already be true.
+	if ( this->newValue.size() != this->oldValue.size() ) {
+		this->hasChange = true;
+	} else if ( strncmp ( this->oldValue.c_str(), this->newValue.c_str(), this->newValue.size() ) != 0 ) {
+		this->hasChange = true;
+	}
+}
+
+void ValueChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk )
+{
+	XIO::WriteUns32_LE( file, this->id );
+	XIO::WriteUns32_LE( file, (XMP_Uns32)this->newSize - 8 );
+	file->Write ( this->newValue.data() , (XMP_Int32)this->newSize - 8  );
+}
+
+/* remove value chunk if existing.
+   return true if it was existing. */
+bool ContainerChunk::removeValue( XMP_Uns32	id )
+{
+	valueMap* cm = &this->childmap;
+	valueMapIter iter = cm->find( id );
+
+	if( iter == cm->end() )
+		return false;  //not found
+
+	ValueChunk* propChunk = iter->second;
+
+	// remove from vector (difficult)
+	chunkVect* cv = &this->children;
+	chunkVectIter cvIter;
+	for (cvIter = cv->begin(); cvIter != cv->end(); ++cvIter )
+	{
+		if ( (*cvIter)->id == id )
+			break; // found!
+	}
+	XMP_Validate( cvIter != cv->end(), "property not found in children vector", kXMPErr_InternalFailure );
+	cv->erase( cvIter );
+
+	// remove from map (easy)
+	cm->erase( iter );
+
+	delete propChunk;
+	return true; // found and removed
+}
+
+/* returns iterator to (first) occurence of this chunk.
+   iterator to the end of the map if chunk pointer is not found  */
+chunkVectIter ContainerChunk::getChild( Chunk* needle )
+{
+	chunkVectIter iter;
+	for( iter = this->children.begin(); iter != this->children.end(); iter++ )
+	{
+		Chunk* temp1 = *iter;
+		Chunk* temp2 = needle;
+		if ( (*iter) == needle ) return iter;
+	}
+	return this->children.end();
+}
+
+/* replaces a chunk by a JUNK chunk.
+   Also frees memory of prior chunk. */
+void ContainerChunk::replaceChildWithJunk( Chunk* child, bool deleteChild )
+{
+	chunkVectIter iter = getChild( child );
+	if ( iter == this->children.end() ) {
+		throw new XMP_Error(kXMPErr_InternalFailure, "replaceChildWithJunk: childChunk not found.");
+	}
+
+	*iter = new JunkChunk ( NULL, child->oldSize );
+	if ( deleteChild ) delete child;
+
+	this->hasChange = true;
+}
+
+// JunkChunk ///////////////////////////////////////////////////
+// a) creation
+JunkChunk::JunkChunk( ContainerChunk* parent, XMP_Int64 size ) : Chunk( parent, chunk_JUNK, kChunk_JUNK )
+{
+	XMP_Assert( size >= 8 );
+	this->oldSize = size;
+	this->newSize = size;
+	this->hasChange = true;
+}
+
+// b) parsing
+JunkChunk::JunkChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chunk( parent, handler, true, chunk_JUNK )
+{
+	chunkType = chunk_JUNK;
+}
+
+void JunkChunk::changesAndSize( RIFF_MetaHandler* handler )
+{
+	this->newSize = this->oldSize; // optimization at a later stage
+	XMP_Validate( this->newSize <= 0xFFFFFFFFLL, "no single chunk may be above 4 GB", kXMPErr_InternalFailure );
+	if ( this->id == kChunk_JUNQ ) this->hasChange = true;	// Force ID change to JUNK.
+}
+
+// zeroBuffer, etc to write out empty native padding
+const static XMP_Uns32 kZeroBufferSize64K = 64 * 1024;
+static XMP_Uns8 kZeroes64K [ kZeroBufferSize64K ]; // C semantics guarantee zero initialization.
+
+void JunkChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk )
+{
+	XIO::WriteUns32_LE( file, kChunk_JUNK );		// write JUNK, never JUNQ
+	XMP_Enforce( this->newSize < 0xFFFFFFFF );
+	XMP_Enforce( this->newSize >= 8 );			// minimum size of any chunk
+	XMP_Uns32 innerSize = (XMP_Uns32)this->newSize - 8;
+	XIO::WriteUns32_LE( file, innerSize );
+
+	// write out in 64K chunks
+	while ( innerSize > kZeroBufferSize64K )
+	{
+		file->Write ( kZeroes64K , kZeroBufferSize64K  );
+		innerSize -= kZeroBufferSize64K;
+	}
+	file->Write ( kZeroes64K , innerSize  );
+}
+
+} // namespace RIFF
diff --git a/XMPFiles/source/FormatSupport/RIFF.hpp b/XMPFiles/source/FormatSupport/RIFF.hpp
new file mode 100644
index 0000000..e2451e5
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/RIFF.hpp
@@ -0,0 +1,330 @@
+#ifndef __RIFF_hpp__
+#define __RIFF_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include <vector>
+#include <map>
+
+// ahead declaration:
+class RIFF_MetaHandler;
+
+namespace RIFF {
+
+	enum ChunkType {
+			chunk_GENERAL,	//unknown or not relevant
+			chunk_CONTAINER,
+			chunk_XMP,
+			chunk_VALUE,
+			chunk_JUNK,
+			NO_CHUNK // used as precessor to first chunk, etc.
+		};
+
+	// ahead declarations
+	class Chunk;
+	class ContainerChunk;
+	class ValueChunk;
+	class XMPChunk;
+
+	// (scope: only used in RIFF_Support and RIFF_Handler.cpp
+	//   ==> no need to overspecify with lengthy names )
+
+	typedef std::vector<Chunk*> chunkVect;  // coulddo: narrow down toValueChunk (could give trouble with JUNK though)
+	typedef chunkVect::iterator chunkVectIter;  // or refactor ??
+
+	typedef std::vector<ContainerChunk*> containerVect;
+	typedef containerVect::iterator containerVectIter;
+
+	typedef std::map<XMP_Uns32,ValueChunk*> valueMap;
+	typedef valueMap::iterator valueMapIter;
+
+
+	// format chunks+types
+	const XMP_Uns32 kChunk_RIFF = 0x46464952;
+	const XMP_Uns32 kType_AVI_  = 0x20495641;
+	const XMP_Uns32 kType_AVIX  = 0x58495641;
+	const XMP_Uns32 kType_WAVE  = 0x45564157;
+
+	const XMP_Uns32 kChunk_JUNK  = 0x4B4E554A;
+	const XMP_Uns32 kChunk_JUNQ  = 0x514E554A;
+
+	// other container chunks
+	const XMP_Uns32 kChunk_LIST = 0x5453494C;
+	const XMP_Uns32 kType_INFO = 0x4F464E49;
+	const XMP_Uns32 kType_Tdat = 0x74616454;
+
+	// other relevant chunks
+	const XMP_Uns32 kChunk_XMP  = 0x584D505F; // "_PMX"
+
+	// relevant for Index Correction
+	// LIST:
+	const XMP_Uns32 kType_hdrl =  0x6C726468;
+	const XMP_Uns32 kType_strl =  0x6C727473;
+	const XMP_Uns32 kChunk_indx =  0x78646E69;
+	const XMP_Uns32 kChunk_ixXX =  0x58587869;
+	const XMP_Uns32 kType_movi =  0x69766F6D;
+
+	//should occur only in AVI
+	const XMP_Uns32 kChunk_Cr8r = 0x72387243;
+	const XMP_Uns32 kChunk_PrmL = 0x4C6D7250;
+
+	//should occur only in WAV
+	const XMP_Uns32 kChunk_DISP = 0x50534944;
+	const XMP_Uns32 kChunk_bext  = 0x74786562;
+
+	// LIST/INFO constants
+	const XMP_Uns32 kPropChunkIART = 0x54524149;
+	const XMP_Uns32 kPropChunkICMT = 0x544D4349;
+	const XMP_Uns32 kPropChunkICOP = 0x504F4349;
+	const XMP_Uns32 kPropChunkICRD = 0x44524349;
+	const XMP_Uns32 kPropChunkIENG = 0x474E4549;
+	const XMP_Uns32 kPropChunkIGNR = 0x524E4749;
+	const XMP_Uns32 kPropChunkINAM = 0x4D414E49;
+	const XMP_Uns32 kPropChunkISFT = 0x54465349;
+	const XMP_Uns32 kPropChunkIARL = 0x4C524149;
+
+	const XMP_Uns32 kPropChunkIMED = 0x44454D49;
+	const XMP_Uns32 kPropChunkISRF = 0x46525349;
+	const XMP_Uns32 kPropChunkICMS = 0x4C524149;
+	const XMP_Uns32 kPropChunkIPRD = 0x534D4349;
+	const XMP_Uns32 kPropChunkISRC = 0x44525049;
+	const XMP_Uns32 kPropChunkITCH = 0x43525349;
+
+	const XMP_Uns32 kPropChunk_tc_O =0x4F5F6374;
+	const XMP_Uns32 kPropChunk_tc_A =0x415F6374;
+	const XMP_Uns32 kPropChunk_rn_O =0x4F5F6E72;
+	const XMP_Uns32 kPropChunk_rn_A =0x415F6E72;
+
+	///////////////////////////////////////////////////////////////
+
+	enum PropType { // from a simplified, opinionated legacy angle
+			prop_SIMPLE,
+			prop_TIMEVALUE,
+			prop_LOCALIZED_TEXT,
+			prop_ARRAYITEM,           // ( here: a solitary one)
+		};
+
+	struct Mapping {
+		XMP_Uns32 chunkID;
+		const char* ns;
+		const char* prop;
+		PropType propType;
+	};
+
+	// bext Mappings, piece-by-piece:
+	static Mapping bextDescription =			{ 0, kXMP_NS_BWF,  "description",			prop_SIMPLE };
+	static Mapping bextOriginator =				{ 0, kXMP_NS_BWF,  "originator",			prop_SIMPLE };
+	static Mapping bextOriginatorRef =			{ 0, kXMP_NS_BWF,  "originatorReference",	prop_SIMPLE };
+	static Mapping bextOriginationDate =		{ 0, kXMP_NS_BWF,  "originationDate",		prop_SIMPLE };
+	static Mapping bextOriginationTime =		{ 0, kXMP_NS_BWF,  "originationTime",		prop_SIMPLE };
+	static Mapping bextTimeReference =			{ 0, kXMP_NS_BWF,  "timeReference",			prop_SIMPLE };
+	static Mapping bextVersion =				{ 0, kXMP_NS_BWF,  "version",				prop_SIMPLE };
+	static Mapping bextUMID =					{ 0, kXMP_NS_BWF,  "umid",					prop_SIMPLE };
+	static Mapping bextCodingHistory =			{ 0, kXMP_NS_BWF,  "codingHistory",			prop_SIMPLE };
+
+	// LIST:INFO properties
+	static Mapping listInfoProps[] = {
+		// reconciliations CS4 and before:
+		{ kPropChunkIART, kXMP_NS_DM,	"artist" ,		prop_SIMPLE },
+		{ kPropChunkICMT, kXMP_NS_DM,	"logComment" ,	prop_SIMPLE  },
+		{ kPropChunkICOP, kXMP_NS_DC,	"rights" ,		prop_LOCALIZED_TEXT  },
+		{ kPropChunkICRD, kXMP_NS_XMP,	"CreateDate" ,	prop_SIMPLE  },
+		{ kPropChunkIENG, kXMP_NS_DM,	"engineer" ,	prop_SIMPLE  },
+		{ kPropChunkIGNR, kXMP_NS_DM,	"genre" ,		prop_SIMPLE  },
+		{ kPropChunkINAM, kXMP_NS_DC,	"title" ,		prop_LOCALIZED_TEXT  }, // ( was wrongly dc:album in pre-CS4)
+		{ kPropChunkISFT, kXMP_NS_XMP,	"CreatorTool",	prop_SIMPLE },
+
+		// RIFF/*/LIST/INFO properties, new in CS5, both AVI and WAV
+
+		{ kPropChunkIMED, kXMP_NS_DC,	"source" ,		prop_SIMPLE },
+		{ kPropChunkISRF, kXMP_NS_DC,	"type" ,		prop_ARRAYITEM },
+		// TO ENABLE { kPropChunkIARL, kXMP_NS_DC,	"subject" ,		prop_SIMPLE }, // array !! (not x-default language alternative)
+		//{ kPropChunkICMS, to be decided,	"" ,		prop_SIMPLE },
+		//{ kPropChunkIPRD, to be decided,	"" ,		prop_SIMPLE },
+		//{ kPropChunkISRC, to be decided,	"" ,		prop_SIMPLE },
+		//{ kPropChunkITCH, to be decided,	"" ,		prop_SIMPLE },
+
+		{ 0, 0, 0 }	// sentinel
+	};
+
+	static Mapping listTdatProps[] = {
+		// reconciliations CS4 and before:
+		{ kPropChunk_tc_O, kXMP_NS_DM,	"startTimecode"	, prop_TIMEVALUE  },  // special: must end up in dm:timeValue child
+		{ kPropChunk_tc_A, kXMP_NS_DM,	"altTimecode"	, prop_TIMEVALUE },   // special: must end up in dm:timeValue child
+		{ kPropChunk_rn_O, kXMP_NS_DM,	"tapeName"		, prop_SIMPLE  },
+		{ kPropChunk_rn_A, kXMP_NS_DM,	"altTapeName"	, prop_SIMPLE  },
+		{ 0, 0, 0 }	// sentinel
+	};
+
+	// =================================================================================================
+	// ImportCr8rItems
+	// ===============
+#if SUNOS_SPARC || SUNOS_X86
+	#pragma pack ( 1 )
+#else
+	#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+	struct PrmLBoxContent {
+		XMP_Uns32 magic;
+		XMP_Uns32 size;
+		XMP_Uns16 verAPI;
+		XMP_Uns16 verCode;
+		XMP_Uns32 exportType;
+		XMP_Uns16 MacVRefNum;
+		XMP_Uns32 MacParID;
+		char filePath[260];
+	};
+
+	enum { kExportTypeMovie = 0, kExportTypeStill = 1, kExportTypeAudio = 2, kExportTypeCustom = 3 };
+
+	struct Cr8rBoxContent {
+		XMP_Uns32 magic;
+		XMP_Uns32 size;
+		XMP_Uns16 majorVer;
+		XMP_Uns16 minorVer;
+		XMP_Uns32 creatorCode;
+		XMP_Uns32 appleEvent;
+		char fileExt[16];
+		char appOptions[16];
+		char appName[32];
+	};
+#if SUNOS_SPARC || SUNOS_X86
+	#pragma pack (  )
+#else
+	#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+	// static getter, determines appropriate chunkType (peeking)and returns
+	// the respective constructor. It's the caller's responsibility to
+	// delete obtained chunk.
+	Chunk* getChunk ( ContainerChunk* parent, RIFF_MetaHandler* handler );
+
+	class Chunk
+	{
+	public:
+		ChunkType			chunkType;	// set by constructor
+		ContainerChunk*		parent;		// 0 on top-level
+
+		XMP_Uns32	id;		// the first four bytes, first byte of highest value
+		XMP_Int64	oldSize;	// actual chunk size INCLUDING the 8/12 header bytes,
+		XMP_Int64	oldPos;	// file position of this chunk
+
+		// both set as part of changesAndSize()
+		XMP_Int64	newSize;
+		bool		hasChange;
+		bool		needSizeFix;		// used in changesAndSize() only
+
+		// Constructors ///////////////////////
+		// parsing
+		Chunk( ContainerChunk* parent, RIFF_MetaHandler* handler, bool skip, ChunkType c /*= chunk_GENERAL*/ );
+		// ad-hoc creation
+		Chunk( ContainerChunk* parent, ChunkType c, XMP_Uns32 id );
+
+		/* returns true, if something has changed in chunk (which needs specific write-out,
+		   this->newSize is expected to be set by this routine */
+		virtual void changesAndSize( RIFF_MetaHandler* handler );
+		virtual std::string toString(XMP_Uns8 level = 0);
+		virtual void write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk = false );
+
+		virtual ~Chunk();
+
+	}; // class Chunk
+
+	class XMPChunk : public Chunk
+	{
+	public:
+		XMPChunk( ContainerChunk* parent );
+		XMPChunk( ContainerChunk* parent, RIFF_MetaHandler* handler );
+
+		void changesAndSize( RIFF_MetaHandler* handler );
+		void write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk = false );
+
+	};
+
+	// any chunk, whose value should be stored, e.g. LIST:INFO, LIST:Tdat
+	class ValueChunk : public Chunk
+	{
+	public:
+		std::string oldValue, newValue;
+
+		// for ad-hoc creation (upon write)
+		ValueChunk( ContainerChunk* parent, std::string value, XMP_Uns32 id );
+
+		// for parsing
+		ValueChunk( ContainerChunk* parent, RIFF_MetaHandler* handler );
+
+		enum { kNULisOptional = true };
+
+		void SetValue( std::string value, bool optionalNUL = false );
+		void changesAndSize( RIFF_MetaHandler* handler );
+		void write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk = false  );
+
+		// own destructor not needed.
+	};
+
+	// relevant (level 1) JUNQ and JUNK chunks...
+	class JunkChunk : public Chunk
+	{
+	public:
+		// construction
+		JunkChunk( ContainerChunk* parent, XMP_Int64 size );
+		// parsing
+		JunkChunk( ContainerChunk* parent, RIFF_MetaHandler* handler );
+
+		// own destructor not needed.
+
+		void changesAndSize( RIFF_MetaHandler* handler );
+		void write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk = false  );
+	};
+
+
+	class ContainerChunk : public Chunk
+	{
+	public:
+		XMP_Uns32	containerType;					// e.g. kType_INFO as in "LIST:INFO"
+
+		chunkVect children;		// used for cleanup/destruction, ordering...
+		valueMap childmap;		// only for efficient *value* access (inside LIST), *not* used for other containers
+
+		// construct
+		ContainerChunk( ContainerChunk* parent, XMP_Uns32 id, XMP_Uns32 containerType );
+		// parse
+		ContainerChunk( ContainerChunk* parent, RIFF_MetaHandler* handler );
+
+		bool removeValue( XMP_Uns32	id );
+
+		/* returns iterator to (first) occurence of this chunk.
+		   iterator to the end of the map if chunk pointer is not found */
+		chunkVectIter getChild( Chunk* needle );
+
+		void replaceChildWithJunk( Chunk* child, bool deleteChild = true );
+
+		void changesAndSize( RIFF_MetaHandler* handler );
+		std::string toString(XMP_Uns8 level = 0);
+		void write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk = false );
+
+		// destroy
+		void release(); // used by destructor and on error in constructor
+		~ContainerChunk();
+
+	}; // class ContainerChunk
+
+} // namespace RIFF
+
+
+#endif	// __RIFF_hpp__
diff --git a/XMPFiles/source/FormatSupport/RIFF_Support.cpp b/XMPFiles/source/FormatSupport/RIFF_Support.cpp
new file mode 100644
index 0000000..152a53b
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/RIFF_Support.cpp
@@ -0,0 +1,939 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+// must have access to handler class fields...
+#include "XMPFiles/source/FormatSupport/RIFF.hpp"
+#include "XMPFiles/source/FileHandlers/RIFF_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/RIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+
+#define MIN(a, b)       ((a) < (b) ? (a) : (b))
+
+using namespace RIFF;
+namespace RIFF {
+
+// The minimum BEXT chunk size should be 610 (incl. 8 byte header/size field)
+XMP_Int32 MIN_BEXT_SIZE = 610; // = > 8 + ( 256+32+32+10+8+4+4+2+64+190+0 )
+
+// An assumed secure max value of 100 MB.
+XMP_Int32 MAX_BEXT_SIZE = 100 * 1024 * 1024;
+
+// CR8R, PrmL have fixed sizes
+XMP_Int32 CR8R_SIZE = 0x5C;
+XMP_Int32 PRML_SIZE = 0x122;
+
+static const char* sHexChars =    "0123456789ABCDEF";
+
+// Encode a string of raw data bytes into a HexString (w/o spaces, i.e. "DEADBEEF").
+// No insertation/acceptance of whitespace/linefeeds. No output/tolerance of lowercase.
+// returns true, if *all* characters returned are zero (or if 0 bytes are returned).
+static bool EncodeToHexString ( XMP_StringPtr   rawStr,
+						      XMP_StringLen   rawLen,
+						      std::string* encodedStr )
+{
+	bool allZero = true; // assume for now
+
+	if ( (rawStr == 0) && (rawLen != 0) )
+		XMP_Throw ( "EncodeToHexString: null rawStr", kXMPErr_BadParam );
+	if ( encodedStr == 0 )
+		XMP_Throw ( "EncodeToHexString: null encodedStr", kXMPErr_BadParam );
+
+	encodedStr->erase();
+	if ( rawLen == 0 ) return allZero;
+	encodedStr->reserve ( rawLen * 2 );
+
+	for( XMP_Uns32 i = 0; i < rawLen; i++ )
+	{
+		// first, second nibble
+		XMP_Uns8 first = rawStr[i] >> 4;
+		XMP_Uns8 second = rawStr[i] & 0xF;
+
+		if ( allZero && (( first != 0 ) || (second != 0)))
+			allZero = false;
+
+		encodedStr->append( 1, sHexChars[first] );
+		encodedStr->append( 1, sHexChars[second] );
+	}
+
+	return allZero;
+}	// EncodeToHexString
+
+// -------------------------------------------------------------------------------------------------
+// DecodeFromHexString
+// ----------------
+//
+// Decode a hex string to raw data bytes.
+// * Input must be all uppercase and w/o any whitespace, strictly (0-9A-Z)* (i.e. "DEADBEEF0099AABC")
+// * No insertation/acceptance of whitespace/linefeeds.
+// * bNo use/tolerance of lowercase.
+// * Number of bytes in the encoded String must be even.
+// * returns true if everything went well, false if illegal (non 0-9A-F) character encountered
+
+static bool DecodeFromHexString ( XMP_StringPtr  encodedStr,
+							    XMP_StringLen  encodedLen,
+							    std::string*   rawStr )
+{
+	if ( (encodedLen % 2) != 0 )
+		return false;
+	rawStr->erase();
+	if ( encodedLen == 0 ) return true;
+	rawStr->reserve ( encodedLen / 2 );
+
+	for( XMP_Uns32 i = 0; i < encodedLen; )
+	{
+		XMP_Uns8 upperNibble = encodedStr[i];
+		if ( (upperNibble < 48) || ( (upperNibble > 57 ) && ( upperNibble < 65 ) ) || (upperNibble > 70) )
+			return false;
+		if ( upperNibble >= 65 )
+			upperNibble -= 7; // shift A-F area adjacent to 0-9
+		upperNibble -= 48; // 'shift' to a value [0..15]
+		upperNibble = ( upperNibble << 4 );
+		i++;
+
+		XMP_Uns8 lowerNibble = encodedStr[i];
+		if ( (lowerNibble < 48) || ( (lowerNibble > 57 ) && ( lowerNibble < 65 ) ) || (lowerNibble > 70) )
+			return false;
+		if ( lowerNibble >= 65 )
+			lowerNibble -= 7; // shift A-F area adjacent to 0-9
+		lowerNibble -= 48; // 'shift' to a value [0..15]
+		i++;
+
+		rawStr->append ( 1, (upperNibble + lowerNibble) );
+	}
+	return true;
+}	// DecodeFromHexString
+
+// Converts input string to an ascii output string
+// - terminates at first 0
+// - replaces all non ascii with 0x3F ('?')
+// - produces up to maxOut characters (note that several UTF-8 character bytes can 'melt' to one byte '?' in ascii.)
+static XMP_StringLen convertToASCII( XMP_StringPtr input, XMP_StringLen inputLen, std::string* output, XMP_StringLen maxOutputLen )
+{
+	if ( (input == 0) && (inputLen != 0) )
+		XMP_Throw ( "convertToASCII: null input string", kXMPErr_BadParam );
+	if ( output == 0)
+		XMP_Throw ( "convertToASCII: null output string", kXMPErr_BadParam );
+	if ( maxOutputLen == 0)
+		XMP_Throw ( "convertToASCII: zero maxOutputLen chars", kXMPErr_BadParam );
+
+	output->reserve(inputLen);
+	output->erase();
+
+	bool isUTF8 = ReconcileUtils::IsUTF8( input, inputLen );
+	XMP_StringLen outputLen = 0;
+
+	for ( XMP_Uns32 i=0; i < inputLen; i++ )
+	{
+		XMP_Uns8 c = (XMP_Uns8) input[i];
+		if ( c == 0 )  // early 0 termination, leave.
+			break;
+		if ( c > 127 ) // uft-8 multi-byte sequence.
+		{
+			if ( isUTF8 ) // skip all high bytes
+			{
+				// how many bytes in this ?
+				if ( c >= 0xC2 && c <= 0xDF )
+					i+=1; // 2-byte sequence
+				else if ( c >= 0xE0 && c <= 0xEF )
+					i+=2; // 3-byte sequence
+				else if ( c >= 0xF0 && c <= 0xF4 )
+					i+=3; // 4-byte sequence
+				else
+					continue; //invalid sequence, look for next 'low' byte ..
+			} // thereafter and 'else': just append a question mark:
+			output->append( 1, '?' );
+		}
+		else // regular valid ascii. 1 byte.
+		{
+			output->append( 1, input[i] );
+		}
+		outputLen++;
+		if ( outputLen >= maxOutputLen )
+			break; // (may be even or even greater due to UFT-8 multi-byte jumps)
+	}
+
+	return outputLen;
+}
+
+/**
+ * ensures that native property gets returned as UTF-8 (may or mayn not already be UTF-8)
+ *  - also takes care of "moot padding" (pre-mature zero termination)
+ *  - propertyExists: it is important to know if there as an existing, non zero property
+ *    even (in the event of serverMode) it is not actually returned, but an empty string instead.
+ */
+static std::string nativePropertyToUTF8 ( XMP_StringPtr cstring, XMP_StringLen maxSize, bool* propertyExists )
+{
+	// the value might be properly 0-terminated, prematurely or not
+	// at all, hence scan through to find actual size
+	XMP_StringLen size   = 0;
+	for ( size = 0; size < maxSize; size++ )
+	{
+		if ( cstring[size] == 0 )
+			break;
+	}
+
+	(*propertyExists) = ( size > 0 );
+
+	std::string utf8("");
+	if ( ReconcileUtils::IsUTF8( cstring, size ) )
+		utf8 = std::string( cstring, size ); //use utf8 directly
+	else
+	{
+		if ( ! ignoreLocalText )
+		{
+			#if ! UNIX_ENV // n/a anyway, since always ignoreLocalText on Unix
+				ReconcileUtils::LocalToUTF8( cstring, size, &utf8 );
+			#endif
+		}
+	}
+	return utf8;
+}
+
+// reads maxSize bytes from file (not "up to", exactly fullSize)
+// puts it into a string, sets respective tree property
+static std::string getBextField ( const char* data, XMP_Uns32 offset, XMP_Uns32 maxSize )
+{
+	if (data == 0)
+		XMP_Throw ( "getBextField: null data pointer", kXMPErr_BadParam );
+	if ( maxSize == 0)
+		XMP_Throw ( "getBextField: maxSize must be greater than 0", kXMPErr_BadParam );
+
+	std::string r;
+	convertToASCII( data+offset, maxSize, &r, maxSize );
+	return r;
+}
+
+static void importBextChunkToXMP( RIFF_MetaHandler* handler, ValueChunk* bextChunk )
+{
+	// if there's a bext chunk, there is data...
+	handler->containsXMP = true; // very important for treatment on caller level
+
+	XMP_Enforce( bextChunk->oldSize >= MIN_BEXT_SIZE );
+	XMP_Enforce( bextChunk->oldSize < MAX_BEXT_SIZE );
+
+	const char* data = bextChunk->oldValue.data();
+	std::string value;
+
+	// register bext namespace:
+	SXMPMeta::RegisterNamespace( kXMP_NS_BWF, "bext:", 0 );
+
+	// bextDescription ------------------------------------------------
+	value = getBextField( data, 0, 256 );
+	if ( value.size() > 0 )
+		handler->xmpObj.SetProperty( bextDescription.ns, bextDescription.prop, value.c_str() );
+
+	// bextOriginator -------------------------------------------------
+	value = getBextField( data, 256, 32 );
+	if ( value.size() > 0 )
+		handler->xmpObj.SetProperty( bextOriginator.ns , bextOriginator.prop, value.c_str() );
+
+	// bextOriginatorRef ----------------------------------------------
+	value = getBextField( data, 256+32, 32 );
+	if ( value.size() > 0 )
+		handler->xmpObj.SetProperty( bextOriginatorRef.ns , bextOriginatorRef.prop, value.c_str() );
+
+	// bextOriginationDate --------------------------------------------
+	value = getBextField( data, 256+32+32, 10 );
+	if ( value.size() > 0 )
+		handler->xmpObj.SetProperty( bextOriginationDate.ns , bextOriginationDate.prop, value.c_str() );
+
+	// bextOriginationTime --------------------------------------------
+	value = getBextField( data, 256+32+32+10, 8 );
+	if ( value.size() > 0 )
+		handler->xmpObj.SetProperty( bextOriginationTime.ns , bextOriginationTime.prop, value.c_str() );
+
+	// bextTimeReference ----------------------------------------------
+	// thanx to nice byte order, all 8 bytes can be read as one:
+	XMP_Uns64 timeReferenceFull  = GetUns64LE( &(data[256+32+32+10+8 ] ) );
+	value.erase();
+	SXMPUtils::ConvertFromInt64( timeReferenceFull, "%llu", &value );
+	handler->xmpObj.SetProperty( bextTimeReference.ns, bextTimeReference.prop, value );
+
+	// bextVersion ----------------------------------------------------
+	XMP_Uns16 bwfVersion  = GetUns16LE( &(data[256+32+32+10+8+8] ) );
+	value.erase();
+	SXMPUtils::ConvertFromInt( bwfVersion, "", &value );
+	handler->xmpObj.SetProperty( bextVersion.ns, bextVersion.prop, value );
+
+	// bextUMID -------------------------------------------------------
+	// binary string is already in memory, must convert to hex string
+	std::string umidString;
+	bool allZero = EncodeToHexString( &(data[256+32+32+10+8+8+2]), 64, &umidString );
+	if (! allZero )
+		handler->xmpObj.SetProperty( bextUMID.ns, bextUMID.prop, umidString );
+
+	// bextCodingHistory ----------------------------------------------
+	bool hasCodingHistory = bextChunk->oldSize > MIN_BEXT_SIZE;
+
+	if ( hasCodingHistory )
+	{
+		XMP_StringLen codingHistorySize = (XMP_StringLen) (bextChunk->oldSize - MIN_BEXT_SIZE);
+		std::string codingHistory;
+		convertToASCII( &data[MIN_BEXT_SIZE-8], codingHistorySize, &codingHistory, codingHistorySize );
+		if (! codingHistory.empty() )
+			handler->xmpObj.SetProperty( bextCodingHistory.ns, bextCodingHistory.prop, codingHistory );
+	}
+} // importBextChunkToXMP
+
+static void importPrmLToXMP( RIFF_MetaHandler* handler, ValueChunk* prmlChunk )
+{
+	bool haveXMP = false;
+
+	XMP_Enforce( prmlChunk->oldSize == PRML_SIZE );
+	PrmLBoxContent rawPrmL;
+	XMP_Assert ( sizeof ( rawPrmL ) == PRML_SIZE - 8 ); // double check tight packing.
+	XMP_Assert ( sizeof ( rawPrmL.filePath ) == 260 );
+	memcpy ( &rawPrmL, prmlChunk->oldValue.data(), sizeof (rawPrmL) );
+
+	if ( rawPrmL.magic != 0xBEEFCAFE ) {
+		Flip4 ( &rawPrmL.exportType );	// The only numeric field that we care about.
+	}
+
+	rawPrmL.filePath[259] = 0;	// Ensure a terminating nul.
+	if ( rawPrmL.filePath[0] != 0 ) {
+		if ( rawPrmL.filePath[0] == '/' ) {
+			haveXMP = true;
+			handler->xmpObj.SetStructField ( kXMP_NS_CreatorAtom, "macAtom",
+								  kXMP_NS_CreatorAtom, "posixProjectPath", rawPrmL.filePath );
+		} else if ( XMP_LitNMatch ( rawPrmL.filePath, "\\\\?\\", 4 ) ) {
+			haveXMP = true;
+			handler->xmpObj.SetStructField ( kXMP_NS_CreatorAtom, "windowsAtom",
+								  kXMP_NS_CreatorAtom, "uncProjectPath", rawPrmL.filePath );
+		}
+	}
+
+	const char * exportStr = 0;
+	switch ( rawPrmL.exportType ) {
+		case kExportTypeMovie  : exportStr = "movie";  break;
+		case kExportTypeStill  : exportStr = "still";  break;
+		case kExportTypeAudio  : exportStr = "audio";  break;
+		case kExportTypeCustom : exportStr = "custom"; break;
+	}
+	if ( exportStr != 0 ) {
+		haveXMP = true;
+		handler->xmpObj.SetStructField ( kXMP_NS_DM, "projectRef", kXMP_NS_DM, "type", exportStr );
+	}
+
+	handler->containsXMP |= haveXMP; // mind the '|='
+} // importCr8rToXMP
+
+static void importCr8rToXMP( RIFF_MetaHandler* handler, ValueChunk* cr8rChunk )
+{
+	bool haveXMP = false;
+
+	XMP_Enforce( cr8rChunk->oldSize == CR8R_SIZE );
+	Cr8rBoxContent rawCr8r;
+	XMP_Assert ( sizeof ( rawCr8r ) == CR8R_SIZE - 8 ); // double check tight packing.
+	memcpy ( &rawCr8r, cr8rChunk->oldValue.data(), sizeof (rawCr8r) );
+
+	if ( rawCr8r.magic != 0xBEEFCAFE ) {
+		Flip4 ( &rawCr8r.creatorCode );	// The only numeric fields that we care about.
+		Flip4 ( &rawCr8r.appleEvent );
+	}
+
+	std::string fieldPath;
+
+	SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "applicationCode", &fieldPath );
+	if ( rawCr8r.creatorCode != 0 ) {
+		haveXMP = true;
+		handler->xmpObj.SetProperty_Int64 ( kXMP_NS_CreatorAtom, fieldPath.c_str(), (XMP_Int64)rawCr8r.creatorCode );	// ! Unsigned trickery.
+	}
+
+	SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "invocationAppleEvent", &fieldPath );
+	if ( rawCr8r.appleEvent != 0 ) {
+		haveXMP = true;
+		handler->xmpObj.SetProperty_Int64 ( kXMP_NS_CreatorAtom, fieldPath.c_str(), (XMP_Int64)rawCr8r.appleEvent );	// ! Unsigned trickery.
+	}
+
+	rawCr8r.fileExt[15] = 0;	// Ensure a terminating nul.
+	if ( rawCr8r.fileExt[0] != 0 ) {
+		haveXMP = true;
+		handler->xmpObj.SetStructField ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "extension", rawCr8r.fileExt );
+	}
+
+	rawCr8r.appOptions[15] = 0;	// Ensure a terminating nul.
+	if ( rawCr8r.appOptions[0] != 0 ) {
+		haveXMP = true;
+		handler->xmpObj.SetStructField ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "invocationFlags", rawCr8r.appOptions );
+	}
+
+	rawCr8r.appName[31] = 0;	// Ensure a terminating nul.
+	if ( rawCr8r.appName[0] != 0 ) {
+		haveXMP = true;
+		handler->xmpObj.SetProperty ( kXMP_NS_XMP, "CreatorTool", rawCr8r.appName );
+	}
+
+	handler->containsXMP |= haveXMP; // mind the '|='
+} // importCr8rToXMP
+
+
+static void importListChunkToXMP( RIFF_MetaHandler* handler, ContainerChunk* listChunk, Mapping mapping[], bool xmpHasPriority )
+{
+	valueMap* cm = &listChunk->childmap;
+	for (int p=0; mapping[p].chunkID != 0; p++) // go through legacy chunks
+	{
+		valueMapIter result = cm->find(mapping[p].chunkID);
+		if( result != cm->end() ) // if value found
+		{
+			ValueChunk* propChunk = result->second;
+
+			bool propertyExists = false;
+			std::string utf8 = nativePropertyToUTF8(
+				propChunk->oldValue.c_str(),
+				(XMP_StringLen)propChunk->oldValue.size(), &propertyExists );
+
+			if ( utf8.size() > 0 ) // if property is not-empty, set Property
+			{
+				switch ( mapping[p].propType )
+				{
+					case prop_TIMEVALUE:
+						if ( xmpHasPriority &&
+							 handler->xmpObj.DoesStructFieldExist( mapping[p].ns, mapping[p].prop, kXMP_NS_DM, "timeValue" ))
+							 break; // skip if XMP has precedence and exists
+						handler->xmpObj.SetStructField( mapping[p].ns, mapping[p].prop,
+										kXMP_NS_DM, "timeValue", utf8.c_str() );
+						break;
+					case prop_LOCALIZED_TEXT:
+						if ( xmpHasPriority && handler->xmpObj.GetLocalizedText( mapping[p].ns ,
+							mapping[p].prop, "" , "x-default", 0, 0, 0 ))
+							break; // skip if XMP has precedence and exists
+						handler->xmpObj.SetLocalizedText( mapping[p].ns , mapping[p].prop,
+											"" , "x-default" , utf8.c_str() );
+						if ( mapping[p].chunkID == kPropChunkINAM )
+							handler->hasListInfoINAM = true; // needs to be known for special 3-way merge around dc:title
+						break;
+					case prop_ARRAYITEM:
+						if ( xmpHasPriority &&
+							 handler->xmpObj.DoesArrayItemExist( mapping[p].ns, mapping[p].prop, 1 ))
+							break; // skip if XMP has precedence and exists
+						handler->xmpObj.DeleteProperty( mapping[p].ns, mapping[p].prop );
+						handler->xmpObj.AppendArrayItem( mapping[p].ns, mapping[p].prop, kXMP_PropValueIsArray, utf8.c_str(), kXMP_NoOptions );
+						break;
+					case prop_SIMPLE:
+						if ( xmpHasPriority &&
+							handler->xmpObj.DoesPropertyExist( mapping[p].ns, mapping[p].prop ))
+							break; // skip if XMP has precedence and exists
+						handler->xmpObj.SetProperty( mapping[p].ns, mapping[p].prop, utf8.c_str() );
+						break;
+					default:
+						XMP_Throw( "internal error" , kXMPErr_InternalFailure );
+				}
+
+				handler->containsXMP = true; // very important for treatment on caller level
+			}
+			else if ( ! propertyExists) // otherwise remove it.
+			{ // [2389942] don't, if legacy value is existing but non-retrievable (due to server mode)
+				switch ( mapping[p].propType )
+				{
+					case prop_TIMEVALUE:
+						if ( (!xmpHasPriority) && // forward deletion only if XMP has no priority
+							 handler->xmpObj.DoesPropertyExist( mapping[p].ns, mapping[p].prop ))
+							handler->xmpObj.DeleteProperty( mapping[p].ns, mapping[p].prop );
+						break;
+					case prop_LOCALIZED_TEXT:
+						if ( (!xmpHasPriority) && // forward deletion only if XMP has no priority
+							 handler->xmpObj.DoesPropertyExist( mapping[p].ns, mapping[p].prop ))
+							handler->xmpObj.DeleteLocalizedText( mapping[p].ns, mapping[p].prop, "", "x-default" );
+						break;
+					case prop_ARRAYITEM:
+					case prop_SIMPLE:
+						if ( (!xmpHasPriority) && // forward deletion only if XMP has no priority
+							 handler->xmpObj.DoesPropertyExist( mapping[p].ns, mapping[p].prop ))
+							handler->xmpObj.DeleteProperty( mapping[p].ns, mapping[p].prop );
+						break;
+					default:
+						XMP_Throw( "internal error" , kXMPErr_InternalFailure );
+				}
+			}
+		}
+	} // for
+}
+void importProperties( RIFF_MetaHandler* handler )
+{
+	bool hasDigest = handler->xmpObj.GetProperty( kXMP_NS_WAV, "NativeDigest", NULL , NULL );
+	if ( hasDigest )
+	{
+		// remove! since it now becomse a 'new' handler file
+		handler->xmpObj.DeleteProperty( kXMP_NS_WAV, "NativeDigest" );
+	}
+
+	// BWF Bext extension chunk -----------------------------------------------
+	if (   handler->parent->format == kXMP_WAVFile && // applies only to WAV
+		   handler->bextChunk != 0 ) //skip if no BEXT chunk found.
+	{
+		importBextChunkToXMP( handler, handler->bextChunk );
+	}
+
+	// PrmL chunk --------------------------------------------------------------
+	if ( handler->prmlChunk != 0 && handler->prmlChunk->oldSize == PRML_SIZE )
+	{
+		importPrmLToXMP( handler, handler->prmlChunk );
+	}
+
+	// Cr8r chunk --------------------------------------------------------------
+	if ( handler->cr8rChunk != 0 && handler->cr8rChunk->oldSize == CR8R_SIZE )
+	{
+		importCr8rToXMP( handler, handler->cr8rChunk );
+	}
+
+	// LIST:INFO --------------------------------------------------------------
+	if ( handler->listInfoChunk != 0) //skip if no LIST:INFO chunk found.
+		importListChunkToXMP( handler, handler->listInfoChunk, listInfoProps, hasDigest );
+
+	// LIST:Tdat --------------------------------------------------------------
+	if ( handler->listTdatChunk != 0)
+		importListChunkToXMP( handler, handler->listTdatChunk, listTdatProps, hasDigest );
+
+	// DISP (do last, higher priority than INAM ) -----------------------------
+	bool takeXMP = false; // assume for now
+	if ( hasDigest )
+	{
+		std::string actualLang, value;
+		bool r = handler->xmpObj.GetLocalizedText( kXMP_NS_DC, "title", "" , "x-default" , &actualLang, &value, NULL );
+		if ( r && (actualLang == "x-default") ) takeXMP = true;
+	}
+
+	if ( (!takeXMP) && handler->dispChunk != 0) //skip if no LIST:INFO chunk found.
+	{
+		std::string* value = &handler->dispChunk->oldValue;
+		if ( value->size() >= 4 ) // ignore contents if file too small
+		{
+			XMP_StringPtr cstring = value->c_str();
+			XMP_StringLen size = (XMP_StringLen) value->size();
+
+			size -= 4; // skip first four bytes known to contain constant
+			cstring += 4;
+
+			bool propertyExists = false;
+			std::string utf8 = nativePropertyToUTF8( cstring, size, &propertyExists );
+
+			if ( utf8.size() > 0 )
+			{
+				handler->xmpObj.SetLocalizedText( kXMP_NS_DC, "title", "" , "x-default" , utf8.c_str() );
+				handler->containsXMP = true; // very important for treatment on caller level
+			}
+			else
+			{
+				// found as part of [2389942]
+				// forward deletion may only happen if no LIST:INFO/INAM is present:
+				if ( ! handler->hasListInfoINAM &&
+					 ! propertyExists )  // ..[2389942]part2: and if truly no legacy property
+				{	                    //    (not just an unreadable one due to ServerMode).
+					handler->xmpObj.DeleteProperty( kXMP_NS_DC, "title" );
+				}
+			}
+		} // if size sufficient
+	} // handler->dispChunk
+
+} // importProperties
+
+////////////////////////////////////////////////////////////////////////////////
+// EXPORT
+////////////////////////////////////////////////////////////////////////////////
+
+void relocateWronglyPlacedXMPChunk( RIFF_MetaHandler* handler )
+{
+	XMP_IO* file = handler->parent->ioRef;
+	RIFF::containerVect *rc = &handler->riffChunks;
+	RIFF::ContainerChunk* lastChunk = rc->at( rc->size()-1 );
+
+	// 1) XMPPacket
+	// needChunk exists but is not in lastChunk ?
+	if (
+		 handler->xmpChunk != 0 &&		// XMP Chunk existing?
+		 (XMP_Uns32)rc->size() > 1 &&	// more than 1 top-level chunk (otherwise pointless)
+         lastChunk->getChild( handler->xmpChunk ) == lastChunk->children.end() // not already in last chunk?
+	    )
+	{
+		RIFF::ContainerChunk* cur;
+		chunkVectIter child;
+		XMP_Int32 chunkNo;
+
+		// find and relocate to last chunk:
+		for ( chunkNo = (XMP_Int32)rc->size()-2 ; chunkNo >= 0; chunkNo-- ) // ==> start with second-last chunk
+		{
+			cur = rc->at(chunkNo);
+			child = cur->getChild( handler->xmpChunk );
+			if ( child != cur->children.end() ) // found?
+				break;
+		} // for
+
+		if ( chunkNo < 0 ) // already in place? nothing left to do.
+			return;
+
+		lastChunk->children.push_back( *child ); // nb: order matters!
+		cur->replaceChildWithJunk( *child, false );
+		cur->hasChange = true; // [2414649] initialize early-on i.e: here
+	} // if
+} // relocateWronglyPlacedXMPChunk
+
+// writes to buffer up to max size,
+// 0 termination only if shorter than maxSize
+// converts down to ascii
+static void setBextField ( std::string* value, XMP_Uns8* data, XMP_Uns32 offset, XMP_Uns32 maxSize )
+{
+	XMP_Validate( value != 0, "setBextField: null value string pointer", kXMPErr_BadParam );
+	XMP_Validate( data != 0, "setBextField: null data value", kXMPErr_BadParam );
+	XMP_Validate( maxSize > 0, "setBextField: maxSize must be greater than 0", kXMPErr_BadParam );
+
+	std::string ascii;
+	XMP_StringLen actualSize = convertToASCII( value->data(), (XMP_StringLen) value->size() , &ascii , maxSize );
+	strncpy( (char*)(data + offset), ascii.data(), actualSize );
+}
+
+// add bwf-bext related data to bext chunk, create if not existing yet.
+// * in fact, since bext is fully fixed and known, there can be no unknown subchunks worth keeping:
+//    * prepare bext chunk in buffer
+//    * value changed/created if needed only, otherways remove chunk
+// * remove bext-mapped properties from xmp (non-redundant storage)
+// note: ValueChunk**: adress of pointer to allow changing the pointer itself (i.e. chunk creation)
+static void exportXMPtoBextChunk( RIFF_MetaHandler* handler, ValueChunk** bextChunk )
+{
+	// register bext namespace ( if there was no import, this is news, otherwise harmless moot)
+	SXMPMeta::RegisterNamespace( kXMP_NS_BWF, "bext:", 0 );
+
+	bool chunkUsed = false; // assume for now
+	SXMPMeta* xmp = &handler->xmpObj;
+
+	// prepare buffer, need to know CodingHistory size as the only variable
+	XMP_Int32 bextBufferSize = MIN_BEXT_SIZE - 8; // -8 because of header
+	std::string value;
+	if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, 0 ))
+	{
+		bextBufferSize += ((XMP_StringLen)value.size()) + 1 ; // add to size (and a trailing zero)
+	}
+
+	// create and clear buffer
+	XMP_Uns8* buffer = new XMP_Uns8[bextBufferSize];
+	for (XMP_Int32 i = 0; i < bextBufferSize; i++ )
+		buffer[i] = 0;
+
+	// grab props, write into buffer, remove from XMP ///////////////////////////
+	// bextDescription ------------------------------------------------
+	if ( xmp->GetProperty( bextDescription.ns, bextDescription.prop, &value, 0 ) )
+	{
+		setBextField( &value, (XMP_Uns8*) buffer, 0, 256 );
+		xmp->DeleteProperty( bextDescription.ns, bextDescription.prop)					;
+		chunkUsed = true;
+	}
+	// bextOriginator -------------------------------------------------
+	if ( xmp->GetProperty( bextOriginator.ns , bextOriginator.prop, &value, 0 ) )
+	{
+		setBextField( &value, (XMP_Uns8*) buffer, 256, 32 );
+		xmp->DeleteProperty( bextOriginator.ns , bextOriginator.prop );
+		chunkUsed = true;
+	}
+	// bextOriginatorRef ----------------------------------------------
+	if ( xmp->GetProperty( bextOriginatorRef.ns , bextOriginatorRef.prop, &value, 0 ) )
+	{
+		setBextField( &value, (XMP_Uns8*) buffer, 256+32, 32 );
+		xmp->DeleteProperty( bextOriginatorRef.ns , bextOriginatorRef.prop );
+		chunkUsed = true;
+	}
+	// bextOriginationDate --------------------------------------------
+	if ( xmp->GetProperty( bextOriginationDate.ns , bextOriginationDate.prop, &value, 0 ) )
+	{
+		setBextField( &value, (XMP_Uns8*) buffer, 256+32+32, 10 );
+		xmp->DeleteProperty( bextOriginationDate.ns , bextOriginationDate.prop );
+		chunkUsed = true;
+	}
+	// bextOriginationTime --------------------------------------------
+	if ( xmp->GetProperty( bextOriginationTime.ns , bextOriginationTime.prop, &value, 0 ) )
+	{
+		setBextField( &value, (XMP_Uns8*) buffer, 256+32+32+10, 8 );
+		xmp->DeleteProperty( bextOriginationTime.ns , bextOriginationTime.prop );
+		chunkUsed = true;
+	}
+	// bextTimeReference ----------------------------------------------
+	// thanx to friendly byte order, all 8 bytes can be written in one go:
+	if ( xmp->GetProperty( bextTimeReference.ns, bextTimeReference.prop, &value, 0 ) )
+	{
+		try
+		{
+			XMP_Int64 v = SXMPUtils::ConvertToInt64( value.c_str() );
+			PutUns64LE( v, &(buffer[256+32+32+10+8] ));
+			chunkUsed = true;
+		}
+		catch (XMP_Error& e)
+		{
+			if ( e.GetID() != kXMPErr_BadParam )
+				throw e;         // re-throw on any other error
+		}  // 'else' tolerate ( time reference remains 0x00000000 )
+		// valid or not, do not store redundantly:
+		xmp->DeleteProperty( bextTimeReference.ns, bextTimeReference.prop );
+	}
+
+	// bextVersion ----------------------------------------------------
+	// set version=1, no matter what.
+	PutUns16LE( 1, &(buffer[256+32+32+10+8+8]) );
+	xmp->DeleteProperty( bextVersion.ns, bextVersion.prop );
+
+	// bextUMID -------------------------------------------------------
+	if ( xmp->GetProperty( bextUMID.ns, bextUMID.prop, &value, 0 ) )
+	{
+		std::string rawStr;
+
+		if ( !DecodeFromHexString( value.data(), (XMP_StringLen) value.size(), &rawStr ) )
+		{
+			delete [] buffer; // important.
+			XMP_Throw ( "EncodeFromHexString: illegal umid string. Must contain an even number of 0-9 and uppercase A-F chars.", kXMPErr_BadParam );
+		}
+
+		// if UMID is smaller/longer than 64 byte for any reason,
+		// truncate/do a partial write (just like for any other bext property)
+
+		memcpy( (char*) &(buffer[256+32+32+10+8+8+2]), rawStr.data(), MIN( 64, rawStr.size() ) );
+		xmp->DeleteProperty( bextUMID.ns, bextUMID.prop );
+		chunkUsed = true;
+	}
+
+	// bextCodingHistory ----------------------------------------------
+	if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, 0 ) )
+	{
+		std::string ascii;
+		convertToASCII( value.data(), (XMP_StringLen) value.size() , &ascii, (XMP_StringLen) value.size() );
+		strncpy( (char*) &(buffer[MIN_BEXT_SIZE-8]), ascii.data(), ascii.size() );
+		xmp->DeleteProperty( bextCodingHistory.ns, bextCodingHistory.prop );
+		chunkUsed = true;
+	}
+
+	// always delete old, recreate if needed
+	if ( *bextChunk != 0 )
+	{
+		(*bextChunk)->parent->replaceChildWithJunk( *bextChunk );
+		(*bextChunk) = 0; // clear direct Chunk pointer
+	}
+
+	if ( chunkUsed)
+		*bextChunk = new ValueChunk( handler->riffChunks.at(0), std::string( (char*)buffer, bextBufferSize ), kChunk_bext );
+
+	delete [] buffer; // important.
+}
+
+static inline void SetBufferedString ( char * dest, const std::string source, size_t limit )
+{
+	memset ( dest, 0, limit );
+	size_t count = source.size();
+	if ( count >= limit ) count = limit - 1;	// Ensure a terminating nul.
+	memcpy ( dest, source.c_str(), count );
+}
+
+static void exportXMPtoCr8rChunk ( RIFF_MetaHandler* handler, ValueChunk** cr8rChunk )
+{
+	const SXMPMeta & xmp = handler->xmpObj;
+
+	// Make sure an existing Cr8r chunk has the proper fixed length.
+	bool haveOldCr8r = (*cr8rChunk != 0);
+	if ( haveOldCr8r && ((*cr8rChunk)->oldSize != sizeof(Cr8rBoxContent)+8) ) {
+		(*cr8rChunk)->parent->replaceChildWithJunk ( *cr8rChunk );	// Wrong length, the existing chunk must be bad.
+		(*cr8rChunk) = 0;
+		haveOldCr8r = false;
+	}
+
+	bool haveNewCr8r = false;
+	std::string creatorCode, appleEvent, fileExt, appOptions, appName;
+
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "applicationCode", &creatorCode, 0 );
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "macAtom", kXMP_NS_CreatorAtom, "invocationAppleEvent", &appleEvent, 0 );
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "extension", &fileExt, 0 );
+	haveNewCr8r |= xmp.GetStructField ( kXMP_NS_CreatorAtom, "windowsAtom", kXMP_NS_CreatorAtom, "invocationFlags", &appOptions, 0 );
+	haveNewCr8r |= xmp.GetProperty ( kXMP_NS_XMP, "CreatorTool", &appName, 0 );
+
+	if ( ! haveNewCr8r ) {	// Get rid of an existing Cr8r chunk if there is no new XMP.
+		if ( haveOldCr8r ) {
+			(*cr8rChunk)->parent->replaceChildWithJunk ( *cr8rChunk );
+			*cr8rChunk = 0;
+		}
+		return;
+	}
+
+	if ( ! haveOldCr8r ) {
+		*cr8rChunk = new ValueChunk ( handler->lastChunk, std::string(), kChunk_Cr8r );
+	}
+
+	std::string strValue;
+	strValue.assign ( (sizeof(Cr8rBoxContent) - 1), '\0' );	// ! Use size-1 because SetValue appends a trailing 0 byte.
+	(*cr8rChunk)->SetValue ( strValue );	// ! Just get the space available.
+	XMP_Assert ( (*cr8rChunk)->newValue.size() == sizeof(Cr8rBoxContent) );
+	(*cr8rChunk)->hasChange = true;
+
+	Cr8rBoxContent * newCr8r = (Cr8rBoxContent*) (*cr8rChunk)->newValue.data();
+
+	if ( ! haveOldCr8r ) {
+
+		newCr8r->magic = MakeUns32LE ( 0xBEEFCAFE );
+		newCr8r->size = MakeUns32LE ( sizeof(Cr8rBoxContent) );
+		newCr8r->majorVer = MakeUns16LE ( 1 );
+
+	} else {
+
+		const Cr8rBoxContent * oldCr8r = (Cr8rBoxContent*) (*cr8rChunk)->oldValue.data();
+		memcpy ( newCr8r, oldCr8r, sizeof(Cr8rBoxContent) );
+		if ( GetUns32LE ( &newCr8r->magic ) != 0xBEEFCAFE ) {	// Make sure we write LE numbers.
+			Flip4 ( &newCr8r->magic );
+			Flip4 ( &newCr8r->size );
+			Flip2 ( &newCr8r->majorVer );
+			Flip2 ( &newCr8r->minorVer );
+			Flip4 ( &newCr8r->creatorCode );
+			Flip4 ( &newCr8r->appleEvent );
+		}
+
+	}
+
+	if ( ! creatorCode.empty() ) {
+		newCr8r->creatorCode = MakeUns32LE ( (XMP_Uns32) strtoul ( creatorCode.c_str(), 0, 0 ) );
+	}
+
+	if ( ! appleEvent.empty() ) {
+		newCr8r->appleEvent = MakeUns32LE ( (XMP_Uns32) strtoul ( appleEvent.c_str(), 0, 0 ) );
+	}
+
+	if ( ! fileExt.empty() ) SetBufferedString ( newCr8r->fileExt, fileExt, sizeof ( newCr8r->fileExt ) );
+	if ( ! appOptions.empty() ) SetBufferedString ( newCr8r->appOptions, appOptions, sizeof ( newCr8r->appOptions ) );
+	if ( ! appName.empty() ) SetBufferedString ( newCr8r->appName, appName, sizeof ( newCr8r->appName ) );
+
+}
+
+static void exportXMPtoListChunk( XMP_Uns32 id, XMP_Uns32 containerType,
+						   RIFF_MetaHandler* handler, ContainerChunk** listChunk, Mapping mapping[])
+{
+	// note: ContainerChunk**: adress of pointer to allow changing the pointer itself (i.e. chunk creation)
+	SXMPMeta* xmp = &handler->xmpObj;
+	bool listChunkIsNeeded = false; // assume for now
+
+	// ! The NUL is optional in WAV to avoid a parsing bug in Audition 3 - can't handle implicit pad byte.
+	bool optionalNUL = (handler->parent->format == kXMP_WAVFile);
+
+	for ( int p=0; mapping[p].chunkID != 0; ++p ) {	// go through all potential property mappings
+
+		bool propExists = false;
+		std::string value, actualLang;
+
+		switch ( mapping[p].propType ) {
+
+			// get property. if existing, remove from XMP (to avoid redundant storage)
+			case prop_TIMEVALUE:
+				propExists = xmp->GetStructField ( mapping[p].ns, mapping[p].prop, kXMP_NS_DM, "timeValue", &value, 0 );
+				break;
+
+			case prop_LOCALIZED_TEXT:
+				propExists = xmp->GetLocalizedText ( mapping[p].ns, mapping[p].prop, "", "x-default", &actualLang, &value, 0);
+				if ( actualLang != "x-default" ) propExists = false; // no "x-default" => nothing to reconcile !
+				break;
+
+			case prop_ARRAYITEM:
+				propExists = xmp->GetArrayItem ( mapping[p].ns, mapping[p].prop, 1, &value, 0 );
+				break;
+
+			case prop_SIMPLE:
+				propExists = xmp->GetProperty ( mapping[p].ns, mapping[p].prop, &value, 0 );
+				break;
+
+			default:
+				XMP_Throw ( "internal error", kXMPErr_InternalFailure );
+
+		}
+
+		if ( ! propExists ) {
+
+			if ( *listChunk != 0 ) (*listChunk)->removeValue ( mapping[p].chunkID );
+
+		} else {
+
+			listChunkIsNeeded = true;
+			if ( *listChunk == 0 ) *listChunk = new ContainerChunk ( handler->riffChunks[0], id, containerType );
+
+			valueMap* cm = &(*listChunk)->childmap;
+			valueMapIter result = cm->find( mapping[p].chunkID );
+			ValueChunk* propChunk = 0;
+
+			if ( result != cm->end() ) {
+				propChunk = result->second;
+			} else {
+				propChunk = new ValueChunk ( *listChunk, std::string(), mapping[p].chunkID );
+			}
+
+			propChunk->SetValue ( value.c_str(), optionalNUL );
+
+		}
+
+	} // for each property
+
+	if ( (! listChunkIsNeeded) && (*listChunk != 0) && ((*listChunk)->children.size() == 0) ) {
+		(*listChunk)->parent->replaceChildWithJunk ( *listChunk );
+		(*listChunk) = 0; // reset direct Chunk pointer
+	}
+
+}
+
+void exportAndRemoveProperties ( RIFF_MetaHandler* handler )
+{
+	SXMPMeta xmpObj = handler->xmpObj;
+
+	exportXMPtoCr8rChunk ( handler, &handler->cr8rChunk );
+
+	// 1/4 BWF Bext extension chunk -----------------------------------------------
+	if ( handler->parent->format == kXMP_WAVFile ) {	// applies only to WAV
+		exportXMPtoBextChunk ( handler, &handler->bextChunk );
+	}
+
+	// 2/4 DISP chunk
+	if ( handler->parent->format == kXMP_WAVFile ) {	// create for WAVE only
+
+		std::string actualLang, xmpValue;
+		bool r = xmpObj.GetLocalizedText ( kXMP_NS_DC, "title", "" , "x-default" , &actualLang, &xmpValue, 0 );
+
+		if ( r && ( actualLang == "x-default" ) ) {	// prop exists?
+
+			// the 'right' DISP is lead by a 32 bit low endian 0x0001
+			std::string dispValue = std::string( "\x1\0\0\0", 4 );
+			dispValue.append ( xmpValue );
+
+			if ( handler->dispChunk == 0 ) {
+				handler->dispChunk = new RIFF::ValueChunk ( handler->riffChunks.at(0), std::string(), kChunk_DISP );
+			}
+
+			// ! The NUL is optional in WAV to avoid a parsing bug in Audition 3 - can't handle implicit pad byte.
+			handler->dispChunk->SetValue ( dispValue, ValueChunk::kNULisOptional );
+
+		} else {	// remove Disp Chunk..
+
+			if ( handler->dispChunk != 0 ) {	// ..if existing
+				ContainerChunk* mainChunk = handler->riffChunks.at(0);
+				Chunk* needle = handler->dispChunk;
+				chunkVectIter iter = mainChunk->getChild ( needle );
+				if ( iter != mainChunk->children.end() ) {
+					mainChunk->replaceChildWithJunk ( *iter );
+					handler->dispChunk = 0;
+					mainChunk->hasChange = true;
+				}
+			}
+
+		}
+
+	}
+
+	// 3/4 LIST:INFO
+	exportXMPtoListChunk ( kChunk_LIST, kType_INFO, handler, &handler->listInfoChunk, listInfoProps );
+
+	// 4/4 LIST:Tdat
+	exportXMPtoListChunk ( kChunk_LIST, kType_Tdat, handler, &handler->listTdatChunk, listTdatProps );
+
+}
+
+} // namespace RIFF
diff --git a/XMPFiles/source/FormatSupport/RIFF_Support.hpp b/XMPFiles/source/FormatSupport/RIFF_Support.hpp
new file mode 100644
index 0000000..c88599b
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/RIFF_Support.hpp
@@ -0,0 +1,42 @@
+#ifndef __RIFF_Support_hpp__
+#define __RIFF_Support_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include <vector>
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+// ahead declaration:
+class RIFF_MetaHandler;
+
+namespace RIFF {
+
+	// declare ahead
+	class Chunk;
+	class ContainerChunk;
+	class ValueChunk;
+	class XMPChunk;
+	
+	/* This rountines imports the properties found into the 
+		xmp packet. Use after parsing. */
+	void importProperties( RIFF_MetaHandler* handler );
+
+	/* This rountines exports XMP properties to the respective Chunks,
+	   creating those if needed. No writing to file here. */
+	void exportAndRemoveProperties( RIFF_MetaHandler* handler );
+
+	/* will relocated a wrongly placed  chunk (one of XMP, LIST:Info, LIST:Tdat=
+	   from RIFF::avix back to main chunk. Chunk itself not touched. */
+	void relocateWronglyPlacedXMPChunk( RIFF_MetaHandler* handler );
+
+} // namespace RIFF
+
+#endif	// __RIFF_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp b/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp
new file mode 100644
index 0000000..df9d676
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp
@@ -0,0 +1,857 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/XIO.hpp"
+
+#include <stdio.h>
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+// =================================================================================================
+/// \file ReconcileIPTC.cpp
+/// \brief Utilities to reconcile between XMP and legacy IPTC and PSIR metadata.
+///
+// =================================================================================================
+
+// =================================================================================================
+// NormalizeToCR
+// =============
+
+static inline void NormalizeToCR ( std::string * value )
+{
+	char * strPtr = (char*) value->data();
+	char * strEnd = strPtr + value->size();
+
+	for ( ; strPtr < strEnd; ++strPtr ) {
+		if ( *strPtr == kLF ) *strPtr = kCR;
+	}
+
+}	// NormalizeToCR
+
+// =================================================================================================
+// NormalizeToLF
+// =============
+
+static inline void NormalizeToLF ( std::string * value )
+{
+	char * strPtr = (char*) value->data();
+	char * strEnd = strPtr + value->size();
+
+	for ( ; strPtr < strEnd; ++strPtr ) {
+		if ( *strPtr == kCR ) *strPtr = kLF;
+	}
+
+}	// NormalizeToLF
+
+// =================================================================================================
+// ComputeIPTCDigest
+// =================
+//
+// Compute a 128 bit (16 byte) MD5 digest of the full IPTC block.
+
+static inline void ComputeIPTCDigest ( const void * iptcPtr, const XMP_Uns32 iptcLen, MD5_Digest * digest )
+{
+	MD5_CTX context;
+
+	MD5Init ( &context );
+	MD5Update ( &context, (XMP_Uns8*)iptcPtr, iptcLen );
+	MD5Final ( *digest, &context );
+
+}	// ComputeIPTCDigest;
+
+// =================================================================================================
+// PhotoDataUtils::CheckIPTCDigest
+// ===============================
+
+int PhotoDataUtils::CheckIPTCDigest ( const void * newPtr, const XMP_Uns32 newLen, const void * oldDigest )
+{
+	MD5_Digest newDigest;
+	ComputeIPTCDigest ( newPtr, newLen, &newDigest );
+	if ( memcmp ( &newDigest, oldDigest, 16 ) == 0 ) return kDigestMatches;
+	return kDigestDiffers;
+
+}	// PhotoDataUtils::CheckIPTCDigest
+
+// =================================================================================================
+// PhotoDataUtils::SetIPTCDigest
+// =============================
+
+void PhotoDataUtils::SetIPTCDigest ( void * iptcPtr, XMP_Uns32 iptcLen, PSIR_Manager * psir )
+{
+	MD5_Digest newDigest;
+
+	ComputeIPTCDigest ( iptcPtr, iptcLen, &newDigest );
+	psir->SetImgRsrc ( kPSIR_IPTCDigest, &newDigest, sizeof(newDigest) );
+
+}	// PhotoDataUtils::SetIPTCDigest
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// PhotoDataUtils::ImportIPTC_Simple
+// =================================
+
+void PhotoDataUtils::ImportIPTC_Simple ( const IPTC_Manager & iptc, SXMPMeta * xmp,
+										 XMP_Uns8 id, const char * xmpNS, const char * xmpProp )
+{
+	std::string utf8Str;
+	size_t count = iptc.GetDataSet_UTF8 ( id, &utf8Str );
+
+	if ( count != 0 ) {
+		NormalizeToLF ( &utf8Str );
+		xmp->SetProperty ( xmpNS, xmpProp, utf8Str.c_str() );
+	}
+
+}	// PhotoDataUtils::ImportIPTC_Simple
+
+// =================================================================================================
+// PhotoDataUtils::ImportIPTC_LangAlt
+// ==================================
+
+void PhotoDataUtils::ImportIPTC_LangAlt ( const IPTC_Manager & iptc, SXMPMeta * xmp,
+										  XMP_Uns8 id, const char * xmpNS, const char * xmpProp )
+{
+	std::string utf8Str;
+	size_t count = iptc.GetDataSet_UTF8 ( id, &utf8Str );
+
+	if ( count != 0 ) {
+		NormalizeToLF ( &utf8Str );
+		xmp->SetLocalizedText ( xmpNS, xmpProp, "", "x-default", utf8Str.c_str() );
+	}
+
+}	// PhotoDataUtils::ImportIPTC_LangAlt
+
+// =================================================================================================
+// PhotoDataUtils::ImportIPTC_Array
+// ================================
+
+void PhotoDataUtils::ImportIPTC_Array ( const IPTC_Manager & iptc, SXMPMeta * xmp,
+										XMP_Uns8 id, const char * xmpNS, const char * xmpProp )
+{
+	std::string utf8Str;
+	size_t count = iptc.GetDataSet ( id, 0 );
+
+	xmp->DeleteProperty ( xmpNS, xmpProp );
+	
+	XMP_OptionBits arrayForm = kXMP_PropArrayIsUnordered;
+	if ( XMP_LitMatch ( xmpNS, kXMP_NS_DC ) && XMP_LitMatch ( xmpProp, "creator" ) ) arrayForm = kXMP_PropArrayIsOrdered;
+
+	for ( size_t ds = 0; ds < count; ++ds ) {
+		(void) iptc.GetDataSet_UTF8 ( id, &utf8Str, ds );
+		NormalizeToLF ( &utf8Str );
+		xmp->AppendArrayItem ( xmpNS, xmpProp, arrayForm, utf8Str.c_str() );
+	}
+
+}	// PhotoDataUtils::ImportIPTC_Array
+
+// =================================================================================================
+// PhotoDataUtils::ImportIPTC_Date
+// ===============================
+//
+// An IPTC (IIM) date is 8 characters, YYYYMMDD. Include the time portion if it is present. The IPTC
+// time is HHMMSSxHHMM, where 'x' is '+' or '-'. Be tolerant of some ill-formed dates and times.
+// Apparently some non-Adobe apps put strings like "YYYY-MM-DD" or "HH:MM:SSxHH:MM" in the IPTC.
+// Allow a missing time zone portion.
+
+// *** The date/time handling differs from the MWG 1.0.1 policy, following a proposed tweak to MWG:
+// ***   Exif DateTimeOriginal <-> XMP exif:DateTimeOriginal
+// ***   IPTC DateCreated <-> XMP photoshop:DateCreated
+// ***   Exif DateTimeDigitized <-> IPTC DigitalCreateDate <-> XMP xmp:CreateDate
+
+void PhotoDataUtils::ImportIPTC_Date ( XMP_Uns8 dateID, const IPTC_Manager & iptc, SXMPMeta * xmp )
+{
+	XMP_Uns8 timeID;
+	XMP_StringPtr xmpNS, xmpProp;
+	
+	if ( dateID == kIPTC_DateCreated ) {
+		timeID  = kIPTC_TimeCreated;
+		xmpNS   = kXMP_NS_Photoshop;
+		xmpProp = "DateCreated";
+	} else if ( dateID == kIPTC_DigitalCreateDate ) {
+		timeID  = kIPTC_DigitalCreateTime;
+		xmpNS   = kXMP_NS_XMP;
+		xmpProp = "CreateDate";
+	} else {
+		XMP_Throw ( "Unrecognized dateID", kXMPErr_BadParam );
+	}
+	
+	// First gather the date portion.
+
+	IPTC_Manager::DataSetInfo dsInfo;
+	size_t count = iptc.GetDataSet ( dateID, &dsInfo );
+	if ( count == 0 ) return;
+
+	size_t chPos, digits;
+	XMP_DateTime xmpDate;
+	memset ( &xmpDate, 0, sizeof(xmpDate) );
+
+	chPos = 0;
+	for ( digits = 0; digits < 4; ++digits, ++chPos ) {
+		if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+		xmpDate.year = (xmpDate.year * 10) + (dsInfo.dataPtr[chPos] - '0');
+	}
+
+	if ( dsInfo.dataPtr[chPos] == '-' ) ++chPos;
+	for ( digits = 0; digits < 2; ++digits, ++chPos ) {
+		if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+		xmpDate.month = (xmpDate.month * 10) + (dsInfo.dataPtr[chPos] - '0');
+	}
+	if ( xmpDate.month < 1 ) xmpDate.month = 1;
+	if ( xmpDate.month > 12 ) xmpDate.month = 12;
+
+	if ( dsInfo.dataPtr[chPos] == '-' ) ++chPos;
+	for ( digits = 0; digits < 2; ++digits, ++chPos ) {
+		if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+		xmpDate.day = (xmpDate.day * 10) + (dsInfo.dataPtr[chPos] - '0');
+	}
+	if ( xmpDate.day < 1 ) xmpDate.day = 1;
+	if ( xmpDate.day > 31 ) xmpDate.day = 28;	// Close enough.
+
+	if ( chPos != dsInfo.dataLen ) return;	// The DataSet is ill-formed.
+	xmpDate.hasDate = true;
+
+	// Now add the time portion if present.
+
+	count = iptc.GetDataSet ( timeID, &dsInfo );
+	if ( count != 0 ) {
+
+		chPos = 0;
+		for ( digits = 0; digits < 2; ++digits, ++chPos ) {
+			if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+			xmpDate.hour = (xmpDate.hour * 10) + (dsInfo.dataPtr[chPos] - '0');
+		}
+		if ( xmpDate.hour < 0 ) xmpDate.hour = 0;
+		if ( xmpDate.hour > 23 ) xmpDate.hour = 23;
+
+		if ( dsInfo.dataPtr[chPos] == ':' ) ++chPos;
+		for ( digits = 0; digits < 2; ++digits, ++chPos ) {
+			if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+			xmpDate.minute = (xmpDate.minute * 10) + (dsInfo.dataPtr[chPos] - '0');
+		}
+		if ( xmpDate.minute < 0 ) xmpDate.minute = 0;
+		if ( xmpDate.minute > 59 ) xmpDate.minute = 59;
+
+		if ( dsInfo.dataPtr[chPos] == ':' ) ++chPos;
+		for ( digits = 0; digits < 2; ++digits, ++chPos ) {
+			if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+			xmpDate.second = (xmpDate.second * 10) + (dsInfo.dataPtr[chPos] - '0');
+		}
+		if ( xmpDate.second < 0 ) xmpDate.second = 0;
+		if ( xmpDate.second > 59 ) xmpDate.second = 59;
+
+		xmpDate.hasTime = true;
+
+		if ( (dsInfo.dataPtr[chPos] != ' ') && (dsInfo.dataPtr[chPos] != 0) ) {	// Tolerate a missing TZ.
+		
+			if ( dsInfo.dataPtr[chPos] == '+' ) {
+				xmpDate.tzSign = kXMP_TimeEastOfUTC;
+			} else if ( dsInfo.dataPtr[chPos] == '-' ) {
+				xmpDate.tzSign = kXMP_TimeWestOfUTC;
+			} else if ( chPos != dsInfo.dataLen ) {
+				return;	// The DataSet is ill-formed.
+			}
+	
+			++chPos;	// Move past the time zone sign.
+			for ( digits = 0; digits < 2; ++digits, ++chPos ) {
+				if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+				xmpDate.tzHour = (xmpDate.tzHour * 10) + (dsInfo.dataPtr[chPos] - '0');
+			}
+			if ( xmpDate.tzHour < 0 ) xmpDate.tzHour = 0;
+			if ( xmpDate.tzHour > 23 ) xmpDate.tzHour = 23;
+	
+			if ( dsInfo.dataPtr[chPos] == ':' ) ++chPos;
+			for ( digits = 0; digits < 2; ++digits, ++chPos ) {
+				if ( (chPos >= dsInfo.dataLen) || (dsInfo.dataPtr[chPos] < '0') || (dsInfo.dataPtr[chPos] > '9') ) break;
+				xmpDate.tzMinute = (xmpDate.tzMinute * 10) + (dsInfo.dataPtr[chPos] - '0');
+			}
+			if ( xmpDate.tzMinute < 0 ) xmpDate.tzMinute = 0;
+			if ( xmpDate.tzMinute > 59 ) xmpDate.tzMinute = 59;
+	
+			if ( chPos != dsInfo.dataLen ) return;	// The DataSet is ill-formed.
+			xmpDate.hasTimeZone = true;
+			
+		}
+
+	}
+
+	// Finally, set the XMP property.
+
+	xmp->SetProperty_Date ( xmpNS, xmpProp, xmpDate );
+
+}	// PhotoDataUtils::ImportIPTC_Date
+
+// =================================================================================================
+// ImportIPTC_IntellectualGenre
+// ============================
+//
+// Import DataSet 2:04. In the IIM this is a 3 digit number, a colon, and an optional text name.
+// Even though the number is the more formal part, the IPTC4XMP rule is that the name is imported to
+// XMP and the number is dropped. Also, even though IIMv4.1 says that 2:04 is repeatable, the XMP
+// property to which it is mapped is simple.
+
+static void ImportIPTC_IntellectualGenre ( const IPTC_Manager & iptc, SXMPMeta * xmp )
+{
+	std::string utf8Str;
+	size_t count = iptc.GetDataSet_UTF8 ( kIPTC_IntellectualGenre, &utf8Str );
+
+	if ( count == 0 ) return;
+	NormalizeToLF ( &utf8Str );
+
+	XMP_StringPtr namePtr = utf8Str.c_str() + 4;
+
+	if ( utf8Str.size() <= 4 ) {
+		// No name in the IIM. Look up the number in our list of known genres.
+		int i;
+		XMP_StringPtr numPtr = utf8Str.c_str();
+		for ( i = 0; kIntellectualGenreMappings[i].refNum != 0; ++i ) {
+			if ( strncmp ( numPtr, kIntellectualGenreMappings[i].refNum, 3 ) == 0 ) break;
+		}
+		if ( kIntellectualGenreMappings[i].refNum == 0 ) return;
+		namePtr = kIntellectualGenreMappings[i].name;
+	}
+
+	xmp->SetProperty ( kXMP_NS_IPTCCore, "IntellectualGenre", namePtr );
+
+}	// ImportIPTC_IntellectualGenre
+
+// =================================================================================================
+// ImportIPTC_SubjectCode
+// ======================
+//
+// Import all 2:12 DataSets into an unordered array. In the IIM each DataSet is composed of 5 colon
+// separated sections: a provider name, an 8 digit reference number, and 3 optional names for the
+// levels of the reference number hierarchy. The IPTC4XMP mapping rule is that only the reference
+// number is imported to XMP.
+
+static void ImportIPTC_SubjectCode ( const IPTC_Manager & iptc, SXMPMeta * xmp )
+{
+	std::string utf8Str;
+	size_t count = iptc.GetDataSet_UTF8 ( kIPTC_SubjectCode, 0 );
+
+	for ( size_t ds = 0; ds < count; ++ds ) {
+
+		(void) iptc.GetDataSet_UTF8 ( kIPTC_SubjectCode, &utf8Str, ds );
+
+		char * refNumPtr = (char*) utf8Str.c_str();
+		for ( ; (*refNumPtr != ':') && (*refNumPtr != 0); ++refNumPtr ) {}
+		if ( *refNumPtr == 0 ) continue;	// This DataSet is ill-formed.
+
+		char * refNumEnd = refNumPtr + 1;
+		for ( ; (*refNumEnd != ':') && (*refNumEnd != 0); ++refNumEnd ) {}
+		if ( (refNumEnd - refNumPtr) != 8 ) continue;	// This DataSet is ill-formed.
+		*refNumEnd = 0;	// Ensure a terminating nul for the reference number portion.
+
+		xmp->AppendArrayItem ( kXMP_NS_IPTCCore, "SubjectCode", kXMP_PropArrayIsUnordered, refNumPtr );
+
+	}
+
+}	// ImportIPTC_SubjectCode
+
+// =================================================================================================
+// PhotoDataUtils::Import2WayIPTC
+// ==============================
+
+void PhotoDataUtils::Import2WayIPTC ( const IPTC_Manager & iptc, SXMPMeta * xmp, int iptcDigestState )
+{
+	if ( iptcDigestState == kDigestMatches ) return;	// Ignore the IPTC if the digest matches.
+
+	std::string oldStr, newStr;
+	IPTC_Writer oldIPTC;
+
+	if ( iptcDigestState == kDigestDiffers ) {
+		PhotoDataUtils::ExportIPTC ( *xmp, &oldIPTC );	// Predict old IPTC DataSets based on the existing XMP.
+	}
+	
+	size_t newCount;
+	IPTC_Manager::DataSetInfo newInfo, oldInfo;
+	
+	for ( size_t i = 0; kKnownDataSets[i].dsNum != 255; ++i ) {
+
+		const DataSetCharacteristics & thisDS = kKnownDataSets[i];
+		if ( thisDS.mapForm >= kIPTC_Map3Way ) continue;	// The mapping is handled elsewhere, or not at all.
+		
+		bool haveXMP = xmp->DoesPropertyExist ( thisDS.xmpNS, thisDS.xmpProp );
+		newCount = PhotoDataUtils::GetNativeInfo ( iptc, thisDS.dsNum, iptcDigestState, haveXMP, &newInfo );
+		if ( newCount == 0 ) continue;	// GetNativeInfo returns 0 for ignored local text.
+		
+		if ( iptcDigestState == kDigestMissing ) {
+			if ( haveXMP ) continue;	// Keep the existing XMP.
+		} else if ( ! PhotoDataUtils::IsValueDifferent ( iptc, oldIPTC, thisDS.dsNum ) ) {
+			continue;	// Don't import values that match the previous export.
+		}
+		
+		// The IPTC wins. Delete any existing XMP and import the DataSet.
+		
+		xmp->DeleteProperty ( thisDS.xmpNS, thisDS.xmpProp );
+
+		try {	// Don't let errors with one stop the others.
+
+			switch ( thisDS.mapForm ) {
+
+				case kIPTC_MapSimple :
+					ImportIPTC_Simple ( iptc, xmp, thisDS.dsNum, thisDS.xmpNS, thisDS.xmpProp );
+					break;
+
+				case kIPTC_MapLangAlt :
+					ImportIPTC_LangAlt ( iptc, xmp, thisDS.dsNum, thisDS.xmpNS, thisDS.xmpProp );
+					break;
+
+				case kIPTC_MapArray :
+					ImportIPTC_Array ( iptc, xmp, thisDS.dsNum, thisDS.xmpNS, thisDS.xmpProp );
+					break;
+
+				case kIPTC_MapSpecial :
+					if ( thisDS.dsNum == kIPTC_DateCreated ) {
+						PhotoDataUtils::ImportIPTC_Date ( thisDS.dsNum, iptc, xmp );
+					} else if ( thisDS.dsNum == kIPTC_IntellectualGenre ) {
+						ImportIPTC_IntellectualGenre ( iptc, xmp );
+					} else if ( thisDS.dsNum == kIPTC_SubjectCode ) {
+						ImportIPTC_SubjectCode ( iptc, xmp );
+					} else {
+						XMP_Assert ( false );	// Catch mapping errors.
+					}
+					break;
+
+			}
+
+		} catch ( ... ) {
+
+			// Do nothing, let other imports proceed.
+			// ? Notify client?
+
+		}
+
+	}
+
+}	// PhotoDataUtils::Import2WayIPTC
+
+// =================================================================================================
+// PhotoDataUtils::ImportPSIR
+// ==========================
+//
+// There are only 2 standalone Photoshop image resources for XMP properties:
+//    1034 - Copyright Flag - 0/1 Boolean mapped to xmpRights:Marked.
+//    1035 - Copyright URL - Local OS text mapped to xmpRights:WebStatement.
+
+// ! Photoshop does not use a true/false/missing model for PSIR 1034. Instead it essentially uses a
+// ! yes/don't-know model when importing. A missing or 0 value for PSIR 1034 cause xmpRights:Marked
+// ! to be deleted.
+
+void PhotoDataUtils::ImportPSIR ( const PSIR_Manager & psir, SXMPMeta * xmp, int iptcDigestState )
+{
+	PSIR_Manager::ImgRsrcInfo rsrcInfo;
+	bool import;
+
+	if ( iptcDigestState == kDigestMatches ) return;
+
+	try {	// Don't let errors with one stop the others.
+		import = psir.GetImgRsrc ( kPSIR_CopyrightFlag, &rsrcInfo );
+		if ( import ) import = (! xmp->DoesPropertyExist ( kXMP_NS_XMP_Rights, "Marked" ));
+		if ( import && (rsrcInfo.dataLen == 1) && (*((XMP_Uns8*)rsrcInfo.dataPtr) != 0) ) {
+			xmp->SetProperty_Bool ( kXMP_NS_XMP_Rights, "Marked", true );
+		}
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+	try {	// Don't let errors with one stop the others.
+		import = psir.GetImgRsrc ( kPSIR_CopyrightURL, &rsrcInfo );
+		if ( import ) import = (! xmp->DoesPropertyExist ( kXMP_NS_XMP_Rights, "WebStatement" ));
+		if ( import ) {
+			std::string utf8;
+			if ( ReconcileUtils::IsUTF8 ( rsrcInfo.dataPtr, rsrcInfo.dataLen ) ) {
+				utf8.assign ( (char*)rsrcInfo.dataPtr, rsrcInfo.dataLen );
+			} else if ( ! ignoreLocalText ) {
+				ReconcileUtils::LocalToUTF8 ( rsrcInfo.dataPtr, rsrcInfo.dataLen, &utf8 );
+			} else {
+				import = false;	// Inhibit the SetProperty call.
+			}
+			if ( import ) xmp->SetProperty ( kXMP_NS_XMP_Rights, "WebStatement", utf8.c_str() );
+		}
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// PhotoDataUtils::ImportPSIR;
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// ExportIPTC_Simple
+// =================
+
+static void ExportIPTC_Simple ( const SXMPMeta & xmp, IPTC_Manager * iptc,
+								const char * xmpNS, const char * xmpProp, XMP_Uns8 id )
+{
+	std::string    value;
+	XMP_OptionBits xmpFlags;
+
+	bool found = xmp.GetProperty ( xmpNS, xmpProp, &value, &xmpFlags );
+	if ( ! found ) {
+		iptc->DeleteDataSet ( id );
+		return;
+	}
+
+	if ( ! XMP_PropIsSimple ( xmpFlags ) ) return;	// ? Complain? Delete the DataSet?
+
+	NormalizeToCR ( &value );
+
+	size_t iptcCount = iptc->GetDataSet ( id, 0 );
+	if ( iptcCount > 1 ) iptc->DeleteDataSet ( id );
+
+	iptc->SetDataSet_UTF8 ( id, value.c_str(), (XMP_Uns32)value.size(), 0 );	// ! Don't append a 2nd DataSet!
+
+}	// ExportIPTC_Simple
+
+// =================================================================================================
+// ExportIPTC_LangAlt
+// ==================
+
+static void ExportIPTC_LangAlt ( const SXMPMeta & xmp, IPTC_Manager * iptc,
+								 const char * xmpNS, const char * xmpProp, XMP_Uns8 id )
+{
+	std::string    value;
+	XMP_OptionBits xmpFlags;
+
+	bool found = xmp.GetProperty ( xmpNS, xmpProp, 0, &xmpFlags );
+	if ( ! found ) {
+		iptc->DeleteDataSet ( id );
+		return;
+	}
+
+	if ( ! XMP_ArrayIsAltText ( xmpFlags ) ) return;	// ? Complain? Delete the DataSet?
+
+	found = xmp.GetLocalizedText ( xmpNS, xmpProp, "", "x-default", 0, &value, 0 );
+	if ( ! found ) {
+		iptc->DeleteDataSet ( id );
+		return;
+	}
+
+	NormalizeToCR ( &value );
+
+	size_t iptcCount = iptc->GetDataSet ( id, 0 );
+	if ( iptcCount > 1 ) iptc->DeleteDataSet ( id );
+
+	iptc->SetDataSet_UTF8 ( id, value.c_str(), (XMP_Uns32)value.size(), 0 );	// ! Don't append a 2nd DataSet!
+
+}	// ExportIPTC_LangAlt
+
+// =================================================================================================
+// ExportIPTC_Array
+// ================
+//
+// Array exporting needs a bit of care to preserve the detection of XMP-only updates. If the current
+// XMP and IPTC array sizes differ, delete the entire IPTC and append all new values. If they match,
+// set the individual values in order - which lets SetDataSet apply its no-change optimization.
+
+static void ExportIPTC_Array ( const SXMPMeta & xmp, IPTC_Manager * iptc,
+							   const char * xmpNS, const char * xmpProp, XMP_Uns8 id )
+{
+	std::string    value;
+	XMP_OptionBits xmpFlags;
+
+	bool found = xmp.GetProperty ( xmpNS, xmpProp, 0, &xmpFlags );
+	if ( ! found ) {
+		iptc->DeleteDataSet ( id );
+		return;
+	}
+
+	if ( ! XMP_PropIsArray ( xmpFlags ) ) return;	// ? Complain? Delete the DataSet?
+
+	XMP_Index xmpCount  = xmp.CountArrayItems ( xmpNS, xmpProp );
+	XMP_Index iptcCount = (XMP_Index) iptc->GetDataSet ( id, 0 );
+
+	if ( xmpCount != iptcCount ) iptc->DeleteDataSet ( id );
+
+	for ( XMP_Index ds = 0; ds < xmpCount; ++ds ) {	// ! XMP arrays are indexed from 1, IPTC from 0.
+
+		(void) xmp.GetArrayItem ( xmpNS, xmpProp, ds+1, &value, &xmpFlags );
+		if ( ! XMP_PropIsSimple ( xmpFlags ) ) continue;	// ? Complain?
+
+		NormalizeToCR ( &value );
+
+		iptc->SetDataSet_UTF8 ( id, value.c_str(), (XMP_Uns32)value.size(), ds );	// ! Appends if necessary.
+
+	}
+
+}	// ExportIPTC_Array
+
+// =================================================================================================
+// ExportIPTC_IntellectualGenre
+// ============================
+//
+// Export DataSet 2:04. In the IIM this is a 3 digit number, a colon, and a text name. Even though
+// the number is the more formal part, the IPTC4XMP rule is that the name is imported to XMP and the
+// number is dropped. Also, even though IIMv4.1 says that 2:04 is repeatable, the XMP property to
+// which it is mapped is simple. Look up the XMP value in a list of known genres to get the number.
+
+static void ExportIPTC_IntellectualGenre ( const SXMPMeta & xmp, IPTC_Manager * iptc )
+{
+	std::string    xmpValue;
+	XMP_OptionBits xmpFlags;
+
+	bool found = xmp.GetProperty ( kXMP_NS_IPTCCore, "IntellectualGenre", &xmpValue, &xmpFlags );
+	if ( ! found ) {
+		iptc->DeleteDataSet ( kIPTC_IntellectualGenre );
+		return;
+	}
+
+	if ( ! XMP_PropIsSimple ( xmpFlags ) ) return;	// ? Complain? Delete the DataSet?
+
+	NormalizeToCR ( &xmpValue );
+
+	int i;
+	XMP_StringPtr namePtr = xmpValue.c_str();
+	for ( i = 0; kIntellectualGenreMappings[i].name != 0; ++i ) {
+		if ( strcmp ( namePtr, kIntellectualGenreMappings[i].name ) == 0 ) break;
+	}
+	if ( kIntellectualGenreMappings[i].name == 0 ) return;	// Not a known genre, don't export it.
+
+	std::string iimValue = kIntellectualGenreMappings[i].refNum;
+	iimValue += ':';
+	iimValue += xmpValue;
+
+	size_t iptcCount = iptc->GetDataSet ( kIPTC_IntellectualGenre, 0 );
+	if ( iptcCount > 1 ) iptc->DeleteDataSet ( kIPTC_IntellectualGenre );
+
+	iptc->SetDataSet_UTF8 ( kIPTC_IntellectualGenre, iimValue.c_str(), (XMP_Uns32)iimValue.size(), 0 );	// ! Don't append a 2nd DataSet!
+
+}	// ExportIPTC_IntellectualGenre
+
+// =================================================================================================
+// ExportIPTC_SubjectCode
+// ======================
+//
+// Export 2:12 DataSets from an unordered array. In the IIM each DataSet is composed of 5 colon
+// separated sections: a provider name, an 8 digit reference number, and 3 optional names for the
+// levels of the reference number hierarchy. The IPTC4XMP mapping rule is that only the reference
+// number is imported to XMP. We export with a fixed provider of "IPTC" and no optional names.
+
+static void ExportIPTC_SubjectCode ( const SXMPMeta & xmp, IPTC_Manager * iptc )
+{
+	std::string    xmpValue, iimValue;
+	XMP_OptionBits xmpFlags;
+
+	bool found = xmp.GetProperty ( kXMP_NS_IPTCCore, "SubjectCode", 0, &xmpFlags );
+	if ( ! found ) {
+		iptc->DeleteDataSet ( kIPTC_SubjectCode );
+		return;
+	}
+
+	if ( ! XMP_PropIsArray ( xmpFlags ) ) return;	// ? Complain? Delete the DataSet?
+
+	XMP_Index xmpCount  = xmp.CountArrayItems ( kXMP_NS_IPTCCore, "SubjectCode" );
+	XMP_Index iptcCount = (XMP_Index) iptc->GetDataSet ( kIPTC_SubjectCode, 0 );
+
+	if ( xmpCount != iptcCount ) iptc->DeleteDataSet ( kIPTC_SubjectCode );
+
+	for ( XMP_Index ds = 0; ds < xmpCount; ++ds ) {	// ! XMP arrays are indexed from 1, IPTC from 0.
+
+		(void) xmp.GetArrayItem ( kXMP_NS_IPTCCore, "SubjectCode", ds+1, &xmpValue, &xmpFlags );
+		if ( ! XMP_PropIsSimple ( xmpFlags ) ) continue;	// ? Complain?
+		if ( xmpValue.size() != 8 ) continue;	// ? Complain?
+
+		iimValue = "IPTC:";
+		iimValue += xmpValue;
+		iimValue += ":::";	// Add the separating colons for the empty name portions.
+
+		iptc->SetDataSet_UTF8 ( kIPTC_SubjectCode, iimValue.c_str(), (XMP_Uns32)iimValue.size(), ds );	// ! Appends if necessary.
+
+	}
+
+}	// ExportIPTC_SubjectCode
+
+// =================================================================================================
+// ExportIPTC_Date
+// ===============
+//
+// The IPTC date and time are "YYYYMMDD" and "HHMMSSxHHMM" where 'x' is '+' or '-'. Export the IPTC
+// time only if already present, or if the XMP has a time portion.
+
+// *** The date/time handling differs from the MWG 1.0 policy, following a proposed tweak to MWG:
+// ***   Exif DateTimeOriginal <-> IPTC DateCreated <-> XMP photoshop:DateCreated
+// ***   Exif DateTimeDigitized <-> IPTC DigitalCreateDate <-> XMP xmp:CreateDate
+
+static void ExportIPTC_Date ( XMP_Uns8 dateID, const SXMPMeta & xmp, IPTC_Manager * iptc )
+{
+	XMP_Uns8 timeID;
+	XMP_StringPtr xmpNS, xmpProp;
+	
+	if ( dateID == kIPTC_DateCreated ) {
+		timeID  = kIPTC_TimeCreated;
+		xmpNS   = kXMP_NS_Photoshop;
+		xmpProp = "DateCreated";
+	} else if ( dateID == kIPTC_DigitalCreateDate ) {
+		timeID  = kIPTC_DigitalCreateTime;
+		xmpNS   = kXMP_NS_XMP;
+		xmpProp = "CreateDate";
+	} else {
+		XMP_Throw ( "Unrecognized dateID", kXMPErr_BadParam );
+	}
+
+	iptc->DeleteDataSet ( dateID );	// ! Either the XMP does not exist and we want to 
+	iptc->DeleteDataSet ( timeID );	// ! delete the IPTC, or we're replacing the IPTC.
+
+	XMP_DateTime xmpValue;
+	bool found = xmp.GetProperty_Date ( xmpNS, xmpProp, &xmpValue, 0 );
+	if ( ! found ) return;
+
+	char iimValue[16];	// AUDIT: Big enough for "YYYYMMDD" (8) and "HHMMSS+HHMM" (11).
+
+	// Set the IIM date portion as YYYYMMDD with zeroes for unknown parts.
+	
+	snprintf ( iimValue, sizeof(iimValue), "%04d%02d%02d",	// AUDIT: Use of sizeof(iimValue) is safe.
+			   xmpValue.year, xmpValue.month, xmpValue.day );
+
+	iptc->SetDataSet_UTF8 ( dateID, iimValue, 8 );
+
+	// Set the IIM time portion as HHMMSS+HHMM (or -HHMM). Allow a missing time zone.
+
+	if ( xmpValue.hasTimeZone )  {
+		snprintf ( iimValue, sizeof(iimValue), "%02d%02d%02d%c%02d%02d",	// AUDIT: Use of sizeof(iimValue) is safe.
+				   xmpValue.hour, xmpValue.minute, xmpValue.second,
+				   ((xmpValue.tzSign == kXMP_TimeWestOfUTC) ? '-' : '+'), xmpValue.tzHour, xmpValue.tzMinute );
+		iptc->SetDataSet_UTF8 ( timeID, iimValue, 11 );
+	} else if ( xmpValue.hasTime ) {
+		snprintf ( iimValue, sizeof(iimValue), "%02d%02d%02d",	// AUDIT: Use of sizeof(iimValue) is safe.
+				   xmpValue.hour, xmpValue.minute, xmpValue.second );
+		iptc->SetDataSet_UTF8 ( timeID, iimValue, 6 );
+	} else {
+		iptc->DeleteDataSet ( timeID );
+	}
+
+}	// ExportIPTC_Date
+
+// =================================================================================================
+// PhotoDataUtils::ExportIPTC
+// ==========================
+
+void PhotoDataUtils::ExportIPTC ( const SXMPMeta & xmp, IPTC_Manager * iptc )
+{
+
+	for ( size_t i = 0; kKnownDataSets[i].dsNum != 255; ++i ) {
+
+		try {	// Don't let errors with one stop the others.
+
+			const DataSetCharacteristics & thisDS = kKnownDataSets[i];
+			if ( thisDS.mapForm >= kIPTC_UnmappedText ) continue;
+
+			switch ( thisDS.mapForm ) {
+
+				case kIPTC_MapSimple :
+					ExportIPTC_Simple ( xmp, iptc, thisDS.xmpNS, thisDS.xmpProp, thisDS.dsNum );
+					break;
+
+				case kIPTC_MapLangAlt :
+					ExportIPTC_LangAlt ( xmp, iptc, thisDS.xmpNS, thisDS.xmpProp, thisDS.dsNum );
+					break;
+
+				case kIPTC_MapArray :
+					ExportIPTC_Array ( xmp, iptc, thisDS.xmpNS, thisDS.xmpProp, thisDS.dsNum );
+					break;
+
+				case kIPTC_MapSpecial :
+					if ( thisDS.dsNum == kIPTC_DateCreated ) {
+						ExportIPTC_Date ( thisDS.dsNum, xmp, iptc );
+					} else if ( thisDS.dsNum == kIPTC_IntellectualGenre ) {
+						ExportIPTC_IntellectualGenre ( xmp, iptc );
+					} else if ( thisDS.dsNum == kIPTC_SubjectCode ) {
+						ExportIPTC_SubjectCode ( xmp, iptc );
+					} else {
+						XMP_Assert ( false );	// Catch mapping errors.
+					}
+					break;
+				
+				case kIPTC_Map3Way :	// The 3 way case is special for import, not for export.
+					if ( thisDS.dsNum == kIPTC_DigitalCreateDate ) {
+						// ! Special case: Don't create IIM DigitalCreateDate. This can avoid PSD
+						// ! full rewrite due to new mapping from xmp:CreateDate.
+						if ( iptc->GetDataSet ( thisDS.dsNum, 0 ) > 0 ) ExportIPTC_Date ( thisDS.dsNum, xmp, iptc );
+					} else if ( thisDS.dsNum == kIPTC_Creator ) {
+						ExportIPTC_Array ( xmp, iptc, kXMP_NS_DC, "creator", kIPTC_Creator );
+					} else if ( thisDS.dsNum == kIPTC_CopyrightNotice ) {
+						ExportIPTC_LangAlt ( xmp, iptc, kXMP_NS_DC, "rights", kIPTC_CopyrightNotice );
+					} else if ( thisDS.dsNum == kIPTC_Description ) {
+						ExportIPTC_LangAlt ( xmp, iptc, kXMP_NS_DC, "description", kIPTC_Description );
+					} else {
+						XMP_Assert ( false );	// Catch mapping errors.
+					}
+
+			}
+
+		} catch ( ... ) {
+
+			// Do nothing, let other exports proceed.
+			// ? Notify client?
+
+		}
+
+	}
+
+}	// PhotoDataUtils::ExportIPTC;
+
+// =================================================================================================
+// PhotoDataUtils::ExportPSIR
+// ==========================
+//
+// There are only 2 standalone Photoshop image resources for XMP properties:
+//    1034 - Copyright Flag - 0/1 Boolean mapped to xmpRights:Marked.
+//    1035 - Copyright URL - Local OS text mapped to xmpRights:WebStatement.
+
+// ! We don't bother with the CR<->LF normalization for xmpRights:WebStatement. Very little chance
+// ! of having a raw CR character in a URI.
+
+void PhotoDataUtils::ExportPSIR ( const SXMPMeta & xmp, PSIR_Manager * psir )
+{
+	bool found;
+	std::string utf8Value;
+
+	try {	// Don't let errors with one stop the others.
+		found = xmp.GetProperty ( kXMP_NS_XMP_Rights, "Marked", &utf8Value, 0 );
+		if ( ! found ) {
+			psir->DeleteImgRsrc ( kPSIR_CopyrightFlag );
+		} else {
+			bool copyrighted = SXMPUtils::ConvertToBool ( utf8Value );
+			psir->SetImgRsrc ( kPSIR_CopyrightFlag, &copyrighted, 1 );
+		}
+	} catch ( ... ) {
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+	}
+
+	try {	// Don't let errors with one stop the others.
+		found = xmp.GetProperty ( kXMP_NS_XMP_Rights, "WebStatement", &utf8Value, 0 );
+		if ( ! found ) {
+			psir->DeleteImgRsrc ( kPSIR_CopyrightURL );
+		} else if ( ! ignoreLocalText ) {
+			std::string localValue;
+			ReconcileUtils::UTF8ToLocal ( utf8Value.c_str(), utf8Value.size(), &localValue );
+			psir->SetImgRsrc ( kPSIR_CopyrightURL, localValue.c_str(), (XMP_Uns32)localValue.size() );
+		} else if ( ReconcileUtils::IsASCII ( utf8Value.c_str(), utf8Value.size() ) ) {
+			psir->SetImgRsrc ( kPSIR_CopyrightURL, utf8Value.c_str(), (XMP_Uns32)utf8Value.size() );
+		} else {
+			psir->DeleteImgRsrc ( kPSIR_CopyrightURL );
+		}
+	} catch ( ... ) {
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+	}
+
+}	// PhotoDataUtils::ExportPSIR;
diff --git a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp
new file mode 100644
index 0000000..e71af09
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp
@@ -0,0 +1,205 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/ReconcileLegacy.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/XIO.hpp"
+
+// =================================================================================================
+/// \file ReconcileLegacy.cpp
+/// \brief Top level parts of utilities to reconcile between XMP and legacy metadata forms such as
+/// TIFF/Exif and IPTC.
+///
+// =================================================================================================
+
+// =================================================================================================
+// ImportPhotoData
+// ===============
+//
+// Import legacy metadata for JPEG, TIFF, and Photoshop files into the XMP. The caller must have
+// already done the file specific processing to select the appropriate sources of the TIFF stream,
+// the Photoshop image resources, and the IPTC.
+
+#define SaveExifTag(ns,prop)	\
+	if ( xmp->DoesPropertyExist ( ns, prop ) ) SXMPUtils::DuplicateSubtree ( *xmp, &savedExif, ns, prop )
+#define RestoreExifTag(ns,prop)	\
+	if ( savedExif.DoesPropertyExist ( ns, prop ) ) SXMPUtils::DuplicateSubtree ( savedExif, xmp, ns, prop )
+
+void ImportPhotoData ( const TIFF_Manager & exif,
+					   const IPTC_Manager & iptc,
+					   const PSIR_Manager & psir,
+					   int                  iptcDigestState,
+					   SXMPMeta *		    xmp,
+					   XMP_OptionBits	    options /* = 0 */ )
+{
+	bool haveXMP  = XMP_OptionIsSet ( options, k2XMP_FileHadXMP );
+	bool haveExif = XMP_OptionIsSet ( options, k2XMP_FileHadExif );
+	bool haveIPTC = XMP_OptionIsSet ( options, k2XMP_FileHadIPTC );
+	
+	// Save some new Exif writebacks that can be XMP-only from older versions, delete all of the
+	// XMP's tiff: and exif: namespaces (they should only reflect native Exif), then put back the
+	// saved writebacks (which might get replaced by the native Exif values in the Import calls).
+	// The value of exif:ISOSpeedRatings is saved for special case handling of ISO over 65535.
+
+	bool haveOldExif = true;	// Default to old Exif if no version tag.
+	TIFF_Manager::TagInfo tagInfo;
+	bool found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+		haveOldExif = (strncmp ( (char*)tagInfo.dataPtr, "0230", 4 ) < 0);
+	}
+	
+	SXMPMeta savedExif;
+	
+	SaveExifTag ( kXMP_NS_EXIF, "DateTimeOriginal" );
+	SaveExifTag ( kXMP_NS_EXIF, "GPSLatitude" );
+	SaveExifTag ( kXMP_NS_EXIF, "GPSLongitude" );
+	SaveExifTag ( kXMP_NS_EXIF, "GPSTimeStamp" );
+	SaveExifTag ( kXMP_NS_EXIF, "GPSAltitude" );
+	SaveExifTag ( kXMP_NS_EXIF, "GPSAltitudeRef" );
+	SaveExifTag ( kXMP_NS_EXIF, "ISOSpeedRatings" );
+	
+	SXMPUtils::RemoveProperties ( xmp, kXMP_NS_TIFF, 0, kXMPUtil_DoAllProperties );
+	SXMPUtils::RemoveProperties ( xmp, kXMP_NS_EXIF, 0, kXMPUtil_DoAllProperties );
+	if ( ! haveOldExif ) SXMPUtils::RemoveProperties ( xmp, kXMP_NS_ExifEX, 0, kXMPUtil_DoAllProperties );
+
+	RestoreExifTag ( kXMP_NS_EXIF, "DateTimeOriginal" );
+	RestoreExifTag ( kXMP_NS_EXIF, "GPSLatitude" );
+	RestoreExifTag ( kXMP_NS_EXIF, "GPSLongitude" );
+	RestoreExifTag ( kXMP_NS_EXIF, "GPSTimeStamp" );
+	RestoreExifTag ( kXMP_NS_EXIF, "GPSAltitude" );
+	RestoreExifTag ( kXMP_NS_EXIF, "GPSAltitudeRef" );
+	RestoreExifTag ( kXMP_NS_EXIF, "ISOSpeedRatings" );
+
+	// Not obvious here, but the logic in PhotoDataUtils follows the MWG reader guidelines.
+	
+	PhotoDataUtils::ImportPSIR ( psir, xmp, iptcDigestState );
+
+	if ( haveIPTC ) PhotoDataUtils::Import2WayIPTC ( iptc, xmp, iptcDigestState );
+	if ( haveExif ) PhotoDataUtils::Import2WayExif ( exif, xmp, iptcDigestState );
+
+	if ( haveExif | haveIPTC ) PhotoDataUtils::Import3WayItems ( exif, iptc, xmp, iptcDigestState );
+
+	// If photoshop:DateCreated does not exist try to create it from exif:DateTimeOriginal.
+	
+	if ( ! xmp->DoesPropertyExist ( kXMP_NS_Photoshop, "DateCreated" ) ) {
+		std::string exifValue;
+		bool haveExifDTO = xmp->GetProperty ( kXMP_NS_EXIF, "DateTimeOriginal", &exifValue, 0 );
+		if ( haveExifDTO ) xmp->SetProperty ( kXMP_NS_Photoshop, "DateCreated", exifValue.c_str() );
+	}
+
+}	// ImportPhotoData
+
+// =================================================================================================
+// ExportPhotoData
+// ===============
+
+void ExportPhotoData ( XMP_FileFormat destFormat,
+					   SXMPMeta *     xmp,
+					   TIFF_Manager * exif, // Pass 0 if not wanted.
+					   IPTC_Manager * iptc, // Pass 0 if not wanted.
+					   PSIR_Manager * psir, // Pass 0 if not wanted.
+					   XMP_OptionBits options /* = 0 */ )
+{
+	XMP_Assert ( (destFormat == kXMP_JPEGFile) || (destFormat == kXMP_TIFFFile) || (destFormat == kXMP_PhotoshopFile) );
+
+	// Do not write IPTC-IIM or PSIR in DNG files (which are a variant of TIFF).
+
+	if ( (destFormat == kXMP_TIFFFile) && (exif != 0) &&
+		 exif->GetTag ( kTIFF_PrimaryIFD, kTIFF_DNGVersion, 0 ) ) {
+
+		iptc = 0;	// These prevent calls to ExportIPTC and ExportPSIR.
+		psir = 0;
+
+		exif->DeleteTag ( kTIFF_PrimaryIFD, kTIFF_IPTC );	// These remove any existing IPTC and PSIR.
+		exif->DeleteTag ( kTIFF_PrimaryIFD, kTIFF_PSIR );
+
+	}
+
+	// Export the individual metadata items to the non-XMP forms. Set the IPTC digest whether or not
+	// it changed, it might not have been present or correct before.
+
+	bool iptcChanged = false;	// Save explicitly, internal flag is reset by UpdateMemoryDataSets.
+
+	void *    iptcPtr = 0;
+	XMP_Uns32 iptcLen = 0;
+	
+	if ( iptc != 0 ) {
+		PhotoDataUtils::ExportIPTC ( *xmp, iptc );
+		iptcChanged = iptc->IsChanged();
+		if ( iptcChanged ) iptc->UpdateMemoryDataSets();
+		iptcLen = iptc->GetBlockInfo ( &iptcPtr );
+		if ( psir != 0 ) PhotoDataUtils::SetIPTCDigest ( iptcPtr, iptcLen, psir );
+	}
+
+	if ( exif != 0 ) PhotoDataUtils::ExportExif ( xmp, exif );
+	if ( psir != 0 ) PhotoDataUtils::ExportPSIR ( *xmp, psir );
+
+	// Now update the non-XMP collections of metadata according to the file format. Do not update
+	// the XMP here, that is done in the file handlers after deciding if an XMP-only in-place
+	// update should be done.
+	// - JPEG has the IPTC in PSIR 1028, the Exif and PSIR are marker segments.
+	// - TIFF has the IPTC and PSIR in primary IFD tags.
+	// - PSD has everything in PSIRs.
+
+	if ( destFormat == kXMP_JPEGFile ) {
+
+		if ( iptcChanged && (psir != 0) ) psir->SetImgRsrc ( kPSIR_IPTC, iptcPtr, iptcLen );
+
+	} else if ( destFormat == kXMP_TIFFFile ) {
+
+		XMP_Assert ( exif != 0 );
+
+		if ( iptcChanged ) exif->SetTag ( kTIFF_PrimaryIFD, kTIFF_IPTC, kTIFF_UndefinedType, iptcLen, iptcPtr );
+
+		if ( (psir != 0) && psir->IsChanged() ) {
+			void* psirPtr;
+			XMP_Uns32 psirLen = psir->UpdateMemoryResources ( &psirPtr );
+			exif->SetTag ( kTIFF_PrimaryIFD, kTIFF_PSIR, kTIFF_UndefinedType, psirLen, psirPtr );
+		}
+
+	} else if ( destFormat == kXMP_PhotoshopFile ) {
+
+		XMP_Assert ( psir != 0 );
+
+		if ( iptcChanged ) psir->SetImgRsrc ( kPSIR_IPTC, iptcPtr, iptcLen );
+
+		if ( (exif != 0) && exif->IsChanged() ) {
+			void* exifPtr;
+			XMP_Uns32 exifLen = exif->UpdateMemoryStream ( &exifPtr );
+			psir->SetImgRsrc ( kPSIR_Exif, exifPtr, exifLen );
+		}
+
+	}
+	
+	// Strip the tiff: and exif: namespaces from the XMP, we're done with them. Save the Exif
+	// ISOSpeedRatings if any of the values are over 0xFFFF, the native tag is SHORT. Lower level
+	// code already kept or stripped the XMP form.
+
+	bool haveOldExif = true;	// Default to old Exif if no version tag.
+	if ( exif != 0 ) {
+		TIFF_Manager::TagInfo tagInfo;
+		bool found = exif->GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, &tagInfo );
+		if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+			haveOldExif = (strncmp ( (char*)tagInfo.dataPtr, "0230", 4 ) < 0);
+		}
+	}
+	
+	SXMPMeta savedExif;
+	SaveExifTag ( kXMP_NS_EXIF, "ISOSpeedRatings" );
+	
+	SXMPUtils::RemoveProperties ( xmp, kXMP_NS_TIFF, 0, kXMPUtil_DoAllProperties );
+	SXMPUtils::RemoveProperties ( xmp, kXMP_NS_EXIF, 0, kXMPUtil_DoAllProperties );
+	if ( ! haveOldExif ) SXMPUtils::RemoveProperties ( xmp, kXMP_NS_ExifEX, 0, kXMPUtil_DoAllProperties );
+
+	RestoreExifTag ( kXMP_NS_EXIF, "ISOSpeedRatings" );
+
+}	// ExportPhotoData
diff --git a/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp
new file mode 100644
index 0000000..16333a3
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp
@@ -0,0 +1,272 @@
+#ifndef __ReconcileLegacy_hpp__
+#define __ReconcileLegacy_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "XMPFiles/source/FormatSupport/PSIR_Support.hpp"
+#include "XMPFiles/source/FormatSupport/IPTC_Support.hpp"
+
+// =================================================================================================
+/// \file ReconcileLegacy.hpp
+/// \brief Utilities to reconcile between XMP and photo metadata forms such as TIFF/Exif and IPTC.
+///
+// =================================================================================================
+
+// ImportPhotoData imports TIFF/Exif and IPTC metadata from JPEG, TIFF, and Photoshop files into
+// XMP. The caller must have already done the file specific processing to select the appropriate
+// sources of the TIFF stream, the Photoshop image resources, and the IPTC.
+//
+// The reconciliation logic used here is based on the Metadata Working Group guidelines. This is a
+// simpler approach than used previously - which was modeled after historical Photoshop behavior.
+
+enum {	// Bits for the options to ImportJTPtoXMP.
+	k2XMP_FileHadXMP  = 0x0001,	// Set if the file had an XMP packet.
+	k2XMP_FileHadIPTC = 0x0002,	// Set if the file had legacy IPTC.
+	k2XMP_FileHadExif = 0x0004	// Set if the file had legacy Exif.
+};
+
+extern void ImportPhotoData ( const TIFF_Manager & exif,
+						 	  const IPTC_Manager & iptc,
+							  const PSIR_Manager & psir,
+							  int                  iptcDigestState,
+							  SXMPMeta *		   xmp,
+							  XMP_OptionBits	   options = 0 );
+
+// ExportPhotoData exports XMP into TIFF/Exif and IPTC metadata for JPEG, TIFF, and Photoshop files.
+
+extern void ExportPhotoData ( XMP_FileFormat destFormat,
+							  SXMPMeta *     xmp,
+							  TIFF_Manager * exif, // Pass 0 if not wanted.
+							  IPTC_Manager * iptc, // Pass 0 if not wanted.
+							  PSIR_Manager * psir, // Pass 0 if not wanted.
+							  XMP_OptionBits options = 0 );
+
+// *** Mapping notes need revision for MWG related changes.
+
+// =================================================================================================
+// Summary of TIFF/Exif mappings to XMP
+// ====================================
+//
+// The mapping for each tag is driven mainly by the tag ID, and secondarily by the type. E.g. there
+// is no blanket rule that all ASCII tags are mapped to simple strings in XMP. Some, such as
+// SubSecTime or GPSLatitudeRef, are combined with other tags; others, like Flash, are reformated.
+// However, most tags are in fact mapped in an obvious manner based on their type and count.
+//
+// Photoshop practice has been to truncate ASCII tags at the first NUL, not supporting the TIFF
+// specification's notion of multi-part ASCII values.
+//
+// Rational values are mapped to XMP as "num/denom".
+//
+// The tags of UNDEFINED type that are mapped to XMP text are either special cases like ExifVersion
+// or the strings with an explicit encoding like UserComment.
+//
+// Latitude and logitude are mapped to XMP as "DDD,MM,SSk" or "DDD,MM.mmk"; k is N, S, E, or W.
+//
+// Flash struct in XMP separates the Fired, Return, Mode, Function, and RedEyeMode portions of the
+// Exif value. Fired, Function, and RedEyeMode are Boolean; Return and Mode are integers.
+//
+// The OECF/SFR, CFA, and DeviceSettings tables are described in the XMP spec.
+//
+// Instead of iterating through all tags in the various IFDs, it is probably more efficient to have
+// explicit processing for the tags that get special treatment, and a static table listing those
+// that get mapped by type and count. The type and count processing will verify that the actual
+// type and count are as expected, if not the tag is ignored.
+//
+// Here are the primary (0th) IFD tags that get special treatment:
+//
+// 270, 33432 - ASCII mapped to alt-text['x-default']
+// 306 - DateTime master
+// 315 - ASCII mapped to text seq[1]
+//
+// Here are the primary (0th) IFD tags that get mapped by type and count:
+//
+// 256, 257, 258, 259, 262, 271, 272, 274, 277, 282, 283, 284, 296, 301, 305, 318, 319,
+// 529, 530, 531, 532
+//
+// Here are the Exif IFD tags that get special treatment:
+//
+// 34856, 41484 - OECF/SFR table
+// 36864, 40960 - 4 ASCII chars to text
+// 36867, 36868 - DateTime master
+// 37121 - 4 UInt8 to integer seq
+// 37385 - Flash struct
+// 37510 - explicitly encoded text to alt-text['x-default']
+// 41728, 41729 - UInt8 to integer
+// 41730 - CFA table
+// 41995 - DeviceSettings table
+//
+// Here are the Exif IFD tags that get mapped by type and count:
+//
+// 33434, 33437, 34850, 34852, 34855, 37122, 37377, 37378, 37379, 37380, 37381, 37382, 37383, 37384,
+// 37386, 37396, 40961, 40962, 40963, 40964, 41483, 41486, 41487, 41488, 41492, 41493, 41495, 41985,
+// 41986, 41987, 41988, 41989, 41990, 41991, 41992, 41993, 41994, 41996, 42016
+//
+// Here are the GPS IFD tags that get special treatment:
+//
+// 0 - 4 UInt8 to text "n.n.n.n"
+// 2, 4, 20, 22 - Latitude or longitude master
+// 7 - special DateTime master, the time part
+// 27, 28 - explicitly encoded text
+//
+// Here are the GPS IFD tags that get mapped by type and count:
+//
+// 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 23, 24, 25, 26, 30
+// =================================================================================================
+
+// *** What about the Camera Raw tags that MDKit maps:
+// ***	0xFDE8, 0xFDE9, 0xFDEA, 0xFE4C, 0xFE4D, 0xFE4E, 0xFE4F, 0xFE50, 0xFE51, 0xFE52, 0xFE53,
+// ***	0xFE54, 0xFE55, 0xFE56, 0xFE57, 0xFE58
+
+// =================================================================================================
+// Summary of TIFF/Exif mappings from XMP
+// ======================================
+//
+// Only a small number of properties are written back from XMP to TIFF/Exif. Most of the TIFF/Exif
+// tags mapped into XMP are information about the image or capture process, not things that users
+// should be editing. The tags that can be edited and written back to TIFF/Exif are:
+//
+// 270, 274, 282, 283, 296, 305, 306, 315, 33432; 36867, 36868, 37510, 40964
+// =================================================================================================
+
+// =================================================================================================
+// Details of TIFF/Exif mappings
+// =============================
+//
+// General (primary and thumbnail, 0th and 1st) IFD tags
+//   tag  TIFF type    count  Name                       XMP mapping
+//
+//   256  SHORTorLONG      1  ImageWidth                 integer
+//   257  SHORTorLONG      1  ImageLength                integer
+//   258  SHORT            3  BitsPerSample              integer seq
+//   259  SHORT            1  Compression                integer
+//   262  SHORT            1  PhotometricInterpretation  integer
+//   270  ASCII          Any  ImageDescription           text, dc:description['x-default']
+//   271  ASCII          Any  Make                       text
+//   272  ASCII          Any  Model                      text
+//   274  SHORT            1  Orientation                integer
+//   277  SHORT            1  SamplesPerPixel            integer
+//   282  RATIONAL         1  XResolution                rational
+//   283  RATIONAL         1  YResolution                rational
+//   284  SHORT            1  PlanarConfiguration        integer
+//   296  SHORT            1  ResolutionUnit             integer
+//   301  SHORT        3*256  TransferFunction           integer seq
+//   305  ASCII          Any  Software                   text, xmp:CreatorTool
+//   306  ASCII           20  DateTime                   date, master of 37520, xmp:DateTime
+//   315  ASCII          Any  Artist                     text, dc:creator[1]
+//   318  RATIONAL         2  WhitePoint                 rational seq
+//   319  RATIONAL         6  PrimaryChromaticities      rational seq
+//   529  RATIONAL         3  YCbCrCoefficients          rational seq
+//   530  SHORT            2  YCbCrSubSampling           integer seq
+//   531  SHORT            1  YCbCrPositioning           integer
+//   532  RATIONAL         6  ReferenceBlackWhite        rational seq
+// 33432  ASCII          Any  Copyright                  text, dc:rights['x-default']
+//
+// Exif IFD tags
+//   tag  TIFF type    count  Name                       XMP mapping
+//
+// 33434  RATIONAL         1  ExposureTime               rational
+// 33437  RATIONAL         1  FNumber                    rational
+// 34850  SHORT            1  ExposureProgram            integer
+// 34852  ASCII          Any  SpectralSensitivity        text
+// 34855  SHORT          Any  ISOSpeedRatings            integer seq
+// 34856  UNDEFINED      Any  OECF                       OECF/SFR table
+// 36864  UNDEFINED        4  ExifVersion                text, Exif has 4 ASCII chars
+// 36867  ASCII           20  DateTimeOriginal           date, master of 37521
+// 36868  ASCII           20  DateTimeDigitized          date, master of 37522
+// 37121  UNDEFINED        4  ComponentsConfiguration    integer seq, Exif has 4 UInt8
+// 37122  RATIONAL         1  CompressedBitsPerPixel     rational
+// 37377  SRATIONAL        1  ShutterSpeedValue          rational
+// 37378  RATIONAL         1  ApertureValue              rational
+// 37379  SRATIONAL        1  BrightnessValue            rational
+// 37380  SRATIONAL        1  ExposureBiasValue          rational
+// 37381  RATIONAL         1  MaxApertureValue           rational
+// 37382  RATIONAL         1  SubjectDistance            rational
+// 37383  SHORT            1  MeteringMode               integer
+// 37384  SHORT            1  LightSource                integer
+// 37385  SHORT            1  Flash                      Flash struct
+// 37386  RATIONAL         1  FocalLength                rational
+// 37396  SHORT         2..4  SubjectArea                integer seq
+// 37510  UNDEFINED      Any  UserComment                text, explicit encoding, exif:UserComment['x-default]
+// 37520  ASCII          Any  SubSecTime                 date, with 306
+// 37521  ASCII          Any  SubSecTimeOriginal         date, with 36867
+// 37522  ASCII          Any  SubSecTimeDigitized        date, with 36868
+// 40960  UNDEFINED        4  FlashpixVersion            text, Exif has 4 ASCII chars
+// 40961  SHORT            1  ColorSpace                 integer
+// 40962  SHORTorLONG      1  PixelXDimension            integer
+// 40963  SHORTorLONG      1  PixelYDimension            integer
+// 40964  ASCII           13  RelatedSoundFile           text
+// 41483  RATIONAL         1  FlashEnergy                rational
+// 41484  UNDEFINED      Any  SpatialFrequencyResponse   OECF/SFR table
+// 41486  RATIONAL         1  FocalPlaneXResolution      rational
+// 41487  RATIONAL         1  FocalPlaneYResolution      rational
+// 41488  SHORT            1  FocalPlaneResolutionUnit   integer
+// 41492  SHORT            2  SubjectLocation            integer seq
+// 41493  RATIONAL         1  ExposureIndex              rational
+// 41495  SHORT            1  SensingMethod              integer
+// 41728  UNDEFINED        1  FileSource                 integer, Exif has UInt8
+// 41729  UNDEFINED        1  SceneType                  integer, Exif has UInt8
+// 41730  UNDEFINED      Any  CFAPattern                 CFA table
+// 41985  SHORT            1  CustomRendered             integer
+// 41986  SHORT            1  ExposureMode               integer
+// 41987  SHORT            1  WhiteBalance               integer
+// 41988  RATIONAL         1  DigitalZoomRatio           rational
+// 41989  SHORT            1  FocalLengthIn35mmFilm      integer
+// 41990  SHORT            1  SceneCaptureType           integer
+// 41991  SHORT            1  GainControl                integer
+// 41992  SHORT            1  Contrast                   integer
+// 41993  SHORT            1  Saturation                 integer
+// 41994  SHORT            1  Sharpness                  integer
+// 41995  UNDEFINED      Any  DeviceSettingDescription   DeviceSettings table
+// 41996  SHORT            1  SubjectDistanceRange       integer
+// 42016  ASCII           33  ImageUniqueID              text
+//
+// GPS IFD tags
+//   tag  TIFF type    count  Name                       XMP mapping
+//
+//     0  BYTE             4  GPSVersionID               text, "n.n.n.n", Exif has 4 UInt8
+//     1  ASCII            2  GPSLatitudeRef             latitude, with 2
+//     2  RATIONAL         3  GPSLatitude                latitude, master of 2
+//     3  ASCII            2  GPSLongitudeRef            longitude, with 4
+//     4  RATIONAL         3  GPSLongitude               longitude, master of 3
+//     5  BYTE             1  GPSAltitudeRef             integer
+//     6  RATIONAL         1  GPSAltitude                rational
+//     7  RATIONAL         3  GPSTimeStamp               date, master of 29
+//     8  ASCII          Any  GPSSatellites              text
+//     9  ASCII            2  GPSStatus                  text
+//    10  ASCII            2  GPSMeasureMode             text
+//    11  RATIONAL         1  GPSDOP                     rational
+//    12  ASCII            2  GPSSpeedRef                text
+//    13  RATIONAL         1  GPSSpeed                   rational
+//    14  ASCII            2  GPSTrackRef                text
+//    15  RATIONAL         1  GPSTrack                   rational
+//    16  ASCII            2  GPSImgDirectionRef         text
+//    17  RATIONAL         1  GPSImgDirection            rational
+//    18  ASCII          Any  GPSMapDatum                text
+//    19  ASCII            2  GPSDestLatitudeRef         latitude, with 20
+//    20  RATIONAL         3  GPSDestLatitude            latitude, master of 19
+//    21  ASCII            2  GPSDestLongitudeRef        longitude, with 22
+//    22  RATIONAL         3  GPSDestLongitude           logitude, master of 21
+//    23  ASCII            2  GPSDestBearingRef          text
+//    24  RATIONAL         1  GPSDestBearing             rational
+//    25  ASCII            2  GPSDestDistanceRef         text
+//    26  RATIONAL         1  GPSDestDistance            rational
+//    27  UNDEFINED      Any  GPSProcessingMethod        text, explicit encoding
+//    28  UNDEFINED      Any  GPSAreaInformation         text, explicit encoding
+//    29  ASCII           11  GPSDateStamp               date, with 29
+//    30  SHORT            1  GPSDifferential            integer
+//
+// =================================================================================================
+
+// =================================================================================================
+
+#endif	// #ifndef __ReconcileLegacy_hpp__
diff --git a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp
new file mode 100644
index 0000000..7e89b0e
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp
@@ -0,0 +1,3454 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/UnicodeConversions.hpp"
+#include "source/XIO.hpp"
+
+#include <stdio.h>
+#if XMP_WinBuild
+	#define snprintf _snprintf
+#endif
+
+#include "source/EndianUtils.hpp"
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4146 )	// unary minus operator applied to unsigned type
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false'
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+// =================================================================================================
+/// \file ReconcileTIFF.cpp
+/// \brief Utilities to reconcile between XMP and legacy TIFF/Exif metadata.
+///
+// =================================================================================================
+
+// =================================================================================================
+
+#ifndef SupportOldExifProperties
+	#define SupportOldExifProperties	1
+	// This controls support of the old Adobe names for things that have official names as of Exif 2.3.
+#endif
+
+// =================================================================================================
+// Tables of the TIFF/Exif tags that are mapped into XMP. For the most part, the tags have obvious
+// mappings based on their IFD, tag number, type and count. These tables do not list tags that are
+// mapped as subsidiary parts of others, e.g. TIFF SubSecTime or GPS Info GPSDateStamp. Tags that
+// have special mappings are marked by having an empty string for the XMP property name.
+
+// ! These tables have the tags listed in the order of tables 3, 4, 5, and 12 of Exif 2.2, with the
+// ! exception of ImageUniqueID (which is listed at the end of the Exif mappings). This order is
+// ! very important to consistent checking of the legacy status. The NativeDigest properties list
+// ! all possible mapped tags in this order. The NativeDigest strings are compared as a whole, so
+// ! the same tags listed in a different order would compare as different.
+
+// ! The sentinel tag value can't be 0, that is a valid GPS Info tag, 0xFFFF is unused so far.
+
+enum {
+	kExport_Never = 0,		// Never export.
+	kExport_Always = 1,		// Add, modify, or delete.
+	kExport_NoDelete = 2,	// Add or modify, do not delete if no XMP.
+	kExport_InjectOnly = 3	// Add tag if new, never modify or delete existing values.
+};
+
+struct TIFF_MappingToXMP {
+	XMP_Uns16    id;
+	XMP_Uns16    type;
+	XMP_Uns32    count;	// Zero means any.
+	XMP_Uns8     exportMode;
+	const char * ns;	// The namespace of the mapped XMP property.
+	const char * name;	// The name of the mapped XMP property.
+};
+
+enum { kAnyCount = 0 };
+
+static const TIFF_MappingToXMP sPrimaryIFDMappings[] = {	// A blank name indicates a special mapping.
+	{ /*   256 */ kTIFF_ImageWidth,                kTIFF_ShortOrLongType, 1,         kExport_Never,      kXMP_NS_TIFF,  "ImageWidth" },
+	{ /*   257 */ kTIFF_ImageLength,               kTIFF_ShortOrLongType, 1,         kExport_Never,      kXMP_NS_TIFF,  "ImageLength" },
+	{ /*   258 */ kTIFF_BitsPerSample,             kTIFF_ShortType,       3,         kExport_Never,      kXMP_NS_TIFF,  "BitsPerSample" },
+	{ /*   259 */ kTIFF_Compression,               kTIFF_ShortType,       1,         kExport_Never,      kXMP_NS_TIFF,  "Compression" },
+	{ /*   262 */ kTIFF_PhotometricInterpretation, kTIFF_ShortType,       1,         kExport_Never,      kXMP_NS_TIFF,  "PhotometricInterpretation" },
+	{ /*   274 */ kTIFF_Orientation,               kTIFF_ShortType,       1,         kExport_NoDelete,   kXMP_NS_TIFF,  "Orientation" },
+	{ /*   277 */ kTIFF_SamplesPerPixel,           kTIFF_ShortType,       1,         kExport_Never,      kXMP_NS_TIFF,  "SamplesPerPixel" },
+	{ /*   284 */ kTIFF_PlanarConfiguration,       kTIFF_ShortType,       1,         kExport_Never,      kXMP_NS_TIFF,  "PlanarConfiguration" },
+	{ /*   529 */ kTIFF_YCbCrCoefficients,         kTIFF_RationalType,    3,         kExport_Never,      kXMP_NS_TIFF,  "YCbCrCoefficients" },
+	{ /*   530 */ kTIFF_YCbCrSubSampling,          kTIFF_ShortType,       2,         kExport_Never,      kXMP_NS_TIFF,  "YCbCrSubSampling" },
+	{ /*   282 */ kTIFF_XResolution,               kTIFF_RationalType,    1,         kExport_NoDelete,   kXMP_NS_TIFF,  "XResolution" },
+	{ /*   283 */ kTIFF_YResolution,               kTIFF_RationalType,    1,         kExport_NoDelete,   kXMP_NS_TIFF,  "YResolution" },
+	{ /*   296 */ kTIFF_ResolutionUnit,            kTIFF_ShortType,       1,         kExport_NoDelete,   kXMP_NS_TIFF,  "ResolutionUnit" },
+	{ /*   301 */ kTIFF_TransferFunction,          kTIFF_ShortType,       3*256,     kExport_Never,      kXMP_NS_TIFF,  "TransferFunction" },
+	{ /*   318 */ kTIFF_WhitePoint,                kTIFF_RationalType,    2,         kExport_Never,      kXMP_NS_TIFF,  "WhitePoint" },
+	{ /*   319 */ kTIFF_PrimaryChromaticities,     kTIFF_RationalType,    6,         kExport_Never,      kXMP_NS_TIFF,  "PrimaryChromaticities" },
+	{ /*   531 */ kTIFF_YCbCrPositioning,          kTIFF_ShortType,       1,         kExport_Never,      kXMP_NS_TIFF,  "YCbCrPositioning" },
+	{ /*   532 */ kTIFF_ReferenceBlackWhite,       kTIFF_RationalType,    6,         kExport_Never,      kXMP_NS_TIFF,  "ReferenceBlackWhite" },
+	{ /*   306 */ kTIFF_DateTime,                  kTIFF_ASCIIType,       20,        kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /*   270 */ kTIFF_ImageDescription,          kTIFF_ASCIIType,       kAnyCount, kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /*   271 */ kTIFF_Make,                      kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_TIFF,  "Make" },
+	{ /*   272 */ kTIFF_Model,                     kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_TIFF,  "Model" },
+	{ /*   305 */ kTIFF_Software,                  kTIFF_ASCIIType,       kAnyCount, kExport_Always,     kXMP_NS_TIFF,  "Software" },	// Has alias to xmp:CreatorTool.
+	{ /*   315 */ kTIFF_Artist,                    kTIFF_ASCIIType,       kAnyCount, kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /* 33432 */ kTIFF_Copyright,                 kTIFF_ASCIIType,       kAnyCount, kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ 0xFFFF, 0, 0, 0 }	// ! Must end with sentinel.
+};
+
+static const TIFF_MappingToXMP sExifIFDMappings[] = {
+
+	// From Exif 2.3 table 7:
+	{ /* 36864 */ kTIFF_ExifVersion,               kTIFF_UndefinedType,   4,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 40960 */ kTIFF_FlashpixVersion,           kTIFF_UndefinedType,   4,         kExport_Never,      "", "" },	// ! Has a special mapping.
+	{ /* 40961 */ kTIFF_ColorSpace,                kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ColorSpace" },
+	{ /* 42240 */ kTIFF_Gamma,                     kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_ExifEX, "Gamma" },
+	{ /* 37121 */ kTIFF_ComponentsConfiguration,   kTIFF_UndefinedType,   4,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 37122 */ kTIFF_CompressedBitsPerPixel,    kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "CompressedBitsPerPixel" },
+	{ /* 40962 */ kTIFF_PixelXDimension,           kTIFF_ShortOrLongType, 1,         kExport_InjectOnly, kXMP_NS_EXIF,  "PixelXDimension" },
+	{ /* 40963 */ kTIFF_PixelYDimension,           kTIFF_ShortOrLongType, 1,         kExport_InjectOnly, kXMP_NS_EXIF,  "PixelYDimension" },
+	{ /* 37510 */ kTIFF_UserComment,               kTIFF_UndefinedType,   kAnyCount, kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /* 40964 */ kTIFF_RelatedSoundFile,          kTIFF_ASCIIType,       kAnyCount, kExport_Always,     kXMP_NS_EXIF,  "RelatedSoundFile" },	// ! Exif spec says count of 13.
+	{ /* 36867 */ kTIFF_DateTimeOriginal,          kTIFF_ASCIIType,       20,        kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /* 36868 */ kTIFF_DateTimeDigitized,         kTIFF_ASCIIType,       20,        kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /* 42016 */ kTIFF_ImageUniqueID,             kTIFF_ASCIIType,       33,        kExport_InjectOnly, kXMP_NS_EXIF,  "ImageUniqueID" },
+	{ /* 42032 */ kTIFF_CameraOwnerName,           kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_ExifEX, "CameraOwnerName" },
+	{ /* 42033 */ kTIFF_BodySerialNumber,          kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_ExifEX, "BodySerialNumber" },
+	{ /* 42034 */ kTIFF_LensSpecification,         kTIFF_RationalType,    4,         kExport_InjectOnly, kXMP_NS_ExifEX, "LensSpecification" },
+	{ /* 42035 */ kTIFF_LensMake,                  kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_ExifEX, "LensMake" },
+	{ /* 42036 */ kTIFF_LensModel,                 kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_ExifEX, "LensModel" },
+	{ /* 42037 */ kTIFF_LensSerialNumber,          kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_ExifEX, "LensSerialNumber" },
+
+	// From Exif 2.3 table 8:
+	{ /* 33434 */ kTIFF_ExposureTime,              kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ExposureTime" },
+	{ /* 33437 */ kTIFF_FNumber,                   kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "FNumber" },
+	{ /* 34850 */ kTIFF_ExposureProgram,           kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ExposureProgram" },
+	{ /* 34852 */ kTIFF_SpectralSensitivity,       kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_EXIF,  "SpectralSensitivity" },
+	{ /* 34855 */ kTIFF_PhotographicSensitivity,   kTIFF_ShortType,       1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 34856 */ kTIFF_OECF,                      kTIFF_UndefinedType,   kAnyCount, kExport_Never,      "", "" },	// ! Has a special mapping.
+	{ /* 34864 */ kTIFF_SensitivityType,           kTIFF_ShortType,       1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 34865 */ kTIFF_StandardOutputSensitivity, kTIFF_LongType,        1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 34866 */ kTIFF_RecommendedExposureIndex,  kTIFF_LongType,        1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 34867 */ kTIFF_ISOSpeed,                  kTIFF_LongType,        1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 34868 */ kTIFF_ISOSpeedLatitudeyyy,       kTIFF_LongType,        1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 34869 */ kTIFF_ISOSpeedLatitudezzz,       kTIFF_LongType,        1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 37377 */ kTIFF_ShutterSpeedValue,         kTIFF_SRationalType,   1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ShutterSpeedValue" },
+	{ /* 37378 */ kTIFF_ApertureValue,             kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ApertureValue" },
+	{ /* 37379 */ kTIFF_BrightnessValue,           kTIFF_SRationalType,   1,         kExport_InjectOnly, kXMP_NS_EXIF,  "BrightnessValue" },
+	{ /* 37380 */ kTIFF_ExposureBiasValue,         kTIFF_SRationalType,   1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ExposureBiasValue" },
+	{ /* 37381 */ kTIFF_MaxApertureValue,          kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "MaxApertureValue" },
+	{ /* 37382 */ kTIFF_SubjectDistance,           kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "SubjectDistance" },
+	{ /* 37383 */ kTIFF_MeteringMode,              kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "MeteringMode" },
+	{ /* 37384 */ kTIFF_LightSource,               kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "LightSource" },
+	{ /* 37385 */ kTIFF_Flash,                     kTIFF_ShortType,       1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 37386 */ kTIFF_FocalLength,               kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "FocalLength" },
+	{ /* 37396 */ kTIFF_SubjectArea,               kTIFF_ShortType,       kAnyCount, kExport_Never,      kXMP_NS_EXIF,  "SubjectArea" },	// ! Actually 2..4.
+	{ /* 41483 */ kTIFF_FlashEnergy,               kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "FlashEnergy" },
+	{ /* 41484 */ kTIFF_SpatialFrequencyResponse,  kTIFF_UndefinedType,   kAnyCount, kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 41486 */ kTIFF_FocalPlaneXResolution,     kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "FocalPlaneXResolution" },
+	{ /* 41487 */ kTIFF_FocalPlaneYResolution,     kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "FocalPlaneYResolution" },
+	{ /* 41488 */ kTIFF_FocalPlaneResolutionUnit,  kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "FocalPlaneResolutionUnit" },
+	{ /* 41492 */ kTIFF_SubjectLocation,           kTIFF_ShortType,       2,         kExport_Never,      kXMP_NS_EXIF,  "SubjectLocation" },
+	{ /* 41493 */ kTIFF_ExposureIndex,             kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ExposureIndex" },
+	{ /* 41495 */ kTIFF_SensingMethod,             kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "SensingMethod" },
+	{ /* 41728 */ kTIFF_FileSource,                kTIFF_UndefinedType,   1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 41729 */ kTIFF_SceneType,                 kTIFF_UndefinedType,   1,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 41730 */ kTIFF_CFAPattern,                kTIFF_UndefinedType,   kAnyCount, kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 41985 */ kTIFF_CustomRendered,            kTIFF_ShortType,       1,         kExport_Never,      kXMP_NS_EXIF,  "CustomRendered" },
+	{ /* 41986 */ kTIFF_ExposureMode,              kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "ExposureMode" },
+	{ /* 41987 */ kTIFF_WhiteBalance,              kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "WhiteBalance" },
+	{ /* 41988 */ kTIFF_DigitalZoomRatio,          kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "DigitalZoomRatio" },
+	{ /* 41989 */ kTIFF_FocalLengthIn35mmFilm,     kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "FocalLengthIn35mmFilm" },
+	{ /* 41990 */ kTIFF_SceneCaptureType,          kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "SceneCaptureType" },
+	{ /* 41991 */ kTIFF_GainControl,               kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GainControl" },
+	{ /* 41992 */ kTIFF_Contrast,                  kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "Contrast" },
+	{ /* 41993 */ kTIFF_Saturation,                kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "Saturation" },
+	{ /* 41994 */ kTIFF_Sharpness,                 kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "Sharpness" },
+	{ /* 41995 */ kTIFF_DeviceSettingDescription,  kTIFF_UndefinedType,   kAnyCount, kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /* 41996 */ kTIFF_SubjectDistanceRange,      kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "SubjectDistanceRange" },
+
+	{ 0xFFFF, 0, 0, 0 }	// ! Must end with sentinel.
+};
+
+static const TIFF_MappingToXMP sGPSInfoIFDMappings[] = {
+	{ /*     0 */ kTIFF_GPSVersionID,              kTIFF_ByteType,        4,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /*     2 */ kTIFF_GPSLatitude,               kTIFF_RationalType,    3,         kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /*     4 */ kTIFF_GPSLongitude,              kTIFF_RationalType,    3,         kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /*     5 */ kTIFF_GPSAltitudeRef,            kTIFF_ByteType,        1,         kExport_Always,     kXMP_NS_EXIF,  "GPSAltitudeRef" },
+	{ /*     6 */ kTIFF_GPSAltitude,               kTIFF_RationalType,    1,         kExport_Always,     kXMP_NS_EXIF,  "GPSAltitude" },
+	{ /*     7 */ kTIFF_GPSTimeStamp,              kTIFF_RationalType,    3,         kExport_Always,     "", "" },	// ! Has a special mapping.
+	{ /*     8 */ kTIFF_GPSSatellites,             kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_EXIF,  "GPSSatellites" },
+	{ /*     9 */ kTIFF_GPSStatus,                 kTIFF_ASCIIType,       2,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSStatus" },
+	{ /*    10 */ kTIFF_GPSMeasureMode,            kTIFF_ASCIIType,       2,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSMeasureMode" },
+	{ /*    11 */ kTIFF_GPSDOP,                    kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSDOP" },
+	{ /*    12 */ kTIFF_GPSSpeedRef,               kTIFF_ASCIIType,       2,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSSpeedRef" },
+	{ /*    13 */ kTIFF_GPSSpeed,                  kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSSpeed" },
+	{ /*    14 */ kTIFF_GPSTrackRef,               kTIFF_ASCIIType,       2,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSTrackRef" },
+	{ /*    15 */ kTIFF_GPSTrack,                  kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSTrack" },
+	{ /*    16 */ kTIFF_GPSImgDirectionRef,        kTIFF_ASCIIType,       2,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSImgDirectionRef" },
+	{ /*    17 */ kTIFF_GPSImgDirection,           kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSImgDirection" },
+	{ /*    18 */ kTIFF_GPSMapDatum,               kTIFF_ASCIIType,       kAnyCount, kExport_InjectOnly, kXMP_NS_EXIF,  "GPSMapDatum" },
+	{ /*    20 */ kTIFF_GPSDestLatitude,           kTIFF_RationalType,    3,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /*    22 */ kTIFF_GPSDestLongitude,          kTIFF_RationalType,    3,         kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /*    23 */ kTIFF_GPSDestBearingRef,         kTIFF_ASCIIType,       2,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSDestBearingRef" },
+	{ /*    24 */ kTIFF_GPSDestBearing,            kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSDestBearing" },
+	{ /*    25 */ kTIFF_GPSDestDistanceRef,        kTIFF_ASCIIType,       2,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSDestDistanceRef" },
+	{ /*    26 */ kTIFF_GPSDestDistance,           kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSDestDistance" },
+	{ /*    27 */ kTIFF_GPSProcessingMethod,       kTIFF_UndefinedType,   kAnyCount, kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /*    28 */ kTIFF_GPSAreaInformation,        kTIFF_UndefinedType,   kAnyCount, kExport_InjectOnly, "", "" },	// ! Has a special mapping.
+	{ /*    30 */ kTIFF_GPSDifferential,           kTIFF_ShortType,       1,         kExport_InjectOnly, kXMP_NS_EXIF,  "GPSDifferential" },
+	{ /*    31 */ kTIFF_GPSHPositioningError,      kTIFF_RationalType,    1,         kExport_InjectOnly, kXMP_NS_ExifEX, "GPSHPositioningError" },
+	{ 0xFFFF, 0, 0, 0 }	// ! Must end with sentinel.
+};
+
+// =================================================================================================
+
+static void	// ! Needed by Import2WayExif
+ExportTIFF_Date ( const SXMPMeta & xmp, const char * xmpNS, const char * xmpProp, TIFF_Manager * tiff, XMP_Uns16 mainID );
+
+// =================================================================================================
+
+static XMP_Uns32 GatherInt ( const char * strPtr, size_t count )
+{
+	XMP_Uns32 value = 0;
+	const char * strEnd = strPtr + count;
+
+	while ( strPtr < strEnd ) {
+		char ch = *strPtr;
+		if ( (ch < '0') || (ch > '9') ) break;
+		value = value*10 + (ch - '0');
+		++strPtr;
+	}
+
+	return value;
+
+}	// GatherInt
+
+// =================================================================================================
+
+static size_t TrimTrailingSpaces ( char * firstChar, size_t origLen )
+{
+	if ( !firstChar || origLen == 0 ) return 0;
+
+	char * lastChar  = firstChar + origLen - 1;
+	if ( (*lastChar != ' ') && (*lastChar != 0) ) return origLen;	// Nothing to do.
+	
+	while ( (firstChar <= lastChar) && ((*lastChar == ' ') || (*lastChar == 0)) ) --lastChar;
+	
+	XMP_Assert ( (lastChar == firstChar-1) ||
+				 ((lastChar >= firstChar) && (*lastChar != ' ') && (*lastChar != 0)) );
+	
+	size_t newLen = (size_t)((lastChar+1) - firstChar);
+	XMP_Assert ( newLen <= origLen );
+
+	if ( newLen < origLen ) {
+		++lastChar;
+		*lastChar = 0;
+	}
+
+	return newLen;
+
+}	// TrimTrailingSpaces
+
+static void TrimTrailingSpaces ( TIFF_Manager::TagInfo * info )
+{
+	info->dataLen = (XMP_Uns32) TrimTrailingSpaces ( (char*)info->dataPtr, (size_t)info->dataLen );
+}
+
+static void TrimTrailingSpaces ( std::string * stdstr )
+{
+	size_t origLen = stdstr->size();
+	size_t newLen = TrimTrailingSpaces ( (char*)stdstr->c_str(), origLen );
+	if ( newLen != origLen ) stdstr->erase ( newLen );
+}
+
+// =================================================================================================
+
+bool PhotoDataUtils::GetNativeInfo ( const TIFF_Manager & exif, XMP_Uns8 ifd, XMP_Uns16 id, TIFF_Manager::TagInfo * info )
+{
+	bool haveExif = exif.GetTag ( ifd, id, info );
+
+	if ( haveExif ) {
+
+		XMP_Uns32 i;
+		char * chPtr;
+		
+		XMP_Assert ( (info->dataPtr != 0) || (info->dataLen == 0) );	// Null pointer requires zero length.
+
+		bool isDate = ((id == kTIFF_DateTime) || (id == kTIFF_DateTimeOriginal) || (id == kTIFF_DateTimeOriginal));
+
+		for ( i = 0, chPtr = (char*)info->dataPtr; i < info->dataLen; ++i, ++chPtr ) {
+			if ( isDate && (*chPtr == ':') ) continue;	// Ignore colons, empty dates have spaces and colons.
+			if ( (*chPtr != ' ') && (*chPtr != 0) ) break;	// Break if the Exif value is non-empty.
+		}
+
+		if ( i == info->dataLen ) {
+			haveExif = false;	// Ignore empty Exif.
+		} else {
+			TrimTrailingSpaces ( info );
+			if ( info->dataLen == 0 ) haveExif = false;
+		}
+
+	}
+
+	return haveExif;
+
+}	// PhotoDataUtils::GetNativeInfo
+
+// =================================================================================================
+
+size_t PhotoDataUtils::GetNativeInfo ( const IPTC_Manager & iptc, XMP_Uns8 id, int digestState, bool haveXMP, IPTC_Manager::DataSetInfo * info )
+{
+	size_t iptcCount = 0;
+
+	if ( (digestState == kDigestDiffers) || ((digestState == kDigestMissing) && (! haveXMP)) ) {
+		iptcCount = iptc.GetDataSet ( id, info );
+	}
+	
+	if ( ignoreLocalText && (iptcCount > 0) && (! iptc.UsingUTF8()) ) {
+		// Check to see if the new value(s) should be ignored.
+		size_t i;
+		IPTC_Manager::DataSetInfo tmpInfo;
+		for ( i = 0; i < iptcCount; ++i ) {
+			(void) iptc.GetDataSet ( id, &tmpInfo, i );
+			if ( ReconcileUtils::IsASCII ( tmpInfo.dataPtr, tmpInfo.dataLen ) ) break;
+		}
+		if ( i == iptcCount ) iptcCount = 0;	// Return 0 if value(s) should be ignored.
+	}
+
+	return iptcCount;
+
+}	// PhotoDataUtils::GetNativeInfo
+
+// =================================================================================================
+
+bool PhotoDataUtils::IsValueDifferent ( const TIFF_Manager::TagInfo & exifInfo, const std::string & xmpValue, std::string * exifValue )
+{
+	if ( exifInfo.dataLen == 0 ) return false;	// Ignore empty Exif values.
+
+	if ( ReconcileUtils::IsUTF8 ( exifInfo.dataPtr, exifInfo.dataLen ) ) {	// ! Note that ASCII is UTF-8.
+		exifValue->assign ( (char*)exifInfo.dataPtr, exifInfo.dataLen );
+	} else {
+		if ( ignoreLocalText ) return false;
+		ReconcileUtils::LocalToUTF8 ( exifInfo.dataPtr, exifInfo.dataLen, exifValue );
+	}
+
+	return (*exifValue != xmpValue);
+
+}	// PhotoDataUtils::IsValueDifferent
+
+// =================================================================================================
+
+bool PhotoDataUtils::IsValueDifferent ( const IPTC_Manager & newIPTC, const IPTC_Manager & oldIPTC, XMP_Uns8 id )
+{
+	IPTC_Manager::DataSetInfo newInfo;
+	size_t newCount = newIPTC.GetDataSet ( id, &newInfo );
+	if ( newCount == 0 ) return false;	// Ignore missing new IPTC values.
+
+	IPTC_Manager::DataSetInfo oldInfo;
+	size_t oldCount = oldIPTC.GetDataSet ( id, &oldInfo );
+	if ( oldCount == 0 ) return true;	// Missing old IPTC values differ.
+	
+	if ( newCount != oldCount ) return true;
+
+	std::string oldStr, newStr;
+
+	for ( newCount = 0; newCount < oldCount; ++newCount ) {
+
+		if ( ignoreLocalText & (! newIPTC.UsingUTF8()) ) {	// Check to see if the new value should be ignored.
+			(void) newIPTC.GetDataSet ( id, &newInfo, newCount );
+			if ( ! ReconcileUtils::IsASCII ( newInfo.dataPtr, newInfo.dataLen ) ) continue;
+		}
+
+		(void) newIPTC.GetDataSet_UTF8 ( id, &newStr, newCount );
+		(void) oldIPTC.GetDataSet_UTF8 ( id, &oldStr, newCount );
+		if ( newStr.size() == 0 ) continue;	// Ignore empty new IPTC.
+		if ( newStr != oldStr ) break;
+
+	}
+
+	return ( newCount != oldCount );	// Not different if all values matched.
+	
+}	// PhotoDataUtils::IsValueDifferent
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// ImportSingleTIFF_Short
+// ======================
+
+static void
+ImportSingleTIFF_Short ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns16 binValue = GetUns16AsIs ( tagInfo.dataPtr );
+		if ( ! nativeEndian ) binValue = Flip2 ( binValue );
+
+		char strValue[20];
+		snprintf ( strValue, sizeof(strValue), "%hu", binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_Short
+
+// =================================================================================================
+// ImportSingleTIFF_Long
+// =====================
+
+static void
+ImportSingleTIFF_Long ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns32 binValue = GetUns32AsIs ( tagInfo.dataPtr );
+		if ( ! nativeEndian ) binValue = Flip4 ( binValue );
+
+		char strValue[20];
+		snprintf ( strValue, sizeof(strValue), "%lu", (unsigned long)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_Long
+
+// =================================================================================================
+// ImportSingleTIFF_Rational
+// =========================
+
+static void
+ImportSingleTIFF_Rational ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+							SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns32 * binPtr = (XMP_Uns32*)tagInfo.dataPtr;
+		XMP_Uns32 binNum   = GetUns32AsIs ( &binPtr[0] );
+		XMP_Uns32 binDenom = GetUns32AsIs ( &binPtr[1] );
+		if ( ! nativeEndian ) {
+			binNum = Flip4 ( binNum );
+			binDenom = Flip4 ( binDenom );
+		}
+
+		char strValue[40];
+		snprintf ( strValue, sizeof(strValue), "%lu/%lu", (unsigned long)binNum, (unsigned long)binDenom );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_Rational
+
+// =================================================================================================
+// ImportSingleTIFF_SRational
+// ==========================
+
+static void
+ImportSingleTIFF_SRational ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+							 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+#if SUNOS_SPARC || XMP_IOS_ARM
+        XMP_Uns32  binPtr[2];
+        memcpy(&binPtr, tagInfo.dataPtr, sizeof(XMP_Uns32)*2);
+#else
+	XMP_Uns32 * binPtr = (XMP_Uns32*)tagInfo.dataPtr;
+#endif //#if SUNOS_SPARC || XMP_IOS_ARM
+		XMP_Int32 binNum   = GetUns32AsIs ( &binPtr[0] );
+		XMP_Int32 binDenom = GetUns32AsIs ( &binPtr[1] );
+		if ( ! nativeEndian ) {
+			Flip4 ( &binNum );
+			Flip4 ( &binDenom );
+		}
+
+		char strValue[40];
+		snprintf ( strValue, sizeof(strValue), "%ld/%ld", (unsigned long)binNum, (unsigned long)binDenom );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_SRational
+
+// =================================================================================================
+// ImportSingleTIFF_ASCII
+// ======================
+
+static void
+ImportSingleTIFF_ASCII ( const TIFF_Manager::TagInfo & tagInfo,
+						 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+	
+		TrimTrailingSpaces ( (TIFF_Manager::TagInfo*) &tagInfo );
+		if ( tagInfo.dataLen == 0 ) return;	// Ignore empty tags.
+
+		const char * chPtr  = (const char *)tagInfo.dataPtr;
+		const bool   hasNul = !tagInfo.dataLen || !chPtr || (chPtr[tagInfo.dataLen-1] == 0);
+		const bool   isUTF8 = ReconcileUtils::IsUTF8 ( chPtr, tagInfo.dataLen );
+
+		if ( isUTF8 && hasNul ) {
+			xmp->SetProperty ( xmpNS, xmpProp, chPtr );
+		} else {
+			std::string strValue;
+			if ( isUTF8 ) {
+				strValue.assign ( chPtr, tagInfo.dataLen );
+			} else {
+				if ( ignoreLocalText ) return;
+				ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue );
+			}
+			xmp->SetProperty ( xmpNS, xmpProp, strValue.c_str() );
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_ASCII
+
+// =================================================================================================
+// ImportSingleTIFF_Byte
+// =====================
+
+static void
+ImportSingleTIFF_Byte ( const TIFF_Manager::TagInfo & tagInfo,
+						SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns8 binValue = *((XMP_Uns8*)tagInfo.dataPtr);
+
+		char strValue[20];
+		snprintf ( strValue, sizeof(strValue), "%hu", (XMP_Uns16)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_Byte
+
+// =================================================================================================
+// ImportSingleTIFF_SByte
+// ======================
+
+static void
+ImportSingleTIFF_SByte ( const TIFF_Manager::TagInfo & tagInfo,
+						 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Int8 binValue = *((XMP_Int8*)tagInfo.dataPtr);
+
+		char strValue[20];
+		snprintf ( strValue, sizeof(strValue), "%hd", (short)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_SByte
+
+// =================================================================================================
+// ImportSingleTIFF_SShort
+// =======================
+
+static void
+ImportSingleTIFF_SShort ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Int16 binValue = *((XMP_Int16*)tagInfo.dataPtr);
+		if ( ! nativeEndian ) Flip2 ( &binValue );
+
+		char strValue[20];
+		snprintf ( strValue, sizeof(strValue), "%hd", binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_SShort
+
+// =================================================================================================
+// ImportSingleTIFF_SLong
+// ======================
+
+static void
+ImportSingleTIFF_SLong ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Int32 binValue = *((XMP_Int32*)tagInfo.dataPtr);
+		if ( ! nativeEndian ) Flip4 ( &binValue );
+
+		char strValue[20];
+		snprintf ( strValue, sizeof(strValue), "%ld", (long)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+		xmp->SetProperty ( xmpNS, xmpProp, strValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_SLong
+
+// =================================================================================================
+// ImportSingleTIFF_Float
+// ======================
+
+static void
+ImportSingleTIFF_Float ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		float binValue = *((float*)tagInfo.dataPtr);
+		if ( ! nativeEndian ) Flip4 ( &binValue );
+
+		xmp->SetProperty_Float ( xmpNS, xmpProp, binValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_Float
+
+// =================================================================================================
+// ImportSingleTIFF_Double
+// =======================
+
+static void
+ImportSingleTIFF_Double ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		double binValue = *((double*)tagInfo.dataPtr);
+		if ( ! nativeEndian ) Flip8 ( &binValue );
+
+		xmp->SetProperty_Float ( xmpNS, xmpProp, binValue );	// ! Yes, SetProperty_Float.
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportSingleTIFF_Double
+
+// =================================================================================================
+// ImportSingleTIFF
+// ================
+
+static void
+ImportSingleTIFF ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+				   SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+
+	// We've got a tag to map to XMP, decide how based on actual type and the expected count. Using
+	// the actual type eliminates a ShortOrLong case. Using the expected count is needed to know
+	// whether to create an XMP array. The actual count for an array could be 1. Put the most
+	// common cases first for better iCache utilization.
+
+	switch ( tagInfo.type ) {
+
+		case kTIFF_ShortType :
+			ImportSingleTIFF_Short ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_LongType :
+			ImportSingleTIFF_Long ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_RationalType :
+			ImportSingleTIFF_Rational ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SRationalType :
+			ImportSingleTIFF_SRational ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_ASCIIType :
+			ImportSingleTIFF_ASCII ( tagInfo, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_ByteType :
+			ImportSingleTIFF_Byte ( tagInfo, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SByteType :
+			ImportSingleTIFF_SByte ( tagInfo, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SShortType :
+			ImportSingleTIFF_SShort ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SLongType :
+			ImportSingleTIFF_SLong ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_FloatType :
+			ImportSingleTIFF_Float ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_DoubleType :
+			ImportSingleTIFF_Double ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+	}
+
+}	// ImportSingleTIFF
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// ImportArrayTIFF_Short
+// =====================
+
+static void
+ImportArrayTIFF_Short ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns16 * binPtr = (XMP_Uns16*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			XMP_Uns16 binValue = *binPtr;
+			if ( ! nativeEndian ) binValue = Flip2 ( binValue );
+
+			char strValue[20];
+			snprintf ( strValue, sizeof(strValue), "%hu", binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_Short
+
+// =================================================================================================
+// ImportArrayTIFF_Long
+// ====================
+
+static void
+ImportArrayTIFF_Long ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+					   SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns32 * binPtr = (XMP_Uns32*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			XMP_Uns32 binValue = *binPtr;
+			if ( ! nativeEndian ) binValue = Flip4 ( binValue );
+
+			char strValue[20];
+			snprintf ( strValue, sizeof(strValue), "%lu", (unsigned long)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_Long
+
+// =================================================================================================
+// ImportArrayTIFF_Rational
+// ========================
+
+static void
+ImportArrayTIFF_Rational ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						   SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns32 * binPtr = (XMP_Uns32*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, binPtr += 2 ) {
+
+			XMP_Uns32 binNum  = GetUns32AsIs ( &binPtr[0] );
+			XMP_Uns32 binDenom = GetUns32AsIs ( &binPtr[1] );
+			if ( ! nativeEndian ) {
+				binNum = Flip4 ( binNum );
+				binDenom = Flip4 ( binDenom );
+			}
+
+			char strValue[40];
+			snprintf ( strValue, sizeof(strValue), "%lu/%lu", (unsigned long)binNum, (unsigned long)binDenom );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_Rational
+
+// =================================================================================================
+// ImportArrayTIFF_SRational
+// =========================
+
+static void
+ImportArrayTIFF_SRational ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+							SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Int32 * binPtr = (XMP_Int32*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, binPtr += 2 ) {
+
+			XMP_Int32 binNum   = binPtr[0];
+			XMP_Int32 binDenom = binPtr[1];
+			if ( ! nativeEndian ) {
+				Flip4 ( &binNum );
+				Flip4 ( &binDenom );
+			}
+
+			char strValue[40];
+			snprintf ( strValue, sizeof(strValue), "%ld/%ld", (long)binNum, (long)binDenom );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_SRational
+
+// =================================================================================================
+// ImportArrayTIFF_ASCII
+// =====================
+
+static void
+ImportArrayTIFF_ASCII ( const TIFF_Manager::TagInfo & tagInfo,
+						SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+	
+		TrimTrailingSpaces ( (TIFF_Manager::TagInfo*) &tagInfo );
+		if ( tagInfo.dataLen == 0 ) return;	// Ignore empty tags.
+
+		const char * chPtr  = (const char *)tagInfo.dataPtr;
+		const char * chEnd  = chPtr + tagInfo.dataLen;
+		const bool   hasNul = (chPtr[tagInfo.dataLen-1] == 0);
+		const bool   isUTF8 = ReconcileUtils::IsUTF8 ( chPtr, tagInfo.dataLen );
+
+		std::string  strValue;
+
+		if ( (! isUTF8) || (! hasNul) ) {
+			if ( isUTF8 ) {
+				strValue.assign ( chPtr, tagInfo.dataLen );
+			} else {
+				if ( ignoreLocalText ) return;
+				ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue );
+			}
+			chPtr = strValue.c_str();
+			chEnd = chPtr + strValue.size();
+		}
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( ; chPtr < chEnd; chPtr += (strlen(chPtr) + 1) ) {
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, chPtr );
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_ASCII
+
+// =================================================================================================
+// ImportArrayTIFF_Byte
+// ====================
+
+static void
+ImportArrayTIFF_Byte ( const TIFF_Manager::TagInfo & tagInfo,
+					   SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns8 * binPtr = (XMP_Uns8*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			XMP_Uns8 binValue = *binPtr;
+
+			char strValue[20];
+			snprintf ( strValue, sizeof(strValue), "%hu", (XMP_Uns16)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_Byte
+
+// =================================================================================================
+// ImportArrayTIFF_SByte
+// =====================
+
+static void
+ImportArrayTIFF_SByte ( const TIFF_Manager::TagInfo & tagInfo,
+						SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Int8 * binPtr = (XMP_Int8*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			XMP_Int8 binValue = *binPtr;
+
+			char strValue[20];
+			snprintf ( strValue, sizeof(strValue), "%hd", (short)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_SByte
+
+// =================================================================================================
+// ImportArrayTIFF_SShort
+// ======================
+
+static void
+ImportArrayTIFF_SShort ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Int16 * binPtr = (XMP_Int16*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			XMP_Int16 binValue = *binPtr;
+			if ( ! nativeEndian ) Flip2 ( &binValue );
+
+			char strValue[20];
+			snprintf ( strValue, sizeof(strValue), "%hd", binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_SShort
+
+// =================================================================================================
+// ImportArrayTIFF_SLong
+// =====================
+
+static void
+ImportArrayTIFF_SLong ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Int32 * binPtr = (XMP_Int32*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			XMP_Int32 binValue = *binPtr;
+			if ( ! nativeEndian ) Flip4 ( &binValue );
+
+			char strValue[20];
+			snprintf ( strValue, sizeof(strValue), "%ld", (long)binValue );	// AUDIT: Using sizeof(strValue) is safe.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_SLong
+
+// =================================================================================================
+// ImportArrayTIFF_Float
+// =====================
+
+static void
+ImportArrayTIFF_Float ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		float * binPtr = (float*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			float binValue = *binPtr;
+			if ( ! nativeEndian ) Flip4 ( &binValue );
+
+			std::string strValue;
+			SXMPUtils::ConvertFromFloat ( binValue, "", &strValue );
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue.c_str() );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_Float
+
+// =================================================================================================
+// ImportArrayTIFF_Double
+// ======================
+
+static void
+ImportArrayTIFF_Double ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+						 SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		double * binPtr = (double*)tagInfo.dataPtr;
+		
+		xmp->DeleteProperty ( xmpNS, xmpProp );	// ! Don't keep appending, create a new array.
+
+		for ( size_t i = 0; i < tagInfo.count; ++i, ++binPtr ) {
+
+			double binValue = *binPtr;
+			if ( ! nativeEndian ) Flip8 ( &binValue );
+
+			std::string strValue;
+			SXMPUtils::ConvertFromFloat ( binValue, "", &strValue );	// ! Yes, ConvertFromFloat.
+
+			xmp->AppendArrayItem ( xmpNS, xmpProp, kXMP_PropArrayIsOrdered, strValue.c_str() );
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportArrayTIFF_Double
+
+// =================================================================================================
+// ImportArrayTIFF
+// ===============
+
+static void
+ImportArrayTIFF ( const TIFF_Manager::TagInfo & tagInfo, const bool nativeEndian,
+				  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+
+	// We've got a tag to map to XMP, decide how based on actual type and the expected count. Using
+	// the actual type eliminates a ShortOrLong case. Using the expected count is needed to know
+	// whether to create an XMP array. The actual count for an array could be 1. Put the most
+	// common cases first for better iCache utilization.
+
+	switch ( tagInfo.type ) {
+
+		case kTIFF_ShortType :
+			ImportArrayTIFF_Short ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_LongType :
+			ImportArrayTIFF_Long ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_RationalType :
+			ImportArrayTIFF_Rational ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SRationalType :
+			ImportArrayTIFF_SRational ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_ASCIIType :
+			ImportArrayTIFF_ASCII ( tagInfo, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_ByteType :
+			ImportArrayTIFF_Byte ( tagInfo, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SByteType :
+			ImportArrayTIFF_SByte ( tagInfo, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SShortType :
+			ImportArrayTIFF_SShort ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_SLongType :
+			ImportArrayTIFF_SLong ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_FloatType :
+			ImportArrayTIFF_Float ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+		case kTIFF_DoubleType :
+			ImportArrayTIFF_Double ( tagInfo, nativeEndian, xmp, xmpNS, xmpProp );
+			break;
+
+	}
+
+}	// ImportArrayTIFF
+
+// =================================================================================================
+// ImportTIFF_CheckStandardMapping
+// ===============================
+
+static bool
+ImportTIFF_CheckStandardMapping ( const TIFF_Manager::TagInfo & tagInfo, const TIFF_MappingToXMP & mapInfo )
+{
+	XMP_Assert ( (kTIFF_ByteType <= tagInfo.type) && (tagInfo.type <= kTIFF_LastType) );
+	XMP_Assert ( mapInfo.type <= kTIFF_LastType );
+
+	if ( (tagInfo.type < kTIFF_ByteType) || (tagInfo.type > kTIFF_LastType) ) return false;
+
+	if ( tagInfo.type != mapInfo.type ) {
+		// Be tolerant of reasonable mismatches among numeric types.
+		if ( kTIFF_IsIntegerType[mapInfo.type] ) {
+			if ( ! kTIFF_IsIntegerType[tagInfo.type] ) return false;
+		} else if ( kTIFF_IsRationalType[mapInfo.type] ) {
+			if ( ! kTIFF_IsRationalType[tagInfo.type] ) return false;
+		} else if ( kTIFF_IsFloatType[mapInfo.type] ) {
+			if ( ! kTIFF_IsFloatType[tagInfo.type] ) return false;
+		} else {
+			return false;
+		}
+	}
+
+	if ( (tagInfo.count != mapInfo.count) &&	// Maybe there is a problem because the counts don't match.
+		 // (mapInfo.count != kAnyCount) &&		... don't need this because of the new check below ...
+		 (mapInfo.count == 1) ) return false;	// Be tolerant of mismatch in expected array size.
+
+	return true;
+
+}	// ImportTIFF_CheckStandardMapping
+
+// =================================================================================================
+// ImportTIFF_StandardMappings
+// ===========================
+
+static void
+ImportTIFF_StandardMappings ( XMP_Uns8 ifd, const TIFF_Manager & tiff, SXMPMeta * xmp )
+{
+	const bool nativeEndian = tiff.IsNativeEndian();
+	TIFF_Manager::TagInfo tagInfo;
+
+	const TIFF_MappingToXMP * mappings = 0;
+
+	if ( ifd == kTIFF_PrimaryIFD ) {
+		mappings = sPrimaryIFDMappings;
+	} else if ( ifd == kTIFF_ExifIFD ) {
+		mappings = sExifIFDMappings;
+	} else if ( ifd == kTIFF_GPSInfoIFD ) {
+		mappings = sGPSInfoIFDMappings;
+	} else {
+		XMP_Throw ( "Invalid IFD for standard mappings", kXMPErr_InternalFailure );
+	}
+
+	for ( size_t i = 0; mappings[i].id != 0xFFFF; ++i ) {
+
+		try {	// Don't let errors with one stop the others.
+
+			const TIFF_MappingToXMP & mapInfo =  mappings[i];
+			const bool mapSingle = ((mapInfo.count == 1) || (mapInfo.type == kTIFF_ASCIIType));
+
+			if ( mapInfo.name[0] == 0 ) continue;	// Skip special mappings, handled higher up.
+			
+			bool found = tiff.GetTag ( ifd, mapInfo.id, &tagInfo );
+			if ( ! found ) continue;
+
+			XMP_Assert ( tagInfo.type != kTIFF_UndefinedType );	// These must have a special mapping.
+			if ( tagInfo.type == kTIFF_UndefinedType ) continue;
+			if ( ! ImportTIFF_CheckStandardMapping ( tagInfo, mapInfo ) ) continue;
+
+			if ( mapSingle ) {
+				ImportSingleTIFF ( tagInfo, nativeEndian, xmp, mapInfo.ns, mapInfo.name );
+			} else {
+				ImportArrayTIFF ( tagInfo, nativeEndian, xmp, mapInfo.ns, mapInfo.name );
+			}
+
+		} catch ( ... ) {
+
+			// Do nothing, let other imports proceed.
+			// ? Notify client?
+
+		}
+
+	}
+
+}	// ImportTIFF_StandardMappings
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// ImportTIFF_Date
+// ===============
+//
+// Convert an Exif 2.2 master date/time tag plus associated fractional seconds to an XMP date/time.
+// The Exif date/time part is a 20 byte ASCII value formatted as "YYYY:MM:DD HH:MM:SS" with a
+// terminating nul. Any of the numeric portions can be blanks if unknown. The fractional seconds
+// are a nul terminated ASCII string with possible space padding. They are literally the fractional
+// part, the digits that would be to the right of the decimal point.
+
+static void
+ImportTIFF_Date ( const TIFF_Manager & tiff, const TIFF_Manager::TagInfo & dateInfo,
+				  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	XMP_Uns16 secID = 0;
+	switch ( dateInfo.id ) {
+		case kTIFF_DateTime          : secID = kTIFF_SubSecTime;			break;
+		case kTIFF_DateTimeOriginal  : secID = kTIFF_SubSecTimeOriginal;	break;
+		case kTIFF_DateTimeDigitized : secID = kTIFF_SubSecTimeDigitized;	break;
+	}
+	
+	try {	// Don't let errors with one stop the others.
+	
+		if ( (dateInfo.type != kTIFF_ASCIIType) || (dateInfo.count != 20) ) return;
+
+		const char * dateStr = (const char *) dateInfo.dataPtr;
+		if ( (dateStr[4] != ':')  || (dateStr[7] != ':')  ||
+			 (dateStr[10] != ' ') || (dateStr[13] != ':') || (dateStr[16] != ':') ) return;
+
+		XMP_DateTime binValue;
+
+		binValue.year   = GatherInt ( &dateStr[0], 4 );
+		binValue.month  = GatherInt ( &dateStr[5], 2 );
+		binValue.day    = GatherInt ( &dateStr[8], 2 );
+		if ( (binValue.year != 0) | (binValue.month != 0) | (binValue.day != 0) ) binValue.hasDate = true;
+
+		binValue.hour   = GatherInt ( &dateStr[11], 2 );
+		binValue.minute = GatherInt ( &dateStr[14], 2 );
+		binValue.second = GatherInt ( &dateStr[17], 2 );
+		binValue.nanoSecond = 0;	// Get the fractional seconds later.
+		if ( (binValue.hour != 0) | (binValue.minute != 0) | (binValue.second != 0) ) binValue.hasTime = true;
+
+		binValue.tzSign = 0;	// ! Separate assignment, avoid VS integer truncation warning.
+		binValue.tzHour = binValue.tzMinute = 0;
+		binValue.hasTimeZone = false;	// Exif times have no zone.
+
+		// *** Consider looking at the TIFF/EP TimeZoneOffset tag?
+
+		TIFF_Manager::TagInfo secInfo;
+		bool found = tiff.GetTag ( kTIFF_ExifIFD, secID, &secInfo );	// ! Subseconds are all in the Exif IFD.
+
+		if ( found && (secInfo.type == kTIFF_ASCIIType) ) {
+			const char * fracPtr = (const char *) secInfo.dataPtr;
+			binValue.nanoSecond = GatherInt ( fracPtr, secInfo.dataLen );
+			size_t digits = 0;
+			for ( ; (('0' <= *fracPtr) && (*fracPtr <= '9')); ++fracPtr ) ++digits;
+			for ( ; digits < 9; ++digits ) binValue.nanoSecond *= 10;
+			if ( binValue.nanoSecond != 0 ) binValue.hasTime = true;
+		}
+
+		xmp->SetProperty_Date ( xmpNS, xmpProp, binValue );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_Date
+
+// =================================================================================================
+// ImportTIFF_LocTextASCII
+// =======================
+
+static void
+ImportTIFF_LocTextASCII ( const TIFF_Manager & tiff, XMP_Uns8 ifd, XMP_Uns16 tagID,
+						  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		TIFF_Manager::TagInfo tagInfo;
+
+		bool found = tiff.GetTag ( ifd, tagID, &tagInfo );
+		if ( (! found) || (tagInfo.type != kTIFF_ASCIIType) ) return;
+
+		TrimTrailingSpaces ( (TIFF_Manager::TagInfo*) &tagInfo );
+		if ( tagInfo.dataLen == 0 ) return;	// Ignore empty tags.
+
+		const char * chPtr  = (const char *)tagInfo.dataPtr;
+		const bool   hasNul = (chPtr[tagInfo.dataLen-1] == 0);
+		const bool   isUTF8 = ReconcileUtils::IsUTF8 ( chPtr, tagInfo.dataLen );
+
+		if ( isUTF8 && hasNul ) {
+			xmp->SetLocalizedText ( xmpNS, xmpProp, "", "x-default", chPtr );
+		} else {
+			std::string strValue;
+			if ( isUTF8 ) {
+				strValue.assign ( chPtr, tagInfo.dataLen );
+			} else {
+				if ( ignoreLocalText ) return;
+				ReconcileUtils::LocalToUTF8 ( chPtr, tagInfo.dataLen, &strValue );
+			}
+			xmp->SetLocalizedText ( xmpNS, xmpProp, "", "x-default", strValue.c_str() );
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_LocTextASCII
+
+// =================================================================================================
+// ImportTIFF_EncodedString
+// ========================
+
+static void
+ImportTIFF_EncodedString ( const TIFF_Manager & tiff, const TIFF_Manager::TagInfo & tagInfo,
+						   SXMPMeta * xmp, const char * xmpNS, const char * xmpProp, bool isLangAlt = false )
+{
+	try {	// Don't let errors with one stop the others.
+
+		std::string strValue;
+
+		bool ok = tiff.DecodeString ( tagInfo.dataPtr, tagInfo.dataLen, &strValue );
+		if ( ! ok ) return;
+
+		TrimTrailingSpaces ( &strValue );
+		if ( strValue.empty() ) return;
+
+		if ( ! isLangAlt ) {
+			xmp->SetProperty ( xmpNS, xmpProp, strValue.c_str() );
+		} else {
+			xmp->SetLocalizedText ( xmpNS, xmpProp, "", "x-default", strValue.c_str() );
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_EncodedString
+
+// =================================================================================================
+// ImportTIFF_Flash
+// ================
+
+static void
+ImportTIFF_Flash ( const TIFF_Manager::TagInfo & tagInfo, bool nativeEndian,
+				   SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		XMP_Uns16 binValue = GetUns16AsIs ( tagInfo.dataPtr );
+		if ( ! nativeEndian ) binValue = Flip2 ( binValue );
+
+		bool fired    = (bool)(binValue & 1);	// Avoid implicit 0/1 conversion.
+		int  rtrn     = (binValue >> 1) & 3;
+		int  mode     = (binValue >> 3) & 3;
+		bool function = (bool)((binValue >> 5) & 1);
+		bool redEye   = (bool)((binValue >> 6) & 1);
+
+		static const char * sTwoBits[] = { "0", "1", "2", "3" };
+
+		xmp->SetStructField ( kXMP_NS_EXIF, "Flash", kXMP_NS_EXIF, "Fired", (fired ? kXMP_TrueStr : kXMP_FalseStr) );
+		xmp->SetStructField ( kXMP_NS_EXIF, "Flash", kXMP_NS_EXIF, "Return", sTwoBits[rtrn] );
+		xmp->SetStructField ( kXMP_NS_EXIF, "Flash", kXMP_NS_EXIF, "Mode", sTwoBits[mode] );
+		xmp->SetStructField ( kXMP_NS_EXIF, "Flash", kXMP_NS_EXIF, "Function", (function ? kXMP_TrueStr : kXMP_FalseStr) );
+		xmp->SetStructField ( kXMP_NS_EXIF, "Flash", kXMP_NS_EXIF, "RedEyeMode", (redEye ? kXMP_TrueStr : kXMP_FalseStr) );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_Flash
+
+// =================================================================================================
+// ImportConversionTable
+// =====================
+//
+// Although the XMP for the OECF and SFR tables is the same, the Exif is not. The OECF table has
+// signed rational values and the SFR table has unsigned. But they are otherwise the same.
+
+static void
+ImportConversionTable ( const TIFF_Manager::TagInfo & tagInfo, bool nativeEndian,
+					    SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	const bool isSigned = (tagInfo.id == kTIFF_OECF);
+	XMP_Assert ( (tagInfo.id == kTIFF_OECF) || (tagInfo.id == kTIFF_SpatialFrequencyResponse) );
+	
+	xmp->DeleteProperty ( xmpNS, xmpProp );
+	
+	try {	// Don't let errors with one stop the others.
+
+		const XMP_Uns8 * bytePtr = (XMP_Uns8*)tagInfo.dataPtr;
+		const XMP_Uns8 * byteEnd = bytePtr + tagInfo.dataLen;
+
+		XMP_Uns16 columns = *((XMP_Uns16*)bytePtr);
+		XMP_Uns16 rows    = *((XMP_Uns16*)(bytePtr+2));
+		if ( ! nativeEndian ) {
+			columns = Flip2 ( columns );
+			rows = Flip2 ( rows );
+		}
+
+		char buffer[40];
+
+		snprintf ( buffer, sizeof(buffer), "%d", columns );	// AUDIT: Use of sizeof(buffer) is safe.
+		xmp->SetStructField ( xmpNS, xmpProp, kXMP_NS_EXIF, "Columns", buffer );
+		snprintf ( buffer, sizeof(buffer), "%d", rows );	// AUDIT: Use of sizeof(buffer) is safe.
+		xmp->SetStructField ( xmpNS, xmpProp, kXMP_NS_EXIF, "Rows", buffer );
+
+		std::string arrayPath;
+
+		SXMPUtils::ComposeStructFieldPath ( xmpNS, xmpProp, kXMP_NS_EXIF, "Names", &arrayPath );
+
+		bytePtr += 4;	// Move to the list of names. Don't convert from local text, should really be ASCII.
+		for ( size_t i = columns; i > 0; --i ) {
+			size_t nameLen = strlen((XMP_StringPtr)bytePtr) + 1;	// ! Include the terminating nul.
+			if ( (bytePtr + nameLen) > byteEnd ) XMP_Throw ( "OECF-SFR name overflow", kXMPErr_BadValue );
+			if ( ! ReconcileUtils::IsUTF8 ( bytePtr, nameLen ) ) XMP_Throw ( "OECF-SFR name error", kXMPErr_BadValue );
+			xmp->AppendArrayItem ( xmpNS, arrayPath.c_str(), kXMP_PropArrayIsOrdered, (XMP_StringPtr)bytePtr );
+			bytePtr += nameLen;
+		}
+
+		if ( (byteEnd - bytePtr) != (8 * columns * rows) ) XMP_Throw ( "OECF-SFR data overflow", kXMPErr_BadValue );
+		SXMPUtils::ComposeStructFieldPath ( xmpNS, xmpProp, kXMP_NS_EXIF, "Values", &arrayPath );
+
+		XMP_Uns32 * binPtr = (XMP_Uns32*)bytePtr;
+		for ( size_t i = (columns * rows); i > 0; --i, binPtr += 2 ) {
+
+			XMP_Uns32 binNum   = binPtr[0];
+			XMP_Uns32 binDenom = binPtr[1];
+			if ( ! nativeEndian ) {
+				Flip4 ( &binNum );
+				Flip4 ( &binDenom );
+			}
+
+			if ( (binDenom == 0) && (binNum != 0) ) XMP_Throw ( "OECF-SFR data overflow", kXMPErr_BadValue );
+			if ( isSigned ) {
+				snprintf ( buffer, sizeof(buffer), "%ld/%ld", (long)binNum, (long)binDenom );	// AUDIT: Use of sizeof(buffer) is safe.
+			} else {
+				snprintf ( buffer, sizeof(buffer), "%lu/%lu", (unsigned long)binNum, (unsigned long)binDenom );	// AUDIT: Use of sizeof(buffer) is safe.
+			}
+
+			xmp->AppendArrayItem ( xmpNS, arrayPath.c_str(), kXMP_PropArrayIsOrdered, buffer );
+
+		}
+
+		return;
+
+	} catch ( ... ) {
+		xmp->DeleteProperty ( xmpNS, xmpProp );
+		// ? Notify client?
+	}
+
+}	// ImportConversionTable
+
+// =================================================================================================
+// ImportTIFF_CFATable
+// ===================
+
+static void
+ImportTIFF_CFATable ( const TIFF_Manager::TagInfo & tagInfo, bool nativeEndian,
+					  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		const XMP_Uns8 * bytePtr = (XMP_Uns8*)tagInfo.dataPtr;
+		const XMP_Uns8 * byteEnd = bytePtr + tagInfo.dataLen;
+
+		XMP_Uns16 columns = *((XMP_Uns16*)bytePtr);
+		XMP_Uns16 rows    = *((XMP_Uns16*)(bytePtr+2));
+		if ( ! nativeEndian ) {
+			columns = Flip2 ( columns );
+			rows = Flip2 ( rows );
+		}
+
+		char buffer[20];
+		std::string arrayPath;
+
+		snprintf ( buffer, sizeof(buffer), "%d", columns );	// AUDIT: Use of sizeof(buffer) is safe.
+		xmp->SetStructField ( xmpNS, xmpProp, kXMP_NS_EXIF, "Columns", buffer );
+		snprintf ( buffer, sizeof(buffer), "%d", rows );	// AUDIT: Use of sizeof(buffer) is safe.
+		xmp->SetStructField ( xmpNS, xmpProp, kXMP_NS_EXIF, "Rows", buffer );
+
+		bytePtr += 4;	// Move to the matrix of values.
+		if ( (byteEnd - bytePtr) != (columns * rows) ) goto BadExif;	// Make sure the values are present.
+
+		SXMPUtils::ComposeStructFieldPath ( xmpNS, xmpProp, kXMP_NS_EXIF, "Values", &arrayPath );
+
+		for ( size_t i = (columns * rows); i > 0; --i, ++bytePtr ) {
+			snprintf ( buffer, sizeof(buffer), "%hu", (XMP_Uns16)(*bytePtr) );	// AUDIT: Use of sizeof(buffer) is safe.
+			xmp->AppendArrayItem ( xmpNS, arrayPath.c_str(), kXMP_PropArrayIsOrdered, buffer );
+		}
+
+		return;
+
+	BadExif:	// Ignore the tag if the table is ill-formed.
+		xmp->DeleteProperty ( xmpNS, xmpProp );
+		return;
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_CFATable
+
+// =================================================================================================
+// ImportTIFF_DSDTable
+// ===================
+
+static void
+ImportTIFF_DSDTable ( const TIFF_Manager & tiff, const TIFF_Manager::TagInfo & tagInfo,
+					  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		const XMP_Uns8 * bytePtr = (XMP_Uns8*)tagInfo.dataPtr;
+		const XMP_Uns8 * byteEnd = bytePtr + tagInfo.dataLen;
+
+		XMP_Uns16 columns = *((XMP_Uns16*)bytePtr);
+		XMP_Uns16 rows    = *((XMP_Uns16*)(bytePtr+2));
+		if ( ! tiff.IsNativeEndian() ) {
+			columns = Flip2 ( columns );
+			rows = Flip2 ( rows );
+		}
+
+		char buffer[20];
+
+		snprintf ( buffer, sizeof(buffer), "%d", columns );	// AUDIT: Use of sizeof(buffer) is safe.
+		xmp->SetStructField ( xmpNS, xmpProp, kXMP_NS_EXIF, "Columns", buffer );
+		snprintf ( buffer, sizeof(buffer), "%d", rows );	// AUDIT: Use of sizeof(buffer) is safe.
+		xmp->SetStructField ( xmpNS, xmpProp, kXMP_NS_EXIF, "Rows", buffer );
+
+		std::string arrayPath;
+		SXMPUtils::ComposeStructFieldPath ( xmpNS, xmpProp, kXMP_NS_EXIF, "Settings", &arrayPath );
+
+		bytePtr += 4;	// Move to the list of settings.
+		UTF16Unit * utf16Ptr = (UTF16Unit*)bytePtr;
+		UTF16Unit * utf16End = (UTF16Unit*)byteEnd;
+
+		std::string utf8;
+
+		// Figure 17 in the Exif 2.2 spec is unclear. It has counts for rows and columns, but the
+		// settings are listed as 1..n, not as a rectangular matrix. So, ignore the counts and copy
+		// strings until the end of the Exif value.
+
+		while ( utf16Ptr < utf16End ) {
+
+			size_t nameLen = 0;
+			while ( utf16Ptr[nameLen] != 0 ) ++nameLen;
+			++nameLen;	// ! Include the terminating nul.
+			if ( (utf16Ptr + nameLen) > utf16End ) goto BadExif;
+
+			try {
+				FromUTF16 ( utf16Ptr, nameLen, &utf8, tiff.IsBigEndian() );
+			} catch ( ... ) {
+				goto BadExif; // Ignore the tag if there are conversion errors.
+			}
+
+			xmp->AppendArrayItem ( xmpNS, arrayPath.c_str(), kXMP_PropArrayIsOrdered, utf8.c_str() );
+
+			utf16Ptr += nameLen;
+
+		}
+
+		return;
+
+	BadExif:	// Ignore the tag if the table is ill-formed.
+		xmp->DeleteProperty ( xmpNS, xmpProp );
+		return;
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_DSDTable
+
+// =================================================================================================
+// ImportTIFF_GPSCoordinate
+// ========================
+
+static void
+ImportTIFF_GPSCoordinate ( const TIFF_Manager & tiff, const TIFF_Manager::TagInfo & posInfo,
+						   SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others. Tolerate ill-formed values where reasonable.
+
+		const bool nativeEndian = tiff.IsNativeEndian();
+		
+		if ( (posInfo.type != kTIFF_RationalType) || (posInfo.count == 0) ) return;
+
+		XMP_Uns16 refID = posInfo.id - 1;	// ! The GPS refs and coordinates are all tag n and n+1.
+		TIFF_Manager::TagInfo refInfo;
+		bool found = tiff.GetTag ( kTIFF_GPSInfoIFD, refID, &refInfo );
+		if ( (! found) || (refInfo.count == 0) ) return;
+		char ref = *((char*)refInfo.dataPtr);
+		if ( (ref != 'N') && (ref != 'S') && (ref != 'E') && (ref != 'W') ) return;
+
+		XMP_Uns32 * binPtr = (XMP_Uns32*)posInfo.dataPtr;
+		XMP_Uns32 degNum = 0, degDenom = 1;	// Defaults for missing parts.
+		XMP_Uns32 minNum = 0, minDenom = 1;
+		XMP_Uns32 secNum = 0, secDenom = 1;
+		if ( ! nativeEndian ) {
+			degDenom = Flip4 ( degDenom );	// So they can be flipped again below.
+			minDenom = Flip4 ( minDenom );
+			secDenom = Flip4 ( secDenom );
+		}
+		
+		degNum   = GetUns32AsIs ( &binPtr[0] );
+		degDenom = GetUns32AsIs ( &binPtr[1] );
+
+		if ( posInfo.count >= 2 ) {
+			minNum   = GetUns32AsIs ( &binPtr[2] );
+			minDenom = GetUns32AsIs ( &binPtr[3] );
+			if ( posInfo.count >= 3 ) {
+				secNum   = GetUns32AsIs ( &binPtr[4] );
+				secDenom = GetUns32AsIs ( &binPtr[5] );
+			}
+		}
+		
+		if ( ! nativeEndian ) {
+			degNum = Flip4 ( degNum );
+			degDenom = Flip4 ( degDenom );
+			minNum = Flip4 ( minNum );
+			minDenom = Flip4 ( minDenom );
+			secNum = Flip4 ( secNum );
+			secDenom = Flip4 ( secDenom );
+		}
+
+		// *** No check is made, whether the numerator exceed the maximum values,
+		//	which is 90 for Latitude and 180 for Longitude
+		// ! The Exif spec says denominator must not be zero, but in reality they can be
+
+		char buffer[40];
+
+		// Simplest case: all denominators are 1
+		if ( (degDenom == 1) && (minDenom == 1) && (secDenom == 1) ) {
+
+			snprintf ( buffer, sizeof(buffer), "%lu,%lu,%lu%c", (unsigned long)degNum, (unsigned long)minNum, (unsigned long)secNum, ref );	// AUDIT: Using sizeof(buffer) is safe.
+
+		} else if ( (degDenom == 0 && degNum != 0) || (minDenom == 0 && minNum != 0) || (secDenom == 0 && secNum != 0) ) { 
+
+			// Error case: a denominator is zero and the numerator is non-zero
+			return; // Do not continue with import
+
+		} else {
+
+			// Determine precision
+			// The code rounds up to the next power of 10 to get the number of fractional digits
+			XMP_Uns32 maxDenom = degDenom;
+			if ( minDenom > maxDenom ) maxDenom = minDenom;
+			if ( secDenom > maxDenom ) maxDenom = secDenom;
+
+			int fracDigits = 1;
+			while ( maxDenom > 10 ) { ++fracDigits; maxDenom = maxDenom/10; }
+
+			// Calculate the values
+			// At this point we know that the fractions are either 0/0, 0/y or x/y
+
+			double degrees, minutes;
+
+			// Degrees
+			if ( degDenom == 0 && degNum == 0 ) {
+				degrees = 0;
+			} else {
+				degrees = (double)( (XMP_Uns32)((double)degNum / (double)degDenom) );	// Just the integral number of degrees.
+			}
+
+			// Minutes
+			if ( minDenom == 0 && minNum == 0 ) {
+				minutes = 0;
+			} else {
+				double temp = 0;
+				if( degrees != 0 ) temp = ((double)degNum / (double)degDenom) - degrees;
+
+				minutes = (temp * 60.0) + ((double)minNum / (double)minDenom);
+			}
+
+			// Seconds, are added to minutes
+			if ( secDenom != 0 && secNum != 0 ) {
+				minutes += ((double)secNum / (double)secDenom) / 60.0;
+			}
+
+			snprintf ( buffer, sizeof(buffer), "%.0f,%.*f%c", degrees, fracDigits, minutes, ref );	// AUDIT: Using sizeof(buffer) is safe.
+
+		}
+
+		xmp->SetProperty ( xmpNS, xmpProp, buffer );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_GPSCoordinate
+
+// =================================================================================================
+// ImportTIFF_GPSTimeStamp
+// =======================
+
+static void
+ImportTIFF_GPSTimeStamp ( const TIFF_Manager & tiff, const TIFF_Manager::TagInfo & timeInfo,
+						  SXMPMeta * xmp, const char * xmpNS, const char * xmpProp )
+{
+	try {	// Don't let errors with one stop the others.
+
+		const bool nativeEndian = tiff.IsNativeEndian();
+
+		bool haveDate;
+		TIFF_Manager::TagInfo dateInfo;
+		haveDate = tiff.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDateStamp, &dateInfo );
+		if ( ! haveDate ) haveDate = tiff.GetTag ( kTIFF_ExifIFD, kTIFF_DateTimeOriginal, &dateInfo );
+		if ( ! haveDate ) haveDate = tiff.GetTag ( kTIFF_ExifIFD, kTIFF_DateTimeDigitized, &dateInfo );
+		if ( ! haveDate ) return;
+
+		const char * dateStr = (const char *) dateInfo.dataPtr;
+		if ( ((dateStr[4] != ':') && (dateStr[4] != '-')) || ((dateStr[7] != ':') && (dateStr[7] != '-')) ) return;
+		if ( (dateStr[10] != 0)  && (dateStr[10] != ' ') ) return;
+
+		XMP_Uns32 * binPtr = (XMP_Uns32*)timeInfo.dataPtr;
+		XMP_Uns32 hourNum   = GetUns32AsIs ( &binPtr[0] );
+		XMP_Uns32 hourDenom = GetUns32AsIs ( &binPtr[1] );
+		XMP_Uns32 minNum    = GetUns32AsIs ( &binPtr[2] );
+		XMP_Uns32 minDenom  = GetUns32AsIs ( &binPtr[3] );
+		XMP_Uns32 secNum    = GetUns32AsIs ( &binPtr[4] );
+		XMP_Uns32 secDenom  = GetUns32AsIs ( &binPtr[5] );
+		if ( ! nativeEndian ) {
+			hourNum = Flip4 ( hourNum );
+			hourDenom = Flip4 ( hourDenom );
+			minNum = Flip4 ( minNum );
+			minDenom = Flip4 ( minDenom );
+			secNum = Flip4 ( secNum );
+			secDenom = Flip4 ( secDenom );
+		}
+
+		double fHour, fMin, fSec, fNano, temp;
+		fSec  =  (double)secNum / (double)secDenom;
+		temp  =  (double)minNum / (double)minDenom;
+		fMin  =  (double)((XMP_Uns32)temp);
+		fSec  += (temp - fMin) * 60.0;
+		temp  =  (double)hourNum / (double)hourDenom;
+		fHour =  (double)((XMP_Uns32)temp);
+		fSec  += (temp - fHour) * 3600.0;
+		temp  =  (double)((XMP_Uns32)fSec);
+		fNano =  ((fSec - temp) * (1000.0*1000.0*1000.0)) + 0.5;	// Try to avoid n999... problems.
+		fSec  =  temp;
+
+		XMP_DateTime binStamp;
+		binStamp.year   = GatherInt ( dateStr, 4 );
+		binStamp.month  = GatherInt ( dateStr+5, 2 );
+		binStamp.day    = GatherInt ( dateStr+8, 2 );
+		binStamp.hour   = (XMP_Int32)fHour;
+		binStamp.minute = (XMP_Int32)fMin;
+		binStamp.second = (XMP_Int32)fSec;
+		binStamp.nanoSecond  = (XMP_Int32)fNano;
+		binStamp.hasTimeZone = true;	// Exif GPS TimeStamp is implicitly UTC.
+		binStamp.tzSign = kXMP_TimeIsUTC;
+		binStamp.tzHour = binStamp.tzMinute = 0;
+
+		xmp->SetProperty_Date ( xmpNS, xmpProp, binStamp );
+
+	} catch ( ... ) {
+		// Do nothing, let other imports proceed.
+		// ? Notify client?
+	}
+
+}	// ImportTIFF_GPSTimeStamp
+
+// =================================================================================================
+
+static void ImportTIFF_PhotographicSensitivity ( const TIFF_Manager & exif, SXMPMeta * xmp ) {
+
+	// PhotographicSensitivity has special cases for values over 65534 because the tag is SHORT. It
+	// has a count of "any", but all known cameras used a count of 1. Exif 2.3 still allows a count
+	// of "any" but says only 1 value should ever be recorded. We only process the first value if
+	// the count is greater than 1.
+	//
+	// Prior to Exif 2.3 the tag was called ISOSpeedRatings. Some cameras omit the tag and some
+	// write 65535. Most put the real ISO in MakerNote, which might be in the XMP from ACR.
+	//
+	// With Exif 2.3 five speed-related tags were added of type LONG: StandardOutputSensitivity,
+	// RecommendedExposureIndex, ISOSpeed, ISOSpeedLatitudeyyy, and ISOSpeedLatitudezzz. The tag
+	// SensitivityType was added to say which of these five is copied to PhotographicSensitivity.
+	//
+	// Import logic:
+	//	Save exif:ISOSpeedRatings when cleaning namespaces (done in ImportPhotoData)
+	//	If ExifVersion is less than "0230" (or missing)
+	//		If PhotographicSensitivity[1] < 65535 or no exif:ISOSpeedRatings: set exif:ISOSpeedRatings from tag
+	//	Else (ExifVersion is at least "0230")
+	//		Import SensitivityType and related long tags
+	//		If PhotographicSensitivity[1] < 65535: set exifEX:PhotographicSensitivity and exif:ISOSpeedRatings from tag
+	//		Else (no PhotographicSensitivity tag or value is 65535)
+	//			Set exifEX:PhotographicSensitivity from tag (missing or 65535)
+	//			If have SensitivityType and indicated tag: set exif:ISOSpeedRatings from indicated tag
+	
+	try {
+	
+		bool found;
+		TIFF_Manager::TagInfo tagInfo;
+	
+		bool haveOldExif = true;	// Default to old Exif if no version tag.
+		bool haveTag34855 = false;
+		bool haveLowISO = false;	// Set for real if haveTag34855 is true.
+		
+		XMP_Uns32 valueTag34855;	// ! Only care about the first value if more than 1.
+	
+		found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, &tagInfo );
+		if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+			haveOldExif = (strncmp ( (char*)tagInfo.dataPtr, "0230", 4 ) < 0);
+		}
+	
+		haveTag34855 = exif.GetTag_Integer ( kTIFF_ExifIFD, kTIFF_PhotographicSensitivity, &valueTag34855 );
+		if ( haveTag34855 ) haveLowISO = (valueTag34855 < 65535);
+
+		if ( haveOldExif ) {	// Exif version is before 2.3, use just the old tag and property.
+
+			if ( haveTag34855 ) {
+				if ( haveLowISO || (! xmp->DoesPropertyExist ( kXMP_NS_EXIF, "ISOSpeedRatings" )) ) {
+					xmp->DeleteProperty ( kXMP_NS_EXIF, "ISOSpeedRatings" );
+					xmp->AppendArrayItem ( kXMP_NS_EXIF, "ISOSpeedRatings", kXMP_PropArrayIsOrdered, "" );
+					xmp->SetProperty_Int ( kXMP_NS_EXIF, "ISOSpeedRatings[1]", valueTag34855 );
+				}
+			}
+		
+		} else {	// Exif version is 2.3 or newer, use the Exif 2.3 tags and properties.
+		
+			// Import the SensitivityType and related long tags.
+	
+			XMP_Uns16 whichLongTag = 0;
+			XMP_Uns32 sensitivityType, tagValue;
+			
+			bool haveSensitivityType = exif.GetTag_Integer ( kTIFF_ExifIFD, kTIFF_SensitivityType, &sensitivityType );
+			if ( haveSensitivityType ) {
+				xmp->SetProperty_Int ( kXMP_NS_ExifEX, "SensitivityType", sensitivityType );
+				switch ( sensitivityType ) {
+					case 1  : // Use StandardOutputSensitivity for both 1 and 4.
+					case 4  : whichLongTag = kTIFF_StandardOutputSensitivity; break;
+					case 2  : whichLongTag = kTIFF_RecommendedExposureIndex; break;
+					case 3  : // Use ISOSpeed for all of 3, 5, 6, and 7.
+					case 5  :
+					case 6  :
+					case 7  : whichLongTag = kTIFF_ISOSpeed; break;
+				}
+			}
+			
+			found = exif.GetTag_Integer ( kTIFF_ExifIFD, kTIFF_StandardOutputSensitivity, &tagValue );
+			if ( found ) {
+				xmp->SetProperty_Int64 ( kXMP_NS_ExifEX, "StandardOutputSensitivity", tagValue );
+			}
+			
+			found = exif.GetTag_Integer ( kTIFF_ExifIFD, kTIFF_RecommendedExposureIndex, &tagValue );
+			if ( found ) {
+				xmp->SetProperty_Int64 ( kXMP_NS_ExifEX, "RecommendedExposureIndex", tagValue );
+			}
+			
+			found = exif.GetTag_Integer ( kTIFF_ExifIFD, kTIFF_ISOSpeed, &tagValue );
+			if ( found ) {
+				xmp->SetProperty_Int64 ( kXMP_NS_ExifEX, "ISOSpeed", tagValue );
+			}
+			
+			found = exif.GetTag_Integer ( kTIFF_ExifIFD, kTIFF_ISOSpeedLatitudeyyy, &tagValue );
+			if ( found ) {
+				xmp->SetProperty_Int64 ( kXMP_NS_ExifEX, "ISOSpeedLatitudeyyy", tagValue );
+			}
+			
+			found = exif.GetTag_Integer ( kTIFF_ExifIFD, kTIFF_ISOSpeedLatitudezzz, &tagValue );
+			if ( found ) {
+				xmp->SetProperty_Int64 ( kXMP_NS_ExifEX, "ISOSpeedLatitudezzz", tagValue );
+			}
+		
+			// Deal with the special cases for exifEX:PhotographicSensitivity and exif:ISOSpeedRatings.
+	
+			if ( haveTag34855 & haveLowISO ) {	// The easier low ISO case.
+	
+				xmp->DeleteProperty ( kXMP_NS_EXIF, "ISOSpeedRatings" );
+				xmp->AppendArrayItem ( kXMP_NS_EXIF, "ISOSpeedRatings", kXMP_PropArrayIsOrdered, "" );
+				xmp->SetProperty_Int ( kXMP_NS_EXIF, "ISOSpeedRatings[1]", valueTag34855 );
+				xmp->SetProperty_Int ( kXMP_NS_ExifEX, "PhotographicSensitivity", valueTag34855 );
+	
+			} else {	// The more complex high ISO case, or no PhotographicSensitivity tag.
+				
+				if ( haveTag34855 ) {
+					XMP_Assert ( valueTag34855 == 65535 );
+					xmp->SetProperty_Int ( kXMP_NS_ExifEX, "PhotographicSensitivity", valueTag34855 );
+				}
+				
+				if ( whichLongTag != 0 ) {
+					found = exif.GetTag ( kTIFF_ExifIFD, whichLongTag, &tagInfo );
+					if ( found && (tagInfo.type == kTIFF_LongType) && (tagInfo.count == 1) ){
+						xmp->DeleteProperty ( kXMP_NS_EXIF, "ISOSpeedRatings" );
+						xmp->AppendArrayItem ( kXMP_NS_EXIF, "ISOSpeedRatings", kXMP_PropArrayIsOrdered, "" );
+						xmp->SetProperty_Int ( kXMP_NS_EXIF, "ISOSpeedRatings[1]", exif.GetUns32 ( tagInfo.dataPtr ) );
+					}
+				}
+	
+			}
+		
+		}
+	
+	} catch ( ... ) {
+	
+		// Do nothing, don't let failures here stop other exports.
+		
+	}
+
+}	// ImportTIFF_PhotographicSensitivity
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// PhotoDataUtils::Import2WayExif
+// ==============================
+//
+// Import the TIFF/Exif tags that have 2 way mappings to XMP, i.e. no correspondence to IPTC.
+// These are always imported for the tiff: and exif: namespaces, but not for others.
+
+void
+PhotoDataUtils::Import2WayExif ( const TIFF_Manager & exif, SXMPMeta * xmp, int iptcDigestState )
+{
+	const bool nativeEndian = exif.IsNativeEndian();
+
+	bool found, foundFromXMP;
+	TIFF_Manager::TagInfo tagInfo;
+	XMP_OptionBits flags;
+
+	ImportTIFF_StandardMappings ( kTIFF_PrimaryIFD, exif, xmp );
+	ImportTIFF_StandardMappings ( kTIFF_ExifIFD, exif, xmp );
+	ImportTIFF_StandardMappings ( kTIFF_GPSInfoIFD, exif, xmp );
+	
+	// --------------------------------------------------------
+	// Add the old Adobe names for new Exif 2.3 tags if wanted.
+	
+	#if SupportOldExifProperties
+		
+		// CameraOwnerName -> aux:OwnerName
+		found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_CameraOwnerName, &tagInfo );
+		if ( found && (tagInfo.type == kTIFF_ASCIIType) && (tagInfo.count > 0) ) {
+			ImportSingleTIFF ( tagInfo, nativeEndian, xmp, kXMP_NS_EXIF_Aux, "OwnerName" );
+		}
+		
+		// BodySerialNumber -> aux:SerialNumber
+		found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_BodySerialNumber, &tagInfo );
+		if ( found && (tagInfo.type == kTIFF_ASCIIType) && (tagInfo.count > 0) ) {
+			ImportSingleTIFF ( tagInfo, nativeEndian, xmp, kXMP_NS_EXIF_Aux, "SerialNumber" );
+		}
+		
+		// LensModel -> aux:Lens
+		found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_LensModel, &tagInfo );
+		if ( found && (tagInfo.type == kTIFF_ASCIIType) && (tagInfo.count > 0) ) {
+			ImportSingleTIFF ( tagInfo, nativeEndian, xmp, kXMP_NS_EXIF_Aux, "Lens" );
+		}
+		
+		// LensSpecification -> aux:LensInfo as a single string - use the XMP form for simplicity
+		found = xmp->GetProperty ( kXMP_NS_ExifEX, "LensSpecification", 0, &flags );
+		if ( found && XMP_PropIsArray(flags) ) {
+			std::string fullStr, oneItem;
+			size_t count = (size_t) xmp->CountArrayItems ( kXMP_NS_ExifEX, "LensSpecification" );
+			if ( count > 0 ) {
+				(void) xmp->GetArrayItem ( kXMP_NS_ExifEX, "LensSpecification", 1, &fullStr, 0 );
+				for ( size_t i = 2; i <= count; ++i ) {
+					fullStr += ' ';
+					(void) xmp->GetArrayItem ( kXMP_NS_ExifEX, "LensSpecification", i, &oneItem, 0 );
+					fullStr += oneItem;
+				}
+			}
+			xmp->SetProperty ( kXMP_NS_EXIF_Aux, "LensInfo", fullStr.c_str(), kXMP_DeleteExisting );
+		}
+	
+	#endif
+	
+	// --------------------------------------------------------------------------------------------
+	// Fixup erroneous cases that appear to have a negative value for GPSAltitude in the Exif. This
+	// treats any value with the high bit set as a negative, which is more likely in practice than
+	// an actual value over 2 billion.
+
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSAltitude, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_RationalType) &&  (tagInfo.count == 1) ) {
+
+		XMP_Uns32 num = exif.GetUns32 ( tagInfo.dataPtr );
+		XMP_Uns32 denom = exif.GetUns32 ( (XMP_Uns8*)tagInfo.dataPtr + 4 );
+		
+		bool fixXMP = false;
+		bool numNeg = num >> 31;
+		bool denomNeg = denom >> 31;
+		
+		if ( denomNeg ) {	// The denominator looks negative, shift the sign to the numerator.
+			denom = -denom;
+			num = -num;
+			numNeg = num >> 31;
+			fixXMP = true;
+		}
+
+		if ( numNeg ) {	// The numerator looks negative, fix the XMP.
+			xmp->SetProperty ( kXMP_NS_EXIF, "GPSAltitudeRef", "1" );
+			num = -num;
+			fixXMP = true;
+		}
+
+		if ( fixXMP ) {
+			char buffer [32];
+			snprintf ( buffer, sizeof(buffer), "%lu/%lu", (unsigned long) num, (unsigned long) denom );	// AUDIT: Using sizeof(buffer) is safe.
+			xmp->SetProperty ( kXMP_NS_EXIF, "GPSAltitude", buffer );
+		}
+
+	}
+	
+	// ---------------------------------------------------------------
+	// Import DateTimeOriginal and DateTime if the XMP doss not exist.
+
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_DateTimeOriginal, &tagInfo );
+	foundFromXMP = xmp->DoesPropertyExist ( kXMP_NS_EXIF, "DateTimeOriginal" );
+	
+	if ( found && (! foundFromXMP) && (tagInfo.type == kTIFF_ASCIIType) ) {
+		ImportTIFF_Date ( exif, tagInfo, xmp, kXMP_NS_EXIF, "DateTimeOriginal" );
+	}
+
+	found = exif.GetTag ( kTIFF_PrimaryIFD, kTIFF_DateTime, &tagInfo );
+	foundFromXMP = xmp->DoesPropertyExist ( kXMP_NS_XMP, "ModifyDate" );
+	
+	if ( found && (! foundFromXMP) && (tagInfo.type == kTIFF_ASCIIType) ) {
+		ImportTIFF_Date ( exif, tagInfo, xmp, kXMP_NS_XMP, "ModifyDate" );
+	}
+
+	// ----------------------------------------------------
+	// Import the Exif IFD tags that have special mappings.
+
+	// There are moderately complex import special cases for PhotographicSensitivity.
+	ImportTIFF_PhotographicSensitivity ( exif, xmp );
+	
+	// 42032 CameraOwnerName has a standard mapping. As a special case also set dc:creator if there
+	// is no Exif Artist tag and no dc:creator in the XMP.
+	found = exif.GetTag ( kTIFF_PrimaryIFD, kTIFF_Artist, &tagInfo );
+	foundFromXMP = xmp->DoesPropertyExist ( kXMP_NS_DC, "creator" );
+	if ( (! found) && (! foundFromXMP) ) {
+		found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_CameraOwnerName, &tagInfo );
+		if ( found ) {
+			std::string xmpValue ( (char*)tagInfo.dataPtr, tagInfo.dataLen );
+			xmp->AppendArrayItem ( kXMP_NS_DC, "creator", kXMP_PropArrayIsOrdered, xmpValue.c_str() );
+		}
+	}
+
+	// 36864 ExifVersion is 4 "undefined" ASCII characters.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+		char str[5];
+
+		*((XMP_Uns32*)str) = GetUns32AsIs ( tagInfo.dataPtr );
+		str[4] = 0;
+		xmp->SetProperty ( kXMP_NS_EXIF, "ExifVersion", str );
+	}
+
+	// 40960 FlashpixVersion is 4 "undefined" ASCII characters.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_FlashpixVersion, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+		char str[5];
+
+		*((XMP_Uns32*)str) = GetUns32AsIs ( tagInfo.dataPtr );
+		str[4] = 0;
+		xmp->SetProperty ( kXMP_NS_EXIF, "FlashpixVersion", str );
+	}
+
+	// 37121 ComponentsConfiguration is an array of 4 "undefined" UInt8 bytes.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_ComponentsConfiguration, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+		ImportArrayTIFF_Byte ( tagInfo, xmp, kXMP_NS_EXIF, "ComponentsConfiguration" );
+	}
+
+	// 37510 UserComment is a string with explicit encoding.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_UserComment, &tagInfo );
+	if ( found ) {
+		ImportTIFF_EncodedString ( exif, tagInfo, xmp, kXMP_NS_EXIF, "UserComment", true /* isLangAlt */ );
+	}
+
+	// 34856 OECF is an OECF/SFR table.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_OECF, &tagInfo );
+	if ( found ) {
+		ImportConversionTable ( tagInfo, nativeEndian, xmp, kXMP_NS_EXIF, "OECF" );
+	}
+
+	// 37385 Flash is a UInt16 collection of bit fields and is mapped to a struct in XMP.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_Flash, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_ShortType) && (tagInfo.count == 1) ) {
+		ImportTIFF_Flash ( tagInfo, nativeEndian, xmp, kXMP_NS_EXIF, "Flash" );
+	}
+
+	// 41484 SpatialFrequencyResponse is an OECF/SFR table.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_SpatialFrequencyResponse, &tagInfo );
+	if ( found ) {
+		ImportConversionTable ( tagInfo, nativeEndian, xmp, kXMP_NS_EXIF, "SpatialFrequencyResponse" );
+	}
+
+	// 41728 FileSource is an "undefined" UInt8.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_FileSource, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 1) ) {
+		ImportSingleTIFF_Byte ( tagInfo, xmp, kXMP_NS_EXIF, "FileSource" );
+	}
+
+	// 41729 SceneType is an "undefined" UInt8.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_SceneType, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 1) ) {
+		ImportSingleTIFF_Byte ( tagInfo, xmp, kXMP_NS_EXIF, "SceneType" );
+	}
+
+	// 41730 CFAPattern is a custom table.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_CFAPattern, &tagInfo );
+	if ( found ) {
+		ImportTIFF_CFATable ( tagInfo, nativeEndian, xmp, kXMP_NS_EXIF, "CFAPattern" );
+	}
+
+	// 41995 DeviceSettingDescription is a custom table.
+	found = exif.GetTag ( kTIFF_ExifIFD, kTIFF_DeviceSettingDescription, &tagInfo );
+	if ( found ) {
+		ImportTIFF_DSDTable ( exif, tagInfo, xmp, kXMP_NS_EXIF, "DeviceSettingDescription" );
+	}
+
+	// --------------------------------------------------------
+	// Import the GPS Info IFD tags that have special mappings.
+
+	// 0 GPSVersionID is 4 UInt8 bytes and mapped as "n.n.n.n".
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSVersionID, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_ByteType) && (tagInfo.count == 4) ) {
+		const XMP_Uns8 * binValue = (const XMP_Uns8 *) tagInfo.dataPtr;
+		char strOut[20];// ! Value could be up to 16 bytes: "255.255.255.255" plus nul.
+		snprintf ( strOut, sizeof(strOut), "%u.%u.%u.%u",	// AUDIT: Use of sizeof(strOut) is safe.
+				   binValue[0], binValue[1], binValue[2], binValue[3] );
+		xmp->SetProperty ( kXMP_NS_EXIF, "GPSVersionID", strOut );
+	}
+
+	// 2 GPSLatitude is a GPS coordinate master.
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSLatitude, &tagInfo );
+	if ( found ) {
+		ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSLatitude" );
+	}
+
+	// 4 GPSLongitude is a GPS coordinate master.
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSLongitude, &tagInfo );
+	if ( found ) {
+		ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSLongitude" );
+	}
+
+	// 7 GPSTimeStamp is a UTC time as 3 rationals, mated with the optional GPSDateStamp.
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSTimeStamp, &tagInfo );
+	if ( found && (tagInfo.type == kTIFF_RationalType) && (tagInfo.count == 3) ) {
+		ImportTIFF_GPSTimeStamp ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSTimeStamp" );
+	}
+
+	// 20 GPSDestLatitude is a GPS coordinate master.
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDestLatitude, &tagInfo );
+	if ( found ) {
+		ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSDestLatitude" );
+	}
+
+	// 22 GPSDestLongitude is a GPS coordinate master.
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDestLongitude, &tagInfo );
+	if ( found ) {
+		ImportTIFF_GPSCoordinate ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSDestLongitude" );
+	}
+
+	// 27 GPSProcessingMethod is a string with explicit encoding.
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSProcessingMethod, &tagInfo );
+	if ( found ) {
+		ImportTIFF_EncodedString ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSProcessingMethod" );
+	}
+
+	// 28 GPSAreaInformation is a string with explicit encoding.
+	found = exif.GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSAreaInformation, &tagInfo );
+	if ( found ) {
+		ImportTIFF_EncodedString ( exif, tagInfo, xmp, kXMP_NS_EXIF, "GPSAreaInformation" );
+	}
+
+}	// PhotoDataUtils::Import2WayExif
+
+// =================================================================================================
+// Import3WayDateTime
+// ==================
+
+static void Import3WayDateTime ( XMP_Uns16 exifTag, const TIFF_Manager & exif, const IPTC_Manager & iptc,
+								 SXMPMeta * xmp, int iptcDigestState, const IPTC_Manager & oldIPTC )
+{
+	XMP_Uns8  iptcDS;
+	XMP_StringPtr xmpNS, xmpProp;
+	
+	if ( exifTag == kTIFF_DateTimeOriginal ) {
+		iptcDS  = kIPTC_DateCreated;
+		xmpNS   = kXMP_NS_Photoshop;
+		xmpProp = "DateCreated";
+	} else if ( exifTag == kTIFF_DateTimeDigitized ) {
+		iptcDS  = kIPTC_DigitalCreateDate;
+		xmpNS   = kXMP_NS_XMP;
+		xmpProp = "CreateDate";
+	} else {
+		XMP_Throw ( "Unrecognized dateID", kXMPErr_BadParam );
+	}
+
+	size_t iptcCount;
+	bool haveXMP, haveExif, haveIPTC;	// ! These are manipulated to simplify MWG-compliant logic.
+	std::string xmpValue, exifValue, iptcValue;
+	TIFF_Manager::TagInfo exifInfo;
+	IPTC_Manager::DataSetInfo iptcInfo;
+
+	// Get the basic info about available values.
+	haveXMP   = xmp->GetProperty ( xmpNS, xmpProp, &xmpValue, 0 );
+	iptcCount = PhotoDataUtils::GetNativeInfo ( iptc, iptcDS, iptcDigestState, haveXMP, &iptcInfo );
+	haveIPTC = (iptcCount > 0);
+	XMP_Assert ( (iptcDigestState == kDigestMatches) ? (! haveIPTC) : true );
+	haveExif  = (! haveXMP) && (! haveIPTC) && PhotoDataUtils::GetNativeInfo ( exif, kTIFF_ExifIFD, exifTag, &exifInfo );
+	XMP_Assert ( (! (haveExif & haveXMP)) & (! (haveExif & haveIPTC)) );
+
+	if ( haveIPTC ) {
+
+		PhotoDataUtils::ImportIPTC_Date ( iptcDS, iptc, xmp );
+
+	} else if ( haveExif && (exifInfo.type == kTIFF_ASCIIType) ) {
+
+		// Only import the Exif form if the non-TZ information differs from the XMP.
+	
+		TIFF_FileWriter exifFromXMP;
+		TIFF_Manager::TagInfo infoFromXMP;
+
+		ExportTIFF_Date ( *xmp, xmpNS, xmpProp, &exifFromXMP, exifTag );
+		bool foundFromXMP = exifFromXMP.GetTag ( kTIFF_ExifIFD, exifTag, &infoFromXMP );
+
+		if ( (! foundFromXMP) || (exifInfo.dataLen != infoFromXMP.dataLen) ||
+			 (! XMP_LitNMatch ( (char*)exifInfo.dataPtr, (char*)infoFromXMP.dataPtr, exifInfo.dataLen )) ) {
+			ImportTIFF_Date ( exif, exifInfo, xmp, xmpNS, xmpProp );
+		}
+
+	}
+
+}	// Import3WayDateTime
+
+// =================================================================================================
+// PhotoDataUtils::Import3WayItems
+// ===============================
+//
+// Handle the imports that involve all 3 of Exif, IPTC, and XMP. There are only 4 properties with
+// 3-way mappings, copyright, description, creator, and date/time. Following the MWG guidelines,
+// this general policy is applied separately to each:
+//
+//   If the new IPTC digest differs from the stored digest (favor IPTC over Exif and XMP)
+//      If the IPTC value differs from the predicted old IPTC value
+//         Import the IPTC value, including deleting the XMP
+//      Else if the Exif is non-empty and differs from the XMP
+//         Import the Exif value (does not delete existing XMP)
+//   Else if the stored IPTC digest is missing (favor Exif over IPTC, or IPTC over missing XMP)
+//      If the Exif is non-empty and differs from the XMP
+//         Import the Exif value (does not delete existing XMP)
+//      Else if the XMP is missing and the Exif is missing or empty
+//         Import the IPTC value
+//   Else (the new IPTC digest matches the stored digest - ignore the IPTC)
+//      If the Exif is non-empty and differs from the XMP
+//         Import the Exif value (does not delete existing XMP)
+//
+// Note that missing or empty Exif will never cause existing XMP to be deleted. This is a pragmatic
+// choice to improve compatibility with pre-MWG software. There are few Exif-only editors for these
+// 3-way properties, there are important existing IPTC-only editors.
+
+// -------------------------------------------------------------------------------------------------
+
+void PhotoDataUtils::Import3WayItems ( const TIFF_Manager & exif, const IPTC_Manager & iptc, SXMPMeta * xmp, int iptcDigestState )
+{
+	size_t iptcCount;
+
+	bool haveXMP, haveExif, haveIPTC;	// ! These are manipulated to simplify MWG-compliant logic.
+	std::string xmpValue, exifValue, iptcValue;
+
+	TIFF_Manager::TagInfo exifInfo;
+	IPTC_Manager::DataSetInfo iptcInfo;
+
+	IPTC_Writer oldIPTC;
+	if ( iptcDigestState == kDigestDiffers ) {
+		PhotoDataUtils::ExportIPTC ( *xmp, &oldIPTC );	// Predict old IPTC DataSets based on the existing XMP.
+	}
+	
+	// ---------------------------------------------------------------------------------
+	// Process the copyright. Replace internal nuls in the Exif to "merge" the portions.
+	
+	// Get the basic info about available values.
+	haveXMP   = xmp->GetLocalizedText ( kXMP_NS_DC, "rights", "", "x-default", 0, &xmpValue, 0 );
+	iptcCount = PhotoDataUtils::GetNativeInfo ( iptc, kIPTC_CopyrightNotice, iptcDigestState, haveXMP, &iptcInfo );
+	haveIPTC  = (iptcCount > 0);
+	XMP_Assert ( (iptcDigestState == kDigestMatches) ? (! haveIPTC) : true );
+	haveExif  = (! haveXMP) && (! haveIPTC) && PhotoDataUtils::GetNativeInfo ( exif, kTIFF_PrimaryIFD, kTIFF_Copyright, &exifInfo );
+	XMP_Assert ( (! (haveExif & haveXMP)) & (! (haveExif & haveIPTC)) );
+
+	if ( haveExif && (exifInfo.dataLen > 1) ) {	// Replace internal nul characters with linefeed.
+		for ( XMP_Uns32 i = 0; i < exifInfo.dataLen-1; ++i ) {
+			if ( ((char*)exifInfo.dataPtr)[i] == 0 ) ((char*)exifInfo.dataPtr)[i] = 0x0A;
+		}
+	}
+	
+	if ( haveIPTC ) {
+		PhotoDataUtils::ImportIPTC_LangAlt ( iptc, xmp, kIPTC_CopyrightNotice, kXMP_NS_DC, "rights" );
+	} else if ( haveExif && PhotoDataUtils::IsValueDifferent ( exifInfo, xmpValue, &exifValue ) ) {
+		xmp->SetLocalizedText ( kXMP_NS_DC, "rights", "", "x-default", exifValue.c_str() );
+	}
+	
+	// ------------------------
+	// Process the description.
+	
+	// Get the basic info about available values.
+	haveXMP   = xmp->GetLocalizedText ( kXMP_NS_DC, "description", "", "x-default", 0, &xmpValue, 0 );
+	iptcCount = PhotoDataUtils::GetNativeInfo ( iptc, kIPTC_Description, iptcDigestState, haveXMP, &iptcInfo );
+	haveIPTC  = (iptcCount > 0);
+	XMP_Assert ( (iptcDigestState == kDigestMatches) ? (! haveIPTC) : true );
+	haveExif  = (! haveXMP) && (! haveIPTC) && PhotoDataUtils::GetNativeInfo ( exif, kTIFF_PrimaryIFD, kTIFF_ImageDescription, &exifInfo );
+	XMP_Assert ( (! (haveExif & haveXMP)) & (! (haveExif & haveIPTC)) );
+	
+	if ( haveIPTC ) {
+		PhotoDataUtils::ImportIPTC_LangAlt ( iptc, xmp, kIPTC_Description, kXMP_NS_DC, "description" );
+	} else if ( haveExif && PhotoDataUtils::IsValueDifferent ( exifInfo, xmpValue, &exifValue ) ) {
+		xmp->SetLocalizedText ( kXMP_NS_DC, "description", "", "x-default", exifValue.c_str() );
+	}
+
+	// -------------------------------------------------------------------------------------------
+	// Process the creator. The XMP and IPTC are arrays, the Exif is a semicolon separated string.
+	
+	// Get the basic info about available values.
+	haveXMP   = xmp->DoesPropertyExist ( kXMP_NS_DC, "creator" );
+	haveExif  = PhotoDataUtils::GetNativeInfo ( exif, kTIFF_PrimaryIFD, kTIFF_Artist, &exifInfo );
+	iptcCount = PhotoDataUtils::GetNativeInfo ( iptc, kIPTC_Creator, iptcDigestState, haveXMP, &iptcInfo );
+	haveIPTC  = (iptcCount > 0);
+	XMP_Assert ( (iptcDigestState == kDigestMatches) ? (! haveIPTC) : true );
+	haveExif  = (! haveXMP) && (! haveIPTC) && PhotoDataUtils::GetNativeInfo ( exif, kTIFF_PrimaryIFD, kTIFF_Artist, &exifInfo );
+	XMP_Assert ( (! (haveExif & haveXMP)) & (! (haveExif & haveIPTC)) );
+
+	if ( haveIPTC ) {
+		PhotoDataUtils::ImportIPTC_Array ( iptc, xmp, kIPTC_Creator, kXMP_NS_DC, "creator" );
+	} else if ( haveExif && PhotoDataUtils::IsValueDifferent ( exifInfo, xmpValue, &exifValue ) ) {
+		SXMPUtils::SeparateArrayItems ( xmp, kXMP_NS_DC, "creator",
+										(kXMP_PropArrayIsOrdered | kXMPUtil_AllowCommas), exifValue );
+	}
+	
+	// ------------------------------------------------------------------------------
+	// Process DateTimeDigitized; DateTimeOriginal and DateTime are 2-way.
+	// ***   Exif DateTimeOriginal <-> XMP exif:DateTimeOriginal
+	// ***   IPTC DateCreated <-> XMP photoshop:DateCreated
+	// ***   Exif DateTimeDigitized <-> IPTC DigitalCreateDate <-> XMP xmp:CreateDate
+	// ***   TIFF DateTime <-> XMP xmp:ModifyDate
+
+	Import3WayDateTime ( kTIFF_DateTimeDigitized, exif, iptc, xmp, iptcDigestState, oldIPTC );
+
+}	// PhotoDataUtils::Import3WayItems
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+
+static bool DecodeRational ( const char * ratio, XMP_Uns32 * num, XMP_Uns32 * denom ) {
+
+	unsigned long locNum, locDenom;
+	char nextChar;	// Used to make sure sscanf consumes all of the string.
+
+	int items = sscanf ( ratio, "%lu/%lu%c", &locNum, &locDenom, &nextChar );	// AUDIT: This is safe, check the calls.
+
+	if ( items != 2 ) {
+		if ( items != 1 ) return false;
+		locDenom = 1;	// The XMP was just an integer, assume a denominator of 1.
+	}
+	
+	*num = (XMP_Uns32)locNum;
+	*denom = (XMP_Uns32)locDenom;
+	return true;
+
+}	// DecodeRational
+
+// =================================================================================================
+// ExportSingleTIFF
+// ================
+//
+// This is only called when the XMP exists and will be exported. And only for standard mappings.
+
+// ! Only implemented for the types known to be needed.
+
+static void
+ExportSingleTIFF ( TIFF_Manager * tiff, XMP_Uns8 ifd, const TIFF_MappingToXMP & mapInfo,
+				   bool nativeEndian, const std::string & xmpValue )
+{
+	XMP_Assert ( (mapInfo.count == 1) || (mapInfo.type == kTIFF_ASCIIType) );
+	XMP_Assert ( mapInfo.name[0] != 0 );	// Must be a standard mapping.
+	
+	bool ok;
+	char nextChar;	// Used to make sure sscanf consumes all of the string.
+	
+	switch ( mapInfo.type ) {
+
+		case kTIFF_ByteType : {
+			unsigned short binValue;
+			int items = sscanf ( xmpValue.c_str(), "%hu%c", &binValue, &nextChar );	// AUDIT: Using xmpValue.c_str() is safe.
+			if ( items != 1 ) return;	// ? complain? notify client?
+			tiff->SetTag_Byte ( ifd, mapInfo.id, (XMP_Uns8)binValue );
+			break;
+		}
+
+		case kTIFF_ShortType : {
+			unsigned long binValue;
+			int items = sscanf ( xmpValue.c_str(), "%lu%c", &binValue, &nextChar );	// AUDIT: Using xmpValue.c_str() is safe.
+			if ( items != 1 ) return;	// ? complain? notify client?
+			tiff->SetTag_Short ( ifd, mapInfo.id, (XMP_Uns16)binValue );
+			break;
+		}
+
+		case kTIFF_LongType : {
+			unsigned long binValue;
+			int items = sscanf ( xmpValue.c_str(), "%lu%c", &binValue, &nextChar );	// AUDIT: Using xmpValue.c_str() is safe.
+			if ( items != 1 ) return;	// ? complain? notify client?
+			tiff->SetTag_Long ( ifd, mapInfo.id, (XMP_Uns32)binValue );
+			break;
+		}
+
+		case kTIFF_ShortOrLongType : {
+			unsigned long binValue;
+			int items = sscanf ( xmpValue.c_str(), "%lu%c", &binValue, &nextChar );	// AUDIT: Using xmpValue.c_str() is safe.
+			if ( items != 1 ) return;	// ? complain? notify client?
+			if ( binValue <= 0xFFFF ) {
+				tiff->SetTag_Short ( ifd, mapInfo.id, (XMP_Uns16)binValue );
+			} else {
+				tiff->SetTag_Long ( ifd, mapInfo.id, (XMP_Uns32)binValue );
+			}
+			break;
+		}
+
+		case kTIFF_RationalType : {	// The XMP is formatted as "num/denom".
+			XMP_Uns32 num, denom;
+			ok = DecodeRational ( xmpValue.c_str(), &num, &denom );
+			if ( ! ok ) return;	// ? complain? notify client?
+			tiff->SetTag_Rational ( ifd, mapInfo.id, num, denom );
+			break;
+		}
+
+		case kTIFF_SRationalType : {	// The XMP is formatted as "num/denom".
+			signed long num, denom;
+			int items = sscanf ( xmpValue.c_str(), "%ld/%ld%c", &num, &denom, &nextChar );	// AUDIT: Using xmpValue.c_str() is safe.
+			if ( items != 2 ) {
+				if ( items != 1 ) return;	// ? complain? notify client?
+				denom = 1;	// The XMP was just an integer, assume a denominator of 1.
+			}
+			tiff->SetTag_SRational ( ifd, mapInfo.id, (XMP_Int32)num, (XMP_Int32)denom );
+			break;
+		}
+
+		case kTIFF_ASCIIType :
+			tiff->SetTag ( ifd, mapInfo.id, kTIFF_ASCIIType, (XMP_Uns32)(xmpValue.size()+1), xmpValue.c_str() );
+			break;
+			
+		default:
+			XMP_Assert ( false );	// Force a debug assert for unexpected types.
+
+	}
+
+}	// ExportSingleTIFF
+
+// =================================================================================================
+// ExportArrayTIFF
+// ================
+//
+// This is only called when the XMP exists and will be exported. And only for standard mappings.
+
+// ! Only implemented for the types known to be needed.
+
+static void
+ExportArrayTIFF ( TIFF_Manager * tiff, XMP_Uns8 ifd, const TIFF_MappingToXMP & mapInfo, bool nativeEndian,
+				  const SXMPMeta & xmp, const char * xmpNS, const char * xmpArray )
+{
+	XMP_Assert ( (mapInfo.count != 1) && (mapInfo.type != kTIFF_ASCIIType) );
+	XMP_Assert ( mapInfo.name[0] != 0 );	// Must be a standard mapping.
+	XMP_Assert ( (mapInfo.type == kTIFF_ShortType) || (mapInfo.type == kTIFF_RationalType) );
+	XMP_Assert ( xmp.DoesPropertyExist ( xmpNS, xmpArray ) );
+	
+	size_t arraySize = xmp.CountArrayItems ( xmpNS, xmpArray );
+	if ( arraySize == 0 ) {
+		tiff->DeleteTag ( ifd, mapInfo.id );
+		return;
+	}
+	
+	if ( mapInfo.type == kTIFF_ShortType ) {
+		
+		std::vector<XMP_Uns16> shortVector;
+		shortVector.assign ( arraySize, 0 );
+		XMP_Uns16 * shortPtr = (XMP_Uns16*) &shortVector[0];
+		
+		std::string itemPath;
+		XMP_Int32 int32;
+		XMP_Uns16 uns16;
+		for ( size_t i = 1; i <= arraySize; ++i, ++shortPtr ) {
+			SXMPUtils::ComposeArrayItemPath ( xmpNS, xmpArray, (XMP_Index)i, &itemPath );
+			xmp.GetProperty_Int ( xmpNS, itemPath.c_str(), &int32, 0 );
+			uns16 = (XMP_Uns16)int32;
+			if ( ! nativeEndian ) uns16 = Flip2 ( uns16 );
+			*shortPtr = uns16;
+		}
+	
+		tiff->SetTag ( ifd, mapInfo.id, kTIFF_ShortType, (XMP_Uns32)arraySize, &shortVector[0] );
+	
+	} else if ( mapInfo.type == kTIFF_RationalType ) {
+		
+		std::vector<XMP_Uns32> rationalVector;
+		rationalVector.assign ( 2*arraySize, 0 );
+		XMP_Uns32 * rationalPtr = (XMP_Uns32*) &rationalVector[0];
+		
+		std::string itemPath, xmpValue;
+		XMP_Uns32 num, denom;
+		for ( size_t i = 1; i <= arraySize; ++i, rationalPtr += 2 ) {
+			SXMPUtils::ComposeArrayItemPath ( xmpNS, xmpArray, (XMP_Index)i, &itemPath );
+			bool isPropoerty = xmp.GetProperty ( xmpNS, itemPath.c_str(), &xmpValue, 0 );
+			if ( ! isPropoerty ) return;
+			bool ok = DecodeRational ( xmpValue.c_str(), &num, &denom );
+			if ( ! ok ) return;
+			if ( ! nativeEndian ) { num = Flip4 ( num ); denom = Flip4 ( denom ); }
+			rationalPtr[0] = num;
+			rationalPtr[1] = denom;
+		}
+	
+		tiff->SetTag ( ifd, mapInfo.id, kTIFF_RationalType, (XMP_Uns32)arraySize, &rationalVector[0] );
+
+	}
+
+}	// ExportArrayTIFF
+
+// =================================================================================================
+// ExportTIFF_StandardMappings
+// ===========================
+
+static void
+ExportTIFF_StandardMappings ( XMP_Uns8 ifd, TIFF_Manager * tiff, const SXMPMeta & xmp )
+{
+	const bool nativeEndian = tiff->IsNativeEndian();
+	TIFF_Manager::TagInfo tagInfo;
+	std::string xmpValue;
+	XMP_OptionBits xmpForm;
+
+	const TIFF_MappingToXMP * mappings = 0;
+
+	if ( ifd == kTIFF_PrimaryIFD ) {
+		mappings = sPrimaryIFDMappings;
+	} else if ( ifd == kTIFF_ExifIFD ) {
+		mappings = sExifIFDMappings;
+	} else if ( ifd == kTIFF_GPSInfoIFD ) {
+		mappings = sGPSInfoIFDMappings;
+	} else {
+		XMP_Throw ( "Invalid IFD for standard mappings", kXMPErr_InternalFailure );
+	}
+
+	for ( size_t i = 0; mappings[i].id != 0xFFFF; ++i ) {
+
+		try {	// Don't let errors with one stop the others.
+
+			const TIFF_MappingToXMP & mapInfo =  mappings[i];
+
+			if ( mapInfo.exportMode == kExport_Never ) continue;
+			if ( mapInfo.name[0] == 0 ) continue;	// Skip special mappings, handled higher up.
+
+			bool haveTIFF = tiff->GetTag ( ifd, mapInfo.id, &tagInfo );
+			if ( haveTIFF && (mapInfo.exportMode == kExport_InjectOnly) ) continue;
+			
+			bool haveXMP  = xmp.GetProperty ( mapInfo.ns, mapInfo.name, &xmpValue, &xmpForm );
+			if ( ! haveXMP ) {
+			
+				if ( haveTIFF && (mapInfo.exportMode == kExport_Always) ) tiff->DeleteTag ( ifd, mapInfo.id );
+
+			} else {
+			
+				XMP_Assert ( tagInfo.type != kTIFF_UndefinedType );	// These must have a special mapping.
+				if ( tagInfo.type == kTIFF_UndefinedType ) continue;
+	
+				const bool mapSingle = ((mapInfo.count == 1) || (mapInfo.type == kTIFF_ASCIIType));
+				if ( mapSingle ) {
+					if ( ! XMP_PropIsSimple ( xmpForm ) ) continue;	// ? Notify client?
+					ExportSingleTIFF ( tiff, ifd, mapInfo, nativeEndian, xmpValue );
+				} else {
+					if ( ! XMP_PropIsArray ( xmpForm ) ) continue;	// ? Notify client?
+					ExportArrayTIFF ( tiff, ifd, mapInfo, nativeEndian, xmp, mapInfo.ns, mapInfo.name );
+				}
+				
+			}
+
+		} catch ( ... ) {
+
+			// Do nothing, let other imports proceed.
+			// ? Notify client?
+
+		}
+
+	}
+
+}	// ExportTIFF_StandardMappings
+
+// =================================================================================================
+// ExportTIFF_Date
+// ===============
+//
+// Convert  an XMP date/time to an Exif 2.2 master date/time tag plus associated fractional seconds.
+// The Exif date/time part is a 20 byte ASCII value formatted as "YYYY:MM:DD HH:MM:SS" with a
+// terminating nul. The fractional seconds are a nul terminated ASCII string with possible space
+// padding. They are literally the fractional part, the digits that would be to the right of the
+// decimal point.
+
+static void
+ExportTIFF_Date ( const SXMPMeta & xmp, const char * xmpNS, const char * xmpProp, TIFF_Manager * tiff, XMP_Uns16 mainID )
+{
+	XMP_Uns8 mainIFD = kTIFF_ExifIFD;
+	XMP_Uns16 fracID=0;
+	switch ( mainID ) {
+		case kTIFF_DateTime : mainIFD = kTIFF_PrimaryIFD; fracID = kTIFF_SubSecTime;	break;
+		case kTIFF_DateTimeOriginal  : fracID = kTIFF_SubSecTimeOriginal;	break;
+		case kTIFF_DateTimeDigitized : fracID = kTIFF_SubSecTimeDigitized;	break;
+	}
+
+	try {	// Don't let errors with one stop the others.
+
+		std::string  xmpStr;
+		bool foundXMP = xmp.GetProperty ( xmpNS, xmpProp, &xmpStr, 0 );
+		if ( ! foundXMP ) {
+			tiff->DeleteTag ( mainIFD, mainID );
+			tiff->DeleteTag ( kTIFF_ExifIFD, fracID );	// ! The subseconds are always in the Exif IFD.
+			return;
+		}
+
+		// Format using all of the numbers. Then overwrite blanks for missing fields. The fields
+		// missing from the XMP are detected with length checks: YYYY-MM-DDThh:mm:ss
+		//   < 18 - no seconds
+		//   < 15 - no minutes
+		//   < 12 - no hours
+		//   <  9 - no day
+		//   <  6 - no month
+		//   <  1 - no year
+
+		XMP_DateTime xmpBin;
+		SXMPUtils::ConvertToDate ( xmpStr.c_str(), &xmpBin );
+		
+		char buffer[24];
+		snprintf ( buffer, sizeof(buffer), "%04d:%02d:%02d %02d:%02d:%02d",	// AUDIT: Use of sizeof(buffer) is safe.
+				   xmpBin.year, xmpBin.month, xmpBin.day, xmpBin.hour, xmpBin.minute, xmpBin.second );
+
+		size_t xmpLen = xmpStr.size();
+		if ( xmpLen < 18 ) {
+			buffer[17] = buffer[18] = ' ';
+			if ( xmpLen < 15 ) {
+				buffer[14] = buffer[15] = ' ';
+				if ( xmpLen < 12 ) {
+					buffer[11] = buffer[12] = ' ';
+					if ( xmpLen < 9 ) {
+						buffer[8] = buffer[9] = ' ';
+						if ( xmpLen < 6 ) {
+							buffer[5] = buffer[6] = ' ';
+							if ( xmpLen < 1 ) {
+								buffer[0] = buffer[1] = buffer[2] = buffer[3] = ' ';
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		tiff->SetTag_ASCII ( mainIFD, mainID, buffer );
+
+		if ( xmpBin.nanoSecond == 0 ) {
+		
+			tiff->DeleteTag ( kTIFF_ExifIFD, fracID );
+		
+		} else {
+
+			snprintf ( buffer, sizeof(buffer), "%09d", xmpBin.nanoSecond );	// AUDIT: Use of sizeof(buffer) is safe.
+			for ( size_t i = strlen(buffer)-1; i > 0; --i ) {
+				if ( buffer[i] != '0' ) break;
+				buffer[i] = 0;	// Strip trailing zero digits.
+			}
+
+			tiff->SetTag_ASCII ( kTIFF_ExifIFD, fracID, buffer );	// ! The subseconds are always in the Exif IFD.
+
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+	}
+
+}	// ExportTIFF_Date
+
+// =================================================================================================
+// ExportTIFF_ArrayASCII
+// =====================
+//
+// Catenate all of the XMP array values into a string. Use a "; " separator for Artist, nul for others.
+
+static void
+ExportTIFF_ArrayASCII ( const SXMPMeta & xmp, const char * xmpNS, const char * xmpProp,
+						TIFF_Manager * tiff, XMP_Uns8 ifd, XMP_Uns16 id )
+{
+	try {	// Don't let errors with one stop the others.
+
+		std::string    itemValue, fullValue;
+		XMP_OptionBits xmpFlags;
+
+		bool foundXMP = xmp.GetProperty ( xmpNS, xmpProp, 0, &xmpFlags );
+		if ( ! foundXMP ) {
+			tiff->DeleteTag ( ifd, id );
+			return;
+		}
+
+		if ( ! XMP_PropIsArray ( xmpFlags ) ) return;	// ? Complain? Delete the tag?
+
+		if ( id == kTIFF_Artist ) {
+			SXMPUtils::CatenateArrayItems ( xmp, xmpNS, xmpProp, 0, 0,
+											(kXMP_PropArrayIsOrdered | kXMPUtil_AllowCommas), &fullValue );
+			fullValue += '\x0';	// ! Need explicit final nul for SetTag below.
+		} else {
+			size_t count = xmp.CountArrayItems ( xmpNS, xmpProp );
+			for ( size_t i = 1; i <= count; ++i ) {	// ! XMP arrays are indexed from 1.
+				(void) xmp.GetArrayItem ( xmpNS, xmpProp, (XMP_Index)i, &itemValue, &xmpFlags );
+				if ( ! XMP_PropIsSimple ( xmpFlags ) ) continue;	// ? Complain?
+				fullValue.append ( itemValue );
+				fullValue.append ( 1, '\x0' );
+			}
+		}
+
+		tiff->SetTag ( ifd, id, kTIFF_ASCIIType, (XMP_Uns32)fullValue.size(), fullValue.c_str() );	// ! Already have trailing nul.
+
+	} catch ( ... ) {
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+	}
+
+}	// ExportTIFF_ArrayASCII
+
+// =================================================================================================
+// ExportTIFF_LocTextASCII
+// ======================
+
+static void
+ExportTIFF_LocTextASCII ( const SXMPMeta & xmp, const char * xmpNS, const char * xmpProp,
+						  TIFF_Manager * tiff, XMP_Uns8 ifd, XMP_Uns16 id )
+{
+	try {	// Don't let errors with one stop the others.
+
+		std::string xmpValue;
+
+		bool foundXMP = xmp.GetLocalizedText ( xmpNS, xmpProp, "", "x-default", 0, &xmpValue, 0 );
+		if ( ! foundXMP ) {
+			tiff->DeleteTag ( ifd, id );
+			return;
+		}
+
+		tiff->SetTag ( ifd, id, kTIFF_ASCIIType, (XMP_Uns32)( xmpValue.size()+1 ), xmpValue.c_str() );
+
+	} catch ( ... ) {
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+	}
+
+}	// ExportTIFF_LocTextASCII
+
+// =================================================================================================
+// ExportTIFF_EncodedString
+// ========================
+
+static void
+ExportTIFF_EncodedString ( const SXMPMeta & xmp, const char * xmpNS, const char * xmpProp,
+						   TIFF_Manager * tiff, XMP_Uns8 ifd, XMP_Uns16 id, bool isLangAlt = false )
+{
+	try {	// Don't let errors with one stop the others.
+
+		std::string    xmpValue;
+		XMP_OptionBits xmpFlags;
+
+		bool foundXMP = xmp.GetProperty ( xmpNS, xmpProp, &xmpValue, &xmpFlags );
+		if ( ! foundXMP ) {
+			tiff->DeleteTag ( ifd, id );
+			return;
+		}
+
+		if ( ! isLangAlt ) {
+			if ( ! XMP_PropIsSimple ( xmpFlags ) ) return;	// ? Complain? Delete the tag?
+		} else {
+			if ( ! XMP_ArrayIsAltText ( xmpFlags ) ) return;	// ? Complain? Delete the tag?
+			bool ok = xmp.GetLocalizedText ( xmpNS, xmpProp, "", "x-default", 0, &xmpValue, 0 );
+			if ( ! ok ) return;	// ? Complain? Delete the tag?
+		}
+
+		XMP_Uns8 encoding = kTIFF_EncodeASCII;
+		for ( size_t i = 0; i < xmpValue.size(); ++i ) {
+			if ( (XMP_Uns8)xmpValue[i] >= 0x80 ) {
+				encoding = kTIFF_EncodeUnicode;
+				break;
+			}
+		}
+
+		tiff->SetTag_EncodedString ( ifd, id, xmpValue.c_str(), encoding );
+
+	} catch ( ... ) {
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+	}
+
+}	// ExportTIFF_EncodedString
+
+// =================================================================================================
+// ExportTIFF_GPSCoordinate
+// ========================
+//
+// The XMP format is either "deg,min,secR" or "deg,min.fracR", where 'R' is the reference direction,
+// 'N', 'S', 'E', or 'W'. The location gets output as ( deg/1, min/1, sec/1 ) for the first form,
+// and ( deg/1, minFrac/denom, 0/1 ) for the second form.
+
+// ! We arbitrarily limit the number of fractional minute digits to 6 to avoid overflow in the
+// ! combined numerator. But we don't otherwise check for overflow or range errors.
+
+static void
+ExportTIFF_GPSCoordinate ( const SXMPMeta & xmp, const char * xmpNS, const char * xmpProp,
+						   TIFF_Manager * tiff, XMP_Uns8 ifd, XMP_Uns16 _id )
+{
+	XMP_Uns16 refID = _id-1;	// ! The GPS refs and locations are all tag N-1 and N pairs.
+	XMP_Uns16 locID = _id;
+
+	XMP_Assert ( (locID & 1) == 0 );
+
+	try {	// Don't let errors with one stop the others. Tolerate ill-formed values where reasonable.
+
+		std::string xmpValue;
+		XMP_OptionBits xmpFlags;
+
+		bool foundXMP = xmp.GetProperty ( xmpNS, xmpProp, &xmpValue, &xmpFlags );
+		if ( ! foundXMP ) {
+			tiff->DeleteTag ( ifd, refID );
+			tiff->DeleteTag ( ifd, locID );
+			return;
+		}
+
+		if ( ! XMP_PropIsSimple ( xmpFlags ) ) return;
+
+		const char * chPtr = xmpValue.c_str();	// Guaranteed to have a nul terminator.
+
+		XMP_Uns32 deg=0, minNum=0, minDenom=1, sec=0;
+
+		// Extract the degree part, it must be present.
+
+		while ( (*chPtr == ' ') || (*chPtr == '\t') ) ++chPtr;
+		if ( (*chPtr < '0') || (*chPtr > '9') ) return;	// Bad XMP string.
+		for ( ; ('0' <= *chPtr) && (*chPtr <= '9'); ++chPtr ) deg = deg*10 + (*chPtr - '0');
+		while ( (*chPtr == ' ') || (*chPtr == '\t') ) ++chPtr;
+		if ( (*chPtr == ',') || (*chPtr == ';') ) ++chPtr;
+		while ( (*chPtr == ' ') || (*chPtr == '\t') ) ++chPtr;
+
+		// Extract the whole minutes if present.
+
+		if ( ('0' <= *chPtr) && (*chPtr <= '9') ) {
+
+			for ( ; ('0' <= *chPtr) && (*chPtr <= '9'); ++chPtr ) minNum = minNum*10 + (*chPtr - '0');
+			
+			// Extract the fractional minutes or seconds if present.
+			
+			if ( *chPtr == '.' ) {
+
+				++chPtr;	// Skip the period.
+				for ( ; ('0' <= *chPtr) && (*chPtr <= '9'); ++chPtr ) {
+					if ( minDenom > 100*1000 ) continue;	// Don't accumulate any more digits.
+					minDenom *= 10;
+					minNum = minNum*10 + (*chPtr - '0');
+				}
+
+			} else {
+
+				while ( (*chPtr == ' ') || (*chPtr == '\t') ) ++chPtr;
+				if ( (*chPtr == ',') || (*chPtr == ';') ) ++chPtr;
+				while ( (*chPtr == ' ') || (*chPtr == '\t') ) ++chPtr;
+				for ( ; ('0' <= *chPtr) && (*chPtr <= '9'); ++chPtr ) sec = sec*10 + (*chPtr - '0');
+
+			}
+
+		}
+		
+		// The compass direction part is required. But it isn't worth the bother to make sure it is
+		// appropriate for the tag. Little chance of ever seeing an error, it causes no great harm.
+
+		while ( (*chPtr == ' ') || (*chPtr == '\t') ) ++chPtr;
+		if ( (*chPtr == ',') || (*chPtr == ';') ) ++chPtr;	// Tolerate ',' or ';' here also.
+		while ( (*chPtr == ' ') || (*chPtr == '\t') ) ++chPtr;
+
+		char ref[2];
+		ref[0] = *chPtr;
+		ref[1] = 0;
+
+		if ( ('a' <= ref[0]) && (ref[0] <= 'z') ) ref[0] -= 0x20;
+		if ( (ref[0] != 'N') && (ref[0] != 'S') && (ref[0] != 'E') && (ref[0] != 'W') ) return;
+
+		tiff->SetTag ( ifd, refID, kTIFF_ASCIIType, 2, &ref[0] );
+
+		XMP_Uns32 loc[6];
+		tiff->PutUns32 ( deg, &loc[0] );
+		tiff->PutUns32 ( 1,   &loc[1] );
+		tiff->PutUns32 ( minNum,   &loc[2] );
+		tiff->PutUns32 ( minDenom, &loc[3] );
+		tiff->PutUns32 ( sec, &loc[4] );
+		tiff->PutUns32 ( 1,   &loc[5] );
+
+		tiff->SetTag ( ifd, locID, kTIFF_RationalType, 3, &loc[0] );
+
+	} catch ( ... ) {
+
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+
+	}
+
+}	// ExportTIFF_GPSCoordinate
+
+// =================================================================================================
+// ExportTIFF_GPSTimeStamp
+// =======================
+//
+// The Exif is in 2 tags, GPSTimeStamp and GPSDateStamp. The time is 3 rationals for the hour, minute,
+// and second in UTC. The date is a nul terminated string "YYYY:MM:DD".
+
+static const double kBillion = 1000.0*1000.0*1000.0;
+static const double mMaxSec  = 4.0*kBillion - 1.0;
+
+static void
+ExportTIFF_GPSTimeStamp ( const SXMPMeta & xmp, const char * xmpNS, const char * xmpProp, TIFF_Manager * tiff )
+{
+	
+	try {	// Don't let errors with one stop the others.
+
+		XMP_DateTime binXMP;
+		bool foundXMP = xmp.GetProperty_Date ( xmpNS, xmpProp, &binXMP, 0 );
+		if ( ! foundXMP ) {
+			tiff->DeleteTag ( kTIFF_GPSInfoIFD, kTIFF_GPSTimeStamp );
+			tiff->DeleteTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDateStamp );
+			return;
+		}
+		
+		SXMPUtils::ConvertToUTCTime ( &binXMP );
+
+		XMP_Uns32 exifTime[6];
+		tiff->PutUns32 ( binXMP.hour, &exifTime[0] );
+		tiff->PutUns32 ( 1, &exifTime[1] );
+		tiff->PutUns32 ( binXMP.minute, &exifTime[2] );
+		tiff->PutUns32 ( 1, &exifTime[3] );
+		if ( binXMP.nanoSecond == 0 ) {
+			tiff->PutUns32 ( binXMP.second, &exifTime[4] );
+			tiff->PutUns32 ( 1,   &exifTime[5] );
+		} else {
+			double fSec = (double)binXMP.second + ((double)binXMP.nanoSecond / kBillion );
+			XMP_Uns32 denom = 1000*1000;	// Choose microsecond resolution by default.
+			TIFF_Manager::TagInfo oldInfo;
+			bool hadExif = tiff->GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSTimeStamp, &oldInfo );
+			if ( hadExif && (oldInfo.type == kTIFF_RationalType) && (oldInfo.count == 3) ) {
+				XMP_Uns32 oldDenom = tiff->GetUns32 ( &(((XMP_Uns32*)oldInfo.dataPtr)[5]) );
+				if ( oldDenom != 1 ) denom = oldDenom;
+			}
+			fSec *= denom;
+			while ( fSec > mMaxSec ) { fSec /= 10; denom /= 10; }
+			tiff->PutUns32 ( (XMP_Uns32)fSec, &exifTime[4] );
+			tiff->PutUns32 ( denom, &exifTime[5] );
+		}
+		tiff->SetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSTimeStamp, kTIFF_RationalType, 3, &exifTime[0] );
+
+		char exifDate[16];	// AUDIT: Long enough, only need 11.
+		snprintf ( exifDate, 12, "%04d:%02d:%02d", binXMP.year, binXMP.month, binXMP.day );
+		if ( exifDate[10] == 0 ) {	// Make sure there is no value overflow.
+			tiff->SetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDateStamp, kTIFF_ASCIIType, 11, exifDate );
+		}
+
+	} catch ( ... ) {
+		// Do nothing, let other exports proceed.
+		// ? Notify client?
+	}
+
+}	// ExportTIFF_GPSTimeStamp
+
+// =================================================================================================
+
+static void ExportTIFF_PhotographicSensitivity ( SXMPMeta * xmp, TIFF_Manager * exif ) {
+
+	// PhotographicSensitivity has special cases for values over 65534 because the tag is SHORT. It
+	// has a count of "any", but all known cameras used a count of 1. Exif 2.3 still allows a count
+	// of "any" but says only 1 value should ever be recorded. We only process the first value if
+	// the count is greater than 1.
+	//
+	// Prior to Exif 2.3 the tag was called ISOSpeedRatings. Some cameras omit the tag and some
+	// write 65535. Most put the real ISO in MakerNote, which be in the XMP from ACR.
+	//
+	// With Exif 2.3 five speed-related tags were added of type LONG: StandardOutputSensitivity,
+	// RecommendedExposureIndex, ISOSpeed, ISOSpeedLatitudeyyy, and ISOSpeedLatitudezzz. The tag
+	// SensitivityType was added to say which of these five is copied to PhotographicSensitivity.
+	//
+	// Export logic:
+	//	If ExifVersion is less than "0230" (or missing)
+	//		If exif:ISOSpeedRatings[1] <= 65535: inject tag (if missing), remove exif:ISOSpeedRatings
+	//	Else (ExifVersion is at least "0230")
+	//		If no exifEX:PhotographicSensitivity: set it from exif:ISOSpeedRatings[1]
+	//		Remove exif:ISOSpeedRatings (to not be saved in namespace cleanup)
+	//		If exifEX:PhotographicSensitivity <= 65535: inject tag (if missing)
+	//		Else if exifEX:PhotographicSensitivity over 65535
+	//			If no PhotographicSensitivity tag and no SensitivityType tag and no ISOSpeed tag:
+	//				Inject PhotographicSensitivity tag as 65535
+	//				If no exifEX:SensitivityType and no exifEX:ISOSpeed
+	//					Set exifEX:SensitivityType to 3
+	//					Set exifEX:ISOSpeed to exifEX:PhotographicSensitivity
+	//		Inject SensitivityType and long tags (if missing)
+	//	Save exif:ISOSpeedRatings when cleaning namespaces (done in ExportPhotoData)
+	
+	try {
+	
+		bool foundXMP, foundExif;
+		TIFF_Manager::TagInfo tagInfo;
+		std::string xmpValue;
+		XMP_OptionBits flags;
+		XMP_Int32 binValue = 0;
+	
+		bool haveOldExif = true;	// Default to old Exif if no version tag.
+	
+		foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, &tagInfo );
+		if ( foundExif && (tagInfo.type == kTIFF_UndefinedType) && (tagInfo.count == 4) ) {
+			haveOldExif = (strncmp ( (char*)tagInfo.dataPtr, "0230", 4 ) < 0);
+		}
+	
+		if ( haveOldExif ) {	// Exif version is before 2.3, use just the old tag and property.
+		
+			foundXMP = xmp->GetProperty ( kXMP_NS_EXIF, "ISOSpeedRatings", 0, &flags );
+			if ( foundXMP && XMP_PropIsArray(flags) && (xmp->CountArrayItems ( kXMP_NS_EXIF, "ISOSpeedRatings" ) > 0) ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_EXIF, "ISOSpeedRatings[1]", &binValue, 0 );
+			}
+			
+			if ( ! foundXMP ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "PhotographicSensitivity", &binValue, 0 );
+			}
+
+			if ( foundXMP && (0 <= binValue) && (binValue <= 65535) ) {
+				xmp->DeleteProperty ( kXMP_NS_EXIF, "ISOSpeedRatings" );	// So namespace cleanup won't keep it.
+				foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_PhotographicSensitivity, &tagInfo );
+				if ( ! foundExif ) {
+					exif->SetTag_Short ( kTIFF_ExifIFD, kTIFF_PhotographicSensitivity, (XMP_Uns16)binValue );
+				}
+			}
+		
+		} else {	// Exif version is 2.3 or newer, use the Exif 2.3 tags and properties.
+		
+			// Deal with the special cases for exifEX:PhotographicSensitivity and exif:ISOSpeedRatings.
+
+			if ( ! xmp->DoesPropertyExist ( kXMP_NS_ExifEX,  "PhotographicSensitivity" ) ) {
+				foundXMP = xmp->GetProperty ( kXMP_NS_EXIF, "ISOSpeedRatings", 0, &flags );
+				if ( foundXMP && XMP_PropIsArray(flags) &&
+					 (xmp->CountArrayItems ( kXMP_NS_EXIF, "ISOSpeedRatings" ) > 0) ) {
+					xmp->GetArrayItem ( kXMP_NS_EXIF, "ISOSpeedRatings", 1, &xmpValue, 0 );
+					xmp->SetProperty ( kXMP_NS_ExifEX,  "PhotographicSensitivity", xmpValue.c_str() );
+				}
+			}
+			
+			xmp->DeleteProperty ( kXMP_NS_EXIF, "ISOSpeedRatings" );	// Don't want it kept after namespace cleanup.
+			
+			foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "PhotographicSensitivity", &binValue, 0 );
+
+			if ( foundXMP && (0 <= binValue) && (binValue <= 65535) ) {	// The simpler low ISO case.
+			
+				foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_PhotographicSensitivity, &tagInfo );
+				if ( ! foundExif ) {
+					exif->SetTag_Short ( kTIFF_ExifIFD, kTIFF_PhotographicSensitivity, (XMP_Uns16)binValue );
+				}
+			
+			} else if ( foundXMP ) {	// The more commplex high ISO case.
+			
+				bool havePhotographicSensitivityTag = exif->GetTag ( kTIFF_ExifIFD, kTIFF_PhotographicSensitivity, 0 );
+				bool haveSensitivityTypeTag = exif->GetTag ( kTIFF_ExifIFD, kTIFF_SensitivityType, 0 );
+				bool haveISOSpeedTag = exif->GetTag ( kTIFF_ExifIFD, kTIFF_ISOSpeed, 0 );
+			
+				bool haveSensitivityTypeXMP = xmp->DoesPropertyExist ( kXMP_NS_ExifEX, "SensitivityType" );
+				bool haveISOSpeedXMP = xmp->DoesPropertyExist ( kXMP_NS_ExifEX, "ISOSpeed" );
+			
+				if ( (! havePhotographicSensitivityTag) && (! haveSensitivityTypeTag) && (! haveISOSpeedTag) ) {
+
+					exif->SetTag_Short ( kTIFF_ExifIFD, kTIFF_PhotographicSensitivity, 65535 );
+					
+					if ( (! haveSensitivityTypeXMP) && (! haveISOSpeedXMP) ) {
+						xmp->SetProperty ( kXMP_NS_ExifEX, "SensitivityType", "3" );
+						xmp->SetProperty_Int ( kXMP_NS_ExifEX, "ISOSpeed", binValue );
+					}
+
+				}
+			
+			}
+	
+			// Export SensitivityType and the related long tags. Must be done after the special
+			// cases because they might set exifEX:SensitivityType and exifEX:ISOSpeed.
+	
+			foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_SensitivityType, &tagInfo );
+			if ( ! foundExif ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "SensitivityType", &binValue, 0 );
+				if ( foundXMP && (0 <= binValue) && (binValue <= 65535) ) {
+					exif->SetTag_Short ( kTIFF_ExifIFD, kTIFF_SensitivityType, (XMP_Uns16)binValue );
+				}
+			}
+	
+			foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_StandardOutputSensitivity, &tagInfo );
+			if ( ! foundExif ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "StandardOutputSensitivity", &binValue, 0 );
+				if ( foundXMP && (binValue >= 0) ) {
+					exif->SetTag_Long ( kTIFF_ExifIFD, kTIFF_StandardOutputSensitivity, (XMP_Uns32)binValue );
+				}
+			}
+	
+			foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_RecommendedExposureIndex, &tagInfo );
+			if ( ! foundExif ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "RecommendedExposureIndex", &binValue, 0 );
+				if ( foundXMP && (binValue >= 0) ) {
+					exif->SetTag_Long ( kTIFF_ExifIFD, kTIFF_RecommendedExposureIndex, (XMP_Uns32)binValue );
+				}
+			}
+	
+			foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_ISOSpeed, &tagInfo );
+			if ( ! foundExif ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "ISOSpeed", &binValue, 0 );
+				if ( foundXMP && (binValue >= 0) ) {
+					exif->SetTag_Long ( kTIFF_ExifIFD, kTIFF_ISOSpeed, (XMP_Uns32)binValue );
+				}
+			}
+	
+			foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_ISOSpeedLatitudeyyy, &tagInfo );
+			if ( ! foundExif ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "ISOSpeedLatitudeyyy", &binValue, 0 );
+				if ( foundXMP && (binValue >= 0) ) {
+					exif->SetTag_Long ( kTIFF_ExifIFD, kTIFF_ISOSpeedLatitudeyyy, (XMP_Uns32)binValue );
+				}
+			}
+	
+			foundExif = exif->GetTag ( kTIFF_ExifIFD, kTIFF_ISOSpeedLatitudezzz, &tagInfo );
+			if ( ! foundExif ) {
+				foundXMP = xmp->GetProperty_Int ( kXMP_NS_ExifEX, "ISOSpeedLatitudezzz", &binValue, 0 );
+				if ( foundXMP && (binValue >= 0) ) {
+					exif->SetTag_Long ( kTIFF_ExifIFD, kTIFF_ISOSpeedLatitudezzz, (XMP_Uns32)binValue );
+				}
+			}
+		
+		}
+
+	} catch ( ... ) {
+
+		// Do nothing, don't let this failure stop other exports.
+
+	}
+
+}	// ExportTIFF_PhotographicSensitivity
+
+// =================================================================================================
+// =================================================================================================
+
+// =================================================================================================
+// PhotoDataUtils::ExportExif
+// ==========================
+
+void
+PhotoDataUtils::ExportExif ( SXMPMeta * xmp, TIFF_Manager * exif )
+{
+	bool haveXMP;
+	std::string xmpValue;
+
+	XMP_Int32 int32;
+	XMP_Uns8 uns8;
+	
+	// ---------------------------------------------------------
+	// Read the old Adobe names for new Exif 2.3 tags if wanted.
+	
+	#if SupportOldExifProperties
+	
+		XMP_OptionBits flags;
+	
+		haveXMP = xmp->DoesPropertyExist ( kXMP_NS_ExifEX, "PhotographicSensitivity" );
+		if ( ! haveXMP ) {
+			haveXMP = xmp->GetProperty ( kXMP_NS_EXIF, "ISOSpeedRatings", 0, &flags );
+			if ( haveXMP && XMP_PropIsArray(flags) ) {
+				haveXMP = xmp->GetArrayItem ( kXMP_NS_EXIF, "ISOSpeedRatings", 1, &xmpValue, 0 );
+				if ( haveXMP ) xmp->SetProperty ( kXMP_NS_ExifEX, "PhotographicSensitivity", xmpValue.c_str() );
+			}
+		}
+	
+		haveXMP = xmp->DoesPropertyExist ( kXMP_NS_ExifEX, "CameraOwnerName" );
+		if ( ! haveXMP ) {
+			haveXMP = xmp->GetProperty ( kXMP_NS_EXIF_Aux, "OwnerName", &xmpValue, 0 );
+			if ( haveXMP ) xmp->SetProperty ( kXMP_NS_ExifEX, "CameraOwnerName", xmpValue.c_str() );
+		}
+	
+		haveXMP = xmp->DoesPropertyExist ( kXMP_NS_ExifEX, "BodySerialNumber" );
+		if ( ! haveXMP ) {
+			haveXMP = xmp->GetProperty ( kXMP_NS_EXIF_Aux, "SerialNumber", &xmpValue, 0 );
+			if ( haveXMP ) xmp->SetProperty ( kXMP_NS_ExifEX, "BodySerialNumber", xmpValue.c_str() );
+		}
+	
+		haveXMP = xmp->DoesPropertyExist ( kXMP_NS_ExifEX, "LensModel" );
+		if ( ! haveXMP ) {
+			haveXMP = xmp->GetProperty ( kXMP_NS_EXIF_Aux, "Lens", &xmpValue, 0 );
+			if ( haveXMP ) xmp->SetProperty ( kXMP_NS_ExifEX, "LensModel", xmpValue.c_str() );
+		}
+	
+		haveXMP = xmp->DoesPropertyExist ( kXMP_NS_ExifEX, "LensSpecification" );
+		if ( ! haveXMP ) {
+			haveXMP = xmp->GetProperty ( kXMP_NS_EXIF_Aux, "LensInfo", &xmpValue, 0 );
+			if ( haveXMP ) {
+				size_t start, end;
+				std::string nextItem;
+				for ( start = 0; start < xmpValue.size(); start = end + 1 ) {
+					end = xmpValue.find ( ' ', start );
+					if ( end == start ) continue;
+					if ( end == std::string::npos ) end = xmpValue.size();
+					nextItem = xmpValue.substr ( start, (end-start) );
+					xmp->AppendArrayItem ( kXMP_NS_ExifEX, "LensSpecification", kXMP_PropArrayIsOrdered, nextItem.c_str() );
+				}
+			}
+		}
+	
+	#endif
+	
+	// Do all of the table driven standard exports.
+	
+	ExportTIFF_StandardMappings ( kTIFF_PrimaryIFD, exif, *xmp );
+	ExportTIFF_StandardMappings ( kTIFF_ExifIFD, exif, *xmp );
+	ExportTIFF_StandardMappings ( kTIFF_GPSInfoIFD, exif, *xmp );
+	
+	// --------------------------------------------------------------------------------------------
+	// Fixup erroneous cases that appear to have a negative value for GPSAltitude in the Exif. This
+	// treats any value with the high bit set as a negative, which is more likely in practice than
+	// an actual value over 2 billion. The XMP was exported by the tables and is left alone since it
+	// won't be kept in the file.
+	
+	TIFF_Manager::Rational altValue;
+	bool haveExif = exif->GetTag_Rational ( kTIFF_GPSInfoIFD, kTIFF_GPSAltitude, &altValue );
+	if ( haveExif ) {
+
+		bool fixExif = false;
+
+		if ( altValue.denom >> 31 ) {	// Shift the sign to the numerator.
+			altValue.denom = -altValue.denom;
+			altValue.num = -altValue.num;
+			fixExif = true;
+		}
+
+		if ( altValue.num >> 31 ) {	// Fix the numerator and set GPSAltitudeRef.
+			exif->SetTag_Byte ( kTIFF_GPSInfoIFD, kTIFF_GPSAltitudeRef, 1 );
+			altValue.num = -altValue.num;
+			fixExif = true;
+		}
+
+		if ( fixExif ) exif->SetTag_Rational ( kTIFF_GPSInfoIFD, kTIFF_GPSAltitude, altValue.num, altValue.denom );
+
+	}
+
+	// Export dc:description to TIFF ImageDescription, and exif:UserComment to EXIF UserComment.
+	
+	// *** This is not following the MWG guidelines. The policy here tries to be more backward compatible.
+
+	ExportTIFF_LocTextASCII ( *xmp, kXMP_NS_DC, "description",
+							  exif, kTIFF_PrimaryIFD, kTIFF_ImageDescription );
+
+	ExportTIFF_EncodedString ( *xmp, kXMP_NS_EXIF, "UserComment",
+							   exif, kTIFF_ExifIFD, kTIFF_UserComment, true /* isLangAlt */ );
+	
+	// Export all of the date/time tags.
+	// ! Special case: Don't create Exif DateTimeDigitized. This can avoid PSD full rewrite due to
+	// ! new mapping from xmp:CreateDate.
+
+	if ( exif->GetTag ( kTIFF_ExifIFD, kTIFF_DateTimeDigitized, 0 ) ) {
+		ExportTIFF_Date ( *xmp, kXMP_NS_XMP, "CreateDate", exif, kTIFF_DateTimeDigitized );
+	}
+
+	ExportTIFF_Date ( *xmp, kXMP_NS_EXIF, "DateTimeOriginal", exif, kTIFF_DateTimeOriginal );
+	ExportTIFF_Date ( *xmp, kXMP_NS_XMP, "ModifyDate", exif, kTIFF_DateTime );
+	
+	// Export the remaining TIFF, Exif, and GPS IFD tags.
+
+	ExportTIFF_ArrayASCII ( *xmp, kXMP_NS_DC, "creator", exif, kTIFF_PrimaryIFD, kTIFF_Artist );
+
+	ExportTIFF_LocTextASCII ( *xmp, kXMP_NS_DC, "rights", exif, kTIFF_PrimaryIFD, kTIFF_Copyright );
+		
+	haveXMP = xmp->GetProperty ( kXMP_NS_EXIF, "ExifVersion", &xmpValue, 0 );
+	if ( haveXMP && (xmpValue.size() == 4) && (! exif->GetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, 0 )) ) {
+		// 36864 ExifVersion is 4 "undefined" ASCII characters.
+		exif->SetTag ( kTIFF_ExifIFD, kTIFF_ExifVersion, kTIFF_UndefinedType, 4, xmpValue.data() );
+	}
+
+	// There are moderately complex export special cases for PhotographicSensitivity.
+	ExportTIFF_PhotographicSensitivity ( xmp, exif );
+	
+	haveXMP = xmp->DoesPropertyExist ( kXMP_NS_EXIF, "ComponentsConfiguration" );
+	if ( haveXMP && (xmp->CountArrayItems ( kXMP_NS_EXIF, "ComponentsConfiguration" ) == 4) &&
+		 (! exif->GetTag ( kTIFF_ExifIFD, kTIFF_ComponentsConfiguration, 0 )) ) {
+		// 37121 ComponentsConfiguration is an array of 4 "undefined" UInt8 bytes.
+		XMP_Uns8 compConfig[4];
+		xmp->GetProperty_Int ( kXMP_NS_EXIF, "ComponentsConfiguration[1]", &int32, 0 );
+		compConfig[0] = (XMP_Uns8)int32;
+		xmp->GetProperty_Int ( kXMP_NS_EXIF, "ComponentsConfiguration[2]", &int32, 0 );
+		compConfig[1] = (XMP_Uns8)int32;
+		xmp->GetProperty_Int ( kXMP_NS_EXIF, "ComponentsConfiguration[3]", &int32, 0 );
+		compConfig[2] = (XMP_Uns8)int32;
+		xmp->GetProperty_Int ( kXMP_NS_EXIF, "ComponentsConfiguration[4]", &int32, 0 );
+		compConfig[3] = (XMP_Uns8)int32;
+		exif->SetTag ( kTIFF_ExifIFD, kTIFF_ComponentsConfiguration, kTIFF_UndefinedType, 4, &compConfig[0] );
+	}
+	
+	haveXMP = xmp->DoesPropertyExist ( kXMP_NS_EXIF, "Flash" );
+	if ( haveXMP && (! exif->GetTag ( kTIFF_ExifIFD, kTIFF_Flash, 0 )) ) {
+		// 37385 Flash is a UInt16 collection of bit fields and is mapped to a struct in XMP.
+		XMP_Uns16 binFlash = 0;
+		bool field;
+		haveXMP = xmp->GetProperty_Bool ( kXMP_NS_EXIF, "Flash/exif:Fired", &field, 0 );
+		if ( haveXMP & field ) binFlash |= 0x0001;
+		haveXMP = xmp->GetProperty_Int ( kXMP_NS_EXIF, "Flash/exif:Return", &int32, 0 );
+		if ( haveXMP ) binFlash |= (int32 & 3) << 1;
+		haveXMP = xmp->GetProperty_Int ( kXMP_NS_EXIF, "Flash/exif:Mode", &int32, 0 );
+		if ( haveXMP ) binFlash |= (int32 & 3) << 3;
+		haveXMP = xmp->GetProperty_Bool ( kXMP_NS_EXIF, "Flash/exif:Function", &field, 0 );
+		if ( haveXMP & field ) binFlash |= 0x0020;
+		haveXMP = xmp->GetProperty_Bool ( kXMP_NS_EXIF, "Flash/exif:RedEyeMode", &field, 0 );
+		if ( haveXMP & field ) binFlash |= 0x0040;
+		exif->SetTag_Short ( kTIFF_ExifIFD, kTIFF_Flash, binFlash );
+	}
+	
+	haveXMP = xmp->GetProperty_Int ( kXMP_NS_EXIF, "FileSource", &int32, 0 );
+	if ( haveXMP && (! exif->GetTag ( kTIFF_ExifIFD, kTIFF_FileSource, 0 )) ) {
+		// 41728 FileSource is an "undefined" UInt8.
+		uns8 = (XMP_Uns8)int32;
+		exif->SetTag ( kTIFF_ExifIFD, kTIFF_FileSource, kTIFF_UndefinedType, 1, &uns8 );
+	}
+	
+	haveXMP = xmp->GetProperty_Int ( kXMP_NS_EXIF, "SceneType", &int32, 0 );
+	if ( haveXMP && (! exif->GetTag ( kTIFF_ExifIFD, kTIFF_SceneType, 0 )) ) {
+		// 41729 SceneType is an "undefined" UInt8.
+		uns8 = (XMP_Uns8)int32;
+		exif->SetTag ( kTIFF_ExifIFD, kTIFF_SceneType, kTIFF_UndefinedType, 1, &uns8 );
+	}
+	
+	// *** Deferred inject-only tags: SpatialFrequencyResponse, DeviceSettingDescription, CFAPattern
+
+	haveXMP = xmp->GetProperty ( kXMP_NS_EXIF, "GPSVersionID", &xmpValue, 0 );	// This is inject-only.
+	if ( haveXMP && (! exif->GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSVersionID, 0 )) ) {
+		XMP_Uns8 gpsID[4];	// 0 GPSVersionID is 4 UInt8 bytes and mapped in XMP as "n.n.n.n".
+		unsigned int fields[4];	// ! Need ints for output from sscanf.
+		int count = sscanf ( xmpValue.c_str(), "%u.%u.%u.%u", &fields[0], &fields[1], &fields[2], &fields[3] );
+		if ( (count == 4) && (fields[0] <= 255) && (fields[1] <= 255) && (fields[2] <= 255) && (fields[3] <= 255) ) {
+			gpsID[0] = fields[0]; gpsID[1] = fields[1]; gpsID[2] = fields[2]; gpsID[3] = fields[3];
+			exif->SetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSVersionID, kTIFF_ByteType, 4, &gpsID[0] );
+		}
+	}
+	
+	ExportTIFF_GPSCoordinate ( *xmp, kXMP_NS_EXIF, "GPSLatitude", exif, kTIFF_GPSInfoIFD, kTIFF_GPSLatitude );
+
+	ExportTIFF_GPSCoordinate ( *xmp, kXMP_NS_EXIF, "GPSLongitude", exif, kTIFF_GPSInfoIFD, kTIFF_GPSLongitude );
+	
+	ExportTIFF_GPSTimeStamp ( *xmp, kXMP_NS_EXIF, "GPSTimeStamp", exif );
+
+	// The following GPS tags are inject-only.
+	
+	haveXMP = xmp->DoesPropertyExist ( kXMP_NS_EXIF, "GPSDestLatitude" );
+	if ( haveXMP && (! exif->GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDestLatitude, 0 )) ) {
+		ExportTIFF_GPSCoordinate ( *xmp, kXMP_NS_EXIF, "GPSDestLatitude", exif, kTIFF_GPSInfoIFD, kTIFF_GPSDestLatitude );
+	}
+
+	haveXMP = xmp->DoesPropertyExist ( kXMP_NS_EXIF, "GPSDestLongitude" );
+	if ( haveXMP && (! exif->GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSDestLongitude, 0 )) ) {
+		ExportTIFF_GPSCoordinate ( *xmp, kXMP_NS_EXIF, "GPSDestLongitude", exif, kTIFF_GPSInfoIFD, kTIFF_GPSDestLongitude );
+	}
+
+	haveXMP = xmp->GetProperty ( kXMP_NS_EXIF, "GPSProcessingMethod", &xmpValue, 0 );
+	if ( haveXMP && (! xmpValue.empty()) && (! exif->GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSProcessingMethod, 0 )) ) {
+		// 27 GPSProcessingMethod is a string with explicit encoding.
+		ExportTIFF_EncodedString ( *xmp, kXMP_NS_EXIF, "GPSProcessingMethod", exif, kTIFF_GPSInfoIFD, kTIFF_GPSProcessingMethod );
+	}
+
+	haveXMP = xmp->GetProperty ( kXMP_NS_EXIF, "GPSAreaInformation", &xmpValue, 0 );
+	if ( haveXMP && (! xmpValue.empty()) && (! exif->GetTag ( kTIFF_GPSInfoIFD, kTIFF_GPSAreaInformation, 0 )) ) {
+		// 28 GPSAreaInformation is a string with explicit encoding.
+		ExportTIFF_EncodedString ( *xmp, kXMP_NS_EXIF, "GPSAreaInformation", exif, kTIFF_GPSInfoIFD, kTIFF_GPSAreaInformation );
+	}
+	
+}	// PhotoDataUtils::ExportExif
diff --git a/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp b/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp
new file mode 100644
index 0000000..7ff57c2
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp
@@ -0,0 +1,473 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "source/UnicodeConversions.hpp"
+#include "source/XIO.hpp"
+
+#if XMP_WinBuild
+#elif XMP_MacBuild
+	#include <CoreServices/CoreServices.h>
+#elif XMP_iOSBuild
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
+const char * ReconcileUtils::kHexDigits = "0123456789ABCDEF";
+
+// =================================================================================================
+/// \file Reconcile_Impl.cpp
+/// \brief Implementation utilities for the photo metadata reconciliation support.
+///
+// =================================================================================================
+
+// =================================================================================================
+// ReconcileUtils::IsASCII
+// =======================
+//
+// See if a string is 7 bit ASCII.
+
+bool ReconcileUtils::IsASCII ( const void * textPtr, size_t textLen )
+{
+	
+	for ( const XMP_Uns8 * textPos = (XMP_Uns8*)textPtr; textLen > 0; --textLen, ++textPos ) {
+		if ( *textPos >= 0x80 ) return false;
+	}
+	
+	return true;
+
+}	// ReconcileUtils::IsASCII
+
+// =================================================================================================
+// ReconcileUtils::IsUTF8
+// ======================
+//
+// See if a string contains valid UTF-8. Allow nul bytes, they can appear inside of multi-part Exif
+// strings. We don't use CodePoint_from_UTF8_Multi in UnicodeConversions because it throws an
+// exception for non-Unicode and we don't need to actually compute the code points.
+
+bool ReconcileUtils::IsUTF8 ( const void * textPtr, size_t textLen )
+{
+	const XMP_Uns8 * textPos = (XMP_Uns8*)textPtr;
+	const XMP_Uns8 * textEnd = textPos + textLen;
+	
+	while ( textPos < textEnd ) {
+	
+		if ( *textPos < 0x80 ) {
+		
+			++textPos;	// ASCII is UTF-8, tolerate nuls.
+		
+		} else {
+		
+			// -------------------------------------------------------------------------------------
+			// We've got a multibyte UTF-8 character. The first byte has the number of bytes as the
+			// number of high order 1 bits. The remaining bytes must have 1 and 0 as the top 2 bits.
+	
+			#if 0	// *** This might be a more effcient way to count the bytes.
+				static XMP_Uns8 kByteCounts[16] = { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 2, 2, 3, 4 };
+				size_t bytesNeeded = kByteCounts [ *textPos >> 4 ];
+				if ( (bytesNeeded < 2) || ((bytesNeeded == 4) && ((*textPos & 0x08) != 0)) ) return false;
+				if ( (textPos + bytesNeeded) > textEnd ) return false;
+			#endif
+		
+			size_t bytesNeeded = 0;	// Count the high order 1 bits in the first byte.
+			for ( XMP_Uns8 temp = *textPos; temp > 0x7F; temp = temp << 1 ) ++bytesNeeded;
+				// *** Consider CPU-specific assembly inline, e.g. cntlzw on PowerPC.
+			
+			if ( (bytesNeeded < 2) || (bytesNeeded > 4) || ((textPos+bytesNeeded) > textEnd) ) return false;
+			
+			for ( --bytesNeeded, ++textPos; bytesNeeded > 0; --bytesNeeded, ++textPos ) {
+				if ( (*textPos >> 6) != 2 ) return false;
+			}
+		
+		}
+	
+	}
+	
+	return true;	// ! Returns true for empty strings.
+
+}	// ReconcileUtils::IsUTF8
+
+// =================================================================================================
+// UTF8ToHostEncoding
+// ==================
+
+#if XMP_WinBuild
+
+	void ReconcileUtils::UTF8ToWinEncoding ( UINT codePage, const XMP_Uns8 * utf8Ptr, size_t utf8Len, std::string * host )
+	{
+	
+		std::string utf16;	// WideCharToMultiByte wants native UTF-16.
+		ToUTF16Native ( (UTF8Unit*)utf8Ptr, utf8Len, &utf16 );
+	
+		LPCWSTR utf16Ptr = (LPCWSTR) utf16.c_str();
+		size_t  utf16Len = utf16.size() / 2;
+	
+		int hostLen = WideCharToMultiByte ( codePage, 0, utf16Ptr, (int)utf16Len, 0, 0, 0, 0 );
+		host->assign ( hostLen, ' ' );	// Allocate space for the results.
+	
+		(void) WideCharToMultiByte ( codePage, 0, utf16Ptr, (int)utf16Len, (LPSTR)host->data(), hostLen, 0, 0 );
+		XMP_Assert ( hostLen == host->size() );
+	
+	}	// UTF8ToWinEncoding
+
+#elif XMP_MacBuild
+
+	void ReconcileUtils::UTF8ToMacEncoding ( XMP_Uns16 macScript, XMP_Uns16 macLang, const XMP_Uns8 * utf8Ptr, size_t utf8Len, std::string * host )
+	{
+		OSStatus err;
+		
+		TextEncoding destEncoding;
+		if ( macLang == langUnspecified ) macLang = kTextLanguageDontCare;
+		err = UpgradeScriptInfoToTextEncoding ( macScript, macLang, kTextRegionDontCare, 0, &destEncoding );
+		if ( err != noErr ) XMP_Throw ( "UpgradeScriptInfoToTextEncoding failed", kXMPErr_ExternalFailure );
+		
+		UnicodeMapping mappingInfo;
+		mappingInfo.mappingVersion  = kUnicodeUseLatestMapping;
+		mappingInfo.otherEncoding   = GetTextEncodingBase ( destEncoding );
+		mappingInfo.unicodeEncoding = CreateTextEncoding ( kTextEncodingUnicodeDefault,
+														   kUnicodeNoSubset, kUnicodeUTF8Format );
+		
+		UnicodeToTextInfo converterInfo;
+		err = CreateUnicodeToTextInfo ( &mappingInfo, &converterInfo );
+		if ( err != noErr ) XMP_Throw ( "CreateUnicodeToTextInfo failed", kXMPErr_ExternalFailure );
+		
+		try {	// ! Need to call DisposeUnicodeToTextInfo before exiting.
+		
+			OptionBits convFlags = kUnicodeUseFallbacksMask | 
+								   kUnicodeLooseMappingsMask |  kUnicodeDefaultDirectionMask;
+			ByteCount bytesRead, bytesWritten;
+	
+			enum { kBufferLen = 1000 };	// Ought to be enough in practice, without using too much stack.
+			char buffer [kBufferLen];
+			
+			host->reserve ( utf8Len );	// As good a guess as any.
+		
+			while ( utf8Len > 0 ) {
+				// Ignore all errors from ConvertFromUnicodeToText. It returns info like "output 
+				// buffer full" or "use substitution" as errors.
+				err = ConvertFromUnicodeToText ( converterInfo, utf8Len, (UniChar*)utf8Ptr, convFlags,
+												 0, 0, 0, 0, kBufferLen, &bytesRead, &bytesWritten, buffer );
+				if ( bytesRead == 0 ) break;	// Make sure forward progress happens.
+				host->append ( &buffer[0], bytesWritten );
+				utf8Ptr += bytesRead;
+				utf8Len -= bytesRead;
+			}
+		
+			DisposeUnicodeToTextInfo ( &converterInfo );
+	
+		} catch ( ... ) {
+	
+			DisposeUnicodeToTextInfo ( &converterInfo );
+			throw;
+	
+		}
+	
+	}	// UTF8ToMacEncoding
+
+#elif XMP_UNIXBuild
+
+	// ! Does not exist, must not be called, for Generic UNIX builds.
+
+#endif
+
+// =================================================================================================
+// ReconcileUtils::UTF8ToLocal
+// ===========================
+
+void ReconcileUtils::UTF8ToLocal ( const void * _utf8Ptr, size_t utf8Len, std::string * local )
+{
+	const XMP_Uns8* utf8Ptr = (XMP_Uns8*)_utf8Ptr;
+
+	local->erase();
+	
+	if ( ReconcileUtils::IsASCII ( utf8Ptr, utf8Len ) ) {
+		local->assign ( (const char *)utf8Ptr, utf8Len );
+		return;
+	}
+	
+	#if XMP_WinBuild
+	
+		UTF8ToWinEncoding ( CP_ACP, utf8Ptr, utf8Len, local );
+	
+	#elif XMP_MacBuild
+	
+		UTF8ToMacEncoding ( smSystemScript, kTextLanguageDontCare, utf8Ptr, utf8Len, local );
+	
+	#elif XMP_UNIXBuild
+	
+		XMP_Throw ( "Generic UNIX does not have conversions between local and Unicode", kXMPErr_Unavailable );
+    
+    #elif XMP_iOSBuild
+    
+        IOSConvertEncoding(kCFStringEncodingUTF8, CFStringGetSystemEncoding(), utf8Ptr, utf8Len, local);
+
+    
+    
+	
+	#endif
+
+}	// ReconcileUtils::UTF8ToLocal
+
+// =================================================================================================
+// ReconcileUtils::UTF8ToLatin1
+// ============================
+
+void ReconcileUtils::UTF8ToLatin1 ( const void * _utf8Ptr, size_t utf8Len, std::string * latin1 )
+{
+	const XMP_Uns8* utf8Ptr = (XMP_Uns8*)_utf8Ptr;
+	const XMP_Uns8* utf8End = utf8Ptr + utf8Len;
+
+	latin1->erase();
+	latin1->reserve ( utf8Len );	// As good a guess as any, at least enough, exact for ASCII.
+	
+	bool inBadRun = false;
+	
+	while ( utf8Ptr < utf8End ) {
+	
+		if ( *utf8Ptr <= 0x7F ) {
+
+			(*latin1) += (char)*utf8Ptr;	// Have an ASCII character.
+			inBadRun = false;
+			++utf8Ptr;
+
+		} else if ( utf8Ptr == (utf8End - 1) ) {
+
+			inBadRun = false;
+			++utf8Ptr;	// Ignore a bad end to the UTF-8.
+
+		} else {
+
+			XMP_Assert ( (utf8End - utf8Ptr) >= 2 );
+			XMP_Uns16 ch16 = GetUns16BE ( utf8Ptr );	// A Latin-1 80..FF is 2 UTF-8 bytes.
+
+			if ( (0xC280 <= ch16) && (ch16 <= 0xC2BF) ) {
+
+				(*latin1) += (char)(ch16 & 0xFF);	// UTF-8 C280..C2BF are Latin-1 80..BF.
+				inBadRun = false;
+				utf8Ptr += 2;
+
+			} else if ( (0xC380 <= ch16) && (ch16 <= 0xC3BF) ) {
+
+				(*latin1) += (char)((ch16 & 0xFF) + 0x40);	// UTF-8 C380..C3BF are Latin-1 C0..FF.
+				inBadRun = false;
+				utf8Ptr += 2;
+
+			} else {
+
+				if ( ! inBadRun ) {
+					inBadRun = true;
+					(*latin1) += "(?)";	// Mark the run of out of scope UTF-8.
+				}
+				
+				++utf8Ptr;	// Skip the presumably well-formed UTF-8 character.
+				while ( (utf8Ptr < utf8End) && ((*utf8Ptr & 0xC0) == 0x80) ) ++utf8Ptr;
+
+			}
+
+		}
+	
+	}
+	
+	XMP_Assert ( utf8Ptr == utf8End );
+
+}	// ReconcileUtils::UTF8ToLatin1
+
+// =================================================================================================
+// HostEncodingToUTF8
+// ==================
+
+#if XMP_WinBuild
+
+	void ReconcileUtils::WinEncodingToUTF8 ( UINT codePage, const XMP_Uns8 * hostPtr, size_t hostLen, std::string * utf8 )
+	{
+
+		int utf16Len = MultiByteToWideChar ( codePage, 0, (LPCSTR)hostPtr, (int)hostLen, 0, 0 );
+		std::vector<UTF16Unit> utf16 ( utf16Len, 0 );	// MultiByteToWideChar returns native UTF-16.
+
+		(void) MultiByteToWideChar ( codePage, 0, (LPCSTR)hostPtr, (int)hostLen, (LPWSTR)&utf16[0], utf16Len );
+		FromUTF16Native ( &utf16[0], (int)utf16Len, utf8 );
+	
+	}	// WinEncodingToUTF8
+
+#elif XMP_MacBuild
+
+	void ReconcileUtils::MacEncodingToUTF8 ( XMP_Uns16 macScript, XMP_Uns16 macLang, const XMP_Uns8 * hostPtr, size_t hostLen, std::string * utf8 )
+	{
+		OSStatus err;
+		
+		TextEncoding srcEncoding;
+		if ( macLang == langUnspecified ) macLang = kTextLanguageDontCare;
+		err = UpgradeScriptInfoToTextEncoding ( macScript, macLang, kTextRegionDontCare, 0, &srcEncoding );
+		if ( err != noErr ) XMP_Throw ( "UpgradeScriptInfoToTextEncoding failed", kXMPErr_ExternalFailure );
+		
+		UnicodeMapping mappingInfo;
+		mappingInfo.mappingVersion  = kUnicodeUseLatestMapping;
+		mappingInfo.otherEncoding   = GetTextEncodingBase ( srcEncoding );
+		mappingInfo.unicodeEncoding = CreateTextEncoding ( kTextEncodingUnicodeDefault,
+														   kUnicodeNoSubset, kUnicodeUTF8Format );
+		
+		TextToUnicodeInfo converterInfo;
+		err = CreateTextToUnicodeInfo ( &mappingInfo, &converterInfo );
+		if ( err != noErr ) XMP_Throw ( "CreateTextToUnicodeInfo failed", kXMPErr_ExternalFailure );
+		
+		try {	// ! Need to call DisposeTextToUnicodeInfo before exiting.
+		
+			ByteCount bytesRead, bytesWritten;
+
+			enum { kBufferLen = 1000 };	// Ought to be enough in practice, without using too much stack.
+			char buffer [kBufferLen];
+			
+			utf8->reserve ( hostLen );	// As good a guess as any.
+		
+			while ( hostLen > 0 ) {
+				// Ignore all errors from ConvertFromTextToUnicode. It returns info like "output 
+				// buffer full" or "use substitution" as errors.
+				err = ConvertFromTextToUnicode ( converterInfo, hostLen, hostPtr, kNilOptions,
+												 0, 0, 0, 0, kBufferLen, &bytesRead, &bytesWritten, (UniChar*)buffer );
+				if ( bytesRead == 0 ) break;	// Make sure forward progress happens.
+				utf8->append ( &buffer[0], bytesWritten );
+				hostPtr += bytesRead;
+				hostLen -= bytesRead;
+			}
+		
+			DisposeTextToUnicodeInfo ( &converterInfo );
+
+		} catch ( ... ) {
+
+			DisposeTextToUnicodeInfo ( &converterInfo );
+			throw;
+
+		}
+	
+	}	// MacEncodingToUTF8
+
+#elif XMP_UNIXBuild
+
+	// ! Does not exist, must not be called, for Generic UNIX builds.
+
+#endif
+
+// =================================================================================================
+// ReconcileUtils::LocalToUTF8
+// ===========================
+
+void ReconcileUtils::LocalToUTF8 ( const void * _localPtr, size_t localLen, std::string * utf8 )
+{
+	const XMP_Uns8* localPtr = (XMP_Uns8*)_localPtr;
+
+	utf8->erase();
+	
+	if ( ReconcileUtils::IsASCII ( localPtr, localLen ) ) {
+		utf8->assign ( (const char *)localPtr, localLen );
+		return;
+	} 
+	
+	#if XMP_WinBuild
+
+		WinEncodingToUTF8 ( CP_ACP, localPtr, localLen, utf8 );
+		
+	#elif XMP_MacBuild
+	
+		MacEncodingToUTF8 ( smSystemScript, kTextLanguageDontCare, localPtr, localLen, utf8 );
+
+	#elif XMP_UNIXBuild
+	
+		XMP_Throw ( "Generic UNIX does not have conversions between local and Unicode", kXMPErr_Unavailable );
+    
+    #elif XMP_iOSBuild
+    
+        IOSConvertEncoding(CFStringGetSystemEncoding(), kCFStringEncodingUTF8, localPtr, localLen, utf8);
+    
+	
+	#endif
+
+}	// ReconcileUtils::LocalToUTF8
+
+// =================================================================================================
+// ReconcileUtils::Latin1ToUTF8
+// ============================
+
+void ReconcileUtils::Latin1ToUTF8 ( const void * _latin1Ptr, size_t latin1Len, std::string * utf8 )
+{
+	const XMP_Uns8* latin1Ptr = (XMP_Uns8*)_latin1Ptr;
+	const XMP_Uns8* latin1End = latin1Ptr + latin1Len;
+
+	utf8->erase();
+	utf8->reserve ( latin1Len );	// As good a guess as any, exact for ASCII.
+	
+	for ( ; latin1Ptr < latin1End; ++latin1Ptr ) {
+
+		XMP_Uns8 ch8 = *latin1Ptr;
+		
+		if ( ch8 <= 0x7F ) {
+			(*utf8) += (char)ch8;	// Have an ASCII character.
+		} else if ( ch8 <= 0xBF ) {
+			(*utf8) += 0xC2;	// Latin-1 80..BF are UTF-8 C280..C2BF.
+			(*utf8) += (char)ch8;
+		} else {
+			(*utf8) += 0xC3;	// Latin-1 C0..FF are UTF-8 C380..C3BF.
+			(*utf8) += (char)(ch8 - 0x40);
+		}
+	
+	}
+	
+}	// ReconcileUtils::Latin1ToUTF8
+
+
+// =================================================================================================
+// ReconcileUtils::NativeToUTF8
+// ============================
+
+void ReconcileUtils::NativeToUTF8( const std::string & input, std::string & output )
+{
+	output.erase();
+	// IF it is not UTF-8 
+	if( ! ReconcileUtils::IsUTF8( input.c_str(), input.length() ) )
+	{	
+		// And ServerMode is not active
+		if( ! ignoreLocalText )
+		{
+			// Convert it to UTF-8
+			ReconcileUtils::LocalToUTF8( input.c_str(), input.length(), &output );
+		}
+	}
+	else // If it is already UTF-8
+	{
+		output = input;
+	}
+}	// ReconcileUtils::NativeToUTF8
+
+
+#if XMP_iOSBuild
+    void ReconcileUtils::IOSConvertEncoding(XMP_Uns32 srcEncoding, XMP_Uns32 destEncoding, const XMP_Uns8 * inputPtr, size_t inputLen, std::string * output)
+    {
+        if(srcEncoding == kCFStringEncodingInvalidId || destEncoding == kCFStringEncodingInvalidId ||
+                !CFStringIsEncodingAvailable(srcEncoding) || !CFStringIsEncodingAvailable(destEncoding))
+            return;
+        CFStringRef cStrRef = CFStringCreateWithBytesNoCopy(NULL, inputPtr, inputLen, srcEncoding, false, kCFAllocatorNull);
+        if(cStrRef == NULL)
+            return;
+        CFRange inputRange = CFRangeMake(0, CFStringGetLength(cStrRef));
+        const size_t kBufferLen = 1000;
+        while(inputRange.length > 0)
+        {
+            XMP_Uns8 buffer[kBufferLen];
+            CFIndex charsWritten;
+            CFIndex charsProcessed = CFStringGetBytes(cStrRef, inputRange, destEncoding, 0, FALSE, buffer, kBufferLen, &charsWritten);
+            if (charsProcessed == 0) break;
+            output->append(reinterpret_cast<const char*>(&buffer[0]), charsWritten);
+            inputRange.location += charsProcessed;
+            inputRange.length -= charsProcessed;
+        }
+        CFRelease(cStrRef);
+    }
+#endif
diff --git a/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp b/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp
new file mode 100644
index 0000000..6fc357d
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp
@@ -0,0 +1,106 @@
+#ifndef __Reconcile_Impl_hpp__
+#define __Reconcile_Impl_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "XMPFiles/source/FormatSupport/ReconcileLegacy.hpp"
+#include "third-party/zuid/interfaces/MD5.h"
+
+// =================================================================================================
+/// \file Reconcile_Impl.hpp
+/// \brief Implementation utilities for the legacy metadata reconciliation support.
+///
+// =================================================================================================
+
+typedef XMP_Uns8 MD5_Digest[16];	// ! Should be in MD5.h.
+
+enum {
+	kDigestMissing = -1,	// A partial import is done, existing XMP is left alone.
+	kDigestDiffers =  0,	// A full import is done, existing XMP is deleted or replaced.
+	kDigestMatches = +1		// No importing is done.
+};
+
+namespace ReconcileUtils {
+
+	// *** These ought to be with the Unicode conversions.
+
+	extern const char * kHexDigits;
+
+	bool IsASCII      ( const void * _textPtr, size_t textLen );
+	bool IsUTF8       ( const void * _textPtr, size_t textLen );
+
+	void UTF8ToLocal  ( const void * _utf8Ptr, size_t utf8Len, std::string * local );
+	void UTF8ToLatin1 ( const void * _utf8Ptr, size_t utf8Len, std::string * latin1 );
+	void LocalToUTF8  ( const void * _localPtr, size_t localLen, std::string * utf8 );
+	void Latin1ToUTF8 ( const void * _latin1Ptr, size_t latin1Len, std::string * utf8 );
+	
+	// 
+	// Checks if the input string is UTF-8 encoded. If not, it tries to convert it to UTF-8
+	// This is only done, if Server Mode is not active!
+	// @param input the native input string
+	// @return The input if it is already UTF-8, the converted input 
+	//			or an empty string if no conversion is possible because of ServerMode
+	//
+	void NativeToUTF8 ( const std::string & input, std::string & output );
+
+	#if XMP_WinBuild
+		void UTF8ToWinEncoding ( UINT codePage, const XMP_Uns8 * utf8Ptr, size_t utf8Len, std::string * host );
+		void WinEncodingToUTF8 ( UINT codePage, const XMP_Uns8 * hostPtr, size_t hostLen, std::string * utf8 );
+	#elif XMP_MacBuild
+		void UTF8ToMacEncoding ( XMP_Uns16 macScript, XMP_Uns16 macLang, const XMP_Uns8 * utf8Ptr, size_t utf8Len, std::string * host );
+		void MacEncodingToUTF8 ( XMP_Uns16 macScript, XMP_Uns16 macLang, const XMP_Uns8 * hostPtr, size_t hostLen, std::string * utf8 );
+    #elif XMP_iOSBuild
+        void IOSConvertEncoding(XMP_Uns32 srcEncoding, XMP_Uns32 destEncoding, const XMP_Uns8 * inputPtr, size_t inputLen, std::string * output);
+	#endif
+
+};	// ReconcileUtils
+
+namespace PhotoDataUtils {
+
+	int CheckIPTCDigest ( const void * newPtr, const XMP_Uns32 newLen, const void * oldDigest );
+	void SetIPTCDigest  ( void * iptcPtr, XMP_Uns32 iptcLen, PSIR_Manager * psir );
+
+	bool GetNativeInfo ( const TIFF_Manager & exif, XMP_Uns8 ifd, XMP_Uns16 id, TIFF_Manager::TagInfo * info );
+	size_t GetNativeInfo ( const IPTC_Manager & iptc, XMP_Uns8 id, int digestState,
+						   bool haveXMP, IPTC_Manager::DataSetInfo * info );
+	
+	bool IsValueDifferent ( const TIFF_Manager::TagInfo & exifInfo,
+							const std::string & xmpValue, std::string * exifValue );
+	bool IsValueDifferent ( const IPTC_Manager & newIPTC, const IPTC_Manager & oldIPTC, XMP_Uns8 id );
+
+	void ImportPSIR ( const PSIR_Manager & psir, SXMPMeta * xmp, int iptcDigestState );
+
+	void Import2WayIPTC ( const IPTC_Manager & iptc, SXMPMeta * xmp, int iptcDigestState );
+	void Import2WayExif ( const TIFF_Manager & exif, SXMPMeta * xmp, int iptcDigestState );
+
+	void Import3WayItems ( const TIFF_Manager & exif, const IPTC_Manager & iptc, SXMPMeta * xmp, int iptcDigestState );
+
+	void ExportPSIR ( const SXMPMeta & xmp, PSIR_Manager * psir );
+	void ExportIPTC ( const SXMPMeta & xmp, IPTC_Manager * iptc );
+	void ExportExif ( SXMPMeta * xmp, TIFF_Manager * exif );
+	
+	// These need to be exposed for use in Import3WayItem:
+
+	void ImportIPTC_Simple ( const IPTC_Manager & iptc, SXMPMeta * xmp,
+							 XMP_Uns8 id, const char * xmpNS, const char * xmpProp );
+	
+	void ImportIPTC_LangAlt ( const IPTC_Manager & iptc, SXMPMeta * xmp,
+							  XMP_Uns8 id, const char * xmpNS, const char * xmpProp );
+	
+	void ImportIPTC_Array ( const IPTC_Manager & iptc, SXMPMeta * xmp,
+							XMP_Uns8 id, const char * xmpNS, const char * xmpProp );
+	
+	void ImportIPTC_Date ( XMP_Uns8 dateID, const IPTC_Manager & iptc, SXMPMeta * xmp );
+
+};	// PhotoDataUtils
+
+#endif	// __Reconcile_Impl_hpp__
diff --git a/XMPFiles/source/FormatSupport/SWF_Support.cpp b/XMPFiles/source/FormatSupport/SWF_Support.cpp
new file mode 100644
index 0000000..5ff80f1
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/SWF_Support.cpp
@@ -0,0 +1,484 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FormatSupport/SWF_Support.hpp"
+
+#include "third-party/zlib/zlib.h"
+
+// =================================================================================================
+
+XMP_Uns32 SWF_IO::FileHeaderSize ( XMP_Uns8 rectBits ) {
+
+	// Return the full size of the SWF header, adding the fixed size to the variable RECT size.
+	
+	XMP_Uns8 bitsPerField = rectBits >> 3;
+	XMP_Uns32 rectBytes = ((5 + (4 * bitsPerField)) / 8) + 1;
+	
+	return SWF_IO::HeaderFixedSize + rectBytes;
+
+}	// SWF_IO::FileHeaderSize
+
+// =================================================================================================
+
+bool SWF_IO::GetTagInfo ( const RawDataBlock & swfStream, XMP_Uns32 tagOffset, SWF_IO::TagInfo * info ) {
+
+	if ( tagOffset >= swfStream.size() ) return false;
+	XMP_Uns32 spaceLeft = swfStream.size() - tagOffset;
+	XMP_Uns8 headerSize = 2;
+	if ( spaceLeft < headerSize ) return false;	// The minimum empty tag is a 2 byte header.
+	
+	XMP_Uns16 tagHeader = GetUns16LE ( &swfStream[tagOffset] );
+
+	info->tagID = tagHeader >> 6;
+	info->tagOffset = tagOffset;
+	info->contentLength = tagHeader & SWF_IO::TagLengthMask;
+	
+	if ( info->contentLength != SWF_IO::TagLengthMask ) {
+		info->hasLongHeader = false;
+	} else {
+		headerSize = 6;
+		if ( spaceLeft < headerSize ) return false;	// Make sure there is room for the extended length.
+		info->contentLength = GetUns32LE ( &swfStream[tagOffset+2] );
+		info->hasLongHeader = true;
+	}
+	
+	if ( (spaceLeft - headerSize) < info->contentLength ) return false;
+	
+	return true;
+
+}	// SWF_IO::GetTagInfo
+
+// =================================================================================================
+
+static inline XMP_Uns32 TagHeaderSize ( const SWF_IO::TagInfo & info ) {
+
+	XMP_Uns8 headerSize = 2;
+	if ( info.hasLongHeader ) headerSize = 6;
+	return headerSize;
+
+}	// TagHeaderSize
+
+// =================================================================================================
+
+XMP_Uns32 SWF_IO::FullTagLength ( const SWF_IO::TagInfo & info ) {
+	
+	return TagHeaderSize ( info ) + info.contentLength;
+
+}	// SWF_IO::FullTagLength
+
+// =================================================================================================
+
+XMP_Uns32 SWF_IO::ContentOffset ( const SWF_IO::TagInfo & info ) {
+
+	return info.tagOffset + TagHeaderSize ( info );
+
+}	// SWF_IO::ContentOffset
+
+// =================================================================================================
+
+XMP_Uns32 SWF_IO::NextTagOffset ( const SWF_IO::TagInfo & info ) {
+	
+	return info.tagOffset + FullTagLength ( info );
+
+}	// SWF_IO::NextTagOffset
+
+// =================================================================================================
+
+static inline void AppendData ( RawDataBlock * dataOut, XMP_Uns8 * buffer, size_t count ) {
+
+	size_t prevSize = dataOut->size();	// ! Don't save a pointer, there might be a reallocation.
+	dataOut->insert ( dataOut->end(), count, 0 );	// Add space to the RawDataBlock.
+	memcpy ( &((*dataOut)[prevSize]), buffer, count );
+
+}	// AppendData
+
+// =================================================================================================
+
+XMP_Int64 SWF_IO::DecompressFileToMemory ( XMP_IO * fileIn, RawDataBlock * dataOut ) {
+
+	fileIn->Rewind();
+	dataOut->clear();
+	
+	static const size_t bufferSize = 64*1024;
+	XMP_Uns8 bufferIn  [ bufferSize ];
+	XMP_Uns8 bufferOut [ bufferSize ];
+
+	int err;
+	z_stream zipState;
+	memset ( &zipState, 0, sizeof(zipState) );
+	err = inflateInit ( &zipState );
+	XMP_Enforce ( err == Z_OK );
+	
+	XMP_Int32 ioCount;
+	XMP_Int64 offsetIn;
+	const XMP_Int64 lengthIn = fileIn->Length();
+	XMP_Enforce ( ((XMP_Int64)SWF_IO::HeaderPrefixSize <= lengthIn) && (lengthIn <= SWF_IO::MaxExpandedSize) );
+	
+	// Set the uncompressed part of the header. Save the expanded size from the file.
+	
+	fileIn->ReadAll ( bufferIn, SWF_IO::HeaderPrefixSize );
+	offsetIn = SWF_IO::HeaderPrefixSize;
+	XMP_Uns32 expectedFullSize = GetUns32LE ( &bufferIn[4] );
+
+	AppendData ( dataOut, bufferIn, SWF_IO::HeaderPrefixSize );	// Copy the compressed stream's prefix.
+	PutUns32LE ( SWF_IO::ExpandedSignature, &(*dataOut)[0] );	// Change the signature.
+	(*dataOut)[3] = bufferIn[3];	// Keep the SWF version.
+	
+	// Read the input file, feed it to the decompression engine, writing as needed.
+
+	zipState.next_out  = &bufferOut[0];	// Initial output conditions. Must be set before the input loop!
+	zipState.avail_out = bufferSize;
+	
+	while ( offsetIn < lengthIn ) {
+	
+		// Read the next chunk of input.
+		ioCount = fileIn->Read ( bufferIn, bufferSize );
+		XMP_Enforce ( ioCount > 0 );
+		offsetIn += ioCount;
+		zipState.next_in  = &bufferIn[0];
+		zipState.avail_in = ioCount;
+		
+		// Process all of this input, writing as needed.
+		
+		err = Z_OK;
+		while ( (zipState.avail_in > 0) && (err == Z_OK) ) {
+
+			XMP_Assert ( zipState.avail_out > 0 );	// Sanity check for output buffer space.
+			err = inflate ( &zipState, Z_NO_FLUSH );
+			XMP_Enforce ( (err == Z_OK) || (err == Z_STREAM_END) );
+
+			if ( zipState.avail_out == 0 ) {
+				AppendData ( dataOut, bufferOut, bufferSize );
+				zipState.next_out  = &bufferOut[0];
+				zipState.avail_out = bufferSize;
+			}
+
+		}
+	
+	}
+	
+	// Finish the decompression and write the final output.
+
+	do {
+
+		ioCount = bufferSize - zipState.avail_out;	// Make sure there is room for inflate to do more.
+		if ( ioCount > 0 ) {
+			AppendData ( dataOut, bufferOut, ioCount );
+			zipState.next_out  = &bufferOut[0];
+			zipState.avail_out = bufferSize;
+		}
+
+		err = inflate ( &zipState, Z_NO_FLUSH );
+		XMP_Enforce ( (err == Z_OK) || (err == Z_STREAM_END) || (err == Z_BUF_ERROR) );
+
+	} while ( err == Z_OK );
+
+	ioCount = bufferSize - zipState.avail_out;	// Write any final output.
+	if ( ioCount > 0 ) {
+		AppendData ( dataOut, bufferOut, ioCount );
+		zipState.next_out  = &bufferOut[0];
+		zipState.avail_out = bufferSize;
+	}
+
+	// Done. Make sure the file header has the true decompressed size.
+	
+	XMP_Int64 lengthOut = zipState.total_out + SWF_IO::HeaderPrefixSize;
+	if ( lengthOut != expectedFullSize ) PutUns32LE ( (XMP_Uns32)lengthOut, &((*dataOut)[4]) );
+	inflateEnd ( &zipState );
+	return lengthOut;
+	
+}	// SWF_IO::DecompressFileToMemory
+
+// =================================================================================================
+
+XMP_Int64 SWF_IO::CompressMemoryToFile ( const RawDataBlock & dataIn, XMP_IO*  fileOut ) {
+
+	fileOut->Rewind();
+	fileOut->Truncate ( 0 );
+	
+	static const size_t bufferSize = 64*1024;
+	XMP_Uns8 bufferOut [ bufferSize ];
+
+	int err;
+	z_stream zipState;
+	memset ( &zipState, 0, sizeof(zipState) );
+	err = deflateInit ( &zipState, Z_DEFAULT_COMPRESSION );
+	XMP_Enforce ( err == Z_OK );
+	
+	XMP_Int32 ioCount;
+	const size_t lengthIn = dataIn.size();
+	XMP_Enforce ( SWF_IO::HeaderPrefixSize <= lengthIn );
+	
+	// Write the uncompressed part of the file header.
+	
+	PutUns32LE ( SWF_IO::CompressedSignature, &bufferOut[0] );
+	bufferOut[3] = dataIn[3];	// Copy the SWF version.
+	PutUns32LE ( lengthIn, &bufferOut[4] );
+	fileOut->Write ( bufferOut, SWF_IO::HeaderPrefixSize );
+	
+	// Feed the input to the compression engine in one step, write the output as available.
+
+	zipState.next_in   = (Bytef*)&dataIn[SWF_IO::HeaderPrefixSize];
+	zipState.avail_in  = lengthIn - SWF_IO::HeaderPrefixSize;
+	zipState.next_out  = &bufferOut[0];
+	zipState.avail_out = bufferSize;
+	
+	while ( zipState.avail_in > 0 ) {
+
+		XMP_Assert ( zipState.avail_out > 0 );	// Sanity check for output buffer space.
+		err = deflate ( &zipState, Z_NO_FLUSH );
+		XMP_Enforce ( err == Z_OK );
+
+		if ( zipState.avail_out == 0 ) {
+			fileOut->Write ( bufferOut, bufferSize );
+			zipState.next_out  = &bufferOut[0];
+			zipState.avail_out = bufferSize;
+		}
+
+	}
+	
+	// Finish the compression and write the final output.
+
+	do {
+
+		err = deflate ( &zipState, Z_FINISH );
+		XMP_Enforce ( (err == Z_OK) || (err == Z_STREAM_END) );
+		ioCount = bufferSize - zipState.avail_out;	// See if there is output to write.
+
+		if ( ioCount > 0 ) {
+			fileOut->Write ( bufferOut, ioCount );
+			zipState.next_out  = &bufferOut[0];
+			zipState.avail_out = bufferSize;
+		}
+
+	} while ( err != Z_STREAM_END );
+
+	// Done.
+	
+	XMP_Int64 lengthOut = zipState.total_out;
+	deflateEnd ( &zipState );
+	return lengthOut;
+	
+}	// SWF_IO::CompressMemoryToFile
+
+// =================================================================================================
+
+#if 0	// ! Not used, but save it for later transfer to a general ZIP utility file.
+
+XMP_Int64 SWF_IO::DecompressFileToFile ( XMP_IO * fileIn, XMP_IO * fileOut ) {
+
+	fileIn->Rewind();
+	fileOut->Rewind();
+	fileOut->Truncate ( 0 );
+	
+	static const size_t bufferSize = 64*1024;
+	XMP_Uns8 bufferIn  [ bufferSize ];
+	XMP_Uns8 bufferOut [ bufferSize ];
+
+	int err;
+	z_stream zipState;
+	memset ( zipState, 0, sizeof(zipState) );
+	err = inflateInit ( &zipState );
+	XMP_Enforce ( err == Z_OK );
+	
+	XMP_Int32 ioCount;
+	XMP_Int64 offsetIn;
+	const XMP_Int64 lengthIn = fileIn->Length();
+	XMP_Enforce ( (lengthIn >= SWF_IO::HeaderPrefixSize) && (lengthIn <= SWF_IO::MaxExpandedSize) );
+	
+	// Copy the uncompressed part of the file header. Save the expanded size from the header.
+	
+	fileIn->ReadAll ( bufferIn, SWF_IO::HeaderPrefixSize );
+	fileOut.Write ( bufferIn, SWF_IO::HeaderPrefixSize );
+	offsetIn = SWF_IO::HeaderPrefixSize;
+	
+	XMP_Uns32 expectedFullSize = GetUns32LE ( &bufferIn[4] );
+	
+	// Read the input file, feed it to the decompression engine, writing as needed.
+
+	zipState.next_out  = &bufferOut[0];	// Initial output conditions. Must be set before the input loop!
+	zipState.avail_out = bufferSize;
+	
+	while ( offsetIn < lengthIn ) {
+	
+		// Read the next chunk of input.
+		ioCount = fileIn->Read ( bufferIn, bufferSize );
+		XMP_Enforce ( ioCount > 0 );
+		offsetIn += ioCount;
+		zipState.next_in  = &bufferIn[0];
+		zipState.avail_in = ioCount;
+		
+		// Process all of this input, writing as needed.
+		
+		err = Z_OK;
+		while ( (zipState.avail_in > 0) && (err == Z_OK) ) {
+
+			XMP_Assert ( zipState.avail_out > 0 );	// Sanity check for output buffer space.
+			err = inflate ( &zipState, Z_NO_FLUSH );
+			XMP_Enforce ( (err == Z_OK) || (err == Z_STREAM_END) );
+
+			if ( zipState.avail_out == 0 ) {
+				fileOut->write ( bufferOut, bufferSize );
+				zipState.next_out  = &bufferOut[0];
+				zipState.avail_out = bufferSize;
+			}
+
+		}
+	
+	}
+	
+	// Finish the decompression and write the final output.
+
+	do {
+
+		ioCount = bufferSize - zipState.avail_out;	// Make sure there is room for inflate.
+		if ( ioCount > 0 ) {
+			fileOut->write ( bufferOut, ioCount );
+			zipState.next_out  = &bufferOut[0];
+			zipState.avail_out = bufferSize;
+		}
+
+		err = inflate ( &zipState, Z_NO_FLUSH );
+		XMP_Enforce ( (err == Z_OK) || (err == Z_STREAM_END) || (err == Z_BUF_ERROR) );
+		ioCount = bufferSize - zipState.avail_out;	// See if there is output to write.
+		if ( ioCount > 0 ) {
+			fileOut->write ( bufferOut, ioCount );
+			zipState.next_out  = &bufferOut[0];
+			zipState.avail_out = bufferSize;
+		}
+
+	} while ( err == Z_OK );
+
+	ioCount = bufferSize - zipState.avail_out;	// Write any final output.
+	if ( ioCount > 0 ) {
+		fileOut->write ( bufferOut, ioCount );
+		zipState.next_out  = &bufferOut[0];
+		zipState.avail_out = bufferSize;
+	}
+
+	// Done. Make sure the file header has the true decompressed size.
+	
+	XMP_Int64 lengthOut = zipState.total_out;
+	
+	if ( lengthOut != expectedFullSize ) {
+		PutUns32LE ( &bufferOut[0], lengthOut );
+		fileOut->Seek ( 4, kXMP_SeekFromStart );
+		fileOut.Write ( &bufferOut[0], 4 );
+		fileOut->Seek ( 0, kXMP_SeekFromEnd );
+	}
+
+	inflateEnd ( &zipState );
+	return lengthOut;
+	
+}	// SWF_IO::DecompressFileToFile
+
+#endif
+
+// =================================================================================================
+
+#if 0	// ! Not used, but save it for later transfer to a general ZIP utility file.
+
+XMP_Int64 SWF_IO::CompressFileToFile ( XMP_IO * fileIn, XMP_IO * fileOut ) {
+
+	fileIn->Rewind();
+	fileOut->Rewind();
+	fileOut->Truncate ( 0 );
+	
+	static const size_t bufferSize = 64*1024;
+	XMP_Uns8 bufferIn  [ bufferSize ];
+	XMP_Uns8 bufferOut [ bufferSize ];
+
+	int err;
+	z_stream zipState;
+	memset ( zipState, 0, sizeof(zipState) );
+	err = deflateInit ( &zipState, Z_DEFAULT_COMPRESSION );
+	XMP_Enforce ( err == Z_OK );
+	
+	XMP_Int32 ioCount;
+	XMP_Int64 offsetIn;
+	const XMP_Int64 lengthIn = fileIn->Length();
+	XMP_Enforce ( (lengthIn >= SWF_IO::HeaderPrefixSize) && (lengthIn <= SWF_IO::MaxExpandedSize) );
+	
+	// Write the uncompressed part of the file header.
+	
+	fileIn->ReadAll ( bufferIn, SWF_IO::HeaderPrefixSize );
+	offsetIn = SWF_IO::HeaderPrefixSize;
+	
+	PutUns32LE ( SWF_IO::CompressedSignature, &bufferOut[0] );
+	bufferOut[3] = bufferIn[3];	// Copy the SWF version.
+	PutUns32LE ( &bufferOut[4], lengthIn );
+	fileOut.Write ( bufferOut, SWF_IO::HeaderPrefixSize );
+	
+	// Read the input file, feed it to the compression engine, writing as needed.
+
+	zipState.next_out  = &bufferOut[0];	// Initial output conditions. Must be set before the input loop!
+	zipState.avail_out = bufferSize;
+	
+	while ( offsetIn < lengthIn ) {
+	
+		// Read the next chunk of input.
+		ioCount = fileIn->Read ( bufferIn, bufferSize );
+		XMP_Enforce ( ioCount > 0 );
+		offsetIn += ioCount;
+		zipState.next_in  = &bufferIn[0];
+		zipState.avail_in = ioCount;
+		
+		// Process all of this input, writing as needed. Yes, we need a loop. Compression means less
+		// output than input, but a previous read has probably left partial compression results.
+		
+		while ( zipState.avail_in > 0 ) {
+
+			XMP_Assert ( zipState.avail_out > 0 );	// Sanity check for output buffer space.
+			err = deflate ( &zipState, Z_NO_FLUSH );
+			XMP_Enforce ( err == Z_OK );
+
+			if ( zipState.avail_out == 0 ) {
+				fileOut->write ( bufferOut, bufferSize );
+				zipState.next_out  = &bufferOut[0];
+				zipState.avail_out = bufferSize;
+			}
+
+		}
+	
+	}
+	
+	// Finish the compression and write the final output.
+
+	do {
+
+		err = deflate ( &zipState, Z_FINISH );
+		XMP_Enforce ( (err == Z_OK) || (err == Z_STREAM_END) );
+		ioCount = bufferSize - zipState.avail_out;	// See if there is output to write.
+
+		if ( ioCount > 0 ) {
+			fileOut->write ( bufferOut, ioCount );
+			zipState.next_out  = &bufferOut[0];
+			zipState.avail_out = bufferSize;
+		}
+
+	} while ( err != Z_STREAM_END );
+
+	// Done.
+	
+	XMP_Int64 lengthOut = zipState.total_out;
+	deflateEnd ( &zipState );
+	return lengthOut;
+	
+}	// SWF_IO::CompressFileToFile
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/SWF_Support.hpp b/XMPFiles/source/FormatSupport/SWF_Support.hpp
new file mode 100644
index 0000000..731d64e
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/SWF_Support.hpp
@@ -0,0 +1,86 @@
+#ifndef __SWF_Support_hpp__
+#define __SWF_Support_hpp__ 1
+
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "third-party/zlib/zlib.h"
+
+// =================================================================================================
+
+namespace SWF_IO {
+
+	const XMP_Int64 MaxExpandedSize	= 0xFFFFFFFFUL;	// The file header has a UInt32 expanded size field.
+	
+	const size_t HeaderPrefixSize	= 8;	// The uncompressed first part of the file header.
+	const size_t HeaderFixedSize	= 12;	// The fixed size part of the file header, omits the RECT.
+
+	const XMP_Uns32 CompressedSignature	= 0x00535743;	// The low 3 bytes are "SWC".
+	const XMP_Uns32 ExpandedSignature	= 0x00535746;	// The low 3 bytes are "SWF".
+		// Note: Can't use char* here, it causes duplicate symbols with xcode.
+	
+	const XMP_Uns16 FileAttributesTagID	= 69;
+	const XMP_Uns16 MetadataTagID		= 77;
+	
+	const XMP_Uns8 TagLengthMask	= 0x3F;
+	const XMP_Uns8 HasMetadataMask	= 0x10;
+
+	// A SWF file begins with a variable length header. The header layout is:
+	//
+	//	UInt8[3] - "FWS" for uncompressed SWF and "CWS" for compressed SWF
+	//	UInt8 - SWF format version
+	//	UInt32 - Length of uncompressed file, little endian
+	//	RECT - packed bit RECT structure
+	//	UInt16 - frame rate, little endian, really 8.8 fixed point
+	//	UInt16 - frame count, little endian
+	//
+	// If the first 4 bytes are read as a little endian UInt32 they become "vSWC" and "vSWF", where
+	// the "v" byte is the version format version.
+	//
+	// SWF compression starts 8 bytes into the file, after the length field in the header.
+	// The length in the header is everything. If compressed this is 8 plus the decompressed size.
+	//
+	// Following the header is a sequence of tags. Each tag begins with a little endian UInt16 whose
+	// upper 10 bits are the tag ID and lower 6 bits are a length for the content. If this length is
+	// 63 (0x3F) then a little endian Int32 follows with the content length.
+	//
+	// The FileAttributes tag, #69, has a flag byte and 3 reserved bytes following the header. There
+	// is only 1 flag bit that we care about, HasMetadata with the mask 0x10.
+	//
+	// The Metadata tag, #77, has content that is the UTF-8 XMP, preferably as small as possible.
+
+	XMP_Uns32 FileHeaderSize ( XMP_Uns8 rectBits );
+	
+	class TagInfo {
+	public:
+		bool hasLongHeader;
+		XMP_Uns16 tagID;
+		XMP_Uns32 tagOffset, contentLength;
+		TagInfo() : hasLongHeader(false), tagID(0), tagOffset(0), contentLength(0) {};
+		~TagInfo() {};
+	};
+
+	bool GetTagInfo ( const RawDataBlock & swfStream, XMP_Uns32 tagOffset, TagInfo * info );
+	XMP_Uns32 FullTagLength ( const TagInfo & info );
+	XMP_Uns32 ContentOffset ( const TagInfo & info );
+	XMP_Uns32 NextTagOffset ( const TagInfo & info );
+	
+	XMP_Int64 DecompressFileToMemory ( XMP_IO * fileIn, RawDataBlock * dataOut );
+	XMP_Int64 CompressMemoryToFile ( const RawDataBlock & dataIn, XMP_IO*  fileOut );
+	
+};	// SWF_IO
+
+#endif	// __SWF_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
new file mode 100644
index 0000000..da4d260
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
@@ -0,0 +1,2034 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+
+#include "source/XIO.hpp"
+
+#include "source/EndianUtils.hpp"
+
+// =================================================================================================
+/// \file TIFF_FileWriter.cpp
+/// \brief TIFF_FileWriter is used for memory-based read-write access and all file-based access.
+///
+/// \c TIFF_FileWriter is used for memory-based read-write access and all file-based access. The
+/// main internal data structure is the InternalTagMap, a std::map that uses the tag number as the
+/// key and InternalTagInfo as the value. There are 5 of these maps, one for each of the recognized
+/// IFDs. The maps contain an entry for each tag in the IFD, whether we capture the data or not. The
+/// dataPtr and dataLen fields in the InternalTagInfo are zero if the tag is not captured.
+// =================================================================================================
+
+// =================================================================================================
+// TIFF_FileWriter::TIFF_FileWriter
+// ================================
+//
+// Set big endian Get/Put routines so that routines are in place for creating TIFF without a parse.
+// Parsing will reset them to the proper endianness for the stream. Big endian is a good default
+// since JPEG and PSD files are big endian overall.
+
+TIFF_FileWriter::TIFF_FileWriter() : changed(false), legacyDeleted(false), memParsed(false),
+									 fileParsed(false), ownedStream(false), memStream(0), tiffLength(0)
+{
+
+	XMP_Uns8 bogusTIFF [kEmptyTIFFLength];
+
+	bogusTIFF[0] = 0x4D;
+	bogusTIFF[1] = 0x4D;
+	bogusTIFF[2] = 0x00;
+	bogusTIFF[3] = 0x2A;
+	bogusTIFF[4] = bogusTIFF[5] = bogusTIFF[6] = bogusTIFF[7] = 0x00;
+
+	(void) this->CheckTIFFHeader ( bogusTIFF, sizeof ( bogusTIFF ) );
+
+}	// TIFF_FileWriter::TIFF_FileWriter
+
+// =================================================================================================
+// TIFF_FileWriter::~TIFF_FileWriter
+// =================================
+
+TIFF_FileWriter::~TIFF_FileWriter()
+{
+	XMP_Assert ( ! (this->memParsed && this->fileParsed) );
+
+	if ( this->ownedStream ) {
+		XMP_Assert ( this->memStream != 0 );
+		free ( this->memStream );
+	}
+
+}	// TIFF_FileWriter::~TIFF_FileWriter
+
+// =================================================================================================
+// TIFF_FileWriter::DeleteExistingInfo
+// ===================================
+
+void TIFF_FileWriter::DeleteExistingInfo()
+{
+	XMP_Assert ( ! (this->memParsed && this->fileParsed) );
+
+	if ( this->ownedStream ) free ( this->memStream );	// ! Current TIFF might be memory-parsed.
+	this->memStream = 0;
+	this->tiffLength = 0;
+
+	for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) this->containedIFDs[ifd].clear();
+
+	this->changed = false;
+	this->legacyDeleted = false;
+	this->memParsed = false;
+	this->fileParsed = false;
+	this->ownedStream = false;
+
+}	// TIFF_FileWriter::DeleteExistingInfo
+
+// =================================================================================================
+// TIFF_FileWriter::PickIFD
+// ========================
+
+XMP_Uns8 TIFF_FileWriter::PickIFD ( XMP_Uns8 ifd, XMP_Uns16 id )
+{
+	if ( ifd > kTIFF_LastRealIFD ) {
+		if ( ifd != kTIFF_KnownIFD ) XMP_Throw ( "Invalid IFD number", kXMPErr_BadParam );
+		XMP_Throw ( "kTIFF_KnownIFD not yet implemented", kXMPErr_Unimplemented );
+		// *** Likely to stay unimplemented until there is a client need.
+	}
+
+	return ifd;
+
+}	// TIFF_FileWriter::PickIFD
+
+// =================================================================================================
+// TIFF_FileWriter::FindTagInIFD
+// =============================
+
+const TIFF_FileWriter::InternalTagInfo* TIFF_FileWriter::FindTagInIFD ( XMP_Uns8 ifd, XMP_Uns16 id ) const
+{
+	ifd = PickIFD ( ifd, id );
+	const InternalTagMap& currIFD = this->containedIFDs[ifd].tagMap;
+
+	InternalTagMap::const_iterator tagPos = currIFD.find ( id );
+	if ( tagPos == currIFD.end() ) return 0;
+	return &tagPos->second;
+
+}	// TIFF_FileWriter::FindTagInIFD
+
+// =================================================================================================
+// TIFF_FileWriter::GetIFD
+// =======================
+
+bool TIFF_FileWriter::GetIFD ( XMP_Uns8 ifd, TagInfoMap* ifdMap ) const
+{
+	if ( ifd > kTIFF_LastRealIFD ) XMP_Throw ( "Invalid IFD number", kXMPErr_BadParam );
+	const InternalTagMap& currIFD = this->containedIFDs[ifd].tagMap;
+
+	InternalTagMap::const_iterator tagPos = currIFD.begin();
+	InternalTagMap::const_iterator tagEnd = currIFD.end();
+
+	if ( ifdMap != 0 ) ifdMap->clear();
+	if ( tagPos == tagEnd ) return false;	// Empty IFD.
+
+	if ( ifdMap != 0 ) {
+		for ( ; tagPos != tagEnd; ++tagPos ) {
+			const InternalTagInfo& intInfo = tagPos->second;
+			TagInfo extInfo ( intInfo.id, intInfo.type, intInfo.count, intInfo.dataPtr, intInfo.dataLen  );
+			(*ifdMap)[intInfo.id] = extInfo;
+		}
+	}
+
+	return true;
+
+}	// TIFF_FileWriter::GetIFD
+
+// =================================================================================================
+// TIFF_FileWriter::GetValueOffset
+// ===============================
+
+XMP_Uns32 TIFF_FileWriter::GetValueOffset ( XMP_Uns8 ifd, XMP_Uns16 id ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( (thisTag == 0) || (thisTag->origDataLen == 0) ) return 0;
+
+	return thisTag->origDataOffset;
+
+}	// TIFF_FileWriter::GetValueOffset
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag
+// =======================
+
+bool TIFF_FileWriter::GetTag ( XMP_Uns8 ifd, XMP_Uns16 id, TagInfo* info ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+
+	if ( info != 0 ) {
+
+		info->id = thisTag->id;
+		info->type = thisTag->type;
+		info->count = thisTag->dataLen / (XMP_Uns32)kTIFF_TypeSizes[thisTag->type];
+		info->dataLen = thisTag->dataLen;
+		info->dataPtr = (const void*)(thisTag->dataPtr);
+
+	}
+
+	return true;
+
+}	// TIFF_FileWriter::GetTag
+
+// =================================================================================================
+// TIFF_FileWriter::SetTag
+// =======================
+
+void TIFF_FileWriter::SetTag ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16 type, XMP_Uns32 count, const void* clientPtr )
+{
+	if ( (type < kTIFF_ByteType) || (type > kTIFF_LastType) ) XMP_Throw ( "Invalid TIFF tag type", kXMPErr_BadParam );
+	size_t typeSize = kTIFF_TypeSizes[type];
+	size_t fullSize = count * typeSize;
+
+	ifd = PickIFD ( ifd, id );
+	InternalTagMap& currIFD = this->containedIFDs[ifd].tagMap;
+
+	InternalTagInfo* tagPtr = 0;
+	InternalTagMap::iterator tagPos = currIFD.find ( id );
+
+	if ( tagPos == currIFD.end() ) {
+
+		// The tag does not yet exist, add it.
+		InternalTagMap::value_type mapValue ( id, InternalTagInfo ( id, type, count, this->fileParsed ) );
+		tagPos = currIFD.insert ( tagPos, mapValue );
+		tagPtr = &tagPos->second;
+
+	} else {
+
+		tagPtr = &tagPos->second;
+
+		// The tag already exists, make sure the value is actually changing.
+		if ( (type == tagPtr->type) && (count == tagPtr->count) &&
+			 (memcmp ( clientPtr, tagPtr->dataPtr, tagPtr->dataLen ) == 0) ) {
+			return;	// ! The value is unchanged, exit.
+		}
+
+		tagPtr->FreeData();	// Release any existing data allocation.
+
+		tagPtr->type  = type;	// These might be changing also.
+		tagPtr->count = count;
+
+	}
+
+	tagPtr->changed = true;
+	tagPtr->dataLen = (XMP_Uns32)fullSize;
+
+	if ( fullSize <= 4 ) {
+		// The data is less than 4 bytes, store it in the smallValue field using native endianness.
+		tagPtr->dataPtr = (XMP_Uns8*) &tagPtr->smallValue;
+	} else {
+		// The data is more than 4 bytes, make a copy.
+		tagPtr->dataPtr = (XMP_Uns8*) malloc ( fullSize );
+		if ( tagPtr->dataPtr == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+	}
+	memcpy ( tagPtr->dataPtr, clientPtr, fullSize );	// AUDIT: Safe, space guaranteed to be fullSize.
+
+	if ( ! this->nativeEndian ) {
+		if ( typeSize == 2 ) {
+			XMP_Uns16* flipPtr = (XMP_Uns16*) tagPtr->dataPtr;
+			for ( XMP_Uns32 i = 0; i < count; ++i ) Flip2 ( flipPtr[i] );
+		} else if ( typeSize == 4 ) {
+			XMP_Uns32* flipPtr = (XMP_Uns32*) tagPtr->dataPtr;
+			for ( XMP_Uns32 i = 0; i < count; ++i ) Flip4 ( flipPtr[i] );
+		} else if ( typeSize == 8 ) {
+			XMP_Uns64* flipPtr = (XMP_Uns64*) tagPtr->dataPtr;
+			for ( XMP_Uns32 i = 0; i < count; ++i ) Flip8 ( flipPtr[i] );
+		}
+	}
+
+	this->containedIFDs[ifd].changed = true;
+	this->changed = true;
+
+}	// TIFF_FileWriter::SetTag
+
+// =================================================================================================
+// TIFF_FileWriter::DeleteTag
+// ==========================
+
+void TIFF_FileWriter::DeleteTag ( XMP_Uns8 ifd, XMP_Uns16 id )
+{
+	ifd = PickIFD ( ifd, id );
+	InternalTagMap& currIFD = this->containedIFDs[ifd].tagMap;
+
+	InternalTagMap::iterator tagPos = currIFD.find ( id );
+	if ( tagPos == currIFD.end() ) return;	// ! Don't set the changed flags if the tag didn't exist.
+
+	currIFD.erase ( tagPos );
+	this->containedIFDs[ifd].changed = true;
+	this->changed = true;
+	if ( (ifd != kTIFF_PrimaryIFD) || (id != kTIFF_XMP) ) this->legacyDeleted = true;
+
+}	// TIFF_FileWriter::DeleteTag
+
+// =================================================================================================
+
+static inline XMP_Uns8 GetUns8 ( const void* dataPtr )
+{
+	return *((XMP_Uns8*)dataPtr);
+}
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_Integer
+// ===============================
+
+bool TIFF_FileWriter::GetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( thisTag->count != 1 ) return false;
+
+	XMP_Uns32 uns32;
+	XMP_Int32 int32;
+
+	switch ( thisTag->type ) {
+	
+		case kTIFF_ByteType:
+			uns32 = GetUns8 ( thisTag->dataPtr );
+			break;
+	
+		case kTIFF_ShortType:
+			uns32 = this->GetUns16 ( thisTag->dataPtr );
+			break;
+	
+		case kTIFF_LongType:
+			uns32 = this->GetUns32 ( thisTag->dataPtr );
+			break;
+	
+		case kTIFF_SByteType:
+			int32 = (XMP_Int8) GetUns8 ( thisTag->dataPtr );
+			uns32 = (XMP_Uns32) int32;	// Make sure sign bits are properly set.
+			break;
+	
+		case kTIFF_SShortType:
+			int32 = (XMP_Int16) this->GetUns16 ( thisTag->dataPtr );
+			uns32 = (XMP_Uns32) int32;	// Make sure sign bits are properly set.
+			break;
+	
+		case kTIFF_SLongType:
+			int32 = (XMP_Int32) this->GetUns32 ( thisTag->dataPtr );
+			uns32 = (XMP_Uns32) int32;	// Make sure sign bits are properly set.
+			break;
+	
+		default: return false;
+
+	}
+
+	if ( data != 0 ) *data = uns32;
+	return true;
+
+}	// TIFF_FileWriter::GetTag_Integer
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_Byte
+// ============================
+
+bool TIFF_FileWriter::GetTag_Byte ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns8* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_ByteType) || (thisTag->dataLen != 1) ) return false;
+
+	if ( data != 0 ) *data = *thisTag->dataPtr;
+	return true;
+
+}	// TIFF_FileWriter::GetTag_Byte
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_SByte
+// =============================
+
+bool TIFF_FileWriter::GetTag_SByte ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int8* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_SByteType) || (thisTag->dataLen != 1) ) return false;
+
+	if ( data != 0 ) *data = *thisTag->dataPtr;
+	return true;
+
+}	// TIFF_FileWriter::GetTag_SByte
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_Short
+// =============================
+
+bool TIFF_FileWriter::GetTag_Short ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_ShortType) || (thisTag->dataLen != 2) ) return false;
+
+	if ( data != 0 ) *data = this->GetUns16 ( thisTag->dataPtr );
+	return true;
+
+}	// TIFF_FileWriter::GetTag_Short
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_SShort
+// ==============================
+
+bool TIFF_FileWriter::GetTag_SShort ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int16* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_SShortType) || (thisTag->dataLen != 2) ) return false;
+
+	if ( data != 0 ) *data = (XMP_Int16) this->GetUns16 ( thisTag->dataPtr );
+	return true;
+
+}	// TIFF_FileWriter::GetTag_SShort
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_Long
+// ============================
+
+bool TIFF_FileWriter::GetTag_Long ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_LongType) || (thisTag->dataLen != 4) ) return false;
+
+	if ( data != 0 ) *data = this->GetUns32 ( thisTag->dataPtr );
+	return true;
+
+}	// TIFF_FileWriter::GetTag_Long
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_SLong
+// =============================
+
+bool TIFF_FileWriter::GetTag_SLong ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_SLongType) || (thisTag->dataLen != 4) ) return false;
+
+	if ( data != 0 ) *data = (XMP_Int32) this->GetUns32 ( thisTag->dataPtr );
+	return true;
+
+}	// TIFF_FileWriter::GetTag_SLong
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_Rational
+// ================================
+
+bool TIFF_FileWriter::GetTag_Rational ( XMP_Uns8 ifd, XMP_Uns16 id, Rational* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( (thisTag == 0) || (thisTag->dataPtr == 0) ) return false;
+	if ( (thisTag->type != kTIFF_RationalType) || (thisTag->dataLen != 8) ) return false;
+
+	if ( data != 0 ) {
+		XMP_Uns32* dataPtr = (XMP_Uns32*)thisTag->dataPtr;
+		data->num   = this->GetUns32 ( dataPtr );
+		data->denom = this->GetUns32 ( dataPtr+1 );
+	}
+
+	return true;
+
+}	// TIFF_FileWriter::GetTag_Rational
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_SRational
+// =================================
+
+bool TIFF_FileWriter::GetTag_SRational ( XMP_Uns8 ifd, XMP_Uns16 id, SRational* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( (thisTag == 0) || (thisTag->dataPtr == 0) ) return false;
+	if ( (thisTag->type != kTIFF_SRationalType) || (thisTag->dataLen != 8) ) return false;
+
+	if ( data != 0 ) {
+		XMP_Uns32* dataPtr = (XMP_Uns32*)thisTag->dataPtr;
+		data->num   = (XMP_Int32) this->GetUns32 ( dataPtr );
+		data->denom = (XMP_Int32) this->GetUns32 ( dataPtr+1 );
+	}
+
+	return true;
+
+}	// TIFF_FileWriter::GetTag_SRational
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_Float
+// =============================
+
+bool TIFF_FileWriter::GetTag_Float ( XMP_Uns8 ifd, XMP_Uns16 id, float* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_FloatType) || (thisTag->dataLen != 4) ) return false;
+
+	if ( data != 0 ) *data = this->GetFloat ( thisTag->dataPtr );
+	return true;
+
+}	// TIFF_FileWriter::GetTag_Float
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_Double
+// ==============================
+
+bool TIFF_FileWriter::GetTag_Double ( XMP_Uns8 ifd, XMP_Uns16 id, double* data ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( (thisTag == 0) || (thisTag->dataPtr == 0) ) return false;
+	if ( (thisTag->type != kTIFF_DoubleType) || (thisTag->dataLen != 8) ) return false;
+
+	if ( data != 0 ) *data = this->GetDouble ( thisTag->dataPtr );
+	return true;
+
+}	// TIFF_FileWriter::GetTag_Double
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_ASCII
+// =============================
+
+bool TIFF_FileWriter::GetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr* dataPtr, XMP_StringLen* dataLen ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->dataLen > 4) && (thisTag->dataPtr == 0) ) return false;
+	if ( thisTag->type != kTIFF_ASCIIType ) return false;
+
+	if ( dataPtr != 0 ) *dataPtr = (XMP_StringPtr)thisTag->dataPtr;
+	if ( dataLen != 0 ) *dataLen = thisTag->dataLen;
+
+	return true;
+
+}	// TIFF_FileWriter::GetTag_ASCII
+
+// =================================================================================================
+// TIFF_FileWriter::GetTag_EncodedString
+// =====================================
+
+bool TIFF_FileWriter::GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const
+{
+	const InternalTagInfo* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( thisTag->type != kTIFF_UndefinedType ) return false;
+
+	if ( utf8Str == 0 ) return true;	// Return true if the converted string is not wanted.
+
+	bool ok = this->DecodeString ( thisTag->dataPtr, thisTag->dataLen, utf8Str );
+	return ok;
+
+}	// TIFF_FileWriter::GetTag_EncodedString
+
+// =================================================================================================
+// TIFF_FileWriter::SetTag_EncodedString
+// =====================================
+
+void TIFF_FileWriter::SetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, const std::string& utf8Str, XMP_Uns8 encoding )
+{
+	std::string encodedStr;
+
+	this->EncodeString ( utf8Str, encoding, &encodedStr );
+	this->SetTag ( ifd, id, kTIFF_UndefinedType, (XMP_Uns32)encodedStr.size(), encodedStr.c_str() );
+
+}	// TIFF_FileWriter::SetTag_EncodedString
+
+// =================================================================================================
+// TIFF_FileWriter::IsLegacyChanged
+// ================================
+
+bool TIFF_FileWriter::IsLegacyChanged()
+{
+
+	if ( ! this->changed ) return false;
+	if ( this->legacyDeleted ) return true;
+
+	for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+		InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+		if ( ! thisIFD.changed ) continue;
+
+		InternalTagMap::iterator tagPos;
+		InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+
+		for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+			InternalTagInfo & thisTag = tagPos->second;
+			if ( thisTag.changed && (thisTag.id != kTIFF_XMP) ) return true;
+		}
+
+	}
+
+	return false;	// Can get here if the XMP tag is the only one changed.
+
+}	// TIFF_FileWriter::IsLegacyChanged
+
+// =================================================================================================
+// TIFF_FileWriter::ParseMemoryStream
+// ==================================
+
+void TIFF_FileWriter::ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData /* = true */ )
+{
+	this->DeleteExistingInfo();
+	this->memParsed = true;
+	if ( length == 0 ) return;
+
+	// Allocate space for the full in-memory stream and copy it.
+
+	if ( ! copyData ) {
+		XMP_Assert ( ! this->ownedStream );
+		this->memStream = (XMP_Uns8*) data;
+	} else {
+		if ( length > 100*1024*1024 ) XMP_Throw ( "Outrageous length for memory-based TIFF", kXMPErr_BadTIFF );
+		this->memStream = (XMP_Uns8*) malloc(length);
+		this->ownedStream = true;
+		if ( this->memStream == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( this->memStream, data, length );	// AUDIT: Safe, malloc'ed length bytes above.
+		this->ownedStream = true;
+	}
+	
+	this->tiffLength = length;
+	XMP_Uns32 ifdLimit = this->tiffLength - 6;	// An IFD must start before this offset.
+
+	// Find and process the primary, thumbnail, Exif, GPS, and Interoperability IFDs.
+
+	XMP_Uns32 primaryIFDOffset = this->CheckTIFFHeader ( this->memStream, length );
+
+	if ( primaryIFDOffset != 0 ) {
+		XMP_Uns32 tnailOffset = this->ProcessMemoryIFD ( primaryIFDOffset, kTIFF_PrimaryIFD );
+		if ( tnailOffset != 0 ) {
+			if ( IsOffsetValid ( tnailOffset, 8, ifdLimit ) ) {	// Remove a bad Thumbnail IFD Offset
+				( void ) this->ProcessMemoryIFD ( tnailOffset, kTIFF_TNailIFD );
+			} else {
+				XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+				this->NotifyClient (kXMPErrSev_Recoverable, error );
+				this->DeleteTag ( kTIFF_PrimaryIFD, kTIFF_TNailIFD );
+			}
+		}
+	}
+
+	const InternalTagInfo* exifIFDTag = this->FindTagInIFD ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer );
+	if ( (exifIFDTag != 0) && (exifIFDTag->type == kTIFF_LongType) && (exifIFDTag->dataLen == 4) ) {
+		XMP_Uns32 exifOffset = this->GetUns32 ( exifIFDTag->dataPtr );
+		(void) this->ProcessMemoryIFD ( exifOffset, kTIFF_ExifIFD );
+	}
+
+	const InternalTagInfo* gpsIFDTag = this->FindTagInIFD ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer );
+	if ( (gpsIFDTag != 0) && (gpsIFDTag->type == kTIFF_LongType) && (gpsIFDTag->dataLen == 4) ) {
+		XMP_Uns32 gpsOffset = this->GetUns32 ( gpsIFDTag->dataPtr );
+		if ( IsOffsetValid ( gpsOffset, 8, ifdLimit ) ) {	// Remove a bad GPS IFD offset.
+			(void) this->ProcessMemoryIFD ( gpsOffset, kTIFF_GPSInfoIFD );
+		} else {
+			XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+			this->NotifyClient (kXMPErrSev_Recoverable, error );
+			this->DeleteTag ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer );
+		}
+	}
+
+	const InternalTagInfo* interopIFDTag = this->FindTagInIFD ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer );
+	if ( (interopIFDTag != 0) && (interopIFDTag->type == kTIFF_LongType) && (interopIFDTag->dataLen == 4) ) {
+		XMP_Uns32 interopOffset = this->GetUns32 ( interopIFDTag->dataPtr );
+		if ( IsOffsetValid ( interopOffset, 8, ifdLimit ) ) {	// Remove a bad Interoperability IFD offset.
+			(void) this->ProcessMemoryIFD ( interopOffset, kTIFF_InteropIFD );
+		} else {
+			XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+			this->NotifyClient (kXMPErrSev_Recoverable, error );
+			this->DeleteTag ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer );
+		}
+	}
+
+	#if 0
+	{
+		printf ( "\nExiting TIFF_FileWriter::ParseMemoryStream\n" );
+		for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+			InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+			printf ( "\n   IFD %d, count %d, mapped %d, offset %d (0x%X), next IFD %d (0x%X)\n",
+					 ifd, thisIFD.origCount, thisIFD.tagMap.size(),
+					 thisIFD.origDataOffset, thisIFD.origDataOffset, thisIFD.origNextIFD, thisIFD.origNextIFD );
+			InternalTagMap::iterator tagPos;
+			InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+			for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+				InternalTagInfo & thisTag = tagPos->second;
+				printf ( "      Tag %d, smallValue 0x%X, origDataLen %d, origDataOffset %d (0x%X)\n",
+						 thisTag.id, thisTag.smallValue, thisTag.origDataLen, thisTag.origDataOffset, thisTag.origDataOffset );
+			}
+		}
+		printf ( "\n" );
+	}
+	#endif
+
+}	// TIFF_FileWriter::ParseMemoryStream
+
+// =================================================================================================
+// TIFF_FileWriter::ProcessMemoryIFD
+// =================================
+
+XMP_Uns32 TIFF_FileWriter::ProcessMemoryIFD ( XMP_Uns32 ifdOffset, XMP_Uns8 ifd )
+{
+	InternalIFDInfo& ifdInfo ( this->containedIFDs[ifd] );
+
+	if ( (ifdOffset < 8) || (ifdOffset > (this->tiffLength - kEmptyIFDLength)) ) {
+		XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+		this->NotifyClient ( kXMPErrSev_FileFatal, error );
+	}
+
+	XMP_Uns8* ifdPtr = this->memStream + ifdOffset;
+	XMP_Uns16 tagCount = this->GetUns16 ( ifdPtr );
+	RawIFDEntry* ifdEntries = (RawIFDEntry*)(ifdPtr+2);
+
+	if ( tagCount >= 0x8000 ) {
+		XMP_Error error ( kXMPErr_BadTIFF, "Outrageous IFD count" );
+		this->NotifyClient ( kXMPErrSev_FileFatal, error );
+	}
+
+	if ( (XMP_Uns32)(2 + tagCount*12 + 4) > (this->tiffLength - ifdOffset) ) {
+		XMP_Error error ( kXMPErr_BadTIFF, "Out of bounds IFD" );
+		this->NotifyClient ( kXMPErrSev_FileFatal, error );
+	}
+
+	ifdInfo.origIFDOffset = ifdOffset;
+	ifdInfo.origCount  = tagCount;
+
+	for ( size_t i = 0; i < tagCount; ++i ) {
+
+		RawIFDEntry* rawTag  = &ifdEntries[i];
+		XMP_Uns16    tagType = this->GetUns16 ( &rawTag->type );
+		if ( (tagType < kTIFF_ByteType) || (tagType > kTIFF_LastType) ) continue;	// Bad type, skip this tag.
+
+		XMP_Uns16 tagID    = this->GetUns16 ( &rawTag->id );
+		XMP_Uns32 tagCount = this->GetUns32 ( &rawTag->count );
+
+		InternalTagMap::value_type mapValue ( tagID, InternalTagInfo ( tagID, tagType, tagCount, kIsMemoryBased ) );
+		InternalTagMap::iterator newPos = ifdInfo.tagMap.insert ( ifdInfo.tagMap.end(), mapValue );
+		InternalTagInfo& mapTag = newPos->second;
+
+		mapTag.dataLen = mapTag.origDataLen = mapTag.count * (XMP_Uns32)kTIFF_TypeSizes[mapTag.type];
+#if SUNOS_SPARC
+		mapTag.smallValue = IE.getUns32(&rawTag->dataOrOffset);
+#else
+		mapTag.smallValue = GetUns32AsIs ( &rawTag->dataOrOffset );	// Keep the value or offset in stream byte ordering.
+#endif //#if SUNOS_SPARC
+
+		if ( mapTag.dataLen <= 4 ) {
+			mapTag.origDataOffset = ifdOffset + 2 + (12 * (XMP_Uns32)i) + 8;	// Compute the data offset.
+		} else {
+			mapTag.origDataOffset = this->GetUns32 ( &rawTag->dataOrOffset );	// Extract the data offset.
+			// printf ( "FW_ProcessMemoryIFD tag %d large value @ %.8X\n", mapTag.id, mapTag.dataPtr );
+			if ( (mapTag.origDataOffset < 8) || (mapTag.origDataOffset >= this->tiffLength) ) {
+				mapTag.count = mapTag.dataLen = mapTag.origDataLen = mapTag.smallValue = 0;
+				mapTag.origDataOffset = ifdOffset + 2 + (12 * (XMP_Uns32)i) + 8;	// Make this bad tag look empty
+			}
+			if ( mapTag.dataLen > (this->tiffLength - mapTag.origDataOffset) ) {
+				mapTag.count = mapTag.dataLen = mapTag.origDataLen = mapTag.smallValue = 0;
+				mapTag.origDataOffset = ifdOffset + 2 + (12 * (XMP_Uns32)i) + 8;	// Make this bad tag look empty
+			}
+		}
+		mapTag.dataPtr = this->memStream + mapTag.origDataOffset;
+
+	}
+
+	ifdPtr += (2 + tagCount*12);
+	ifdInfo.origNextIFD = this->GetUns32 ( ifdPtr );
+
+	return ifdInfo.origNextIFD;
+
+}	// TIFF_FileWriter::ProcessMemoryIFD
+
+// =================================================================================================
+// TIFF_FileWriter::ParseFileStream
+// ================================
+//
+// The buffered I/O model is worth the logic complexity - as opposed to a simple seek/read for each
+// part of the TIFF stream. The vast majority of real-world TIFFs have the primary IFD, Exif IFD,
+// and all of their interesting tag values within the first 64K of the file. Well, at least before
+// we get around to our edit-by-append approach.
+
+void TIFF_FileWriter::ParseFileStream ( XMP_IO* fileRef )
+{
+
+	this->DeleteExistingInfo();
+	this->fileParsed = true;
+	this->tiffLength = (XMP_Uns32) fileRef->Length();
+	if ( this->tiffLength < 8 ) return;	// Ignore empty or impossibly short.
+	fileRef->Rewind ( );
+
+	XMP_Uns32 ifdLimit = this->tiffLength - 6;	// An IFD must start before this offset.
+
+	// Find and process the primary, Exif, GPS, and Interoperability IFDs.
+
+	XMP_Uns8 tiffHeader [8];
+	fileRef->ReadAll ( tiffHeader, sizeof(tiffHeader) );
+	XMP_Uns32 primaryIFDOffset = this->CheckTIFFHeader ( tiffHeader, this->tiffLength );
+
+	if ( primaryIFDOffset == 0 ) {
+		return;
+	} else {
+		XMP_Uns32 tnailOffset = this->ProcessFileIFD ( kTIFF_PrimaryIFD, primaryIFDOffset, fileRef );
+		if ( tnailOffset != 0 ) {
+			if ( IsOffsetValid ( tnailOffset, 8, ifdLimit ) ) {
+				( void ) this->ProcessFileIFD ( kTIFF_TNailIFD, tnailOffset, fileRef );
+			} else {
+				XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+				this->NotifyClient ( kXMPErrSev_Recoverable, error );
+				this->DeleteTag( kTIFF_PrimaryIFD, kTIFF_TNailIFD );
+			}
+		}
+	}
+
+	const InternalTagInfo* exifIFDTag = this->FindTagInIFD ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer );
+	if ( (exifIFDTag != 0) && (exifIFDTag->type == kTIFF_LongType) && (exifIFDTag->count == 1) ) {
+		XMP_Uns32 exifOffset = this->GetUns32 ( exifIFDTag->dataPtr );
+		(void) this->ProcessFileIFD ( kTIFF_ExifIFD, exifOffset, fileRef );
+	}
+
+	const InternalTagInfo* gpsIFDTag = this->FindTagInIFD ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer );
+	if ( (gpsIFDTag != 0) && (gpsIFDTag->type == kTIFF_LongType) && (gpsIFDTag->count == 1) ) {
+		XMP_Uns32 gpsOffset = this->GetUns32 ( gpsIFDTag->dataPtr );
+		if ( IsOffsetValid (gpsOffset, 8, ifdLimit ) ) {	// Remove a bad GPS IFD offset.
+			(void) this->ProcessFileIFD ( kTIFF_GPSInfoIFD, gpsOffset, fileRef );
+		} else {
+			XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+			this->NotifyClient ( kXMPErrSev_Recoverable, error );
+			this->DeleteTag ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer );
+		}
+	}
+
+	const InternalTagInfo* interopIFDTag = this->FindTagInIFD ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer );
+	if ( (interopIFDTag != 0) && (interopIFDTag->type == kTIFF_LongType) && (interopIFDTag->dataLen == 4) ) {
+		XMP_Uns32 interopOffset = this->GetUns32 ( interopIFDTag->dataPtr );
+		if ( IsOffsetValid (interopOffset, 8, ifdLimit ) ) {	// Remove a bad Interoperability IFD offset.
+			(void) this->ProcessFileIFD ( kTIFF_InteropIFD, interopOffset, fileRef );
+		} else {
+			XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+			this->NotifyClient ( kXMPErrSev_Recoverable, error );
+			this->DeleteTag ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer );
+		}
+	}
+
+	#if 0
+	{
+		printf ( "\nExiting TIFF_FileWriter::ParseFileStream\n" );
+		for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+			InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+			printf ( "\n   IFD %d, count %d, mapped %d, offset %d (0x%X), next IFD %d (0x%X)\n",
+					 ifd, thisIFD.origCount, thisIFD.tagMap.size(),
+					 thisIFD.origDataOffset, thisIFD.origDataOffset, thisIFD.origNextIFD, thisIFD.origNextIFD );
+			InternalTagMap::iterator tagPos;
+			InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+			for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+				InternalTagInfo & thisTag = tagPos->second;
+				printf ( "      Tag %d, smallValue 0x%X, origDataLen %d, origDataOffset %d (0x%X)\n",
+						 thisTag.id, thisTag.smallValue, thisTag.origDataLen, thisTag.origDataOffset, thisTag.origDataOffset );
+			}
+		}
+		printf ( "\n" );
+	}
+	#endif
+
+}	// TIFF_FileWriter::ParseFileStream
+
+// =================================================================================================
+// TIFF_FileWriter::ProcessFileIFD
+// ===============================
+//
+// Each IFD has a UInt16 count of IFD entries, a sequence of 12 byte IFD entries, then a UInt32
+// offset to the next IFD. The integer byte order is determined by the II or MM at the TIFF start.
+
+XMP_Uns32 TIFF_FileWriter::ProcessFileIFD ( XMP_Uns8 ifd, XMP_Uns32 ifdOffset, XMP_IO* fileRef )
+{
+	static const size_t ifdBufferSize = 12*65536;	// Enough for the largest possible IFD.
+    std::vector<XMP_Uns8> ifdBuffer(ifdBufferSize);
+	XMP_Uns8 intBuffer [4];	// For the IFD count and offset to next IFD.
+	
+	InternalIFDInfo& ifdInfo ( this->containedIFDs[ifd] );
+
+	if ( (ifdOffset < 8) || (ifdOffset > (this->tiffLength - kEmptyIFDLength)) ) {
+		XMP_Throw ( "Bad IFD offset", kXMPErr_BadTIFF );
+	}
+
+	fileRef->Seek ( ifdOffset, kXMP_SeekFromStart );
+	if ( ! XIO::CheckFileSpace ( fileRef, 2 ) ) return 0;	// Bail for a truncated file.
+	fileRef->ReadAll ( intBuffer, 2 );
+
+	XMP_Uns16 tagCount = this->GetUns16 ( intBuffer );
+	if ( tagCount >= 0x8000 ) return 0;	// Maybe wrong byte order.
+	if ( ! XIO::CheckFileSpace ( fileRef, 12*tagCount ) ) return 0;	// Bail for a truncated file.
+	fileRef->ReadAll ( &ifdBuffer[0], 12*tagCount );
+
+	if ( ! XIO::CheckFileSpace ( fileRef, 4 ) ) {
+        ifdInfo.origNextIFD = 0;	// Tolerate a trncated file, do the remaining processing.
+	} else {
+		fileRef->ReadAll ( intBuffer, 4 );
+        ifdInfo.origNextIFD = this->GetUns32 ( intBuffer );
+	}
+
+	ifdInfo.origIFDOffset = ifdOffset;
+	ifdInfo.origCount  = tagCount;
+
+	// ---------------------------------------------------------------------------------------------
+	// First create all of the IFD map entries, capturing short values, and get the next IFD offset.
+	// We're using a std::map for storage, it automatically eliminates duplicates and provides
+	// sorted output. Plus the "map[key] = value" assignment conveniently keeps the last encountered
+	// value, following Photoshop's behavior.
+
+	XMP_Uns8* ifdPtr = &ifdBuffer[0];	// Move to the first IFD entry.
+
+	for ( XMP_Uns16 i = 0; i < tagCount; ++i, ifdPtr += 12 ) {
+
+		RawIFDEntry* rawTag = (RawIFDEntry*)ifdPtr;
+		XMP_Uns16    tagType = this->GetUns16 ( &rawTag->type );
+		if ( (tagType < kTIFF_ByteType) || (tagType > kTIFF_LastType) ) continue;	// Bad type, skip this tag.
+
+		XMP_Uns16 tagID    = this->GetUns16 ( &rawTag->id );
+		XMP_Uns32 tagCount = this->GetUns32 ( &rawTag->count );
+
+		InternalTagMap::value_type mapValue ( tagID, InternalTagInfo ( tagID, tagType, tagCount, kIsFileBased ) );
+		InternalTagMap::iterator newPos = ifdInfo.tagMap.insert ( ifdInfo.tagMap.end(), mapValue );
+		InternalTagInfo& mapTag = newPos->second;
+
+		mapTag.dataLen = mapTag.origDataLen = mapTag.count * (XMP_Uns32)kTIFF_TypeSizes[mapTag.type];
+		mapTag.smallValue = GetUns32AsIs ( &rawTag->dataOrOffset );	// Keep the value or offset in stream byte ordering.
+
+		if ( mapTag.dataLen <= 4 ) {
+			mapTag.dataPtr = (XMP_Uns8*) &mapTag.smallValue;
+			mapTag.origDataOffset = ifdOffset + 2 + (12 * i) + 8;	// Compute the data offset.
+		} else {
+			mapTag.origDataOffset = this->GetUns32 ( &rawTag->dataOrOffset );	// Extract the data offset.
+			if ( (mapTag.origDataOffset < 8) || (mapTag.origDataOffset >= this->tiffLength) ) {
+				mapTag.dataPtr = (XMP_Uns8*) &mapTag.smallValue;	// Make this bad tag look empty.
+				mapTag.origDataOffset = ifdOffset + 2 + (12 * i) + 8;
+				mapTag.count = mapTag.dataLen = mapTag.origDataLen = mapTag.smallValue = 0;
+			}
+			if ( mapTag.dataLen > (this->tiffLength - mapTag.origDataOffset) ) {
+				mapTag.dataPtr = (XMP_Uns8*) &mapTag.smallValue;	// Make this bad tag look empty.
+				mapTag.origDataOffset = ifdOffset + 2 + (12 * i) + 8;
+				mapTag.count = mapTag.dataLen = mapTag.origDataLen = mapTag.smallValue = 0;
+			}
+		}
+
+	}
+
+	// ------------------------------------------------------------------------
+	// Go back over the tag map and extract the data for large recognized tags.
+
+	InternalTagMap::iterator tagPos = ifdInfo.tagMap.begin();
+	InternalTagMap::iterator tagEnd = ifdInfo.tagMap.end();
+
+	const XMP_Uns16* knownTagPtr = sKnownTags[ifd];	// Points into the ordered recognized tag list.
+
+	for ( ; tagPos != tagEnd; ++tagPos ) {
+
+		InternalTagInfo* currTag = &tagPos->second;
+
+		if ( currTag->dataLen <= 4 ) continue;	// Short values are already in the smallValue field.
+
+		while ( *knownTagPtr < currTag->id ) ++knownTagPtr;
+		if ( *knownTagPtr != currTag->id ) continue;	// Skip unrecognized tags.
+
+		fileRef->Seek ( currTag->origDataOffset, kXMP_SeekFromStart );
+		currTag->dataPtr = (XMP_Uns8*) malloc ( currTag->dataLen );
+		if ( currTag->dataPtr == 0 ) XMP_Throw ( "No data block", kXMPErr_NoMemory );
+		fileRef->ReadAll ( currTag->dataPtr, currTag->dataLen );
+
+	}
+
+	// Done, return the next IFD offset.
+
+	return ifdInfo.origNextIFD;
+
+}	// TIFF_FileWriter::ProcessFileIFD
+
+// =================================================================================================
+// TIFF_FileWriter::IntegrateFromPShop6
+// ====================================
+//
+// See comments for ProcessPShop6IFD.
+
+void TIFF_FileWriter::IntegrateFromPShop6 ( const void * buriedPtr, size_t buriedLen )
+{
+	TIFF_MemoryReader buriedExif;
+	buriedExif.ParseMemoryStream ( buriedPtr, (XMP_Uns32) buriedLen );
+
+	this->ProcessPShop6IFD ( buriedExif, kTIFF_PrimaryIFD );
+	this->ProcessPShop6IFD ( buriedExif, kTIFF_ExifIFD );
+	this->ProcessPShop6IFD ( buriedExif, kTIFF_GPSInfoIFD );
+
+}	// TIFF_FileWriter::IntegrateFromPShop6
+
+// =================================================================================================
+// TIFF_FileWriter::CopyTagToMasterIFD
+// ===================================
+//
+// Create a new master IFD entry from a buried Photoshop 6 IFD entry. Don't try to get clever with
+// large values, just create a new copy. This preserves a clean separation between the memory-based
+// and file-based TIFF processing.
+
+void* TIFF_FileWriter::CopyTagToMasterIFD ( const TagInfo & ps6Tag, InternalIFDInfo * masterIFD )
+{
+	InternalTagMap::value_type mapValue ( ps6Tag.id, InternalTagInfo ( ps6Tag.id, ps6Tag.type, ps6Tag.count, this->fileParsed ) );
+	InternalTagMap::iterator newPos = masterIFD->tagMap.insert ( masterIFD->tagMap.end(), mapValue );
+	InternalTagInfo& newTag = newPos->second;
+
+	newTag.dataLen = ps6Tag.dataLen;
+
+	if ( newTag.dataLen <= 4 ) {
+		newTag.dataPtr = (XMP_Uns8*) &newTag.smallValue;
+		newTag.smallValue = *((XMP_Uns32*)ps6Tag.dataPtr);
+	} else {
+		newTag.dataPtr = (XMP_Uns8*) malloc ( newTag.dataLen );
+		if ( newTag.dataPtr == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( newTag.dataPtr, ps6Tag.dataPtr, newTag.dataLen );	// AUDIT: Safe, malloc'ed dataLen bytes above.
+	}
+
+	newTag.changed = true;	// ! See comments with ProcessPShop6IFD.
+	XMP_Assert ( (newTag.origDataLen == 0) && (newTag.origDataOffset == 0) );
+
+	masterIFD->changed = true;
+
+	return newPos->second.dataPtr;	// ! Return the address within the map entry for small values.
+
+}	// TIFF_FileWriter::CopyTagToMasterIFD
+
+// =================================================================================================
+// FlipCFATable
+// ============
+//
+// The CFA pattern table is trivial, a pair of short counts followed by n*m bytes.
+
+static bool FlipCFATable ( void* voidPtr, XMP_Uns32 tagLen, GetUns16_Proc GetUns16 )
+{
+	if ( tagLen < 4 ) return false;
+
+	XMP_Uns16* u16Ptr = (XMP_Uns16*)voidPtr;
+
+	Flip2 ( &u16Ptr[0] );	// Flip the counts to match the master TIFF.
+	Flip2 ( &u16Ptr[1] );
+
+	XMP_Uns16 columns = GetUns16 ( &u16Ptr[0] );	// Fetch using the master TIFF's routine.
+	XMP_Uns16 rows    = GetUns16 ( &u16Ptr[1] );
+
+	if ( tagLen != (XMP_Uns32)(4 + columns*rows) ) return false;
+
+	return true;
+
+}	// FlipCFATable
+
+// =================================================================================================
+// FlipDSDTable
+// ============
+//
+// The device settings description table is trivial, a pair of short counts followed by UTF-16
+// strings. So the whole value should be flipped as a sequence of 16 bit items.
+
+// ! The Exif 2.2 description is a bit garbled. It might be wrong. It would be nice to have a real example.
+
+static bool FlipDSDTable ( void* voidPtr, XMP_Uns32 tagLen, GetUns16_Proc GetUns16 )
+{
+	if ( tagLen < 4 ) return false;
+
+	XMP_Uns16* u16Ptr = (XMP_Uns16*)voidPtr;
+	for ( size_t i = tagLen/2; i > 0; --i, ++u16Ptr ) Flip2 ( u16Ptr );
+
+	return true;
+
+}	// FlipDSDTable
+
+// =================================================================================================
+// FlipOECFSFRTable
+// ================
+//
+// The OECF and SFR tables have the same layout:
+//    2 short counts, columns and rows
+//    c ASCII strings, null terminated, column names
+//    c*r rationals
+
+static bool FlipOECFSFRTable ( void* voidPtr, XMP_Uns32 tagLen, GetUns16_Proc GetUns16 )
+{
+	XMP_Uns16* u16Ptr = (XMP_Uns16*)voidPtr;
+
+	Flip2 ( &u16Ptr[0] );	// Flip the data to match the master TIFF.
+	Flip2 ( &u16Ptr[1] );
+
+	XMP_Uns16 columns = GetUns16 ( &u16Ptr[0] );	// Fetch using the master TIFF's routine.
+	XMP_Uns16 rows    = GetUns16 ( &u16Ptr[1] );
+
+	XMP_Uns32 minLen = 4 + columns + (8 * columns * rows);	// Minimum legit tag size.
+	if ( tagLen < minLen ) return false;
+
+	// Compute the start of the rationals from the end of value. No need to walk through the names.
+	XMP_Uns32* u32Ptr = (XMP_Uns32*) ((XMP_Uns8*)voidPtr + tagLen - (8 * columns * rows));
+
+	for ( size_t i = 2*columns*rows; i > 0; --i, ++u32Ptr ) Flip4 ( u32Ptr );
+
+	return true;
+
+}	// FlipOECFSFRTable
+
+// =================================================================================================
+// TIFF_FileWriter::ProcessPShop6IFD
+// =================================
+//
+// Photoshop 6 wrote wacky TIFF files that have much of the Exif metadata buried inside of image
+// resource 1058, which is itself within tag 34377 in the 0th IFD. This routine moves the buried
+// tags up to the parent file. Existing tags are not replaced.
+//
+// While it is tempting to try to directly use the TIFF_MemoryReader's tweaked IFD info, making that
+// visible would compromise implementation separation. Better to pay the modest runtime cost of
+// using the official GetIFD method, letting it build the map.
+//
+// The tags that get moved are marked as being changed, as is the IFD they are moved into, but the
+// overall TIFF_FileWriter object is not. We don't want this integration on its own to force a file
+// update, but a file update should include these changes.
+
+// ! Be careful to not move tags that are the nasty Exif explicit offsets, e.g. the Exif or GPS IFD
+// ! "pointers". These are tags with a LONG type and count of 1, whose value is an offset into the
+// ! buried TIFF stream. We can't reliably plant that offset into the outer IFD structure.
+
+// ! To make things even more fun, the buried Exif might not have the same endianness as the outer!
+
+void TIFF_FileWriter::ProcessPShop6IFD ( const TIFF_MemoryReader& buriedExif, XMP_Uns8 ifd )
+{
+	bool ok, found;
+	TagInfoMap ps6IFD;
+
+	found = buriedExif.GetIFD ( ifd, &ps6IFD );
+	if ( ! found ) return;
+
+	bool needsFlipping = (this->bigEndian != buriedExif.IsBigEndian());
+
+	InternalIFDInfo* masterIFD = &this->containedIFDs[ifd];
+
+	TagInfoMap::const_iterator ps6Pos = ps6IFD.begin();
+	TagInfoMap::const_iterator ps6End = ps6IFD.end();
+
+	for ( ; ps6Pos != ps6End; ++ps6Pos ) {
+
+		// Copy buried tags to the master IFD if they don't already exist there.
+
+		const TagInfo& ps6Tag = ps6Pos->second;
+
+		if ( this->FindTagInIFD ( ifd, ps6Tag.id ) != 0 ) continue;	// Keep existing master tags.
+		if ( needsFlipping && (ps6Tag.id == 37500) ) continue;	// Don't copy an unflipped MakerNote.
+		if ( (ps6Tag.id == kTIFF_ExifIFDPointer) ||	// Skip the tags that are explicit offsets.
+			 (ps6Tag.id == kTIFF_GPSInfoIFDPointer) ||
+			 (ps6Tag.id == kTIFF_JPEGInterchangeFormat) ||
+			 (ps6Tag.id == kTIFF_InteroperabilityIFDPointer) ) continue;
+
+		void* voidPtr = this->CopyTagToMasterIFD ( ps6Tag, masterIFD );
+
+		if ( needsFlipping ) {
+			switch ( ps6Tag.type ) {
+
+				case kTIFF_ByteType:
+				case kTIFF_SByteType:
+				case kTIFF_ASCIIType:
+					// Nothing more to do.
+					break;
+
+				case kTIFF_ShortType:
+				case kTIFF_SShortType:
+					{
+						XMP_Uns16* u16Ptr = (XMP_Uns16*)voidPtr;
+						for ( size_t i = ps6Tag.count; i > 0; --i, ++u16Ptr ) Flip2 ( u16Ptr );
+					}
+					break;
+
+				case kTIFF_LongType:
+				case kTIFF_SLongType:
+				case kTIFF_FloatType:
+					{
+						XMP_Uns32* u32Ptr = (XMP_Uns32*)voidPtr;
+						for ( size_t i = ps6Tag.count; i > 0; --i, ++u32Ptr ) Flip4 ( u32Ptr );
+					}
+					break;
+
+				case kTIFF_RationalType:
+				case kTIFF_SRationalType:
+					{
+						XMP_Uns32* ratPtr = (XMP_Uns32*)voidPtr;
+						for ( size_t i = (2 * ps6Tag.count); i > 0; --i, ++ratPtr ) Flip4 ( ratPtr );
+					}
+					break;
+
+				case kTIFF_DoubleType:
+					{
+						XMP_Uns64* u64Ptr = (XMP_Uns64*)voidPtr;
+						for ( size_t i = ps6Tag.count; i > 0; --i, ++u64Ptr ) Flip8 ( u64Ptr );
+					}
+					break;
+
+				case kTIFF_UndefinedType:
+					// Fix up the few kinds of special tables that Exif 2.2 defines.
+					ok = true;	// Keep everything that isn't a special table.
+					if ( ps6Tag.id == kTIFF_CFAPattern ) {
+						ok = FlipCFATable ( voidPtr, ps6Tag.dataLen, this->GetUns16 );
+					} else if ( ps6Tag.id == kTIFF_DeviceSettingDescription ) {
+						ok = FlipDSDTable ( voidPtr, ps6Tag.dataLen, this->GetUns16 );
+					} else if ( (ps6Tag.id == kTIFF_OECF) || (ps6Tag.id == kTIFF_SpatialFrequencyResponse) ) {
+						ok = FlipOECFSFRTable ( voidPtr, ps6Tag.dataLen, this->GetUns16 );
+					}
+					if ( ! ok ) this->DeleteTag ( ifd, ps6Tag.id );
+					break;
+
+				default:
+					// ? XMP_Throw ( "Unexpected tag type", kXMPErr_InternalFailure );
+					this->DeleteTag ( ifd, ps6Tag.id );
+					break;
+
+			}
+		}
+
+	}
+
+}	// TIFF_FileWriter::ProcessPShop6IFD
+
+// =================================================================================================
+// TIFF_FileWriter::PreflightIFDLinkage
+// ====================================
+//
+// Preflight special cases for the linkage between IFDs. Three of the IFDs are found through an
+// explicit tag, the Exif, GPS, and Interop IFDs. The presence or absence of those IFDs affects the
+// presence or absence of the linkage tag, which can affect the IFD containing the linkage tag. The
+// thumbnail IFD is chained from the primary IFD, so if the thumbnail IFD is present we make sure
+// that the primary IFD isn't empty.
+
+void TIFF_FileWriter::PreflightIFDLinkage()
+{
+
+	// Do the tag-linked IFDs bottom up, Interop then GPS then Exif.
+
+	if ( this->containedIFDs[kTIFF_InteropIFD].tagMap.empty() ) {
+		this->DeleteTag ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer );
+	} else if ( ! this->GetTag ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer, 0 ) ) {
+		this->SetTag_Long ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer, 0xABADABAD );
+	}
+
+	if ( this->containedIFDs[kTIFF_GPSInfoIFD].tagMap.empty() ) {
+		this->DeleteTag ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer );
+	} else if ( ! this->GetTag ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer, 0 ) ) {
+		this->SetTag_Long ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer, 0xABADABAD );
+	}
+
+	if ( this->containedIFDs[kTIFF_ExifIFD].tagMap.empty() ) {
+		this->DeleteTag ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer );
+	} else if ( ! this->GetTag ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer, 0 ) ) {
+		this->SetTag_Long ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer, 0xABADABAD );
+	}
+
+	// Make sure that the primary IFD is not empty if the thumbnail IFD is not empty.
+
+	if ( this->containedIFDs[kTIFF_PrimaryIFD].tagMap.empty() &&
+		 (! this->containedIFDs[kTIFF_TNailIFD].tagMap.empty()) ) {
+		this->SetTag_Short ( kTIFF_PrimaryIFD, kTIFF_ResolutionUnit, 2 );	// Set Resolution unit to inches.
+	}
+
+}	// TIFF_FileWriter::PreflightIFDLinkage
+
+// =================================================================================================
+// TIFF_FileWriter::DetermineVisibleLength
+// =======================================
+
+XMP_Uns32 TIFF_FileWriter::DetermineVisibleLength()
+{
+	XMP_Uns32 visibleLength = 8;	// Start with the TIFF header size.
+
+	for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+		InternalIFDInfo& ifdInfo ( this->containedIFDs[ifd] );
+		size_t tagCount = ifdInfo.tagMap.size();
+		if ( tagCount == 0 ) continue;
+
+		visibleLength += (XMP_Uns32)( 6 + (12 * tagCount) );
+
+		InternalTagMap::iterator tagPos = ifdInfo.tagMap.begin();
+		InternalTagMap::iterator tagEnd = ifdInfo.tagMap.end();
+
+		for ( ; tagPos != tagEnd; ++tagPos ) {
+			InternalTagInfo & currTag ( tagPos->second );
+			if ( currTag.dataLen > 4 ) visibleLength += ((currTag.dataLen + 1) & 0xFFFFFFFE);	// ! Round to even lengths.
+		}
+
+	}
+
+	return visibleLength;
+
+}	// TIFF_FileWriter::DetermineVisibleLength
+
+// =================================================================================================
+// TIFF_FileWriter::DetermineAppendInfo
+// ====================================
+
+#ifndef Trace_DetermineAppendInfo
+	#define Trace_DetermineAppendInfo 0
+#endif
+
+// An IFD grows if it has more tags than before.
+#define DoesIFDGrow(ifd)	(this->containedIFDs[ifd].origCount < this->containedIFDs[ifd].tagMap.size())
+
+XMP_Uns32 TIFF_FileWriter::DetermineAppendInfo ( XMP_Uns32 appendedOrigin,
+												 bool      appendedIFDs[kTIFF_KnownIFDCount],
+												 XMP_Uns32 newIFDOffsets[kTIFF_KnownIFDCount],
+												 bool      appendAll /* = false */ )
+{
+	XMP_Uns32 appendedLength = 0;
+	XMP_Assert ( (appendedOrigin & 1) == 0 );	// Make sure it is even.
+
+	#if Trace_DetermineAppendInfo
+	{
+		printf ( "\nEntering TIFF_FileWriter::DetermineAppendInfo%s\n", (appendAll ? ", append all" : "") );
+		for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+			InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+			printf ( "\n   IFD %d, origCount %d, map.size %d, origIFDOffset %d (0x%X), origNextIFD %d (0x%X)",
+					 ifd, thisIFD.origCount, thisIFD.tagMap.size(),
+					 thisIFD.origIFDOffset, thisIFD.origIFDOffset, thisIFD.origNextIFD, thisIFD.origNextIFD );
+			if ( thisIFD.changed ) printf ( ", changed" );
+			if ( thisIFD.origCount < thisIFD.tagMap.size() ) printf ( ", should get appended" );
+			printf ( "\n" );
+			InternalTagMap::iterator tagPos;
+			InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+			for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+				InternalTagInfo & thisTag = tagPos->second;
+				printf ( "      Tag %d, smallValue 0x%X, origDataLen %d, origDataOffset %d (0x%X)",
+						 thisTag.id, thisTag.smallValue, thisTag.origDataLen, thisTag.origDataOffset, thisTag.origDataOffset );
+				if ( thisTag.changed ) printf ( ", changed" );
+				if ( (thisTag.dataLen > thisTag.origDataLen) && (thisTag.dataLen > 4) ) printf ( ", should get appended" );
+				printf ( "\n" );
+			}
+		}
+		printf ( "\n" );
+	}
+	#endif
+
+	// Determine which of the IFDs will be appended. If the Exif, GPS, or Interoperability IFDs are
+	// appended, set dummy values for their offsets in the "owning" IFD. This must be done first
+	// since this might cause the owning IFD to grow.
+
+	if ( ! appendAll ) {
+		for ( int i = 0; i < kTIFF_KnownIFDCount ;++i ) appendedIFDs[i] = false;
+	} else {
+		for ( int i = 0; i < kTIFF_KnownIFDCount ;++i ) appendedIFDs[i] = (this->containedIFDs[i].tagMap.size() > 0);
+	}
+
+	appendedIFDs[kTIFF_InteropIFD] |= DoesIFDGrow ( kTIFF_InteropIFD );
+	if ( appendedIFDs[kTIFF_InteropIFD] ) {
+		this->SetTag_Long ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer, 0xABADABAD );
+	}
+
+	appendedIFDs[kTIFF_GPSInfoIFD] |= DoesIFDGrow ( kTIFF_GPSInfoIFD );
+	if ( appendedIFDs[kTIFF_GPSInfoIFD] ) {
+		this->SetTag_Long ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer, 0xABADABAD );
+	}
+
+	appendedIFDs[kTIFF_ExifIFD] |= DoesIFDGrow ( kTIFF_ExifIFD );
+	if ( appendedIFDs[kTIFF_ExifIFD] ) {
+		this->SetTag_Long ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer, 0xABADABAD );
+	}
+
+	appendedIFDs[kTIFF_PrimaryIFD] |= DoesIFDGrow ( kTIFF_PrimaryIFD );
+
+	// The appended data (if any) will be a sequence of an IFD followed by its large values.
+	// Determine the new offsets for the appended IFDs and tag values, and the total amount of
+	// appended stuff. The final IFD offset is set in newIFDOffsets for all IFDs, changed or not.
+	// This makes it easier to set the offsets to the primary and thumbnail IFDs when writing.
+
+	for ( int ifd = 0; ifd < kTIFF_KnownIFDCount ;++ifd ) {
+
+		InternalIFDInfo& ifdInfo ( this->containedIFDs[ifd] );
+		size_t tagCount = ifdInfo.tagMap.size();
+
+		newIFDOffsets[ifd] = ifdInfo.origIFDOffset;	// Make the new offset valid for unchanged IFDs.
+
+		if ( ! (appendAll | ifdInfo.changed) ) continue;
+		if ( tagCount == 0 ) continue;
+
+		if ( appendedIFDs[ifd] ) {
+			newIFDOffsets[ifd] = appendedOrigin + appendedLength;
+			appendedLength += (XMP_Uns32)( 6 + (12 * tagCount) );
+		}
+
+		InternalTagMap::iterator tagPos = ifdInfo.tagMap.begin();
+		InternalTagMap::iterator tagEnd = ifdInfo.tagMap.end();
+
+		for ( ; tagPos != tagEnd; ++tagPos ) {
+
+			InternalTagInfo & currTag ( tagPos->second );
+			if ( (! (appendAll | currTag.changed)) || (currTag.dataLen <= 4) ) continue;
+
+			if ( (currTag.dataLen <= currTag.origDataLen) && (! appendAll) ) {
+				this->PutUns32 ( currTag.origDataOffset, &currTag.smallValue );	// Reuse the old space.
+			} else {
+				this->PutUns32 ( (appendedOrigin + appendedLength), &currTag.smallValue );	// Set the appended offset.
+				appendedLength += ((currTag.dataLen + 1) & 0xFFFFFFFEUL);	// Round to an even size.
+			}
+
+		}
+
+	}
+
+	// If the Exif, GPS, or Interoperability IFDs get appended, update the tag values for their new offsets.
+
+	if ( appendedIFDs[kTIFF_ExifIFD] ) {
+		this->SetTag_Long ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer, newIFDOffsets[kTIFF_ExifIFD] );
+	}
+	if ( appendedIFDs[kTIFF_GPSInfoIFD] ) {
+		this->SetTag_Long ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer, newIFDOffsets[kTIFF_GPSInfoIFD] );
+	}
+	if ( appendedIFDs[kTIFF_InteropIFD] ) {
+		this->SetTag_Long ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer, newIFDOffsets[kTIFF_InteropIFD] );
+	}
+
+	#if Trace_DetermineAppendInfo
+	{
+		printf ( "Exiting TIFF_FileWriter::DetermineAppendInfo\n" );
+		for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+			InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+			printf ( "\n   IFD %d, origCount %d, map.size %d, origIFDOffset %d (0x%X), origNextIFD %d (0x%X)",
+					 ifd, thisIFD.origCount, thisIFD.tagMap.size(),
+					 thisIFD.origIFDOffset, thisIFD.origIFDOffset, thisIFD.origNextIFD, thisIFD.origNextIFD );
+			if ( thisIFD.changed ) printf ( ", changed" );
+			if ( appendedIFDs[ifd] ) printf ( ", will be appended at %d (0x%X)", newIFDOffsets[ifd], newIFDOffsets[ifd] );
+			printf ( "\n" );
+			InternalTagMap::iterator tagPos;
+			InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+			for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+				InternalTagInfo & thisTag = tagPos->second;
+				printf ( "      Tag %d, smallValue 0x%X, origDataLen %d, origDataOffset %d (0x%X)",
+						 thisTag.id, thisTag.smallValue, thisTag.origDataLen, thisTag.origDataOffset, thisTag.origDataOffset );
+				if ( thisTag.changed ) printf ( ", changed" );
+				if ( (thisTag.dataLen > thisTag.origDataLen) && (thisTag.dataLen > 4) ) {
+					XMP_Uns32 newOffset = this->GetUns32 ( &thisTag.smallValue );
+					printf ( ", will be appended at %d (0x%X)", newOffset, newOffset );
+				}
+				printf ( "\n" );
+			}
+		}
+		printf ( "\n" );
+	}
+	#endif
+
+	return appendedLength;
+
+}	// TIFF_FileWriter::DetermineAppendInfo
+
+// =================================================================================================
+// TIFF_FileWriter::UpdateMemByAppend
+// ==================================
+//
+// Normally we update TIFF in a conservative "by-append" manner. Changes are written in-place where
+// they fit, anything requiring growth is appended to the end and the old space is abandoned. The
+// end for memory-based TIFF is the end of the data block, the end for file-based TIFF is the end of
+// the file. This update-by-append model has the advantage of not perturbing any hidden offsets, a
+// common feature of proprietary MakerNotes.
+//
+// When doing the update-by-append we're only going to be modifying things that have changed. This
+// means IFDs with changed, added, or deleted tags, and large values for changed or added tags. The
+// IFDs and tag values are updated in-place if they fit, leaving holes in the stream if the new
+// value is smaller than the old.
+
+// ** Someday we might want to use the FreeOffsets and FreeByteCounts tags to track free space.
+// ** Probably not a huge win in practice though, and the TIFF spec says they are not recommended
+// ** for general interchange use.
+
+void TIFF_FileWriter::UpdateMemByAppend ( XMP_Uns8** newStream_out, XMP_Uns32* newLength_out,
+										  bool appendAll /* = false */, XMP_Uns32 extraSpace /* = 0 */ )
+{
+	bool appendedIFDs[kTIFF_KnownIFDCount];
+	XMP_Uns32 newIFDOffsets[kTIFF_KnownIFDCount];
+	XMP_Uns32 appendedOrigin = ((this->tiffLength + 1) & 0xFFFFFFFEUL);	// Start at an even offset.
+	XMP_Uns32 appendedLength = DetermineAppendInfo ( appendedOrigin, appendedIFDs, newIFDOffsets, appendAll );
+
+	// Allocate the new block of memory for the full stream. Copy the original stream. Write the
+	// modified IFDs and values. Finally rebuild the internal IFD info and tag map.
+
+	XMP_Uns32 newLength = appendedOrigin + appendedLength;
+	XMP_Uns8* newStream = (XMP_Uns8*) malloc ( newLength + extraSpace );
+	if ( newStream == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+
+	memcpy ( newStream, this->memStream, this->tiffLength );	// AUDIT: Safe, malloc'ed newLength bytes above.
+	if ( this->tiffLength < appendedOrigin ) {
+		XMP_Assert ( appendedOrigin == (this->tiffLength + 1) );
+		newStream[this->tiffLength] = 0;	// Clear the pad byte.
+	}
+
+	try {	// We might get exceptions from the next part and must delete newStream on the way out.
+
+		// Write the modified IFDs and values. Rewrite the full IFD from scratch to make sure the
+		// tags are now unique and sorted. Copy large changed values to their appropriate location.
+
+		XMP_Uns32 appendedOffset = appendedOrigin;
+
+		for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+			InternalIFDInfo& ifdInfo ( this->containedIFDs[ifd] );
+			size_t tagCount = ifdInfo.tagMap.size();
+
+			if ( ! (appendAll | ifdInfo.changed) ) continue;
+			if ( tagCount == 0 ) continue;
+
+			XMP_Uns8* ifdPtr = newStream + newIFDOffsets[ifd];
+
+			if ( appendedIFDs[ifd] ) {
+				XMP_Assert ( newIFDOffsets[ifd] == appendedOffset );
+				appendedOffset += (XMP_Uns32)( 6 + (12 * tagCount) );
+			}
+
+			this->PutUns16 ( (XMP_Uns16)tagCount, ifdPtr );
+			ifdPtr += 2;
+
+			InternalTagMap::iterator tagPos = ifdInfo.tagMap.begin();
+			InternalTagMap::iterator tagEnd = ifdInfo.tagMap.end();
+
+			for ( ; tagPos != tagEnd; ++tagPos ) {
+
+				InternalTagInfo & currTag ( tagPos->second );
+
+				this->PutUns16 ( currTag.id, ifdPtr );
+				ifdPtr += 2;
+				this->PutUns16 ( currTag.type, ifdPtr );
+				ifdPtr += 2;
+				this->PutUns32 ( currTag.count, ifdPtr );
+				ifdPtr += 4;
+
+				PutUns32AsIs ( currTag.smallValue, ifdPtr );
+
+				if ( (appendAll | currTag.changed) && (currTag.dataLen > 4) ) {
+
+					XMP_Uns32 valueOffset = this->GetUns32 ( &currTag.smallValue );
+
+					if ( (currTag.dataLen <= currTag.origDataLen) && (! appendAll) ) {
+						XMP_Assert ( valueOffset == currTag.origDataOffset );
+					} else {
+						XMP_Assert ( valueOffset == appendedOffset );
+						appendedOffset += ((currTag.dataLen + 1) & 0xFFFFFFFEUL);
+					}
+
+					XMP_Assert ( valueOffset <= newLength );	// Provably true, valueOffset is in the old span, newLength is the new bigger span.
+					if ( currTag.dataLen > (newLength - valueOffset) ) XMP_Throw ( "Buffer overrun", kXMPErr_InternalFailure );
+					memcpy ( (newStream + valueOffset), currTag.dataPtr, currTag.dataLen );	// AUDIT: Protected by the above check.
+					if ( (currTag.dataLen & 1) != 0 ) newStream[valueOffset+currTag.dataLen] = 0;
+
+				}
+
+				ifdPtr += 4;
+
+			}
+
+			this->PutUns32 ( ifdInfo.origNextIFD, ifdPtr );
+			ifdPtr += 4;
+
+		}
+
+		XMP_Assert ( appendedOffset == newLength );
+
+		// Back fill the offsets for the primary and thumnbail IFDs, if they are now appended.
+
+		if ( appendedIFDs[kTIFF_PrimaryIFD] ) {
+			this->PutUns32 ( newIFDOffsets[kTIFF_PrimaryIFD], (newStream + 4) );
+		}
+
+		if ( appendedIFDs[kTIFF_TNailIFD] ) {
+			size_t primaryTagCount = this->containedIFDs[kTIFF_PrimaryIFD].tagMap.size();
+			if ( primaryTagCount > 0 ) {
+				XMP_Uns32 tnailLinkOffset = newIFDOffsets[kTIFF_PrimaryIFD] + 2 + (12 * primaryTagCount);
+				this->PutUns32 ( newIFDOffsets[kTIFF_TNailIFD], (newStream + tnailLinkOffset) );
+			}
+		}
+
+	} catch ( ... ) {
+
+		free ( newStream );
+		throw;
+
+	}
+
+	*newStream_out = newStream;
+	*newLength_out = newLength;
+
+}	// TIFF_FileWriter::UpdateMemByAppend
+
+// =================================================================================================
+// TIFF_FileWriter::UpdateMemByRewrite
+// ===================================
+//
+// Normally we update TIFF in a conservative "by-append" manner. Changes are written in-place where
+// they fit, anything requiring growth is appended to the end and the old space is abandoned. The
+// end for memory-based TIFF is the end of the data block, the end for file-based TIFF is the end of
+// the file. This update-by-append model has the advantage of not perturbing any hidden offsets, a
+// common feature of proprietary MakerNotes.
+//
+// The condenseStream parameter can be used to rewrite the full stream instead of appending. This
+// will discard any MakerNote tag and risks breaking offsets that are hidden. This can be necessary
+// though to try to make the TIFF fit in a JPEG file.
+//
+// We don't do most of the actual rewrite here. We set things up so that UpdateMemByAppend can be
+// called to append onto a bare TIFF header. Additional hidden offsets are then handled here.
+//
+// The hidden offsets for the Exif, GPS, and Interoperability IFDs (tags 34665, 34853, and 40965)
+// are handled by the code in DetermineAppendInfo, which is called from UpdateMemByAppend, which is
+// called from here.
+//
+// These other tags are recognized as being hidden offsets when composing a condensed stream:
+//    273 - StripOffsets, lengths in tag 279
+//    288 - FreeOffsets, lengths in tag 289
+//    324 - TileOffsets, lengths in tag 325
+//    330 - SubIFDs, lengths within the IFDs (Plus subIFD values and possible chaining!)
+//    513 - JPEGInterchangeFormat, length in tag 514
+//    519 - JPEGQTables, each table is 64 bytes
+//    520 - JPEGDCTables, lengths ???
+//    521 - JPEGACTables, lengths ???
+//
+// Some of these will handled and kept, some will be thrown out, some will cause the rewrite to fail.
+// At this time only the JPEG thumbnail tags, 513 and 514, contain hidden data that is kept. The
+// final stream layout is whatever UpdateMemByAppend does for the visible content, followed by the
+// hidden offset data. The Exif, GPS, and Interoperability IFDs are visible to UpdateMemByAppend.
+
+// ! So far, a memory-based TIFF rewrite would only be done for the Exif portion of a JPEG file.
+// ! In which case we're probably OK to handle JPEGInterchangeFormat (used for compressed thumbnails)
+// ! and complain about any of the other hidden offset tags.
+
+// tag	count	type
+
+// 273		n	short or long
+// 279		n	short or long
+// 288		n	long
+// 289		n	long
+// 324		n	long
+// 325		n	short or long
+
+// 330		n	long
+
+// 513		1	long
+// 514		1	long
+
+// 519		n	long
+// 520		n	long
+// 521		n	long
+
+static XMP_Uns16 kNoGoTags[] =
+	{
+		kTIFF_StripOffsets,		// 273	*** Should be handled?
+		kTIFF_StripByteCounts,	// 279	*** Should be handled?
+		kTIFF_FreeOffsets,		// 288	*** Should be handled?
+		kTIFF_FreeByteCounts,	// 289	*** Should be handled?
+		kTIFF_TileOffsets,		// 324	*** Should be handled?
+		kTIFF_TileByteCounts,	// 325	*** Should be handled?
+		kTIFF_SubIFDs,			// 330	*** Should be handled?
+		kTIFF_JPEGQTables,		// 519
+		kTIFF_JPEGDCTables,		// 520
+		kTIFF_JPEGACTables,		// 521
+		0xFFFF	// Must be last as a sentinel.
+	};
+
+static XMP_Uns16 kBanishedTags[] =
+	{
+		kTIFF_MakerNote,	// *** Should someday support MakerNoteSafety.
+		0xFFFF	// Must be last as a sentinel.
+	};
+
+struct SimpleHiddenContentInfo {
+	XMP_Uns8  ifd;
+	XMP_Uns16 offsetTag, lengthTag;
+};
+
+struct SimpleHiddenContentLocations {
+	XMP_Uns32 length, oldOffset, newOffset;
+	SimpleHiddenContentLocations() : length(0), oldOffset(0), newOffset(0) {};
+};
+
+enum { kSimpleHiddenContentCount = 1 };
+
+static const SimpleHiddenContentInfo kSimpleHiddenContentInfo [kSimpleHiddenContentCount] =
+	{
+		{ kTIFF_TNailIFD, kTIFF_JPEGInterchangeFormat, kTIFF_JPEGInterchangeFormatLength }
+	};
+
+// -------------------------------------------------------------------------------------------------
+
+void TIFF_FileWriter::UpdateMemByRewrite ( XMP_Uns8** newStream_out, XMP_Uns32* newLength_out )
+{
+	const InternalTagInfo* tagInfo;
+
+	// Check for tags that we don't tolerate because they have data we can't (or refuse to) find.
+
+	for ( XMP_Uns8 ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+		for ( int i = 0; kNoGoTags[i] != 0xFFFF; ++i ) {
+			tagInfo = this->FindTagInIFD ( ifd, kNoGoTags[i] );
+			if ( tagInfo != 0 ) XMP_Throw ( "Tag not tolerated for TIFF rewrite", kXMPErr_Unimplemented );
+		}
+	}
+
+	// Delete unwanted tags.
+
+	for ( XMP_Uns8 ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+		for ( int i = 0; kBanishedTags[i] != 0xFFFF; ++i ) {
+			this->DeleteTag ( ifd, kBanishedTags[i] );
+		}
+	}
+
+	// Determine the offsets and additional size for the hidden offset content. Set the offset tags
+	// to the new offset so that UpdateMemByAppend writes the new offsets.
+
+	XMP_Uns32 hiddenContentLength = 0;
+	XMP_Uns32 hiddenContentOrigin = this->DetermineVisibleLength();
+
+	SimpleHiddenContentLocations hiddenLocations [kSimpleHiddenContentCount];
+
+	for ( int i = 0; i < kSimpleHiddenContentCount; ++i ) {
+
+		const SimpleHiddenContentInfo & hiddenInfo ( kSimpleHiddenContentInfo[i] );
+
+		bool haveLength = this->GetTag_Integer ( hiddenInfo.ifd, hiddenInfo.lengthTag, &hiddenLocations[i].length );
+		bool haveOffset = this->GetTag_Integer ( hiddenInfo.ifd, hiddenInfo.offsetTag, &hiddenLocations[i].oldOffset );
+		if ( haveLength != haveOffset ) XMP_Throw ( "Unpaired simple hidden content tag", kXMPErr_BadTIFF );
+		if ( (! haveLength) || (hiddenLocations[i].length == 0) ) continue;
+
+		hiddenLocations[i].newOffset = hiddenContentOrigin + hiddenContentLength;
+		this->SetTag_Long ( hiddenInfo.ifd, hiddenInfo.offsetTag, hiddenLocations[i].newOffset );
+		hiddenContentLength += ((hiddenLocations[i].length + 1) & 0xFFFFFFFE);	// ! Round up for even offsets.
+
+	}
+
+	// Save any old memory stream for the content behind hidden offsets. Setup a bare TIFF header.
+
+	XMP_Uns8* oldStream = this->memStream;
+	bool ownedOldStream = this->ownedStream;
+
+	XMP_Uns8 bareTIFF [8];
+	if ( this->bigEndian ) {
+		bareTIFF[0] = 0x4D; bareTIFF[1] = 0x4D; bareTIFF[2] = 0x00; bareTIFF[3] = 0x2A;
+	} else {
+		bareTIFF[0] = 0x49; bareTIFF[1] = 0x49; bareTIFF[2] = 0x2A; bareTIFF[3] = 0x00;
+	}
+	*((XMP_Uns32*)&bareTIFF[4]) = 0;
+
+	this->memStream = &bareTIFF[0];
+	this->tiffLength = sizeof ( bareTIFF );
+	this->ownedStream = false;
+
+	// Call UpdateMemByAppend to write the new stream, telling it to append everything.
+
+	this->UpdateMemByAppend ( newStream_out, newLength_out, true, hiddenContentLength );
+
+	// Copy the hidden content and update the output stream length;
+
+	XMP_Assert ( *newLength_out == hiddenContentOrigin );
+	*newLength_out += hiddenContentLength;
+
+	for ( int i = 0; i < kSimpleHiddenContentCount; ++i ) {
+
+		if ( hiddenLocations[i].length == 0 ) continue;
+
+		XMP_Uns8* srcPtr  = oldStream + hiddenLocations[i].oldOffset;
+		XMP_Uns8* destPtr = *newStream_out + hiddenLocations[i].newOffset;
+		memcpy ( destPtr, srcPtr, hiddenLocations[i].length );	// AUDIT: Safe copy, not user data, computed length.
+
+	}
+	
+	// Delete the old stream if appropriate.
+	
+	if ( ownedOldStream ) delete ( oldStream );
+
+}	// TIFF_FileWriter::UpdateMemByRewrite
+
+// =================================================================================================
+// TIFF_FileWriter::UpdateMemoryStream
+// ===================================
+//
+// Normally we update TIFF in a conservative "by-append" manner. Changes are written in-place where
+// they fit, anything requiring growth is appended to the end and the old space is abandoned. The
+// end for memory-based TIFF is the end of the data block, the end for file-based TIFF is the end of
+// the file. This update-by-append model has the advantage of not perturbing any hidden offsets, a
+// common feature of proprietary MakerNotes.
+//
+// The condenseStream parameter can be used to rewrite the full stream instead of appending. This
+// will discard any MakerNote tags and risks breaking offsets that are hidden. This can be necessary
+// though to try to make the TIFF fit in a JPEG file.
+
+XMP_Uns32 TIFF_FileWriter::UpdateMemoryStream ( void** dataPtr, bool condenseStream /* = false */ )
+{
+	if ( this->fileParsed ) XMP_Throw ( "Not memory based", kXMPErr_EnforceFailure );
+
+	this->changed |= condenseStream;	// Make sure a compaction request takes effect.
+	if ( ! this->changed ) {
+		if ( dataPtr != 0 ) *dataPtr = this->memStream;
+		return this->tiffLength;
+	}
+
+	this->PreflightIFDLinkage();
+
+	bool nowEmpty = true;
+	for ( size_t i = 0; i < kTIFF_KnownIFDCount; ++i ) {
+		if ( ! this->containedIFDs[i].tagMap.empty() ) {
+			nowEmpty = false;
+			break;
+		}
+	}
+
+	XMP_Uns8* newStream = 0;
+	XMP_Uns32 newLength = 0;
+
+	if ( nowEmpty ) {
+
+		this->DeleteExistingInfo();	// Prepare for an empty reparse.
+
+	} else {
+
+		if ( this->tiffLength == 0 ) {	// ! An empty parse does set this->memParsed.
+			condenseStream = true;		// Makes "conjured" TIFF take the full rewrite path.
+		}
+
+		if ( condenseStream ) {
+			this->UpdateMemByRewrite ( &newStream, &newLength );
+		} else {
+			this->UpdateMemByAppend ( &newStream, &newLength );
+		}
+
+	}
+
+	// Parse the revised stream. This is the cleanest way to rebuild the tag map.
+
+	this->ParseMemoryStream ( newStream, newLength, kDoNotCopyData );
+	XMP_Assert ( this->tiffLength == newLength );
+	this->ownedStream = (newLength > 0);	// ! We really do own the new stream, if not empty.
+
+	if ( dataPtr != 0 ) *dataPtr = this->memStream;
+	return newLength;
+
+}	// TIFF_FileWriter::UpdateMemoryStream
+
+// =================================================================================================
+// TIFF_FileWriter::UpdateFileStream
+// =================================
+//
+// Updating a file stream is done in the same general manner as updating a memory stream, the intro
+// comments for UpdateMemoryStream largely apply. The file update happens in 3 phases:
+//   1. Determine which IFDs will be appended, and the new offsets for the appended IFDs and tags.
+//   2. Do the in-place update for the IFDs and tag values that fit.
+//   3. Append the IFDs and tag values that grow.
+//
+// The file being updated must match the file that was previously parsed. Offsets and lengths saved
+// when parsing are used to decide if something can be updated in-place or must be appended.
+
+// *** The general linked structure of TIFF makes it very difficult to process the file in a single
+// *** sequential pass. This implementation uses a simple seek/write model for the in-place updates.
+// *** In the future we might want to consider creating a map of what gets updated, allowing use of
+// *** a possibly more efficient buffered model.
+
+// ** Someday we might want to use the FreeOffsets and FreeByteCounts tags to track free space.
+// ** Probably not a huge win in practice though, and the TIFF spec says they are not recommended
+// ** for general interchange use.
+
+#ifndef Trace_UpdateFileStream
+	#define Trace_UpdateFileStream 0
+#endif
+
+void TIFF_FileWriter::UpdateFileStream ( XMP_IO* fileRef, XMP_ProgressTracker* progressTracker )
+{
+	if ( this->memParsed ) XMP_Throw ( "Not file based", kXMPErr_EnforceFailure );
+	if ( ! this->changed ) return;
+
+	XMP_Int64 origDataLength = fileRef->Length();
+	if ( (origDataLength >> 32) != 0 ) XMP_Throw ( "TIFF files can't exceed 4GB", kXMPErr_BadTIFF );
+
+	bool appendedIFDs[kTIFF_KnownIFDCount];
+	XMP_Uns32 newIFDOffsets[kTIFF_KnownIFDCount];
+
+	#if Trace_UpdateFileStream
+		printf ( "\nStarting update of TIFF file stream\n" );
+	#endif
+
+	XMP_Uns32 appendedOrigin = (XMP_Uns32)origDataLength;
+	if ( (appendedOrigin & 1) != 0 ) {
+		++appendedOrigin;	// Start at an even offset.
+		fileRef->Seek ( 0, kXMP_SeekFromEnd  );
+		fileRef->Write ( "\0", 1 );
+	}
+
+	this->PreflightIFDLinkage();
+
+	XMP_Uns32 appendedLength = DetermineAppendInfo ( appendedOrigin, appendedIFDs, newIFDOffsets );
+	if ( appendedLength > (0xFFFFFFFFUL - appendedOrigin) ) XMP_Throw ( "TIFF files can't exceed 4GB", kXMPErr_BadTIFF );
+
+	if ( progressTracker != 0 ) {
+
+		float filesize=0;
+
+		for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+			InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+			if ( ! thisIFD.changed ) continue;
+
+			filesize += (thisIFD.tagMap.size() * sizeof(RawIFDEntry) + 6);
+
+			InternalTagMap::iterator tagPos;
+			InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+
+			for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+				InternalTagInfo & thisTag = tagPos->second;
+				if ( (! thisTag.changed) || (thisTag.dataLen <= 4)  ) continue;
+				filesize += (thisTag.dataLen) ;
+			}
+		}
+
+		if ( appendedIFDs[kTIFF_PrimaryIFD] ) filesize += 4;
+		XMP_Assert ( progressTracker->WorkInProgress() );
+		progressTracker->AddTotalWork ( filesize );
+
+	}
+
+	// Do the in-place update for the IFDs and tag values that fit. This part does separate seeks
+	// and writes for the IFDs and values. Things to be updated can be anywhere in the file.
+
+	// *** This might benefit from a map of the in-place updates. This would allow use of a possibly
+	// *** more efficient sequential I/O model. Could even incorporate the safe update file copying.
+
+	for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+		InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+		if ( ! thisIFD.changed ) continue;
+
+		// In order to get a little bit of locality, write the IFD first then the changed tags that
+		// have large values and fit in-place.
+
+		if ( ! appendedIFDs[ifd] ) {
+			#if Trace_UpdateFileStream
+				printf ( "  Updating IFD %d in-place at offset %d (0x%X)\n", ifd, thisIFD.origIFDOffset, thisIFD.origIFDOffset );
+			#endif
+			fileRef->Seek ( thisIFD.origIFDOffset, kXMP_SeekFromStart  );
+			this->WriteFileIFD ( fileRef, thisIFD );
+		}
+
+		InternalTagMap::iterator tagPos;
+		InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+
+		for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+			InternalTagInfo & thisTag = tagPos->second;
+			if ( (! thisTag.changed) || (thisTag.dataLen <= 4) || (thisTag.dataLen > thisTag.origDataLen) ) continue;
+			#if Trace_UpdateFileStream
+				printf ( "    Updating tag %d in IFD %d in-place at offset %d (0x%X)\n", thisTag.id, ifd, thisTag.origDataOffset, thisTag.origDataOffset );
+			#endif
+			fileRef->Seek ( thisTag.origDataOffset, kXMP_SeekFromStart  );
+			fileRef->Write ( thisTag.dataPtr, thisTag.dataLen );
+		}
+
+	}
+
+	// Append the IFDs and tag values that grow.
+
+	XMP_Int64 fileEnd = fileRef->Seek ( 0, kXMP_SeekFromEnd  );
+	XMP_Assert ( fileEnd == appendedOrigin );
+
+	for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+		InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+		if ( ! thisIFD.changed ) continue;
+
+		if ( appendedIFDs[ifd] ) {
+			#if Trace_UpdateFileStream
+				printf ( "  Updating IFD %d by append at offset %d (0x%X)\n", ifd, newIFDOffsets[ifd], newIFDOffsets[ifd] );
+			#endif
+			XMP_Assert ( newIFDOffsets[ifd] == fileRef->Length() );
+			this->WriteFileIFD ( fileRef, thisIFD );
+		}
+
+		InternalTagMap::iterator tagPos;
+		InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+
+		for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+			InternalTagInfo & thisTag = tagPos->second;
+			if ( (! thisTag.changed) || (thisTag.dataLen <= 4) || (thisTag.dataLen <= thisTag.origDataLen) ) continue;
+			#if Trace_UpdateFileStream
+				XMP_Uns32 newOffset = this->GetUns32(&thisTag.origDataOffset);
+				printf ( "    Updating tag %d in IFD %d by append at offset %d (0x%X)\n", thisTag.id, ifd, newOffset, newOffset );
+			#endif
+			XMP_Assert ( this->GetUns32(&thisTag.smallValue) == fileRef->Length() );
+			fileRef->Write ( thisTag.dataPtr, thisTag.dataLen );
+			if ( (thisTag.dataLen & 1) != 0 ) fileRef->Write ( "\0", 1 );
+		}
+
+	}
+
+	// Back-fill the offset for the primary IFD, if it is now appended.
+
+	XMP_Uns32 newOffset;
+
+	if ( appendedIFDs[kTIFF_PrimaryIFD] ) {
+		this->PutUns32 ( newIFDOffsets[kTIFF_PrimaryIFD], &newOffset );
+		#if TraceUpdateFileStream
+			printf ( "  Back-filling offset of primary IFD, pointing to %d (0x%X)\n", newOffset, newOffset );
+		#endif
+		fileRef->Seek ( 4, kXMP_SeekFromStart  );
+		fileRef->Write ( &newOffset, 4 );
+	}
+
+	// Reset the changed flags and original length/offset values. This simulates a reparse of the
+	// updated file.
+
+	for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {
+
+		InternalIFDInfo & thisIFD = this->containedIFDs[ifd];
+		if ( ! thisIFD.changed ) continue;
+
+		thisIFD.changed = false;
+		thisIFD.origCount  = (XMP_Uns16)( thisIFD.tagMap.size() );
+		thisIFD.origIFDOffset = newIFDOffsets[ifd];
+
+		InternalTagMap::iterator tagPos;
+		InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+
+		for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+			InternalTagInfo & thisTag = tagPos->second;
+			if ( ! thisTag.changed ) continue;
+			thisTag.changed = false;
+			thisTag.origDataLen = thisTag.dataLen;
+			if ( thisTag.origDataLen > 4 ) thisTag.origDataOffset = this->GetUns32 ( &thisTag.smallValue );
+		}
+
+	}
+
+	this->tiffLength = (XMP_Uns32) fileRef->Length();
+	fileRef->Seek ( 0, kXMP_SeekFromEnd  );	// Can't hurt.
+
+	#if Trace_UpdateFileStream
+		printf ( "\nFinished update of TIFF file stream\n" );
+	#endif
+
+}	// TIFF_FileWriter::UpdateFileStream
+
+// =================================================================================================
+// TIFF_FileWriter::WriteFileIFD
+// =============================
+
+void TIFF_FileWriter::WriteFileIFD ( XMP_IO* fileRef, InternalIFDInfo & thisIFD )
+{
+	XMP_Uns16 tagCount;
+	this->PutUns16 ( (XMP_Uns16)thisIFD.tagMap.size(), &tagCount );
+	fileRef->Write ( &tagCount, 2 );
+
+	InternalTagMap::iterator tagPos;
+	InternalTagMap::iterator tagEnd = thisIFD.tagMap.end();
+
+	for ( tagPos = thisIFD.tagMap.begin(); tagPos != tagEnd; ++tagPos ) {
+
+		InternalTagInfo & thisTag = tagPos->second;
+		RawIFDEntry ifdEntry;
+
+		this->PutUns16 ( thisTag.id, &ifdEntry.id );
+		this->PutUns16 ( thisTag.type, &ifdEntry.type );
+		this->PutUns32 ( thisTag.count, &ifdEntry.count );
+		ifdEntry.dataOrOffset = thisTag.smallValue;	// ! Already in stream endianness.
+
+		fileRef->Write ( &ifdEntry, sizeof(ifdEntry) );
+		XMP_Assert ( sizeof(ifdEntry) == 12 );
+
+	}
+
+	XMP_Uns32 nextIFD;
+	this->PutUns32 ( thisIFD.origNextIFD, &nextIFD );
+	fileRef->Write ( &nextIFD, 4 );
+
+}	// TIFF_FileWriter::WriteFileIFD
diff --git a/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp b/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp
new file mode 100644
index 0000000..fcf9e43
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp
@@ -0,0 +1,711 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "source/XIO.hpp"
+#include "source/EndianUtils.hpp"
+
+// =================================================================================================
+/// \file TIFF_MemoryReader.cpp
+/// \brief Implementation of the memory-based read-only TIFF_Manager.
+///
+/// The read-only forms of TIFF_Manager are derived from TIFF_Reader. The GetTag methods are common
+/// implementations in TIFF_Reader. The parsing code is different in the TIFF_MemoryReader and
+/// TIFF_FileReader constructors. There are also separate destructors to release captured info.
+///
+/// The read-only implementations use runtime data that is simple tweaks on the stored form. The
+/// memory-based reader has one block of data for the whole TIFF stream. The file-based reader has
+/// one for each IFD, plus one for the collected non-local data for each IFD. Otherwise the logic
+/// is the same in both cases.
+///
+/// The count for each IFD is extracted and a pointer set to the first entry in each IFD (serving as
+/// a normal C array pointer). The IFD entries are tweaked as follows:
+///
+/// \li The id and type fields are converted to native values.
+/// \li The count field is converted to a native byte count.
+/// \li If the data is not inline the offset is converted to a pointer.
+///
+/// The tag values, whether inline or not, are not converted to native values. The values returned
+/// from the GetTag methods are converted on the fly. The id, type, and count fields are easier to
+/// convert because their types are fixed. They are used more, and more valuable to convert.
+// =================================================================================================
+
+// =================================================================================================
+// TIFF_MemoryReader::SortIFD
+// ==========================
+//
+// Does a fairly simple minded insertion-like sort. This sort is not going to be optimal for edge
+// cases like and IFD with lots of duplicates.
+
+// *** Might be better done using read and write pointers and two loops. The first loop moves out
+// *** of order tags by a modified bubble sort, shifting the middle down one at a time in the loop.
+// *** The first loop stops when a duplicate is hit. The second loop continues by moving the tail
+// *** entries up to the appropriate slot.
+
+void TIFF_MemoryReader::SortIFD ( TweakedIFDInfo* thisIFD )
+{
+
+	XMP_Uns16 tagCount = thisIFD->count;
+	TweakedIFDEntry* ifdEntries = thisIFD->entries;
+	XMP_Uns16 prevTag = GetUns16AsIs ( &ifdEntries[0].id );
+
+	for ( size_t i = 1; i < tagCount; ++i ) {
+
+		XMP_Uns16 thisTag = GetUns16AsIs ( &ifdEntries[i].id );
+
+		if ( thisTag > prevTag ) {
+
+			// In proper order.
+			prevTag = thisTag;
+
+		} else if ( thisTag == prevTag ) {
+
+			// Duplicate tag, keep the 2nd copy, move the tail of the array up, prevTag is unchanged.
+			memmove ( &ifdEntries[i-1], &ifdEntries[i], 12*(tagCount-i) ); // may overlap -- Hub
+			--tagCount;
+			--i; // ! Don't move forward in the array, we've moved the unseen part up.
+
+		} else if ( thisTag < prevTag ) {
+
+			// Out of order, move this tag up, prevTag is unchanged. Might still be a duplicate!
+			XMP_Int32 j;	// ! Need a signed value.
+			for ( j = (XMP_Int32)i-1; j >= 0; --j ) {
+				if ( GetUns16AsIs(&ifdEntries[j].id) <= thisTag ) break;
+			}
+
+			if ( (j >= 0) && (ifdEntries[j].id == thisTag) ) {
+
+				// Out of order duplicate, move it to position j, move the tail of the array up.
+				ifdEntries[j] = ifdEntries[i];
+				memmove ( &ifdEntries[i], &ifdEntries[i+1], 12*(tagCount-(i+1)) );	// may overlap -- Hub
+				--tagCount;
+				--i; // ! Don't move forward in the array, we've moved the unseen part up.
+
+			} else {
+
+				// Move the out of order entry to position j+1, move the middle of the array down.
+				#if ! (SUNOS_SPARC || XMP_IOS_ARM)
+					TweakedIFDEntry temp = ifdEntries[i];
+					++j;	// ! So the insertion index becomes j.
+					memmove ( &ifdEntries[j+1], &ifdEntries[j], 12*(i-j) );	// FAILED -- AUDIT: Safe, moving less than i entries to a location before i.
+					ifdEntries[j] = temp;
+				#else
+					void * tempifdEntries = &ifdEntries[i];
+					TweakedIFDEntry temp;
+					memcpy ( &temp, tempifdEntries, sizeof(TweakedIFDEntry) );
+					++j;	// ! So the insertion index becomes j.
+					memmove ( &ifdEntries[j+1], &ifdEntries[j], 12*(i-j) );	// FAILED -- AUDIT: Safe, moving less than i entries to a location before i.
+					tempifdEntries = &ifdEntries[j];
+					memcpy ( tempifdEntries, &temp, sizeof(TweakedIFDEntry) );
+				#endif
+
+			}
+
+		}
+
+	}
+
+	thisIFD->count = tagCount;	// Save the final count.
+
+}	// TIFF_MemoryReader::SortIFD
+
+// =================================================================================================
+// TIFF_MemoryReader::GetIFD
+// =========================
+
+bool TIFF_MemoryReader::GetIFD ( XMP_Uns8 ifd, TagInfoMap* ifdMap ) const
+{
+	if ( ifd > kTIFF_LastRealIFD ) XMP_Throw ( "Invalid IFD requested", kXMPErr_InternalFailure );
+	const TweakedIFDInfo* thisIFD = &containedIFDs[ifd];
+
+	if ( ifdMap != 0 ) ifdMap->clear();
+	if ( thisIFD->count == 0 ) return false;
+
+	if ( ifdMap != 0 ) {
+
+		for ( size_t i = 0; i < thisIFD->count; ++i ) {
+
+			TweakedIFDEntry* thisTag = &(thisIFD->entries[i]);
+			if ( (thisTag->type < kTIFF_ByteType) || (thisTag->type > kTIFF_LastType) ) continue;	// Bad type, skip this tag.
+
+			TagInfo info ( thisTag->id, thisTag->type, 0, 0, GetUns32AsIs(&thisTag->bytes)  );
+			info.count = info.dataLen / (XMP_Uns32)kTIFF_TypeSizes[info.type];
+			info.dataPtr = this->GetDataPtr ( thisTag );
+
+			(*ifdMap)[info.id] = info;
+
+		}
+
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetIFD
+
+// =================================================================================================
+// TIFF_MemoryReader::FindTagInIFD
+// ===============================
+
+const TIFF_MemoryReader::TweakedIFDEntry* TIFF_MemoryReader::FindTagInIFD ( XMP_Uns8 ifd, XMP_Uns16 id ) const
+{
+	if ( ifd == kTIFF_KnownIFD ) {
+		// ... lookup the tag in the known tag map
+	}
+
+	if ( ifd > kTIFF_LastRealIFD ) XMP_Throw ( "Invalid IFD requested", kXMPErr_InternalFailure );
+	const TweakedIFDInfo* thisIFD = &containedIFDs[ifd];
+
+	if ( thisIFD->count == 0 ) return 0;
+
+	XMP_Uns32 spanLength = thisIFD->count;
+	const TweakedIFDEntry* spanBegin = &(thisIFD->entries[0]);
+
+	while ( spanLength > 1 ) {
+
+		XMP_Uns32 halfLength = spanLength >> 1;	// Since spanLength > 1, halfLength > 0.
+		const TweakedIFDEntry* spanMiddle = spanBegin + halfLength;
+
+		// There are halfLength entries below spanMiddle, then the spanMiddle entry, then
+		// spanLength-halfLength-1 entries above spanMiddle (which can be none).
+
+		XMP_Uns16 middleID = GetUns16AsIs ( &spanMiddle->id );
+		if ( middleID == id ) {
+			spanBegin = spanMiddle;
+			break;
+		} else if ( middleID > id ) {
+			spanLength = halfLength;	// Discard the middle.
+		} else {
+			spanBegin = spanMiddle;	// Keep a valid spanBegin for the return check, don't use spanMiddle+1.
+			spanLength -= halfLength;
+		}
+
+	}
+
+	if ( GetUns16AsIs(&spanBegin->id) != id ) spanBegin = 0;
+	return spanBegin;
+
+}	// TIFF_MemoryReader::FindTagInIFD
+
+// =================================================================================================
+// TIFF_MemoryReader::GetValueOffset
+// =================================
+
+XMP_Uns32 TIFF_MemoryReader::GetValueOffset ( XMP_Uns8 ifd, XMP_Uns16 id ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return 0;
+
+	XMP_Uns8 * valuePtr = (XMP_Uns8*) this->GetDataPtr ( thisTag );
+
+	return (XMP_Uns32)(valuePtr - this->tiffStream);	// ! TIFF streams can't exceed 4GB.
+
+}	// TIFF_MemoryReader::GetValueOffset
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag
+// =========================
+
+bool TIFF_MemoryReader::GetTag ( XMP_Uns8 ifd, XMP_Uns16 id, TagInfo* info ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	
+	XMP_Uns16 thisType = GetUns16AsIs ( &thisTag->type );
+	XMP_Uns32 thisBytes = GetUns32AsIs ( &thisTag->bytes );
+	
+	if ( (thisType < kTIFF_ByteType) || (thisType > kTIFF_LastType) ) return false;	// Bad type, skip this tag.
+
+	if ( info != 0 ) {
+
+		info->id = GetUns16AsIs ( &thisTag->id );
+		info->type = thisType;
+		info->count = thisBytes / (XMP_Uns32)kTIFF_TypeSizes[thisType];
+		info->dataLen = thisBytes;
+
+		info->dataPtr = this->GetDataPtr ( thisTag );
+		// Here we know that if it is NULL, it is wrong. -- Hub
+		// GetDataPtr will return NULL in case of overflow.
+		if (info->dataPtr == NULL) {
+			return false;
+		}
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag
+
+// =================================================================================================
+
+static inline XMP_Uns8 GetUns8 ( const void* dataPtr )
+{
+	return *((XMP_Uns8*)dataPtr);
+}
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_Integer
+// =================================
+//
+// Tolerate any size or sign.
+
+bool TIFF_MemoryReader::GetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+
+	if ( thisTag->type > kTIFF_LastType ) return false;	// Unknown type.
+	if ( GetUns32AsIs(&thisTag->bytes) != kTIFF_TypeSizes[thisTag->type] ) return false;	// Wrong count.
+
+	XMP_Uns32 uns32;
+	XMP_Int32 int32;
+
+	switch ( thisTag->type ) {
+	
+		case kTIFF_ByteType:
+			uns32 = GetUns8 ( this->GetDataPtr ( thisTag ) );
+			break;
+	
+		case kTIFF_ShortType:
+			uns32 = this->GetUns16 ( this->GetDataPtr ( thisTag ) );
+			break;
+	
+		case kTIFF_LongType:
+			uns32 = this->GetUns32 ( this->GetDataPtr ( thisTag ) );
+			break;
+	
+		case kTIFF_SByteType:
+			int32 = (XMP_Int8) GetUns8 ( this->GetDataPtr ( thisTag ) );
+			uns32 = (XMP_Uns32) int32;	// Make sure sign bits are properly set.
+			break;
+	
+		case kTIFF_SShortType:
+			int32 = (XMP_Int16) this->GetUns16 ( this->GetDataPtr ( thisTag ) );
+			uns32 = (XMP_Uns32) int32;	// Make sure sign bits are properly set.
+			break;
+	
+		case kTIFF_SLongType:
+			int32 = (XMP_Int32) this->GetUns32 ( this->GetDataPtr ( thisTag ) );
+			uns32 = (XMP_Uns32) int32;	// Make sure sign bits are properly set.
+			break;
+	
+		default: return false;
+
+	}
+
+	if ( data != 0 ) *data = uns32;
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_Integer
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_Byte
+// ==============================
+
+bool TIFF_MemoryReader::GetTag_Byte ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns8* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_ByteType) || (thisTag->bytes != 1) ) return false;
+
+	if ( data != 0 ) {
+		*data = * ( (XMP_Uns8*) this->GetDataPtr ( thisTag ) );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_Byte
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_SByte
+// ===============================
+
+bool TIFF_MemoryReader::GetTag_SByte ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int8* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_SByteType) || (thisTag->bytes != 1) ) return false;
+
+	if ( data != 0 ) {
+		*data = * ( (XMP_Int8*) this->GetDataPtr ( thisTag ) );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_SByte
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_Short
+// ===============================
+
+bool TIFF_MemoryReader::GetTag_Short ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_ShortType) || (thisTag->bytes != 2) ) return false;
+
+	if ( data != 0 ) {
+		*data = this->GetUns16 ( this->GetDataPtr ( thisTag ) );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_Short
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_SShort
+// ================================
+
+bool TIFF_MemoryReader::GetTag_SShort ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int16* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_SShortType) || (thisTag->bytes != 2) ) return false;
+
+	if ( data != 0 ) {
+		*data = (XMP_Int16) this->GetUns16 ( this->GetDataPtr ( thisTag ) );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_SShort
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_Long
+// ==============================
+
+bool TIFF_MemoryReader::GetTag_Long ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_LongType) || (thisTag->bytes != 4) ) return false;
+
+	if ( data != 0 ) {
+		*data = this->GetUns32 ( this->GetDataPtr ( thisTag ) );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_Long
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_SLong
+// ===============================
+
+bool TIFF_MemoryReader::GetTag_SLong ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_SLongType) || (thisTag->bytes != 4) ) return false;
+
+	if ( data != 0 ) {
+		*data = (XMP_Int32) this->GetUns32 ( this->GetDataPtr ( thisTag ) );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_SLong
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_Rational
+// ==================================
+
+bool TIFF_MemoryReader::GetTag_Rational ( XMP_Uns8 ifd, XMP_Uns16 id, Rational* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_RationalType) || (thisTag->bytes != 8) ) return false;
+
+	if ( data != 0 ) {
+		XMP_Uns32* dataPtr = (XMP_Uns32*) this->GetDataPtr ( thisTag );
+		data->num = this->GetUns32 ( dataPtr );
+		data->denom = this->GetUns32 ( dataPtr+1 );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_Rational
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_SRational
+// ===================================
+
+bool TIFF_MemoryReader::GetTag_SRational ( XMP_Uns8 ifd, XMP_Uns16 id, SRational* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_SRationalType) || (thisTag->bytes != 8) ) return false;
+
+	if ( data != 0 ) {
+		XMP_Uns32* dataPtr = (XMP_Uns32*) this->GetDataPtr ( thisTag );
+		data->num = (XMP_Int32) this->GetUns32 ( dataPtr );
+		data->denom = (XMP_Int32) this->GetUns32 ( dataPtr+1 );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_SRational
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_Float
+// ===============================
+
+bool TIFF_MemoryReader::GetTag_Float ( XMP_Uns8 ifd, XMP_Uns16 id, float* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_FloatType) || (thisTag->bytes != 4) ) return false;
+
+	if ( data != 0 ) {
+		*data = this->GetFloat ( this->GetDataPtr ( thisTag ) );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_Float
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_Double
+// ================================
+
+bool TIFF_MemoryReader::GetTag_Double ( XMP_Uns8 ifd, XMP_Uns16 id, double* data ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( (thisTag->type != kTIFF_DoubleType) || (thisTag->bytes != 8) ) return false;
+
+	if ( data != 0 ) {
+		double* dataPtr = (double*) this->GetDataPtr ( thisTag );
+		*data = this->GetDouble ( dataPtr );
+	}
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_Double
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_ASCII
+// ===============================
+
+bool TIFF_MemoryReader::GetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr* dataPtr, XMP_StringLen* dataLen ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( thisTag->type != kTIFF_ASCIIType ) return false;
+
+	if ( dataPtr != 0 ) {
+		*dataPtr = (XMP_StringPtr) this->GetDataPtr ( thisTag );
+	}
+
+	if ( dataLen != 0 ) *dataLen = thisTag->bytes;
+
+	return true;
+
+}	// TIFF_MemoryReader::GetTag_ASCII
+
+// =================================================================================================
+// TIFF_MemoryReader::GetTag_EncodedString
+// =======================================
+
+bool TIFF_MemoryReader::GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const
+{
+	const TweakedIFDEntry* thisTag = this->FindTagInIFD ( ifd, id );
+	if ( thisTag == 0 ) return false;
+	if ( thisTag->type != kTIFF_UndefinedType ) return false;
+
+	if ( utf8Str == 0 ) return true;	// Return true if the converted string is not wanted.
+
+	bool ok = this->DecodeString ( this->GetDataPtr ( thisTag ), thisTag->bytes, utf8Str );
+	return ok;
+
+}	// TIFF_MemoryReader::GetTag_EncodedString
+
+// =================================================================================================
+// TIFF_MemoryReader::ParseMemoryStream
+// ====================================
+
+// *** Need to tell TIFF/Exif from TIFF/EP, DNG files are the latter.
+
+void TIFF_MemoryReader::ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData /* = true */ )
+{
+	// Get rid of any current TIFF.
+
+	if ( this->ownedStream ) free ( this->tiffStream );
+	this->ownedStream = false;
+	this->tiffStream  = 0;
+	this->tiffLength  = 0;
+
+	for ( size_t i = 0; i < kTIFF_KnownIFDCount; ++i ) {
+		this->containedIFDs[i].count = 0;
+		this->containedIFDs[i].entries = 0;
+	}
+
+	if ( length == 0 ) return;
+
+	// Allocate space for the full in-memory stream and copy it.
+
+	if ( ! copyData ) {
+		XMP_Assert ( ! this->ownedStream );
+		this->tiffStream = (XMP_Uns8*) data;
+	} else {
+		if ( length > 100*1024*1024 ) XMP_Throw ( "Outrageous length for memory-based TIFF", kXMPErr_BadTIFF );
+		this->tiffStream = (XMP_Uns8*) malloc(length);
+		if ( this->tiffStream == 0 ) XMP_Throw ( "Out of memory", kXMPErr_NoMemory );
+		memcpy ( this->tiffStream, data, length );	// AUDIT: Safe, malloc'ed length bytes above.
+		this->ownedStream = true;
+	}
+
+	this->tiffLength = length;
+	XMP_Uns32 ifdLimit = this->tiffLength - 6;	// An IFD must start before this offset.
+
+	// Find and process the primary, Exif, GPS, and Interoperability IFDs.
+
+	XMP_Uns32 primaryIFDOffset = this->CheckTIFFHeader ( this->tiffStream, length );
+	XMP_Uns32 tnailIFDOffset   = 0;
+
+	if ( primaryIFDOffset != 0 ) tnailIFDOffset = this->ProcessOneIFD ( primaryIFDOffset, kTIFF_PrimaryIFD );
+	
+	// ! Need the thumbnail IFD for checking full Exif APP1 in some JPEG files!
+	if ( tnailIFDOffset != 0 ) {
+		if ( IsOffsetValid(tnailIFDOffset, 8, ifdLimit ) ) { 	// Ignore a bad Thumbnail IFD offset.
+			(void) this->ProcessOneIFD ( tnailIFDOffset, kTIFF_TNailIFD );
+		} else {
+			XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+			this->NotifyClient (kXMPErrSev_Recoverable, error );
+		}
+	}
+
+	const TweakedIFDEntry* exifIFDTag = this->FindTagInIFD ( kTIFF_PrimaryIFD, kTIFF_ExifIFDPointer );
+	if ( (exifIFDTag != 0) && (exifIFDTag->type == kTIFF_LongType) && (GetUns32AsIs(&exifIFDTag->bytes) == 4) ) {
+		XMP_Uns32 exifOffset = this->GetUns32 ( &exifIFDTag->dataOrPos );
+		(void) this->ProcessOneIFD ( exifOffset, kTIFF_ExifIFD );
+	}
+
+	const TweakedIFDEntry* gpsIFDTag = this->FindTagInIFD ( kTIFF_PrimaryIFD, kTIFF_GPSInfoIFDPointer );
+	if ( (gpsIFDTag != 0) && (gpsIFDTag->type == kTIFF_LongType) && (GetUns32AsIs(&gpsIFDTag->bytes) == 4) ) {
+		XMP_Uns32 gpsOffset = this->GetUns32 ( &gpsIFDTag->dataOrPos );
+		if ( IsOffsetValid ( gpsOffset, 8, ifdLimit ) ) {	// Ignore a bad GPS IFD offset.
+			(void) this->ProcessOneIFD ( gpsOffset, kTIFF_GPSInfoIFD );
+		} else {
+			XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+			this->NotifyClient (kXMPErrSev_Recoverable, error );
+		}
+	}
+
+	const TweakedIFDEntry* interopIFDTag = this->FindTagInIFD ( kTIFF_ExifIFD, kTIFF_InteroperabilityIFDPointer );
+	if ( (interopIFDTag != 0) && (interopIFDTag->type == kTIFF_LongType) && (GetUns32AsIs(&interopIFDTag->bytes) == 4) ) {
+		XMP_Uns32 interopOffset = this->GetUns32 ( &interopIFDTag->dataOrPos );
+		if ( IsOffsetValid ( interopOffset, 8, ifdLimit ) ) {	// Ignore a bad Interoperability IFD offset.
+			(void) this->ProcessOneIFD ( interopOffset, kTIFF_InteropIFD );
+		} else {
+			XMP_Error error ( kXMPErr_BadTIFF, "Bad IFD offset" );
+			this->NotifyClient (kXMPErrSev_Recoverable, error );
+		}
+	}
+
+}	// TIFF_MemoryReader::ParseMemoryStream
+
+// =================================================================================================
+// TIFF_MemoryReader::ProcessOneIFD
+// ================================
+
+XMP_Uns32 TIFF_MemoryReader::ProcessOneIFD ( XMP_Uns32 ifdOffset, XMP_Uns8 ifd )
+{
+	TweakedIFDInfo& ifdInfo = this->containedIFDs[ifd];
+
+	if ( (ifdOffset < 8) || (ifdOffset > (this->tiffLength - kEmptyIFDLength)) ) {
+		XMP_Error error(kXMPErr_BadTIFF, "Bad IFD offset" );
+		this->NotifyClient ( kXMPErrSev_FileFatal, error );
+	}
+
+	XMP_Uns8* ifdPtr = this->tiffStream + ifdOffset;
+	XMP_Uns16 ifdCount = this->GetUns16 ( ifdPtr );
+	TweakedIFDEntry* ifdEntries = (TweakedIFDEntry*)(ifdPtr+2);
+
+	if ( ifdCount >= 0x8000 ) {
+		XMP_Error error(kXMPErr_BadTIFF, "Outrageous IFD count" );
+		this->NotifyClient ( kXMPErrSev_FileFatal, error );
+	}
+
+	if ( (XMP_Uns32)(2 + ifdCount*12 + 4) > (this->tiffLength - ifdOffset) ) {
+		XMP_Error error(kXMPErr_BadTIFF, "Out of bounds IFD" );
+		this->NotifyClient ( kXMPErrSev_FileFatal, error );
+	}
+
+	ifdInfo.count = ifdCount;
+	ifdInfo.entries = ifdEntries;
+
+	XMP_Int32 prevTag = -1;	// ! The GPS IFD has a tag 0, so we need a signed initial value.
+	bool needsSorting = false;
+	for ( size_t i = 0; i < ifdCount; ++i ) {
+
+		TweakedIFDEntry* thisEntry = &ifdEntries[i];	// Tweak the IFD entry to be more useful.
+
+		if ( ! this->nativeEndian ) {
+			Flip2 ( &thisEntry->id );
+			Flip2 ( &thisEntry->type );
+			Flip4 ( &thisEntry->bytes );
+		}
+
+		if ( GetUns16AsIs(&thisEntry->id) <= prevTag ) needsSorting = true;
+		prevTag = GetUns16AsIs ( &thisEntry->id );
+
+		if ( (GetUns16AsIs(&thisEntry->type) < kTIFF_ByteType) || (GetUns16AsIs(&thisEntry->type) > kTIFF_LastType) ) continue;	// Bad type, skip this tag.
+
+		#if ! (SUNOS_SPARC || XMP_IOS_ARM)
+	
+			thisEntry->bytes *= (XMP_Uns32)kTIFF_TypeSizes[thisEntry->type];
+			if ( thisEntry->bytes > 4 ) {
+				if ( ! this->nativeEndian ) Flip4 ( &thisEntry->dataOrPos );
+				if ( (thisEntry->dataOrPos < 8) || (thisEntry->dataOrPos >= this->tiffLength) ) {
+					thisEntry->bytes = thisEntry->dataOrPos = 0;	// Make this bad tag look empty.
+				}
+				if ( thisEntry->bytes > (this->tiffLength - thisEntry->dataOrPos) ) {
+					thisEntry->bytes = thisEntry->dataOrPos = 0;	// Make this bad tag look empty.
+				}
+			}
+	
+		#else
+	
+			void *tempEntryByte = &thisEntry->bytes;
+			XMP_Uns32 temp = GetUns32AsIs(&thisEntry->bytes);
+			temp = temp * (XMP_Uns32)kTIFF_TypeSizes[GetUns16AsIs(&thisEntry->type)];
+			memcpy ( tempEntryByte, &temp, sizeof(thisEntry->bytes) );
+	
+			// thisEntry->bytes *= (XMP_Uns32)kTIFF_TypeSizes[thisEntry->type];
+			if ( GetUns32AsIs(&thisEntry->bytes) > 4 ) {
+				void *tempEntryDataOrPos = &thisEntry->dataOrPos;
+				if ( ! this->nativeEndian ) Flip4 ( &thisEntry->dataOrPos );
+				if ( (GetUns32AsIs(&thisEntry->dataOrPos) < 8) || (GetUns32AsIs(&thisEntry->dataOrPos) >= this->tiffLength) ) {
+					// thisEntry->bytes = thisEntry->dataOrPos = 0;	// Make this bad tag look empty.
+					memset ( tempEntryByte, 0, sizeof(XMP_Uns32) );
+					memset ( tempEntryDataOrPos, 0, sizeof(XMP_Uns32) );
+				}
+				if ( GetUns32AsIs(&thisEntry->bytes) > (this->tiffLength - GetUns32AsIs(&thisEntry->dataOrPos)) ) {
+					// thisEntry->bytes = thisEntry->dataOrPos = 0;	// Make this bad tag look empty.
+					memset ( tempEntryByte, 0, sizeof(XMP_Uns32) );
+					memset ( tempEntryDataOrPos, 0, sizeof(XMP_Uns32) );
+				}
+			}
+	
+		#endif
+
+	}
+
+	ifdPtr += (2 + ifdCount*12);
+	XMP_Uns32 nextIFDOffset = this->GetUns32 ( ifdPtr );
+
+	if ( needsSorting ) SortIFD ( &ifdInfo );	// ! Don't perturb the ifdCount used to find the next IFD offset.
+
+	return nextIFDOffset;
+
+}	// TIFF_MemoryReader::ProcessOneIFD
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.cpp b/XMPFiles/source/FormatSupport/TIFF_Support.cpp
new file mode 100644
index 0000000..08b0bc6
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/TIFF_Support.cpp
@@ -0,0 +1,460 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/TIFF_Support.hpp"
+#include "source/EndianUtils.hpp"
+#include "source/XIO.hpp"
+
+#include "source/UnicodeConversions.hpp"
+
+static const char * kTIFF_TypeNames[] = { "ShortOrLong", "BYTE", "ASCII", "SHORT", "LONG", "RATIONAL",
+										  "SBYTE", "UNDEFINED", "SSHORT", "SLONG", "SRATIONAL",
+										  "FLOAT", "DOUBLE" };
+
+// =================================================================================================
+/// \file TIFF_Support.cpp
+/// \brief Manager for parsing and serializing TIFF streams.
+///
+// =================================================================================================
+
+// =================================================================================================
+// TIFF_Manager::TIFF_Manager
+// ==========================
+
+static bool sFirstCTor = true;
+
+TIFF_Manager::TIFF_Manager()
+	: GetUns16(0), GetUns32(0), GetFloat(0), GetDouble(0),
+	  PutUns16(0), PutUns32(0), PutFloat(0), PutDouble(0),
+	  bigEndian(false), nativeEndian(false), errorCallbackPtr( NULL )
+{
+
+	if ( sFirstCTor ) {
+		sFirstCTor = false;
+		#if XMP_DebugBuild
+			for ( int ifd = 0; ifd < kTIFF_KnownIFDCount; ++ifd ) {	// Make sure the known tag arrays are sorted.
+				for ( const XMP_Uns16* idPtr = sKnownTags[ifd]; *idPtr != 0xFFFF; ++idPtr ) {
+					XMP_Assert ( *idPtr < *(idPtr+1) );
+				}
+			}
+		#endif
+	}
+
+}	// TIFF_Manager::TIFF_Manager
+
+// =================================================================================================
+// TIFF_Manager::CheckTIFFHeader
+// =============================
+//
+// Checks the 4 byte TIFF prefix for validity and endianness. Sets the endian flags and the Get
+// function pointers. Returns the 0th IFD offset.
+
+XMP_Uns32 TIFF_Manager::CheckTIFFHeader ( const XMP_Uns8* tiffPtr, XMP_Uns32 length )
+{
+	if ( length < kEmptyTIFFLength ) XMP_Throw ( "The TIFF is too small", kXMPErr_BadTIFF );
+
+	XMP_Uns32 tiffPrefix = (tiffPtr[0] << 24) | (tiffPtr[1] << 16) | (tiffPtr[2] << 8) | (tiffPtr[3]);
+
+	if ( tiffPrefix == kBigEndianPrefix ) {
+		this->bigEndian = true;
+	} else if ( tiffPrefix == kLittleEndianPrefix ) {
+		this->bigEndian = false;
+	} else {
+		XMP_Throw ( "Unrecognized TIFF prefix", kXMPErr_BadTIFF );
+	}
+
+	this->nativeEndian = (this->bigEndian == kBigEndianHost);
+
+	if ( this->bigEndian ) {
+
+		this->GetUns16  = GetUns16BE;
+		this->GetUns32  = GetUns32BE;
+		this->GetFloat  = GetFloatBE;
+		this->GetDouble = GetDoubleBE;
+
+		this->PutUns16  = PutUns16BE;
+		this->PutUns32  = PutUns32BE;
+		this->PutFloat  = PutFloatBE;
+		this->PutDouble = PutDoubleBE;
+
+	} else {
+
+		this->GetUns16  = GetUns16LE;
+		this->GetUns32  = GetUns32LE;
+		this->GetFloat  = GetFloatLE;
+		this->GetDouble = GetDoubleLE;
+
+		this->PutUns16  = PutUns16LE;
+		this->PutUns32  = PutUns32LE;
+		this->PutFloat  = PutFloatLE;
+		this->PutDouble = PutDoubleLE;
+
+	}
+
+	XMP_Uns32 mainIFDOffset = this->GetUns32 ( tiffPtr+4 );	// ! Do this after setting the Get/Put procs!
+
+	if ( mainIFDOffset != 0 ) {	// Tolerate empty TIFF even though formally invalid.
+		if ( (length < (kEmptyTIFFLength + kEmptyIFDLength)) ||
+			 (mainIFDOffset < kEmptyTIFFLength) || (mainIFDOffset > (length - kEmptyIFDLength)) ) {
+			XMP_Throw ( "Invalid primary IFD offset", kXMPErr_BadTIFF );
+		}
+	}
+
+	return mainIFDOffset;
+
+}	// TIFF_Manager::CheckTIFFHeader
+
+// =================================================================================================
+// TIFF_Manager::SetTag_Integer
+// ============================
+
+void TIFF_Manager::SetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32 data32 )
+{
+
+	if ( data32 > 0xFFFF ) {
+		this->SetTag ( ifd, id, kTIFF_LongType, 1, &data32 );
+	} else {
+		XMP_Uns16 data16 = (XMP_Uns16)data32;
+		this->SetTag ( ifd, id, kTIFF_ShortType, 1, &data16 );
+	}
+
+}	// TIFF_Manager::SetTag_Integer
+
+// =================================================================================================
+// TIFF_Manager::SetTag_Byte
+// =========================
+
+void TIFF_Manager::SetTag_Byte ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns8 data )
+{
+
+	this->SetTag ( ifd, id, kTIFF_ByteType, 1, &data );
+
+}	// TIFF_Manager::SetTag_Byte
+
+// =================================================================================================
+// TIFF_Manager::SetTag_SByte
+// ==========================
+
+void TIFF_Manager::SetTag_SByte ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int8 data )
+{
+
+	this->SetTag ( ifd, id, kTIFF_SByteType, 1, &data );
+
+}	// TIFF_Manager::SetTag_SByte
+
+// =================================================================================================
+// TIFF_Manager::SetTag_Short
+// ==========================
+
+void TIFF_Manager::SetTag_Short ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16 clientData )
+{
+	XMP_Uns16 streamData;
+
+	this->PutUns16 ( clientData, &streamData );
+	this->SetTag ( ifd, id, kTIFF_ShortType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_Short
+
+// =================================================================================================
+// TIFF_Manager::SetTag_SShort
+// ===========================
+
+ void TIFF_Manager::SetTag_SShort ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int16 clientData )
+{
+	XMP_Int16 streamData;
+
+	this->PutUns16 ( (XMP_Uns16)clientData, &streamData );
+	this->SetTag ( ifd, id, kTIFF_SShortType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_SShort
+
+// =================================================================================================
+// TIFF_Manager::SetTag_Long
+// =========================
+
+ void TIFF_Manager::SetTag_Long ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32 clientData )
+{
+	XMP_Uns32 streamData;
+
+	this->PutUns32 ( clientData, &streamData );
+	this->SetTag ( ifd, id, kTIFF_LongType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_Long
+
+// =================================================================================================
+// TIFF_Manager::SetTag_SLong
+// ==========================
+
+ void TIFF_Manager::SetTag_SLong ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32 clientData )
+{
+	XMP_Int32 streamData;
+
+	this->PutUns32 ( (XMP_Uns32)clientData, &streamData );
+	this->SetTag ( ifd, id, kTIFF_SLongType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_SLong
+
+// =================================================================================================
+// TIFF_Manager::SetTag_Rational
+// =============================
+
+struct StreamRational { XMP_Uns32 num, denom; };
+
+ void TIFF_Manager::SetTag_Rational ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32 clientNum, XMP_Uns32 clientDenom )
+{
+	StreamRational streamData;
+
+	this->PutUns32 ( clientNum, &streamData.num );
+	this->PutUns32 ( clientDenom, &streamData.denom );
+	this->SetTag ( ifd, id, kTIFF_RationalType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_Rational
+
+// =================================================================================================
+// TIFF_Manager::SetTag_SRational
+// ==============================
+
+ void TIFF_Manager::SetTag_SRational ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32 clientNum, XMP_Int32 clientDenom )
+{
+	StreamRational streamData;
+
+	this->PutUns32 ( (XMP_Uns32)clientNum, &streamData.num );
+	this->PutUns32 ( (XMP_Uns32)clientDenom, &streamData.denom );
+	this->SetTag ( ifd, id, kTIFF_SRationalType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_SRational
+
+// =================================================================================================
+// TIFF_Manager::SetTag_Float
+// ==========================
+
+ void TIFF_Manager::SetTag_Float ( XMP_Uns8 ifd, XMP_Uns16 id, float clientData )
+{
+	float streamData;
+
+	this->PutFloat ( clientData, &streamData );
+	this->SetTag ( ifd, id, kTIFF_FloatType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_Float
+
+// =================================================================================================
+// TIFF_Manager::SetTag_Double
+// ===========================
+
+ void TIFF_Manager::SetTag_Double ( XMP_Uns8 ifd, XMP_Uns16 id, double clientData )
+{
+	double streamData;
+
+	this->PutDouble ( clientData, &streamData );
+	this->SetTag ( ifd, id, kTIFF_DoubleType, 1, &streamData );
+
+}	// TIFF_Manager::SetTag_Double
+
+// =================================================================================================
+// TIFF_Manager::SetTag_ASCII
+// ===========================
+
+void TIFF_Manager::SetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr data )
+{
+
+	this->SetTag ( ifd, id, kTIFF_ASCIIType, (XMP_Uns32)(strlen(data) + 1), data );	// ! Include trailing nul.
+
+}	// TIFF_Manager::SetTag_ASCII
+
+// =================================================================================================
+// UTF16_to_UTF8
+// =============
+
+static void UTF16_to_UTF8 ( const UTF16Unit * utf16Ptr, size_t utf16Len, bool bigEndian, std::string * outStr )
+{
+	UTF16_to_UTF8_Proc ToUTF8 = 0;
+	if ( bigEndian ) {
+		ToUTF8 = UTF16BE_to_UTF8;
+	} else {
+		ToUTF8 = UTF16LE_to_UTF8;
+	}
+
+	UTF8Unit buffer [1000];
+	size_t inCount, outCount;
+
+	outStr->erase();
+	outStr->reserve ( utf16Len * 2 );	// As good a guess as any.
+
+	while ( utf16Len > 0 ) {
+		ToUTF8 ( utf16Ptr, utf16Len, buffer, sizeof(buffer), &inCount, &outCount );
+		outStr->append ( (XMP_StringPtr)buffer, outCount );
+		utf16Ptr += inCount;
+		utf16Len -= inCount;
+	}
+
+}	// UTF16_to_UTF8
+
+// =================================================================================================
+// TIFF_Manager::DecodeString
+// ==========================
+//
+// Convert an explicitly encoded string to UTF-8. The input must be encoded according to table 6 of
+// the Exif 2.2 specification. The input pointer is to the start of the 8 byte header, the length is
+// the full length. In other words, the pointer and length from the IFD entry. Returns true if the
+// encoding is supported and the conversion succeeds.
+
+// *** JIS encoding is not supported yet. Need a static mapping table from JIS X 208-1990 to Unicode.
+
+bool TIFF_Manager::DecodeString ( const void * encodedPtr, size_t encodedLen, std::string* utf8Str ) const
+{
+	utf8Str->erase();
+	if ( encodedLen < 8 ) return false;	// Need to have at least the 8 byte header.
+	
+	XMP_StringPtr typePtr  = (XMP_StringPtr)encodedPtr;
+	XMP_StringPtr valuePtr = typePtr + 8;
+	size_t valueLen = encodedLen - 8;
+
+	if ( *typePtr == 'A' ) {
+
+		utf8Str->assign ( valuePtr, valueLen );
+		return true;
+
+	} else if ( *typePtr == 'U' ) {
+
+		try {
+
+			const UTF16Unit * utf16Ptr = (const UTF16Unit *) valuePtr;
+			size_t utf16Len = valueLen >> 1;	// The number of UTF-16 storage units, not bytes.
+			if ( utf16Len == 0 ) return false;
+			bool isBigEndian = this->bigEndian;	// Default to stream endian, unless there is a BOM ...
+			if ( (*utf16Ptr == 0xFEFF) || (*utf16Ptr == 0xFFFE) ) {	// Check for an explicit BOM
+				isBigEndian = (*((XMP_Uns8*)utf16Ptr) == 0xFE);
+				utf16Ptr += 1;	// Don't translate the BOM.
+				utf16Len -= 1;
+				if ( utf16Len == 0 ) return false;
+			}
+			UTF16_to_UTF8 ( utf16Ptr, utf16Len, isBigEndian, utf8Str );
+			return true;
+
+		} catch ( ... ) {
+			return false; // Ignore the tag if there are conversion errors.
+		}
+
+	} else if ( *typePtr == 'J' ) {
+
+		return false;	// ! Ignore JIS for now.
+
+	}
+
+	return false;	// ! Ignore all other encodings.
+
+}	// TIFF_Manager::DecodeString
+
+// =================================================================================================
+// UTF8_to_UTF16
+// =============
+
+static void UTF8_to_UTF16 ( const UTF8Unit * utf8Ptr, size_t utf8Len, bool bigEndian, std::string * outStr )
+{
+	UTF8_to_UTF16_Proc ToUTF16 = 0;
+	if ( bigEndian ) {
+		ToUTF16 = UTF8_to_UTF16BE;
+	} else {
+		ToUTF16 = UTF8_to_UTF16LE;
+	}
+
+	enum { kUTF16Len = 1000 };
+	UTF16Unit buffer [kUTF16Len];
+	size_t inCount, outCount;
+
+	outStr->erase();
+	outStr->reserve ( utf8Len * 2 );	// As good a guess as any.
+
+	while ( utf8Len > 0 ) {
+		ToUTF16 ( utf8Ptr, utf8Len, buffer, kUTF16Len, &inCount, &outCount );
+		outStr->append ( (XMP_StringPtr)buffer, outCount*2 );
+		utf8Ptr += inCount;
+		utf8Len -= inCount;
+	}
+
+}	// UTF8_to_UTF16
+
+XMP_Bool IsOffsetValid( XMP_Uns32 offset, XMP_Uns32 lowerBound, XMP_Uns32 upperBound )
+{
+	if ( (lowerBound <= offset) && (offset < upperBound) )
+		return true;
+	return false;
+}
+
+// =================================================================================================
+// TIFF_Manager::EncodeString
+// ==========================
+//
+// Convert a UTF-8 string to an explicitly encoded form according to table 6 of the Exif 2.2
+// specification. Returns true if the encoding is supported and the conversion succeeds.
+
+// *** JIS encoding is not supported yet. Need a static mapping table to JIS X 208-1990 from Unicode.
+
+bool TIFF_Manager::EncodeString ( const std::string& utf8Str, XMP_Uns8 encoding, std::string* encodedStr )
+{
+	encodedStr -> erase();
+
+	if ( encoding == kTIFF_EncodeASCII ) {
+
+		encodedStr->assign ( "ASCII\0\0\0", 8 );
+		XMP_Assert (encodedStr->size() == 8 );
+
+		encodedStr->append ( utf8Str );	// ! Let the caller filter the value. (?)
+
+		return true;
+
+	} else if ( encoding == kTIFF_EncodeUnicode ) {
+
+		encodedStr->assign ( "UNICODE\0", 8 );
+		XMP_Assert (encodedStr->size() == 8 );
+
+		try {
+			std::string temp;
+			UTF8_to_UTF16 ( (const UTF8Unit*)utf8Str.c_str(), utf8Str.size(), this->bigEndian, &temp );
+			encodedStr->append ( temp );
+			return true;
+		} catch ( ... ) {
+			return false; // Ignore the tag if there are conversion errors.
+		}
+
+	} else if ( encoding == kTIFF_EncodeJIS ) {
+
+		XMP_Throw ( "Encoding to JIS is not implemented", kXMPErr_Unimplemented );
+
+		// encodedStr->assign ( "JIS\0\0\0\0\0", 8 );
+		// XMP_Assert (encodedStr->size() == 8 );
+
+		// ...
+
+		// return true;
+
+	} else {
+
+		XMP_Throw ( "Invalid TIFF string encoding", kXMPErr_BadParam );
+
+	}
+
+	return false;	// ! Should never get here.
+
+}	// TIFF_Manager::EncodeString
+
+void TIFF_Manager::NotifyClient( XMP_ErrorSeverity severity, XMP_Error & error )
+{
+	if (this->errorCallbackPtr)
+		this->errorCallbackPtr->NotifyClient( severity, error );
+	else {
+		if ( severity != kXMPErrSev_Recoverable )
+			throw error;
+	}
+}
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.hpp b/XMPFiles/source/FormatSupport/TIFF_Support.hpp
new file mode 100644
index 0000000..e3e458b
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/TIFF_Support.hpp
@@ -0,0 +1,987 @@
+#ifndef __TIFF_Support_hpp__
+#define __TIFF_Support_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include <map>
+#include <stdlib.h>
+#include <string.h>
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#include "source/EndianUtils.hpp"
+
+#include "source/Endian.h"
+
+#if SUNOS_SPARC || XMP_IOS_ARM
+        static const IEndian &IE = BigEndian::getInstance();
+#else
+        static const IEndian &IE = LittleEndian::getInstance();
+#endif //#if SUNOS_SPARC || XMP_IOS_ARM
+
+// =================================================================================================
+/// \file TIFF_Support.hpp
+/// \brief XMPFiles support for TIFF streams.
+///
+/// This header provides TIFF stream support specific to the needs of XMPFiles. This is not intended
+/// for general purpose TIFF processing. TIFF_Manager is an abstract base class with 2 concrete
+/// derived classes, TIFF_MemoryReader and TIFF_FileWriter.
+///
+/// TIFF_MemoryReader provides read-only support for TIFF streams that are small enough to be kept
+/// entirely in memory. This allows optimizations to reduce heap usage and processing code. It is
+/// sufficient for browsing access to the Exif metadata in JPEG and Photoshop files. Think of
+/// TIFF_MemoryReader as "memory-based AND read-only". Since the entire TIFF stream is available,
+/// GetTag will return information about any tag in the stream.
+///
+/// TIFF_FileWriter is for cases where updates are needed or the TIFF stream is too large to be kept
+/// entirely in memory. Think of TIFF_FileWriter as "file-based OR read-write". TIFF_FileWriter only
+/// maintains information for tags of interest as metadata.
+///
+/// The needs of XMPFiles are well defined metadata access. Only 4 IFDs are processed:
+/// \li The 0th IFD, for the primary image, the first one in the outer list of IFDs.
+/// \li The Exif general metadata IFD, from tag 34665 in the primary image IFD.
+/// \li The Exif GPS Info metadata IFD, from tag 34853 in the primary image IFD.
+/// \li The Exif Interoperability IFD, from tag 40965 in the Exif general metadata IFD.
+///
+/// \note These classes are for use only when directly compiled and linked. They should not be
+/// packaged in a DLL by themselves. They do not provide any form of C++ ABI protection.
+// =================================================================================================
+
+
+// =================================================================================================
+// TIFF IFD and type constants
+// ===========================
+//
+// These aren't inside TIFF_Manager because static data members can't be initialized there.
+
+enum {	// Constants for the recognized IFDs.
+	kTIFF_PrimaryIFD    = 0,	// The primary image IFD, also called the 0th IFD.
+	kTIFF_TNailIFD      = 1,	// The thumbnail image IFD also called the 1st IFD. (not used)
+	kTIFF_ExifIFD       = 2,	// The Exif general metadata IFD.
+	kTIFF_GPSInfoIFD    = 3,	// The Exif GPS Info IFD.
+	kTIFF_InteropIFD    = 4,	// The Exif Interoperability IFD.
+	kTIFF_LastRealIFD   = 4,
+	kTIFF_KnownIFDCount = 5,
+	kTIFF_KnownIFD      = 9	// The IFD that a tag is known to belong in.
+};
+
+enum {	// Constants for the type field of a tag, as defined by TIFF.
+	kTIFF_ShortOrLongType =  0,	// ! Not part of the TIFF spec, never in a tag!
+	kTIFF_ByteType        =  1,
+	kTIFF_ASCIIType       =  2,
+	kTIFF_ShortType       =  3,
+	kTIFF_LongType        =  4,
+	kTIFF_RationalType    =  5,
+	kTIFF_SByteType       =  6,
+	kTIFF_UndefinedType   =  7,
+	kTIFF_SShortType      =  8,
+	kTIFF_SLongType       =  9,
+	kTIFF_SRationalType   = 10,
+	kTIFF_FloatType       = 11,
+	kTIFF_DoubleType      = 12,
+	kTIFF_LastType        = 12
+};
+
+static const size_t kTIFF_TypeSizes[]    = { 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 };
+
+static const bool kTIFF_IsIntegerType[]  = { 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0 };
+static const bool kTIFF_IsRationalType[] = { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 };
+static const bool kTIFF_IsFloatType[]    = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
+
+enum {	// Encodings for SetTag_EncodedString.
+	kTIFF_EncodeUndefined = 0,
+	kTIFF_EncodeASCII     = 1,
+	kTIFF_EncodeUnicode   = 2,	// UTF-16 in the endianness of the TIFF stream.
+	kTIFF_EncodeJIS       = 3,	// Exif 2.2 uses JIS X 208-1990.
+	kTIFF_EncodeUnknown   = 9
+};
+
+// =================================================================================================
+// Recognized TIFF tags
+// ====================
+
+// -----------------------------------------------------------------------------------------------
+// An enum of IDs for all of the tags as potential interest as metadata. The numberical order does
+// not matter. These are mostly listed in the order of the Exif specification tables for convenience
+// of checking correspondence.
+
+enum {
+
+	// General 0th IFD tags. Some of these can also be in the thumbnail IFD.
+
+	// General tags from Exif 2.3 table 4:
+	kTIFF_ImageWidth = 256,
+	kTIFF_ImageLength = 257,
+	kTIFF_BitsPerSample = 258,
+	kTIFF_Compression = 259,
+	kTIFF_PhotometricInterpretation = 262,
+	kTIFF_Orientation = 274,
+	kTIFF_SamplesPerPixel = 277,
+	kTIFF_PlanarConfiguration = 284,
+	kTIFF_YCbCrCoefficients = 529,
+	kTIFF_YCbCrSubSampling = 530,
+	kTIFF_XResolution = 282,
+	kTIFF_YResolution = 283,
+	kTIFF_ResolutionUnit = 296,
+	kTIFF_TransferFunction = 301,
+	kTIFF_WhitePoint = 318,
+	kTIFF_PrimaryChromaticities = 319,
+	kTIFF_YCbCrPositioning = 531,
+	kTIFF_ReferenceBlackWhite = 532,
+	kTIFF_DateTime = 306,
+	kTIFF_ImageDescription = 270,
+	kTIFF_Make = 271,
+	kTIFF_Model = 272,
+	kTIFF_Software = 305,
+	kTIFF_Artist = 315,
+	kTIFF_Copyright = 33432,
+	
+	// Tags defined by Adobe:
+	kTIFF_XMP = 700,
+	kTIFF_IPTC = 33723,
+	kTIFF_PSIR = 34377,
+	kTIFF_DNGVersion = 50706,
+	kTIFF_DNGBackwardVersion = 50707,
+
+	// Additional thumbnail IFD tags. We also care about 256, 257, and 259 in thumbnails.
+	kTIFF_JPEGInterchangeFormat = 513,
+	kTIFF_JPEGInterchangeFormatLength = 514,
+
+	// Tags that need special handling when rewriting memory-based TIFF.
+	kTIFF_StripOffsets = 273,
+	kTIFF_StripByteCounts = 279,
+	kTIFF_FreeOffsets = 288,
+	kTIFF_FreeByteCounts = 289,
+	kTIFF_TileOffsets = 324,
+	kTIFF_TileByteCounts = 325,
+	kTIFF_SubIFDs = 330,
+	kTIFF_JPEGQTables = 519,
+	kTIFF_JPEGDCTables = 520,
+	kTIFF_JPEGACTables = 521,
+
+	// Exif IFD tags defined in Exif 2.3 table 7.
+
+	kTIFF_ExifVersion = 36864,
+	kTIFF_FlashpixVersion = 40960,
+	kTIFF_ColorSpace = 40961,
+	kTIFF_Gamma = 42240,
+	kTIFF_ComponentsConfiguration = 37121,
+	kTIFF_CompressedBitsPerPixel = 37122,
+	kTIFF_PixelXDimension = 40962,
+	kTIFF_PixelYDimension = 40963,
+	kTIFF_MakerNote = 37500, // Gets deleted when rewriting memory-based TIFF.
+	kTIFF_UserComment = 37510,
+	kTIFF_RelatedSoundFile = 40964,
+	kTIFF_DateTimeOriginal = 36867,
+	kTIFF_DateTimeDigitized = 36868,
+	kTIFF_SubSecTime = 37520,
+	kTIFF_SubSecTimeOriginal = 37521,
+	kTIFF_SubSecTimeDigitized = 37522,
+	kTIFF_ImageUniqueID = 42016,
+	kTIFF_CameraOwnerName = 42032,
+	kTIFF_BodySerialNumber = 42033,
+	kTIFF_LensSpecification = 42034,
+	kTIFF_LensMake = 42035,
+	kTIFF_LensModel = 42036,
+	kTIFF_LensSerialNumber = 42037,
+
+	// Exif IFD tags defined in Exif 2.3 table 8.
+
+	kTIFF_ExposureTime = 33434,
+	kTIFF_FNumber = 33437,
+	kTIFF_ExposureProgram = 34850,
+	kTIFF_SpectralSensitivity = 34852,
+	kTIFF_PhotographicSensitivity = 34855,	// ! Called kTIFF_ISOSpeedRatings before Exif 2.3.
+	kTIFF_OECF = 34856,
+	kTIFF_SensitivityType = 34864,
+	kTIFF_StandardOutputSensitivity = 34865,
+	kTIFF_RecommendedExposureIndex = 34866,
+	kTIFF_ISOSpeed = 34867,
+	kTIFF_ISOSpeedLatitudeyyy = 34868,
+	kTIFF_ISOSpeedLatitudezzz = 34869,
+	kTIFF_ShutterSpeedValue = 37377,
+	kTIFF_ApertureValue = 37378,
+	kTIFF_BrightnessValue = 37379,
+	kTIFF_ExposureBiasValue = 37380,
+	kTIFF_MaxApertureValue = 37381,
+	kTIFF_SubjectDistance = 37382,
+	kTIFF_MeteringMode = 37383,
+	kTIFF_LightSource = 37384,
+	kTIFF_Flash = 37385,
+	kTIFF_FocalLength = 37386,
+	kTIFF_SubjectArea = 37396,
+	kTIFF_FlashEnergy = 41483,
+	kTIFF_SpatialFrequencyResponse = 41484,
+	kTIFF_FocalPlaneXResolution = 41486,
+	kTIFF_FocalPlaneYResolution = 41487,
+	kTIFF_FocalPlaneResolutionUnit = 41488,
+	kTIFF_SubjectLocation = 41492,
+	kTIFF_ExposureIndex = 41493,
+	kTIFF_SensingMethod = 41495,
+	kTIFF_FileSource = 41728,
+	kTIFF_SceneType = 41729,
+	kTIFF_CFAPattern = 41730,
+	kTIFF_CustomRendered = 41985,
+	kTIFF_ExposureMode = 41986,
+	kTIFF_WhiteBalance = 41987,
+	kTIFF_DigitalZoomRatio = 41988,
+	kTIFF_FocalLengthIn35mmFilm = 41989,
+	kTIFF_SceneCaptureType = 41990,
+	kTIFF_GainControl = 41991,
+	kTIFF_Contrast = 41992,
+	kTIFF_Saturation = 41993,
+	kTIFF_Sharpness = 41994,
+	kTIFF_DeviceSettingDescription = 41995,
+	kTIFF_SubjectDistanceRange = 41996,
+
+	// GPS IFD tags.
+
+	kTIFF_GPSVersionID = 0,
+	kTIFF_GPSLatitudeRef = 1,
+	kTIFF_GPSLatitude = 2,
+	kTIFF_GPSLongitudeRef = 3,
+	kTIFF_GPSLongitude = 4,
+	kTIFF_GPSAltitudeRef = 5,
+	kTIFF_GPSAltitude = 6,
+	kTIFF_GPSTimeStamp = 7,
+	kTIFF_GPSSatellites = 8,
+	kTIFF_GPSStatus = 9,
+	kTIFF_GPSMeasureMode = 10,
+	kTIFF_GPSDOP = 11,
+	kTIFF_GPSSpeedRef = 12,
+	kTIFF_GPSSpeed = 13,
+	kTIFF_GPSTrackRef = 14,
+	kTIFF_GPSTrack = 15,
+	kTIFF_GPSImgDirectionRef = 16,
+	kTIFF_GPSImgDirection = 17,
+	kTIFF_GPSMapDatum = 18,
+	kTIFF_GPSDestLatitudeRef = 19,
+	kTIFF_GPSDestLatitude = 20,
+	kTIFF_GPSDestLongitudeRef = 21,
+	kTIFF_GPSDestLongitude = 22,
+	kTIFF_GPSDestBearingRef = 23,
+	kTIFF_GPSDestBearing = 24,
+	kTIFF_GPSDestDistanceRef = 25,
+	kTIFF_GPSDestDistance = 26,
+	kTIFF_GPSProcessingMethod = 27,
+	kTIFF_GPSAreaInformation = 28,
+	kTIFF_GPSDateStamp = 29,
+	kTIFF_GPSDifferential = 30,
+	kTIFF_GPSHPositioningError = 31,
+
+	// Special tags that are links to other IFDs.
+	
+	kTIFF_ExifIFDPointer = 34665,				// Found in 0th IFD
+	kTIFF_GPSInfoIFDPointer = 34853,			// Found in 0th IFD
+	kTIFF_InteroperabilityIFDPointer = 40965	// Found in Exif IFD
+
+};
+
+// *** Temporary hack:
+#define kTIFF_ISOSpeedRatings	kTIFF_PhotographicSensitivity
+
+// ------------------------------------------------------------------
+// Sorted arrays of the tags that are recognized in the various IFDs.
+
+static const XMP_Uns16 sKnownPrimaryIFDTags[] =
+{
+	kTIFF_ImageWidth,					//   256
+	kTIFF_ImageLength,					//   257
+	kTIFF_BitsPerSample,				//   258
+	kTIFF_Compression,					//   259
+	kTIFF_PhotometricInterpretation,	//   262
+	kTIFF_ImageDescription,				//   270
+	kTIFF_Make,							//   271
+	kTIFF_Model,						//   272
+	kTIFF_Orientation,					//   274
+	kTIFF_SamplesPerPixel,				//   277
+	kTIFF_XResolution,					//   282
+	kTIFF_YResolution,					//   283
+	kTIFF_PlanarConfiguration,			//   284
+	kTIFF_ResolutionUnit,				//   296
+	kTIFF_TransferFunction,				//   301
+	kTIFF_Software,						//   305
+	kTIFF_DateTime,						//   306
+	kTIFF_Artist,						//   315
+	kTIFF_WhitePoint,					//   318
+	kTIFF_PrimaryChromaticities,		//   319
+	kTIFF_YCbCrCoefficients,			//   529
+	kTIFF_YCbCrSubSampling,				//   530
+	kTIFF_YCbCrPositioning,				//   531
+	kTIFF_ReferenceBlackWhite,			//   532
+	kTIFF_XMP,							//   700
+	kTIFF_Copyright,					// 33432
+	kTIFF_IPTC,							// 33723
+	kTIFF_PSIR,							// 34377
+	kTIFF_ExifIFDPointer,				// 34665
+	kTIFF_GPSInfoIFDPointer,			// 34853
+	kTIFF_DNGVersion,					// 50706
+	kTIFF_DNGBackwardVersion,			// 50707
+	0xFFFF	// Must be last as a sentinel.
+};
+
+static const XMP_Uns16 sKnownThumbnailIFDTags[] =
+{
+	kTIFF_ImageWidth,					// 256
+	kTIFF_ImageLength,					// 257
+	kTIFF_Compression,					// 259
+	kTIFF_JPEGInterchangeFormat,		// 513
+	kTIFF_JPEGInterchangeFormatLength,	// 514
+	0xFFFF	// Must be last as a sentinel.
+};
+
+static const XMP_Uns16 sKnownExifIFDTags[] =
+{
+	kTIFF_ExposureTime,					// 33434
+	kTIFF_FNumber,						// 33437
+	kTIFF_ExposureProgram,				// 34850
+	kTIFF_SpectralSensitivity,			// 34852
+	kTIFF_PhotographicSensitivity,		// 34855
+	kTIFF_OECF,							// 34856
+	kTIFF_SensitivityType,				// 34864
+	kTIFF_StandardOutputSensitivity,	// 34865
+	kTIFF_RecommendedExposureIndex,		// 34866
+	kTIFF_ISOSpeed,						// 34867
+	kTIFF_ISOSpeedLatitudeyyy,			// 34868
+	kTIFF_ISOSpeedLatitudezzz,			// 34869
+	kTIFF_ExifVersion,					// 36864
+	kTIFF_DateTimeOriginal,				// 36867
+	kTIFF_DateTimeDigitized,			// 36868
+	kTIFF_ComponentsConfiguration,		// 37121
+	kTIFF_CompressedBitsPerPixel,		// 37122
+	kTIFF_ShutterSpeedValue,			// 37377
+	kTIFF_ApertureValue,				// 37378
+	kTIFF_BrightnessValue,				// 37379
+	kTIFF_ExposureBiasValue,			// 37380
+	kTIFF_MaxApertureValue,				// 37381
+	kTIFF_SubjectDistance,				// 37382
+	kTIFF_MeteringMode,					// 37383
+	kTIFF_LightSource,					// 37384
+	kTIFF_Flash,						// 37385
+	kTIFF_FocalLength,					// 37386
+	kTIFF_SubjectArea,					// 37396
+	kTIFF_UserComment,					// 37510
+	kTIFF_SubSecTime,					// 37520
+	kTIFF_SubSecTimeOriginal,			// 37521
+	kTIFF_SubSecTimeDigitized,			// 37522
+	kTIFF_FlashpixVersion,				// 40960
+	kTIFF_ColorSpace,					// 40961
+	kTIFF_PixelXDimension,				// 40962
+	kTIFF_PixelYDimension,				// 40963
+	kTIFF_RelatedSoundFile,				// 40964
+	kTIFF_FlashEnergy,					// 41483
+	kTIFF_SpatialFrequencyResponse,		// 41484
+	kTIFF_FocalPlaneXResolution,		// 41486
+	kTIFF_FocalPlaneYResolution,		// 41487
+	kTIFF_FocalPlaneResolutionUnit,		// 41488
+	kTIFF_SubjectLocation,				// 41492
+	kTIFF_ExposureIndex,				// 41493
+	kTIFF_SensingMethod,				// 41495
+	kTIFF_FileSource,					// 41728
+	kTIFF_SceneType,					// 41729
+	kTIFF_CFAPattern,					// 41730
+	kTIFF_CustomRendered,				// 41985
+	kTIFF_ExposureMode,					// 41986
+	kTIFF_WhiteBalance,					// 41987
+	kTIFF_DigitalZoomRatio,				// 41988
+	kTIFF_FocalLengthIn35mmFilm,		// 41989
+	kTIFF_SceneCaptureType,				// 41990
+	kTIFF_GainControl,					// 41991
+	kTIFF_Contrast,						// 41992
+	kTIFF_Saturation,					// 41993
+	kTIFF_Sharpness,					// 41994
+	kTIFF_DeviceSettingDescription,		// 41995
+	kTIFF_SubjectDistanceRange,			// 41996
+	kTIFF_ImageUniqueID,				// 42016
+	kTIFF_CameraOwnerName,				// 42032
+	kTIFF_BodySerialNumber,				// 42033
+	kTIFF_LensSpecification,			// 42034
+	kTIFF_LensMake,						// 42035
+	kTIFF_LensModel,					// 42036
+	kTIFF_LensSerialNumber,				// 42037
+	kTIFF_Gamma,						// 42240
+	0xFFFF	// Must be last as a sentinel.
+};
+
+static const XMP_Uns16 sKnownGPSInfoIFDTags[] =
+{
+	kTIFF_GPSVersionID,			//  0
+	kTIFF_GPSLatitudeRef,		//  1
+	kTIFF_GPSLatitude,			//  2
+	kTIFF_GPSLongitudeRef,		//  3
+	kTIFF_GPSLongitude,			//  4
+	kTIFF_GPSAltitudeRef,		//  5
+	kTIFF_GPSAltitude,			//  6
+	kTIFF_GPSTimeStamp,			//  7
+	kTIFF_GPSSatellites,		//  8
+	kTIFF_GPSStatus,			//  9
+	kTIFF_GPSMeasureMode,		// 10
+	kTIFF_GPSDOP,				// 11
+	kTIFF_GPSSpeedRef,			// 12
+	kTIFF_GPSSpeed,				// 13
+	kTIFF_GPSTrackRef,			// 14
+	kTIFF_GPSTrack,				// 15
+	kTIFF_GPSImgDirectionRef,	// 16
+	kTIFF_GPSImgDirection,		// 17
+	kTIFF_GPSMapDatum,			// 18
+	kTIFF_GPSDestLatitudeRef,	// 19
+	kTIFF_GPSDestLatitude,		// 20
+	kTIFF_GPSDestLongitudeRef,	// 21
+	kTIFF_GPSDestLongitude,		// 22
+	kTIFF_GPSDestBearingRef,	// 23
+	kTIFF_GPSDestBearing,		// 24
+	kTIFF_GPSDestDistanceRef,	// 25
+	kTIFF_GPSDestDistance,		// 26
+	kTIFF_GPSProcessingMethod,	// 27
+	kTIFF_GPSAreaInformation,	// 28
+	kTIFF_GPSDateStamp,			// 29
+	kTIFF_GPSDifferential,		// 30
+	kTIFF_GPSHPositioningError,	// 31
+	0xFFFF	// Must be last as a sentinel.
+};
+
+static const XMP_Uns16 sKnownInteroperabilityIFDTags[] =
+{
+	// ! Yes, there are none at present.
+	0xFFFF	// Must be last as a sentinel.
+};
+
+// ! Make sure these are in the same order as the IFD enum!
+static const XMP_Uns16* sKnownTags[kTIFF_KnownIFDCount] = { sKnownPrimaryIFDTags,
+															sKnownThumbnailIFDTags,
+															sKnownExifIFDTags,
+															sKnownGPSInfoIFDTags,
+															sKnownInteroperabilityIFDTags };
+
+
+// =================================================================================================
+// =================================================================================================
+
+
+// =================================================================================================
+// TIFF_Manager
+// ============
+
+class TIFF_Manager {	// The abstract base class.
+public:
+
+	// ---------------------------------------------------------------------------------------------
+	// Types and constants
+
+	static const XMP_Uns32 kBigEndianPrefix    = 0x4D4D002AUL;
+	static const XMP_Uns32 kLittleEndianPrefix = 0x49492A00UL;
+
+	static const size_t kEmptyTIFFLength = 8;		// Just the header.
+	static const size_t kEmptyIFDLength  = 2 + 4;	// Entry count and next-IFD offset.
+	static const size_t kIFDEntryLength  = 12;
+
+	struct TagInfo {
+		XMP_Uns16   id;
+		XMP_Uns16   type;
+		XMP_Uns32   count;
+		const void* dataPtr;	// ! The data must not be changed! Stream endian format!
+		XMP_Uns32   dataLen;	// The length in bytes.
+		TagInfo() : id(0), type(0), count(0), dataPtr(0), dataLen(0) {};
+		TagInfo ( XMP_Uns16 _id, XMP_Uns16 _type, XMP_Uns32 _count, const void* _dataPtr, XMP_Uns32 _dataLen )
+			: id(_id), type(_type), count(_count), dataPtr(_dataPtr), dataLen(_dataLen) {};
+	};
+
+	typedef std::map<XMP_Uns16,TagInfo> TagInfoMap;
+
+	struct Rational  { XMP_Uns32 num, denom; };
+	struct SRational { XMP_Int32 num, denom; };
+
+	// ---------------------------------------------------------------------------------------------
+	// The IsXyzEndian methods return the external endianness of the original parsed TIFF stream.
+	// The \c GetTag methods return native endian values, the \c SetTag methods take native values.
+	// The original endianness is preserved in output.
+
+	bool IsBigEndian() const { return this->bigEndian; };
+	bool IsLittleEndian() const { return (! this->bigEndian); };
+	bool IsNativeEndian() const { return this->nativeEndian; };
+
+	// ---------------------------------------------------------------------------------------------
+	// The TIFF_Manager only keeps explicit knowledge of up to 4 IFDs:
+	// - The primary image IFD, also known as the 0th IFD. This must be present.
+	// - A possible Exif general metadata IFD, found from tag 34665 in the primary image IFD.
+	// - A possible Exif GPS metadata IFD, found from tag 34853 in the primary image IFD.
+	// - A possible Exif Interoperability IFD, found from tag 40965 in the Exif general metadata IFD.
+	//
+	// Parsing will silently forget about certain aspects of ill-formed streams. If any tags are
+	// repeated in an IFD, only the last is kept. Any known tags that are in the wrong IFD are
+	// removed. Parsing will sort the tags into ascending order, AppendTIFF and ComposeTIFF will
+	// preserve the sorted order. These fixes do not cause IsChanged to return true, that only
+	// happens if the client makes explicit changes using SetTag or DeleteTag.
+
+	virtual bool HasExifIFD() const = 0;
+	virtual bool HasGPSInfoIFD() const = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// These are the basic methods to get a map of all of the tags in an IFD, to get or set a tag,
+	// or to delete a tag. The dataPtr returned by \c GetTag is consided read-only, the client must
+	// not change it. The ifd parameter to \c GetIFD must be for one of the recognized actual IFDs.
+	// The ifd parameter for the GetTag or SetTag methods can be a specific IFD of kTIFF_KnownIFD.
+	// Using the specific IFD will be slightly faster, saving a lookup in the known tag map. An
+	// exception is thrown if kTIFF_KnownIFD is passed to GetTag or SetTag and the tag is not known.
+	// \c SetTag replaces an existing tag regardless of type or count. \c DeleteTag deletes a tag,
+	// it is a no-op if the tag does not exist. \c GetValueOffset returns the offset within the
+	// parsed stream of the tag's value. It returns 0 if the tag was not in the parsed input.
+
+	virtual bool GetIFD ( XMP_Uns8 ifd, TagInfoMap* ifdMap ) const = 0;
+
+	virtual bool GetTag ( XMP_Uns8 ifd, XMP_Uns16 id, TagInfo* info ) const = 0;
+
+	virtual void SetTag ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16 type, XMP_Uns32 count, const void* dataPtr ) = 0;
+
+	virtual void DeleteTag ( XMP_Uns8 ifd, XMP_Uns16 id ) = 0;
+
+	virtual XMP_Uns32 GetValueOffset ( XMP_Uns8 ifd, XMP_Uns16 id ) const = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// These methods are for tags whose type can be short or long, depending on the actual value.
+	// \c GetTag_Integer returns false if an existing tag's type is not short, or long, or if the
+	// count is not 1. \c SetTag_Integer replaces an existing tag regardless of type or count, the
+	// new tag will have type short or long.
+
+	virtual bool GetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const = 0;
+
+	void SetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32 data );
+
+	// ---------------------------------------------------------------------------------------------
+	// These are customized forms of GetTag that verify the type and return a typed value. False is
+	// returned if the type does not match or if the count is not 1.
+
+	// *** Should also add support for ASCII multi-strings?
+
+	virtual bool GetTag_Byte   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns8* data ) const = 0;
+	virtual bool GetTag_SByte  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int8* data ) const = 0;
+	virtual bool GetTag_Short  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16* data ) const = 0;
+	virtual bool GetTag_SShort ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int16* data ) const = 0;
+	virtual bool GetTag_Long   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const = 0;
+	virtual bool GetTag_SLong  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32* data ) const = 0;
+
+	virtual bool GetTag_Rational  ( XMP_Uns8 ifd, XMP_Uns16 id, Rational* data ) const = 0;
+	virtual bool GetTag_SRational ( XMP_Uns8 ifd, XMP_Uns16 id, SRational* data ) const = 0;
+
+	virtual bool GetTag_Float  ( XMP_Uns8 ifd, XMP_Uns16 id, float* data ) const = 0;
+	virtual bool GetTag_Double ( XMP_Uns8 ifd, XMP_Uns16 id, double* data ) const = 0;
+
+	virtual bool GetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr* dataPtr, XMP_StringLen* dataLen ) const = 0;
+
+	// ---------------------------------------------------------------------------------------------
+
+	void SetTag_Byte   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns8 data );
+	void SetTag_SByte  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int8 data );
+	void SetTag_Short  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16 data );
+	void SetTag_SShort ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int16 data );
+	void SetTag_Long   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32 data );
+	void SetTag_SLong  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32 data );
+
+	void SetTag_Rational  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32 num, XMP_Uns32 denom );
+	void SetTag_SRational ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32 num, XMP_Int32 denom );
+
+	void SetTag_Float  ( XMP_Uns8 ifd, XMP_Uns16 id, float data );
+	void SetTag_Double ( XMP_Uns8 ifd, XMP_Uns16 id, double data );
+
+	void SetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr dataPtr );
+
+	// ---------------------------------------------------------------------------------------------
+
+	virtual bool GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const = 0;
+	virtual void SetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, const std::string& utf8Str, XMP_Uns8 encoding ) = 0;
+
+	bool DecodeString ( const void * encodedPtr, size_t encodedLen, std::string* utf8Str ) const;
+	bool EncodeString ( const std::string& utf8Str, XMP_Uns8 encoding, std::string* encodedStr );
+
+	// ---------------------------------------------------------------------------------------------
+	// \c IsChanged returns true if a read-write stream has changes that need to be saved. This is
+	// only the case when a \c SetTag method has been called. It is not true for changes related to
+	// parsing normalization such as sorting of tags. \c IsChanged returns false for read-only streams.
+
+	virtual bool IsChanged() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// \c IsLegacyChanged returns true if a read-write stream has changes that need to be saved to
+	// tags other than the XMP (tag 700). This only the case when a \c SetTag method has been
+	// called. It is not true for changes related to parsing normalization such as sorting of tags.
+	// \c IsLegacyChanged returns false for read-only streams.
+
+	virtual bool IsLegacyChanged() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	// \c UpdateMemoryStream is mainly applicable to memory-based read-write streams. It recomposes
+	// the memory stream to incorporate all changes. The new length and data pointer are returned.
+	// \c UpdateMemoryStream can be used with a read-only memory stream to get the raw stream info.
+	//
+	// \c UpdateFileStream updates file-based TIFF. The client must guarantee that the TIFF portion
+	// of the file matches that from the parse in the file-based constructor. Offsets saved from that
+	// parse must still be valid. The open file reference need not be the same, e.g. the client can
+	// be doing a crash-safe update into a temporary copy.
+	//
+	// Both \c UpdateMemoryStream and \c UpdateFileStream use an update-by-append model. Changes are
+	// written in-place where they fit, anything requiring growth is appended to the end and the old
+	// space is abandoned. The end for memory-based TIFF is the end of the data block, the end for
+	// file-based TIFF is the end of the file. This update-by-append model has the advantage of not
+	// perturbing any hidden offsets, a common feature of proprietary MakerNotes.
+	//
+	// The condenseStream parameter to UpdateMemoryStream can be used to rewrite the full stream
+	// instead of appending. This will discard any MakerNote tags and risks breaking offsets that
+	// are hidden. This can be necessary though to try to make the TIFF fit in a JPEG file.
+
+	virtual void ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData = true ) = 0;
+	virtual void ParseFileStream   ( XMP_IO* fileRef ) = 0;
+
+	virtual void IntegrateFromPShop6 ( const void * buriedPtr, size_t buriedLen ) = 0;
+
+	virtual XMP_Uns32 UpdateMemoryStream ( void** dataPtr, bool condenseStream = false ) = 0;
+	virtual void      UpdateFileStream   ( XMP_IO* fileRef, XMP_ProgressTracker* progressTracker ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+
+	GetUns16_Proc  GetUns16;	// Get values from the TIFF stream.
+	GetUns32_Proc  GetUns32;	// Always native endian on the outside, stream endian in the stream.
+	GetFloat_Proc  GetFloat;
+	GetDouble_Proc GetDouble;
+
+	PutUns16_Proc  PutUns16;	// Put values into the TIFF stream.
+	PutUns32_Proc  PutUns32;	// Always native endian on the outside, stream endian in the stream.
+	PutFloat_Proc  PutFloat;
+	PutDouble_Proc PutDouble;
+
+	virtual ~TIFF_Manager() {};
+
+	virtual void SetErrorCallback ( GenericErrorCallback * ec ) { this->errorCallbackPtr = ec; };
+
+	virtual void NotifyClient ( XMP_ErrorSeverity severity, XMP_Error & error );
+
+protected:
+
+	bool bigEndian, nativeEndian;
+
+	XMP_Uns32 CheckTIFFHeader ( const XMP_Uns8* tiffPtr, XMP_Uns32 length );
+		// The pointer is to a buffer of the first 8 bytes. The length is the overall length, used
+		// to check the primary IFD offset.
+
+	TIFF_Manager();	// Force clients to use the reader or writer derived classes.
+
+	struct RawIFDEntry {
+		XMP_Uns16 id;
+		XMP_Uns16 type;
+		XMP_Uns32 count;
+		XMP_Uns32 dataOrOffset;
+	};
+
+	GenericErrorCallback *errorCallbackPtr;
+
+};	// TIFF_Manager
+
+
+// =================================================================================================
+// =================================================================================================
+
+
+// =================================================================================================
+// TIFF_MemoryReader
+// =================
+
+class TIFF_MemoryReader : public TIFF_Manager {	// The derived class for memory-based read-only access.
+public:
+
+	bool HasExifIFD() const { return (containedIFDs[kTIFF_ExifIFD].count != 0); };
+	bool HasGPSInfoIFD() const { return (containedIFDs[kTIFF_GPSInfoIFD].count != 0); };
+
+	bool GetIFD ( XMP_Uns8 ifd, TagInfoMap* ifdMap ) const;
+
+	bool GetTag ( XMP_Uns8 ifd, XMP_Uns16 id, TagInfo* info ) const;
+
+	void SetTag ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16 type, XMP_Uns32 count, const void* dataPtr ) { NotAppropriate(); };
+
+	void DeleteTag ( XMP_Uns8 ifd, XMP_Uns16 id ) { NotAppropriate(); };
+
+	XMP_Uns32 GetValueOffset ( XMP_Uns8 ifd, XMP_Uns16 id ) const;
+
+	bool GetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const;
+
+	bool GetTag_Byte   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns8* data ) const;
+	bool GetTag_SByte  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int8* data ) const;
+	bool GetTag_Short  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16* data ) const;
+	bool GetTag_SShort ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int16* data ) const;
+	bool GetTag_Long   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const;
+	bool GetTag_SLong  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32* data ) const;
+
+	bool GetTag_Rational  ( XMP_Uns8 ifd, XMP_Uns16 id, Rational* data ) const;
+	bool GetTag_SRational ( XMP_Uns8 ifd, XMP_Uns16 id, SRational* data ) const;
+
+	bool GetTag_Float  ( XMP_Uns8 ifd, XMP_Uns16 id, float* data ) const;
+	bool GetTag_Double ( XMP_Uns8 ifd, XMP_Uns16 id, double* data ) const;
+
+	bool GetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr* dataPtr, XMP_StringLen* dataLen ) const;
+
+	bool GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const;
+
+	void SetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, const std::string& utf8Str, XMP_Uns8 encoding ) { NotAppropriate(); };
+
+	bool IsChanged() { return false; };
+	bool IsLegacyChanged() { return false; };
+
+	void ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData = true );
+	void ParseFileStream   ( XMP_IO* fileRef ) { NotAppropriate(); };
+
+	void IntegrateFromPShop6 ( const void * buriedPtr, size_t buriedLen ) { NotAppropriate(); };
+
+	XMP_Uns32 UpdateMemoryStream ( void** dataPtr, bool condenseStream = false ) { if ( dataPtr != 0 ) *dataPtr = tiffStream; return tiffLength; };
+	void      UpdateFileStream   ( XMP_IO* fileRef, XMP_ProgressTracker* progressTracker ) { NotAppropriate(); };
+
+	TIFF_MemoryReader() : ownedStream(false), tiffStream(0), tiffLength(0) {};
+
+	virtual ~TIFF_MemoryReader() { if ( this->ownedStream ) free ( this->tiffStream ); };
+
+private:
+
+	bool ownedStream;
+
+	XMP_Uns8* tiffStream;
+	XMP_Uns32 tiffLength;
+
+	// Memory usage notes: TIFF_MemoryReader is for memory-based read-only usage (both apply). There
+	// is no need to ever allocate separate blocks of memory, everything is used directly from the
+	// TIFF stream. Data pointers are computed on the fly, the offset field is 4 bytes and pointers
+	// will be 8 bytes for 64-bit platforms.
+
+	struct TweakedIFDEntry {	// ! Most fields are in native byte order, dataOrPos is for offsets only.
+		XMP_Uns16 id;
+		XMP_Uns16 type;
+		XMP_Uns32 bytes;
+		XMP_Uns32 dataOrPos;
+		TweakedIFDEntry() : id(0), type(0), bytes(0), dataOrPos(0) {};
+	};
+
+	struct TweakedIFDInfo {
+		XMP_Uns16 count;
+		TweakedIFDEntry* entries;
+		TweakedIFDInfo() : count(0), entries(0) {};
+	};
+
+	TweakedIFDInfo containedIFDs[kTIFF_KnownIFDCount];
+
+	static void SortIFD ( TweakedIFDInfo* thisIFD );
+
+	XMP_Uns32 ProcessOneIFD ( XMP_Uns32 ifdOffset, XMP_Uns8 ifd );
+
+	const TweakedIFDEntry* FindTagInIFD ( XMP_Uns8 ifd, XMP_Uns16 id ) const;
+
+	const inline void* GetDataPtr ( const TweakedIFDEntry* tifdEntry ) const
+		{ if ( GetUns32AsIs(&tifdEntry->bytes) <= 4 ) {
+		  	return &tifdEntry->dataOrPos;
+		  } else {
+			XMP_Uns32 pos = GetUns32AsIs(&tifdEntry->dataOrPos);
+			if (pos + GetUns32AsIs (&tifdEntry->bytes) > this->tiffLength) {
+				// Invalid file.
+				// The data is past the length of the TIFF.
+				return NULL;
+			}
+			return (this->tiffStream + pos);
+		  }
+		}
+
+	static inline void NotAppropriate() { XMP_Throw ( "Not appropriate for TIFF_Reader", kXMPErr_InternalFailure ); };
+
+};	// TIFF_MemoryReader
+
+
+// =================================================================================================
+// =================================================================================================
+
+
+// =================================================================================================
+// TIFF_FileWriter
+// ===============
+
+class TIFF_FileWriter : public TIFF_Manager {	// The derived class for file-based or read-write access.
+public:
+
+	bool HasExifIFD() const { return this->containedIFDs[kTIFF_ExifIFD].tagMap.size() != 0; };
+	bool HasGPSInfoIFD() const { return this->containedIFDs[kTIFF_GPSInfoIFD].tagMap.size() != 0; };
+
+	bool GetIFD ( XMP_Uns8 ifd, TagInfoMap* ifdMap ) const;
+
+	bool GetTag ( XMP_Uns8 ifd, XMP_Uns16 id, TagInfo* info ) const;
+
+	void SetTag ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16 type, XMP_Uns32 count, const void* dataPtr );
+
+	void DeleteTag ( XMP_Uns8 ifd, XMP_Uns16 id );
+
+	XMP_Uns32 GetValueOffset ( XMP_Uns8 ifd, XMP_Uns16 id ) const;
+
+	bool GetTag_Integer ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const;
+
+	bool GetTag_Byte   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns8* data ) const;
+	bool GetTag_SByte  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int8* data ) const;
+	bool GetTag_Short  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16* data ) const;
+	bool GetTag_SShort ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int16* data ) const;
+	bool GetTag_Long   ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns32* data ) const;
+	bool GetTag_SLong  ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Int32* data ) const;
+
+	bool GetTag_Rational  ( XMP_Uns8 ifd, XMP_Uns16 id, Rational* data ) const;
+	bool GetTag_SRational ( XMP_Uns8 ifd, XMP_Uns16 id, SRational* data ) const;
+
+	bool GetTag_Float  ( XMP_Uns8 ifd, XMP_Uns16 id, float* data ) const;
+	bool GetTag_Double ( XMP_Uns8 ifd, XMP_Uns16 id, double* data ) const;
+
+	bool GetTag_ASCII ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_StringPtr* dataPtr, XMP_StringLen* dataLen ) const;
+
+	bool GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const;
+
+	void SetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, const std::string& utf8Str, XMP_Uns8 encoding );
+
+	bool IsChanged() { return this->changed; };
+
+	bool IsLegacyChanged();
+
+	enum { kDoNotCopyData = false };
+
+	void ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData = true );
+	void ParseFileStream   ( XMP_IO* fileRef );
+
+	void IntegrateFromPShop6 ( const void * buriedPtr, size_t buriedLen );
+
+	XMP_Uns32 UpdateMemoryStream ( void** dataPtr, bool condenseStream = false );
+	void      UpdateFileStream   ( XMP_IO* fileRef, XMP_ProgressTracker* progressTracker );
+
+	TIFF_FileWriter();
+
+	virtual ~TIFF_FileWriter();
+
+private:
+
+	bool changed, legacyDeleted;
+	bool memParsed, fileParsed;
+	bool ownedStream;
+
+	XMP_Uns8* memStream;
+	XMP_Uns32 tiffLength;
+
+	// Memory usage notes: TIFF_FileWriter is for file-based OR read/write usage. For memory-based
+	// streams the dataPtr is initially into the stream, regardless of size. For file-based streams
+	// the dataPtr is initially a separate allocation for large values (over 4 bytes), and points to
+	// the smallValue field for small values. This is also the usage when a tag is changed (for both
+	// memory and file cases), the dataPtr is a separate allocation for large values (over 4 bytes),
+	// and points to the smallValue field for small values.
+
+	// ! The working data values are always stream endian, no matter where stored. They are flipped
+	// ! as necessary by GetTag and SetTag.
+
+	static const bool kIsFileBased   = true;	// For use in the InternalTagInfo constructor.
+	static const bool kIsMemoryBased = false;
+
+	class InternalTagInfo {
+	public:
+
+		XMP_Uns16 id;
+		XMP_Uns16 type;
+		XMP_Uns32 count;
+		XMP_Uns32 dataLen;
+		XMP_Uns32 smallValue;		// Small value in stream endianness, but "left" justified.
+		XMP_Uns8* dataPtr;			// Parsing captures all small values, only large ones that we care about.
+		XMP_Uns32 origDataLen;		// The original (parse time) data length in bytes.
+		XMP_Uns32 origDataOffset;	// The original data offset, regardless of length.
+		bool      changed;
+		bool      fileBased;
+
+		inline void FreeData() {
+			if ( this->fileBased || this->changed ) {
+				if ( (this->dataLen > 4) && (this->dataPtr != 0) ) { free ( this->dataPtr ); this->dataPtr = 0; }
+			}
+		}
+
+		InternalTagInfo ( XMP_Uns16 _id, XMP_Uns16 _type, XMP_Uns32 _count, bool _fileBased )
+			: id(_id), type(_type), count(_count), dataLen(0), smallValue(0), dataPtr(0),
+			  origDataLen(0), origDataOffset(0), changed(false), fileBased(_fileBased) {};
+		~InternalTagInfo() { this->FreeData(); };
+
+		void operator=  ( const InternalTagInfo & in )
+		{
+			// ! Gag! Transfer ownership of the dataPtr!
+			this->FreeData();
+			memcpy ( this, &in, sizeof(*this) );	// AUDIT: Use of sizeof(InternalTagInfo) is safe.
+			if ( this->dataLen <= 4 ) {
+				this->dataPtr = (XMP_Uns8*) &this->smallValue;	// Don't use the copied pointer.
+			} else {
+				*((XMP_Uns8**)&in.dataPtr) = 0;	// The pointer is now owned by "this".
+			}
+		};
+
+	private:
+
+		InternalTagInfo()	// Hidden on purpose, fileBased must be properly set.
+			: id(0), type(0), count(0), dataLen(0), smallValue(0), dataPtr(0),
+			  origDataLen(0), origDataOffset(0), changed(false), fileBased(false) {};
+
+	};
+
+	typedef std::map<XMP_Uns16,InternalTagInfo> InternalTagMap;
+
+	struct InternalIFDInfo {
+		bool changed;
+		XMP_Uns16 origCount;		// Original number of IFD entries.
+		XMP_Uns32 origIFDOffset;	// Original stream offset of the IFD.
+		XMP_Uns32 origNextIFD;		// Original stream offset of the following IFD.
+		InternalTagMap tagMap;
+		InternalIFDInfo() : changed(false), origCount(0), origIFDOffset(0), origNextIFD(0) {};
+		inline void clear()
+		{
+			this->changed = false;
+			this->origCount = 0;
+			this->origIFDOffset = this->origNextIFD = 0;
+			this->tagMap.clear();
+		};
+	};
+
+	InternalIFDInfo containedIFDs[kTIFF_KnownIFDCount];
+
+	static XMP_Uns8 PickIFD ( XMP_Uns8 ifd, XMP_Uns16 id );
+	const InternalTagInfo* FindTagInIFD ( XMP_Uns8 ifd, XMP_Uns16 id ) const;
+
+	void DeleteExistingInfo();
+
+	XMP_Uns32 ProcessMemoryIFD ( XMP_Uns32 ifdOffset, XMP_Uns8 ifd );
+	XMP_Uns32 ProcessFileIFD   ( XMP_Uns8 ifd, XMP_Uns32 ifdOffset, XMP_IO* fileRef );
+
+	void ProcessPShop6IFD ( const TIFF_MemoryReader& buriedExif, XMP_Uns8 ifd );
+
+	void* CopyTagToMasterIFD ( const TagInfo& ps6Tag, InternalIFDInfo* masterIFD );
+
+	void PreflightIFDLinkage();
+
+	XMP_Uns32 DetermineVisibleLength();
+
+	XMP_Uns32 DetermineAppendInfo ( XMP_Uns32 appendedOrigin,
+									bool      appendedIFDs[kTIFF_KnownIFDCount],
+									XMP_Uns32 newIFDOffsets[kTIFF_KnownIFDCount],
+									bool      appendAll = false );
+
+	void UpdateMemByAppend  ( XMP_Uns8** newStream_out, XMP_Uns32* newLength_out,
+							  bool appendAll = false, XMP_Uns32 extraSpace = 0 );
+	void UpdateMemByRewrite ( XMP_Uns8** newStream_out, XMP_Uns32* newLength_out );
+
+	void WriteFileIFD ( XMP_IO* fileRef, InternalIFDInfo & thisIFD );
+
+};	// TIFF_FileWriter
+
+XMP_Bool IsOffsetValid( XMP_Uns32 offset, XMP_Uns32 lowerBound, XMP_Uns32 upperBound );
+
+// =================================================================================================
+
+#endif	// __TIFF_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp b/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp
new file mode 100644
index 0000000..2dbb459
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp
@@ -0,0 +1,599 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2014 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/TimeConversionUtils.hpp"
+
+#include <string>
+#include <sstream>
+#include <iomanip>
+#include <cmath>
+
+namespace TimeConversionUtils {
+
+	void DropFrameToHMSF(
+		XMP_Int64 inFrames,
+		XMP_Int64 inTimecodeFPS,
+		XMP_Uns32& outHours,
+		XMP_Uns32& outMinutes,
+		XMP_Uns32& outSeconds,
+		XMP_Uns32& outFrames)
+	{
+		XMP_Assert((inTimecodeFPS == 30) || (inTimecodeFPS == 60));	// No other drop frame rates are known at this time.
+
+		XMP_Int64 rateAdjustmentFactor = inTimecodeFPS / 30;
+		XMP_Int64 framesPerHour = (30 * 3600 - 108) * rateAdjustmentFactor;
+		XMP_Int64 framesPer10Minutes = (30 * 600 - 18) * rateAdjustmentFactor;
+		XMP_Int64 framesPerMinute = 30 * 60 * rateAdjustmentFactor;
+		XMP_Int64 framesPerSecond = 30 * rateAdjustmentFactor;
+		XMP_Int64 dropsPerMinute = 2 * rateAdjustmentFactor;
+
+		XMP_Int64 currentFrames = inFrames;
+		XMP_Int64 framesLeft = currentFrames;
+		if (currentFrames < 0)
+		{
+			framesLeft = -currentFrames;
+		}
+		if (framesLeft >= framesPerHour)
+		{
+			outHours = static_cast<XMP_Int32>(framesLeft / framesPerHour);
+			framesLeft = framesLeft % framesPerHour;
+		}
+		if (framesLeft >= framesPer10Minutes)
+		{
+			outMinutes = static_cast<XMP_Int32>(framesLeft / framesPer10Minutes) * 10;
+			framesLeft = framesLeft % framesPer10Minutes;
+		}
+		if (framesLeft >= framesPerMinute)
+		{
+			XMP_Int64 remainingDropMinutes = static_cast<XMP_Int64>((framesLeft - framesPerMinute) /
+				(framesPerMinute - dropsPerMinute));
+			++remainingDropMinutes;
+
+			outMinutes += static_cast<XMP_Int32>(remainingDropMinutes);
+			framesLeft -= ((framesPerMinute - dropsPerMinute) * remainingDropMinutes);
+		}
+		if (framesLeft >= framesPerSecond)
+		{
+			outSeconds = static_cast<XMP_Int32>(framesLeft / framesPerSecond);
+		}
+		outFrames = static_cast<XMP_Int32>(framesLeft % framesPerSecond);
+	}
+
+	bool ConvertSamplesToTimecode(
+		std::string &					outTimecode,
+		XMP_Int64						inSamples,
+		XMP_Uns64						inSampleRate,
+		XMP_Int64						inTimecodeFPS,
+		bool							inIsDrop,
+		bool							inIsNoDrop,
+		bool							inShowOnlyFrames = false,
+		bool							inOnlyShowSeconds = false ,
+		bool							inNoZeroPrefix = false ,
+		bool							inShowFractional = false ,
+		bool							inNoHours = false )
+	{
+		if (!(inIsDrop ? !inIsNoDrop : true))
+		{
+			XMP_Assert( !(inIsDrop ? !inIsNoDrop : true) );
+			return false;
+		}
+
+		if (inSampleRate == 0)
+		{
+			outTimecode = "00:00:00:00";
+			return true;
+		}
+
+		std::string possibleNegStr;
+		if (inSamples < 0)
+		{
+			inSamples *= -1;
+			possibleNegStr = "-";
+		}
+
+		XMP_Int64 rateNumerator = inTimecodeFPS;
+		XMP_Int64 rateDenominator = 1;
+		if (inIsDrop || inIsNoDrop)
+		{
+			rateNumerator = 1000 * inTimecodeFPS;
+			rateDenominator = 1001;
+		}
+
+		XMP_Int64 frameNumber = (inSamples * rateNumerator) / (inSampleRate * rateDenominator);
+		XMP_Int64 hundredthsOfFrames = ((inSamples * rateNumerator * 100) / (inSampleRate * rateDenominator)) % 100;
+
+		std::stringstream stream;
+		double fSamples = static_cast<double>(inSamples);
+		double fSampleRate = static_cast<double>(inSampleRate);
+
+		if (inIsDrop)
+		{
+			if (inShowOnlyFrames)
+			{
+				double fAdjustmentFactor = static_cast<double>(inTimecodeFPS) / 30.0;
+				double fCorrectionRatio = (600.0 * static_cast<double>(inTimecodeFPS) / 1.001) / (17982.0 * fAdjustmentFactor);
+				double fValue = fSamples * fCorrectionRatio / fSampleRate;
+
+				// "%ld"
+				stream << static_cast<int>(fValue * 29.97 * fAdjustmentFactor);
+			}
+			else
+			{
+				XMP_Uns32 hours = 0;
+				XMP_Uns32 minutes = 0;
+				XMP_Uns32 seconds = 0;
+				XMP_Uns32 frames = 0;
+
+				DropFrameToHMSF(
+					frameNumber,
+					inTimecodeFPS,
+					hours,
+					minutes,
+					seconds,
+					frames);
+
+				hours = hours % 24;
+				// "%02d;%02d;%02d;%02d"
+				stream << possibleNegStr << std::setfill('0') << std::setw(2) << static_cast<int>(hours)
+					<< ";"
+					<< std::setfill('0') << std::setw(2) << static_cast<int>(minutes)
+					<< ";"
+					<< std::setfill('0') << std::setw(2) << static_cast<int>(seconds)
+					<< ";"
+					<< std::setfill('0') << std::setw(2) << static_cast<int>(frames);
+				possibleNegStr.clear();
+			}
+		}
+		else
+		{
+			if (inShowOnlyFrames)
+			{
+				// "%ld"
+				stream << static_cast<int>(frameNumber);
+			}
+			else
+			{
+				XMP_Int64 framesPerMinute = inTimecodeFPS * 60;
+				XMP_Int64 framesPerHour = framesPerMinute * 60;
+
+				XMP_Int64 iHours = frameNumber / framesPerHour;
+				frameNumber %= framesPerHour;
+				XMP_Int64 mins = frameNumber / framesPerMinute;
+				frameNumber %= framesPerMinute;
+				XMP_Int64 seconds = frameNumber / inTimecodeFPS;
+				XMP_Int64 ss = frameNumber % inTimecodeFPS;
+				XMP_Int64 s = seconds;
+
+				if (inNoHours)
+				{
+					mins += iHours * 60;
+					iHours = 0;
+				}
+
+				if (((iHours) || (!inNoZeroPrefix)) && (!inNoHours))
+				{
+					iHours = iHours % 24;
+					// "%02ld:"
+					stream << possibleNegStr << std::setfill('0') << std::setw(2) << static_cast<int>(iHours)
+						<< ":";
+					possibleNegStr.clear();
+				}
+
+				if ((iHours) || (!inNoZeroPrefix))
+				{
+					// "%02ld:"
+					stream << possibleNegStr << std::setfill('0') << std::setw(2) << static_cast<int>(mins)
+						<< ":";
+					possibleNegStr.clear();
+				}
+				else if (mins)
+				{
+					// "%ld:"
+					stream << possibleNegStr << static_cast<int>(mins)
+						<< ":";
+					possibleNegStr.clear();
+				}
+
+				if (inOnlyShowSeconds)
+				{
+					// "%02ld"
+					stream << possibleNegStr << std::setfill('0') << std::setw(2) << static_cast<int>(s);
+					possibleNegStr.clear();
+				}
+				else
+				{
+					if ((iHours) || (mins) || (!inNoZeroPrefix))
+					{
+						// "%02ld:"
+						stream << possibleNegStr << std::setfill('0') << std::setw(2) << static_cast<int>(s)
+							<< ":";
+						possibleNegStr.clear();
+					}
+					else if (s)
+					{
+						// "%ld:"
+						stream << possibleNegStr << static_cast<int>(s)
+							<< ":";
+						possibleNegStr.clear();
+					}
+
+					if ((iHours) || (mins) || (s) || (!inNoZeroPrefix))
+					{
+						if (inTimecodeFPS <= 10)
+						{
+							// "%01ld"
+							stream << possibleNegStr << std::setfill('0') << std::setw(1) << static_cast<int>(ss);
+							possibleNegStr.clear();
+						}
+						else if ((inTimecodeFPS <= 100))
+						{
+							// "%02ld"
+							stream << possibleNegStr << std::setfill('0') << std::setw(2) << static_cast<int>(ss);
+							possibleNegStr.clear();
+						}
+						else if (inTimecodeFPS <= 1000)
+						{
+							// "%03ld"
+							stream << possibleNegStr << std::setfill('0') << std::setw(3) << static_cast<int>(ss);
+							possibleNegStr.clear();
+						}
+						else
+						{
+							// "%04ld"
+							stream << possibleNegStr << std::setfill('0') << std::setw(4) << static_cast<int>(ss);
+							possibleNegStr.clear();
+						}
+					}
+					else
+					{
+						// "%ld"
+						stream << possibleNegStr << static_cast<int>(ss);
+						possibleNegStr.clear();
+					}
+
+					if (inShowFractional)
+					{
+						// ".%02d"
+						stream << possibleNegStr << "."
+							<< std::setfill('0') << std::setw(2) << static_cast<int>(hundredthsOfFrames);
+						possibleNegStr.clear();
+					}
+				}
+			}
+		}
+
+		outTimecode = stream.str();
+
+		return true;
+	}
+
+	bool ConvertSamplesToSMPTETimecode(
+		std::string &			outTimecode,
+		XMP_Int64				inSamples,
+		XMP_Uns64				inSampleRate,
+		const std::string &		inTimecodeFormat )
+	{
+		bool result = false;
+
+		if ( inTimecodeFormat.compare( "24Timecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 24, false, false );
+		} else if ( inTimecodeFormat.compare( "25Timecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 25, false, false );
+		} else if ( inTimecodeFormat.compare( "2997DropTimecode") == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 30, true, false );
+		} else if ( inTimecodeFormat.compare( "2997NonDropTimecode") == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 30, false, true );
+		} else if ( inTimecodeFormat.compare( "30Timecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 30, false, false );
+		} else if ( inTimecodeFormat.compare( "50Timecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 50, false, false );
+		} else if ( inTimecodeFormat.compare( "5994DropTimecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 60, true, false );
+		} else if ( inTimecodeFormat.compare( "5994NonDropTimecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 60, false, true );
+		} else if ( inTimecodeFormat.compare( "60Timecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode( outTimecode, inSamples, inSampleRate, 60, false, false );
+		} else if ( inTimecodeFormat.compare( "23976Timecode" ) == 0 ) {
+			result = ConvertSamplesToTimecode(outTimecode, inSamples, inSampleRate, 24, false, true);
+		}
+		return result;
+	}
+
+	bool StringToNumber(
+		XMP_Int32 &			outNumber,
+		const std::string & inString )
+	{
+		bool numberFound = false;
+		outNumber = 0;
+		for ( size_t i = 0, endIndex = inString.size(); i < endIndex; i++ ) {
+			XMP_Int32 digit = inString[i] - '0';
+			if ( digit >= 0 && digit <= 9 ) {
+				outNumber *= 10;
+				outNumber += digit;
+				numberFound = true;
+			} else {
+				return numberFound;
+			}
+		}
+		return numberFound;
+	}
+
+	void ParseTimeCodeString(
+		const std::string &		inTimecode, 
+		XMP_Int32 &				outHours,
+		XMP_Int32 &				outMinutes,
+		XMP_Int32 &				outSeconds,
+		XMP_Int32 &				outFrames,
+		XMP_Int32 &				outFractionalFrameNumerator,
+		XMP_Int32 &				outFractionalFrameDenominator )
+	{
+		XMP_Int32 m1 = 0;
+		XMP_Int32 m2 = 0;
+		XMP_Int32 m3 = 0;
+		XMP_Int32 m4 = 0;
+		XMP_Int32 m5 = 0;
+		bool hasFoundDecimal = false;
+		XMP_Int32 digitCount = 0;
+
+		outFractionalFrameNumerator = 0;
+		outFractionalFrameDenominator = 1;
+
+		std::string::const_iterator iter = inTimecode.begin();
+		std::string::const_iterator iterEnd = inTimecode.end();
+
+		while (1)
+		{					// Skip leading white space
+			while ( iter != iterEnd && (*iter < '0' || *iter > '9') )
+			{
+				if (*iter == '.')
+					hasFoundDecimal = true;
+				iter++;
+			}				// hh:mm:ss:ff.ddd
+			if (iter == iterEnd)
+				break;
+
+			if (!hasFoundDecimal)
+			{
+				// get MSB digits
+				StringToNumber(m1, std::string(iter, iterEnd));
+
+				// Skip the digits
+				while (iter != iterEnd && (*iter >= '0' && *iter <= '9'))
+					iter++;
+
+				// Skip the white space, note if "." or ":" ("." signifies decimal portion of frame)
+				while ( iter != iterEnd && (*iter < '0' || *iter > '9'))
+				{
+					if (*iter == '.')
+						hasFoundDecimal = true;
+					iter++;
+				}
+
+				if (iter == iterEnd)
+					break;
+			}
+			// shift and scan next MSB digits
+
+			if (!hasFoundDecimal)
+			{
+				m2 = m1;
+				digitCount = static_cast< XMP_Int32 >( iterEnd - iter );
+				StringToNumber(m1, std::string(iter, iterEnd));
+
+				// Skip the digits
+				while ( iter != iterEnd && (*iter >= '0' && *iter <= '9') )
+					iter++;
+
+				// Skip the white space, note if "." or ":" ("." signifies
+				// decimal portion of frame)
+				while (iter != iterEnd && (*iter < '0' || *iter > '9'))
+				{
+					if (*iter == '.')
+						hasFoundDecimal = true;
+					iter++;
+				}
+			}
+
+			if (iter == iterEnd)
+				break;
+
+			m3 = m2;
+			m2 = m1;
+			digitCount = static_cast< XMP_Int32 >( iterEnd - iter );
+			StringToNumber(m1, std::string(iter, iterEnd));
+			if (hasFoundDecimal)
+				break;
+
+			while (iter != iterEnd && (*iter >= '0' && *iter <= '9'))
+				iter++;
+
+			// Skip the white space, note if "." or ":" ("." signifies decimal portion of frame)
+			while (iter != iterEnd && (*iter < '0' || *iter > '9'))
+			{
+				if (*iter == '.')
+					hasFoundDecimal = true;
+				iter++;
+			}
+			if (iter == iterEnd)
+				break;
+
+			m4 = m3;
+			m3 = m2;
+			m2 = m1;
+			digitCount = static_cast< XMP_Int32 >( iterEnd - iter );
+			StringToNumber(m1, std::string(iter, iterEnd));
+			if (hasFoundDecimal)
+				break;
+
+			while (iter != iterEnd && (*iter >= '0' && *iter <= '9'))
+			{
+				iter++;
+			}
+
+			// Skip the white space, note if "." or ":" ("." signifies decimal portion of frame)
+			while (iter != iterEnd && (*iter < '0' || *iter > '9'))
+			{
+				if (*iter == '.')
+					hasFoundDecimal = true;
+				iter++;
+			}
+
+			if (iter == iterEnd)
+				break;
+
+			m5 = m4;
+			m4 = m3;
+			m3 = m2;
+			m2 = m1;
+			digitCount = static_cast< XMP_Int32 >( iterEnd - iter );
+			StringToNumber(m1, std::string(iter, iterEnd));
+			break;
+		}
+
+		if (hasFoundDecimal)
+		{
+			outFractionalFrameDenominator = static_cast<XMP_Int32>(pow(10.0, digitCount) + 0.5);
+			outFractionalFrameNumerator = m1;
+			m1 = m2;
+			m2 = m3;
+			m3 = m4;
+			m4 = m5;
+			m5 = 0;
+		}
+		outHours = m4;
+		outMinutes = m3;
+		outSeconds = m2;
+		outFrames = m1;
+	}
+
+	bool ConvertTimecodeToSamples(
+		XMP_Int64 &						outSamples,
+		const std::string &				inTimecode,
+		XMP_Uns64						inSampleRate,
+		XMP_Int64						inTimecodeFPS,
+		bool							inNTSC,
+		bool							inDropFrame)
+	{
+		/// @TODO: Ensure that negative and >64-bit values are OK and work as expected.
+
+		if (inTimecode.empty())
+		{
+			outSamples = static_cast<XMP_Int64>(-1);
+			return true;
+		}
+
+		XMP_Int32 hours;
+		XMP_Int32 minutes;
+		XMP_Int32 seconds;
+		XMP_Int32 frames;
+		XMP_Int32 fractionalFrameNumerator;
+		XMP_Int32 fractionalFrameDenominator;
+
+		ParseTimeCodeString(inTimecode, hours, minutes, seconds, frames, fractionalFrameNumerator, fractionalFrameDenominator);
+
+		XMP_Int64 framesPerSecond = inTimecodeFPS;
+		XMP_Int64 framesPerMinute = framesPerSecond * 60;
+		XMP_Int64 framesPerHour = framesPerMinute * 60;
+		XMP_Int64 wholeFrames = 0;
+		XMP_Int64 frameRateNumerator = inTimecodeFPS;
+		XMP_Int64 frameRateDenominator = 1;
+
+		if (inNTSC)
+		{
+			frameRateNumerator = 1000 * inTimecodeFPS;
+			frameRateDenominator = 1001;
+		}
+
+		if (inDropFrame)
+		{
+			XMP_Int64 frameGroupDropped = 2 * inTimecodeFPS / 30;		// 2 or 4 frames dropped at a time.
+			XMP_Int64 framesPerHourDropped = 108 * inTimecodeFPS / 30;
+			framesPerHour -= framesPerHourDropped;
+			XMP_Int64 framesPerTenMinutes = framesPerHour / 6;
+			XMP_Assert( framesPerHour % 6 == 0 );	//, "Drop frame not supported on the given frame rate."
+			XMP_Int64 framesDroppedWithinTheLeastTenMinutes = 0;
+			if (minutes % 10 != 0)
+			{
+				if ((seconds == 0) && (frames < frameGroupDropped))
+				{
+					frames = static_cast<XMP_Int32>(frameGroupDropped);	// Make sure invalid strings snap to the next higher valid frame.
+				}
+				framesDroppedWithinTheLeastTenMinutes = (minutes % 10) * frameGroupDropped;
+			}
+			wholeFrames = hours * framesPerHour + (minutes / 10) * framesPerTenMinutes + (minutes % 10) * framesPerMinute + seconds * framesPerSecond + frames - framesDroppedWithinTheLeastTenMinutes;
+		}
+		else
+		{
+			wholeFrames = hours * framesPerHour + minutes * framesPerMinute + seconds * framesPerSecond + frames;
+		}
+
+		if (frameRateNumerator * fractionalFrameDenominator == 0)
+		{
+			XMP_Assert( "Divide by zero in ConvertTimecodeToSamples" );
+			outSamples = 0;
+			return true;
+		}
+
+		//
+		// (frame count / frames per second) * samples per second = sample count.
+		//
+		// ((frame count + fractionalFrameNumerator / fractionalFrameDenominator) * samples per second / frames per second) = sample count.
+		// or in integer math:
+		// ((frame count * fractionalFrameDenominator + fractionalFrameNumerator) * samples per second / (frames per second * fractionalFrameDenominator)) = sample count.
+		// with rounding correction to give us the first sample contained entirely in the frame:
+
+		// There is a non-zero probability of rolling over this integer arithmetic.
+		double integerFailsafeNumerator = ((static_cast<double>(wholeFrames) * static_cast<double>(fractionalFrameDenominator) + fractionalFrameNumerator) * static_cast<double>(frameRateDenominator) * static_cast<double>(inSampleRate) + (frameRateNumerator * fractionalFrameDenominator - 1));
+		if (integerFailsafeNumerator > static_cast<double>(0x7000000000000000LL))
+		{
+			outSamples = static_cast<XMP_Int64>(integerFailsafeNumerator / (static_cast<double>(frameRateNumerator) * static_cast<double>(fractionalFrameDenominator)));
+		}
+		else
+		{
+			outSamples = ((wholeFrames * fractionalFrameDenominator + fractionalFrameNumerator) * frameRateDenominator * inSampleRate + (frameRateNumerator * fractionalFrameDenominator - 1)) / (frameRateNumerator * fractionalFrameDenominator);
+		}
+		return true;
+	}
+
+	bool ConvertSMPTETimecodeToSamples(
+		XMP_Int64 &				outSamples,
+		const std::string &		inTimecode,
+		XMP_Uns64				inSampleRate,
+		const std::string & inTimecodeFormat )
+	{
+		bool result = false;
+
+		if ( inTimecodeFormat.compare( "24Timecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 24, false, false );
+		} else if ( inTimecodeFormat.compare( "25Timecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 25, false, false );
+		} else if ( inTimecodeFormat.compare( "2997DropTimecode") == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 30, true, true );
+		} else if ( inTimecodeFormat.compare( "2997NonDropTimecode") == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 30, true, false );
+		} else if ( inTimecodeFormat.compare( "30Timecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 30, false, false );
+		} else if ( inTimecodeFormat.compare( "50Timecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 50, false, false );
+		} else if ( inTimecodeFormat.compare( "5994DropTimecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 60, true, true );
+		} else if ( inTimecodeFormat.compare( "5994NonDropTimecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 60, true, false );
+		} else if ( inTimecodeFormat.compare( "60Timecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 60, false, false );
+		} else if ( inTimecodeFormat.compare( "23976Timecode" ) == 0 ) {
+			result = ConvertTimecodeToSamples( outSamples, inTimecode, inSampleRate, 24, true, false );
+		}
+		return result;
+	}
+
+}
diff --git a/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp b/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp
new file mode 100644
index 0000000..bf7ed04
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp
@@ -0,0 +1,35 @@
+#ifndef TimeConversionUtils_h__
+#define TimeConversionUtils_h__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2014 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+namespace TimeConversionUtils {
+	bool ConvertSamplesToSMPTETimecode(
+		std::string &		outTimecode,
+		XMP_Int64			inSamples,
+		XMP_Uns64			inSampleRate,
+		const std::string & inTimecodeFormat );
+
+	bool ConvertSMPTETimecodeToSamples(
+		XMP_Int64 &			outSamples,
+		const std::string & inTimecode,
+		XMP_Uns64			inSampleRate,
+		const std::string & inTimecodeFormat
+		);
+
+
+};
+
+#endif // TimeConversionUtils_h__
diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp
new file mode 100644
index 0000000..5b98ba0
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp
@@ -0,0 +1,355 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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.h>
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h"
+#include "source/Endian.h"
+
+using namespace IFF_RIFF;
+
+static const XMP_Uns32 kBEXTSizeMin					= 602;							// at minimum 602 bytes
+
+static const XMP_Uns32 kSizeDescription				= 256;
+static const XMP_Uns32 kSizeOriginator				= 32;
+static const XMP_Uns32 kSizeOriginatorReference		= 32;
+static const XMP_Uns32 kSizeOriginationDate			= 10;
+static const XMP_Uns32 kSizeOriginationTime			= 8;
+
+// Needed to be able to memcpy directly to this struct.
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( 1 )
+#else
+#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+	struct BEXT
+	{
+		char			mDescription[256];
+		char			mOriginator[32];
+		char			mOriginatorReference[32];
+		char			mOriginationDate[10];
+		char			mOriginationTime[8];
+		XMP_Uns32		mTimeReferenceLow;
+		XMP_Uns32		mTimeReferenceHigh;
+		XMP_Uns16		mVersion;
+		XMP_Uns8		mUMID[64];
+		XMP_Uns8		mReserved[190];
+	};
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( )
+#else
+#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+//-----------------------------------------------------------------------------
+// 
+// [static] convertLF(...)
+// 
+// Purpose: Convert Mac/Unix line feeds to CR/LF
+// 
+//-----------------------------------------------------------------------------
+
+void BEXTMetadata::NormalizeLF( std::string& str )
+{
+	XMP_Uns32 i = 0;
+	while( i < str.length() )
+	{
+		char ch = str[i];
+
+		if( ch == 0x0d )
+		{
+			//
+			// possible Mac lf
+			//
+			if( i+1 < str.length() )
+			{
+				if( str[i+1] != 0x0a )
+				{
+					//
+					// insert missing LF character
+					//
+					str.insert( i+1, 1, 0x0a );
+				}
+
+				i += 2;
+			}
+			else
+			{
+				str.push_back( 0x0a );
+			}
+		}
+		else if( ch == 0x0a )
+		{
+			//
+			// possible Unix LF
+			//
+			if( i == 0 || str[i-1] != 0x0d )
+			{
+				//
+				// insert missing CR character
+				//
+				str.insert( i, 1, 0x0d );
+				i += 2;
+			}
+			else
+			{
+				i++;
+			}
+		}
+		else
+		{
+			i++;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// BEXTMetadata::BEXTMetadata(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+BEXTMetadata::BEXTMetadata()
+{
+}
+
+BEXTMetadata::~BEXTMetadata()
+{
+}
+
+//-----------------------------------------------------------------------------
+// 
+// BEXTMetadata::parse(...)
+// 
+// Purpose: Parses the given memory block and creates a data model representation
+//			The implementation expects that the memory block is the data area of
+//			the BEXT chunk and its size is at least as big as the minimum size
+//			of a BEXT data block.
+//			Throws exceptions if parsing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+void BEXTMetadata::parse( const XMP_Uns8* chunkData, XMP_Uns64 size )
+{
+	if( size >= kBEXTSizeMin )
+	{
+		const LittleEndian& LE = LittleEndian::getInstance();
+
+		BEXT bext;
+		memset( &bext, 0, kBEXTSizeMin );
+
+		//
+		// copy input data into BEXT block (except CodingHistory field)
+		// Safe as fixed size matches size of struct that is #pragma packed(1)
+		//
+		memcpy( &bext, chunkData, kBEXTSizeMin );
+
+		//
+		// copy CodingHistory
+		//
+		if( size > kBEXTSizeMin )
+		{
+			this->setValue<std::string>( kCodingHistory, std::string( reinterpret_cast<const char*>(&chunkData[kBEXTSizeMin]), static_cast<std::string::size_type>(size - kBEXTSizeMin) ) );
+		}
+
+		//
+		// copy values to map
+		//
+		this->setValue<std::string>( kDescription,			std::string( bext.mDescription, kSizeDescription ) );
+		this->setValue<std::string>( kOriginator,			std::string( bext.mOriginator, kSizeOriginator ) );
+		this->setValue<std::string>( kOriginatorReference,	std::string( bext.mOriginatorReference, kSizeOriginatorReference ) );
+		this->setValue<std::string>( kOriginationDate,		std::string( bext.mOriginationDate, kSizeOriginationDate ) );
+		this->setValue<std::string>( kOriginationTime,		std::string( bext.mOriginationTime, kSizeOriginationTime ) );
+
+		this->setValue<XMP_Uns64>( kTimeReference,			LE.getUns64( &bext.mTimeReferenceLow ) );
+		this->setValue<XMP_Uns16>( kVersion,				LE.getUns16( &bext.mVersion ) );
+
+		this->setArray<XMP_Uns8>( kUMID,					bext.mUMID, 64 );
+
+		this->resetChanges();
+	}
+	else
+	{
+		XMP_Throw ( "Not a valid BEXT chunk", kXMPErr_BadFileFormat );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// BEXTMetadata::serialize(...)
+// 
+// Purpose: Serializes the data model to a memory block. 
+//			The memory block will be the data area of a BEXT chunk.
+//			Throws exceptions if serializing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 BEXTMetadata::serialize( XMP_Uns8** outBuffer )
+{
+	XMP_Uns64 size = 0;
+
+	if( outBuffer != NULL )
+	{
+		const LittleEndian& LE = LittleEndian::getInstance();
+
+		size = kBEXTSizeMin;
+
+		std::string codingHistory;
+
+		if( this->valueExists( kCodingHistory ) )
+		{
+			codingHistory = this->getValue<std::string>( kCodingHistory );
+			NormalizeLF( codingHistory );
+
+			size += codingHistory.length();
+		}
+
+		//
+		// setup buffer
+		//
+		XMP_Uns8* buffer = new XMP_Uns8[static_cast<size_t>(size)];
+
+		//
+		// copy values and strings back to BEXT block
+		//
+		// ! Safe use of strncpy as the fixed size is consistent with the size of the destination buffer
+		// But it is intentional here that the string might not be null terminated if
+		// the size of the source is equal to the fixed size of the destination
+		//
+		BEXT bext;
+		memset( &bext, 0, kBEXTSizeMin );
+
+		if( this->valueExists( kDescription ) )
+		{
+			strncpy( bext.mDescription, this->getValue<std::string>( kDescription ).c_str(), kSizeDescription );
+		}
+		if( this->valueExists( kOriginator ) )
+		{
+			strncpy( bext.mOriginator, this->getValue<std::string>( kOriginator ).c_str(), kSizeOriginator );
+		}
+		if( this->valueExists( kOriginatorReference ) )
+		{
+			strncpy( bext.mOriginatorReference, this->getValue<std::string>( kOriginatorReference ).c_str(), kSizeOriginatorReference );
+		}
+		if( this->valueExists( kOriginationDate ) )
+		{
+			strncpy( bext.mOriginationDate, this->getValue<std::string>( kOriginationDate ).c_str(), kSizeOriginationDate );
+		}
+		if( this->valueExists( kOriginationTime ) )
+		{
+			strncpy( bext.mOriginationTime, this->getValue<std::string>( kOriginationTime ).c_str(), kSizeOriginationTime );
+		}
+
+		if( this->valueExists( kTimeReference ) )
+		{
+			LE.putUns64( this->getValue<XMP_Uns64>( kTimeReference ), &bext.mTimeReferenceLow );
+		}
+
+		if( this->valueExists( kVersion ) )
+		{
+			LE.putUns16( this->getValue<XMP_Uns16>( kVersion ), &bext.mVersion );
+		}
+		else // Special case: If no value is given, a value of "1" is the default!
+		{
+			LE.putUns16( 1, &bext.mVersion );
+		}
+
+		if( this->valueExists( kUMID ) )
+		{
+			XMP_Uns32 muidSize = 0;
+			const XMP_Uns8* const muid = this->getArray<XMP_Uns8>( kUMID, muidSize );
+			
+			// Make sure to copy 64 bytes max.
+			muidSize = muidSize > 64 ? 64 : muidSize;
+			memcpy( bext.mUMID, muid, muidSize );
+		}
+		//
+		// set input buffer to zero
+		//
+		memset( buffer, 0, static_cast<size_t>(size) );
+
+		//
+		// copy BEXT block into buffer (except CodingHistory field)
+		//
+		memcpy( buffer, &bext, kBEXTSizeMin );
+
+		//
+		// copy CodingHistory field into buffer
+		//
+		if( ! codingHistory.empty() )
+		{
+			memcpy( buffer + kBEXTSizeMin, codingHistory.c_str(), static_cast<size_t>(size - kBEXTSizeMin) );
+		}
+
+		*outBuffer = buffer;
+	}
+	else
+	{
+		XMP_Throw ( "Invalid buffer", kXMPErr_InternalFailure );
+	}
+
+	return size;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// BEXTMetadata::isEmptyValue(...)
+// 
+// Purpose: Is the value of the passed ValueObject and its id "empty"?
+// 
+//-----------------------------------------------------------------------------
+
+bool BEXTMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj )
+{
+	bool ret = true;
+
+	switch( id )
+	{
+		case kDescription:
+		case kOriginator:
+		case kOriginatorReference:
+		case kOriginationDate:
+		case kOriginationTime:
+		case kCodingHistory:
+		{
+			TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+
+			ret = ( strObj == NULL || ( strObj != NULL && strObj->getValue().empty() ) );
+		}
+		break;
+
+		case kTimeReference:
+		case kVersion:
+			ret = false;
+			break;
+		case kUMID:
+		{
+			TArrayObject<XMP_Uns8>* obj = dynamic_cast<TArrayObject<XMP_Uns8>*>(&valueObj);
+
+			if( obj != NULL )
+			{
+				XMP_Uns32 size	 = 0;
+				const XMP_Uns8* const buffer = obj->getArray( size );
+
+				ret = ( size == 0 );
+			}
+		}
+		break;
+
+		default:
+			ret = true;
+	}
+
+	return ret;
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h
new file mode 100644
index 0000000..0f57246
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h
@@ -0,0 +1,99 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _BEXTMetadata_h_
+#define _BEXTMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+namespace IFF_RIFF
+{
+
+/**
+ *	BEXT Metadata model.
+ *	Implements the IMetadata interface
+ */
+class BEXTMetadata : public IMetadata
+{
+public:
+	enum
+	{
+		kDescription,			// std::string
+		kOriginator,			// std::string
+		kOriginatorReference,	// std::string
+		kOriginationDate,		// std::string
+		kOriginationTime,		// std::string
+		kTimeReference,			// XMP_Uns64
+		kVersion,				// XMP_Uns16
+		kUMID,					// XMP_Uns8[64]
+		kCodingHistory			// std::string
+	};
+
+public:
+	/**
+	 *ctor/dtor
+	 */
+				BEXTMetadata();
+			   ~BEXTMetadata();
+
+	/**
+	 * Parses the given memory block and creates a data model representation
+	 * The implementation expects that the memory block is the data area of
+	 * the BEXT chunk.
+	 * Throws exceptions if parsing is not possible
+	 *
+	 * @param input		The byte buffer to parse
+	 * @param size		Size of the given byte buffer
+	 */
+	void		parse( const XMP_Uns8* chunkData, XMP_Uns64 size );
+	
+	/**
+	 * See IMetadata::parse( const LFA_FileRef input )
+	 */
+	void		parse( XMP_IO* input ) { IMetadata::parse( input ); }
+	
+	/**
+	 * Serializes the data model to a memory block. 
+	 * The memory block will be the data area of a BEXT chunk.
+	 * Throws exceptions if serializing is not possible
+	 *
+	 * @param buffer	Buffer that gets filled with serialized data
+	 * @param size		Size of passed in buffer
+	 *
+	 * @return			Size of serialzed data (might be smaller than buffer size)
+	 */
+	XMP_Uns64		serialize( XMP_Uns8** buffer );
+
+protected:
+	/**
+	 * @see IMetadata::isEmptyValue
+	 */
+	virtual	bool isEmptyValue( XMP_Uns32 id, ValueObject& valueObj );
+
+	/**
+	 * Normalize line feeds to \CR\LF
+	 * Mac <OS9: \r
+	 * Linux: \n
+	 * Win: \r\n
+	 */
+	static void NormalizeLF( std::string& str );
+
+private:
+	// Operators hidden on purpose
+	BEXTMetadata( const BEXTMetadata& ) {};
+	BEXTMetadata& operator=( const BEXTMetadata& ) { return *this; };
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp
new file mode 100644
index 0000000..73165e4
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp
@@ -0,0 +1,324 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+#include "XMPFiles/source/FormatSupport/WAVE/CartMetadata.h"
+
+#include "source/EndianUtils.hpp"
+
+using namespace IFF_RIFF;
+
+// =============================================================================================
+
+// Types and globals for the stored form of the cart chunk.
+
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( 1 )
+#else
+#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+struct StoredCartChunk {
+	char Version[4];	// All of the fixed size text fields are null-filled local text,
+	char Title[64];		//	but need not have a terminating null.
+	char Artist[64];
+	char CutID[64];
+	char ClientID[64];
+	char Category[64];
+	char Classification[64];
+	char OutCue[64];
+	char StartDate[10];
+	char StartTime[8];
+	char EndDate[10];
+	char EndTime[8];
+	char ProducerAppID[64];
+	char ProducerAppVersion[64];
+	char UserDef[64];
+	XMP_Int32 LevelReference;		// Little endian in the file.
+	CartMetadata::StoredCartTimer PostTimer[CartMetadata::kPostTimerLength];
+	char Reserved[276];
+	char URL[1024];
+	// char TagText[];	- fills the tail of the chunk
+};
+
+static const size_t kMinimumCartChunkSize = sizeof(StoredCartChunk);
+
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( )
+#else
+#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+static const size_t kFixedTextCount = (CartMetadata::kLastFixedTextField - CartMetadata::kFirstFixedTextField + 1);
+
+struct FixedTextFieldInfo {
+	size_t length;
+	size_t offset;
+};
+
+static const FixedTextFieldInfo kFixedTextFields [kFixedTextCount] = {
+	// ! The order of the items must match the order of the mapped field enum in the header.
+	{  4, offsetof ( StoredCartChunk, Version ) },
+	{ 64, offsetof ( StoredCartChunk, Title ) },
+	{ 64, offsetof ( StoredCartChunk, Artist ) },
+	{ 64, offsetof ( StoredCartChunk, CutID ) },
+	{ 64, offsetof ( StoredCartChunk, ClientID ) },
+	{ 64, offsetof ( StoredCartChunk, Category ) },
+	{ 64, offsetof ( StoredCartChunk, Classification ) },
+	{ 64, offsetof ( StoredCartChunk, OutCue ) },
+	{ 10, offsetof ( StoredCartChunk, StartDate ) },
+	{  8, offsetof ( StoredCartChunk, StartTime ) },
+	{ 10, offsetof ( StoredCartChunk, EndDate ) },
+	{  8, offsetof ( StoredCartChunk, EndTime ) },
+	{ 64, offsetof ( StoredCartChunk, ProducerAppID ) },
+	{ 64, offsetof ( StoredCartChunk, ProducerAppVersion ) },
+	{ 64, offsetof ( StoredCartChunk, UserDef ) },
+	{ 1024, offsetof ( StoredCartChunk, URL ) }
+};
+
+// =================================================================================================
+
+CartMetadata::CartMetadata() {
+	// Nothing to do.
+}
+
+// =================================================================================================
+
+CartMetadata::~CartMetadata() {
+	// Nothing to do.
+}
+
+// =================================================================================================
+
+static size_t FindZeroByte ( const char * textPtr, size_t maxLength ) {
+	// Return the offset of the first zero byte, up to maxLength.
+	size_t length = 0;
+	while ( (length < maxLength) && (textPtr[length] != 0) ) ++length;
+	return length;
+}
+
+// =================================================================================================
+
+void CartMetadata::parse ( const XMP_Uns8* chunkData, XMP_Uns64 chunkSize ) 
+{
+	// Make sure the chunk has a reasonable size.
+	if ( chunkSize > 1000*1000*1000 )
+	{
+		XMP_Throw ( "Not a valid Cart chunk", kXMPErr_BadFileFormat );
+	}
+	
+	StoredCartChunk* fileChunk;
+
+	// If the chunk is too small, copy and pad with zeros
+	if ( chunkSize < kMinimumCartChunkSize )
+	{
+		fileChunk = new StoredCartChunk;
+		memset( fileChunk, 0, kMinimumCartChunkSize );
+		memcpy( fileChunk, chunkData, static_cast<size_t>(chunkSize) ); // AUDIT: safe, chunkSize is smaller than buffer
+	}
+	else
+	{
+		fileChunk = (StoredCartChunk*)chunkData;
+	}
+
+	try
+	{
+		std::string localStr;
+	
+		// Extract the binary LevelReference field.
+
+		this->setValue<XMP_Int32> ( kLevelReference, (XMP_Int32) GetUns32LE ( &fileChunk->LevelReference ) );
+	
+		// Extract the PostTimer Array
+		// first ensure the correct endianess
+		StoredCartTimer timerArray[CartMetadata::kPostTimerLength];
+		for ( XMP_Uns32 i = 0; i < CartMetadata::kPostTimerLength; i++ )
+		{
+			timerArray[i].usage = GetUns32BE( &fileChunk->PostTimer[i].usage ); 
+			timerArray[i].value = GetUns32LE( &fileChunk->PostTimer[i].value );
+		}
+		this->setArray<StoredCartTimer> (kPostTimer, timerArray, CartMetadata::kPostTimerLength);
+
+		// Extract the trailing TagText portion, if any. Keep the local encoding, the conversion to
+		// Unicode is done later when importing to XMP.
+	
+		if ( chunkSize > kMinimumCartChunkSize ) {
+	
+			const char * tagTextPtr = (char*)fileChunk + sizeof(StoredCartChunk);
+			const size_t trailerSize = (size_t)chunkSize - kMinimumCartChunkSize;
+			const size_t tagTextSize = FindZeroByte ( tagTextPtr, trailerSize );
+			localStr.assign ( tagTextPtr, tagTextSize );
+			this->setValue<std::string> ( kTagText, localStr );
+	
+		}
+	
+		// Extract the fixed length text fields. Keep the local encoding, the conversion to Unicode is
+		// done later when importing to XMP.
+	
+		for ( int i = CartMetadata::kFirstFixedTextField; i <= CartMetadata::kLastFixedTextField; ++i ) {
+	
+			const FixedTextFieldInfo& currField = kFixedTextFields[i];
+			const char * textPtr = (char*)fileChunk + currField.offset;
+			size_t textLen = FindZeroByte ( textPtr, currField.length );
+			if ( textLen > 0 ) {
+				localStr.assign ( textPtr, textLen );
+				this->setValue<std::string> ( i, localStr );
+			}
+	
+		}
+
+		this->resetChanges();
+	}
+	catch ( ... ) // setValue/setArray might throw
+	{
+		// If the chunk had been too small, it has been copied to a new buffer padded with zeros
+		if ( chunkSize < kMinimumCartChunkSize )
+		{
+			delete fileChunk;
+		}
+		throw;
+	}
+	
+	if ( chunkSize < kMinimumCartChunkSize )
+	{
+		delete fileChunk;
+	}
+
+}	// CartMetadata::parse
+
+// =================================================================================================
+
+XMP_Uns64 CartMetadata::serialize ( XMP_Uns8** outBuffer )
+{
+
+	if ( outBuffer == NULL )
+	{
+		XMP_Throw ( "Invalid buffer", kXMPErr_InternalFailure );
+	}
+
+	*outBuffer = 0;	// Default in case of early exit.
+	
+	// Set up the output buffer.
+	
+	size_t trailerSize = 0;
+	std::string tagTextStr;
+	if ( this->valueExists ( kTagText ) ) {
+		tagTextStr = this->getValue<std::string> ( kTagText );
+		trailerSize = tagTextStr.size() + 1;	// Include the final nul.
+	}
+	
+	size_t chunkSize = sizeof(StoredCartChunk) + trailerSize;
+	XMP_Uns8* buffer = new XMP_Uns8 [ chunkSize ];
+	if ( buffer == 0 ) XMP_Throw ( "Cannot allocate cart chunk buffer", kXMPErr_NoMemory );
+	memset ( buffer, 0, chunkSize );	// Fill with zeros for missing or short fields.
+	
+	StoredCartChunk* newChunk = (StoredCartChunk*)buffer;
+
+	// Insert the binary LevelReference field.
+	
+	if ( this->valueExists ( kLevelReference ) ) {
+		newChunk->LevelReference = MakeUns32LE ( (XMP_Uns32) this->getValue<XMP_Int32> ( kLevelReference ) );
+	}
+
+	// Insert the PostTimer Array
+	if ( this->valueExists ( kPostTimer ) ) {
+		XMP_Uns32 size = 0;
+		const StoredCartTimer* timerArray = this->getArray<StoredCartTimer> ( kPostTimer, size );
+		XMP_Assert (size == CartMetadata::kPostTimerLength );
+
+		for ( XMP_Uns32 i = 0; i<CartMetadata::kPostTimerLength; i++ )
+		{
+			newChunk->PostTimer[i].usage = MakeUns32BE(timerArray[i].usage); // ensure the FOURCC is written in Big Endian
+			newChunk->PostTimer[i].value = MakeUns32LE(timerArray[i].value); // ensure the value is written as Little Endian
+		}
+	}
+
+	// Insert the trailing TagText portion, if any. The conversion to local encoding should have
+	// been done when exporting from XMP. Include the final nul.
+
+	if ( ! tagTextStr.empty() ) {
+		XMP_Uns8* tagTextPtr = buffer + sizeof(StoredCartChunk);
+		strncpy ( (char*)tagTextPtr, tagTextStr.c_str(), trailerSize );	// AUDIT: Safe, see prior allocation.
+	}
+	
+	// Insert the fixed length text fields. The conversion to local encoding should have been done
+	// when exporting from XMP.
+
+	std::string currStr;
+	
+	for ( int i = CartMetadata::kFirstFixedTextField; i <= CartMetadata::kLastFixedTextField; ++i ) {
+	
+		if ( ! this->valueExists ( i ) ) continue;
+		const FixedTextFieldInfo& currField = kFixedTextFields[i];
+
+		currStr = this->getValue<std::string> ( i );
+		if ( currStr.empty() ) continue;
+		if ( currStr.size() > currField.length ) currStr.erase ( currField.length );
+		XMP_Assert ( currStr.size() <= currField.length );
+		
+		strncpy ( (char*)(buffer + currField.offset), currStr.c_str(), currStr.size() );	// 	// AUDIT: Safe, within fixed bounds.
+	
+	}
+
+	// Done.
+	
+	*outBuffer = buffer;
+	return chunkSize;
+
+}	// CartMetadata::serialize
+
+// =================================================================================================
+
+bool CartMetadata::isEmptyValue ( XMP_Uns32 id, ValueObject& valueObj ) {
+
+	bool isEmpty = true;
+	
+	switch( id )
+	{
+		case kLevelReference:
+		{
+			//XMP_Int32
+			TValueObject<XMP_Int32>* binObj = dynamic_cast<TValueObject<XMP_Int32>*>(&valueObj);
+			isEmpty = ( binObj == 0 );	// All values are valid.
+		}
+		break;
+		
+		case kPostTimer:
+		{
+			// Array[8]*2
+			TArrayObject<StoredCartTimer>* obj = dynamic_cast<TArrayObject<StoredCartTimer>*>(&valueObj);
+
+			if( obj != NULL )
+			{
+				XMP_Uns32 size	 = 0;
+				const StoredCartTimer* const buffer = obj->getArray( size );
+
+				isEmpty = ( size == 0 );
+			}
+		}
+		break;
+
+		default:
+		{
+			// String values
+			TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+			isEmpty = ( (strObj == 0) || strObj->getValue().empty() ); 
+		}
+		break;
+	}
+	
+	return isEmpty;
+
+}	// CartMetadata::isEmptyValue
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h
new file mode 100644
index 0000000..29266a7
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h
@@ -0,0 +1,87 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 _CartMetadata_h_
+#define _CartMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+namespace IFF_RIFF {
+
+// =================================================================================================
+
+class CartMetadata : public IMetadata {
+
+public:
+
+	enum {
+
+		// IDs for the mapped cart chunk fields.
+		kVersion,				// Local text, max 4 bytes
+		kTitle,					// Local text, max 64 bytes
+		kArtist,				// Local text, max 64 bytes
+		kCutID,					// Local text, max 64 bytes
+		kClientID,				// Local text, max 64 bytes
+		kCategory,				// Local text, max 64 bytes
+		kClassification,		// Local text, max 64 bytes
+		kOutCue,				// Local text, max 64 bytes
+		kStartDate,				// Local text, max 10 bytes
+		kStartTime,				// Local text, max 8 bytes
+		kEndDate,				// Local text, max 10 bytes
+		kEndTime,				// Local text, max 8 bytes
+		kProducerAppID,			// Local text, max 64 bytes
+		kProducerAppVersion,	// Local text, max 64 bytes
+		kUserDef,				// Local text, max 64 bytes
+		kURL,					// Local text, max 1024 bytes
+		kTagText,				// Local text, no limit
+		kLevelReference,		// Little endian unsigned 32
+		kPostTimer,				// array[8] of usage(Uns32), value(Uns32)
+		kReserved,				// 276 reserved bytes
+
+		// Constants for the range of fixed length text fields.
+		kFirstFixedTextField = kVersion,
+		kLastFixedTextField  = kURL
+
+	};
+
+	struct StoredCartTimer {
+		XMP_Uns32 usage;
+		XMP_Uns32 value;
+	};
+
+	enum { kPostTimerLength = 8 };
+
+	CartMetadata();
+	virtual ~CartMetadata();
+
+	void parse ( const XMP_Uns8* chunkData, XMP_Uns64 chunkSize );
+	void parse ( XMP_IO* input ) { IMetadata::parse ( input ); }
+	
+	XMP_Uns64 serialize ( XMP_Uns8** buffer );
+
+protected:
+
+	virtual	bool isEmptyValue ( XMP_Uns32 id, ValueObject& valueObj );
+
+private:
+
+	// Operators hidden on purpose.
+	CartMetadata ( const CartMetadata& ) {};
+	CartMetadata& operator= ( const CartMetadata& ) { return *this; };
+
+};	// CartMetadata
+
+}	// namespace IFF_RIFF
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp
new file mode 100644
index 0000000..d085aca
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp
@@ -0,0 +1,246 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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.h>
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h"
+#include "source/Endian.h"
+
+using namespace IFF_RIFF;
+
+static const XMP_Uns32 kCr8rSizeFix		= 84;		// always 84 bytes
+
+static const XMP_Uns32 kSizeFileExt		= 16;
+static const XMP_Uns32 kSizeAppOtions	= 16;
+static const XMP_Uns32 kSizeAppName		= 32;
+
+// Needed to be able to memcpy directly to this struct.
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( 1 )
+#else
+#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+	struct Cr8rBoxContent 
+	{
+		XMP_Uns32	mMagic;
+		XMP_Uns32	mSize;
+		XMP_Uns16	mMajorVer;
+		XMP_Uns16	mMinorVer;
+		XMP_Uns32	mCreatorCode;
+		XMP_Uns32	mAppleEvent;
+		char		mFileExt[kSizeFileExt];
+		char		mAppOptions[kSizeAppOtions];
+		char		mAppName[kSizeAppName];
+	};
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( )
+#else
+#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+//-----------------------------------------------------------------------------
+// 
+// Cr8rMetadata::Cr8rMetadata(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+Cr8rMetadata::Cr8rMetadata()
+{
+}
+
+Cr8rMetadata::~Cr8rMetadata()
+{
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Cr8rMetadata::parse(...)
+// 
+// Purpose: Parses the given memory block and creates a data model representation
+//			The implementation expects that the memory block is the data area of
+//			the BEXT chunk and its size is at least as big as the minimum size
+//			of a BEXT data block.
+//			Throws exceptions if parsing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+void Cr8rMetadata::parse( const XMP_Uns8* chunkData, XMP_Uns64 size )
+{
+	if( size >= kCr8rSizeFix )
+	{
+		Cr8rBoxContent cr8r;
+		memset( &cr8r, 0, kCr8rSizeFix );
+
+		//
+		// copy input data into Cr8r block
+		// Safe as fixed size matches size of struct that is #pragma packed(1)
+		//
+		memcpy( &cr8r, chunkData, kCr8rSizeFix );
+
+		//
+		// copy values to map
+		//
+		this->setValue<XMP_Uns32>( kMagic,			cr8r.mMagic );
+		this->setValue<XMP_Uns32>( kSize,			cr8r.mSize );
+		this->setValue<XMP_Uns16>( kMajorVer,		cr8r.mMajorVer );
+		this->setValue<XMP_Uns16>( kMinorVer,		cr8r.mMinorVer );
+		this->setValue<XMP_Uns32>( kCreatorCode,	cr8r.mCreatorCode );
+		this->setValue<XMP_Uns32>( kAppleEvent,		cr8r.mAppleEvent );
+		this->setValue<std::string>( kFileExt,		std::string( cr8r.mFileExt,		kSizeFileExt ) );
+		this->setValue<std::string>( kAppOptions,	std::string( cr8r.mAppOptions,	kSizeAppOtions ) );
+		this->setValue<std::string>( kAppName,		std::string( cr8r.mAppName,		kSizeAppName ) );
+
+		this->resetChanges();
+	}
+	else
+	{
+		XMP_Throw ( "Not a valid Cr8r chunk", kXMPErr_BadFileFormat );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Cr8rMetadata::serialize(...)
+// 
+// Purpose: Serializes the data model to a memory block. 
+//			The memory block will be the data area of a BEXT chunk.
+//			Throws exceptions if serializing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 Cr8rMetadata::serialize( XMP_Uns8** outBuffer )
+{
+	XMP_Uns64 size = 0;
+
+	if( outBuffer != NULL )
+	{
+		const LittleEndian& LE = LittleEndian::getInstance();
+
+		size = kCr8rSizeFix;
+
+		//
+		// setup buffer
+		//
+		XMP_Uns8* buffer = new XMP_Uns8[static_cast<size_t>(size)];
+
+		//
+		// copy values and strings back to BEXT block
+		//
+		// ! Safe use of strncpy as the fixed size is consistent with the size of the destination buffer
+		// But it is intentional here that the string might not be null terminated if
+		// the size of the source is equal to the fixed size of the destination
+		//
+		Cr8rBoxContent cr8r;
+		memset( &cr8r, 0, kCr8rSizeFix );
+
+		if( this->valueExists( kMagic ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kMagic ), &cr8r.mMagic );
+		}
+		if( this->valueExists( kSize ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kSize ), &cr8r.mSize );
+		}
+		if( this->valueExists( kMajorVer ) )
+		{
+			LE.putUns16( this->getValue<XMP_Uns16>( kMajorVer ), &cr8r.mMajorVer );
+		}
+		if( this->valueExists( kMinorVer ) )
+		{
+			LE.putUns16( this->getValue<XMP_Uns16>( kMinorVer ), &cr8r.mMinorVer );
+		}
+		if( this->valueExists( kCreatorCode ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kCreatorCode ), &cr8r.mCreatorCode );
+		}
+		if( this->valueExists( kAppleEvent ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kAppleEvent ), &cr8r.mAppleEvent );
+		}
+		if( this->valueExists( kFileExt ) )
+		{
+			strncpy( cr8r.mFileExt, this->getValue<std::string>( kFileExt ).c_str(), kSizeFileExt );
+		}
+		if( this->valueExists( kAppOptions ) )
+		{
+			strncpy( cr8r.mAppOptions, this->getValue<std::string>( kAppOptions ).c_str(), kSizeAppOtions );
+		}
+		if( this->valueExists( kAppName ) )
+		{
+			strncpy( cr8r.mAppName, this->getValue<std::string>( kAppName ).c_str(), kSizeAppName );
+		}
+
+		//
+		// set input buffer to zero
+		//
+		memset( buffer, 0, static_cast<size_t>(size) );
+
+		//
+		// copy Cr8r block into buffer
+		//
+		memcpy( buffer, &cr8r, kCr8rSizeFix );
+
+		*outBuffer = buffer;
+	}
+	else
+	{
+		XMP_Throw ( "Invalid buffer", kXMPErr_BadParam );
+	}
+
+	return size;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// Cr8rMetadata::isEmptyValue(...)
+// 
+// Purpose: Is the value of the passed ValueObject and its id "empty"?
+// 
+//-----------------------------------------------------------------------------
+
+bool Cr8rMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj )
+{
+	bool ret = true;
+
+	switch( id )
+	{
+		case kFileExt:
+		case kAppOptions:
+		case kAppName:
+		{
+			TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+
+			ret = ( strObj == NULL || ( strObj != NULL && strObj->getValue().empty() ) );
+		}
+		break;
+
+		case kMagic:
+		case kSize:
+		case kMajorVer:
+		case kMinorVer:
+		case kCreatorCode:
+		case kAppleEvent:
+		{
+			ret = false;
+		}
+		break;
+
+		default:
+		{
+			ret = true;
+		}
+	}
+
+	return ret;
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h
new file mode 100644
index 0000000..451f430
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h
@@ -0,0 +1,91 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _Cr8rMetadata_h_
+#define _Cr8rMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+namespace IFF_RIFF
+{
+
+/**
+ *	Cr8r Metadata model.
+ *	Implements the IMetadata interface
+ */
+class Cr8rMetadata : public IMetadata
+{
+public:
+	enum
+	{
+		kMagic,				// XMP_Uns32 
+		kSize,				// XMP_Uns32 
+		kMajorVer,			// XMP_Uns16 
+		kMinorVer,			// XMP_Uns16 
+		kCreatorCode,		// XMP_Uns32
+		kAppleEvent,		// XMP_Uns32
+		kFileExt,			// char[16]
+		kAppOptions,		// char[16]
+		kAppName			// char[32]
+	};
+
+public:
+	/**
+	 *ctor/dtor
+	 */
+				Cr8rMetadata();
+			   ~Cr8rMetadata();
+
+	/**
+	 * Parses the given memory block and creates a data model representation
+	 * The implementation expects that the memory block is the data area of
+	 * the Cr8rMetadata chunk.
+	 * Throws exceptions if parsing is not possible
+	 *
+	 * @param input		The byte buffer to parse
+	 * @param size		Size of the given byte buffer
+	 */
+	void		parse( const XMP_Uns8* chunkData, XMP_Uns64 size );
+	
+	/**
+	 * See IMetadata::parse( const LFA_FileRef input )
+	 */
+	void		parse( XMP_IO* input ) { IMetadata::parse( input ); }
+	
+	/**
+	 * Serializes the data model to a memory block. 
+	 * The memory block will be the data area of a Cr8rMetadata chunk.
+	 * Throws exceptions if serializing is not possible
+	 *
+	 * @param buffer	Buffer that gets filled with serialized data
+	 * @param size		Size of passed in buffer
+	 *
+	 * @return			Size of serialzed data (might be smaller than buffer size)
+	 */
+	XMP_Uns64		serialize( XMP_Uns8** buffer );
+
+protected:
+	/**
+	 * @see IMetadata::isEmptyValue
+	 */
+	virtual	bool isEmptyValue( XMP_Uns32 id, ValueObject& valueObj );
+
+private:
+	// Operators hidden on purpose
+	Cr8rMetadata( const Cr8rMetadata& ) {};
+	Cr8rMetadata& operator=( const Cr8rMetadata& ) { return *this; };
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp
new file mode 100644
index 0000000..9e821ef
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp
@@ -0,0 +1,138 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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.h>
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h"
+#include "source/Endian.h"
+
+using namespace IFF_RIFF;
+
+//-----------------------------------------------------------------------------
+// 
+// DISPMetadata::isValidDISP(...)
+// 
+// Purpose: [static] Check if the passed data is a valid DISP chunk. Valid in
+//					 of is it a DISP chunk that XMP should process.
+// 
+//-----------------------------------------------------------------------------
+
+bool DISPMetadata::isValidDISP( const XMP_Uns8* chunkData, XMP_Uns64 size )
+{
+	return ( ( size >= 4 ) && ( LittleEndian::getInstance().getUns32( chunkData ) == 0x0001 ) );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// DISPMetadata::DISPMetadata(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+DISPMetadata::DISPMetadata()
+{
+}
+
+DISPMetadata::~DISPMetadata()
+{
+}
+
+//-----------------------------------------------------------------------------
+// 
+// DISPMetadata::parse(...)
+// 
+// Purpose: Parses the given memory block and creates a data model representation
+//			The implementation expects that the memory block is the data area of
+//			the DISP chunk.
+//			Throws exceptions if parsing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+void DISPMetadata::parse( const XMP_Uns8* chunkData, XMP_Uns64 size )
+{
+	if( DISPMetadata::isValidDISP( chunkData, size ) )
+	{
+		this->setValue<std::string>( kTitle, std::string( (char*)&chunkData[4], static_cast<std::string::size_type>(size-4) ) );
+		this->resetChanges();
+	}
+	else
+	{
+		XMP_Throw ( "Not a valid DISP chunk", kXMPErr_BadFileFormat );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// DISPMetadata::serialize(...)
+// 
+// Purpose: Serializes the data model to a memory block. 
+//			The memory block will be the data area of a DISP chunk.
+//			Throws exceptions if serializing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 DISPMetadata::serialize( XMP_Uns8** outBuffer )
+{
+	XMP_Uns64 size = 0;
+
+	if( outBuffer != NULL && this->valueExists( kTitle ) )
+	{
+		std::string title = this->getValue<std::string>( kTitle );
+
+		size = 4 + title.length();	// at least 4bytes for the type value of the DISP chunk
+		
+		// [2500563] DISP chunk must be of even length for WAVE, 
+		// as pad byte is not interpreted correctly by third-party tools
+		if ( size % 2 != 0 )
+		{
+			size++;
+		}
+		XMP_Uns8* buffer = new XMP_Uns8[static_cast<size_t>(size)];
+
+		memset( buffer, 0, static_cast<size_t>(size) );
+
+		//
+		// DISP type
+		//
+		buffer[0] = 1;
+
+		//
+		// copy string into buffer
+		//
+
+		memcpy( &buffer[4], title.c_str(), title.length() );
+
+		*outBuffer = buffer;
+	}
+	else
+	{
+		XMP_Throw ( "Invalid buffer", kXMPErr_InternalFailure );
+	}
+
+	return size;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// DISPMetadata::isEmptyValue(...)
+// 
+// Purpose: Is the value of the passed ValueObject and its id "empty"?
+// 
+//-----------------------------------------------------------------------------
+
+bool DISPMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj )
+{
+	TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+
+	return ( strObj == NULL || ( strObj != NULL && strObj->getValue().empty() ) );
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h
new file mode 100644
index 0000000..7db1891
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h
@@ -0,0 +1,97 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _DISPMetadata_h_
+#define _DISPMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+namespace IFF_RIFF
+{
+
+/**
+ *	DISP Metadata model.
+ *	Implements the IMetadata interface
+ */
+class DISPMetadata : public IMetadata
+{
+public:
+	enum
+	{
+		kTitle			// std::string
+	};
+
+public:
+	/**
+	 * Return true if the type is 0x0001 and it's large enough for 
+	 * more content
+	 *
+	 * @param chunkData		Data area of chunk
+	 * @param size			Size of data area
+	 *
+	 * @return				True if it's a valid DISP chunk
+	 */
+	static bool		isValidDISP( const XMP_Uns8* chunkData, XMP_Uns64 size );
+
+public:
+	/**
+	 *ctor/dtor
+	 */
+						DISPMetadata();
+	virtual			   ~DISPMetadata();
+
+	/**
+	 * Parses the given memory block and creates a data model representation
+	 * The implementation expects that the memory block is the data area of
+	 * the DISP chunk.
+	 * Throws exceptions if parsing is not possible
+	 *
+	 * @param input		The byte buffer to parse
+	 * @param size		Size of the given byte buffer
+	 */
+	void		parse( const XMP_Uns8* chunkData, XMP_Uns64 size );
+
+	/**
+	 * See IMetadata::parse( const LFA_FileRef input )
+	 */
+	void		parse( XMP_IO* input ) { IMetadata::parse( input ); }
+	
+	/**
+	 * Serializes the data model to a memory block. 
+	 * The method creates a buffer and pass it to the parameter 'buffer'. The callee of
+	 * the method is responsible to delete the buffer later on.
+	 * The memory block will be the data area of a DISP chunk.
+	 * Throws exceptions if serializing is not possible
+	 *
+	 * @param buffer	Buffer that gets filled with serialized data
+	 * @param size		Size of passed in buffer
+	 *
+	 * @ return			Buffer size
+	 */
+	virtual XMP_Uns64 serialize( XMP_Uns8** buffer );
+
+protected:
+	/**
+	 * @see IMetadata::isEmptyValue
+	 */
+	virtual	bool isEmptyValue( XMP_Uns32 id, ValueObject& valueObj );
+
+private:
+	// Operators hidden on purpose
+	DISPMetadata( const DISPMetadata& ) {};
+	DISPMetadata& operator=( const DISPMetadata& ) { return *this; };
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp
new file mode 100644
index 0000000..335acd7
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp
@@ -0,0 +1,264 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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.h>
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h"
+#include "source/Endian.h"
+
+using namespace IFF_RIFF;
+
+typedef std::map<XMP_Uns32, std::string>::const_iterator MapIterator;
+
+static const XMP_Uns32 kSizeChunkID		= 4;
+static const XMP_Uns32 kSizeChunkSize	= 4;
+static const XMP_Uns32 kSizeChunkType	= 4;
+static const XMP_Uns32 kChunkHeaderSize	= kSizeChunkID + kSizeChunkSize;
+
+static const XMP_Uns32 kType_INFO		= 0x494E464F;
+
+//-----------------------------------------------------------------------------
+// 
+// INFOMetadata::INFOMetadata(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+INFOMetadata::INFOMetadata()
+{
+}
+
+INFOMetadata::~INFOMetadata()
+{
+}
+
+//-----------------------------------------------------------------------------
+// 
+// INFOMetadata::parse(...)
+// 
+// Purpose: @see IMetadata::parse
+// 
+//-----------------------------------------------------------------------------
+
+void INFOMetadata::parse( const XMP_Uns8* input, XMP_Uns64 size )
+{
+	if( input != NULL && size >= kSizeChunkType )
+	{
+		const BigEndian& BE		= BigEndian::getInstance();
+		const LittleEndian& LE	= LittleEndian::getInstance();
+
+		XMP_Uns32 type = BE.getUns32( &input[0] );
+
+		XMP_Validate( type == kType_INFO, "Invalid LIST:INFO data", kXMPErr_InternalFailure );
+
+		XMP_Uns64 offset = kSizeChunkType;	// pointer into the buffer
+
+		while( offset < size )
+		{
+			//
+			// continue parsing only if the remaing buffer is greater than
+			// the chunk header size
+			//
+			if( size - offset >= kChunkHeaderSize )
+			{
+				//
+				// read: chunk id
+				//		 chunk size
+				//		 chunk data
+				XMP_Uns32 id		= BE.getUns32( &input[offset] );
+				XMP_Uns32 datasize	= LE.getUns32( &input[offset+kSizeChunkID] );
+
+				if( offset + kChunkHeaderSize + datasize <= size )
+				{
+					if( datasize > 0 )
+					{
+						//
+						// don't store empty values
+						//
+						std::string value( reinterpret_cast<const char*>( &input[offset+kChunkHeaderSize] ), datasize );
+
+						//
+						// set new value
+						//
+						this->setValue<std::string>( id, value );
+					}
+
+					//
+					// update pointer
+					//
+					offset = offset + datasize + kChunkHeaderSize;
+
+					if( datasize & 1 )
+					{
+						// pad byte
+						offset++;
+					}
+				}
+				else
+				{
+					//
+					// invalid chunk, clean up and throw exception
+					//
+					this->deleteAll();
+					XMP_Throw ( "Not a valid LIST:INFO chunk", kXMPErr_BadFileFormat );
+				}
+			}
+			else
+			{
+				//
+				// invalid chunk, clean up and throw exception
+				//
+				this->deleteAll();
+				XMP_Throw ( "Not a valid LIST:INFO chunk", kXMPErr_BadFileFormat );
+			}
+		}
+
+		this->resetChanges();
+	}
+	else
+	{
+		XMP_Throw ( "Not a valid LIST:INFO chunk", kXMPErr_BadFileFormat );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// INFOMetadata::serialize(...)
+// 
+// Purpose: @see IMetadata::serialize
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 INFOMetadata::serialize( XMP_Uns8** outBuffer )
+{
+	XMP_Uns64 size = 0;
+
+	if( outBuffer != NULL )
+	{
+		//
+		// calculate required buffer size
+		//
+		for( ValueMap::iterator iter=mValues.begin(); iter!=mValues.end(); iter++ )
+		{
+			TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(iter->second);
+
+			XMP_Uns32 chunkSize = kChunkHeaderSize + strObj->getValue().length();
+
+			if( chunkSize & 1 )
+			{
+				// take account of pad byte
+				chunkSize++;
+			}
+
+			size += chunkSize;
+		}
+		
+		size += kSizeChunkType; // add size of type "INFO"
+
+		if( size > 0 )
+		{
+			XMP_Uns8* buffer = new XMP_Uns8[static_cast<size_t>(size)];		// output buffer
+
+			memset( buffer, 0, static_cast<size_t>(size) );
+
+			const BigEndian& BE		= BigEndian::getInstance();
+			const LittleEndian& LE	= LittleEndian::getInstance();
+
+			// Put type "INFO" in front of the buffer
+			XMP_Uns32 typeInfo = BE.getUns32(&kType_INFO);
+			memcpy( buffer, &typeInfo, kSizeChunkType );
+			XMP_Uns64 offset = kSizeChunkType;						// pointer into the buffer
+
+			//
+			// for each stored value
+			//
+			for( ValueMap::iterator iter=mValues.begin(); iter!=mValues.end(); iter++ )
+			{
+				//
+				// get: chunk data
+				//		chunk id
+				//		chunk size
+				//
+				XMP_Validate( iter->second != NULL, "ERROR inserting serialize. iter->second is NULL.", kXMPErr_InternalFailure );
+				XMP_Assert(dynamic_cast<TValueObject<std::string>*>(iter->second) == static_cast<TValueObject<std::string>*>(iter->second));
+				TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(iter->second);
+				std::string value	= strObj->getValue();
+				XMP_Uns32 id		= iter->first;
+				XMP_Uns32 size		= value.length();
+
+				if( size & 1 && strObj->hasChanged() )
+				{
+					//
+					// if we modified the value of this entry
+					// then fill chunk data with zero bytes
+					// rather than use a pad byte, i.e.
+					// size of each LIST:INFO entry has
+					// an odd size
+					//
+					size++;
+				}
+
+				//
+				// chunk id and chunk size are stored in little endian format
+				//
+				id		= BE.getUns32( &id );
+				size	= LE.getUns32( &size );
+
+				//
+				// copy values into output buffer
+				//
+				memcpy( buffer+offset, &id, kSizeChunkID );
+				memcpy( buffer+offset+kSizeChunkID, &size, kSizeChunkSize );
+				//size has been changed in little endian format. Change it back to bigendina
+				size	= LE.getUns32( &size );
+				memcpy( buffer+offset+kChunkHeaderSize, value.c_str(), size );
+
+				//
+				// update pointer
+				//
+				offset += kChunkHeaderSize;
+				offset += size;
+
+				if( size & 1 )
+				{
+					//
+					// take account of pad byte
+					offset++;
+				}
+			}
+
+			*outBuffer = buffer;
+		}
+	}
+	else
+	{
+		XMP_Throw ( "Invalid buffer", kXMPErr_InternalFailure );
+	}
+
+	return size;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// INFOMetadata::isEmptyValue(...)
+// 
+// Purpose: Is the value of the passed ValueObject and its id "empty"?
+// 
+//-----------------------------------------------------------------------------
+
+bool INFOMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj )
+{
+	TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+
+	return ( strObj == NULL || ( strObj != NULL && strObj->getValue().empty() ) );
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h
new file mode 100644
index 0000000..74d024c
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h
@@ -0,0 +1,88 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _INFOMetadata_h_
+#define _INFOMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+namespace IFF_RIFF
+{
+
+/**
+ *	LIST INFO Metadata model.
+ *	Implements the IMetadata interface
+ */
+class INFOMetadata : public IMetadata
+{
+public:
+	enum
+	{
+		kArtist				= 0x49415254,	// 'IART'		std::string
+		kComments			= 0x49434d54,	// 'ICMT'		std::string
+		kCopyright			= 0x49434f50,	// 'ICOP'		std::string
+		kCreationDate		= 0x49435244,	// 'ICRD'		std::string
+		kEngineer			= 0x49454e47,	// 'IENG'		std::string
+		kGenre				= 0x49474e52,	// 'IGNR'		std::string
+		kName				= 0x494e414d,	// 'INAM'		std::string
+		kSoftware			= 0x49534654,	// 'ISFT'		std::string
+		kMedium				= 0x494d4544,	// 'IMED'		std::string
+		kSourceForm			= 0x49535246,	// 'ISRF'		std::string
+
+		// new mappings
+		kArchivalLocation	= 0x4941524C,	// 'IARL'
+		kCommissioned		= 0x49434D53,	// 'ICMS'
+		kKeywords			= 0x494B4559,	// 'IKEY'
+		kProduct			= 0x49505244,	// 'IPRD'
+		kSubject			= 0x4953424A,	// 'ISBJ'
+		kSource				= 0x49535243,	// 'ISRC'
+		kTechnican			= 0x49544348,	// 'ITCH'
+	};
+
+public:
+	/**
+	 *ctor/dtor
+	 */
+						INFOMetadata();
+					   ~INFOMetadata();
+
+	/**
+	 * @see IMetadata::parse
+	 */
+	void				parse( const XMP_Uns8* input, XMP_Uns64 size );
+
+	/**
+	 * See IMetadata::parse( const LFA_FileRef input )
+	 */
+	void				parse( XMP_IO* input ) { IMetadata::parse( input ); }
+	
+	/**
+	 * @see IMetadata::serialize
+	 */
+	XMP_Uns64			serialize( XMP_Uns8** outBuffer );
+
+protected:
+	/**
+	 * @see IMetadata::isEmptyValue
+	 */
+	virtual	bool		isEmptyValue( XMP_Uns32 id, ValueObject& valueObj );
+
+private:
+	// Operators hidden on purpose
+	INFOMetadata( const INFOMetadata& ) {};
+	INFOMetadata& operator=( const INFOMetadata& ) { return *this; };
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp
new file mode 100644
index 0000000..87d29fb
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp
@@ -0,0 +1,237 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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.h>
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h"
+#include "source/Endian.h"
+
+using namespace IFF_RIFF;
+
+static const XMP_Uns32 kPrmlSizeFix		= 282;		// always 282 bytes
+
+static const XMP_Uns32 kSizeFilePath	= 260;
+
+// Needed to be able to memcpy directly to this struct.
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( 1 )
+#else
+#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+	struct PrmlBoxContent 
+	{
+		XMP_Uns32	mMagic;
+		XMP_Uns32	mSize;
+		XMP_Uns16	mVerAPI;
+		XMP_Uns16	mVerCode;
+		XMP_Uns32	mExportType;
+		XMP_Uns16	mMacVRefNum;
+		XMP_Uns32	mMacParID;
+		char		mFilePath[kSizeFilePath];
+	};
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( )
+#else
+#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+//-----------------------------------------------------------------------------
+// 
+// PrmLMetadata::PrmLMetadata(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+PrmLMetadata::PrmLMetadata()
+{
+}
+
+PrmLMetadata::~PrmLMetadata()
+{
+}
+
+//-----------------------------------------------------------------------------
+// 
+// PrmLMetadata::parse(...)
+// 
+// Purpose: Parses the given memory block and creates a data model representation
+//			The implementation expects that the memory block is the data area of
+//			the BEXT chunk and its size is at least as big as the minimum size
+//			of a BEXT data block.
+//			Throws exceptions if parsing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+void PrmLMetadata::parse( const XMP_Uns8* chunkData, XMP_Uns64 size )
+{
+	if( size >= kPrmlSizeFix )
+	{
+		PrmlBoxContent prml;
+		memset( &prml, 0, kPrmlSizeFix );
+
+		//
+		// copy input data into Prml block
+		// Safe as fixed size matches size of struct that is #pragma packed(1)
+		//
+		memcpy( &prml, chunkData, kPrmlSizeFix );
+
+		//
+		// copy values to map
+		//
+		this->setValue<XMP_Uns32>( kMagic,			prml.mMagic );
+		this->setValue<XMP_Uns32>( kSize,			prml.mSize );
+		this->setValue<XMP_Uns16>( kVerAPI,			prml.mVerAPI );
+		this->setValue<XMP_Uns16>( kVerCode,		prml.mVerCode );
+		this->setValue<XMP_Uns32>( kExportType,		prml.mExportType );
+		this->setValue<XMP_Uns16>( kMacVRefNum,		prml.mMacVRefNum );
+		this->setValue<XMP_Uns32>( kMacParID,		prml.mMacParID );
+		this->setValue<std::string>( kFilePath,		std::string( prml.mFilePath,	kSizeFilePath ) );
+
+		this->resetChanges();
+	}
+	else
+	{
+		XMP_Throw ( "Not a valid Prml chunk", kXMPErr_BadFileFormat );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// PrmLMetadata::serialize(...)
+// 
+// Purpose: Serializes the data model to a memory block. 
+//			The memory block will be the data area of a BEXT chunk.
+//			Throws exceptions if serializing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 PrmLMetadata::serialize( XMP_Uns8** outBuffer )
+{
+	XMP_Uns64 size = 0;
+
+	if( outBuffer != NULL )
+	{
+		const LittleEndian& LE = LittleEndian::getInstance();
+
+		size = kPrmlSizeFix;
+
+		//
+		// setup buffer
+		//
+		XMP_Uns8* buffer = new XMP_Uns8[static_cast<size_t>(size)];
+
+		//
+		// copy values and strings back to BEXT block
+		//
+		// ! Safe use of strncpy as the fixed size is consistent with the size of the destination buffer
+		// But it is intentional here that the string might not be null terminated if
+		// the size of the source is equal to the fixed size of the destination
+		//
+		PrmlBoxContent prml;
+		memset( &prml, 0, kPrmlSizeFix );
+
+		if( this->valueExists( kMagic ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kMagic ), &prml.mMagic );
+		}
+		if( this->valueExists( kSize ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kSize ), &prml.mSize );
+		}
+		if( this->valueExists( kVerAPI ) )
+		{
+			LE.putUns16( this->getValue<XMP_Uns16>( kVerAPI ), &prml.mVerAPI );
+		}
+		if( this->valueExists( kVerCode ) )
+		{
+			LE.putUns16( this->getValue<XMP_Uns16>( kVerCode ), &prml.mVerCode );
+		}
+		if( this->valueExists( kExportType ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kExportType ), &prml.mExportType );
+		}
+		if( this->valueExists( kMacVRefNum ) )
+		{
+			LE.putUns16( this->getValue<XMP_Uns16>( kMacVRefNum ), &prml.mMacVRefNum );
+		}
+		if( this->valueExists( kMacParID ) )
+		{
+			LE.putUns32( this->getValue<XMP_Uns32>( kMacParID ), &prml.mMacParID );
+		}
+		if( this->valueExists( kFilePath ) )
+		{
+			strncpy( prml.mFilePath, this->getValue<std::string>( kFilePath ).c_str(), kSizeFilePath );
+		}
+
+		//
+		// set input buffer to zero
+		//
+		memset( buffer, 0, static_cast<size_t>(size) );
+
+		//
+		// copy Prml block into buffer
+		//
+		memcpy( buffer, &prml, kPrmlSizeFix );
+
+		*outBuffer = buffer;
+	}
+	else
+	{
+		XMP_Throw ( "Invalid buffer", kXMPErr_BadParam );
+	}
+
+	return size;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// PrmLMetadata::isEmptyValue(...)
+// 
+// Purpose: Is the value of the passed ValueObject and its id "empty"?
+// 
+//-----------------------------------------------------------------------------
+
+bool PrmLMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj )
+{
+	bool ret = true;
+
+	switch( id )
+	{
+		case kFilePath:
+		{
+			TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+
+			ret = ( strObj == NULL || ( strObj != NULL && strObj->getValue().empty() ) );
+		}
+		break;
+
+		case kMagic:
+		case kSize:
+		case kVerAPI:
+		case kVerCode:
+		case kExportType:
+		case kMacVRefNum:
+		case kMacParID:
+		{
+			ret = false;
+		}
+		break;
+
+		default:
+		{
+			ret = true;
+		}
+	}
+
+	return ret;
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h
new file mode 100644
index 0000000..8eb7102
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h
@@ -0,0 +1,90 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _PrmlMetadata_h_
+#define _PrmlMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+namespace IFF_RIFF
+{
+
+/**
+ *	PrmL Metadata model.
+ *	Implements the IMetadata interface
+ */
+class PrmLMetadata : public IMetadata
+{
+public:
+	enum
+	{
+		kMagic,				// XMP_Uns32 
+		kSize,				// XMP_Uns32 
+		kVerAPI,			// XMP_Uns16 
+		kVerCode,			// XMP_Uns16 
+		kExportType,		// XMP_Uns32
+		kMacVRefNum,		// XMP_Uns16
+		kMacParID,			// XMP_Uns32
+		kFilePath,			// char[260]
+	};
+
+public:
+	/**
+	 *ctor/dtor
+	 */
+				PrmLMetadata();
+			   ~PrmLMetadata();
+
+	/**
+	 * Parses the given memory block and creates a data model representation
+	 * The implementation expects that the memory block is the data area of
+	 * the PrmL chunk.
+	 * Throws exceptions if parsing is not possible
+	 *
+	 * @param input		The byte buffer to parse
+	 * @param size		Size of the given byte buffer
+	 */
+	void		parse( const XMP_Uns8* chunkData, XMP_Uns64 size );
+	
+	/**
+	 * See IMetadata::parse( const LFA_FileRef input )
+	 */
+	void		parse( XMP_IO* input ) { IMetadata::parse( input ); }
+	
+	/**
+	 * Serializes the data model to a memory block. 
+	 * The memory block will be the data area of a PrmL chunk.
+	 * Throws exceptions if serializing is not possible
+	 *
+	 * @param buffer	Buffer that gets filled with serialized data
+	 * @param size		Size of passed in buffer
+	 *
+	 * @return			Size of serialzed data (might be smaller than buffer size)
+	 */
+	XMP_Uns64		serialize( XMP_Uns8** buffer );
+
+protected:
+	/**
+	 * @see IMetadata::isEmptyValue
+	 */
+	virtual	bool isEmptyValue( XMP_Uns32 id, ValueObject& valueObj );
+
+private:
+	// Operators hidden on purpose
+	PrmLMetadata( const PrmLMetadata& ) {};
+	PrmLMetadata& operator=( const PrmLMetadata& ) { return *this; };
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp
new file mode 100644
index 0000000..60ce5ae
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp
@@ -0,0 +1,681 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/Chunk.h"
+
+#include <algorithm>
+
+using namespace IFF_RIFF;
+
+//
+// Static init
+//
+const LittleEndian& WAVEBehavior::mEndian = LittleEndian::getInstance();
+
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::getRealSize(...)
+// 
+// Purpose: Validate the passed in size value, identify the valid size if the 
+//			passed in isn't valid and return the valid size.
+//			Throw an exception if the passed in size isn't valid and there's 
+//			no way to identify a valid size.
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 WAVEBehavior::getRealSize( const XMP_Uns64 size, const ChunkIdentifier& id, IChunkContainer& tree, XMP_IO* stream )
+{
+	XMP_Uns64 realSize = size;
+
+	if( size >= kNormalRF64ChunkSize ) // 4GB
+	{
+		if( this->isRF64( tree ) )
+		{
+			//
+			// RF64 supports sizes beyond 4GB
+			//
+			DS64* rf64 = this->getDS64( tree, stream );
+
+			if( rf64 != NULL )
+			{
+				//
+				// get 64bit size from RF64 structure
+				//
+				switch( id.id )
+				{
+					case kChunk_RF64:	realSize = rf64->riffSize;	break;
+					case kChunk_data:	realSize = rf64->dataSize;	break;
+
+					default:
+					{
+						bool found = false;
+
+						//
+						// try to find size value for passed chunk id in the ds64 table
+						//
+						if( rf64->tableLength > 0 )
+						{
+							for( std::vector<ChunkSize64>::iterator iter=rf64->table.begin(); iter!=rf64->table.end(); iter++ )
+							{
+								if( iter->id == id.id )
+								{
+									realSize = iter->size;
+									found = true;
+									break;
+								}
+							}
+						}
+
+						if( !found )
+						{
+							//
+							// no size for passed id available
+							//
+							XMP_Throw( "Unknown size value", kXMPErr_BadFileFormat );
+						}
+					}
+				}
+			}
+			else
+			{
+				//
+				// no RF64 size info available
+				//
+				XMP_Throw( "Unknown size value", kXMPErr_BadFileFormat );
+			}
+		}
+		else
+		{
+			//
+			// WAVE doesn't support that size
+			//
+			XMP_Throw( "Unknown size value", kXMPErr_BadFileFormat );
+		}
+	}
+
+	return realSize;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::getMaxChunkSize(...)
+// 
+// Purpose: Return the maximum size of a single chunk, i.e. the maximum size 
+//			of a top-level chunk.
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 WAVEBehavior::getMaxChunkSize() const
+{
+	// simple WAVE 4GByte
+	XMP_Uns64 ret = 0x00000000FFFFFFFFLL;
+
+	if( mIsRF64 )
+	{
+		// RF64: full possible 64bit size
+		ret = 0xFFFFFFFFFFFFFFFFLL;
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::isValidTopLevelChunk(...)
+// 
+// Purpose: Return true if the passed identifier is valid for top-level chunks 
+//			of a certain format.
+// 
+//-----------------------------------------------------------------------------
+
+bool WAVEBehavior::isValidTopLevelChunk( const ChunkIdentifier& id, XMP_Uns32 chunkNo )
+{
+	return ( chunkNo == 0 )												&& 
+		   ( ( ( id.id == kChunk_RIFF ) && ( id.type == kType_WAVE ) )	||  
+		     ( ( id.id == kChunk_RF64 ) && ( id.type == kType_WAVE ) ) );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::fixHierarchy(...)
+// 
+// Purpose: Fix the hierarchy of chunks depending ones based on size changes of 
+//			one or more chunks and second based on format specific rules.
+//			Throw an exception if the hierarchy can't be fixed.
+// 
+//-----------------------------------------------------------------------------
+
+void WAVEBehavior::fixHierarchy( IChunkContainer& tree )
+{
+	XMP_Validate( tree.numChildren() == 1, "WAVE files should only have one top level chunk (RIFF)", kXMPErr_BadFileFormat);
+	
+	Chunk* riffChunk = tree.getChildAt(0);
+
+	XMP_Validate( (riffChunk->getType() == kType_WAVE || riffChunk->getType() == kChunk_RF64) , "Invalid type for WAVE/RF64 top level chunk (RIFF)", kXMPErr_BadFileFormat);
+
+	if( riffChunk->hasChanged() )
+	{
+		//
+		// move new added chunks to temporary container
+		//
+		Chunk* tmpContainer = Chunk::createChunk( mEndian );
+		this->moveChunks( *riffChunk, *tmpContainer, riffChunk->numChildren() - mChunksAdded );
+
+		//
+		// try to arrange chunks at their current position
+		//
+		this->arrangeChunksInPlace( *riffChunk, *tmpContainer );
+
+		//
+		// for all chunks that were moved to the end try to find a FREE chunk for them
+		//
+		this->arrangeChunksInTree( *tmpContainer, *riffChunk );
+
+		//
+		// append all remaining new added chunks to the end of the tree
+		//
+		this->moveChunks( *tmpContainer, *riffChunk, 0 );
+		delete tmpContainer;
+
+		//
+		// check for FREE chunks at the end
+		//
+		Chunk* endFREE = this->mergeFreeChunks( *riffChunk, riffChunk->numChildren() - 1 );
+
+		if( endFREE != NULL )
+		{
+			riffChunk->removeChildAt( riffChunk->numChildren() - 1 );
+			delete endFREE;
+		}
+
+		//
+		// Fix the offset values of all chunks. Throw an exception in the case that
+		// the offset of a non-modified chunk needs to be reset.
+		//
+		XMP_Validate( riffChunk->getOffset() == 0, "Invalid offset for RIFF top level chunk", kXMPErr_InternalFailure );
+
+		this->validateOffsets( tree );
+	
+		//
+		// update the RF64 chunk (if this is RF64) based on the current chunk sizes
+		//
+		this->updateRF64( tree );
+	}
+}
+
+void WAVEBehavior::insertChunk( IChunkContainer& tree, Chunk& chunk )
+{
+	XMP_Validate( tree.numChildren() == 1, "WAVE files should only have one top level chunk (RIFF)", kXMPErr_BadFileFormat);
+	Chunk* riffChunk = tree.getChildAt(0);
+
+	XMP_Validate( riffChunk->getType() == kType_WAVE , "Invalid type for WAVE top level chunk (RIFF)", kXMPErr_BadFileFormat);
+
+	//
+	// add new chunk to the end of the RIFF:WAVE
+	//
+	riffChunk->appendChild(&chunk);
+
+	mChunksAdded++;
+}
+
+bool WAVEBehavior::removeChunk( IChunkContainer& tree, Chunk& chunk )
+{
+	//
+	// validate parameter
+	//
+	XMP_Validate( chunk.getID() != kChunk_RIFF, "Can't remove RIFF chunk!", kXMPErr_InternalFailure );
+	XMP_Validate( chunk.getChunkMode() != CHUNK_UNKNOWN, "Cant' remove UNKNOWN Chunk", kXMPErr_InternalFailure );
+	XMP_Validate( tree.numChildren() == 1, "WAVE files should only have one top level chunk (RIFF)", kXMPErr_BadFileFormat);	
+
+	//
+	// get top-level chunk
+	//
+	Chunk* riffChunk = tree.getChildAt(0);
+
+	//
+	// validate top-level chunk
+	//
+	XMP_Validate( (riffChunk->getType() == kType_WAVE || riffChunk->getType() == kChunk_RF64) , "Invalid type for WAVE/RF64 top level chunk (RIFF)", kXMPErr_BadFileFormat);
+
+	//
+	// calculate index of chunk to remove
+	//
+	XMP_Uns32 i = std::find( riffChunk->firstChild(), riffChunk->lastChild(), &chunk ) - riffChunk->firstChild();
+
+	//
+	// validate index
+	//
+	XMP_Validate( i < riffChunk->numChildren(), "Invalid chunk in tree", kXMPErr_InternalFailure );
+
+	//
+	// adjust new chunks counter
+	//
+	if( i > riffChunk->numChildren() - mChunksAdded - 1 )
+	{
+		mChunksAdded--;
+	}
+
+	if( i < riffChunk->numChildren()-1 )
+	{
+		//
+		// fill gap with free chunk
+		//
+		Chunk* free = this->createFREE( chunk.getPadSize( true ) );
+		riffChunk->replaceChildAt( i, free );
+		free->setAsNew();
+
+		//
+		// merge JUNK chunks
+		//
+		this->mergeFreeChunks( *riffChunk, i );
+	}
+	else
+	{
+		//
+		// remove chunk from tree
+		//
+		riffChunk->removeChildAt( i );
+	}
+
+	//
+	// if there is an entry in the ds64 table for the removed chunk
+	// then update the ds64 table entry
+	//
+	if( mDS64Data != NULL && mDS64Data->tableLength > 0 )
+	{
+		for( std::vector<ChunkSize64>::iterator iter=mDS64Data->table.begin(); iter!=mDS64Data->table.end(); iter++ )
+		{
+			if( iter->id == chunk.getID() )
+			{
+				//
+				// don't remove entry but set its size to zero
+				//
+				iter->size = 0LL;
+				break;
+			}
+		}
+	}
+	
+	return true;
+}
+
+Chunk* WAVEBehavior::createFREE( XMP_Uns64 chunkSize )
+{
+	XMP_Int64 alloc = chunkSize - Chunk::HEADER_SIZE;
+
+	Chunk* chunk = NULL;
+
+	//
+	// create a 'JUNK' chunk
+	//
+	if( alloc > 0 )
+	{
+		XMP_Uns8* data = new XMP_Uns8[static_cast<size_t>( alloc )];
+		memset( data, 0, static_cast<size_t>( alloc ) );
+
+		chunk = Chunk::createUnknownChunk( mEndian, kChunk_JUNK, kType_NONE, alloc );
+
+		chunk->setData( data, alloc );		
+
+		delete[] data;
+	}
+	else	
+	{
+		chunk = Chunk::createHeaderChunk( mEndian, kChunk_JUNK );
+	}
+
+	// force set dirty flag
+	chunk->setChanged();
+
+	return chunk;
+}
+
+XMP_Bool WAVEBehavior::isFREEChunk( const Chunk& chunk ) const
+{
+	// Check for sigature JUNK and JUNQ
+	return ( chunk.getID() == kChunk_JUNK || chunk.getID() == kChunk_JUNQ );
+}
+
+
+XMP_Uns64 WAVEBehavior::getMinFREESize() const
+{
+	// avoid creation of chunks with size==0
+	return static_cast<XMP_Uns64>( Chunk::HEADER_SIZE ) + 2;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::isRF64(...)
+// 
+// Purpose: Is the current file a RF64 file
+// 
+//-----------------------------------------------------------------------------
+
+bool WAVEBehavior::isRF64( const IChunkContainer& tree )
+{
+	// The file format will not change at runtime
+	// So if the flag is not already set, have a look at the tree 
+	if( ! mIsRF64 && tree.numChildren() != 0 )
+	{
+		Chunk *chunk = tree.getChildAt(0);
+		// Only the TopLevel chunk is interesting
+		mIsRF64 = chunk->getID() == kChunk_RF64 && 
+				chunk->getType() == kType_WAVE;
+	}
+	
+	return mIsRF64;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::getDS64(...)
+// 
+// Purpose: Return RF64 structure.
+// 
+//-----------------------------------------------------------------------------
+
+WAVEBehavior::DS64* WAVEBehavior::getDS64( IChunkContainer& tree, XMP_IO* stream )
+{
+	DS64* ret = mDS64Data;
+
+	if( ret == NULL )
+	{
+		//
+		// try to find 'ds64' chunk in the tree
+		//
+		Chunk* ds64 = NULL;
+		Chunk* rf64 = NULL;
+
+		if( tree.numChildren() > 0 )
+		{
+			rf64 = tree.getChildAt(0);
+
+			if( rf64 != NULL && rf64->getID() == kChunk_RF64 && rf64->numChildren() > 0 )
+			{
+				//
+				// 'ds64' chunk needs to be the very first child of the 'RF64' chunk
+				//
+				ds64 = rf64->getChildAt(0);
+			}
+
+			//
+			// Try to create 'ds64' chunk by parsing the stream
+			//
+			if( ds64 == NULL && stream != NULL )
+			{
+				//
+				// remember file position before start reading from the stream
+				//
+				XMP_Uns64 filePos = stream->Offset();
+
+				try
+				{
+					ds64 = Chunk::createChunk( mEndian );
+					ds64->readChunk( stream );
+				}
+				catch( ... )
+				{
+					delete ds64;
+					ds64 = NULL;
+				}
+
+				if( rf64 != NULL && ds64 != NULL && ds64->getID() == kChunk_ds64 )
+				{
+					//
+					// Successfully read 'ds64' chunk.
+					// Now read its data area as well and
+					// add chunk to the 'RF64' chunk
+					//
+					ds64->cacheChunkData( stream );
+					rf64->appendChild( ds64, false );
+				}
+				else
+				{
+					//
+					// Either the reading failed or the 'ds64' chunk
+					// doesn't exists at the expected position.
+					// Now clean up and reject the stream position.
+					//
+					delete ds64;
+					ds64 = NULL;
+
+					stream->Seek( filePos, kXMP_SeekFromStart );
+				}
+			}
+			else if( ds64 != NULL && ds64->getID() != kChunk_ds64 )
+			{
+				//
+				// first child of 'RF64' chunk is NOT 'ds64'!
+				//
+				ds64 = NULL;
+			}
+		}
+
+		//
+		// parse 'ds64' chunk, store the RF64 struct and return it
+		//
+		if( ds64 != NULL ) 
+		{
+			DS64* ds64data = new DS64();
+
+			if( this->parseDS64Chunk( *ds64, *ds64data ) )
+			{
+				mDS64Data	= ds64data;
+				ret			= mDS64Data;
+			}
+			else
+			{
+				delete ds64data;
+			}
+		}
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::updateRF64(...)
+// 
+// Purpose: update the RF64 chunk (if this is RF64) based on the current chunk sizes
+// 
+//-----------------------------------------------------------------------------
+
+void WAVEBehavior::updateRF64( IChunkContainer& tree )
+{
+	if( this->isRF64( tree ) )
+	{
+		XMP_Validate( mDS64Data != NULL, "Missing DS64 structure", kXMPErr_InternalFailure );
+		XMP_Validate( tree.numChildren() == 1, "Invalid RF64 tree", kXMPErr_InternalFailure );
+
+		//
+		// Check all chunks that sizes have changed and update their related value in the DS64 chunk
+		//
+		Chunk* rf64 = tree.getChildAt(0);
+		XMP_Validate( rf64 != NULL && rf64->getID() == kChunk_RF64 && rf64->numChildren() > 0, "Invalid RF64 chunk", kXMPErr_InternalFailure );
+
+		this->doUpdateRF64( *rf64 );
+
+		//
+		// try to find 'ds64' chunk in the tree
+		// (needs to be the very first child of the 'RF64' chunk)
+		//
+		Chunk* ds64 = rf64->getChildAt(0);
+		XMP_Validate( ds64 != NULL && ds64->getID() == kChunk_ds64, "Missing 'ds64' chunk", kXMPErr_InternalFailure );
+
+		//
+		// serialize DS64 structure and write into ds64 chunk
+		//
+		this->serializeDS64Chunk( *mDS64Data, *ds64 );		
+	}
+}
+
+void WAVEBehavior::doUpdateRF64( Chunk& chunk )
+{
+	//
+	// update ds64 entry for chunk if its size has changed
+	//
+	if( chunk.hasChanged() && chunk.getOriginalSize() > kNormalRF64ChunkSize )
+	{
+		switch( chunk.getID() )
+		{
+			case kChunk_RF64:	mDS64Data->riffSize = chunk.getSize();		break;
+			case kChunk_data:
+				if( chunk.getSize() != chunk.getOriginalSize() )
+				{
+					XMP_Throw( "Data chunk must not change", kXMPErr_InternalFailure );
+				}
+				break;
+			default:
+			{
+				bool requireEntry = ( chunk.getSize() > kNormalRF64ChunkSize );
+				bool found = false;
+
+				//
+				// try to find entry for passed chunk id in the ds64 table
+				//
+				if( mDS64Data->tableLength > 0 )
+				{
+					for( std::vector<ChunkSize64>::iterator iter=mDS64Data->table.begin(); iter!=mDS64Data->table.end(); iter++ )
+					{
+						if( iter->id == chunk.getID() )
+						{
+							// always set new size even if it's less than 4GB
+							iter->size = chunk.getSize();
+							found = true;
+							break;
+						}
+					}
+				}
+
+				//
+				// We can't add new entries to the table. So if we found no entry within 'ds64'
+				// for the passed chunk ID and the size of the chunk is larger than 4GB then
+				// we have to throw an exception
+				//
+				XMP_Validate( found || ( ! found && ! requireEntry ), "Can't update 'ds64' chunk", kXMPErr_Unimplemented );
+			}
+		}
+	}
+
+	//
+	// go through all children to update ds64 data
+	//
+	for( XMP_Uns32 i=0; i<chunk.numChildren(); i++ )
+	{
+		Chunk* child = chunk.getChildAt(i);
+		
+		this->doUpdateRF64( *child );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::parseRF64Chunk(...)
+// 
+// Purpose: Parses the data block of the given RF64 chunk into the internal data structures
+// 
+//-----------------------------------------------------------------------------
+
+bool WAVEBehavior::parseDS64Chunk( const Chunk& ds64Chunk, WAVEBehavior::DS64& ds64 )
+{
+	bool ret = false;
+
+	// It is a valid ds64 chunk
+	if( ds64Chunk.getID() == kChunk_ds64 && ds64Chunk.getSize() >= kMinimumDS64ChunkSize )
+	{
+		const XMP_Uns8* data;
+		XMP_Uns64 size = ds64Chunk.getData(&data);
+
+		memset( &ds64, 0, kMinimumDS64ChunkSize);
+
+		//
+		// copy fix input data into RF64 block (except chunk size table)
+		// Safe as fixed size matches size of struct that is #pragma packed(1)
+		//
+		memcpy( &ds64, data, kMinimumDS64ChunkSize );
+
+		// If there is more data but the table length is <= 0 then this is not a valid ds64 chunk
+		if( size > kMinimumDS64ChunkSize && ds64.tableLength > 0 )
+		{
+			// copy chunk sizes table
+			//
+			XMP_Assert( size - kMinimumDS64ChunkSize >= ds64.tableLength * sizeof(ChunkSize64));
+
+			XMP_Uns32 offset = kMinimumDS64ChunkSize;
+			ChunkSize64 chunkSize;
+
+			for( XMP_Uns32 i = 0 ; i < ds64.tableLength ; i++, offset += sizeof(ChunkSize64) )
+			{
+				chunkSize.id = mEndian.getUns32( data + offset );
+				chunkSize.size = mEndian.getUns64( data + offset + 4 );
+
+				ds64.table.push_back( chunkSize );
+			}
+		}
+
+		// remember any existing table buffer
+		ds64.trailingBytes = static_cast<XMP_Uns32>(size - kMinimumDS64ChunkSize - ds64.tableLength * sizeof(ChunkSize64));
+		
+		// Either a table has been correctly parsed or there was no table
+		ret = (size - kMinimumDS64ChunkSize) >= (ds64.tableLength * sizeof(ChunkSize64));
+	}
+	
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEBehavior::serializeRF64Chunk(...)
+// 
+// Purpose: Serializes the internal RF64 data structures into the data part of the given chunk
+// 
+//-----------------------------------------------------------------------------
+bool WAVEBehavior::serializeDS64Chunk( const WAVEBehavior::DS64& ds64, Chunk& ds64Chunk )
+{
+	if( ds64Chunk.getID() != kChunk_ds64 )
+	{
+		return false; // not a valid ds64 chunk
+	}
+
+	// Calculate needed size
+	XMP_Uns32 size = kMinimumDS64ChunkSize + ds64.tableLength * sizeof(ChunkSize64) + ds64.trailingBytes;
+	// Create tmp buffer
+	XMP_Uns8* data = new XMP_Uns8[size];
+	memset( data, 0, size );
+
+	// copy fix input data into buffer (except chunk sizes table)
+	// Safe as fixed size matches size of struct that is #pragma packed(1)
+	memcpy( data, &ds64, kMinimumDS64ChunkSize );
+
+	// copy chunk sizes table
+	if( ds64.tableLength > 0 )
+	{
+		XMP_Uns32 offset = kMinimumDS64ChunkSize;
+		
+		for( XMP_Uns32 i = 0 ; i < ds64.tableLength ; i++, offset += sizeof(ChunkSize64) )
+		{
+			mEndian.putUns32( ds64.table.at(i).id, data + offset );
+			mEndian.putUns64( ds64.table.at(i).size, data + offset + 4 );
+		}
+	}
+
+	ds64Chunk.setData( data, size );
+
+	// free tmp buffer
+	delete []data;
+
+	return true;
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h
new file mode 100644
index 0000000..b5a2e3f
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h
@@ -0,0 +1,223 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _WAVEBEHAVIOR_h_
+#define _WAVEBEHAVIOR_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "source/Endian.h"
+
+namespace IFF_RIFF
+{
+
+/**
+	WAVE behavior class.
+	
+	Implements the IChunkBehavior interface
+*/
+
+
+class WAVEBehavior : public IChunkBehavior
+{
+// Internal structure to hold RF64 related data
+public:
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack ( 1 )
+#else
+#pragma pack ( push, 1 )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+	struct ChunkSize64
+	{
+		XMP_Uns64 size;
+		XMP_Uns32 id;
+		// Ctor
+		ChunkSize64(): size(0), id(0) {}
+	};
+
+	struct DS64
+	{
+		XMP_Uns64 riffSize;
+		XMP_Uns64 dataSize;
+		XMP_Uns64 sampleCount;
+		XMP_Uns32 tableLength;
+		// fix part ends here
+		XMP_Uns32 trailingBytes;
+		std::vector<ChunkSize64> table;
+
+		// ctor
+		DS64(): riffSize(0), dataSize(0), sampleCount(0), tableLength(0), trailingBytes(0) {}
+	};
+#if SUNOS_SPARC || SUNOS_X86
+#pragma pack (  )
+#else
+#pragma pack ( pop )
+#endif //#if SUNOS_SPARC || SUNOS_X86
+
+
+	/**
+		ctor/dtor
+	*/
+	WAVEBehavior() : mChunksAdded(0), mIsRF64(false), mDS64Data(NULL) {}
+	
+	virtual ~WAVEBehavior() 
+	{
+		if( mDS64Data != NULL )
+		{
+			delete mDS64Data;
+		}
+	}
+
+	/**
+		Validate the passed in size value, identify the valid size if the passed in isn't valid
+		and return the valid size.
+		throw an exception if the passed in size isn't valid and there's no way to identify a
+		valid size.
+
+		@param	size	Size value
+		@param	id		Identifier of chunk
+		@param	tree	Chunk tree
+		@param	stream	Stream handle
+
+		@return		Valid size value.
+	*/
+	XMP_Uns64		getRealSize( const XMP_Uns64 size, const ChunkIdentifier& id, IChunkContainer& tree, XMP_IO* stream );
+
+	/**
+		Return the maximum size of a single chunk, i.e. the maximum size of a top-level chunk.
+
+		@return		Maximum size
+	*/
+	XMP_Uns64		getMaxChunkSize() const;
+
+	/**
+		Return true if the passed identifier is valid for top-level chunks of a certain format.
+
+		@param	id		Chunk identifier
+		@param	chunkNo	order number of top-level chunk
+		@return			true, if passed id is a valid top-level chunk
+	*/
+	bool			isValidTopLevelChunk( const ChunkIdentifier& id, XMP_Uns32 chunkNo );
+
+	/**
+		Fix the hierarchy of chunks depending ones based on size changes of one or more chunks
+		and second based on format specific rules.
+		Throw an exception if the hierarchy can't be fixed.
+
+		@param	tree		Vector of root chunks.
+	*/
+	void			fixHierarchy( IChunkContainer& tree );
+
+	/**
+		Insert a new chunk into the hierarchy of chunks. The behavior needs to decide the position
+		of the new chunk and has to do the insertion.
+
+		@param	tree	Chunk tree
+		@param	chunk	New chunk
+	*/
+	void			insertChunk( IChunkContainer& tree, Chunk& chunk )	;
+
+	/**
+		Remove the chunk described by the passed ChunkPath.
+
+		@param	tree	Chunk tree
+		@param	path	Path to the chunk that needs to be removed
+
+		@return			true if the chunk was removed and need to be deleted
+	*/
+	bool			removeChunk( IChunkContainer& tree, Chunk& chunk )	;
+
+protected:
+		/**
+		Create a FREE chunk.
+		If the chunkSize is smaller than the header+type - size then create an annotation chunk.
+		If the passed size is odd, then add a pad byte.
+
+		@param chunkSize	Total size including header
+		@return				New FREE chunk
+	*/
+	Chunk*			createFREE( XMP_Uns64 chunkSize );
+	
+	/**
+		Check if the passed chunk is a FREE chunk.
+		(Could be also a small annotation chunk with zero bytes in its data)
+
+		@param	chunk	A chunk
+
+		@return			true if the passed chunk is a FREE chunk
+	*/
+	XMP_Bool		isFREEChunk( const Chunk& chunk ) const;
+
+	/**
+		Return the minimum size of a FREE chunk
+	*/
+	XMP_Uns64		getMinFREESize( ) const;
+
+	/**
+		Is the current file a RF64 file?
+
+		@param tree		The whole chunk tree beginning with the root node
+
+		@return			true if the current file is in the RF64 format
+	*/
+	bool			isRF64( const IChunkContainer& tree );
+
+	/**
+		Return RF64 structure.
+
+		If the related chunk ('ds64') is not yet parsed then it should be parsed by this method.
+
+		@param tree		The chunk tree (probably a subtree)
+		@param stream	File stream
+
+		@return			DS64 structure
+	*/
+	DS64*			getDS64( IChunkContainer& tree, XMP_IO* stream );
+
+	/**
+		update the RF64 chunk (if this is RF64) based on the current chunk sizes
+	*/
+	void			updateRF64( IChunkContainer& tree );
+
+	/**
+	 * Parses the data block of the given RF64 chunk into the internal data structures
+	 * @param rf64Chunk the RF64 Chunk
+	 * @param rf64 OUT the RF64 data structure 
+	 * @return The parsing was successful (true) or not (false)
+	 */
+	bool			parseDS64Chunk( const Chunk& ds64Chunk, DS64& rf64 );
+
+	/**
+	 * Serializes the internal RF64 data structures into the data part of the given chunk
+	 * @param rf64 the RF64 data structure
+	 * @param rf64Chunk OUT the RF64 Chunk
+	 * @return The serialization was successful (true) or not (false)
+	 */
+	bool			serializeDS64Chunk( const WAVEBehavior::DS64& rf64, Chunk& ds64Chunk );
+
+private:
+	void			doUpdateRF64( Chunk& chunk );
+
+private:
+	XMP_Uns32	mChunksAdded;
+	bool		mIsRF64;
+	DS64*		mDS64Data;
+	
+	static const LittleEndian& mEndian;				// WAVE is always Little Endian
+	static const XMP_Uns32 kNormalRF64ChunkSize = 0xFFFFFFFF;
+	static const XMP_Uns32 kMinimumDS64ChunkSize = 28;
+}; // IFF_RIFF
+
+}
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp
new file mode 100644
index 0000000..8c3067b
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp
@@ -0,0 +1,1067 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h"
+#include "XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/CartMetadata.h"
+#include "XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h"
+
+#include "XMPFiles/source/FormatSupport/TimeConversionUtils.hpp"
+
+// cr8r is not yet required for WAVE
+//#include "Cr8rMetadata.h"
+
+#include "XMPFiles/source/NativeMetadataSupport/MetadataSet.h"
+
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+
+using namespace IFF_RIFF;
+
+// ************** legacy Mappings ***************** //
+
+static const char * kBWF_description = "description";
+static const char * kBWF_originator = "originator";
+static const char * kBWF_originatorReference = "originatorReference";
+static const char * kBWF_originationDate = "originationDate";
+static const char * kBWF_originationTime = "originationTime";
+static const char * kBWF_timeReference = "timeReference";
+static const char * kBWF_version = "version";
+static const char * kBWF_umid = "umid";
+static const char * kBWF_codingHistory = "codingHistory";
+static const char * kBWF_timeStampSampleRate = "timeSampleRate";		// its transient should be deleted at the end.
+
+static const MetadataPropertyInfo kBextProperties[] =
+{
+//	  XMP NS		XMP Property Name			Native Metadata Identifier			Native Datatype				XMP	Datatype		Delete	Priority	ExportPolicy
+	{ kXMP_NS_BWF,	kBWF_description,			BEXTMetadata::kDescription,			kNativeType_StrLocal,		kXMPType_Simple,	false,	false,		kExport_Always },	// bext:description <-> BEXT:Description
+	{ kXMP_NS_BWF,	kBWF_originator,			BEXTMetadata::kOriginator,			kNativeType_StrLocal,		kXMPType_Simple,	false,	false,		kExport_Always },	// bext:originator <-> BEXT:originator
+	{ kXMP_NS_BWF,	kBWF_originatorReference,	BEXTMetadata::kOriginatorReference,	kNativeType_StrLocal,		kXMPType_Simple,	false,	false,		kExport_Always },	// bext:OriginatorReference <-> BEXT:OriginatorReference
+	{ kXMP_NS_BWF,	kBWF_originationDate,		BEXTMetadata::kOriginationDate,		kNativeType_StrLocal,		kXMPType_Simple,	false,	false,		kExport_Always },	// bext:originationDate <-> BEXT:originationDate
+	{ kXMP_NS_BWF,	kBWF_originationTime,		BEXTMetadata::kOriginationTime,		kNativeType_StrLocal,		kXMPType_Simple,	false,	false,		kExport_Always },	// bext:originationTime <-> BEXT:originationTime
+	{ kXMP_NS_BWF,	kBWF_timeReference,			BEXTMetadata::kTimeReference,		kNativeType_Uns64,			kXMPType_Simple,	false,	false,		kExport_Always },	// bext:timeReference <-> BEXT:TimeReferenceLow + BEXT:TimeReferenceHigh
+	// Special case: On export BEXT:version is always written as 1
+	{ kXMP_NS_BWF,	kBWF_version,				BEXTMetadata::kVersion,				kNativeType_Uns16,			kXMPType_Simple,	false,	false,		kExport_Never },	// bext:version <-> BEXT:version
+	// special case: bext:umid <-> BEXT:UMID
+	{ kXMP_NS_BWF,	kBWF_codingHistory,			BEXTMetadata::kCodingHistory,		kNativeType_StrLocal,		kXMPType_Simple,	false,	false,		kExport_Always },	// bext:codingHistory <-> BEXT:codingHistory
+	{ NULL }
+};
+
+static const char * kDM_takeNumber = "takeNumber";
+static const char * kDM_audioSampleType = "audioSampleType";
+static const char * kDM_scene = "scene";
+static const char * kDM_tapeName = "tapeName";
+static const char * kDM_logComment = "logComment";
+static const char * kDM_projectName = "projectName";
+static const char * kDM_audioSampleRate = "audioSampleRate";
+static const char * kDM_startTimecode = "startTimecode";
+static const char * kDM_timeFormat = "timeFormat";
+static const char * kDM_timeValue = "timeValue";
+static const char * kDM_good = "good";
+
+static const MetadataPropertyInfo kiXMLProperties[] =
+{
+//	  XMP NS		XMP Property Name			Native Metadata Identifier				Native Datatype				XMP	Datatype		Delete	Priority	ExportPolicy
+	{ kXMP_NS_DM,	kDM_tapeName,				iXMLMetadata::kTape,					kNativeType_StrUTF8,		kXMPType_Simple,	false,	false,		kExport_Always },	//xmpDM:tapeName <-> iXML:TAPE
+	{ kXMP_NS_DM,	kDM_takeNumber,				iXMLMetadata::kTake,					kNativeType_Uns64,			kXMPType_Simple,	false,	false,		kExport_Always },	//xmpDM:tapeName <-> iXML:TAPE
+	{ kXMP_NS_DM,	kDM_scene,					iXMLMetadata::kScene,					kNativeType_StrUTF8,		kXMPType_Simple,	false,	false,		kExport_Always },	//xmpDM:scene <-> iXML:SCENE
+	{ kXMP_NS_DM,	kDM_logComment,				iXMLMetadata::kNote,					kNativeType_StrUTF8,		kXMPType_Simple,	false,	false,		kExport_Always },	//xmpDM:logComment <-> iXML:NOTE
+	{ kXMP_NS_DM,	kDM_projectName,			iXMLMetadata::kProject,					kNativeType_StrUTF8,		kXMPType_Simple,	false,	false,		kExport_Always },	//xmpDM:project <-> iXML:PROJECT
+	{ kXMP_NS_DM,	kDM_good,					iXMLMetadata::kCircled,					kNativeType_Bool,			kXMPType_Simple,	false,	false,		kExport_Always },	//xmpDM:good <-> iXML:CIRCLED
+	{ kXMP_NS_DM,	kDM_audioSampleRate,		iXMLMetadata::kFileSampleRate,			kNativeType_Uns64,			kXMPType_Simple,	false,	false,		kExport_Always },	// xmpDM:audioSampleRate <-> iXML:FILE_SAMPLE_RATE
+	// special case for AudioBitDepth // xmpDM:audioSampleType <-> iXML:AUDIO_BIT_DEPTH
+	{ kXMP_NS_BWF,	kBWF_description,			iXMLMetadata::kBWFDescription,			kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },	// bext:description <-> iXML:BWF_DESCRIPTION
+	{ kXMP_NS_BWF,	kBWF_originator,			iXMLMetadata::kBWFOriginator,			kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },	// bext:originator <-> iXML:BWF_ORIGINATOR
+	{ kXMP_NS_BWF,	kBWF_originatorReference,	iXMLMetadata::kBWFOriginatorReference,	kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },	// bext:OriginatorReference <-> iXML:BWF_ORIGINATOR_REFERENCE
+	{ kXMP_NS_BWF,	kBWF_originationDate,		iXMLMetadata::kBWFOriginationDate,		kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },	// bext:originationDate <-> iXML:BWF_ORIGINATION_DATE
+	{ kXMP_NS_BWF,	kBWF_originationTime,		iXMLMetadata::kBWFOriginationTime,		kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },	// bext:originationTime <-> iXML:BWF_ORIGINATION_TIME
+	// special case for timeReference // bext:timeReference <-> iXML:BWF_TIME_REFERENCE_LOW and iXML:BWF_TIME_REFERENCE_HIGH
+	// Special case: On export BEXT:version is always written as 1
+	{ kXMP_NS_BWF,	kBWF_version,				iXMLMetadata::kBWFVersion,				kNativeType_Uns64,			kXMPType_Simple,	true,	false,		kExport_Never },	// bext:version <-> iXML:BWF_VERSION
+	{ kXMP_NS_BWF,	kBWF_codingHistory,			iXMLMetadata::kBWFHistory,				kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },	// bext:codingHistory <-> iXML:BWF_CODING_HISTORY
+	{ kXMP_NS_BWF,	kBWF_umid,					iXMLMetadata::kBWFUMID,					kNativeType_StrASCII,		kXMPType_Simple,	true,	false,		kExport_Always },	// bext:codingHistory <-> iXML:BWF_CODING_HISTORY
+	// special case for timeReference // bext:timeReference <-> iXML:TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_HO and iXML:TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_HI
+	// special case for startTimeCode // xmpDM:startTimecode <-> iXML:TIMECODE_RATE, iXML:TIMECODE_FLAG and bext:timeReference.
+	{ kXMP_NS_BWF,	kBWF_timeStampSampleRate,	iXMLMetadata::kTimeStampSampleRate,		kNativeType_Uns64,			kXMPType_Simple,	false,	false,		kExport_NoDelete },	// bext::timeStampSampleRate <-> iXML
+	{ NULL }
+};
+
+static const MetadataPropertyInfo kINFOProperties[] =
+{
+//	  XMP NS		XMP Property Name		Native Metadata Identifier		Native Datatype				XMP	Datatype		Delete	Priority	ExportPolicy
+	{ kXMP_NS_DM,	"artist",				INFOMetadata::kArtist,			kNativeType_StrUTF8,		kXMPType_Simple,	false,	true,		kExport_Always },		// xmpDM:artist <-> IART
+	{ kXMP_NS_DM,	"logComment",			INFOMetadata::kComments,		kNativeType_StrUTF8,		kXMPType_Simple,	false,	true,		kExport_Always },		// xmpDM:logComment <-> ICMT
+	{ kXMP_NS_DC,	"rights",				INFOMetadata::kCopyright,		kNativeType_StrUTF8,		kXMPType_Localized,	false,	true,		kExport_Always },		// dc:rights <-> ICOP
+	{ kXMP_NS_XMP,	"CreateDate",			INFOMetadata::kCreationDate,	kNativeType_StrUTF8,		kXMPType_Simple,	false,	true,		kExport_Always },		// xmp:CreateDate <-> ICRD
+	{ kXMP_NS_DM,	"engineer",				INFOMetadata::kEngineer,		kNativeType_StrUTF8,		kXMPType_Simple,	false,	true,		kExport_Always },		// xmpDM:engineer <-> IENG
+	{ kXMP_NS_DM,	"genre",				INFOMetadata::kGenre,			kNativeType_StrUTF8,		kXMPType_Simple,	false,	true,		kExport_Always },		// xmpDM:genre <-> IGNR
+	{ kXMP_NS_XMP,	"CreatorTool",			INFOMetadata::kSoftware,		kNativeType_StrUTF8,		kXMPType_Simple,	false,	true,		kExport_Always },		// xmp:CreatorTool <-> ISFT
+	{ kXMP_NS_DC,	"source",				INFOMetadata::kMedium,			kNativeType_StrUTF8,		kXMPType_Simple,	false,	false,		kExport_Always },		// dc:source <-> IMED, not in old digest
+	{ kXMP_NS_DC,	"type",					INFOMetadata::kSourceForm,		kNativeType_StrUTF8,		kXMPType_Array,		false,	false,		kExport_Always },		// dc:type <-> ISRF, not in old digest
+
+	// new mappings
+	{ kXMP_NS_RIFFINFO,	"name",				INFOMetadata::kName,			kNativeType_StrUTF8,		kXMPType_Localized,	true,	false,		kExport_Always },		// riffinfo:name <-> INAM
+	{ kXMP_NS_RIFFINFO,	"archivalLocation",	INFOMetadata::kArchivalLocation,kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },		// riffinfo:archivalLocation  <-> IARL
+	{ kXMP_NS_RIFFINFO,	"commissioned",		INFOMetadata::kCommissioned,	kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },		// riffinfo:commissioned  <-> ICMS
+	// special case, the native value is a semicolon-separated array
+	// { kXMP_NS_DC,		"subject",			INFOMetadata::kKeywords,		kNativeType_StrUTF8,		kXMPType_Array,		false,	false,		kExport_Always },		// dc:subject  <-> IKEY
+	{ kXMP_NS_RIFFINFO,	"product",			INFOMetadata::kProduct,			kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },		// riffinfo:product <-> IPRD
+	{ kXMP_NS_DC,		"description",		INFOMetadata::kSubject,			kNativeType_StrUTF8,		kXMPType_Localized,	false,	false,		kExport_Always },		// dc:description <-> ISBJ
+	{ kXMP_NS_RIFFINFO,	"source",			INFOMetadata::kSource,			kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },		// riffinfo:source  <-> ISRC
+	{ kXMP_NS_RIFFINFO,	"technician",		INFOMetadata::kTechnican,		kNativeType_StrUTF8,		kXMPType_Simple,	true,	false,		kExport_Always },		// riffinfo:technician <-> ITCH
+
+	{ NULL }
+};
+
+static const MetadataPropertyInfo kDISPProperties[] =
+{
+//	  XMP NS		XMP Property Name		Native Metadata Identifier		Datatype					Datatype			Delete	Priority	ExportPolicy
+	{ kXMP_NS_DC,	"title",				DISPMetadata::kTitle,			kNativeType_StrUTF8,		kXMPType_Localized,	false,	true,		kExport_Always },		// dc:title <-> DISP
+	// Special case: DISP will overwrite LIST/INFO:INAM in dc:title if existing
+	{ NULL }
+};
+
+static const MetadataPropertyInfo kCartProperties[] =
+{
+//	  XMP NS			XMP Property Name		Native Metadata Identifier			Datatype					Datatype			Delete	Priority	ExportPolicy
+	{ kXMP_NS_AEScart,	"Version",				CartMetadata::kVersion,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"Title",				CartMetadata::kTitle,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"Artist",				CartMetadata::kArtist,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"CutID",				CartMetadata::kCutID,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"ClientID",				CartMetadata::kClientID,			kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"Category",				CartMetadata::kCategory,			kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"Classification",		CartMetadata::kClassification,		kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"OutCue",				CartMetadata::kOutCue,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"StartDate",			CartMetadata::kStartDate,			kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"StartTime",			CartMetadata::kStartTime,			kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"EndDate",				CartMetadata::kEndDate,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"EndTime",				CartMetadata::kEndTime,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"ProducerAppID",		CartMetadata::kProducerAppID,		kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"ProducerAppVersion",	CartMetadata::kProducerAppVersion,	kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"UserDef",				CartMetadata::kUserDef,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"URL",					CartMetadata::kURL,					kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"TagText",				CartMetadata::kTagText,				kNativeType_StrLocal,		kXMPType_Simple,	true,	false,		kExport_Always },
+	{ kXMP_NS_AEScart,	"LevelReference",		CartMetadata::kLevelReference,		kNativeType_Int32,			kXMPType_Simple,	true,	false,		kExport_Always },
+	// Special case Post Timer
+	{ NULL }
+};
+
+// cr8r is not yet required for WAVE
+//
+//static const MetadataPropertyInfo kCr8rProperties[] =
+//{
+////	  XMP NS				XMP Property Name							Native Metadata Identifier	Native Datatype		XMP Datatype		Delete	Priority	ExportPolicy
+//	{ kXMP_NS_CreatorAtom,	"macAtom/creatorAtom:applicationCode",		Cr8rMetadata::kCreatorCode,	kNativeType_Uns32,	kXMPType_Simple,	false,	false,		kExport_Always },	// creatorAtom:macAtom/creatorAtom:applicationCode <-> Cr8r.creatorCode 
+//	{ kXMP_NS_CreatorAtom,	"macAtom/creatorAtom:invocationAppleEvent",	Cr8rMetadata::kAppleEvent,	kNativeType_Uns32,	kXMPType_Simple,	false,	false,		kExport_Always },	// creatorAtom:macAtom/creatorAtom:invocationAppleEvent <-> Cr8r.appleEvent
+//	{ kXMP_NS_CreatorAtom,	"windowsAtom/creatorAtom:extension",		Cr8rMetadata::kFileExt,		kNativeType_Str,	kXMPType_Simple,	false,	false,		kExport_Always },	// creatorAtom:windowsAtom/creatorAtom:extension <-> Cr8r.fileExt
+//	{ kXMP_NS_CreatorAtom,	"windowsAtom/creatorAtom:invocationFlags",	Cr8rMetadata::kAppOptions,	kNativeType_Str,	kXMPType_Simple,	false,	false,		kExport_Always },	// creatorAtom:windowsAtom/creatorAtom:invocationFlags <-> Cr8r.appOptions
+//	{ kXMP_NS_XMP,			"CreatorTool",								Cr8rMetadata::kAppName,		kNativeType_Str,	kXMPType_Simple,	false,	false,		kExport_Always },	// xmp:CreatorTool <-> Cr8r.appName
+//	{ NULL }
+//};
+
+// ! PrmL atom has all special mappings
+
+// ************** legacy Mappings end ***************** //
+
+XMP_Bool WAVEReconcile::importToXMP( SXMPMeta& outXMP, const MetadataSet& inMetaData )
+{
+	bool changed = false;
+
+	// the reconciliation is based on the existing outXMP packet
+
+	//
+	// ! The existence of a digest leads to prefering pre-existing XMP over legacy properties.
+	//
+	bool hasDigest = outXMP.GetProperty( kXMP_NS_WAV, "NativeDigest", NULL , NULL );
+
+	if ( hasDigest )
+	{
+		// remove, as digests are no longer used.
+		outXMP.DeleteProperty( kXMP_NS_WAV, "NativeDigest" );
+	}
+
+
+	if ( ! ignoreLocalText ) 
+	{
+		//
+		// Import iXML
+		//
+		iXMLMetadata * iXMLMeta = inMetaData.get<iXMLMetadata>();
+		if ( iXMLMeta != NULL ) {
+			changed |= IReconcile::importNativeToXMP( outXMP, *iXMLMeta, kiXMLProperties, false );
+			changed |= exportSpecialiXMLToXMP( *iXMLMeta, outXMP );
+		}
+
+		//
+		// Import BEXT
+		//
+		BEXTMetadata *bextMeta = inMetaData.get<BEXTMetadata>();
+
+		if (bextMeta != NULL)
+		{
+			changed |= IReconcile::importNativeToXMP( outXMP, *bextMeta, kBextProperties, false );
+
+			// bext:umid <-> BEXT:UMID
+			if ( bextMeta->valueExists( BEXTMetadata::kUMID ) )
+			{
+				XMP_Uns32 umidSize = 0;
+				const XMP_Uns8* const umid = bextMeta->getArray<XMP_Uns8>( BEXTMetadata::kUMID, umidSize );
+
+				std::string xmpValue;
+				bool allZero = encodeToHexString( umid, xmpValue );
+			
+				if( ! allZero )
+				{	
+					outXMP.SetProperty(kXMP_NS_BWF, "umid", xmpValue.c_str());	
+					changed = true;
+				}
+			}
+
+		}
+
+
+		//
+		// Import cart
+		//
+		CartMetadata* cartData = inMetaData.get<CartMetadata>();
+		if ( cartData != NULL ) 
+		{
+
+			if (cartData->valueExists( CartMetadata::kPostTimer ) )
+			{
+				// first get Array
+				XMP_Uns32 size = 0;
+				const CartMetadata::StoredCartTimer* timerArray = cartData->getArray<CartMetadata::StoredCartTimer> ( CartMetadata::kPostTimer, size );
+				XMP_Assert (size == CartMetadata::kPostTimerLength );
+
+				char usage [5];
+				XMP_Uns32 usageBE = 0;
+				char value [25];  // Unsigned has 10 dezimal digets (buffer has 25 just to be save)
+				std::string  path = "";
+				memset ( usage, 0, 5 );	// Fill with zeros
+				memset ( value, 0, 25 );	// Fill with zeros
+
+				outXMP.DeleteProperty( kXMP_NS_AEScart, "PostTimer");
+				outXMP.AppendArrayItem( kXMP_NS_AEScart, "PostTimer", kXMP_PropArrayIsOrdered, NULL, kXMP_PropValueIsStruct );
+
+				for ( XMP_Uns32 i = 0; i<CartMetadata::kPostTimerLength; i++ )
+				{	
+					// Ensure to write as Big Endian
+					usageBE = MakeUns32BE(timerArray[i].usage);
+					memcpy( usage, &usageBE, 4 );
+
+					snprintf ( value, 24,	"%u", timerArray[i].value);
+
+					SXMPUtils::ComposeArrayItemPath( kXMP_NS_AEScart, "PostTimer", i+1, &path);
+					outXMP.SetStructField( kXMP_NS_AEScart,  path.c_str(), kXMP_NS_AEScart, "Usage", usage );
+					outXMP.SetStructField( kXMP_NS_AEScart, path.c_str(), kXMP_NS_AEScart, "Value", value );
+				}
+
+				changed = true;
+			}
+
+			// import rest if cart properties
+			changed |= IReconcile::importNativeToXMP ( outXMP, *cartData, kCartProperties, false );
+		}
+	
+	}
+
+	// cr8r is not yet required for WAVE
+
+	////
+	//// import cr8r
+	//// Special case: If both Cr8r.AppName and LIST/INFO:ISFT are present, ISFT shall win.
+	//// therefor import Cr8r first.
+	////
+	//Cr8rMetadata* cr8rMeta = inMetaData.get<Cr8rMetadata>();
+
+	//if( cr8rMeta != NULL )
+	//{
+	//	changed |= IReconcile::importNativeToXMP( outXMP, *cr8rMeta, kCr8rProperties, false );
+	//}
+
+	//
+	// Import LIST/INFO
+	//
+	INFOMetadata *infoMeta = inMetaData.get<INFOMetadata>();
+	bool hasINAM = false;
+	std::string actualLang;
+	bool hasDCTitle = outXMP.GetLocalizedText( kXMP_NS_DC, "title", "" , "x-default" , &actualLang, NULL, NULL );
+
+	if (infoMeta != NULL)
+	{
+		//
+		// Remember if List/INFO:INAM has been imported
+		//
+		hasINAM = infoMeta->valueExists( INFOMetadata::kName );
+
+		// Keywords are a ;-separated list and is therefore handled manually,
+		// leveraging the XMPUtils functions
+		if (infoMeta->valueExists( INFOMetadata::kKeywords ) )
+		{
+			std::string keywordsUTF8;
+			outXMP.DeleteProperty( kXMP_NS_DC, "subject" );
+			ReconcileUtils::NativeToUTF8( infoMeta->getValue<std::string>( INFOMetadata::kKeywords ), keywordsUTF8 );
+			SXMPUtils::SeparateArrayItems( &outXMP, kXMP_NS_DC, "subject", kXMP_PropArrayIsUnordered, keywordsUTF8 );
+			changed = true;
+		}
+
+		//
+		// import properties
+		//
+		changed |= IReconcile::importNativeToXMP( outXMP, *infoMeta, kINFOProperties, hasDigest );
+	}
+
+	//
+	// Import DISP
+	// ! DISP will overwrite dc:title
+	//
+	bool hasDISP = false;
+
+	DISPMetadata *dispMeta = inMetaData.get<DISPMetadata>();
+
+	if( dispMeta != NULL && dispMeta->valueExists( DISPMetadata::kTitle) )
+	{
+		changed |= IReconcile::importNativeToXMP( outXMP, *dispMeta, kDISPProperties, hasDigest );
+		hasDISP = true;
+	}
+
+	if( !hasDISP )
+	{
+		//
+		// map INAM to dc:title ONLY in the case if:
+		// * DISP does NOT exists
+		// * dc:title does NOT exists
+		// * INAM exists
+		//
+		if( !hasDCTitle && hasINAM )
+		{
+			std::string xmpValue;
+			ReconcileUtils::NativeToUTF8( infoMeta->getValue<std::string>( INFOMetadata::kName ), xmpValue );
+			outXMP.SetLocalizedText( kXMP_NS_DC, "title", NULL, "x-default", xmpValue.c_str() );
+		}
+	}
+
+	// do timecode calculations
+	if ( outXMP.DoesPropertyExist( kXMP_NS_BWF, kBWF_timeReference ) &&
+		 outXMP.DoesPropertyExist( kXMP_NS_BWF, kDM_timeFormat ) &&
+		 outXMP.DoesPropertyExist( kXMP_NS_BWF, kBWF_timeStampSampleRate ) )
+	{
+		std::string xmpValue;
+		XMP_Int64 sampleRate = 0;
+		XMP_Uns64 nSamples = 0;
+		std::string timeFormat;
+		bool ok = outXMP.GetProperty( kXMP_NS_BWF, kBWF_timeReference, &xmpValue, 0 );
+
+		if ( ok )
+		{
+			int count;
+			char nextCh;
+			const char * strValue = xmpValue.c_str();
+			count = sscanf ( strValue, "%llu%c", &nSamples, &nextCh );
+		
+			if ( count != 1 ) ok = false;
+		}
+		if ( ok )
+			ok = outXMP.GetProperty_Int64( kXMP_NS_BWF, kBWF_timeStampSampleRate, &sampleRate, 0 );
+		if ( ok )
+			ok = outXMP.GetProperty( kXMP_NS_BWF, kDM_timeFormat, &timeFormat, 0 );
+
+		if ( ok && sampleRate != 0 && timeFormat.size() > 0 ) {
+			// compute time code from all the information we have
+			std::string timecode;
+			if ( TimeConversionUtils::ConvertSamplesToSMPTETimecode( timecode, nSamples, sampleRate, timeFormat ) ) {
+				outXMP.SetStructField( kXMP_NS_DM, kDM_startTimecode, kXMP_NS_DM, kDM_timeValue, timecode, 0 );
+				outXMP.SetStructField( kXMP_NS_DM, kDM_startTimecode, kXMP_NS_DM, kDM_timeFormat, timeFormat, 0 );
+			}
+		}
+	}
+
+	// delete transient properties
+	outXMP.DeleteProperty( kXMP_NS_BWF, kBWF_timeStampSampleRate );
+	outXMP.DeleteProperty( kXMP_NS_BWF, kDM_timeFormat );
+
+	return changed;
+}	// importToXMP
+
+
+XMP_Bool WAVEReconcile::exportFromXMP( MetadataSet& outMetaData, SXMPMeta& inXMP )
+{
+	// tracks if anything has been exported from the XMP
+	bool changed = false;
+
+	//
+	// Export DISP
+	//
+	DISPMetadata *dispMeta = outMetaData.get<DISPMetadata>();
+	if (dispMeta != NULL)
+	{
+		// dc:title <-> DISP
+		changed |= IReconcile::exportXMPToNative( *dispMeta, inXMP, kDISPProperties );
+	}
+
+	PropertyList propertiesToBeRemovedFromXMPMeta;
+	if ( ! ignoreLocalText ) 
+	{
+		bool removeAllPropertiesinBextNameSpace = false;
+		//
+		// Export iXML
+		//
+		iXMLMetadata *iXMLMeta = outMetaData.get<iXMLMetadata>();
+		if (iXMLMeta != NULL)
+		{
+			IReconcile::exportXMPToNative( *iXMLMeta, inXMP, kiXMLProperties, &propertiesToBeRemovedFromXMPMeta );
+			exportSpecialXMPToiXML( inXMP, *iXMLMeta, propertiesToBeRemovedFromXMPMeta );
+			changed |= iXMLMeta->hasChanged();
+			removeAllPropertiesinBextNameSpace = true;
+			// for maintaing backward compatibility we don't want to remove properties from xmp packet.
+			propertiesToBeRemovedFromXMPMeta.clear();
+
+			// update time code value
+			if ( iXMLMeta->valueExists( iXMLMetadata::kTimeStampSampleRate ) && 
+				 iXMLMeta->valueExists( iXMLMetadata::kTimeStampSampleSinceMidnightHigh ) &&
+				 iXMLMeta->valueExists( iXMLMetadata::kTimeStampSampleSinceMidnightLow ) &&
+				 iXMLMeta->valueExists( iXMLMetadata::kTimeCodeRate ) )
+			{
+				if ( iXMLMeta->valueChanged( iXMLMetadata::kTimeStampSampleRate ) ||
+					 iXMLMeta->valueChanged( iXMLMetadata::kTimeStampSampleSinceMidnightHigh ) ||
+					 iXMLMeta->valueChanged( iXMLMetadata::kTimeStampSampleSinceMidnightLow ) ||
+					 iXMLMeta->valueChanged( iXMLMetadata::kTimeCodeRate ) ||
+					 ( iXMLMeta->valueExists( iXMLMetadata::kTimeCodeFlag ) && iXMLMeta->valueChanged( iXMLMetadata::kTimeCodeFlag ) ) )
+				{
+					// update the time code value
+					XMP_Int64 sampleRate = iXMLMeta->getValue<XMP_Uns64>( iXMLMetadata::kTimeStampSampleRate );
+					XMP_Int64 nSamples = 0;
+					std::string timeFormat;
+					bool ok = inXMP.GetProperty_Int64( kXMP_NS_BWF, kBWF_timeReference, &nSamples, 0 );
+					if ( ok )
+						ok = inXMP.GetStructField( kXMP_NS_DM, kDM_startTimecode, kXMP_NS_DM, kDM_timeFormat, &timeFormat, 0 );
+
+					if ( ok && sampleRate != 0 && timeFormat.size() > 0 ) {
+						// compute time code from all the information we have
+						std::string timecode;
+						if ( TimeConversionUtils::ConvertSamplesToSMPTETimecode( timecode, nSamples, sampleRate, timeFormat ) ) {
+							inXMP.SetStructField( kXMP_NS_DM, kDM_startTimecode, kXMP_NS_DM, kDM_timeValue, timecode, 0 );
+						}
+					}
+					
+				}
+			}
+		}
+
+		//
+		// Export BEXT
+		//
+
+		BEXTMetadata *bextMeta = outMetaData.get<BEXTMetadata>();
+
+		if (bextMeta != NULL)
+		{
+			IReconcile::exportXMPToNative( *bextMeta, inXMP, kBextProperties );
+
+			std::string xmpValue;
+
+			// bext:umid  <-> RIFF:WAVE/bext.UMID
+			if (inXMP.GetProperty(kXMP_NS_BWF, "umid", &xmpValue, 0))
+			{
+				std::string umid;
+			
+				if( this->decodeFromHexString( xmpValue, umid ) )
+				{
+					//
+					// if the XMP property doesn't contain a valid hex string then
+					// keep the existing value in the umid BEXT field
+					//
+					bextMeta->setArray<XMP_Uns8>(BEXTMetadata::kUMID, reinterpret_cast<const XMP_Uns8*>(umid.data()), umid.length());
+				}
+			}
+			else
+			{
+				bextMeta->deleteValue(BEXTMetadata::kUMID);
+			}
+
+			// bext:version  <-> RIFF:WAVE/bext.version
+			// Special case: bext.version is always written as 1
+			if (inXMP.GetProperty(kXMP_NS_BWF, "version", NULL, 0))
+			{
+				bextMeta->setValue<XMP_Uns16>(BEXTMetadata::kVersion, 1);
+			}
+			else
+			{
+				bextMeta->deleteValue(BEXTMetadata::kVersion);
+			}
+
+			removeAllPropertiesinBextNameSpace = true;
+
+			changed |= bextMeta->hasChanged();
+		}
+
+		if ( removeAllPropertiesinBextNameSpace )
+			SXMPUtils::RemoveProperties(&inXMP, kXMP_NS_BWF, NULL, kXMPUtil_DoAllProperties );
+
+		//
+		// Export cart
+		//
+		CartMetadata* cartData = outMetaData.get<CartMetadata>();
+
+		if ( cartData != NULL ) 
+		{
+			IReconcile::exportXMPToNative ( *cartData, inXMP, kCartProperties );
+			
+			// Export PostTimer
+			if ( inXMP.DoesPropertyExist( kXMP_NS_AEScart, "PostTimer" ) )
+			{
+				if( inXMP.CountArrayItems( kXMP_NS_AEScart, "PostTimer" ) == CartMetadata::kPostTimerLength )
+				{
+					
+					CartMetadata::StoredCartTimer timer[CartMetadata::kPostTimerLength];
+					memset ( timer, 0, sizeof(CartMetadata::StoredCartTimer)*CartMetadata::kPostTimerLength );	// Fill with zeros
+					std::string path = "";
+					std::string usageSt = "";
+					std::string valueSt = "";
+					XMP_Bool invalidArray = false;
+					XMP_Uns32 usage = 0;
+					XMP_Uns32 value = 0;
+					XMP_Int64 tmp = 0;
+					XMP_OptionBits opts;
+					
+
+					for ( XMP_Uns32 i = 0; i<CartMetadata::kPostTimerLength && !invalidArray; i++ )
+					{	
+						// get options of array item
+						inXMP.GetArrayItem( kXMP_NS_AEScart, "PostTimer", i+1, NULL, &opts );
+						// copose path to array item
+						SXMPUtils::ComposeArrayItemPath( kXMP_NS_AEScart, "PostTimer", i+1, &path);						
+
+						if ( opts == kXMP_PropValueIsStruct &&
+							 inXMP.DoesStructFieldExist ( kXMP_NS_AEScart, path.c_str(), kXMP_NS_AEScart, "Usage" ) &&
+							 inXMP.DoesStructFieldExist ( kXMP_NS_AEScart, path.c_str(), kXMP_NS_AEScart, "Value" ) )
+						{
+							inXMP.GetStructField( kXMP_NS_AEScart, path.c_str(), kXMP_NS_AEScart, "Usage", &usageSt, NULL);
+							inXMP.GetStructField( kXMP_NS_AEScart, path.c_str(), kXMP_NS_AEScart, "Value", &valueSt, NULL);
+
+							if ( stringToFOURCC( usageSt,usage ) )
+							{
+								// don't add if the String is not set or not exactly 4 characters
+								timer[i].usage = usage;
+						
+								// now the value
+								if ( valueSt.length() > 0 )
+								{
+									tmp = SXMPUtils::ConvertToInt64(valueSt);
+									if ( tmp > 0  && tmp <= 0xffffffff)
+									{								
+										value = static_cast<XMP_Uns32>(tmp); // save because I checked that the number is positiv.
+										timer[i].value = value;
+									}
+									// else value stays 0								
+								}
+								// else value stays 0
+							}
+						} 
+						else
+						{
+							invalidArray = true;
+						}
+					}
+
+					if (!invalidArray) // if the structure of the array is wrong don't add anything
+					{
+						cartData->setArray<CartMetadata::StoredCartTimer> (CartMetadata::kPostTimer, timer, CartMetadata::kPostTimerLength);
+					}
+				} // Array length is wrong: don't add anything
+			}
+			else
+			{
+				cartData->deleteValue( CartMetadata::kPostTimer );
+			}
+			SXMPUtils::RemoveProperties ( &inXMP, kXMP_NS_AEScart, 0, kXMPUtil_DoAllProperties );
+			changed |= cartData->hasChanged();
+		}
+	}
+
+	//
+	// export LIST:INFO
+	//
+	INFOMetadata *infoMeta = outMetaData.get<INFOMetadata>();
+
+	if (infoMeta != NULL)
+	{
+		IReconcile::exportXMPToNative( *infoMeta, inXMP, kINFOProperties );
+
+		if ( inXMP.DoesPropertyExist(	 kXMP_NS_DC, "subject" ) )
+		{
+			std::string catedStr;
+			SXMPUtils::CatenateArrayItems( inXMP, kXMP_NS_DC, "subject", NULL, NULL, kXMP_NoOptions, &catedStr );
+			infoMeta->setValue<std::string>(INFOMetadata::kKeywords, catedStr);
+		}
+		else
+		{
+			infoMeta->deleteValue( INFOMetadata::kKeywords );
+		}
+
+		// Remove RIFFINFO properties from the XMP
+		SXMPUtils::RemoveProperties(&inXMP, kXMP_NS_RIFFINFO, NULL, kXMPUtil_DoAllProperties );
+
+		changed |= infoMeta->hasChanged();
+	}
+
+	// cr8r is not yet required for WAVE
+
+	////
+	//// export cr8r
+	////
+	//Cr8rMetadata* cr8rMeta = outMetaData.get<Cr8rMetadata>();
+
+	//if( cr8rMeta != NULL )
+	//{
+	//	changed |= IReconcile::exportXMPToNative( *cr8rMeta, inXMP, kCr8rProperties );
+	//}
+
+	//
+	// remove WAV digest
+	//
+	inXMP.DeleteProperty( kXMP_NS_WAV, "NativeDigest" );
+
+	for ( PropertyList::iterator it = propertiesToBeRemovedFromXMPMeta.begin(), last = propertiesToBeRemovedFromXMPMeta.end(); it != last; it++ )
+	{
+		inXMP.DeleteProperty( it->first, it->second );
+	}
+
+	return changed;
+}	// exportFromXMP
+
+
+// ************** Helper Functions ***************** //
+
+bool WAVEReconcile::encodeToHexString ( const XMP_Uns8* input, std::string& output )
+{
+	bool allZero = true; // assume for now
+	XMP_Uns32 kFixedSize = 64; // Only used for UMID Bext field, which is fixed
+	output.erase();
+
+	if ( input != 0 )
+	{
+		output.reserve ( kFixedSize * 2 );
+				
+		for( XMP_Uns32 i = 0; i < kFixedSize; i++ )
+		{
+			// first, second nibble
+			XMP_Uns8 first = input[i] >> 4;
+			XMP_Uns8 second = input[i] & 0xF;
+
+			if ( allZero && (( first != 0 ) || (second != 0)))
+				allZero = false;
+
+			output.append( 1, ReconcileUtils::kHexDigits[first] );
+			output.append( 1, ReconcileUtils::kHexDigits[second] );	
+		}
+	}
+	return allZero;
+}	// encodeToHexString
+
+
+bool WAVEReconcile::decodeFromHexString ( std::string input, std::string &output)
+{
+	if ( (input.length() % 2) != 0 )
+		return false;
+	output.erase();
+	output.reserve ( input.length() / 2 );
+
+	for( XMP_Uns32 i = 0; i < input.length(); )
+	{	
+		XMP_Uns8 upperNibble = input[i];
+		if ( (upperNibble < 48) || ( (upperNibble > 57 ) && ( upperNibble < 65 ) ) || (upperNibble > 70) )
+		{
+			return false;
+		}
+		if ( upperNibble >= 65 )
+		{		
+			upperNibble -= 7; // shift A-F area adjacent to 0-9
+		}
+		upperNibble -= 48; // 'shift' to a value [0..15]
+		upperNibble = ( upperNibble << 4 );
+		i++;
+
+		XMP_Uns8 lowerNibble = input[i];
+		if ( (lowerNibble < 48) || ( (lowerNibble > 57 ) && ( lowerNibble < 65 ) ) || (lowerNibble > 70) )
+		{
+			return false;
+		}
+		if ( lowerNibble >= 65 )
+		{		
+			lowerNibble -= 7; // shift A-F area adjacent to 0-9
+		}
+		lowerNibble -= 48; // 'shift' to a value [0..15]
+		i++;
+
+		output.append ( 1, (upperNibble + lowerNibble) );
+	}
+	return true;
+}	// decodeFromHexString
+
+bool WAVEReconcile::stringToFOURCC ( std::string input, XMP_Uns32 &output )
+{
+	bool result = false;
+	std::string asciiST = "";
+	
+	// convert to ACSII
+	convertToASCII(input, asciiST);
+	if ( asciiST.length() == 4 )
+	{
+
+		output = GetUns32BE( asciiST.c_str() );
+		result = true;
+	}
+	
+	return result;
+}
+
+struct iXMLAudioSampleTypeMapping
+{
+	const char *			xmpStringValue;
+	XMP_Uns64				ixmlIntValue;
+};
+
+iXMLAudioSampleTypeMapping ixmlAudioSampleTypeMappings[] = {
+	{ "8Int",		8 },
+	{ "16Int",		16 },
+	{ "24Int",		24 },
+	{ "32Float",	32 },
+};
+
+struct iXMLTimeCodeRateAndFlagMapping 
+{
+	const char *			xmpStringValue;
+	const char *			ixmlTimeCodeRateValue;
+	const char *			ixmlTimeCodeFlagValue;
+};
+
+iXMLTimeCodeRateAndFlagMapping ixmlTimeCodeRateAndFlagMappings[] = {
+	{ "24Timecode",				"24/1",			"NDF" },
+	{ "25Timecode",				"25/1",			"NDF" },
+	{ "2997DropTimecode",		"30000/1001",	"DF" },
+	{ "2997NonDropTimecode",	"30000/1001",	"NDF" },
+	{ "30Timecode",				"30/1",			"NDF" },
+	{ "50Timecode",				"50/1",			"NDF" },
+	{ "5994DropTimecode",		"60000/1001",	"DF" },
+	{ "5994NonDropTimecode",	"60000/1001",	"NDF" },
+	{ "60Timecode",				"60/1",			"NDF" },
+	{ "23976Timecode",			"24000/1001",	"NDF" },
+};
+
+void IFF_RIFF::WAVEReconcile::exportSpecialXMPToiXML( SXMPMeta & inXMP, IMetadata & outNativeMeta, PropertyList & propertiesToBeDeleted )
+{
+	std::string sXmpValue;
+	XMP_Int64 iXMPValue;
+
+	// special case for NoGood and Circled // xmpDM:good ,-> iXML:NO_GOOD and iXML:CIRCLED
+
+	// special case for AudioBitDepth // xmpDM:audioSampleType <-> iXML:AUDIO_BIT_DEPTH
+	bool deleteNativeEntry = false;
+	try
+	{
+		if ( inXMP.GetProperty( kXMP_NS_DM, kDM_audioSampleType, &sXmpValue, 0 ) )
+		{
+			bool matchingValueFound = false;
+			XMP_Uns64 ixmlValue = 0;
+			for ( size_t i = 0, total = sizeof(ixmlAudioSampleTypeMappings )/sizeof( iXMLAudioSampleTypeMapping); i < total; i++ )
+			{
+				if ( sXmpValue.compare( ixmlAudioSampleTypeMappings[i].xmpStringValue ) == 0 )
+				{
+					ixmlValue = ixmlAudioSampleTypeMappings[i].ixmlIntValue;
+					matchingValueFound = true;
+					break;
+				}
+			}
+
+			if ( matchingValueFound )
+			{
+				outNativeMeta.setValue< XMP_Uns64 >( iXMLMetadata::kAudioBitDepth, ixmlValue );
+				propertiesToBeDeleted.push_back( std::make_pair( kXMP_NS_DM, kDM_audioSampleType ) );
+				deleteNativeEntry = false;
+			}
+			else
+			{
+				deleteNativeEntry = true;
+			}
+		}
+		else
+		{
+			deleteNativeEntry = true;
+		}
+
+		if ( deleteNativeEntry )
+		{
+			if ( outNativeMeta.valueExists( iXMLMetadata::kAudioBitDepth ) )
+			{
+				XMP_Uns64 ixmlValue = outNativeMeta.getValue< XMP_Uns64 >( iXMLMetadata::kAudioBitDepth );
+				bool validValue = false;
+				for ( size_t i = 0, total = sizeof(ixmlAudioSampleTypeMappings )/sizeof( iXMLAudioSampleTypeMapping); i < total; i++ )
+				{
+					if ( ixmlValue == ixmlAudioSampleTypeMappings[i].ixmlIntValue )
+					{
+						validValue = true;
+						break;
+					}
+				}
+				if ( validValue )
+					outNativeMeta.deleteValue( iXMLMetadata::kAudioBitDepth );
+			}
+		}
+	}
+	catch ( ... )
+	{
+		// do nothing
+	}
+
+	// Special case: On export BEXT:version is always written as 1
+	try
+	{
+		if ( inXMP.GetProperty( kXMP_NS_BWF, "version", NULL, 0 ) )
+		{
+			outNativeMeta.setValue< XMP_Uns64 >( iXMLMetadata::kBWFVersion, 1 );
+		}
+		else
+		{
+			outNativeMeta.deleteValue( iXMLMetadata::kBWFVersion );
+		}
+	}
+	catch( ... )
+	{
+		// do nothing
+	}
+
+	// special case for xmpDM:startTimecode\xmpDM:timeFormat
+	try
+	{
+		if ( inXMP.GetStructField( kXMP_NS_DM, kDM_startTimecode, kXMP_NS_DM, kDM_timeFormat, &sXmpValue, 0 ) )
+		{
+			bool matchingValueFound = false;
+			const char * ixmlValueForTimeCodeRate = NULL;
+			const char * ixmlValueForTimeCodeFlag = NULL;
+			for ( size_t i = 0, total = sizeof(ixmlTimeCodeRateAndFlagMappings)/sizeof(iXMLTimeCodeRateAndFlagMapping); i < total; i++ )
+			{
+				if ( sXmpValue.compare( ixmlTimeCodeRateAndFlagMappings[i].xmpStringValue ) == 0 )
+				{
+					ixmlValueForTimeCodeRate = ixmlTimeCodeRateAndFlagMappings[i].ixmlTimeCodeRateValue;
+					ixmlValueForTimeCodeFlag = ixmlTimeCodeRateAndFlagMappings[i].ixmlTimeCodeFlagValue;
+					matchingValueFound = true;
+					deleteNativeEntry = false;
+					break;
+				}
+			}
+
+			if ( matchingValueFound )
+			{
+				outNativeMeta.setValue< std::string >( iXMLMetadata::kTimeCodeRate, ixmlValueForTimeCodeRate );
+				outNativeMeta.setValue< std::string >( iXMLMetadata::kTimeCodeFlag, ixmlValueForTimeCodeFlag );
+			}
+			else
+			{
+				deleteNativeEntry = true;
+			}
+		}
+		else
+		{
+			deleteNativeEntry = true;
+		}
+
+		if ( deleteNativeEntry )
+		{
+			if ( outNativeMeta.valueExists( iXMLMetadata::kTimeCodeRate ) )
+			{
+				std::string ixmlValueForTimecodeRate = outNativeMeta.getValue< std::string >( iXMLMetadata::kTimeCodeRate );
+				bool validValue = false;
+				for ( size_t i = 0, total = sizeof(ixmlTimeCodeRateAndFlagMappings)/sizeof(iXMLTimeCodeRateAndFlagMapping); i < total; i++ )
+				{
+					if ( ixmlValueForTimecodeRate.compare( ixmlTimeCodeRateAndFlagMappings[i].ixmlTimeCodeRateValue ) == 0 )
+					{
+						validValue = true;
+						break;
+					}
+				}
+				if ( validValue )
+				{
+					outNativeMeta.deleteValue( iXMLMetadata::kTimeCodeRate );
+					outNativeMeta.deleteValue( iXMLMetadata::kTimeCodeFlag );
+				}
+			}
+		}
+	}
+	catch( ... )
+	{
+		// do nothing
+	}
+
+	// special case for timeReference // bext:timeReference <-> iXML:BWF_TIME_REFERENCE_LOW and iXML:BWF_TIME_REFERENCE_HIGH
+	bool bextTimeReferenceDataAvailable = false;
+	XMP_Uns32 bextLowValue = 0;
+	XMP_Uns32 bextHighValue = 0;
+	bool timeCodeDataAvailable = false;
+	XMP_Uns32 tcLowValue = 0;
+	XMP_Uns32 tcHighValue = 0;
+
+	try
+	{
+		if ( inXMP.GetProperty_Int64( kXMP_NS_BWF, "timeReference", &iXMPValue, 0 ) )
+		{
+			bextTimeReferenceDataAvailable = true;
+			XMP_Uns64 uXmpValue = ( XMP_Uns64 )( iXMPValue );
+			bextLowValue = ( XMP_Uns32 ) uXmpValue;
+			bextHighValue = ( XMP_Uns32 ) ( uXmpValue >> 32 );
+		}
+	}
+	catch ( ... )
+	{
+		// do nothing
+	}
+
+#if 0 // reverse calculation from timecode to samples can result in different number of samples. So ignoring for time being
+	if ( outNativeMeta.valueExists( iXMLMetadata::kTimeStampSampleRate ) )
+	{
+		try
+		{
+			std::string timeFormat, timeValue;
+			if ( inXMP.GetStructField( kXMP_NS_DM, kDM_startTimecode, kXMP_NS_DM, kDM_timeValue, &timeValue, 0 ) &&
+				inXMP.GetStructField( kXMP_NS_DM, kDM_startTimecode, kXMP_NS_DM, kDM_timeFormat, &timeFormat, 0) )
+			{
+				XMP_Int64 nSamples;
+				if ( TimeConversionUtils::ConvertSMPTETimecodeToSamples( nSamples, timeValue,
+					outNativeMeta.getValue< XMP_Uns64 >( iXMLMetadata::kTimeStampSampleRate ), timeFormat ) )
+				{
+					timeCodeDataAvailable = true;
+					XMP_Uns64 uXmpValue = ( XMP_Uns64 )( nSamples );
+					tcLowValue = ( XMP_Uns32 ) uXmpValue;
+					tcHighValue = ( XMP_Uns32 ) ( uXmpValue >> 32 );
+				}
+				
+			}
+		}
+		catch ( ... )
+		{
+			// do nothing
+		}
+	}
+
+	if ( bextTimeReferenceDataAvailable && timeCodeDataAvailable )
+	{
+		// pick the one which is different, if both different pick the bext one
+		XMP_Uns64 
+	}
+	else if ( bextTimeReferenceDataAvailable )
+	{
+	}
+	else if ( timeCodeDataAvailable )
+	{
+	}
+	else  // none of the bextTimeReference and timeCode data is available
+	{
+		outNativeMeta.deleteValue( iXMLMetadata::kTimeStampSampleSinceMidnightHigh );
+		outNativeMeta.deleteValue( iXMLMetadata::kTimeStampSampleSinceMidnightLow );
+		outNativeMeta.deleteValue( iXMLMetadata::kBWFTimeReferenceHigh );
+		outNativeMeta.deleteValue( iXMLMetadata::kBWFTimeReferenceLow );
+	}
+#endif
+
+	if ( bextTimeReferenceDataAvailable ) {
+		outNativeMeta.setValue< XMP_Uns64 >( iXMLMetadata::kBWFTimeReferenceHigh, bextHighValue );
+		outNativeMeta.setValue< XMP_Uns64 >( iXMLMetadata::kBWFTimeReferenceLow, bextLowValue );
+		outNativeMeta.setValue< XMP_Uns64 >( iXMLMetadata::kTimeStampSampleSinceMidnightHigh, bextHighValue );
+		outNativeMeta.setValue< XMP_Uns64 >( iXMLMetadata::kTimeStampSampleSinceMidnightLow, bextLowValue );
+	} else {
+		outNativeMeta.deleteValue( iXMLMetadata::kTimeStampSampleSinceMidnightHigh );
+		outNativeMeta.deleteValue( iXMLMetadata::kTimeStampSampleSinceMidnightLow );
+		outNativeMeta.deleteValue( iXMLMetadata::kBWFTimeReferenceHigh );
+		outNativeMeta.deleteValue( iXMLMetadata::kBWFTimeReferenceLow );
+	}
+}
+
+bool IFF_RIFF::WAVEReconcile::exportSpecialiXMLToXMP( IMetadata & inNativeMeta, SXMPMeta & outXMP )
+{
+	bool changed = false;
+	// special case for AudioBitDepth // xmpDM:audioSampleType <-> iXML:AUDIO_BIT_DEPTH
+	if ( inNativeMeta.valueExists( iXMLMetadata::kAudioBitDepth ) ) {
+		XMP_Uns64 ixmlValue = inNativeMeta.getValue< XMP_Uns64 >( iXMLMetadata::kAudioBitDepth);
+		const char * xmpValue = NULL;
+		bool matchingValueFound = false;
+
+		for ( size_t i = 0, total = sizeof(ixmlAudioSampleTypeMappings)/sizeof(iXMLAudioSampleTypeMapping); i < total; i++ )
+		{
+			if ( ixmlAudioSampleTypeMappings[i].ixmlIntValue == ixmlValue )
+			{
+				xmpValue = ixmlAudioSampleTypeMappings[i].xmpStringValue;
+				matchingValueFound = true;
+				break;
+			}
+		}
+		if ( matchingValueFound )
+		{
+			outXMP.SetProperty( kXMP_NS_DM, kDM_audioSampleType, xmpValue );
+			changed = true;
+		}
+	}
+
+	// special case for timeReference // bext:timeReference <-> iXML:TIME_SAMPLES_SINCE_MIDNIGHT_LO and iXML:TIME_SAMPLES_SINCE_MIDNIGHT_HI
+	if ( inNativeMeta.valueExists( iXMLMetadata::kTimeStampSampleSinceMidnightHigh ) && inNativeMeta.valueExists( iXMLMetadata::kTimeStampSampleSinceMidnightLow ) ) {
+		XMP_Uns64 combinedValue = inNativeMeta.getValue< XMP_Uns64 >( iXMLMetadata::kTimeStampSampleSinceMidnightHigh );
+		combinedValue = combinedValue << 32;
+		combinedValue += inNativeMeta.getValue< XMP_Uns64 >( iXMLMetadata::kTimeStampSampleSinceMidnightLow );
+		std::string strValue;
+		SXMPUtils::ConvertFromInt64( combinedValue, "%llu", &strValue );
+		outXMP.SetProperty( kXMP_NS_BWF, "timeReference", strValue );
+		changed = true;
+	}
+
+	// special case for timeReference // bext:timeReference <-> iXML:BWF_TIME_REFERENCE_LOW and iXML:BWF_TIME_REFERENCE_HIGH
+	if ( inNativeMeta.valueExists( iXMLMetadata::kBWFTimeReferenceHigh ) && inNativeMeta.valueExists( iXMLMetadata::kBWFTimeReferenceLow ) ) {
+		XMP_Uns64 combinedValue = inNativeMeta.getValue< XMP_Uns64 >( iXMLMetadata::kBWFTimeReferenceHigh );
+		combinedValue = combinedValue << 32;
+		combinedValue += inNativeMeta.getValue< XMP_Uns64 >( iXMLMetadata::kBWFTimeReferenceLow );
+		std::string strValue;
+		SXMPUtils::ConvertFromInt64( combinedValue, "%llu", &strValue );
+		outXMP.SetProperty( kXMP_NS_BWF, "timeReference", strValue );
+		changed = true;
+	}
+
+	// special case for xmpDM:startTimecode\xmpDM:timeFormat
+	if ( inNativeMeta.valueExists( iXMLMetadata::kTimeCodeRate ) )
+	{
+		std::string ixmlTimecodeRateValue = inNativeMeta.getValue<std::string>( iXMLMetadata::kTimeCodeRate );
+		std::string ixmlTimecodeFlagValue = "NDF";
+		const char * xmpValue = NULL;
+		bool matchingValueFound = false;
+		if ( inNativeMeta.valueExists( iXMLMetadata::kTimeCodeFlag ) )
+		{
+			ixmlTimecodeFlagValue = inNativeMeta.getValue<std::string>( iXMLMetadata::kTimeCodeFlag );
+		}
+
+		for ( size_t i = 0, total = sizeof(ixmlTimeCodeRateAndFlagMappings)/sizeof(iXMLTimeCodeRateAndFlagMapping); i < total; i++ )
+		{
+			if ( ( ixmlTimecodeRateValue.compare(ixmlTimeCodeRateAndFlagMappings[i].ixmlTimeCodeRateValue) == 0 ) &&
+				 ( ixmlTimecodeFlagValue.compare(ixmlTimeCodeRateAndFlagMappings[i].ixmlTimeCodeFlagValue) == 0 ) )
+			{
+				xmpValue = ixmlTimeCodeRateAndFlagMappings[i].xmpStringValue;
+				matchingValueFound = true;
+				break;
+			}
+		}
+		if ( matchingValueFound )
+		{
+			outXMP.SetProperty( kXMP_NS_BWF, kDM_timeFormat, xmpValue );
+			changed = true;
+		}
+	}
+
+	return changed;
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h
new file mode 100644
index 0000000..7f0c2b8
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h
@@ -0,0 +1,72 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _WAVEReconcile_h_
+#define _WAVEReconcile_h_
+
+#include "XMPFiles/source/NativeMetadataSupport/IReconcile.h"
+
+class IMetadata;
+
+namespace IFF_RIFF
+{
+
+class INFOMetadata;
+class BEXTMetadata;
+
+class WAVEReconcile : public IReconcile
+{
+public:
+	~WAVEReconcile() {};
+
+	/** 
+	* @see IReconcile::importToXMP
+	* Legacy values are always imported.
+	* If the values are not UTF-8 they will be converted to UTF-8 except in ServerMode
+	*/
+	XMP_Bool importToXMP( SXMPMeta& outXMP, const MetadataSet& inMetaData );
+
+	/** 
+	* @see IReconcile::exportFromXMP
+	* XMP values are always exported to Legacy as UTF-8 encoded
+	*/
+	XMP_Bool exportFromXMP( MetadataSet& outMetaData, SXMPMeta& inXMP );
+
+private:
+	// Encode a string of raw data bytes into a HexString (w/o spaces, i.e. "DEADBEEF").
+	// Only used for UMID Bext field, which has fixed size of 64, so 64 chars are expected in the buffer!
+	// No insertation/acceptance of whitespace/linefeeds. No output/tolerance of lowercase.
+	// returns true, if *all* characters returned are zero (or if 0 bytes are returned).
+	static bool encodeToHexString ( const XMP_Uns8* input, std::string& output );
+
+	/**
+	 * Decode a hex string to raw data bytes.
+	 * Input must be all uppercase and w/o any whitespace, strictly (0-9A-Z)* (i.e. "DEADBEEF0099AABC")
+	 * No insertation/acceptance of whitespace/linefeeds.
+	 * bNo use/tolerance of lowercase.
+	 * Number of bytes in the encoded String must be even.
+	 * returns true if everything went well, false if illegal (non 0-9A-F) character encountered
+	 */
+	static bool decodeFromHexString ( std::string input, std::string &output);
+
+	/**
+	* convert a 4 character string to XPM_Uns32 (FOURCC)
+	*/
+	static bool stringToFOURCC ( std::string input, XMP_Uns32 &output );
+
+	// export all the properties requiring special conversion from inXMP into iXMLMetadata.
+	static void exportSpecialXMPToiXML( SXMPMeta & inXMP, IMetadata & outNativeMeta, PropertyList & propertiesToBeDeleted );
+
+	// export all the properties requiring special conversion from iXMLMetadata into inXMP.
+	static bool exportSpecialiXMLToXMP( IMetadata & inNativeMeta, SXMPMeta & outXMP );
+};
+
+}
+
+#endif
diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp
new file mode 100644
index 0000000..d6ea068
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp
@@ -0,0 +1,815 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2014 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h"
+#include "source/Endian.h"
+
+#include "source/ExpatAdapter.hpp"
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include <algorithm>
+
+namespace IFF_RIFF {
+
+	static const char * tagNames[ iXMLMetadata::kLastEntry ] = {
+		"TAPE",										//kTape,								// std::string
+		"TAKE",										//kTake,								// XMP_Uns64
+		"SCENE",									//kScene,								// std::string
+		"NOTE",										//kNote,								// std::string
+		"PROJECT",									//kProject,								// std::string
+		"NO_GOOD",									//kNoGood,								// bool( true/false )
+		"FILE_SAMPLE_RATE",							//kFileSampleRate,						// XMP_Uns64
+		"AUDIO_BIT_DEPTH",							//kAudioBitDepth,						// XMP_Uns64
+		"CIRCLED",									//kCircled,								// bool( true/false )
+		"BWF_DESCRIPTION",							//kBWFDescription,						// std::string( 256 )
+		"BWF_ORIGINATOR",							//kBWFOriginator,						// std::string( 32 )
+		"BWF_ORIGINATOR_REFERENCE",					//kBWFOriginatorReference,				// std::string( 32 )
+		"BWF_ORIGINATION_DATE",						//kBWFOriginationDate,					// std::string( 10 )
+		"BWF_ORIGINATION_TIME",						//kBWFOriginationTime,					// std::string( 8 )
+		"BWF_TIME_REFERENCE_LOW",					//kBWFTimeReferenceLow,					// XMP_Uns32
+		"BWF_TIME_REFERENCE_HIGH",					//kBWFTimeReferenceHigh,				// XMP_Uns32
+		"BWF_VERSION",								//kBWFVersion,							// XMP_Uns16
+		"BWF_UMID",									//kBWFUMID,								// std::string[64]
+		"BWF_CODING_HISTORY",						//kBWFHistory,							// std::string
+		"TIMECODE_FLAG",							//kTimeCodeFlag,						// std::string[DF/NDF]
+		"TIMECODE_RATE",							//kTimeCodeRate,						// std::string
+		"TIMESTAMP_SAMPLE_RATE",					//kTimeStampSampleRate,					// XMP_Uns64
+		"TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO",		//kTimeStampSampleSinceMidnightLow,		// XMP_Uns32
+		"TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_HI",		//kTimeStampSampleSinceMidnightHi,		// XMP_Uns32
+	};
+
+	static const char * rootTagName = "BWFXML";
+	static const char * speedTagName = "SPEED";
+	static const char * bextTagName = "BEXT";
+
+	iXMLMetadata::iXMLMetadata()
+		: mExpatAdapter( NULL )
+		, mRootNode( NULL )
+		, mErrorCallback( NULL )
+		, mExtraSpaceSize( 1024 ) {}
+
+	iXMLMetadata::~iXMLMetadata() {
+		if ( mExpatAdapter ) {
+			mRootNode = NULL;
+		}
+		delete mExpatAdapter;
+		delete mRootNode;
+		mExpatAdapter = NULL;
+	}
+
+#define MAX_SZ ((size_t)~((size_t)0))
+
+	void iXMLMetadata::parse( const XMP_Uns8 * chunkData, XMP_Uns64 size ) {
+		if ( chunkData == NULL || size == 0 ) {
+			XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: iXML chunk is not well formed" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			return;
+		}
+
+		mExpatAdapter = XMP_NewExpatAdapter ( ExpatAdapter::kUseLocalNamespaces );
+		if ( mExpatAdapter == 0 ) XMP_Throw ( "iXMLMetadata: Can't create Expat adapter", kXMPErr_NoMemory );
+		mExpatAdapter->SetErrorCallback( mErrorCallback );
+
+		try {
+			XMP_Uns64 parsedSize = 0;
+			while ( parsedSize < size ) {
+				XMP_Uns64 currentSize = std::min<XMP_Uns64>( size - parsedSize, MAX_SZ );
+				mExpatAdapter->ParseBuffer( chunkData + parsedSize, (size_t) currentSize, false );
+				parsedSize += currentSize;
+			}
+			mExpatAdapter->ParseBuffer( 0, 0, true );
+		} catch( ... ) {
+			XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: iXML chunk is not well formed" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			return;
+		}
+
+		// read the particular nodes we are interested in and store in the map
+		// Get the root node
+
+		// Get the root node of the XML tree.
+
+		XML_Node & xmlTree = mExpatAdapter->tree;
+
+		for ( size_t i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+			if ( xmlTree.content[i]->kind == kElemNode ) {
+				mRootNode = xmlTree.content[i];
+				break;
+			}
+		}
+
+		if ( mRootNode == NULL ) {
+			XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: No Root Element present in iXML chunk" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			return;
+		}
+
+		XMP_StringPtr rootLocalName = mRootNode->name.c_str() + mRootNode->nsPrefixLen;
+
+		if ( ! XMP_LitMatch ( rootLocalName, rootTagName ) ) {
+			XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: Unexpected Root Element present in iXML chunk" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			return;
+		}
+
+		XMP_StringPtr ns = mRootNode->ns.c_str();
+
+		XML_NodePtr currentNode( NULL );
+
+		ParseAndSetProperties();
+		resetChanges();
+	}
+
+	XMP_Uns64 iXMLMetadata::serialize( XMP_Uns8** buffer ) {
+		*buffer = NULL;
+		if ( mRootNode == NULL ) {
+			mRootNode = new XML_Node( NULL, rootTagName, kElemNode );
+			if ( mRootNode == NULL ) {
+				XMP_Error error( kXMPErr_NoMemory, "iXML Metadata reconciliation failure: Can't create Root Node" );
+				NotifyClient( kXMPErrSev_OperationFatal, error );
+				return 0;
+			}
+		}
+
+
+		// Create SPEED and bext node if required
+		XML_Node * node = mRootNode->GetNamedElement( "", speedTagName );
+		if ( node == NULL ) {
+			node = new XML_Node( mRootNode, speedTagName, kElemNode );
+			if ( node == NULL ) {
+				XMP_Error error( kXMPErr_NoMemory, "iXML Metadata reconciliation failure: Can't create Speed Node" );
+				NotifyClient( kXMPErrSev_OperationFatal, error );
+				return 0;
+			}
+			mRootNode->content.push_back( node );
+		}
+
+		node = mRootNode->GetNamedElement( "", bextTagName );
+		if ( node == NULL ) {
+			node = new XML_Node( mRootNode, bextTagName, kElemNode );
+			if ( node == NULL ) {
+				XMP_Error error( kXMPErr_NoMemory, "iXML Metadata reconciliation failure: Can't create Bext Node" );
+				NotifyClient( kXMPErrSev_OperationFatal, error );
+				return 0;
+			}
+			mRootNode->content.push_back( node );
+		}
+
+		UpdateProperties();
+
+		// get the SPEED and bext node and remove them if empty
+		if ( node->content.size() == 0 )
+			RemoveXMLNode( mRootNode, bextTagName );
+		node = mRootNode->GetNamedElement( "", speedTagName );
+		if ( node->content.size() == 0 )
+			RemoveXMLNode( mRootNode, speedTagName );
+		node = NULL;
+
+		std::string strBuffer;
+		mRootNode->Serialize( &strBuffer );
+
+		// move the contents of the string into the new bigger buffer
+		size_t newSize = strBuffer.size() + mExtraSpaceSize;
+		XMP_Uns8 * newBuffer = new XMP_Uns8[ newSize ];
+		memset( newBuffer, 0x20, newSize );
+		memcpy( newBuffer, "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>\n", 39 );
+		memcpy( newBuffer + 39, strBuffer.c_str(), strBuffer.size() );
+
+		*buffer = newBuffer;
+
+		return newSize;
+	}
+
+	bool iXMLMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj ) {
+		bool ret = true;
+
+		switch( id )
+		{
+		case kTape:
+		case kScene:
+		case kNote:
+		case kProject:
+		case kBWFDescription:
+		case kBWFOriginator:
+		case kBWFOriginatorReference:
+		case kBWFOriginationDate:
+		case kBWFOriginationTime:
+		case kBWFHistory:
+		case kBWFUMID:
+		case kTimeCodeFlag:
+		case kTimeCodeRate:
+			{
+				TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj);
+
+				ret = ( strObj == NULL || ( strObj != NULL && strObj->getValue().empty() ) );
+			}
+			break;
+
+		case kTake:
+		case kFileSampleRate:
+		case kAudioBitDepth:
+		case kBWFTimeReferenceLow:
+		case kBWFTimeReferenceHigh:
+		case kBWFVersion:
+		case kTimeStampSampleRate:
+		case kTimeStampSampleSinceMidnightLow:
+		case kTimeStampSampleSinceMidnightHigh:
+			ret = false;
+			break;
+
+		case kNoGood:
+		case kCircled:
+			ret = false;
+			break;
+
+		default:
+			ret = true;
+		}
+
+		return ret;
+	}
+
+	void iXMLMetadata::ParseAndSetStringProperty( XML_Node * parentNode, XMP_Uns32 id ) {
+		std::string nodeValue = ParseStringValue( parentNode, id );
+		if ( nodeValue.size() > 0 ) {
+			this->setValue< std::string >( id, nodeValue );
+		}
+	}
+
+	void iXMLMetadata::SetErrorCallback( GenericErrorCallback * errorCallback ) {
+		mErrorCallback = errorCallback;
+	}
+
+	void iXMLMetadata::NotifyClient( XMP_ErrorSeverity severity, XMP_Error & error ) {
+		XMPFileHandler::NotifyClient( mErrorCallback, severity, error );
+	}
+
+	static XMP_Uns64 ConvertStringToUns64( const std::string & strValue ) {
+		int count;
+		char nextCh;
+		XMP_Uns64 result;
+
+		count = sscanf ( strValue.c_str(), "%llu%c", &result, &nextCh );
+		if ( count != 1 ) XMP_Throw ( "Invalid integer string", kXMPErr_BadParam );
+
+		return result;
+	}
+
+	void iXMLMetadata::ParseAndSetIntegerProperty( XML_Node * parentNode, XMP_Uns32 id ) {
+		std::string strValue = ParseStringValue( parentNode, id );
+
+		if ( strValue.size() > 0 ) {
+			XMP_Uns64 uValue;
+			try {
+				uValue = ConvertStringToUns64( strValue );
+			} catch( ... ) {
+				// some nodes like tape can be non integer also. Treat it as warning
+				XMP_Error error( kXMPErr_BadFileFormat, "iXML Metadata reconciliation failure: node is supposed to have integer value" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+				return;
+			}
+			this->setValue< XMP_Uns64 >( id, uValue );
+		}
+	}
+
+	void iXMLMetadata::ParseAndSetBoolProperty( XML_Node * parentNode, XMP_Uns32 id ) {
+		std::string strValue = ParseStringValue( parentNode, id );
+		if ( strValue.size() > 0 ) {
+			if ( strValue.compare( "TRUE" ) == 0 )
+				this->setValue< bool >( id, true );
+			else if ( strValue.compare( "FALSE" ) == 0 )
+				this->setValue< bool >( id, false );
+			else {
+				XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: invalid boolean value present" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+			}
+		}
+	}
+
+	void iXMLMetadata::ParseAndSetProperties() {
+
+		// top level properties
+		ParseAndSetStringProperty( mRootNode, kTape );
+		ParseAndSetIntegerProperty( mRootNode, kTake );
+		ParseAndSetStringProperty( mRootNode, kScene );
+		ParseAndSetStringProperty( mRootNode, kNote );
+		ParseAndSetStringProperty( mRootNode, kProject );
+		ParseAndSetBoolProperty( mRootNode, kNoGood );
+		ParseAndSetBoolProperty( mRootNode, kCircled );
+
+		// speed node children
+		XML_Node * speedNode = mRootNode->GetNamedElement( "", speedTagName );
+		if ( speedNode ) {
+			ParseAndSetIntegerProperty( speedNode, kFileSampleRate );
+			ParseAndSetIntegerProperty( speedNode, kAudioBitDepth );
+			ParseAndSetStringProperty( speedNode, kTimeCodeFlag );
+			ParseAndSetStringProperty( speedNode, kTimeCodeRate );
+			ParseAndSetIntegerProperty( speedNode, kTimeStampSampleRate );
+			ParseAndSetIntegerProperty( speedNode, kTimeStampSampleSinceMidnightLow );
+			ParseAndSetIntegerProperty( speedNode, kTimeStampSampleSinceMidnightHigh );
+		}
+
+		// bext node children
+		XML_Node * bextNode = mRootNode->GetNamedElement( "", bextTagName );
+		if ( bextNode ) {
+			ParseAndSetStringProperty( bextNode, kBWFDescription );
+			ParseAndSetStringProperty( bextNode, kBWFOriginator );
+			ParseAndSetStringProperty( bextNode, kBWFOriginatorReference );
+			ParseAndSetStringProperty( bextNode, kBWFOriginationDate );
+			ParseAndSetStringProperty( bextNode, kBWFOriginationTime );
+			ParseAndSetIntegerProperty( bextNode, kBWFTimeReferenceLow );
+			ParseAndSetIntegerProperty( bextNode, kBWFTimeReferenceHigh );
+			ParseAndSetIntegerProperty( bextNode, kBWFVersion );
+			ParseAndSetStringProperty( bextNode, kBWFHistory );
+			ParseAndSetStringProperty( bextNode, kBWFUMID );
+		}
+	}
+
+	void iXMLMetadata::UpdateStringProperty( XML_Node * parentNode, XMP_Uns32 id ) {
+		if ( valueExists( id ) ) {
+			std::string value;
+			try {
+				 value = this->getValue< std::string >( id );
+			} catch ( ... ) {
+				XMP_Error e1( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected the value to be of string type" );
+				NotifyClient( kXMPErrSev_Recoverable, e1 );
+				return;
+			}
+			UpdateXMLNode( parentNode, tagNames[ id ], value );
+		} else {
+			RemoveXMLNode( parentNode, tagNames[ id ] );
+		}
+	}
+
+	void iXMLMetadata::UpdateXMLNode( XML_Node * parentNode, const char * localName, const std::string & value ) {
+		XML_Node * node = parentNode->GetNamedElement( "", localName );
+
+		if ( node == NULL ) {
+			node = new XML_Node( parentNode, localName, kElemNode );
+			if ( node == NULL ) {
+				XMP_Error error( kXMPErr_NoMemory, "Unable to create new objects" );
+				NotifyClient( kXMPErrSev_OperationFatal, error );
+				return;
+			}
+			parentNode->content.push_back( node );
+		}
+
+		if ( node->IsLeafContentNode() == false ) {
+			XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: node was supposed to be a leaf node" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			node->RemoveContent();
+		}
+		node->SetLeafContentValue( value.c_str() );
+	}
+
+	void iXMLMetadata::RemoveXMLNode( XML_Node * parentNode, const char * localName ) {
+		XML_Node * node = parentNode->GetNamedElement( "", localName );
+		if ( node ) {
+			// find the position
+			XML_NodeVector::iterator it = std::find( parentNode->content.begin(), parentNode->content.end(), node );
+			XMP_Assert( it != parentNode->content.end() );
+			parentNode->content.erase( it );
+			delete node;
+		}
+	}
+
+#if XMP_WinBuild
+	#define snprintf _snprintf
+#endif
+	static std::string ConvertUns64ToString( XMP_Uns64 uValue ) {
+		char buffer[64];
+
+		snprintf( buffer, sizeof( buffer ), "%llu", uValue );
+		std::string str( buffer );
+		return str;
+	}
+
+	void iXMLMetadata::UpdateIntegerProperty( XML_Node * parentNode, XMP_Uns32 id ) {
+		if ( valueExists( id ) ) {
+			XMP_Uns64 uValue;
+			try {
+				uValue = this->getValue< XMP_Uns64 >( id );
+			} catch ( ... ) {
+				XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected the value to be of XMP_Uns64 type" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+				return;
+			}
+			std::string strValue = ConvertUns64ToString( uValue );
+			UpdateXMLNode( parentNode, tagNames[ id ], strValue );
+		} else {
+			RemoveXMLNode( parentNode, tagNames[ id ] );
+		}
+	}
+
+	void iXMLMetadata::UpdateBoolProperty( XML_Node * parentNode, XMP_Uns32 id ) {
+		if ( valueExists( id ) ) {
+			bool value;
+
+			try {
+				value = this->getValue< bool >( id );
+			} catch ( ... ) {
+				XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected the value to be of bool type" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+				return;
+			}
+
+			std::string strValue;
+			if ( value ) strValue = "TRUE";
+			else strValue = "FALSE";
+
+			UpdateXMLNode( parentNode, tagNames[ id ], strValue );
+		} else {
+			RemoveXMLNode( parentNode, tagNames[ id ] );
+		}
+	}
+
+	void iXMLMetadata::UpdateProperties() {
+		// top level properties
+		UpdateStringProperty( mRootNode, kTape );
+		UpdateIntegerProperty( mRootNode, kTake );
+		UpdateStringProperty( mRootNode, kScene );
+		UpdateStringProperty( mRootNode, kNote );
+		UpdateStringProperty( mRootNode, kProject );
+		UpdateBoolProperty( mRootNode, kNoGood );
+		UpdateBoolProperty( mRootNode, kCircled );
+
+		// speed node children
+		XML_Node * speedNode = mRootNode->GetNamedElement( "", speedTagName );
+		if ( speedNode ) {
+			UpdateIntegerProperty( speedNode, kFileSampleRate );
+			UpdateIntegerProperty( speedNode, kAudioBitDepth );
+			UpdateStringProperty( speedNode, kTimeCodeFlag );
+			UpdateStringProperty( speedNode, kTimeCodeRate );
+			UpdateIntegerProperty( speedNode, kTimeStampSampleRate );
+			UpdateIntegerProperty( speedNode, kTimeStampSampleSinceMidnightLow );
+			UpdateIntegerProperty( speedNode, kTimeStampSampleSinceMidnightHigh );
+		}
+
+		// bext node children
+		XML_Node * bextNode = mRootNode->GetNamedElement( "", bextTagName );
+		if ( bextNode ) {
+			UpdateStringProperty( bextNode, kBWFDescription );
+			UpdateStringProperty( bextNode, kBWFOriginator );
+			UpdateStringProperty( bextNode, kBWFOriginatorReference );
+			UpdateStringProperty( bextNode, kBWFOriginationDate );
+			UpdateStringProperty( bextNode, kBWFOriginationTime );
+			UpdateIntegerProperty( bextNode, kBWFTimeReferenceLow );
+			UpdateIntegerProperty( bextNode, kBWFTimeReferenceHigh );
+			UpdateIntegerProperty( bextNode, kBWFVersion );
+			UpdateStringProperty( bextNode, kBWFHistory );
+			UpdateStringProperty( bextNode, kBWFUMID );
+		}
+
+	}
+
+	bool iXMLMetadata::valueValid( XMP_Uns32 id, ValueObject * valueObj ) {
+		switch( id ) {
+		case kTape:
+			return validateStringSize( valueObj );
+			break;
+
+		case kTake:
+			return validateInt( valueObj );
+			break;
+
+		case kScene:
+			return validateStringSize( valueObj );
+			break;
+			
+		case kNote:
+			return validateStringSize( valueObj );
+			break;
+
+		case kProject:
+			return validateStringSize( valueObj );
+			break;
+			
+		case kNoGood:
+			return validateBool( valueObj );
+			break;
+
+		case kFileSampleRate:
+			return validateInt( valueObj );
+			break;
+
+		case kAudioBitDepth:
+			return validateInt( valueObj );
+			break;
+
+		case kCircled:
+			return validateBool( valueObj );
+			break;
+
+		case kBWFDescription:
+		case kBWFOriginator:
+		case kBWFOriginatorReference:
+			// string length can be anything but while setting it will be trimmed.
+			return validateStringSize( valueObj );
+			break;
+
+		case kBWFOriginationDate:
+			return validateDate( valueObj );
+			break;
+
+		case kBWFOriginationTime:
+			return validateTime( valueObj );
+			break;
+
+		case kBWFTimeReferenceLow:
+		case kBWFTimeReferenceHigh:
+			return validateInt( valueObj, 0, Max_XMP_Uns32 );
+			break;
+
+		case kBWFVersion:
+			return validateInt( valueObj, 0, Max_XMP_Uns16 );
+			break;
+
+		case kBWFUMID:
+			return validateUMID( valueObj );
+			break;
+
+		case kBWFHistory:
+			return validateStringSize( valueObj );
+			break;
+
+		case kTimeCodeFlag:
+			return validateTimeCodeFlag( valueObj );
+			break;
+
+		case kTimeCodeRate:
+			return validateRational( valueObj );
+			break;
+
+		case kTimeStampSampleRate:
+			return validateInt( valueObj );
+			break;
+
+		case kTimeStampSampleSinceMidnightHigh:
+		case kTimeStampSampleSinceMidnightLow:
+			return validateInt( valueObj, 0, Max_XMP_Uns32 );
+			break;
+
+		default:
+			return false;
+			break;
+		}
+	}
+
+	void iXMLMetadata::valueModify( XMP_Uns32 id, ValueObject * value ) {
+		switch( id ) {
+		case kBWFDescription:
+			shortenString( value, 256 );
+			break;
+
+		case kBWFOriginator:
+			shortenString( value, 32 );
+			break;
+
+		case kBWFOriginatorReference:
+			shortenString( value, 32 );
+			break;
+
+		case kBWFUMID:
+			shortenString( value, 128 );
+			break;
+
+		default:
+			// do nothing
+			break;
+		}
+	}
+
+	bool iXMLMetadata::validateStringSize( ValueObject * value, size_t minSize /*= 1*/, size_t maxSize /*= std::string::npos */ ) {
+		TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(value);
+		if ( strObj ) {
+			const std::string * strPtr = &strObj->getValue();
+			size_t sizeOfString = strPtr->size();
+			if ( sizeOfString < minSize ) {
+				XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: length of string is less than expected" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+				return false;
+			} else if ( sizeOfString > maxSize ) {
+				XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: length of string is more than expected" );
+				NotifyClient( kXMPErrSev_Recoverable, error);
+				return false;
+			} else {
+				return true;
+			}
+		} else { // object is not of string type
+			XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected string value" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			return false;
+		}
+		return false;
+	}
+
+	bool iXMLMetadata::validateInt( ValueObject * value, XMP_Uns64 minValue /*= 0*/, XMP_Uns64 maxValue /*= Max_XMP_Uns64*/ ) {
+		TValueObject< XMP_Uns64 > * valuePtr = dynamic_cast< TValueObject< XMP_Uns64 > * > ( value );
+
+		if ( valuePtr ) {
+			XMP_Uns64 uValue = valuePtr->getValue();
+			if ( uValue < minValue ) {
+				XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: node integer value is less than allowed" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+				return false;
+			} else if ( uValue > maxValue ) {
+				XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: node integer value is more than allowed" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+				return false;
+			} else {
+				return true;
+			}
+		} else {
+			XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected XMP_Uns64 value" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			return false;
+		}
+	}
+
+	bool iXMLMetadata::validateBool( ValueObject * value ) {
+		// just check typecasts is possible or not
+		TValueObject< bool > * boolValuePtr = dynamic_cast< TValueObject< bool > * > ( value );
+		if ( boolValuePtr ) {
+			return true;
+		} else {
+			XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected bool value" );
+			NotifyClient( kXMPErrSev_Recoverable, error );
+			return false;
+		}
+	}
+
+	void iXMLMetadata::shortenString( ValueObject * value, size_t lengthOfString ) {
+		TValueObject< std::string > * strObj = dynamic_cast< TValueObject< std::string > * >( value );
+		if ( strObj ) {
+			const std::string * strPtr = &strObj->getValue();
+			size_t sizeOfString = strPtr->size();
+			if ( sizeOfString > lengthOfString ) {
+				std::string newString;
+				newString.append( *strPtr, 0, lengthOfString );
+				strObj->setValue( newString );
+			}
+		}
+	}
+
+	static bool charIsNumber( const char & ch ) {
+		if ( ch >= '0' && ch <= '9' )
+			return true;
+		else
+			return false;
+	}
+
+	bool iXMLMetadata::validateDate( ValueObject * value ) {
+		bool stringOK = validateStringSize( value, 10, 10 );
+		if ( stringOK ) {
+			TValueObject< std::string > * strObj = dynamic_cast< TValueObject< std::string > * >( value );
+			const std::string * strPtr = &strObj->getValue();
+			// check 0,1,2,3,5,6,8,9 elements are integer
+			for ( size_t i = 0; i < 10; i++ ) {
+				if ( i == 4 || i == 7 )
+					continue;
+				stringOK = charIsNumber( strPtr->operator[]( i ) );
+				if ( !stringOK ) {
+					XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected a number character" );
+					NotifyClient( kXMPErrSev_Recoverable, error );
+					return false;
+				}
+			}
+			return stringOK;
+		}
+		return false;
+	}
+
+	bool iXMLMetadata::validateTime( ValueObject * value ) {
+		bool stringOK = validateStringSize( value, 8, 8 );
+		if ( stringOK ) {
+			TValueObject< std::string > * strObj = dynamic_cast< TValueObject< std::string > * >( value );
+			const std::string * strPtr = &strObj->getValue();
+			// check 0,1,3,4,6,7 elements are integer
+			for ( size_t i = 0; i < 8; i++ ) {
+				if ( i == 2 || i == 5 )
+					continue;
+				stringOK = charIsNumber( strPtr->operator[]( i ) );
+				if ( !stringOK ) {
+					XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected a number character" );
+					NotifyClient( kXMPErrSev_Recoverable, error );
+					return false;
+				}
+			}
+			return stringOK;
+		}
+		return false;
+	}
+
+	static bool charIsHexDigit( const char & ch ) {
+		if ( charIsNumber( ch ) ) {
+			return true;
+		} else {
+			if ( ch >= 'A' && ch <= 'F' )
+				return true;
+			else if ( ch >= 'a' && ch <= 'f' )
+				return true;
+			else
+				return false;
+		}
+	}
+
+	bool iXMLMetadata::validateUMID( ValueObject * value ) {
+		bool stringOK = validateStringSize( value );
+		if ( stringOK ) {
+			// max size to consider is 128
+			TValueObject< std::string > * strObj = dynamic_cast< TValueObject< std::string > * >( value );
+			const std::string * strPtr = &strObj->getValue();
+			size_t effectiveLength = strPtr->size();
+			if ( effectiveLength > 128 )
+				effectiveLength = 128;
+
+			// first check length needs to even
+			if ( effectiveLength % 2 == 0 ) {
+				for ( size_t i = 0; i < effectiveLength; i++ ) {
+					stringOK = charIsHexDigit( strPtr->operator[]( i ) );
+					if ( !stringOK ) {
+						XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected a hex character" );
+						NotifyClient( kXMPErrSev_Recoverable, error );
+						return false;
+					}
+				}
+				return stringOK;
+			} else {
+				XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected the hex string length to be even" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+				return false;
+			}
+		}
+		return false;
+	}
+
+	std::string iXMLMetadata::ParseStringValue( XML_Node * parentNode, XMP_Uns32 id ) {
+		std::string nodeValue;
+		XML_Node * node = parentNode->GetNamedElement( "", tagNames[ id ] );
+		if ( node ) {
+			if ( node->IsLeafContentNode() && node->content.size() != 0 ) {
+				size_t lengthOfValue = node->content[0]->value.size();
+				if ( lengthOfValue > 0 ) {
+					nodeValue = node->content[0]->value;
+				}
+			} else {
+				XMP_Error error( kXMPErr_BadBlockFormat, "iXML Metadata reconciliation failure: node was supposed to be a leaf node" );
+				NotifyClient( kXMPErrSev_Recoverable, error );
+			}
+		}
+		return nodeValue;
+	}
+
+	bool iXMLMetadata::validateTimeCodeFlag( ValueObject * value ) {
+		bool returnValue = validateStringSize( value, 2, 3 );
+		if ( returnValue ) {
+			TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(value);
+			if ( strObj ) {
+				const std::string * strPtr = &strObj->getValue();
+				if ( strPtr->compare( "DF" ) == 0 )
+					return true;
+				else if ( strPtr->compare( "NDF" ) == 0 )
+					return true;
+			}
+		}
+		return false;
+	}
+
+	bool iXMLMetadata::validateRational( ValueObject * value ) {
+		bool returnValue = validateStringSize( value, 3 );
+		if ( returnValue ) {
+			TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(value);
+			if ( strObj ) {
+				const std::string * strPtr = &strObj->getValue();
+				size_t posOfSlash = strPtr->find( "/" );
+				if ( posOfSlash == std::string::npos || posOfSlash == strPtr->size() - 1 || posOfSlash == 0 ) {
+					XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: node value was supposed to be in a fractional format" );
+					NotifyClient( kXMPErrSev_Recoverable, error );
+					return false;
+				}
+
+				for ( size_t i = 0; i < strPtr->size(); i++ ) {
+					if ( i == posOfSlash )
+						continue;
+					returnValue = charIsNumber( strPtr->operator[]( i ) );
+					if ( ! returnValue ) {
+						XMP_Error error( kXMPErr_BadValue, "iXML Metadata reconciliation failure: expected a number character" );
+						NotifyClient( kXMPErrSev_Recoverable, error );
+						return false;
+					}
+				}
+				return returnValue;
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h
new file mode 100644
index 0000000..815fe85
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h
@@ -0,0 +1,157 @@
+#ifndef __iXMLMetadata_h__
+#define __iXMLMetadata_h__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2014 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+class ExpatAdapter;
+class XML_Node;
+
+namespace IFF_RIFF {
+
+	/**
+	*	iXML Metadata model.
+	*	Implements the IMetadata interface
+	*/
+	class iXMLMetadata : public IMetadata
+	{
+	public:
+		enum
+		{
+			kTape,								// std::string
+			kTake,								// XMP_Uns64
+			kScene,								// std::string
+			kNote,								// std::string
+			kProject,							// std::string
+			kNoGood,							// bool( true/false )
+			kFileSampleRate,					// XMP_Uns64
+			kAudioBitDepth,						// XMP_Uns64
+			kCircled,							// bool( true/false )
+			kBWFDescription,					// std::string
+			kBWFOriginator,						// std::string
+			kBWFOriginatorReference,			// std::string
+			kBWFOriginationDate,				// std::string
+			kBWFOriginationTime,				// std::string
+			kBWFTimeReferenceLow,				// XMP_Uns32
+			kBWFTimeReferenceHigh,				// XMP_Uns32
+			kBWFVersion,						// XMP_Uns16
+			kBWFUMID,							// std::string[64]
+			kBWFHistory,						// std::string
+			kTimeCodeFlag,						// std::string[DF/NDF]
+			kTimeCodeRate,						// std::string
+			kTimeStampSampleRate,				// XMP_Uns64
+			kTimeStampSampleSinceMidnightLow,	// XMP_Uns32
+			kTimeStampSampleSinceMidnightHigh,	// XMP_Uns32
+			kLastEntry
+		};
+
+	public:
+		/**
+		*ctor/dtor
+		*/
+		iXMLMetadata();
+		~iXMLMetadata();
+
+		/**
+		* Parses the given memory block and creates a data model representation
+		* The implementation expects that the memory block is the data area of
+		* the iXML chunk.
+		* Throws exceptions if parsing is not possible
+		*
+		* @param input		The byte buffer to parse
+		* @param size		Size of the given byte buffer
+		*/
+		void		parse( const XMP_Uns8* chunkData, XMP_Uns64 size );
+
+		/**
+		* See IMetadata::parse( const LFA_FileRef input )
+		*/
+		void		parse( XMP_IO* input ) { IMetadata::parse( input ); }
+
+		/**
+		* Serializes the data model to a memory block. 
+		* The memory block will be the data area of a iXML chunk.
+		* Throws exceptions if serializing is not possible
+		*
+		* @param buffer	Buffer that gets filled with serialized data
+		* @param size		Size of passed in buffer
+		*
+		* @return			Size of serialized data (might be smaller than buffer size)
+		*/
+		XMP_Uns64		serialize( XMP_Uns8** buffer );
+
+		void SetErrorCallback( GenericErrorCallback * errorCallback );
+
+		void SetExtraSpaceSize( size_t size ) { mExtraSpaceSize = size; }
+
+		size_t GetExtraSpaceSize() const { return mExtraSpaceSize; }
+
+	protected:
+		/**
+		* @see IMetadata::isEmptyValue
+		*/
+		virtual	bool isEmptyValue( XMP_Uns32 id, ValueObject& valueObj );
+
+		/**
+		 * @see iMetadata::valueValid
+		 */
+		virtual bool valueValid( XMP_Uns32 id, ValueObject * valueObj );
+
+		/**
+		 * @see IMetadata::valueModify
+		 */
+		virtual void valueModify( XMP_Uns32 id, ValueObject * value );
+
+		void ParseAndSetProperties();
+		void UpdateProperties();
+
+		std::string ParseStringValue( XML_Node * parentNode, XMP_Uns32 id );
+		void ParseAndSetStringProperty( XML_Node * parentNode, XMP_Uns32 id );
+		void ParseAndSetIntegerProperty( XML_Node * parentNode, XMP_Uns32 id );
+		void ParseAndSetBoolProperty( XML_Node * parentNode, XMP_Uns32 id );
+
+		void UpdateStringProperty( XML_Node * parentNode, XMP_Uns32 id );
+		void UpdateIntegerProperty( XML_Node * parentNode, XMP_Uns32 id );
+		void UpdateBoolProperty( XML_Node * parentNode, XMP_Uns32 id );
+
+		void UpdateXMLNode( XML_Node * parentNode, const char * localName, const std::string &  value );
+		void RemoveXMLNode( XML_Node * parentNode, const char * localName );
+
+		void NotifyClient( XMP_ErrorSeverity severity, XMP_Error & error );
+
+		bool validateStringSize( ValueObject * value, size_t minSize = 1, size_t maxSize = std::string::npos );
+		bool validateInt( ValueObject * value, XMP_Uns64 minValue = 0, XMP_Uns64 maxValue = Max_XMP_Uns64 );
+		bool validateBool( ValueObject * value );
+		void shortenString( ValueObject * value, size_t lengthOfString );
+		bool validateDate( ValueObject * value );
+		bool validateTime( ValueObject * value );
+		bool validateUMID( ValueObject * value );
+		bool validateTimeCodeFlag( ValueObject * value );
+		bool validateRational( ValueObject * value );
+
+	private:
+		// Operators hidden on purpose
+		iXMLMetadata( const iXMLMetadata& ) {};
+		iXMLMetadata& operator=( const iXMLMetadata& ) { return *this; };
+
+		ExpatAdapter *			mExpatAdapter;
+		XML_Node *				mRootNode;
+		GenericErrorCallback *	mErrorCallback;
+		size_t					mExtraSpaceSize;
+	};
+
+}
+
+#endif  // __iXMLMetadata_h__
diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
new file mode 100644
index 0000000..ffaf220
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
@@ -0,0 +1,275 @@
+#include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "XMPFiles/source/FileHandlers/WEBP_Handler.hpp"
+#include "XMPFiles/source/FormatSupport/WEBP_Support.hpp"
+
+#include <stdexcept> // std::out_of_range
+#include <vector>
+
+using namespace WEBP;
+
+namespace WEBP {
+
+// Constructor for reading an existing chunk
+Chunk::Chunk(Container* parent, WEBP_MetaHandler* handler)
+{
+    this->needsRewrite = (parent) ? parent->needsRewrite : false;
+    this->parent = parent;
+
+    XMP_IO* file = handler->parent->ioRef;
+    this->pos = file->Offset();
+
+    this->tag = XIO::ReadUns32_LE(file);
+
+    this->size = XIO::ReadUns32_LE(file);
+
+    // Make sure the size is within expected bounds.
+    if ((this->pos + this->size + 8) > handler->initialFileSize) {
+        XMP_Throw("Bad RIFF chunk size", kXMPErr_BadFileFormat);
+    }
+
+    this->data.reserve((XMP_Int32) this->size);
+    this->data.assign((XMP_Int32) this->size, '\0');
+    file->ReadAll((void*)this->data.data(), (XMP_Int32) this->size);
+
+    // Account for padding
+    if (this->size & 1) {
+        file->Seek(1, kXMP_SeekFromCurrent);
+    }
+}
+
+// Constructor for creating a new chunk
+Chunk::Chunk(Container* parent, XMP_Uns32 tag)
+  : parent(parent), tag(tag)
+{
+    this->needsRewrite = true;
+}
+
+void Chunk::write(WEBP_MetaHandler* handler)
+{
+    XMP_IO* file = handler->parent->ioRef;
+    if (this->needsRewrite) {
+        this->pos = file->Offset();
+        XIO::WriteUns32_LE(file, this->tag);
+        XIO::WriteUns32_LE(file, (XMP_Uns32) this->size);
+        file->Write(this->data.data(), (XMP_Int32) this->size);
+    }
+    else {
+        file->Seek(this->pos + this->size + 8, kXMP_SeekFromStart);
+    }
+    if (this->size & 1) {
+        const XMP_Uns8 zero = 0;
+        file->Write(&zero, 1);
+    }
+}
+
+Chunk::~Chunk()
+{
+    // Do nothing
+}
+
+XMPChunk::XMPChunk(Container* parent)
+  : Chunk(parent, kChunk_XMP_)
+{
+    this->size = 0;
+}
+
+XMPChunk::XMPChunk(Container* parent, WEBP_MetaHandler* handler)
+  : Chunk(parent, handler)
+{
+    handler->packetInfo.offset = this->pos + 8;
+    handler->packetInfo.length = (XMP_Int32) this->data.size();
+
+    handler->xmpPacket.reserve(handler->packetInfo.length);
+    handler->xmpPacket.assign(handler->packetInfo.length, '\0');
+    handler->xmpPacket.insert(handler->xmpPacket.begin(), this->data.begin(),
+                              this->data.end());
+
+    handler->containsXMP = true; // last, after all possible failure
+
+    // pointer for later processing
+    handler->xmpChunk = this;
+}
+
+void XMPChunk::write(WEBP_MetaHandler* handler)
+{
+    XMP_IO* file = handler->parent->ioRef;
+    this->size = handler->xmpPacket.size();
+    XIO::WriteUns32_LE(file, this->tag);
+    XIO::WriteUns32_LE(file, (XMP_Uns32) this->size);
+    file->Write(handler->xmpPacket.data(), (XMP_Int32) this->size);
+    if (this->size & 1) {
+        const XMP_Uns8 zero = 0;
+        file->Write(&zero, 1);
+    }
+}
+
+VP8XChunk::VP8XChunk(Container* parent)
+  : Chunk(parent, kChunk_VP8X)
+{
+    this->needsRewrite = true;
+    this->size = 10;
+    this->data.resize(this->size);
+    this->data.assign(this->size, 0);
+    XMP_Uns8* bitstream =
+        (XMP_Uns8*)parent->chunks[WEBP_CHUNK_IMAGE][0]->data.data();
+    // See bug https://bugs.freedesktop.org/show_bug.cgi?id=105247
+    // bitstream could be NULL.
+    XMP_Uns32 width = bitstream ? ((bitstream[7] << 8) | bitstream[6]) & 0x3fff : 0;
+    XMP_Uns32 height = bitstream ? ((bitstream[9] << 8) | bitstream[8]) & 0x3fff : 0;
+    this->width(width);
+    this->height(height);
+    parent->vp8x = this;
+}
+
+VP8XChunk::VP8XChunk(Container* parent, WEBP_MetaHandler* handler)
+  : Chunk(parent, handler)
+{
+    this->size = 10;
+    this->needsRewrite = true;
+    parent->vp8x = this;
+}
+
+XMP_Uns32 VP8XChunk::width()
+{
+    return GetLE24(&this->data[4]) + 1;
+}
+void VP8XChunk::width(XMP_Uns32 val)
+{
+    PutLE24(&this->data[4], val > 0 ? val - 1 : 0);
+}
+XMP_Uns32 VP8XChunk::height()
+{
+    return GetLE24(&this->data[7]) + 1;
+}
+void VP8XChunk::height(XMP_Uns32 val)
+{
+    PutLE24(&this->data[7], val > 0 ? val - 1 : 0);
+}
+bool VP8XChunk::xmp()
+{
+    XMP_Uns32 flags = GetLE32(&this->data[0]);
+    return (bool)((flags >> XMP_FLAG_BIT) & 1);
+}
+void VP8XChunk::xmp(bool hasXMP)
+{
+    XMP_Uns32 flags = GetLE32(&this->data[0]);
+    flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
+    PutLE32(&this->data[0], flags);
+}
+
+Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
+{
+    this->needsRewrite = false;
+
+    XMP_IO* file = handler->parent->ioRef;
+
+    file->Seek(12, kXMP_SeekFromStart);
+
+    XMP_Int64 size = handler->initialFileSize;
+
+    XMP_Uns32 peek = 0;
+
+    while (file->Offset() < size) {
+        peek = XIO::PeekUns32_LE(file);
+        switch (peek) {
+        case kChunk_XMP_:
+            this->addChunk(new XMPChunk(this, handler));
+            break;
+        case kChunk_VP8X:
+            this->addChunk(new VP8XChunk(this, handler));
+            break;
+        default:
+            this->addChunk(new Chunk(this, handler));
+            break;
+        }
+    }
+
+    if (this->chunks[WEBP_CHUNK_IMAGE].size() == 0) {
+        XMP_Throw("File has no image bitstream", kXMPErr_BadFileFormat);
+    }
+
+    if (this->chunks[WEBP_CHUNK_VP8X].size() == 0) {
+        // The file is either in Lossy or Lossless Simple File Format.
+        // For simplicity we will always convert it to the Extended File Format.
+        this->needsRewrite = true;
+        this->addChunk(new VP8XChunk(this));
+    }
+
+    if (this->chunks[WEBP_CHUNK_XMP].size() == 0) {
+        XMPChunk* xmpChunk = new XMPChunk(this);
+        this->addChunk(xmpChunk);
+        handler->xmpChunk = xmpChunk;
+        this->vp8x->xmp(true);
+    }
+}
+
+Chunk* Container::getExifChunk()
+{
+    if (this->chunks[WEBP::WEBP_CHUNK_EXIF].size() == 0) {
+        return NULL;
+    }
+    return this->chunks[WEBP::WEBP_CHUNK_EXIF][0];
+}
+
+void Container::addChunk(Chunk* chunk)
+{
+    ChunkId idx;
+
+    try {
+        idx = chunkMap.at(chunk->tag);
+    }
+    catch (const std::out_of_range& e) {
+        idx = WEBP_CHUNK_UNKNOWN;
+    }
+    this->chunks[idx].push_back(chunk);
+}
+
+void Container::write(WEBP_MetaHandler* handler)
+{
+    XMP_IO* file = handler->parent->ioRef;
+    file->Rewind();
+    XIO::WriteUns32_LE(file, this->tag);
+    XIO::WriteUns32_LE(file, (XMP_Uns32) this->size);
+    XIO::WriteUns32_LE(file, kChunk_WEBP);
+
+    size_t i, j;
+    std::vector<Chunk*> chunkVect;
+    for (i = 0; i < WEBP_CHUNK_NIL; i++) {
+        chunkVect = this->chunks[i];
+        for (j = 0; j < chunkVect.size(); j++) {
+            chunkVect.at(j)->write(handler);
+        }
+    }
+    XMP_Int64 lastOffset = file->Offset();
+    this->size = lastOffset - 8;
+    file->Seek(this->pos + 4, kXMP_SeekFromStart);
+    XIO::WriteUns32_LE(file, (XMP_Uns32) this->size);
+    file->Seek(lastOffset, kXMP_SeekFromStart);
+    if (lastOffset < handler->initialFileSize) {
+        file->Truncate(lastOffset);
+    }
+}
+
+Container::~Container()
+{
+    Chunk* chunk;
+    size_t i;
+    std::vector<Chunk*> chunkVect;
+    for (i = 0; i < WEBP_CHUNK_NIL; i++) {
+        chunkVect = this->chunks[i];
+        while (!chunkVect.empty()) {
+            chunk = chunkVect.back();
+            delete chunk;
+            chunkVect.pop_back();
+        }
+    }
+}
+}
diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.hpp b/XMPFiles/source/FormatSupport/WEBP_Support.hpp
new file mode 100644
index 0000000..aebe781
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/WEBP_Support.hpp
@@ -0,0 +1,174 @@
+#ifndef __WEBP_Support_hpp__
+#define __WEBP_Support_hpp__ 1
+
+#include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/Endian.h"
+#include "source/XMPFiles_IO.hpp"
+
+#include <array>
+#include <map>
+#include <vector>
+
+// forward declaration:
+class WEBP_MetaHandler;
+
+namespace WEBP {
+
+// Read 16, 24 or 32 bits stored in little-endian order.
+//
+// The inline functions provided in EndianUtils.hpp and XIO.hpp operate on
+// pointers to XMP_Uns32, and then flip the bytes if the desired endianness
+// differs from the host's. It seems to me that it is much simpler to read
+// the data into XMP_Uns8 (i.e. unsigned char) arrays and just use shift
+// operators (which operate on values rather than their representation
+// in memory) to convert between values and the bytes read from or written to
+// a file in a platform-independent way. And besides, WEBP stores dimensions
+// in 24 bit LE, and converting that to and from a 32 bit pointer, having to
+// account for the platform's endianness, would be a nightmare.
+static inline XMP_Uns32 GetLE16(const XMP_Uns8* const data)
+{
+    return (XMP_Uns32)(data[0] << 0) | (data[1] << 8);
+}
+
+static inline XMP_Uns32 GetLE24(const XMP_Uns8* const data)
+{
+    return GetLE16(data) | (data[2] << 16);
+}
+
+static inline XMP_Uns32 GetLE32(const XMP_Uns8* const data)
+{
+    return (XMP_Uns32)GetLE16(data) | (GetLE16(data + 2) << 16);
+}
+
+// Store 16, 24 or 32 bits in little-endian order.
+static inline void PutLE16(XMP_Uns8* const data, XMP_Uns32 val)
+{
+    assert(val < (1 << 16));
+    data[0] = (val >> 0);
+    data[1] = (val >> 8);
+}
+
+static inline void PutLE24(XMP_Uns8* const buf, XMP_Uns32 val)
+{
+    assert(val < (1 << 24));
+    PutLE16(buf, val & 0xffff);
+    buf[2] = (val >> 16);
+}
+
+static inline void PutLE32(XMP_Uns8* const data, XMP_Uns32 val)
+{
+    PutLE16(data, (XMP_Uns32)(val & 0xffff));
+    PutLE16(data + 2, (XMP_Uns32)(val >> 16));
+}
+
+#define WEBP_MKFOURCC(a, b, c, d)                                              \
+    ((XMP_Uns32)(a) | (b) << 8 | (c) << 16 | (d) << 24)
+
+// VP8X Feature Flags.
+typedef enum FeatureFlagBits {
+    FRAGMENTS_FLAG_BIT, // Experimental, not enabled by default
+    ANIMATION_FLAG_BIT,
+    XMP_FLAG_BIT,
+    EXIF_FLAG_BIT,
+    ALPHA_FLAG_BIT,
+    ICCP_FLAG_BIT
+} FeatureFlagBits;
+
+typedef enum ChunkId {
+    WEBP_CHUNK_VP8X,    // VP8X
+    WEBP_CHUNK_ICCP,    // ICCP
+    WEBP_CHUNK_ANIM,    // ANIM
+    WEBP_CHUNK_ANMF,    // ANMF
+    WEBP_CHUNK_FRGM,    // FRGM
+    WEBP_CHUNK_ALPHA,   // ALPH
+    WEBP_CHUNK_IMAGE,   // VP8/VP8L
+    WEBP_CHUNK_EXIF,    // EXIF
+    WEBP_CHUNK_XMP,     // XMP
+    WEBP_CHUNK_UNKNOWN, // Other chunks.
+    WEBP_CHUNK_NIL
+} ChunkId;
+
+const XMP_Uns32 kChunk_RIFF = WEBP_MKFOURCC('R', 'I', 'F', 'F');
+const XMP_Uns32 kChunk_WEBP = WEBP_MKFOURCC('W', 'E', 'B', 'P');
+const XMP_Uns32 kChunk_VP8_ = WEBP_MKFOURCC('V', 'P', '8', ' ');
+const XMP_Uns32 kChunk_VP8L = WEBP_MKFOURCC('V', 'P', '8', 'L');
+const XMP_Uns32 kChunk_VP8X = WEBP_MKFOURCC('V', 'P', '8', 'X');
+const XMP_Uns32 kChunk_XMP_ = WEBP_MKFOURCC('X', 'M', 'P', ' ');
+const XMP_Uns32 kChunk_ANIM = WEBP_MKFOURCC('A', 'N', 'I', 'M');
+const XMP_Uns32 kChunk_ICCP = WEBP_MKFOURCC('I', 'C', 'C', 'P');
+const XMP_Uns32 kChunk_EXIF = WEBP_MKFOURCC('E', 'X', 'I', 'F');
+const XMP_Uns32 kChunk_ANMF = WEBP_MKFOURCC('A', 'N', 'M', 'F');
+const XMP_Uns32 kChunk_FRGM = WEBP_MKFOURCC('F', 'R', 'G', 'M');
+const XMP_Uns32 kChunk_ALPH = WEBP_MKFOURCC('A', 'L', 'P', 'H');
+
+static std::map<XMP_Uns32, ChunkId> chunkMap = {
+    { kChunk_VP8X, WEBP_CHUNK_VP8X },  { kChunk_ICCP, WEBP_CHUNK_ICCP },
+    { kChunk_ANIM, WEBP_CHUNK_ANIM },  { kChunk_ANMF, WEBP_CHUNK_ANMF },
+    { kChunk_FRGM, WEBP_CHUNK_FRGM },  { kChunk_ALPH, WEBP_CHUNK_ALPHA },
+    { kChunk_VP8_, WEBP_CHUNK_IMAGE }, { kChunk_VP8L, WEBP_CHUNK_IMAGE },
+    { kChunk_EXIF, WEBP_CHUNK_EXIF },  { kChunk_XMP_, WEBP_CHUNK_XMP }
+};
+
+class Container;
+
+class Chunk {
+public:
+    Chunk(Container* parent, WEBP_MetaHandler* handler);
+    Chunk(Container* parent, XMP_Uns32 tag);
+    virtual ~Chunk();
+
+    virtual void write(WEBP_MetaHandler* handler);
+
+    Container* parent;
+    XMP_Uns32 tag;
+    RawDataBlock data;
+    XMP_Int64 pos;
+    XMP_Int64 size;
+    bool needsRewrite;
+};
+
+class XMPChunk
+  : public Chunk {
+public:
+    XMPChunk(Container* parent, WEBP_MetaHandler* handler);
+    XMPChunk(Container* parent);
+    void write(WEBP_MetaHandler* handler);
+};
+
+class VP8XChunk
+  : public Chunk {
+public:
+    VP8XChunk(Container* parent, WEBP_MetaHandler* handler);
+    VP8XChunk(Container* parent);
+    bool xmp();
+    void xmp(bool);
+    XMP_Uns32 width();
+    XMP_Uns32 height();
+    void width(XMP_Uns32);
+    void height(XMP_Uns32);
+};
+
+typedef std::array<std::vector<Chunk*>, WEBP_CHUNK_NIL> Chunks;
+
+class Container
+  : public Chunk {
+public:
+    Container(WEBP_MetaHandler* handler);
+    ~Container();
+
+    void write(WEBP_MetaHandler* handler);
+    void addChunk(Chunk*);
+    Chunk* getExifChunk();
+
+    Chunks chunks;
+    VP8XChunk* vp8x;
+};
+
+} // namespace WEBP
+
+#endif // __WEBP_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/XDCAM_Support.cpp b/XMPFiles/source/FormatSupport/XDCAM_Support.cpp
new file mode 100644
index 0000000..cb65bf0
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/XDCAM_Support.cpp
@@ -0,0 +1,486 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/FormatSupport/XDCAM_Support.hpp"
+
+// =================================================================================================
+/// \file XDCAM_Support.cpp
+///
+// =================================================================================================
+
+// =================================================================================================
+// CreateChildElement
+// ==================
+
+static XML_Node * CreateChildElement ( XML_Node * parent,
+									   XMP_StringPtr localName,
+									   XMP_StringPtr legacyNS,
+									   int indent /* = 0 */ )
+{
+	XML_Node * wsNode;
+	XML_Node * childNode = parent->GetNamedElement ( legacyNS, localName );
+	
+	if ( childNode == 0 ) {
+	
+		// The indenting is a hack, assuming existing 2 spaces per level.
+		
+		wsNode = new XML_Node ( parent, "", kCDataNode );
+		wsNode->value = "  ";	// Add 2 spaces to the existing WS before the parent's close tag.
+		parent->content.push_back ( wsNode );
+
+		childNode = new XML_Node ( parent, localName, kElemNode );
+		childNode->ns = parent->ns;
+		childNode->nsPrefixLen = parent->nsPrefixLen;
+		childNode->name.insert ( 0, parent->name, 0, parent->nsPrefixLen );
+		parent->content.push_back ( childNode );
+
+		wsNode = new XML_Node ( parent, "", kCDataNode );
+		wsNode->value = '\n';
+		for ( ; indent > 1; --indent ) wsNode->value += "  ";	// Indent less 1, to "outdent" the parent's close.
+		parent->content.push_back ( wsNode );
+
+	}
+	
+	return childNode;
+	
+}	// CreateChildElement
+
+// =================================================================================================
+// GetTimeScale
+// ============
+
+static std::string GetTimeScale ( XMP_StringPtr formatFPS )
+{
+	std::string timeScale;
+	
+	if ( XMP_LitNMatch ( "25p", formatFPS, 3 ) || XMP_LitNMatch ( "50i", formatFPS, 3 ) ) {
+		timeScale = "1/25";
+	} else if ( XMP_LitNMatch ( "50p", formatFPS, 3 ) ) {
+		timeScale = "1/50";
+	} else if ( XMP_LitNMatch ( "23.98p", formatFPS, 6 ) ) {
+		timeScale = "1001/24000";
+	} else if ( XMP_LitNMatch ( "29.97p", formatFPS, 6 ) || XMP_LitNMatch( "59.94i", formatFPS, 6 ) ) {
+		timeScale = "1001/30000";
+	} else if ( XMP_LitNMatch ( "59.94p", formatFPS, 6 ) ) {
+		timeScale = "1001/60000";
+	}
+						
+	return timeScale;
+
+}	// GetTimeScale
+
+// =================================================================================================
+// XDCAM_Support::GetMediaProLegacyMetadata
+// ========================================
+
+bool XDCAM_Support::GetMediaProLegacyMetadata ( SXMPMeta * xmpObjPtr,
+												const std::string&	clipUMID,
+												const std::string& mediaProPath,
+												bool digestFound)
+{
+	// NOTE: The logic of the form "if ( digestFound || (! XMP-prop-exists) ) Set-XMP-prop" might
+	// look odd at first, especially the digestFound part. This is OK though. If there is no digest
+	// then we want to preserve existing XMP. The handlers do not call this routine if the digest is
+	// present and matched, so here digestFound really means "found and differs".
+
+	bool containsXMP = false;
+	
+	Host_IO::FileRef hostRef = Host_IO::Open ( mediaProPath.c_str(), Host_IO::openReadOnly );
+	if ( hostRef == Host_IO::noFileRef ) return false;	// The open failed.
+	XMPFiles_IO xmlFile ( hostRef, mediaProPath.c_str(), Host_IO::openReadOnly );
+
+	ExpatAdapter * expat = XMP_NewExpatAdapter ( ExpatAdapter::kUseLocalNamespaces );
+	if ( expat == 0 ) return false;
+	
+	#define CleanupAndExit	\
+		{ if ( expat != 0 ) delete expat; return containsXMP; }
+		
+	XML_NodePtr mediaproRootElem = 0;
+	XML_NodePtr contentContext = 0, materialContext = 0;
+	
+	XMP_Uns8 buffer [64*1024];
+	while ( true ) {
+		XMP_Int32 ioCount = xmlFile.Read ( buffer, sizeof(buffer) );
+		if ( ioCount == 0 ) break;
+		expat->ParseBuffer ( buffer, ioCount, false /* not the end */ );
+	}
+	expat->ParseBuffer ( 0, 0, true );	// End the parse.
+	xmlFile.Close();
+	
+	// Get the root node of the XML tree.
+
+	XML_Node & mediaproXMLTree = expat->tree;
+	for ( size_t i = 0, limit = mediaproXMLTree.content.size(); i < limit; ++i ) {
+		if ( mediaproXMLTree.content[i]->kind == kElemNode ) {
+			mediaproRootElem = mediaproXMLTree.content[i];
+		}
+	}
+
+	if ( mediaproRootElem == 0 ) CleanupAndExit
+	XMP_StringPtr rlName = mediaproRootElem->name.c_str() + mediaproRootElem->nsPrefixLen;
+	if ( ! XMP_LitMatch ( rlName, "MediaProfile" ) ) CleanupAndExit
+	
+	//  MediaProfile, Contents
+
+	XMP_StringPtr ns = mediaproRootElem->ns.c_str();
+	contentContext = mediaproRootElem->GetNamedElement ( ns, "Contents" );
+
+	if ( contentContext != 0 ) {
+
+		size_t numMaterialElems = contentContext->CountNamedElements ( ns, "Material" );
+		
+		// Iterate over the Material tags, looking for one that has a matching umid.
+		for ( size_t i = 0; i < numMaterialElems; ++i ) {
+
+			XML_NodePtr materialElement = contentContext->GetNamedElement ( ns, "Material", i );
+			XMP_Assert ( materialElement != 0 );
+
+			XMP_StringPtr umid = materialElement->GetAttrValue ( "umid" );
+			
+			// Found one that matches the input umid, gather what metadata we can and break.
+			if ( (umid != 0) && (umid == clipUMID) ) {
+			
+				// title
+				XMP_StringPtr title = materialElement->GetAttrValue ( "title" );
+				if ( title != 0 ) {
+					if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DC, "title" )) ) {
+						xmpObjPtr->SetLocalizedText ( kXMP_NS_DC, "title", "", "x-default", title, kXMP_DeleteExisting );
+						containsXMP = true;
+					}
+				}
+				
+				break;
+
+			}
+		}
+
+	}
+
+	CleanupAndExit
+	#undef CleanupAndExit
+
+}	// XDCAM_Support::GetMediaProLegacyMetadata
+
+// =================================================================================================
+// XDCAM_Support::GetLegacyMetadata
+// ================================
+
+bool XDCAM_Support::GetLegacyMetadata ( SXMPMeta *		xmpObjPtr,
+										XML_NodePtr	    rootElem,
+										XMP_StringPtr	legacyNS,
+										bool			digestFound,
+										std::string&	umid )
+{
+	// NOTE: The logic of the form "if ( digestFound || (! XMP-prop-exists) ) Set-XMP-prop" might
+	// look odd at first, especially the digestFound part. This is OK though. If there is no digest
+	// then we want to preserve existing XMP. The handlers do not call this routine if the digest is
+	// present and matched, so here digestFound really means "found and differs".
+
+	bool containsXMP = false;
+	
+	XML_NodePtr legacyContext = 0, legacyProp = 0;
+	XMP_StringPtr formatFPS = 0;
+	
+	// UMID
+	if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DC, "identifier" )) ) {
+		legacyProp = rootElem->GetNamedElement ( legacyNS, "TargetMaterial" );
+		if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+			XMP_StringPtr legacyValue = legacyProp->GetAttrValue ( "umidRef" );
+			if ( legacyValue != 0 ) {
+				umid = legacyValue;
+				xmpObjPtr->SetProperty ( kXMP_NS_DC, "identifier", legacyValue, kXMP_DeleteExisting );
+				containsXMP = true;
+			}
+		}
+	}
+
+	// Title
+	if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DC, "title" )) ) {
+		legacyProp = rootElem->GetNamedElement ( legacyNS, "Title" );
+		if ( legacyProp != 0 )  {
+			XMP_StringPtr legacyValue = legacyProp->GetAttrValue ( "usAscii" );
+			if ( legacyValue != 0 ) {
+				xmpObjPtr->SetLocalizedText ( kXMP_NS_DC, "title", "", "x-default", legacyValue, kXMP_DeleteExisting );
+				containsXMP = true;
+			}
+		}
+	}
+
+	// Creation date
+	if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_XMP, "CreateDate" )) ) {
+		legacyProp = rootElem->GetNamedElement ( legacyNS, "CreationDate" );
+		if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+			XMP_StringPtr legacyValue = legacyProp->GetAttrValue ( "value" );
+			if ( legacyValue != 0 ) {
+				xmpObjPtr->SetProperty ( kXMP_NS_XMP, "CreateDate", legacyValue, kXMP_DeleteExisting );
+				containsXMP = true;
+			}
+		}
+	}
+
+	// Modify Date
+	if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_XMP, "ModifyDate" )) ) {
+		legacyProp = rootElem->GetNamedElement ( legacyNS, "LastUpdate" );
+		if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+			XMP_StringPtr legacyValue = legacyProp->GetAttrValue ( "value" );
+			if ( legacyValue != 0 ) {
+				xmpObjPtr->SetProperty ( kXMP_NS_XMP, "ModifyDate", legacyValue, kXMP_DeleteExisting );
+				containsXMP = true;
+			}
+		}
+	}
+
+	// Metadata Modify Date
+	if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_XMP, "MetadataDate" )) ) {
+		legacyProp = rootElem->GetNamedElement ( legacyNS, "lastUpdate" );
+		if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+			XMP_StringPtr legacyValue = legacyProp->GetAttrValue ( "value" );
+			if ( legacyValue != 0 ) {
+				xmpObjPtr->SetProperty ( kXMP_NS_XMP, "MetadataDate", legacyValue, kXMP_DeleteExisting );
+				containsXMP = true;
+			}
+		}
+	}
+
+	// Description
+	if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DC, "description" )) ) {
+		legacyProp = rootElem->GetNamedElement ( legacyNS, "Description" );
+		if ( (legacyProp != 0) && legacyProp->IsLeafContentNode() ) {
+			XMP_StringPtr legacyValue = legacyProp->GetLeafContentValue();
+			if ( legacyValue != 0 ) {
+				xmpObjPtr->SetLocalizedText ( kXMP_NS_DC, "description", "", "x-default", legacyValue, kXMP_DeleteExisting );
+				containsXMP = true;
+			}
+		}
+	}
+
+	legacyContext = rootElem->GetNamedElement ( legacyNS, "VideoFormat" );
+
+	if ( legacyContext != 0 ) {
+	
+		// frame size
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DM, "videoFrameSize" )) ) {
+			legacyProp = legacyContext->GetNamedElement ( legacyNS, "VideoLayout" );
+			if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+	
+				XMP_StringPtr widthValue  = legacyProp->GetAttrValue ( "pixel" );
+				XMP_StringPtr heightValue = legacyProp->GetAttrValue ( "numOfVerticalLine" );
+	
+				if ( (widthValue != 0) && (heightValue != 0) ) {
+	
+					xmpObjPtr->DeleteProperty ( kXMP_NS_DM, "videoFrameSize" );
+					xmpObjPtr->SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "w", widthValue );
+					xmpObjPtr->SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "h", heightValue );
+					xmpObjPtr->SetStructField ( kXMP_NS_DM, "videoFrameSize", kXMP_NS_XMP_Dimensions, "unit", "pixels" );
+												  
+					containsXMP = true;
+	
+				}
+	
+			}
+		}
+		
+		// Aspect ratio
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DM, "videoPixelAspectRatio" )) ) {
+			legacyProp = legacyContext->GetNamedElement ( legacyNS, "VideoLayout" );
+			if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+				XMP_StringPtr aspectRatio = legacyProp->GetAttrValue ( "aspectRatio" );
+				if ( aspectRatio != 0 ) {
+					xmpObjPtr->SetProperty ( kXMP_NS_DM, "videoPixelAspectRatio", aspectRatio, kXMP_DeleteExisting );
+					containsXMP = true;
+				}
+			}
+		}
+	
+		// Frame rate (always read, because its used later for the Duration
+        legacyProp = legacyContext->GetNamedElement ( legacyNS, "VideoFrame" );
+        if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+            formatFPS = legacyProp->GetAttrValue ( "formatFps" );
+        }
+        
+        // only write back to XMP if framerate is not set in XMP yet
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DM, "videoFrameRate" )) ) {
+            if ( formatFPS != 0 ) {
+                xmpObjPtr->SetProperty ( kXMP_NS_DM, "videoFrameRate", formatFPS, kXMP_DeleteExisting );
+                containsXMP = true;
+			}
+		}
+
+		// Video codec
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DM, "videoCompressor" )) ) {
+			legacyProp = legacyContext->GetNamedElement ( legacyNS, "VideoFrame" );
+			if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+				XMP_StringPtr prop = legacyProp->GetAttrValue ( "videoCodec" );
+				if ( prop != 0 ) {
+					xmpObjPtr->SetProperty ( kXMP_NS_DM, "videoCompressor", prop, kXMP_DeleteExisting );
+					containsXMP = true;
+				}
+			}
+		}
+	
+	}	// VideoFormat
+	
+	legacyContext = rootElem->GetNamedElement ( legacyNS, "AudioFormat" );
+
+	if ( legacyContext != 0 ) {
+
+		// Audio codec
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DM, "audioCompressor" )) ) {
+			legacyProp = legacyContext->GetNamedElement ( legacyNS, "AudioRecPort" );
+			if ( (legacyProp != 0) && legacyProp->IsEmptyLeafNode() ) {
+				XMP_StringPtr prop = legacyProp->GetAttrValue ( "audioCodec" );
+				if ( prop != 0 ) {
+					xmpObjPtr->SetProperty ( kXMP_NS_DM, "audioCompressor", prop, kXMP_DeleteExisting );
+					containsXMP = true;
+				}
+			}
+		}
+	
+	}	// AudioFormat
+
+	// Duration
+	if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DM, "duration" )) ) {
+
+		std::string durationFrames;
+		legacyProp = rootElem->GetNamedElement ( legacyNS, "Duration" );
+		if ( legacyProp != 0 ) {
+			XMP_StringPtr durationValue = legacyProp->GetAttrValue ( "value" );
+			if ( durationValue != 0 ) durationFrames = durationValue;
+		}
+		
+		std::string timeScale;
+        if ( formatFPS ) {
+        
+            timeScale = GetTimeScale ( formatFPS );
+        }
+        
+		if ( (! timeScale.empty()) && (! durationFrames.empty()) ) {
+			xmpObjPtr->DeleteProperty ( kXMP_NS_DM, "duration" );
+			xmpObjPtr->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "value", durationFrames );
+			xmpObjPtr->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "scale", timeScale );
+			containsXMP = true;
+		}
+
+	}
+	
+	legacyContext = rootElem->GetNamedElement ( legacyNS, "Device" );
+	if ( legacyContext != 0 ) {
+
+		std::string model; 
+		  
+		// manufacturer string
+		XMP_StringPtr manufacturer = legacyContext->GetAttrValue ( "manufacturer" );
+		if ( manufacturer != 0 ) {
+			model += manufacturer;
+		}
+		
+		// model string
+		XMP_StringPtr modelName = legacyContext->GetAttrValue ( "modelName" );
+		if ( modelName != 0 ) {
+			if ( model.size() > 0 ) {
+				model += " ";
+			}
+			model += modelName;
+		}
+		
+
+		// For the dm::cameraModel property, concat the make and model.
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_DM, "cameraModel" )) ) {
+			if ( model.size() != 0 ) {
+				xmpObjPtr->SetProperty ( kXMP_NS_DM, "cameraModel", model, kXMP_DeleteExisting );
+				containsXMP = true;
+			}
+		}
+		
+		// EXIF Model
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_TIFF, "Model" )) ) {
+			xmpObjPtr->SetProperty ( kXMP_NS_TIFF, "Model", modelName, kXMP_DeleteExisting );
+		}
+	
+		// EXIF Make
+		if ( digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_TIFF, "Make" )) ) {
+			xmpObjPtr->SetProperty ( kXMP_NS_TIFF, "Make", manufacturer, kXMP_DeleteExisting );
+		}
+	
+		// EXIF-AUX Serial number
+		XMP_StringPtr serialNumber = legacyContext->GetAttrValue ( "serialNo" );
+		if ( serialNumber != 0 && (digestFound || (! xmpObjPtr->DoesPropertyExist ( kXMP_NS_EXIF_Aux, "SerialNumber" ))) ) {
+			xmpObjPtr->SetProperty ( kXMP_NS_EXIF_Aux, "SerialNumber", serialNumber, kXMP_DeleteExisting );
+		}
+	
+	}
+
+	
+	return containsXMP;
+
+}	// XDCAM_Support::GetLegacyMetadata
+
+// =================================================================================================
+// XDCAM_Support::SetLegacyMetadata
+// ================================
+
+bool XDCAM_Support::SetLegacyMetadata ( XML_Node *		clipMetadata,
+										SXMPMeta *		xmpObj,
+										XMP_StringPtr	legacyNS )
+{
+	bool updateLegacyXML = false;
+	bool xmpFound = false;
+	std::string xmpValue;
+	XML_Node * xmlNode = 0;
+	
+	xmpFound = xmpObj->GetProperty ( kXMP_NS_DC, "title", &xmpValue, 0 );
+	
+	if ( xmpFound ) {
+
+		xmlNode = CreateChildElement ( clipMetadata, "Title", legacyNS, 3 );
+		if ( xmpValue != xmlNode->GetLeafContentValue() ) {
+			xmlNode->SetLeafContentValue ( xmpValue.c_str() );
+			updateLegacyXML = true;
+		}
+
+	}
+	
+	xmpFound = xmpObj->GetArrayItem ( kXMP_NS_DC, "creator", 1, &xmpValue, 0 );
+
+	if ( xmpFound ) {
+		xmlNode = CreateChildElement ( clipMetadata, "Creator", legacyNS, 3 );
+		XMP_StringPtr creatorName = xmlNode->GetAttrValue ( "name" );
+		if ( creatorName == 0 ) creatorName = "";
+		if ( xmpValue != creatorName ) {
+			xmlNode->SetAttrValue ( "name", xmpValue.c_str() );
+			updateLegacyXML = true;
+		}
+	}
+	
+	xmpFound = xmpObj->GetProperty ( kXMP_NS_DC, "description", &xmpValue, 0 );
+
+	if ( xmpFound ) {
+		xmlNode = CreateChildElement ( clipMetadata, "Description", legacyNS, 3 );
+		if ( xmpValue != xmlNode->GetLeafContentValue() ) {
+			// description in non real time metadata is limited to 2047 bytes
+			if ( xmpValue.size() > 2047 ) xmpValue.resize ( 2047 );
+			xmlNode->SetLeafContentValue ( xmpValue.c_str() );
+			updateLegacyXML = true;
+		}
+	}
+	
+	return updateLegacyXML;
+
+}	// XDCAM_Support::SetLegacyMetadata
+
+// =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/XDCAM_Support.hpp b/XMPFiles/source/FormatSupport/XDCAM_Support.hpp
new file mode 100644
index 0000000..cd209e9
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/XDCAM_Support.hpp
@@ -0,0 +1,50 @@
+#ifndef __XDCAM_Support_hpp__
+#define __XDCAM_Support_hpp__	1
+
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/ExpatAdapter.hpp"
+
+// =================================================================================================
+/// \file XDCAM_Support.hpp
+/// \brief XMPFiles support for XDCAM streams.
+///
+// =================================================================================================
+
+namespace XDCAM_Support 
+{
+
+	// Read XDCAM XML metadata from MEDIAPRO.XML and translate to appropriate XMP.
+	bool GetMediaProLegacyMetadata ( SXMPMeta * xmpObjPtr,
+									 const std::string&	umid,
+									 const std::string& mediaProPath,
+									 bool digestFound);
+
+	// Read XDCAM XML metadata and translate to appropriate XMP.
+	bool GetLegacyMetadata ( SXMPMeta *		xmpObjPtr,
+							 XML_NodePtr	rootElem,
+							 XMP_StringPtr	legacyNS,
+							 bool			digestFound,
+							 std::string&	umid );
+
+	// Write XMP metadata back to XDCAM XML.
+	bool SetLegacyMetadata ( XML_Node *		clipMetadata,
+							 SXMPMeta *		xmpObj,
+							 XMP_StringPtr	legacyNS );
+
+
+} // namespace XDCAM_Support
+
+// =================================================================================================
+
+#endif	// __XDCAM_Support_hpp__
diff --git a/XMPFiles/source/FormatSupport/XMPScanner.cpp b/XMPFiles/source/FormatSupport/XMPScanner.cpp
new file mode 100644
index 0000000..0dd34ae
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/XMPScanner.cpp
@@ -0,0 +1,1450 @@
+// =================================================================================================
+// Copyright 2004 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 WIN32
+	#pragma warning ( disable : 4127 )	// conditional expression is constant
+	#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
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+
+#if TestRunnerBuild
+	#define EnablePacketScanning 1
+#else
+	#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#endif
+
+#include "XMPFiles/source/FormatSupport/XMPScanner.hpp"
+
+#include <cassert>
+#include <string>
+#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
+#endif
+
+using namespace std;
+
+#if EnablePacketScanning
+
+// =================================================================================================
+// =================================================================================================
+// 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
+// =============
+
+XMPScanner::PacketMachine::PacketMachine ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 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
+// ==============
+
+XMPScanner::PacketMachine::~PacketMachine ()
+{
+
+	// An empty placeholder.
+
+}	// ~PacketMachine
+
+// =================================================================================================
+// AssociateBuffer
+// ===============
+
+void
+XMPScanner::PacketMachine::AssociateBuffer ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 bufferLength )
+{
+
+	fBufferOffset = bufferOffset;
+	fBufferOrigin = (const char *) bufferOrigin;
+	fBufferPtr = fBufferOrigin + fBufferOverrun;
+	fBufferLimit = fBufferOrigin + bufferLength;
+
+}	// AssociateBuffer
+
+// =================================================================================================
+// ResetMachine
+// ============
+
+void
+XMPScanner::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
+// ============
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+// ===========
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::PacketMachine::MatchString ( PacketMachine * ths, const char * literal )
+{
+	const int			bytesPerChar	= ths->fBytesPerChar;
+	const char *		litPtr			= literal + ths->fPosition;
+	const XMP_Int32		charsToGo		= (XMP_Int32) strlen ( literal ) - ths->fPosition;
+	int					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
+// =========
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+// ==============
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+// ===============
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::PacketMachine::MatchCloseQuote ( PacketMachine * ths, const char * /* unused */ )
+{
+
+	return MatchChar ( ths, &ths->fQuoteChar );
+
+}	// MatchCloseQuote
+
+// =================================================================================================
+// CaptureAttrName
+// ===============
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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 = (long) 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.
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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.
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+};
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+// ==============
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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;
+		int		count	= (int) ths->fAttrValue.size();
+		int		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
+// =============
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+// ==============
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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.
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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 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 = 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;
+
+	}
+
+	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
+
+// =================================================================================================
+// 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 XMPScanner::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.
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+XMPScanner::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.
+
+XMPScanner::PacketMachine::TriState
+XMPScanner::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
+// ============
+
+XMPScanner::InternalSnip::InternalSnip ( XMP_Int64 offset, XMP_Int64 length )
+{
+
+	fInfo.fOffset = offset;
+	fInfo.fLength = length;
+
+}	// InternalSnip
+
+// =================================================================================================
+// InternalSnip
+// ============
+
+XMPScanner::InternalSnip::InternalSnip ( const InternalSnip & rhs ) :
+	fInfo ( rhs.fInfo ),
+	fMachine ()
+{
+
+	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
+// =============
+
+XMPScanner::InternalSnip::~InternalSnip ()
+{
+}	// ~InternalSnip
+
+
+// =================================================================================================
+// =================================================================================================
+// class XMPScanner
+// ================
+
+// =================================================================================================
+// DumpSnipList
+// ============
+
+#if DEBUG
+
+static const char *	snipStateName [6] = { "not-seen", "pending", "raw-data", "good-packet", "partial", "bad-packet" };
+
+void
+XMPScanner::DumpSnipList ( const char * title )
+{
+	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;
+	}
+}	// DumpSnipList
+
+#endif
+
+// =================================================================================================
+// PrevSnip and NextSnip
+// =====================
+
+XMPScanner::InternalSnipIterator
+XMPScanner::PrevSnip ( InternalSnipIterator snipPos )
+{
+
+	InternalSnipIterator prev = snipPos;
+	return --prev;
+
+}	// PrevSnip
+
+XMPScanner::InternalSnipIterator
+XMPScanner::NextSnip ( InternalSnipIterator snipPos )
+{
+
+	InternalSnipIterator next = snipPos;
+	return ++next;
+
+}	// NextSnip
+
+// =================================================================================================
+// XMPScanner
+// ==========
+//
+// Initialize the scanner object with one "not seen" snip covering the whole stream.
+
+XMPScanner::XMPScanner ( XMP_Int64 streamLength ) :
+
+	fStreamLength ( streamLength )
+
+{
+	InternalSnip	rootSnip ( 0, streamLength );
+
+	if ( streamLength > 0 ) fInternalSnips.push_front ( rootSnip );		// Be nice for empty files.
+	// DumpSnipList ( "New XMPScanner" );
+
+}	// XMPScanner
+
+// =================================================================================================
+// ~XMPScanner
+// ===========
+
+XMPScanner::~XMPScanner()
+{
+
+}	// ~XMPScanner
+
+// =================================================================================================
+// GetSnipCount
+// ============
+
+long
+XMPScanner::GetSnipCount ()
+{
+
+	return (long)fInternalSnips.size();
+
+}	// GetSnipCount
+
+// =================================================================================================
+// StreamAllScanned
+// ================
+
+bool
+XMPScanner::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
+XMPScanner::SplitInternalSnip ( InternalSnipIterator snipPos, XMP_Int64 relOffset, XMP_Int64 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 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.
+			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
+// ==================
+
+XMPScanner::InternalSnipIterator
+XMPScanner::MergeInternalSnips ( InternalSnipIterator firstPos, InternalSnipIterator secondPos )
+{
+
+	firstPos->fInfo.fLength += secondPos->fInfo.fLength;
+	fInternalSnips.erase ( secondPos );
+	return firstPos;
+
+}	// MergeInternalSnips
+
+// =================================================================================================
+// Scan
+// ====
+
+void
+XMPScanner::Scan ( const void * bufferOrigin, XMP_Int64 bufferOffset, XMP_Int64 bufferLength )
+{
+	XMP_Int64	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 XMP_Int64			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 = unique_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 );
+				unique_ptr<PacketMachine>	ap ( pm );
+				snipPos->fMachine = std::move(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 = unique_ptr<PacketMachine>();	// *** snipPos->fMachine.reset();	VC++ lacks reset
+			#else
+				{
+					// Some versions of gcc complain about the assignment operator above.  This avoids the gcc bug.
+					unique_ptr<PacketMachine>	ap;
+					snipPos->fMachine = std::move(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 = unique_ptr<PacketMachine>();	// *** snipPos->fMachine.reset();	VC++ lacks reset
+					#else
+						{
+							// Some versions of gcc complain about the assignment operator above.  This avoids the gcc bug.
+							unique_ptr<PacketMachine>	ap;
+							snipPos->fMachine = std::move(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 = std::move(snipPos->fMachine);	// unique_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
+XMPScanner::Report ( SnipInfoVector& snips )
+{
+	const int				count	= (int)fInternalSnips.size();
+	InternalSnipIterator	snipPos	= fInternalSnips.begin();
+
+	int	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
+
+// =================================================================================================
+
+#endif	// EnablePacketScanning
diff --git a/XMPFiles/source/FormatSupport/XMPScanner.hpp b/XMPFiles/source/FormatSupport/XMPScanner.hpp
new file mode 100644
index 0000000..841f2ec
--- /dev/null
+++ b/XMPFiles/source/FormatSupport/XMPScanner.hpp
@@ -0,0 +1,330 @@
+#ifndef __XMPScanner_hpp__
+#define __XMPScanner_hpp__
+
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include <list>
+#include <vector>
+#include <string>
+#include <memory>
+#include <stdexcept>
+
+#include "public/include/XMP_Const.h"
+
+// =================================================================================================
+// The XMPScanner 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 XMPScanner object.
+// =================================================================================================
+
+class XMPScanner {
+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 XMPScanner 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.
+	
+	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 XMP_Uns8	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 XMP_Uns8	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) & XMPScanner::eChar16BitMask) != 0 )
+	#define CharFormIs32Bit(f)			( ((int)(f) & XMPScanner::eChar32BitMask) != 0 )
+	
+	#define CharFormIsBigEndian(f)		( ((int)(f) & XMPScanner::eCharLittleEndianMask) == 0 )
+	#define CharFormIsLittleEndian(f)	( ((int)(f) & XMPScanner::eCharLittleEndianMask) != 0 )
+	
+	struct SnipInfo {
+
+		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.
+		XMP_Int64		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, XMP_Int64 offset, XMP_Int64 length ) :
+			fOffset ( offset ),
+			fLength ( length ),
+			fState ( state ),
+			fOutOfOrder ( false ),
+			fAccess ( ' ' ),
+			fCharForm ( eChar8Bit ),
+			fEncodingAttr ( "" ),
+			fBytesAttr( -1 )
+		{ }
+	
+	};
+	
+	typedef std::vector<SnipInfo>	SnipInfoVector;
+
+	XMPScanner ( XMP_Int64 streamLength );
+	// Constructs a new XMPScanner object for a stream with the given length.
+	
+	~XMPScanner();
+
+	long 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, 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.
+
+	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:	// XMPScanner
+	
+	class PacketMachine;
+
+	class InternalSnip {
+	public:
+
+		SnipInfo	fInfo;							// The public info about this snip.
+		std::unique_ptr<PacketMachine>	fMachine;	// The state machine for "active" snips.
+		
+		InternalSnip ( XMP_Int64 offset, XMP_Int64 length );
+		InternalSnip ( const InternalSnip & );
+		~InternalSnip ();
+
+	};	// InternalSnip
+
+	typedef std::list<InternalSnip>		InternalSnipList;
+	typedef InternalSnipList::iterator	InternalSnipIterator;
+
+	class PacketMachine {
+	public:
+		
+		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.
+		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 ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 bufferLength );
+		
+		PacketMachine ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 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
+
+		};
+		
+		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.
+
+		RecognizerKind	fRecognizer;	// Which recognizer is currently active.
+		signed long		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
+	
+	XMP_Int64			fStreamLength;
+	InternalSnipList	fInternalSnips;
+
+	void
+	SplitInternalSnip ( InternalSnipIterator snipPos, XMP_Int64 relOffset, XMP_Int64 newLength );
+
+	InternalSnipIterator
+	MergeInternalSnips ( InternalSnipIterator firstPos, InternalSnipIterator secondPos );
+
+	InternalSnipIterator
+	PrevSnip ( InternalSnipIterator snipPos );
+
+	InternalSnipIterator
+	NextSnip ( InternalSnipIterator snipPos );
+
+	#if DEBUG
+		void DumpSnipList ( const char * title );
+	#endif
+	
+};	// XMPScanner
+
+#endif	// __XMPScanner_hpp__
diff --git a/XMPFiles/source/HandlerRegistry.cpp b/XMPFiles/source/HandlerRegistry.cpp
new file mode 100644
index 0000000..69aed6e
--- /dev/null
+++ b/XMPFiles/source/HandlerRegistry.cpp
@@ -0,0 +1,976 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/HandlerRegistry.h"
+
+#if EnablePluginManager
+	#include "XMPFiles/source/PluginHandler/XMPAtoms.h"
+#endif
+
+#if EnablePhotoHandlers
+	#include "XMPFiles/source/FileHandlers/JPEG_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/PSD_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/TIFF_Handler.hpp"
+#endif
+
+#if EnableDynamicMediaHandlers
+	#include "XMPFiles/source/FileHandlers/AIFF_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/ASF_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/FLV_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/MP3_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/MPEG2_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/MPEG4_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/P2_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/WAVE_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/RIFF_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/SWF_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/XDCAM_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/WEBP_Handler.hpp"
+#endif
+
+#if EnableMiscHandlers
+	#include "XMPFiles/source/FileHandlers/InDesign_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/PNG_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/PostScript_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/UCF_Handler.hpp"
+	#include "XMPFiles/source/FileHandlers/GIF_Handler.hpp"
+#endif
+
+//#if EnablePacketScanning
+//#include "XMPFiles/source/FileHandlers/Scanner_Handler.hpp"
+//#endif
+
+using namespace Common;
+
+#if EnablePluginManager
+	using namespace XMP_PLUGIN;
+#endif
+
+// =================================================================================================
+
+#if EnableDynamicMediaHandlers
+
+static const char * kP2ContentChildren[] = { "CLIP", "VIDEO", "AUDIO", "ICON", "VOICE", "PROXY", 0 };
+
+static inline bool CheckP2ContentChild ( const std::string & folderName )
+{
+	for ( int i = 0; kP2ContentChildren[i] != 0; ++i ) {
+		if ( folderName == kP2ContentChildren[i] ) return true;
+	}
+	return false;
+}
+
+#endif
+
+// =================================================================================================
+
+//
+// Static init
+//
+HandlerRegistry* HandlerRegistry::sInstance = 0;
+
+/*static*/ HandlerRegistry& HandlerRegistry::getInstance()
+{
+	if ( sInstance == 0 ) sInstance = new HandlerRegistry();
+	return *sInstance;
+}
+
+/*static*/ void HandlerRegistry::terminate()
+{
+	delete sInstance;
+	sInstance = 0;
+}
+
+HandlerRegistry::HandlerRegistry()
+{
+	mFolderHandlers		= new XMPFileHandlerTable;
+	mNormalHandlers		= new XMPFileHandlerTable;
+	mOwningHandlers		= new XMPFileHandlerTable;
+	mReplacedHandlers	= new XMPFileHandlerTable;
+}
+
+HandlerRegistry::~HandlerRegistry()
+{
+	delete mFolderHandlers;
+	delete mNormalHandlers;
+	delete mOwningHandlers;
+	delete mReplacedHandlers;
+}
+
+// =================================================================================================
+
+void HandlerRegistry::initialize()
+{
+
+	bool allOK = true;	// All of the linked-in handler registrations must work, do one test at the end.
+	
+	// -----------------------------------------
+	// Register the directory-oriented handlers.
+
+#if EnableDynamicMediaHandlers
+	allOK &= this->registerFolderHandler ( kXMP_P2File, kP2_HandlerFlags, P2_CheckFormat, P2_MetaHandlerCTor );
+	allOK &= this->registerFolderHandler ( kXMP_SonyHDVFile, kSonyHDV_HandlerFlags, SonyHDV_CheckFormat, SonyHDV_MetaHandlerCTor );
+	allOK &= this->registerFolderHandler ( kXMP_XDCAM_FAMFile, kXDCAM_HandlerFlags, XDCAM_CheckFormat, XDCAM_MetaHandlerCTor );
+	allOK &= this->registerFolderHandler ( kXMP_XDCAM_SAMFile, kXDCAM_HandlerFlags, XDCAM_CheckFormat, XDCAM_MetaHandlerCTor );
+	allOK &= this->registerFolderHandler ( kXMP_XDCAM_EXFile, kXDCAMEX_HandlerFlags, XDCAMEX_CheckFormat, XDCAMEX_MetaHandlerCTor );
+#endif
+
+	// ------------------------------------------------------------------------------------------
+	// Register the file-oriented handlers that don't want to open and close the file themselves.
+
+#if EnablePhotoHandlers
+	allOK &= this->registerNormalHandler ( kXMP_JPEGFile, kJPEG_HandlerFlags, JPEG_CheckFormat, JPEG_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_PhotoshopFile, kPSD_HandlerFlags, PSD_CheckFormat, PSD_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_TIFFFile, kTIFF_HandlerFlags, TIFF_CheckFormat, TIFF_MetaHandlerCTor );
+#endif
+
+#if EnableDynamicMediaHandlers
+	allOK &= this->registerNormalHandler ( kXMP_WMAVFile, kASF_HandlerFlags, ASF_CheckFormat, ASF_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_MP3File, kMP3_HandlerFlags, MP3_CheckFormat, MP3_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_WAVFile, kWAVE_HandlerFlags, WAVE_CheckFormat, WAVE_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_AVIFile, kRIFF_HandlerFlags, RIFF_CheckFormat, RIFF_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_WEBPFile, kWEBP_HandlerFlags, WEBP_CheckFormat, WEBP_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_SWFFile, kSWF_HandlerFlags, SWF_CheckFormat, SWF_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_MPEG4File, kMPEG4_HandlerFlags, MPEG4_CheckFormat, MPEG4_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_MOVFile, kMPEG4_HandlerFlags, MPEG4_CheckFormat, MPEG4_MetaHandlerCTor );	// ! Yes, MPEG-4 includes MOV.
+	allOK &= this->registerNormalHandler ( kXMP_FLVFile, kFLV_HandlerFlags, FLV_CheckFormat, FLV_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_AIFFFile, kAIFF_HandlerFlags, AIFF_CheckFormat, AIFF_MetaHandlerCTor );
+#endif
+
+#if EnableMiscHandlers
+	allOK &= this->registerNormalHandler ( kXMP_InDesignFile, kInDesign_HandlerFlags, InDesign_CheckFormat, InDesign_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_PNGFile, kPNG_HandlerFlags, PNG_CheckFormat, PNG_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_UCFFile, kUCF_HandlerFlags, UCF_CheckFormat, UCF_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_GIFFile, kGIF_HandlerFlags, GIF_CheckFormat, GIF_MetaHandlerCTor );
+	// ! EPS and PostScript have the same handler, EPS is a proper subset of PostScript.
+	allOK &= this->registerNormalHandler ( kXMP_EPSFile, kPostScript_HandlerFlags, PostScript_CheckFormat, PostScript_MetaHandlerCTor );
+	allOK &= this->registerNormalHandler ( kXMP_PostScriptFile, kPostScript_HandlerFlags, PostScript_CheckFormat, PostScript_MetaHandlerCTor );
+#endif
+
+	// ------------------------------------------------------------------------------------
+	// Register the file-oriented handlers that need to open and close the file themselves.
+
+#if EnableDynamicMediaHandlers
+	allOK &= this->registerOwningHandler ( kXMP_MPEGFile, kMPEG2_HandlerFlags, MPEG2_CheckFormat, MPEG2_MetaHandlerCTor );
+	allOK &= this->registerOwningHandler ( kXMP_MPEG2File, kMPEG2_HandlerFlags, MPEG2_CheckFormat, MPEG2_MetaHandlerCTor );
+#endif
+
+	if ( ! allOK ) XMP_Throw ( "Failure initializing linked-in file handlers", kXMPErr_InternalFailure );
+
+}	// HandlerRegistry::initialize
+
+// =================================================================================================
+
+bool HandlerRegistry::registerFolderHandler( XMP_FileFormat			format,
+										     XMP_OptionBits			flags,
+										     CheckFolderFormatProc	checkProc,
+										     XMPFileHandlerCTor		handlerCTor,
+											 bool					replaceExisting /*= false*/ )
+{
+	XMP_Assert ( format != kXMP_UnknownFile );
+
+	XMP_Assert ( flags & kXMPFiles_HandlerOwnsFile );
+	XMP_Assert ( flags & kXMPFiles_FolderBasedFormat );
+	XMP_Assert ( (flags & kXMPFiles_CanInjectXMP) ? (flags & kXMPFiles_CanExpand) : 1 );
+	
+	if ( replaceExisting ) 
+	{
+		//
+		// Remember previous file handler for this format.
+		// Reject if there is already a replacement.
+		//
+		if( mReplacedHandlers->find( format ) == mReplacedHandlers->end() )
+		{
+			XMPFileHandlerInfo* standardHandler = this->getHandlerInfo( format );
+
+			if( standardHandler != NULL )
+			{
+				mReplacedHandlers->insert( mReplacedHandlers->end(), XMPFileHandlerTablePair( format, *standardHandler ) );
+			}
+			else
+			{
+				// skip registration if there is nothing to replace
+				return false;
+			}
+		}
+		else
+		{
+			// skip registration if there is already a replacing handler registered for this format
+			return false;
+		}
+
+		// remove existing handler
+		this->removeHandler ( format );
+	} 
+	else 
+	{
+		// skip registration if there is already a handler registered for this format
+		if ( this->getFormatInfo ( format ) ) return false;
+	}
+
+	//
+	// register handler
+	//
+	XMPFileHandlerInfo handlerInfo ( format, flags, checkProc, handlerCTor );
+	mFolderHandlers->insert ( mFolderHandlers->end(), XMPFileHandlerTablePair ( format, handlerInfo ) );
+
+	return true;
+
+}	// HandlerRegistry::registerFolderHandler
+
+// =================================================================================================
+
+bool HandlerRegistry::registerNormalHandler( XMP_FileFormat			format,
+										     XMP_OptionBits			flags,
+										     CheckFileFormatProc	checkProc,
+											 XMPFileHandlerCTor		handlerCTor,
+											 bool					replaceExisting /*= false*/ )
+{
+	XMP_Assert ( format != kXMP_UnknownFile );
+
+	XMP_Assert ( ! (flags & kXMPFiles_HandlerOwnsFile) );
+	XMP_Assert ( ! (flags & kXMPFiles_FolderBasedFormat) );
+	XMP_Assert ( (flags & kXMPFiles_CanInjectXMP) ? (flags & kXMPFiles_CanExpand) : 1 );
+
+	if ( replaceExisting ) 
+	{
+		//
+		// Remember previous file handler for this format.
+		// Reject if there is already a replacement.
+		//
+		if( mReplacedHandlers->find( format ) == mReplacedHandlers->end() )
+		{
+			XMPFileHandlerInfo* standardHandler = this->getHandlerInfo( format );
+
+			if( standardHandler != NULL )
+			{
+				mReplacedHandlers->insert( mReplacedHandlers->end(), XMPFileHandlerTablePair( format, *standardHandler ) );
+			}
+			else
+			{
+				// skip registration if there is nothing to replace
+				return false;
+			}
+		}
+		else
+		{
+			// skip registration if there is already a replacing handler registered for this format
+			return false;
+		}
+
+		// remove existing handler
+		this->removeHandler ( format );
+	} 
+	else 
+	{
+		// skip registration if there is already a handler registered for this format
+		if ( this->getFormatInfo ( format ) ) return false;
+	}
+
+	//
+	// register handler
+	//
+	XMPFileHandlerInfo handlerInfo ( format, flags, checkProc, handlerCTor );
+	mNormalHandlers->insert ( mNormalHandlers->end(), XMPFileHandlerTablePair ( format, handlerInfo ) );
+	return true;
+
+}	// HandlerRegistry::registerNormalHandler
+
+// =================================================================================================
+
+bool HandlerRegistry::registerOwningHandler( XMP_FileFormat			format,
+										     XMP_OptionBits			flags,
+										     CheckFileFormatProc	checkProc,
+											 XMPFileHandlerCTor		handlerCTor,
+											 bool					replaceExisting /*= false*/ )
+{
+	XMP_Assert ( format != kXMP_UnknownFile );
+
+	XMP_Assert ( flags & kXMPFiles_HandlerOwnsFile );
+	XMP_Assert ( ! (flags & kXMPFiles_FolderBasedFormat) );
+	XMP_Assert ( (flags & kXMPFiles_CanInjectXMP) ? (flags & kXMPFiles_CanExpand) : 1 );
+
+	if ( replaceExisting ) 
+	{
+		//
+		// Remember previous file handler for this format.
+		// Reject if there is already a replacement.
+		//
+		if( mReplacedHandlers->find( format ) == mReplacedHandlers->end() )
+		{
+			XMPFileHandlerInfo* standardHandler = this->getHandlerInfo( format );
+
+			if( standardHandler != NULL )
+			{
+				mReplacedHandlers->insert( mReplacedHandlers->end(), XMPFileHandlerTablePair( format, *standardHandler ) );
+			}
+			else
+			{
+				// skip registration if there is nothing to replace
+				return false;
+			}
+		}
+		else
+		{
+			// skip registration if there is already a replacing handler registered for this format
+			return false;
+		}
+
+		// remove existing handler
+		this->removeHandler ( format );
+	} 
+	else 
+	{
+		// skip registration if there is already a handler registered for this format
+		if ( this->getFormatInfo ( format ) ) return false;
+	}
+
+	//
+	// register handler
+	//
+	XMPFileHandlerInfo handlerInfo ( format, flags, checkProc, handlerCTor );
+	mOwningHandlers->insert ( mOwningHandlers->end(), XMPFileHandlerTablePair ( format, handlerInfo ) );
+	return true;
+
+}	// HandlerRegistry::registerOwningHandler
+
+// =================================================================================================
+
+void HandlerRegistry::removeHandler ( XMP_FileFormat format ) {
+
+	XMPFileHandlerTablePos handlerPos;
+
+	handlerPos = mFolderHandlers->find ( format );
+	if ( handlerPos != mFolderHandlers->end() ) {
+		mFolderHandlers->erase ( handlerPos );
+		XMP_Assert ( ! this->getFormatInfo ( format ) );
+		return;
+	}
+
+	handlerPos = mNormalHandlers->find ( format );
+	if ( handlerPos != mNormalHandlers->end() ) {
+		mNormalHandlers->erase ( handlerPos );
+		XMP_Assert ( ! this->getFormatInfo ( format ) );
+		return;
+	}
+
+	handlerPos = mOwningHandlers->find ( format );
+	if ( handlerPos != mOwningHandlers->end() ) {
+		mOwningHandlers->erase ( handlerPos );
+		XMP_Assert ( ! this->getFormatInfo ( format ) );
+		return;
+	}
+
+}	// HandlerRegistry::removeHandler
+
+// =================================================================================================
+
+XMP_FileFormat HandlerRegistry::getFileFormat( const std::string & fileExt, bool addIfNotFound /*= false*/ )
+{
+	if ( ! fileExt.empty() ) {
+		for ( int i=0; kFileExtMap[i].format != 0; ++i ) {
+			if ( fileExt == kFileExtMap[i].ext ) return kFileExtMap[i].format;
+		}
+	}
+
+	#if EnablePluginManager
+		return ResourceParser::getPluginFileFormat ( fileExt, addIfNotFound );
+	#else
+		return kXMP_UnknownFile;
+	#endif
+}
+
+// =================================================================================================
+
+XMPFileHandlerInfo*	HandlerRegistry::getHandlerInfo( XMP_FileFormat format )
+{
+	XMPFileHandlerTablePos handlerPos;
+
+	handlerPos = mFolderHandlers->find( format );
+
+	if( handlerPos != mFolderHandlers->end() ) 
+	{
+		return &(handlerPos->second);
+	}
+
+	handlerPos = mNormalHandlers->find ( format );
+
+	if( handlerPos != mNormalHandlers->end() ) 
+	{
+		return &(handlerPos->second);
+	}
+
+	handlerPos = mOwningHandlers->find ( format );
+
+	if( handlerPos != mOwningHandlers->end() ) 
+	{
+		return &(handlerPos->second);
+	}
+
+	return NULL;
+}
+
+// =================================================================================================
+
+XMPFileHandlerInfo*	HandlerRegistry::getStandardHandlerInfo( XMP_FileFormat format )
+{
+	XMPFileHandlerTablePos handlerPos = mReplacedHandlers->find( format );
+
+	if( handlerPos != mReplacedHandlers->end() )
+	{
+		return &(handlerPos->second);
+	}
+	else
+	{
+		return this->getHandlerInfo( format );
+	}
+}
+
+// =================================================================================================
+
+bool HandlerRegistry::isReplaced( XMP_FileFormat format )
+{
+	return ( mReplacedHandlers->find( format ) != mReplacedHandlers->end() );
+}
+
+// =================================================================================================
+
+bool HandlerRegistry::getFormatInfo( XMP_FileFormat format, XMP_OptionBits* flags /*= 0*/ )
+{
+	if ( flags == 0 ) flags = &voidOptionBits;
+
+	XMPFileHandlerInfo*	handler = this->getHandlerInfo( format );
+
+	if( handler != NULL )
+	{
+		*flags = handler->flags;
+	}
+
+	return ( handler != NULL );
+}	// HandlerRegistry::getFormatInfo
+
+// =================================================================================================
+
+XMPFileHandlerInfo* HandlerRegistry::pickDefaultHandler ( XMP_FileFormat format, const std::string & fileExt )
+{
+	if ( format == kXMP_UnknownFile ) format = this->getFileFormat ( fileExt );
+	if ( format == kXMP_UnknownFile ) return 0;
+
+	XMPFileHandlerTablePos handlerPos;
+
+	handlerPos = mNormalHandlers->find ( format );
+	if ( handlerPos != mNormalHandlers->end() ) return &handlerPos->second;
+
+	handlerPos = mOwningHandlers->find ( format );
+	if ( handlerPos != mOwningHandlers->end() ) return &handlerPos->second;
+
+	handlerPos = mFolderHandlers->find ( format );
+	if ( handlerPos != mFolderHandlers->end() ) return &handlerPos->second;
+
+	return 0;
+}
+
+// =================================================================================================
+
+XMPFileHandlerInfo* HandlerRegistry::selectSmartHandler( XMPFiles* session, XMP_StringPtr clientPath, XMP_FileFormat format, XMP_OptionBits openFlags )
+{
+
+	// The normal case for selectSmartHandler is when OpenFile is given a string file path. All of
+	// the stages described below have slight special cases when OpenFile is given an XMP_IO object
+	// for client-managed I/O. In that case the only handlers considered are those for embedded XMP
+	// that do not need to own the file.
+	//
+	// There are 4 stages in finding a handler, ending at the first success:
+	//   1. If the client passes in a format, try that handler.
+	//   2. Try all of the folder-oriented handlers.
+	//   3. Try a file-oriented handler based on the file extension.
+	//   4. Try all of the file-oriented handlers.
+	//
+	// The most common case is almost certainly #3, so we want to get there quickly. Most of the
+	// time the client won't pass in a format, so #1 takes no time. The folder-oriented handler
+	// checks are preceded by minimal folder checks. These checks are meant to be fast in the
+	// failure case. The folder-oriented checks have to go before the general file-oriented checks
+	// because the client path might be to one of the inner files, and we might have a file-oriented
+	// handler for that kind of file, but we want to recognize the clip. More details are below.
+	//
+	// In brief, the folder-oriented formats use shallow trees with specific folder names and
+	// highly stylized file names. The user thinks of the tree as a collection of clips, each clip
+	// is stored as multiple files for video, audio, metadata, etc. The folder-oriented stage has
+	// to be first because there can be files in the structure that are also covered by a
+	// file-oriented handler.
+	//
+	// In the file-oriented case, the CheckProc should do as little as possible to determine the
+	// format, based on the actual file content. If that is not possible, use the format hint. The
+	// initial CheckProc calls (steps 1 and 3) has the presumed format in this->format, the later
+	// calls (step 4) have kXMP_UnknownFile there.
+	//
+	// The folder-oriented checks need to be well optimized since the formats are relatively rare,
+	// but have to go first and could require multiple file system calls to identify. We want to
+	// get to the first file-oriented guess as quickly as possible, that is the real handler most of
+	// the time.
+	//
+	// The folder-oriented handlers are for things like P2 and XDCAM that use files distributed in a
+	// well defined folder structure. Using a portion of P2 as an example:
+	//	.../MyMovie
+	//		CONTENTS
+	//			CLIP
+	//				0001AB.XML
+	//				0002CD.XML
+	//			VIDEO
+	//				0001AB.MXF
+	//				0002CD.MXF
+	//			VOICE
+	//				0001AB.WAV
+	//				0002CD.WAV
+	//
+	// The user thinks of .../MyMovie as the container of P2 stuff, in this case containing 2 clips
+	// called 0001AB and 0002CD. The exact folder structure and file layout differs, but the basic
+	// concepts carry across all of the folder-oriented handlers.
+	//
+	// The client path can be a conceptual clip path like .../MyMovie/0001AB, or a full path to any
+	// of the contained files. For file paths we have to behave the same as the implied conceptual
+	// path, e.g. we don't want .../MyMovie/CONTENTS/VOICE/0001AB.WAV to invoke the WAV handler.
+	// There might also be a mapping from user friendly names to clip names (e.g. Intro to 0001AB).
+	// If so that is private to the handler and does not affect this code.
+	//
+	// In order to properly handle the file path input we have to look for the folder-oriented case
+	// before any of the file-oriented cases. And since these are relatively rare, hence fail most of
+	// the time, we have to get in and out fast in the not handled case. That is what we do here.
+	//
+	// The folder-oriented processing done here is roughly:
+	//
+	// 1. Get the state of the client path: does-not-exist, is-file, is-folder, is-other.
+	// 2. Reject is-folder and is-other, they can't possibly be a valid case.
+	// 3. For does-not-exist:
+	//	3a. Split the client path into a leaf component and root path.
+	//	3b. Make sure the root path names an existing folder.
+	//	3c. Make sure the root folder has a viable top level child folder (e.g. CONTENTS).
+	// 4. For is-file:
+	//	4a. Split the client path into a root path, grandparent folder, parent folder, and leaf name.
+	//	4b. Make sure the parent or grandparent has a viable name (e.g. CONTENTS).
+	// 5. Try the registered folder handlers.
+	//
+	// For the common case of "regular" files, we should only get as far as 3b. This is just 1 file
+	// system call to get the client path state and some string processing.
+
+	bool readOnly = XMP_OptionIsClear( openFlags, kXMPFiles_OpenForUpdate );
+
+	Host_IO::FileMode clientMode;
+	std::string rootPath;
+	std::string leafName;
+	std::string fileExt;
+	std::string emptyStr;
+
+	XMPFileHandlerInfo* handlerInfo	= 0;
+	bool foundHandler				= false;
+	
+	if ( openFlags & kXMPFiles_ForceGivenHandler ) {
+		// We're being told to blindly use the handler for the given format and nothing else.
+		return this->pickDefaultHandler ( format, emptyStr );	// Picks based on just the format.
+	}
+
+	if ( session->UsesClientIO() ) {
+
+		XMP_Assert ( session->ioRef != 0 );
+		clientMode = Host_IO::kFMode_IsFile;
+
+	} else {
+
+		clientMode = Host_IO::GetFileMode( clientPath );
+		if ( (clientMode == Host_IO::kFMode_IsFolder) || (clientMode == Host_IO::kFMode_IsOther) ) return 0;
+
+		rootPath = clientPath;
+		XIO::SplitLeafName ( &rootPath, &leafName );
+		
+		if ( leafName.empty() ) return 0;
+
+		if ( clientMode == Host_IO::kFMode_IsFile ) {
+			// Only extract the file extension for existing files. Non-existing files can only be
+			// logical clip names, and they don't have file extensions.
+			XIO::SplitFileExtension ( &leafName, &fileExt );
+		}
+
+	}
+
+	session->format	= kXMP_UnknownFile;	// Make sure it is preset for later checks.
+	session->openFlags = openFlags;
+
+	// If the client passed in a format, try that first.
+
+	if( format != kXMP_UnknownFile ) 
+	{
+		handlerInfo = this->pickDefaultHandler( format, emptyStr );	// Picks based on just the format.
+
+		if( handlerInfo != 0 ) 
+		{
+			if( ( session->ioRef == 0 ) && (! ( handlerInfo->flags & kXMPFiles_HandlerOwnsFile ) ) ) 
+			{
+				session->ioRef = XMPFiles_IO::New_XMPFiles_IO( clientPath, readOnly, &session->errorCallback);
+				if ( session->ioRef == 0 ) return 0;
+			}
+			
+			session->format = format;	// ! Hack to tell the CheckProc session is an initial call.
+
+			if( handlerInfo->flags & kXMPFiles_FolderBasedFormat ) 
+			{
+#if 0
+				std::string gpName, parentName;
+				if ( clientMode == Host_IO::kFMode_IsFile ) {
+					XIO::SplitLeafName( &rootPath, &parentName );
+					XIO::SplitLeafName( &rootPath, &gpName );
+					if ( format != kXMP_XDCAM_FAMFile ) MakeUpperCase( &gpName );	// ! Save the original case for XDCAM-FAM.
+					MakeUpperCase( &parentName );
+				}
+				CheckFolderFormatProc CheckProc = (CheckFolderFormatProc) (handlerInfo->checkProc);
+				foundHandler = CheckProc ( handlerInfo->format, rootPath, gpName, parentName, leafName, session );
+#else
+				// *** Don't try here yet. These are messy, needing existence checking and path processing.
+				// *** CheckFolderFormatProc CheckProc = (CheckFolderFormatProc) (handlerInfo->checkProc);
+				// *** foundHandler = CheckProc ( handlerInfo->format, rootPath, gpName, parentName, leafName, session );
+				// *** Don't let OpenStrictly cause an early exit:
+				if( openFlags & kXMPFiles_OpenStrictly ) openFlags ^= kXMPFiles_OpenStrictly;
+#endif
+			} 
+			else 
+			{
+				bool tryThisHandler = true;
+
+				if( session->UsesClientIO() ) 
+				{
+					if ( (handlerInfo->flags & kXMPFiles_UsesSidecarXMP) ||
+						(handlerInfo->flags & kXMPFiles_HandlerOwnsFile) ) tryThisHandler = false;
+				}
+
+				if( tryThisHandler ) 
+				{
+					CheckFileFormatProc CheckProc = (CheckFileFormatProc) (handlerInfo->checkProc);
+					foundHandler = CheckProc ( format, clientPath, session->ioRef, session );
+				}
+			}
+
+			XMP_Assert( foundHandler || (session->tempPtr == 0) );
+			
+			if ( foundHandler ) return handlerInfo;
+			
+			handlerInfo = 0;	// ! Clear again for later use.
+		}
+
+		if ( openFlags & kXMPFiles_OpenStrictly ) return 0;
+
+	}
+
+#if EnableDynamicMediaHandlers	// All of the folder handlers are for dynamic media.
+
+	// Try the folder handlers if appropriate.
+
+	if( session->UsesLocalIO() ) 
+	{
+		XMP_Assert ( handlerInfo == 0 );
+		XMP_Assert ( (clientMode == Host_IO::kFMode_IsFile) || (clientMode == Host_IO::kFMode_DoesNotExist) );
+
+		std::string gpName, parentName;
+
+		if( clientMode == Host_IO::kFMode_DoesNotExist ) 
+		{
+			// 3. For does-not-exist:
+			//	3a. Split the client path into a leaf component and root path.
+			//	3b. Make sure the root path names an existing folder.
+			//	3c. Make sure the root folder has a viable top level child folder.
+
+			// ! This does "return 0" on failure, the file does not exist so a normal file handler can't apply.
+
+			if ( Host_IO::GetFileMode ( rootPath.c_str() ) != Host_IO::kFMode_IsFolder ) return 0;
+			
+			session->format = checkTopFolderName ( rootPath );
+			
+			if ( session->format == kXMP_UnknownFile ) return 0;
+
+			handlerInfo = this->tryFolderHandlers( session->format, rootPath, gpName, parentName, leafName, session );	// ! Parent and GP are empty.
+
+			return handlerInfo;	// ! Return found handler or 0.
+		}
+
+		XMP_Assert ( clientMode == Host_IO::kFMode_IsFile );
+
+		// 4. For is-file:
+		//	4a. Split the client path into root, grandparent, parent, and leaf.
+		//	4b. Make sure the parent or grandparent has a viable name.
+
+		// ! Don't "return 0" on failure, this has to fall through to the normal file handlers.
+
+		XIO::SplitLeafName( &rootPath, &parentName );
+		XIO::SplitLeafName( &rootPath, &gpName );
+		std::string origGPName ( gpName );	// ! Save the original case for XDCAM-FAM.
+		MakeUpperCase( &parentName );
+		MakeUpperCase( &gpName );
+
+		session->format = checkParentFolderNames( rootPath, gpName, parentName, leafName );
+
+		if( session->format != kXMP_UnknownFile ) 
+		{
+			if( (session->format == kXMP_XDCAM_FAMFile) &&
+			    ( (parentName == "CLIP") || (parentName == "EDIT") || (parentName == "SUB") ) ) 
+			{
+					// ! The standard says Clip/Edit/Sub, but we just shifted to upper case.
+					gpName = origGPName;	// ! XDCAM-FAM has just 1 level of inner folder, preserve the "MyMovie" case.
+			}
+
+			handlerInfo = tryFolderHandlers ( session->format, rootPath, gpName, parentName, leafName, session );
+			if ( handlerInfo != 0 ) return handlerInfo;
+
+		}
+	}
+
+#endif	// EnableDynamicMediaHandlers
+
+	// Try an initial file-oriented handler based on the extension.
+
+	if( session->UsesLocalIO() ) 
+	{
+		handlerInfo = pickDefaultHandler ( kXMP_UnknownFile, fileExt );	// Picks based on just the extension.
+
+		if( handlerInfo != 0 ) 
+		{
+			if( (session->ioRef == 0) && (! (handlerInfo->flags & kXMPFiles_HandlerOwnsFile)) ) 
+			{
+				session->ioRef = XMPFiles_IO::New_XMPFiles_IO ( clientPath, readOnly, &session->errorCallback);
+				if ( session->ioRef == 0 ) return 0;
+			} 
+			else if( (session->ioRef != 0) && (handlerInfo->flags & kXMPFiles_HandlerOwnsFile) ) 
+			{
+				delete session->ioRef;	// Close is implicit in the destructor.
+				session->ioRef = 0;
+			}
+			
+			session->format = handlerInfo->format;	// ! Hack to tell the CheckProc this is an initial call.
+			CheckFileFormatProc CheckProc = (CheckFileFormatProc) (handlerInfo->checkProc);
+			foundHandler = CheckProc ( handlerInfo->format, clientPath, session->ioRef, session );
+			XMP_Assert ( foundHandler || (session->tempPtr == 0) );
+			
+			if ( foundHandler ) return handlerInfo;
+		}
+	}
+
+	// Search the handlers that don't want to open the file themselves.
+
+	if( session->ioRef == 0 ) 
+	{
+		session->ioRef = XMPFiles_IO::New_XMPFiles_IO ( clientPath, readOnly, &session->errorCallback );
+		if ( session->ioRef == 0 ) return 0;
+	}
+	
+	XMPFileHandlerTablePos handlerPos = mNormalHandlers->begin();
+
+	for( ; handlerPos != mNormalHandlers->end(); ++handlerPos ) 
+	{
+		session->format = kXMP_UnknownFile;	// ! Hack to tell the CheckProc this is not an initial call.
+		handlerInfo = &handlerPos->second;
+		CheckFileFormatProc CheckProc = (CheckFileFormatProc) (handlerInfo->checkProc);
+		foundHandler = CheckProc ( handlerInfo->format, clientPath, session->ioRef, session );
+		XMP_Assert ( foundHandler || (session->tempPtr == 0) );
+		if ( foundHandler ) return handlerInfo;
+	}
+
+	// Search the handlers that do want to open the file themselves.
+
+	if( session->UsesLocalIO() ) 
+	{
+		delete session->ioRef;	// Close is implicit in the destructor.
+		session->ioRef = 0;
+		handlerPos = mOwningHandlers->begin();
+
+		for( ; handlerPos != mOwningHandlers->end(); ++handlerPos ) 
+		{
+			session->format = kXMP_UnknownFile;	// ! Hack to tell the CheckProc this is not an initial call.
+			handlerInfo = &handlerPos->second;
+			CheckFileFormatProc CheckProc = (CheckFileFormatProc) (handlerInfo->checkProc);
+			foundHandler = CheckProc ( handlerInfo->format, clientPath, session->ioRef, session );
+			XMP_Assert ( foundHandler || (session->tempPtr == 0) );
+			if ( foundHandler ) return handlerInfo;
+		}
+	}
+
+	// Failed to find a smart handler.
+
+	return 0;
+
+}	// HandlerRegistry::selectSmartHandler
+
+// =================================================================================================
+
+#if EnableDynamicMediaHandlers
+
+XMPFileHandlerInfo* HandlerRegistry::tryFolderHandlers( XMP_FileFormat format,
+													    const std::string & rootPath,
+														const std::string & gpName,
+														const std::string & parentName,
+														const std::string & leafName,
+														XMPFiles * parentObj )
+{
+	bool foundHandler = false;
+	XMPFileHandlerInfo * handlerInfo = 0;
+	XMPFileHandlerTablePos handlerPos;
+
+	// We know we're in a possible context for a folder-oriented handler, so try them.
+
+	if( format != kXMP_UnknownFile ) 
+	{
+
+		// Have an explicit format, pick that or nothing.
+		handlerPos = mFolderHandlers->find ( format );
+	
+		if( handlerPos != mFolderHandlers->end() ) 
+		{
+			handlerInfo = &handlerPos->second;
+			CheckFolderFormatProc CheckProc = (CheckFolderFormatProc) (handlerInfo->checkProc);
+			foundHandler = CheckProc ( handlerInfo->format, rootPath, gpName, parentName, leafName, parentObj );
+			XMP_Assert ( foundHandler || (parentObj->tempPtr == 0) );
+		}
+	} 
+	else 
+	{
+		// Try all of the folder handlers.
+		for( handlerPos = mFolderHandlers->begin(); handlerPos != mFolderHandlers->end(); ++handlerPos ) 
+		{
+			handlerInfo = &handlerPos->second;
+			CheckFolderFormatProc CheckProc = (CheckFolderFormatProc) (handlerInfo->checkProc);
+			foundHandler = CheckProc ( handlerInfo->format, rootPath, gpName, parentName, leafName, parentObj );
+			XMP_Assert ( foundHandler || (parentObj->tempPtr == 0) );
+			if ( foundHandler ) break;	// ! Exit before incrementing handlerPos.
+		}
+	}
+
+	if ( ! foundHandler ) handlerInfo = 0;
+
+	return handlerInfo;
+}
+
+#endif
+
+// =================================================================================================
+
+#if EnableDynamicMediaHandlers
+
+/*static*/ XMP_FileFormat HandlerRegistry::checkTopFolderName( const std::string & rootPath )
+{
+	// This is called when the input path to XMPFiles::OpenFile does not name an existing file (or
+	// existing anything). We need to quickly decide if this might be a logical path for a folder
+	// handler. See if the root contains the top content folder for any of the registered folder
+	// handlers. This check does not have to be precise, the handler will do that. This does have to
+	// be fast.
+	//
+	// Since we don't have many folder handlers, this is simple hardwired code.
+
+	std::string childPath = rootPath;
+	childPath += kDirChar;
+	size_t baseLen = childPath.size();
+
+	// P2 .../MyMovie/CONTENTS/<group>/... - only check for CONTENTS/CLIP
+	childPath += "CONTENTS";
+	childPath += kDirChar;
+	childPath += "CLIP";
+	if ( Host_IO::GetFileMode ( childPath.c_str() ) == Host_IO::kFMode_IsFolder ) return kXMP_P2File;
+	childPath.erase ( baseLen );
+
+	// XDCAM-FAM .../MyMovie/<group>/... - only check for Clip and MEDIAPRO.XML
+	childPath += "Clip";	// ! Yes, mixed case.
+	if ( Host_IO::GetFileMode ( childPath.c_str() ) == Host_IO::kFMode_IsFolder ) {
+		childPath.erase ( baseLen );
+		childPath += "MEDIAPRO.XML";
+		if ( Host_IO::GetFileMode ( childPath.c_str() ) == Host_IO::kFMode_IsFile ) return kXMP_XDCAM_FAMFile;
+	}
+	childPath.erase ( baseLen );
+
+	// XDCAM-SAM .../MyMovie/PROAV/<group>/... - only check for PROAV/CLPR
+	childPath += "PROAV";
+	childPath += kDirChar;
+	childPath += "CLPR";
+	if ( Host_IO::GetFileMode ( childPath.c_str() ) == Host_IO::kFMode_IsFolder ) return kXMP_XDCAM_SAMFile;
+	childPath.erase ( baseLen );
+
+	// XDCAM-EX .../MyMovie/BPAV/<group>/... - check for BPAV/CLPR
+	childPath += "BPAV";
+	childPath += kDirChar;
+	childPath += "CLPR";
+	if ( Host_IO::GetFileMode ( childPath.c_str() ) == Host_IO::kFMode_IsFolder ) return kXMP_XDCAM_EXFile;
+	childPath.erase ( baseLen );
+
+	// Sony HDV .../MyMovie/VIDEO/HVR/<file>.<ext> - check for VIDEO/HVR
+	childPath += "VIDEO";
+	childPath += kDirChar;
+	childPath += "HVR";
+	if ( Host_IO::GetFileMode ( childPath.c_str() ) == Host_IO::kFMode_IsFolder ) return kXMP_SonyHDVFile;
+	childPath.erase ( baseLen );
+
+	return kXMP_UnknownFile;
+
+}	// CheckTopFolderName
+
+#endif
+
+// =================================================================================================
+
+#if EnableDynamicMediaHandlers
+
+/*static*/ XMP_FileFormat HandlerRegistry::checkParentFolderNames( const std::string& rootPath,
+																   const std::string& gpName,
+																   const std::string& parentName, 
+																   const std::string& leafName )
+{
+	IgnoreParam ( parentName );
+
+	// This is called when the input path to XMPFiles::OpenFile names an existing file. We need to
+	// quickly decide if this might be inside a folder-handler's structure. See if the containing
+	// folders might match any of the registered folder handlers. This check does not have to be
+	// precise, the handler will do that. This does have to be fast.
+	//
+	// Since we don't have many folder handlers, this is simple hardwired code. Note that the caller
+	// has already shifted the names to upper case.
+
+	// P2  .../MyMovie/CONTENTS/<group>/<file>.<ext> - check CONTENTS and <group>
+	if ( (gpName == "CONTENTS") && CheckP2ContentChild ( parentName ) ) return kXMP_P2File;
+
+	// XDCAM-EX  .../MyMovie/BPAV/CLPR/<clip>/<file>.<ext> - check for BPAV/CLPR
+	// ! This must be checked before XDCAM-SAM because both have a "CLPR" grandparent.
+	if ( gpName == "CLPR" ) {
+		std::string tempPath, greatGP;
+		tempPath = rootPath;
+		XIO::SplitLeafName ( &tempPath, &greatGP );
+		MakeUpperCase ( &greatGP );
+		if ( greatGP == "BPAV" ) return kXMP_XDCAM_EXFile;
+	}
+
+	// XDCAM-FAM  .../MyMovie/<group>/<file>.<ext> - check that <group> is CLIP, or EDIT, or SUB
+	// ! The standard says Clip/Edit/Sub, but the caller has already shifted to upper case.
+	if ( (parentName == "CLIP") || (parentName == "EDIT") || (parentName == "SUB") ) return kXMP_XDCAM_FAMFile;
+
+	// XDCAM-SAM  .../MyMovie/PROAV/<group>/<clip>/<file>.<ext> - check for PROAV and CLPR or EDTR
+	if ( (gpName == "CLPR") || (gpName == "EDTR") ) {
+		std::string tempPath, greatGP;
+		tempPath = rootPath;
+		XIO::SplitLeafName ( &tempPath, &greatGP );
+		MakeUpperCase ( &greatGP );
+		if ( greatGP == "PROAV" ) return kXMP_XDCAM_SAMFile;
+	}
+
+	// Sony HDV  .../MyMovie/VIDEO/HVR/<file>.<ext> - check for VIDEO and HVR
+	if ( (gpName == "VIDEO") && (parentName == "HVR") ) return kXMP_SonyHDVFile;
+
+	return kXMP_UnknownFile;
+
+}	// CheckParentFolderNames
+
+#endif
diff --git a/XMPFiles/source/HandlerRegistry.h b/XMPFiles/source/HandlerRegistry.h
new file mode 100644
index 0000000..a146bfd
--- /dev/null
+++ b/XMPFiles/source/HandlerRegistry.h
@@ -0,0 +1,238 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 _HANDLERREGISTRY_h_
+#define _HANDLERREGISTRY_h_
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XMPFiles_IO.hpp"
+
+#include "XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h"
+#include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h"
+#include "source/Endian.h"
+
+namespace Common
+{
+
+/**
+	File handler data
+ */
+struct XMPFileHandlerInfo 
+{
+	XMP_FileFormat		format;
+	XMP_OptionBits		flags;
+	void*				checkProc;
+	XMPFileHandlerCTor	handlerCTor;
+
+	XMPFileHandlerInfo() : format(0), flags(0), checkProc(0), handlerCTor(0) 
+	{};
+	
+	XMPFileHandlerInfo( XMP_FileFormat _format, 
+						XMP_OptionBits _flags,
+						CheckFileFormatProc _checkProc, 
+						XMPFileHandlerCTor _handlerCTor )
+		: format(_format), flags(_flags), checkProc((void*)_checkProc), handlerCTor(_handlerCTor) 
+	{};
+	
+	XMPFileHandlerInfo( XMP_FileFormat _format, 
+						XMP_OptionBits _flags,
+						CheckFolderFormatProc _checkProc, 
+						XMPFileHandlerCTor _handlerCTor )
+		: format(_format), flags(_flags), checkProc((void*)_checkProc), handlerCTor(_handlerCTor) 
+	{};
+};
+
+/**
+	The singleton class HandlerRegistry is responsible to manage all file handler.
+	It registers file handlers during initialization time and provides functionality
+	to select a file handler based on a given file format.
+*/
+
+class HandlerRegistry
+{
+public:
+	static HandlerRegistry&		getInstance();
+	static void					terminate();
+
+#if EnableDynamicMediaHandlers
+	static XMP_FileFormat		checkTopFolderName( const std::string & rootPath );
+	static XMP_FileFormat		checkParentFolderNames( const std::string& rootPath,
+														const std::string& gpName,
+														const std::string& parentName, 
+														const std::string& leafName );
+#endif
+
+public:
+	/**
+	 * Register all file handler
+	 */
+	void				initialize();
+
+	/**
+	 * Register a single folder based file handler.
+	 *
+	 * @param format			File format identifier
+	 * @param flags				Flags
+	 * @param checkProc			Check format function pointer
+	 * @param handlerCTor		Factory function pointer
+	 * @param replaceExisting	Replace an already existing handler
+	 */
+	bool				registerFolderHandler( XMP_FileFormat			format,
+											   XMP_OptionBits			flags,
+											   CheckFolderFormatProc	checkProc,
+											   XMPFileHandlerCTor		handlerCTor,
+											   bool						replaceExisting = false );
+
+	/**
+	 * Register a single normal file handler.
+	 *
+	 * @param format			File format identifier
+	 * @param flags				Flags
+	 * @param checkProc			Check format function pointer
+	 * @param handlerCTor		Factory function pointer
+	 * @param replaceExisting	Replace an already existing handler
+	 */
+	bool				registerNormalHandler( XMP_FileFormat			format,
+											   XMP_OptionBits			flags,
+											   CheckFileFormatProc		checkProc,
+											   XMPFileHandlerCTor		handlerCTor,
+											   bool						replaceExisting = false );
+
+	/**
+	 * Register a single owning file handler.
+	 *
+	 * @param format			File format identifier
+	 * @param flags				Flags
+	 * @param checkProc			Check format function pointer
+	 * @param handlerCTor		Factory function pointer
+	 * @param replaceExisting	Replace an already existing handler
+	 */
+	bool				registerOwningHandler( XMP_FileFormat			format,
+											   XMP_OptionBits			flags,
+											   CheckFileFormatProc		checkProc,
+											   XMPFileHandlerCTor		handlerCTor,
+											   bool						replaceExisting = false );
+
+	// Remove a handler. Does nothing if no such handler exists.
+	void removeHandler ( XMP_FileFormat format );
+	
+	/**
+	 * Get file format identifier for filename extension.
+	 *
+	 * @param fileExt			Filename extension
+	 * @param addIfNotFound		If true if handler doesn't exists then add now
+	 */
+	XMP_FileFormat		getFileFormat( const std::string & fileExt, bool addIfNotFound = false );
+
+	/**
+	 * Get handler flags for file format.
+	 *
+	 * @param format	File format identifier
+	 * @param flags		Return handler flag
+	 * @return			True on success
+	 */
+	bool				getFormatInfo( XMP_FileFormat format, XMP_OptionBits* flags = NULL );
+
+	/**
+	 * Get handler information for passed format. 
+	 * The returned file handler is the default handler. I.e. that handler
+	 * that is used when called from outside using the XMPFiles API.
+	 *
+	 * @param format	File format identifier
+	 * @return			Return handler info if available, otherwise NULL
+	 */
+	XMPFileHandlerInfo*	getHandlerInfo( XMP_FileFormat format );
+
+	/**
+	 * Get file handler information of the standard file handler for the
+	 * file format identifier.
+	 * If there is a replacement for this format then the standard handler
+	 * is the replaced handler. Otherwise the standard handler and the 
+	 * default handler are the same.
+	 *
+	 * @param format	File format identifier
+	 * @return			Return handler info if available, otherwise NULL
+	 */
+	XMPFileHandlerInfo*	getStandardHandlerInfo( XMP_FileFormat format );
+
+	/**
+	 * Return true if there is a replacement for the file format
+	 */
+	bool isReplaced( XMP_FileFormat format );
+
+	/**
+	 * Select file handler based on passed information and setup XMPFiles instance with related data.
+	 *
+	 * @param session		XMPFiles instance
+	 * @param clientPath	Path to file
+	 * @param format		File format identifier
+	 * @param openFlags		Flags
+	 * @return				File handler structure
+	 */
+	XMPFileHandlerInfo*	selectSmartHandler( XMPFiles* session, XMP_StringPtr clientPath, XMP_FileFormat format, XMP_OptionBits openFlags );
+
+private:
+	/**
+	 * Return default file handler for file format identifier or filename extension
+	 *
+	 * @param format	File format identifier
+	 * @param fileExt	Filename extension
+	 * @return			File handler structure for passed format/extension
+	 */
+	XMPFileHandlerInfo* pickDefaultHandler ( XMP_FileFormat format, const std::string & fileExt );
+
+#if EnableDynamicMediaHandlers
+	/**
+	 * Try to find folder based file handler.
+	 *
+	 * @param format		File format identifier
+	 * @param rootPath		Path to root folder
+	 * @param gpName		Grand parent folder name
+	 * @param parentName	Parent folder name
+	 * @param leafName		File name
+	 * @param parentObj		XMPFiles instance
+	 * @return				File handler structure
+	 */
+	XMPFileHandlerInfo* tryFolderHandlers( XMP_FileFormat format,
+										   const std::string& rootPath,
+										   const std::string& gpName,
+										   const std::string& parentName,
+										   const std::string& leafName,
+										   XMPFiles* parentObj );
+#endif
+
+private:
+	/**
+	 * ctor/dtor
+	 */
+	 HandlerRegistry();
+	~HandlerRegistry();
+
+private:
+	typedef std::map <XMP_FileFormat, XMPFileHandlerInfo>	XMPFileHandlerTable;
+	typedef XMPFileHandlerTable::iterator					XMPFileHandlerTablePos;
+	typedef std::pair <XMP_FileFormat, XMPFileHandlerInfo>	XMPFileHandlerTablePair;
+
+	XMPFileHandlerTable*	mFolderHandlers;	// The directory-oriented handlers.
+	XMPFileHandlerTable*	mNormalHandlers;	// The normal file-oriented handlers.
+	XMPFileHandlerTable*	mOwningHandlers;	// The file-oriented handlers that "own" the file.
+
+	XMPFileHandlerTable*	mReplacedHandlers;	// All file handler that where replaced by a later one
+
+	static HandlerRegistry*	sInstance;			// singleton instance
+};
+
+} // Common
+
+#endif	// _HANDLERREGISTRY_h_
diff --git a/XMPFiles/source/Makefile.am b/XMPFiles/source/Makefile.am
new file mode 100644
index 0000000..6d1a1d3
--- /dev/null
+++ b/XMPFiles/source/Makefile.am
@@ -0,0 +1,57 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+SUBDIRS = FileHandlers FormatSupport NativeMetadataSupport PluginHandler
+
+noinst_LTLIBRARIES = libXMPFiles.la
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions -fno-strict-aliasing
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_HEADERS = XMPFiles.hpp XMPFiles_Impl.hpp HandlerRegistry.h
+
+libXMPFiles_la_SOURCES = WXMPFiles.cpp XMPFiles.cpp \
+	XMPFiles_Impl.cpp HandlerRegistry.cpp
+
+
+libXMPFiles_la_LIBADD = ./FileHandlers/libxmpfilehandlers.la \
+	./FormatSupport/libformatsupport.la \
+	./PluginHandler/libpluginhandler.la \
+	./NativeMetadataSupport/libnativemetadata.la
+#libXMPFiles_la_LDFLAGS = -version-info @LIBXMPCORE_VERSION_INFO@
diff --git a/XMPFiles/source/Makefile.in b/XMPFiles/source/Makefile.in
new file mode 100644
index 0000000..e906c17
--- /dev/null
+++ b/XMPFiles/source/Makefile.in
@@ -0,0 +1,791 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFiles/source
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libXMPFiles_la_DEPENDENCIES = ./FileHandlers/libxmpfilehandlers.la \
+	./FormatSupport/libformatsupport.la \
+	./PluginHandler/libpluginhandler.la \
+	./NativeMetadataSupport/libnativemetadata.la
+am_libXMPFiles_la_OBJECTS = WXMPFiles.lo XMPFiles.lo XMPFiles_Impl.lo \
+	HandlerRegistry.lo
+libXMPFiles_la_OBJECTS = $(am_libXMPFiles_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libXMPFiles_la_SOURCES)
+DIST_SOURCES = $(libXMPFiles_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = FileHandlers FormatSupport NativeMetadataSupport PluginHandler
+noinst_LTLIBRARIES = libXMPFiles.la
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions -fno-strict-aliasing
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_HEADERS = XMPFiles.hpp XMPFiles_Impl.hpp HandlerRegistry.h
+libXMPFiles_la_SOURCES = WXMPFiles.cpp XMPFiles.cpp \
+	XMPFiles_Impl.cpp HandlerRegistry.cpp
+
+libXMPFiles_la_LIBADD = ./FileHandlers/libxmpfilehandlers.la \
+	./FormatSupport/libformatsupport.la \
+	./PluginHandler/libpluginhandler.la \
+	./NativeMetadataSupport/libnativemetadata.la
+
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFiles/source/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFiles/source/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libXMPFiles.la: $(libXMPFiles_la_OBJECTS) $(libXMPFiles_la_DEPENDENCIES) $(EXTRA_libXMPFiles_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libXMPFiles_la_OBJECTS) $(libXMPFiles_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HandlerRegistry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WXMPFiles.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPFiles.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPFiles_Impl.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+#libXMPFiles_la_LDFLAGS = -version-info @LIBXMPCORE_VERSION_INFO@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp
new file mode 100644
index 0000000..2a3560c
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp
@@ -0,0 +1,231 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::IMetadata(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+IMetadata::IMetadata() 
+: mDirty(false) 
+{
+}
+
+IMetadata::~IMetadata() 
+{
+	for( ValueMap::iterator iter = mValues.begin(); iter != mValues.end(); iter++ )
+	{
+		delete iter->second;
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::parse(...)
+// 
+// Purpose: Parses the given memory block and creates a data model representation
+//			We assume that any metadata block is < 4GB so that we can savely use 
+//			32bit sizes.
+//			Throws exceptions if parsing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+void IMetadata::parse( const XMP_Uns8* input, XMP_Uns64 size )
+{
+	XMP_Throw ( "Method not implemented", kXMPErr_Unimplemented );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::parse(...)
+// 
+// Purpose: Parses the given file and creates a data model representation
+//			Throws exceptions if parsing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+void IMetadata::parse( XMP_IO* input )
+{
+	XMP_Throw ( "Method not implemented", kXMPErr_Unimplemented );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::serialize(...)
+// 
+// Purpose: Serializes the data model to a memory block. 
+//			The method creates a buffer and pass it to the parameter 'buffer'. 
+//			The callee of the method is responsible to delete the buffer later on.
+//			We assume that any metadata block is < 4GB so that we can savely use 
+//			32bit sizes.
+//			Throws exceptions if serializing is not possible
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns64 IMetadata::serialize( XMP_Uns8** buffer )
+{
+	XMP_Throw ( "Method not implemented", kXMPErr_Unimplemented );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::hasChanged(...)
+// 
+// Purpose: Return true if any values of this container was modified
+// 
+//-----------------------------------------------------------------------------
+
+bool IMetadata::hasChanged() const
+{
+	bool isDirty = mDirty;
+
+	for( ValueMap::const_iterator iter=mValues.begin(); ! isDirty && iter != mValues.end(); iter++ )
+	{
+		isDirty = iter->second->hasChanged();
+	}
+
+	return isDirty;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::resetChanges(...)
+// 
+// Purpose: Reset dirty flag
+// 
+//-----------------------------------------------------------------------------
+
+void IMetadata::resetChanges()
+{
+	mDirty = false;
+
+	for( ValueMap::iterator iter=mValues.begin(); iter != mValues.end(); iter++ )
+	{
+		iter->second->resetChanged();
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::isEmpty(...)
+// 
+// Purpose: Return true if the no metadata are available in this container
+// 
+//-----------------------------------------------------------------------------
+
+bool IMetadata::isEmpty() const
+{
+	return mValues.empty();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::deleteValue(...)
+// 
+// Purpose: Remove value for passed identifier
+// 
+//-----------------------------------------------------------------------------
+
+void IMetadata::deleteValue( XMP_Uns32 id )
+{
+	ValueMap::iterator iterator = mValues.find( id );
+
+	if( iterator != mValues.end() )
+	{
+		delete iterator->second;
+		mValues.erase( iterator );
+
+		mDirty = true;
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::deleteAll(...)
+// 
+// Purpose: Remove all stored values
+// 
+//-----------------------------------------------------------------------------
+
+void IMetadata::deleteAll()
+{
+	mDirty = ( mValues.size() > 0 );
+
+	for( ValueMap::iterator iter = mValues.begin(); iter != mValues.end(); iter++ )
+	{
+		delete iter->second;
+	}
+
+	mValues.clear();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::valueExists(...)
+// 
+// Purpose: Return true if an value for the passed identifier exists
+// 
+//-----------------------------------------------------------------------------
+
+bool IMetadata::valueExists( XMP_Uns32 id ) const
+{
+	ValueMap::const_iterator iterator = mValues.find( id );
+
+	return ( iterator != mValues.end() );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IMetadata::valueChanged(...)
+// 
+// Purpose: Return true if the value for the passed identifier was changed
+// 
+//-----------------------------------------------------------------------------
+
+bool IMetadata::valueChanged( XMP_Uns32 id ) const
+{
+	ValueMap::const_iterator iterator = mValues.find( id );
+
+	if( iterator != mValues.end() )
+	{
+		return iterator->second->hasChanged();
+	}
+
+	return false;
+}
+
+//-----------------------------------------------------------------------------
+//
+// IMetadata::valueValid(...)
+//
+// Purpose: Return true if the value for the passed identifier is valid
+//
+//-----------------------------------------------------------------------------
+
+bool IMetadata::valueValid( XMP_Uns32 id, ValueObject *value )
+{
+	return true;
+}
+
+//-----------------------------------------------------------------------------
+//
+// IMetadata::valueValid(...)
+//
+// Purpose: Return true if the value for the passed identifier is valid
+//
+//-----------------------------------------------------------------------------
+void IMetadata::valueModify(XMP_Uns32 id, ValueObject *value)
+{
+	return;
+}
\ No newline at end of file
diff --git a/XMPFiles/source/NativeMetadataSupport/IMetadata.h b/XMPFiles/source/NativeMetadataSupport/IMetadata.h
new file mode 100644
index 0000000..b85239b
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.h
@@ -0,0 +1,356 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _IMetadata_h_
+#define _IMetadata_h_
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+#include "source/XMP_LibUtils.hpp"
+#include "XMPFiles/source/NativeMetadataSupport/ValueObject.h"
+
+#include <map>
+
+/**
+ * The class IMetadata is supposed to store any unique metadata.
+ * It provides a generic interface to store any data types or arrays of any data types.
+ * The requirements for used datatypes are defined by the class ValueObject and its derived classes.
+ * For each single value as well as for the container as a whole modification and existing state is provided.
+ * It also provids methods to parse a byte block to distinct values or to serialize values to a byte block.
+ * IMetadata is an abstract class due to the method isEmptyValue(...). Derived classes needs to implement this 
+ * method. It has to define when a certain value is "empty", since "empty" values are not stored but removed
+ * from the container.
+ * 
+ */
+class IMetadata
+{
+public:
+	/** 
+	 * ctor/dtor 
+	 */
+	IMetadata();
+	virtual ~IMetadata();
+
+
+	/**
+	 * Parses the given memory block and creates a data model representation
+	 * We assume that any metadata block is < 4GB so that we can savely use 32bit sizes.
+	 * Throws exceptions if parsing is not possible
+	 *
+	 * @param input		The byte buffer to parse
+	 * @param size		Size of the given byte buffer
+	 */
+	virtual void parse( const XMP_Uns8* input, XMP_Uns64 size );
+
+
+	/**
+	 * Parses the given file and creates a data model representation
+	 * Throws exceptions if parsing is not possible
+	 *
+	 * @param input		The file to parse
+	 */
+	virtual void parse( XMP_IO* input );
+	
+
+	/**
+	 * Serializes the data model to a memory block. 
+	 * The method creates a buffer and pass it to the parameter 'buffer'. The callee of
+	 * the method is responsible to delete the buffer later on.
+	 * We assume that any metadata block is < 4GB so that we can savely use 32bit sizes.
+	 * Throws exceptions if serializing is not possible
+	 *
+	 * @param buffer	Buffer that gets filled with serialized data
+	 * @param size		Size of passed in buffer
+	 *
+	 * @ return			Buffer size
+	 */
+	virtual XMP_Uns64 serialize( XMP_Uns8** buffer );
+
+	/**
+	 * Return true if any values of this container was modified
+	 */
+	virtual bool hasChanged() const;
+
+	/**
+	 * Reset dirty flag
+	 */
+	virtual void resetChanges();
+
+	/**
+	 * Return true if the no metadata are available in this container
+	 */
+	virtual bool isEmpty() const;
+
+	/**
+	 * Set value for passed identifier
+	 *
+	 * @param id	Identifier of value
+	 * @param value New value of passed data type
+	 */
+	template<class T> void	setValue( XMP_Uns32 id, const T& value );
+	
+	/**
+	 * Set array for passed identifier
+	 *
+	 * @param id			Identifier of value
+	 * @param value			Pointer to the array
+	 * @param bufferSize	Number of array elements
+	 */
+	template<class T> void setArray( XMP_Uns32 id, const T* buffer, XMP_Uns32 numElements);
+
+	/**
+	 * Return value for passed identifier.
+	 * If the value doesn't exists an exception is thrown!
+	 *
+	 * @param id	Identifier of value
+	 * @return		Value of passed data type
+	 */
+	template<class T> const T&	getValue( XMP_Uns32 id ) const;
+	
+	/**
+	 * Return array for passed identifier
+	 * If the array doesn't exists an exception is thrown!
+	 *
+	 * @param id			Identifier of value
+	 * @param outBuffer		Array
+	 * @return				Number of array elements
+	 */
+	template<class T> const T* const getArray( XMP_Uns32 id, XMP_Uns32& outSize ) const;
+
+	/**
+	 * Remove value for passed identifier
+	 *
+	 * @param id	Identifier of value
+	 */
+	virtual void deleteValue( XMP_Uns32 id );
+
+	/**
+	 * Remove all stored values
+	 */
+	virtual void deleteAll();
+
+	/**
+	 * Return true if an value for the passed identifier exists
+	 *
+	 * @param id	Identifier of value
+	 */
+	virtual bool valueExists( XMP_Uns32 id ) const;
+
+	/**
+	 * Return true if the value for the passed identifier was changed
+	 *
+	 * @param id	Identifier of value
+	 */
+	virtual bool valueChanged( XMP_Uns32 id ) const;
+	
+protected:
+	/**
+	 * Is the value of the passed ValueObject that belongs to the given id "empty"?
+	 * Derived classes are required to implement this method and define "empty"
+	 * for its values.
+	 * Needed for setValue and setArray.
+	 *
+	 * @param id		Identifier of passed value
+	 * @param valueObj	Value to inspect
+	 *
+	 * @return			True if the value is "empty"
+	 */
+	virtual	bool isEmptyValue( XMP_Uns32 id, ValueObject& valueObj ) = 0;
+
+	/**
+	 * Validates the value for the passed identifier
+	 * @param id	Identifier of value
+	 * @param value	pointer to value object
+	 */
+	virtual bool valueValid( XMP_Uns32 id, ValueObject * value );
+
+	/**
+	 * Modify the value for the passed identifier
+	 * @param id	Identifier of value
+	 * @param value	pointer to value object
+	 */
+	virtual void valueModify( XMP_Uns32 id, ValueObject * value );
+	
+private:
+	// Operators hidden on purpose
+	IMetadata( const IMetadata& ) {};
+	IMetadata& operator=( const IMetadata& ) { return *this; };
+
+protected:
+	typedef std::map<XMP_Uns32, ValueObject*> ValueMap;
+	ValueMap		mValues;
+	bool			mDirty;
+};
+
+template<class T> void IMetadata::setValue( XMP_Uns32 id, const T& value )
+{
+	TValueObject<T>* valueObj = NULL;
+
+	//
+	// find existing value for id
+	//
+	ValueMap::iterator iterator = mValues.find( id );
+
+	if( iterator != mValues.end() )
+	{
+		//
+		// value exists, set new value
+		//
+		valueObj = dynamic_cast<TValueObject<T>*>( iterator->second );
+
+		if( valueObj != NULL ) 
+		{
+			TValueObject< T > newValueObj( value );
+			if ( valueValid( id, &newValueObj ) ) {
+				valueModify( id, &newValueObj );
+				valueObj->setValue( newValueObj.getValue() );
+			}
+		}
+		else
+		{
+			XMP_Throw ( "Invalid identifier", kXMPErr_InternalFailure );
+		}
+	}
+	else
+	{
+		//
+		// value doesn't exists yet and is not "empty"
+		// so add a new value to the map
+		//
+		TValueObject< T > newValueObj( value );
+		if ( this->valueValid( id, &newValueObj ) )
+		{
+			this->valueModify( id, &newValueObj );
+			valueObj = new TValueObject<T>( newValueObj.getValue() );
+			mValues[id] = valueObj;
+			mDirty = true;	// the new created value isn't dirty, but the container becomes dirty
+		}
+	}
+
+	//
+	// check if the value is "empty"
+	//
+	if( this->isEmptyValue( id, *valueObj ) )
+	{
+		//
+		// value is "empty", delete it
+		//
+		this->deleteValue( id );
+	}
+}
+
+template<class T> void IMetadata::setArray( XMP_Uns32 id, const T* buffer, XMP_Uns32 numElements )
+{
+	TArrayObject<T>* arrayObj = NULL;
+
+	//
+	// find existing value for id
+	//
+	ValueMap::iterator iterator = mValues.find( id );
+
+	if( iterator != mValues.end() )
+	{
+		//
+		// value exists, set new value
+		//
+		arrayObj = dynamic_cast<TArrayObject<T>*>( iterator->second );
+
+		if( arrayObj != NULL )
+		{
+			arrayObj->setArray( buffer, numElements );
+		}
+		else
+		{
+			XMP_Throw ( "Invalid identifier", kXMPErr_InternalFailure );
+		}
+	}
+	else
+	{
+		//
+		// value doesn't exists yet and is not "empty"
+		// so add a new value to the map
+		//
+		arrayObj = new TArrayObject<T>( buffer, numElements );
+		mValues[id] = arrayObj;
+
+		mDirty = true;	// the new created value isn't dirty, but the container becomes dirty
+	}
+
+	//
+	// check if the value is "empty"
+	//
+	if( this->isEmptyValue( id, *arrayObj ) )
+	{
+		//
+		// value is "empty", delete it
+		//
+		this->deleteValue( id );
+	}
+}
+
+template<class T> const T& IMetadata::getValue( XMP_Uns32 id ) const
+{
+	ValueMap::const_iterator iterator = mValues.find( id );
+
+	if( iterator != mValues.end() )
+	{
+		//
+		// values exists, return value string
+		//
+		TValueObject<T>* valueObj = dynamic_cast<TValueObject<T>*>( iterator->second );
+
+		if( valueObj != NULL )
+		{
+			return valueObj->getValue();
+		}
+		else
+		{
+			XMP_Throw ( "Invalid identifier", kXMPErr_InternalFailure );
+		}
+	}
+	else
+	{
+		//
+		// value for id doesn't exists, throw an exception
+		//
+		XMP_Throw ( "Invalid identifier", kXMPErr_InternalFailure );
+	}
+}
+
+template<class T> const T* const IMetadata::getArray( XMP_Uns32 id, XMP_Uns32& outSize ) const
+{
+	ValueMap::const_iterator iterator = mValues.find( id );
+
+	if( iterator != mValues.end() )
+	{
+		//
+		// values exists, return value string
+		//
+		TArrayObject<T>* arrayObj = dynamic_cast<TArrayObject<T>*>( iterator->second );
+
+		if( arrayObj != NULL )
+		{
+			return arrayObj->getArray( outSize );
+		}
+		else
+		{
+			XMP_Throw ( "Invalid identifier", kXMPErr_InternalFailure );
+		}
+	}
+	else
+	{
+		//
+		// value for id doesn't exists, throw an exception
+		//
+		XMP_Throw ( "Invalid identifier", kXMPErr_InternalFailure );
+	}
+}
+
+#endif
diff --git a/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp b/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp
new file mode 100644
index 0000000..b7d4405
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp
@@ -0,0 +1,543 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "XMPFiles/source/NativeMetadataSupport/IReconcile.h"
+
+#include "XMPFiles/source/NativeMetadataSupport/MetadataSet.h"
+#include "XMPFiles/source/NativeMetadataSupport/IMetadata.h"
+
+#include "XMPFiles/source/FormatSupport/Reconcile_Impl.hpp"
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEReconcile::importNativeToXMP(...)
+// 
+// Purpose: [static] Import native metadata container into XMP.
+//					 This method is supposed to import all native metadata values 
+//					 that are listed in the property table from the IMetadata 
+//					 instance to the SXMPMeta instance.
+// 
+//-----------------------------------------------------------------------------
+
+bool IReconcile::importNativeToXMP( SXMPMeta& outXMP, const IMetadata& nativeMeta, const MetadataPropertyInfo* propertyInfo, bool xmpPriority )
+{
+	bool changed = false;
+
+	std::string xmpValue;
+	XMP_Uns32 index = 0;
+
+	do
+	{
+		if( propertyInfo[index].mXMPSchemaNS != NULL )
+		{
+			bool xmpPropertyExists = false;
+
+			//
+			// need to know if the XMP property exists either
+			// if a priority needs to be considered or if
+			// the value isn't set by a native value
+			//
+			switch( propertyInfo[index].mXMPType )
+			{
+				case kXMPType_Simple:
+				{
+					xmpPropertyExists = outXMP.DoesPropertyExist( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName );
+				}
+				break;
+
+				case kXMPType_Localized:
+				{
+					std::string actualLang;
+					bool result = outXMP.GetLocalizedText( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, "" , "x-default" , &actualLang, NULL, NULL );
+					// If existing and the appropriate one
+					xmpPropertyExists = result && (actualLang == "x-default");
+				}
+				break;
+
+				case kXMPType_Array:
+				case kXMPType_OrderedArray:
+				{
+					xmpPropertyExists = outXMP.DoesArrayItemExist( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, 1 );
+				}
+				break;
+
+				default:
+				{
+					XMP_Throw( "Unknown XMP data type", kXMPErr_InternalFailure );
+				}
+				break;
+			}
+
+			//
+			// import native property if there is no priority or
+			// the XMP property doesn't exist yet
+			//
+			if( ! propertyInfo[index].mConsiderPriority || ! xmpPriority || ! xmpPropertyExists )
+			{
+				//
+				// if the native property exists
+				//
+				if( nativeMeta.valueExists( propertyInfo[index].mMetadataID ) )
+				{
+					//
+					// prepare native property value for XMP
+					// depending on the native data type
+					//
+					xmpValue.erase();
+
+					switch( propertyInfo[index].mNativeType )
+					{
+						case kNativeType_Str:
+						{
+							xmpValue = nativeMeta.getValue<std::string>( propertyInfo[index].mMetadataID );
+						}
+						break;
+
+						case kNativeType_StrASCII:
+						{
+							convertToASCII( nativeMeta.getValue<std::string>( propertyInfo[index].mMetadataID ), xmpValue );
+						}
+						break;
+
+						case kNativeType_StrLocal:
+						{
+							ReconcileUtils::NativeToUTF8( nativeMeta.getValue<std::string>( propertyInfo[index].mMetadataID ), xmpValue );
+						}
+						break;
+
+						case kNativeType_StrUTF8:
+						{
+							ReconcileUtils::NativeToUTF8( nativeMeta.getValue<std::string>( propertyInfo[index].mMetadataID ), xmpValue );
+						}
+						break;
+
+						case kNativeType_Uns64:
+						{
+							SXMPUtils::ConvertFromInt64( nativeMeta.getValue<XMP_Uns64>( propertyInfo[index].mMetadataID ), "%llu", &xmpValue );
+						}
+						break;
+
+						case kNativeType_Uns32:
+						{
+							SXMPUtils::ConvertFromInt( nativeMeta.getValue<XMP_Uns32>( propertyInfo[index].mMetadataID ), "%lu", &xmpValue );
+						}
+						break;
+
+						case kNativeType_Int32:
+						{
+							SXMPUtils::ConvertFromInt( nativeMeta.getValue<XMP_Int32>( propertyInfo[index].mMetadataID ), 0 /* default format */, &xmpValue );
+						}
+						break;
+
+						case kNativeType_Uns16:
+						{
+							SXMPUtils::ConvertFromInt( nativeMeta.getValue<XMP_Uns16>( propertyInfo[index].mMetadataID ), "%lu", &xmpValue );
+						}
+						break;
+
+						case kNativeType_Bool:
+						{
+							SXMPUtils::ConvertFromBool( nativeMeta.getValue<bool>( propertyInfo[index].mMetadataID ), &xmpValue );
+						}
+						break;
+
+						default:
+						{
+							XMP_Throw( "Unknown native data type", kXMPErr_InternalFailure );
+						}
+						break;
+					};
+
+					if( ! xmpValue.empty() )
+					{
+						//
+						// set the new XMP value depending on the 
+						// XMP data type
+						//
+						switch( propertyInfo[index].mXMPType )
+						{
+							case kXMPType_Localized:
+							{
+								outXMP.SetLocalizedText( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, NULL, "x-default", xmpValue.c_str() );
+							}
+							break;
+
+							case kXMPType_Array:
+							{
+								// Overwrite any existing array
+								outXMP.DeleteProperty( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName );
+								outXMP.AppendArrayItem( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, kXMP_PropArrayIsUnordered, xmpValue.c_str(), kXMP_NoOptions );
+							}
+							break;
+
+							case kXMPType_OrderedArray:
+							{
+								// Overwrite any existing array
+								outXMP.DeleteProperty( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName );
+								outXMP.AppendArrayItem( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, kXMP_PropArrayIsOrdered, xmpValue.c_str(), kXMP_NoOptions );
+							}
+							break;
+
+							default:
+							{
+								outXMP.SetProperty( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, xmpValue.c_str() );	
+							}
+							break;
+						}
+
+						changed = true;
+					}
+				}
+				else if( propertyInfo[index].mDeleteXMPIfNoNative && xmpPropertyExists )
+				{
+					//
+					// native value doesn't exists, delete the XMP property
+					//
+					outXMP.DeleteProperty( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName );
+					changed = xmpPropertyExists;
+				}
+			}
+		}
+
+		index++;
+
+	} while( propertyInfo[index].mXMPSchemaNS != NULL );
+
+	return changed;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// WAVEReconcile::exportXMPToNative(...)
+// 
+// Purpose: [static] Export XMP values to native metadata container.
+//					 This method is supposed to export all native metadata values 
+//					 that are listed in the property table from the XMP container 
+//					 to the IMetadata instance.
+// 
+//-----------------------------------------------------------------------------
+
+bool IReconcile::exportXMPToNative( IMetadata& outNativeMeta, SXMPMeta& inXMP, const MetadataPropertyInfo* propertyInfo, PropertyList * propertiesExportedSuccessfully /*= NULL*/ )
+{
+	std::string xmpValue;
+	XMP_Uns32 index = 0;
+
+	do
+	{
+		if( propertyInfo[index].mXMPSchemaNS != NULL && propertyInfo[index].mExportPolicy != kExport_Never )
+		{
+			bool xmpPropertyExists = false;
+
+			//
+			// get value from XMP depending on
+			// the XMP data type
+			//
+			switch( propertyInfo[index].mXMPType )
+			{
+				case kXMPType_Localized:
+				{
+					std::string lang;
+					xmpPropertyExists = inXMP.GetLocalizedText( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, NULL, "x-default", &lang, &xmpValue, 0 );
+				}
+				break;
+
+				case kXMPType_Array:
+				case kXMPType_OrderedArray:
+				{
+					// TOTRACK currently only the first array item is used
+					if( inXMP.CountArrayItems( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) > 0 )
+					{
+						xmpPropertyExists = inXMP.GetArrayItem( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, 1, &xmpValue, 0 );
+					}
+				}
+				break;
+
+				default:
+				{
+					xmpPropertyExists = inXMP.GetProperty( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName, &xmpValue, 0 );
+				}
+				break;
+			}
+
+			//
+			// convert xmp value and set native property
+			// depending on the native data type and the export policy
+			//
+			if( xmpPropertyExists &&
+				( propertyInfo[index].mExportPolicy != kExport_InjectOnly || 
+				! outNativeMeta.valueExists( propertyInfo[index].mMetadataID ) ) )
+			{
+
+				switch( propertyInfo[index].mNativeType )
+				{
+					case kNativeType_StrASCII:
+					{
+						std::string ascii;
+						convertToASCII( xmpValue, ascii );
+						outNativeMeta.setValue<std::string>( propertyInfo[index].mMetadataID, ascii );
+						if ( propertiesExportedSuccessfully )
+							propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+					}
+					break;
+
+					case kNativeType_Str:
+					case kNativeType_StrUTF8:
+					{
+						outNativeMeta.setValue<std::string>( propertyInfo[index].mMetadataID, xmpValue );
+						if ( propertiesExportedSuccessfully )
+							propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+					}
+					break;
+
+					case kNativeType_StrLocal:
+					{
+						std::string value;
+
+						try
+						{
+							ReconcileUtils::UTF8ToLocal( xmpValue.c_str(), xmpValue.size(), &value );
+							outNativeMeta.setValue<std::string>( propertyInfo[index].mMetadataID, value );
+							if ( propertiesExportedSuccessfully )
+								propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+						}
+						catch( XMP_Error& e )
+						{
+							if( e.GetID() != kXMPErr_Unavailable )
+							{
+								// rethrow exception if it wasn't caused
+								// by missing encoding functionality (UNIX)
+								throw e;
+							}
+						}
+					}
+					break;
+
+					case kNativeType_Uns64:
+					{
+						XMP_Int64 value = 0;
+						bool error = false;
+
+						try
+						{
+							value = SXMPUtils::ConvertToInt64( xmpValue );
+						}
+						catch( XMP_Error& e )
+						{
+							if ( e.GetID() != kXMPErr_BadParam )
+							{
+								// rethrow exception if it wasn't caused by an
+								// invalid parameter for the conversion
+								throw e;
+							}
+							error = true;
+						}
+
+						// Only write the value if it could be converted to a number and has a positive value
+						if( ! error && value >= 0 )
+						{
+							outNativeMeta.setValue<XMP_Uns64>( propertyInfo[index].mMetadataID, static_cast<XMP_Uns64>(value) );
+							if ( propertiesExportedSuccessfully )
+								propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+						}
+					}
+					break;
+
+					case kNativeType_Uns32:
+					{
+						XMP_Int32 value = 0;
+						bool error = false;
+
+						try
+						{
+							value = SXMPUtils::ConvertToInt( xmpValue );
+						}
+						catch( XMP_Error& e )
+						{
+							if ( e.GetID() != kXMPErr_BadParam )
+							{
+								// rethrow exception if it wasn't caused by an
+								// invalid parameter for the conversion
+								throw e;
+							}
+							error = true;
+						}
+
+						// Only write the value if it could be converted to a number and has a positive value
+						if( ! error && value >= 0 )
+						{
+							outNativeMeta.setValue<XMP_Uns32>( propertyInfo[index].mMetadataID, static_cast<XMP_Uns32>(value) );
+							if ( propertiesExportedSuccessfully )
+								propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+						}
+					}
+					break;
+
+					case kNativeType_Int32:
+					{
+						XMP_Int32 value = 0;
+						bool error = false;
+
+						try
+						{
+							value = SXMPUtils::ConvertToInt( xmpValue );
+						}
+						catch( XMP_Error& e )
+						{
+							if ( e.GetID() != kXMPErr_BadParam )
+							{
+								// rethrow exception if it wasn't caused by an
+								// invalid parameter for the conversion
+								throw e;
+							}
+							error = true;
+						}
+
+						// Only write the value if it could be converted to a number
+						if( ! error )
+						{
+							outNativeMeta.setValue<XMP_Int32>( propertyInfo[index].mMetadataID, static_cast<XMP_Int32>(value) );
+							if ( propertiesExportedSuccessfully )
+								propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+						}
+					}
+					break;
+
+					case kNativeType_Uns16:
+					{
+						XMP_Int32 value = 0;
+						bool error = false;
+
+						try
+						{
+							value = SXMPUtils::ConvertToInt( xmpValue );
+						}
+						catch( XMP_Error& e )
+						{
+							if ( e.GetID() != kXMPErr_BadParam )
+							{
+								// rethrow exception if it wasn't caused by an
+								// invalid parameter for the conversion
+								throw e;
+							}
+							error = true;
+						}
+						
+						// Only write the value if it could be converted to a number and has a positive value
+						if( ! error && value >= 0 )
+						{
+							outNativeMeta.setValue<XMP_Uns16>( propertyInfo[index].mMetadataID, static_cast<XMP_Uns16>(value) );
+							if ( propertiesExportedSuccessfully )
+								propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+						}
+					}
+					break;
+
+					case kNativeType_Bool:
+					{
+						bool value;
+						bool error = false;
+
+						try
+						{
+							value = SXMPUtils::ConvertToBool( xmpValue );
+						}
+						catch( XMP_Error& e )
+						{
+							if ( e.GetID() != kXMPErr_BadParam )
+							{
+								// rethrow exception if it wasn't caused by an
+								// invalid parameter for the conversion
+								throw e;
+							}
+							error = true;
+						}
+
+						// Only write the value if it could be converted to a number and has a positive value
+						if( ! error )
+						{
+							outNativeMeta.setValue<bool>( propertyInfo[index].mMetadataID, value );
+							if ( propertiesExportedSuccessfully )
+								propertiesExportedSuccessfully->push_back( std::make_pair( propertyInfo[index].mXMPSchemaNS, propertyInfo[index].mXMPPropName ) );
+						}
+					}
+					break;
+
+					default:
+					{
+						XMP_Throw( "Unknown native data type", kXMPErr_InternalFailure );
+					}
+					break;
+				}
+			}
+			else
+			{
+				if( propertyInfo[index].mExportPolicy == kExport_Always )
+				{
+					//
+					// delete native value if the corresponding XMP value doesn't exists
+					//
+					outNativeMeta.deleteValue( propertyInfo[index].mMetadataID );
+				}
+			}
+		}
+
+		index++;
+
+	} while( propertyInfo[index].mXMPSchemaNS != NULL );
+
+	return outNativeMeta.hasChanged();
+}
+
+//-----------------------------------------------------------------------------
+// 
+// IReconcile::convertToASCII(...)
+// 
+// Purpose: Converts input string to an ascii output string
+//			- terminates at first 0
+//			- replaces all non ascii with 0x3F ('?')
+// 
+//-----------------------------------------------------------------------------
+
+void IReconcile::convertToASCII( const std::string& input, std::string& output )
+{
+	output.erase();
+	output.reserve( input.length() );
+
+	bool isUTF8 = ReconcileUtils::IsUTF8( input.c_str(), input.length() );
+
+	XMP_StringPtr iter = input.c_str();
+
+	for ( XMP_Uns32 i=0; i < input.length(); i++ )
+	{
+		XMP_Uns8 c = (XMP_Uns8) iter[i];
+		if ( c == 0 )  // early 0 termination, leave.
+			break;
+		if ( c > 127 ) // uft-8 multi-byte sequence.
+		{
+			if ( isUTF8 ) // skip all high bytes
+			{
+				// how many bytes in this ?
+				if ( c >= 0xC2 && c <= 0xDF )
+					i+=1; // 2-byte sequence
+				else if ( c >= 0xE0 && c <= 0xEF )
+					i+=2; // 3-byte sequence
+				else if ( c >= 0xF0 && c <= 0xF4 )
+					i+=3; // 4-byte sequence
+				else
+					continue; //invalid sequence, look for next 'low' byte ..
+			} // thereafter and 'else': just append a question mark:
+			output.append( 1, '?' );
+		}
+		else // regular valid ascii. 1 byte.
+		{
+			output.append( 1, iter[i] );
+		}
+	}
+}	// convertToASCII
+
diff --git a/XMPFiles/source/NativeMetadataSupport/IReconcile.h b/XMPFiles/source/NativeMetadataSupport/IReconcile.h
new file mode 100644
index 0000000..16a0109
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.h
@@ -0,0 +1,142 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _IReconcile_h_
+#define _IReconcile_h_
+
+#include <string>
+
+#ifndef TXMP_STRING_TYPE
+	#define TXMP_STRING_TYPE std::string
+#endif
+
+#include "XMP.hpp"
+
+class MetadataSet;
+class IMetadata;
+
+enum XMPPropertyType
+{
+	kXMPType_Simple,
+	// Structs can be treated as Simple if the whole path is given to the API
+	kXMPType_Localized,
+	// Unordered array (bag)
+	kXMPType_Array,
+	// Ordered array (seq)
+	kXMPType_OrderedArray
+};
+
+/** Types that describe how the native property is interpreted */
+enum MetadataPropertyType
+{
+	kNativeType_Str,		// Take the value as is
+	kNativeType_StrASCII,	// Treat it as ASCII, convert if necessary
+	kNativeType_StrUTF8,	// Treat it as UTF-8, convert if necessary
+	kNativeType_StrLocal,	// Use local encoding
+	kNativeType_Uns64,
+	kNativeType_Uns32,
+	kNativeType_Int32,
+	kNativeType_Uns16,
+	kNativeType_Bool
+};
+
+/** Types that describe how an XMP property is exported to native Metadata */
+enum ExportPolicy
+{
+	kExport_Never = 0,		// Never export.
+	kExport_Always = 1,		// Add, modify, or delete.
+	kExport_NoDelete = 2,	// Add or modify, do not delete if no XMP.
+	kExport_InjectOnly = 3	// Add tag if new, never modify or delete existing values.
+};
+
+struct MetadataPropertyInfo
+{
+	XMP_StringPtr			mXMPSchemaNS;
+	XMP_StringPtr			mXMPPropName;
+	XMP_Uns32				mMetadataID;
+	MetadataPropertyType	mNativeType;
+	XMPPropertyType			mXMPType;
+	// If true, delete the XMP property if the native one does not exist on import
+	bool					mDeleteXMPIfNoNative;
+	// If true, any existing XMP has higher priority on import
+	bool					mConsiderPriority;
+	ExportPolicy			mExportPolicy;
+};
+
+class IReconcile
+{
+public:
+	typedef std::vector< std::pair< XMP_StringPtr, XMP_StringPtr > > PropertyList;
+
+	virtual ~IReconcile() {};
+	/**
+	 * Reconciles metadata from legacy formats into XMP.
+	 * 
+	 * @param outXMP the reconciliated XMP packet contains all XMP and legacy metadata,
+	 *		  it is created and owned by the the caller. 
+	 * @param inMetaData contains all legacy containers that are relevant for the processed file format AND 
+	 *		  which actually contain data.
+	 *		  If a container is not included in the set, it is omitted by the reconciliation method.
+	 *		  Note: inMetaData#getXMP() and outXMP can be the same object
+	 * @return XMP has been changed (true) or not (false)
+	 *
+	 * Throws exception if reconciliation is not possible.
+	 */
+	virtual XMP_Bool importToXMP( SXMPMeta& outXMP, const MetadataSet& inMetaData ) = 0;
+
+	/**
+	 * Dissolves metadata from the XMP object to legacy formats.
+	 *
+	 * @param outMetaData contains all legacy containers that are relevant for the processed file format
+	 *		  (and the file handler is interested in).
+	 *		  If a container is not included in the set, it is omitted by the dissolve method.
+	 *		  Note: outMetaData#getXMP() and inXMP can be the same object
+	 * @param inXMP the XMP packet that contains all XMP and legacy metadata,
+	 *		  it is created and owned by the the caller. The legacy data is distributed into the legacy containers.
+	 * @return legacy has been changed (true) or not (false)
+	 *
+	 * Throws exception if dissolving is not possible.
+	 */
+	virtual XMP_Bool exportFromXMP( MetadataSet& outMetaData, SXMPMeta& inXMP ) = 0;
+
+protected:
+	/**
+		Import native metadata container into XMP.
+		This method is supposed to import all native metadata values that are listed in the property table
+		from the IMetadata instance to the SXMPMeta instance.
+
+		@param outXMP			Target XMP container
+		@param nativeMeta		Native metadata container
+		@param propertyInfo		Property table that lists all values that are supposed to be imported
+		@param xmpPriority		Pass true, if an existing XMP value has higher priority than the native metadata
+
+		@return		true if any XMP properties were changed
+	*/
+	static bool importNativeToXMP( SXMPMeta& outXMP, const IMetadata& nativeMeta, const MetadataPropertyInfo* propertyInfo, bool xmpPriority );
+
+	/**
+		Export XMP values to native metadata container.
+		This method is supposed to export all native metadata values that are listed in the property table
+		from the XMP container to the IMetadata instance.
+
+		@param outNativeMeta	Target native metadata container
+		@param inXMP			XMP container
+		@param propertyInfo		Property table that lists all values that are supposed to be exported
+
+		@return		true if any native metadata value were changed
+	*/
+	static bool exportXMPToNative( IMetadata& outNativeMeta, SXMPMeta& inXMP, const MetadataPropertyInfo* propertyInfo, PropertyList * propertiesExportedSuccessfully = NULL );
+
+	// Converts input string to an ascii output string
+	// - terminates at first 0
+	// - replaces all non ascii with 0x3F ('?')
+	static void convertToASCII( const std::string& input, std::string& output );
+};
+
+#endif
diff --git a/XMPFiles/source/NativeMetadataSupport/Makefile.am b/XMPFiles/source/NativeMetadataSupport/Makefile.am
new file mode 100644
index 0000000..2606720
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/Makefile.am
@@ -0,0 +1,51 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+noinst_LTLIBRARIES = libnativemetadata.la
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions -fno-strict-aliasing
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+libnativemetadata_la_SOURCES = \
+	IMetadata.cpp IMetadata.h \
+	IReconcile.cpp IReconcile.h \
+	MetadataSet.cpp MetadataSet.h \
+	ValueObject.h \
+	$(NULL)
diff --git a/XMPFiles/source/NativeMetadataSupport/Makefile.in b/XMPFiles/source/NativeMetadataSupport/Makefile.in
new file mode 100644
index 0000000..28cbace
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/Makefile.in
@@ -0,0 +1,682 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFiles/source/NativeMetadataSupport
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libnativemetadata_la_LIBADD =
+am_libnativemetadata_la_OBJECTS = IMetadata.lo IReconcile.lo \
+	MetadataSet.lo
+libnativemetadata_la_OBJECTS = $(am_libnativemetadata_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libnativemetadata_la_SOURCES)
+DIST_SOURCES = $(libnativemetadata_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libnativemetadata.la
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions -fno-strict-aliasing
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+libnativemetadata_la_SOURCES = \
+	IMetadata.cpp IMetadata.h \
+	IReconcile.cpp IReconcile.h \
+	MetadataSet.cpp MetadataSet.h \
+	ValueObject.h \
+	$(NULL)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFiles/source/NativeMetadataSupport/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFiles/source/NativeMetadataSupport/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libnativemetadata.la: $(libnativemetadata_la_OBJECTS) $(libnativemetadata_la_DEPENDENCIES) $(EXTRA_libnativemetadata_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libnativemetadata_la_OBJECTS) $(libnativemetadata_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMetadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IReconcile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetadataSet.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp b/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp
new file mode 100644
index 0000000..f6389f4
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp
@@ -0,0 +1,127 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "XMPFiles/source/NativeMetadataSupport/MetadataSet.h"
+#include "source/XMP_LibUtils.hpp"
+
+//-----------------------------------------------------------------------------
+// 
+// MetadataSet::MetadataSet(...)
+// 
+// Purpose: ctor/dtor
+// 
+//-----------------------------------------------------------------------------
+
+MetadataSet::MetadataSet()
+:	mMeta	( NULL )
+{
+}
+
+MetadataSet::~MetadataSet()
+{
+	delete mMeta;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// MetadataSet::append(...)
+// 
+// Purpose: Append metadata container
+// 
+//-----------------------------------------------------------------------------
+
+void MetadataSet::append( IMetadata* meta )
+{
+	if( mMeta == NULL )
+	{
+		mMeta = new std::vector<IMetadata*>;
+	}
+
+	mMeta->push_back( meta );
+}
+
+//-----------------------------------------------------------------------------
+// 
+// MetadataSet::removeAt(...)
+// 
+// Purpose: Remove metadata container at passed position
+// 
+//-----------------------------------------------------------------------------
+
+void MetadataSet::removeAt( XMP_Uns32 pos )
+{
+	if( mMeta != NULL && pos < mMeta->size() )
+	{
+		mMeta->erase( mMeta->begin() + pos );
+	}
+	else
+	{
+		XMP_Throw( "Index out of range.", kXMPErr_BadIndex );
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// MetadataSet::remove(...)
+// 
+// Purpose: Remove the last metadata container inside the vector
+// 
+//-----------------------------------------------------------------------------
+
+void MetadataSet::remove()
+{
+	if( mMeta != NULL )
+	{
+		mMeta->pop_back();
+	}
+}
+
+//-----------------------------------------------------------------------------
+// 
+// MetadataSet::length(...)
+// 
+// Purpose: Return the number of stored metadata container
+// 
+//-----------------------------------------------------------------------------
+
+XMP_Uns32 MetadataSet::length() const
+{
+	XMP_Uns32 ret = 0;
+
+	if( mMeta != NULL )
+	{
+		ret = (XMP_Uns32)mMeta->size();
+	}
+
+	return ret;
+}
+
+//-----------------------------------------------------------------------------
+// 
+// MetadataSet::getAt(...)
+// 
+// Purpose: Return metadata container of passed position.
+// 
+//-----------------------------------------------------------------------------
+
+IMetadata* MetadataSet::getAt( XMP_Uns32 pos ) const
+{
+	IMetadata* ret = NULL;
+
+	if( mMeta != NULL && pos < mMeta->size() )
+	{
+		ret = mMeta->at(pos);
+	}
+	else
+	{
+		XMP_Throw( "Index out of range.", kXMPErr_BadIndex );
+	}
+
+	return ret;
+}
diff --git a/XMPFiles/source/NativeMetadataSupport/MetadataSet.h b/XMPFiles/source/NativeMetadataSupport/MetadataSet.h
new file mode 100644
index 0000000..62bb8b5
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.h
@@ -0,0 +1,100 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _MetadataSet_h_
+#define _MetadataSet_h_
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include <vector>
+
+/**
+	The class MetadataSet acts as a container for any metadata that base on
+	the interface IMeta.
+*/
+
+class IMetadata;
+
+class MetadataSet
+{
+	public:
+		/**
+			ctor/dtor
+		*/
+								MetadataSet	();
+							   ~MetadataSet	();
+
+		/**
+			Append metadata container
+
+			@param	meta	Metadata container
+		*/
+		void					append		( IMetadata* meta );
+
+		/**
+			Remove metadata container at passed position
+
+			@param	pos		Position inside the vector of metadata
+		*/
+		void					removeAt	( XMP_Uns32 pos );
+
+		/**
+			Remove the last metadata container inside the vector
+		*/
+		void					remove		();
+
+		/**
+			Return the number of stored metadata container
+
+			@return length of vector
+		*/
+		XMP_Uns32				length		() const;
+
+		/**
+			Return metadata container of passed position.
+
+			@param	pos		Position inside of the vector of metadata
+		*/
+		IMetadata*		getAt				( XMP_Uns32 pos ) const;
+
+		/**
+			Return metadata container of passed type
+
+			@return stored metadata container of type T
+		*/
+		template<class T> T*	get			() const;
+
+	private:
+		std::vector<IMetadata*>*					mMeta;
+		typedef std::vector<IMetadata*>::iterator	MetaIterator;
+
+}; // MetadataSet
+
+template<class T> T* MetadataSet::get() const
+{
+	T* ret = NULL;
+
+	if( mMeta != NULL )
+	{
+		for( MetaIterator iter = mMeta->begin(); iter != mMeta->end(); iter++ )
+		{
+			T* tmp = dynamic_cast<T*>( *iter );
+
+			if( tmp != NULL )
+			{
+				ret = tmp;
+				break;
+			}
+		}
+	}
+
+	return ret;
+}
+
+#endif
diff --git a/XMPFiles/source/NativeMetadataSupport/ValueObject.h b/XMPFiles/source/NativeMetadataSupport/ValueObject.h
new file mode 100644
index 0000000..cfd0c49
--- /dev/null
+++ b/XMPFiles/source/NativeMetadataSupport/ValueObject.h
@@ -0,0 +1,145 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 _ValueObject_h_
+#define _ValueObject_h_
+
+#include <string.h>
+
+#include "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+#include "public/include/XMP_Const.h"
+
+/**
+ * The class ValueObject acts as a base class for the two generic classes
+ * TValueObject and TValueArray.
+ * The overall purpose of these classes is to store a single value (or array)
+ * of any data types and a modification state. The modification state is
+ * always set if the existing value has changed. It is not set if a new value
+ * is set that is equal to the existing value.
+ * If a ValueObject based instance is created or a new value is passed to an 
+ * instance the actual value gets copied.
+ *
+ * So there're some requirements of possible data types:
+ *   - data type needs to provide a relational operator
+ *   - data type needs to provide an assign operator
+ */
+
+/**
+ * The class ValueObject is the base class for the following generic classes.
+ * It provids common functionality for handle the modification state.
+ * This class can't be used directly!
+ */
+class ValueObject
+{
+public:
+	virtual ~ValueObject()        {}
+
+	inline bool		hasChanged() const				{ return mDirty;  }
+	inline void		resetChanged()					{ mDirty = false; }
+
+protected:
+	ValueObject() : mDirty(false) {}
+
+protected:
+	bool	mDirty;
+};
+
+/**
+ * The generic class TValueObject is supposed to store values of any data types.
+ * It is based on the class ValueObject and support modification state functionality.
+ * See above for the requirements of possible data types.
+ */
+template <class T> class TValueObject : public ValueObject
+{
+public:
+	TValueObject( const T& value ) : mValue(value) {}
+	~TValueObject() {}
+
+	inline const T&	getValue() const				{ return mValue; }
+	inline void		setValue( const T& value )		{ mDirty = !( mValue == value ); mValue = value; }
+
+private:
+	T		mValue;
+};
+
+/**
+ * The generic class TArrayObject is supposed to store arrays of any data types.
+ * It is based on the class ValueObject and supports modification state functionality.
+ * See above for the requirements of possible data types.
+ */
+template <class T> class TArrayObject : public ValueObject
+{
+public:
+	TArrayObject( const T* buffer, XMP_Uns32 bufferSize );
+	~TArrayObject();
+
+   inline const T* const getArray( XMP_Uns32& outSize ) const		{ outSize = mSize; return mArray; }
+   void setArray( const T* buffer, XMP_Uns32 numElements);
+
+private:
+	T*			mArray;
+	XMP_Uns32	mSize;
+};
+
+template<class T> inline TArrayObject<T>::TArrayObject( const T* buffer, XMP_Uns32 bufferSize ) 
+: mArray(NULL), mSize(0)
+{
+	this->setArray( buffer, bufferSize );
+	mDirty = false;
+}
+
+template<class T> inline TArrayObject<T>::~TArrayObject()
+{
+	if( mArray != NULL )
+	{
+		delete[] mArray;
+	}
+}
+
+template<class T> inline void TArrayObject<T>::setArray( const T* buffer, XMP_Uns32 numElements )
+{
+	if( buffer != NULL && numElements > 0 )
+	{
+		bool doSet = true;
+
+		if( mArray != NULL &&  mSize == numElements )
+		{
+			doSet = ( memcmp( mArray, buffer, numElements*sizeof(T) ) != 0 );
+		}
+
+		if( doSet )
+		{
+			if( mArray != NULL )
+			{
+				delete[] mArray;
+			}
+
+			mArray = new T[numElements];
+			mSize  = numElements;
+
+			memcpy( mArray, buffer, numElements*sizeof(T) );
+
+			mDirty = true;
+		}
+	}
+	else
+	{
+		mDirty = ( mArray != NULL );
+
+		if( mArray != NULL )
+		{
+			delete[] mArray;
+		}
+
+		mArray = NULL;
+		mSize  = 0;
+	}
+}
+
+#endif
diff --git a/XMPFiles/source/PluginHandler/FileHandler.h b/XMPFiles/source/PluginHandler/FileHandler.h
new file mode 100644
index 0000000..96c344b
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/FileHandler.h
@@ -0,0 +1,101 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 PLUGINHANDLER_H
+#define PLUGINHANDLER_H
+#include "Module.h"
+
+namespace XMP_PLUGIN
+{
+
+/** @struct CheckFormat
+ *  @brief Record of byte sequences.
+ *
+ *  It is a static information of the file handler provided in the resource file, if the format 
+ *  can be identified by one or more sequences of fixed bytes at a fixed location within the format.
+ */
+struct CheckFormat
+{
+	XMP_Int64 mOffset;
+	XMP_Uns32 mLength;
+	std::string mByteSeq;
+
+	CheckFormat(): mOffset( 0 ), mLength( 0 ) { }
+	
+	inline void clear()
+	{
+		mOffset = 0; mLength = 0; mByteSeq.clear(); 
+	}
+	
+	inline bool empty() 
+	{ 
+		return ( mLength == 0 || mByteSeq.empty() );
+	}	
+};
+
+/** @class FileHandler
+ *  @brief File handler exposed through plugin architecture.
+ *
+ *  At the initialization time of XMPFiles only static information from all the avalbale plugins
+ *  is populated by creating instance of this class FileHandler. It's loaded later when it's actually 
+ *  required to get information from the format.
+ */
+class FileHandler
+{
+public:
+	
+	FileHandler(std::string & uid, XMP_OptionBits handlerFlags, FileHandlerType type, ModuleSharedPtr module):
+	  mVersion(0), mUID(uid), mHandlerFlags(handlerFlags), mSerializeOption(0), mOverwrite(false), mType(type), mModule(module) {}
+
+	virtual ~FileHandler(){}
+
+	inline double getVersion() const { return mVersion; }
+	inline void setVersion( double version ) { mVersion = version; }
+
+	inline const std::string& getUID() const { return mUID; }
+	inline XMP_OptionBits getHandlerFlags() const { return mHandlerFlags; }
+	inline void setHandlerFlags( XMP_OptionBits flags ) { mHandlerFlags = flags; }
+	
+	inline XMP_OptionBits getSerializeOption() const { return mSerializeOption; }
+	inline void setSerializeOption( XMP_OptionBits option ) { mSerializeOption = option; }
+
+	inline bool getOverwriteHandler() const { return mOverwrite; }
+	inline void setOverwriteHandler( bool overwrite ) { mOverwrite = overwrite; }
+	
+	inline FileHandlerType getHandlerType() const { return mType; }
+	inline void setHandlerType( FileHandlerType type ) { mType = type; }
+
+	inline bool load() { return mModule->load(); }
+	inline ModuleSharedPtr getModule() const { return mModule; }
+
+	inline void addCheckFormat( const CheckFormat & checkFormat ) { mCheckFormatVec.push_back( checkFormat ); }
+	inline XMP_Uns32 getCheckFormatSize() const { return (XMP_Uns32) mCheckFormatVec.size(); }
+	inline CheckFormat getCheckFormat( XMP_Uns32 index ) const 
+	{
+		CheckFormat checkFormat;
+		if( index < mCheckFormatVec.size() )
+			checkFormat = mCheckFormatVec[index];
+		return checkFormat;
+	}
+	
+private:
+	typedef std::vector<CheckFormat> CheckFormatVec;
+
+	CheckFormatVec				mCheckFormatVec;
+	double						mVersion;
+	std::string					mUID;
+	XMP_OptionBits				mHandlerFlags;
+	XMP_OptionBits				mSerializeOption;
+	bool						mOverwrite;
+	FileHandlerType				mType;
+	ModuleSharedPtr				mModule;
+};
+
+} //namespace XMP_PLUGIN
+#endif //PLUGINHANDLER_H
diff --git a/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp
new file mode 100644
index 0000000..3d2ffd8
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp
@@ -0,0 +1,183 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "FileHandlerInstance.h"
+
+namespace XMP_PLUGIN
+{
+
+FileHandlerInstance::FileHandlerInstance ( SessionRef object, FileHandlerSharedPtr handler, XMPFiles * _parent ):
+XMPFileHandler( _parent ), mObject( object ), mHandler( handler )
+{
+	this->handlerFlags = mHandler->getHandlerFlags();
+	this->stdCharForm  = kXMP_Char8Bit;
+	PluginManager::addHandlerInstance( this->mObject, this );
+}
+
+FileHandlerInstance::~FileHandlerInstance()
+{
+	WXMP_Error error;
+	mHandler->getModule()->getPluginAPIs()->mTerminateSessionProc( this->mObject, &error );
+	PluginManager::removeHandlerInstance( this->mObject );
+	CheckError( error );
+}
+
+bool FileHandlerInstance::GetFileModDate ( XMP_DateTime * modDate )
+{
+	XMP_Bool ok;
+	WXMP_Error error;
+	GetSessionFileModDateProc wGetFileModDate = mHandler->getModule()->getPluginAPIs()->mGetFileModDateProc;
+	wGetFileModDate ( this->mObject, &ok, modDate, &error );
+	CheckError ( error );
+	return ConvertXMP_BoolToBool( ok );
+}
+
+void FileHandlerInstance::CacheFileData()
+{
+	if( this->containsXMP ) return;
+	
+	WXMP_Error error;
+	XMP_StringPtr xmpStr = NULL;
+	mHandler->getModule()->getPluginAPIs()->mCacheFileDataProc( this->mObject, this->parent->ioRef, &xmpStr, &error );
+	
+	if( error.mErrorID != kXMPErr_NoError )
+	{
+		if ( xmpStr != 0 ) free( (void*) xmpStr );
+		throw XMP_Error( kXMPErr_InternalFailure, error.mErrorMsg );
+	}
+
+	if( xmpStr != NULL )
+	{
+		this->xmpPacket.assign( xmpStr );
+		free( (void*) xmpStr ); // It should be freed as documentation of mCacheFileDataProc says so.
+	}
+	this->containsXMP = true;
+}
+
+void FileHandlerInstance::ProcessXMP()
+{
+	if( !this->containsXMP || this->processedXMP ) return;
+	this->processedXMP = true;
+
+	SXMPUtils::RemoveProperties ( &this->xmpObj, 0, 0, kXMPUtil_DoAllProperties );
+	this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+
+	WXMP_Error error;
+	if( mHandler->getModule()->getPluginAPIs()->mImportToXMPStringProc )
+	{
+		std::string xmp;
+		this->xmpObj.SerializeToBuffer(&xmp, kXMP_NoOptions, 0);
+		XMP_StringPtr xmpStr=xmp.c_str();
+		mHandler->getModule()->getPluginAPIs()->mImportToXMPStringProc( this->mObject, &xmpStr, &error );
+		if( xmpStr!= NULL && xmpStr != xmp.c_str() )
+		{
+			xmp.resize(0);
+			xmp.assign(xmpStr);
+			SXMPMeta newMeta(xmp.c_str(),xmp.length());
+			this->xmpObj=newMeta;
+			free( (void*) xmpStr ); // It should be freed as documentation of mImportToXMPStringProc says so.
+		}
+	}
+	else
+	{
+		if( mHandler->getModule()->getPluginAPIs()->mImportToXMPProc )
+			mHandler->getModule()->getPluginAPIs()->mImportToXMPProc( this->mObject, this->xmpObj.GetInternalRef(), &error );
+	}
+	CheckError( error );
+}
+
+void FileHandlerInstance::UpdateFile ( bool doSafeUpdate )
+{
+	if ( !this->needsUpdate || this->xmpPacket.size() == 0 ) return;
+
+	WXMP_Error error;
+	if( mHandler->getModule()->getPluginAPIs()->mExportFromXMPStringProc )
+	{
+		std::string xmp;
+		this->xmpObj.SerializeToBuffer(&xmp, kXMP_NoOptions, 0);
+		XMP_StringPtr xmpStr=xmp.c_str();
+		mHandler->getModule()->getPluginAPIs()->mExportFromXMPStringProc( this->mObject, xmpStr, &error );
+	}
+	else
+	{
+		if( mHandler->getModule()->getPluginAPIs()->mExportFromXMPProc )
+			mHandler->getModule()->getPluginAPIs()->mExportFromXMPProc( this->mObject, this->xmpObj.GetInternalRef(), &error );
+	}
+	CheckError( error );
+
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, mHandler->getSerializeOption() );
+	
+	mHandler->getModule()->getPluginAPIs()->mUpdateFileProc( this->mObject, this->parent->ioRef, doSafeUpdate, this->xmpPacket.c_str(), &error );
+	CheckError( error );
+	this->needsUpdate = false;
+}
+
+void FileHandlerInstance::WriteTempFile( XMP_IO* tempRef )
+{
+	WXMP_Error error;
+	if( mHandler->getModule()->getPluginAPIs()->mExportFromXMPProc )
+		mHandler->getModule()->getPluginAPIs()->mExportFromXMPProc( this->mObject, this->xmpObj.GetInternalRef(), &error );
+	CheckError( error );
+
+	this->xmpObj.SerializeToBuffer ( &this->xmpPacket, mHandler->getSerializeOption() );
+
+	mHandler->getModule()->getPluginAPIs()->mWriteTempFileProc( this->mObject, this->parent->ioRef, tempRef, this->xmpPacket.c_str(), &error );
+	CheckError( error );
+}
+
+static void SetStringVector ( StringVectorRef clientPtr, XMP_StringPtr * arrayPtr, XMP_Uns32 stringCount )
+{
+	std::vector<std::string>* clientVec = (std::vector<std::string>*) clientPtr;
+	clientVec->clear();
+	for ( XMP_Uns32 i = 0; i < stringCount; ++i ) {
+		std::string nextValue ( arrayPtr[i] );
+		clientVec->push_back ( nextValue );
+	}
+}
+
+
+void FileHandlerInstance::FillMetadataFiles( std::vector<std::string> * metadataFiles )
+{
+	WXMP_Error error;
+	FillMetadataFilesProc wFillMetadataFilesProc = mHandler->getModule()->getPluginAPIs()->mFillMetadataFilesProc;
+	if ( wFillMetadataFilesProc ) {
+		wFillMetadataFilesProc( this->mObject, metadataFiles, SetStringVector, &error);
+		CheckError( error );
+	} else {
+		XMP_Throw ( "This version of plugin does not support FillMetadataFiles API", kXMPErr_Unimplemented );
+	}
+}
+
+void FileHandlerInstance::FillAssociatedResources( std::vector<std::string> * resourceList )
+{
+	WXMP_Error error;
+	FillAssociatedResourcesProc wFillAssociatedResourcesProc = mHandler->getModule()->getPluginAPIs()->mFillAssociatedResourcesProc;
+	if ( wFillAssociatedResourcesProc ) {
+		wFillAssociatedResourcesProc( this->mObject, resourceList, SetStringVector, &error);
+		CheckError( error );
+	} else {
+		XMP_Throw ( "This version of plugin does not support FillAssociatedResources API", kXMPErr_Unimplemented );
+	}
+}
+
+bool FileHandlerInstance::IsMetadataWritable( )
+{
+	WXMP_Error error;
+	XMP_Bool result = kXMP_Bool_False;
+	IsMetadataWritableProc wIsMetadataWritableProc = mHandler->getModule()->getPluginAPIs()->mIsMetadataWritableProc;
+	if ( wIsMetadataWritableProc ) {
+		wIsMetadataWritableProc( this->mObject, &result, &error);
+		CheckError( error );
+	} else {
+		XMP_Throw ( "This version of plugin does not support IsMetadataWritable API", kXMPErr_Unimplemented );
+	}
+	return ConvertXMP_BoolToBool( result );
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFiles/source/PluginHandler/FileHandlerInstance.h b/XMPFiles/source/PluginHandler/FileHandlerInstance.h
new file mode 100644
index 0000000..9810831
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.h
@@ -0,0 +1,50 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 PLUGINHANDLERINSTANCE_H
+#define PLUGINHANDLERINSTANCE_H
+#include "FileHandler.h"
+
+namespace XMP_PLUGIN
+{
+
+/** @class FileHandlerInstance
+ *  @brief This class is equivalent to the native file handlers like JPEG_MetaHandler or the simialr one.
+ *
+ *  This class is equivalent to the native file handler. This class is supposed to support all the 
+ *  function which a native file handler support.
+ *  As of now, it support only the functions required for OwningFileHandler.
+ */
+class FileHandlerInstance : public XMPFileHandler
+{
+public:
+	FileHandlerInstance ( SessionRef object, FileHandlerSharedPtr handler, XMPFiles * parent );
+	virtual ~FileHandlerInstance();
+
+	virtual bool GetFileModDate ( XMP_DateTime * modDate );
+
+	virtual void CacheFileData();
+	virtual void ProcessXMP();
+	//virtual XMP_OptionBits GetSerializeOptions(); //It should not be needed as its required only inside updateFile.
+	virtual void UpdateFile ( bool doSafeUpdate );
+	virtual void WriteTempFile ( XMP_IO* tempRef );
+	virtual void FillMetadataFiles ( std::vector<std::string> * metadataFiles );
+	virtual void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	virtual bool IsMetadataWritable ( );
+
+	inline SessionRef				GetSession() const	{ return mObject; }
+	inline FileHandlerSharedPtr		GetHandlerInfo() const	{ return mHandler; }
+
+private:
+	SessionRef			mObject;
+	FileHandlerSharedPtr	mHandler;
+};
+
+} //namespace XMP_PLUGIN
+#endif
diff --git a/XMPFiles/source/PluginHandler/HostAPIImpl.cpp b/XMPFiles/source/PluginHandler/HostAPIImpl.cpp
new file mode 100644
index 0000000..cf6a389
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/HostAPIImpl.cpp
@@ -0,0 +1,723 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "HostAPI.h"
+#include "PluginManager.h"
+#include "FileHandlerInstance.h"
+#include "source/XIO.hpp"
+#include "XMPFiles/source/HandlerRegistry.h"
+
+using namespace Common;
+
+namespace XMP_PLUGIN
+{
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		Exception handler
+//
+
+static void HandleException( WXMP_Error* wError ) 
+{
+	try
+	{
+		throw;
+	}
+	catch(  XMP_Error& xmpErr )
+	{
+		wError->mErrorMsg = xmpErr.GetErrMsg();
+		wError->mErrorID = xmpErr.GetID();
+	}
+	catch( std::exception& stdErr )
+	{
+		wError->mErrorMsg = stdErr.what();
+	}
+	catch( ... )
+	{
+		wError->mErrorMsg = "Caught unknown exception";
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		FileIO_API
+//
+
+static XMPErrorID FileSysRead( XMP_IORef io, void* buffer, XMP_Uns32 count, XMP_Bool readAll, XMP_Uns32& byteRead, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			byteRead = thiz->Read( buffer, count, ConvertXMP_BoolToBool( readAll ) );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID FileSysWrite( XMP_IORef io, void* buffer, XMP_Uns32 count, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			thiz->Write( buffer, count );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID FileSysSeek( XMP_IORef io, XMP_Int64& offset, SeekMode mode, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			thiz->Seek( offset, mode );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID FileSysLength( XMP_IORef io, XMP_Int64& length, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			length = thiz->Length();
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID FileSysTruncate( XMP_IORef io, XMP_Int64 length, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			thiz->Truncate( length );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID FileSysDeriveTemp( XMP_IORef io, XMP_IORef& tempIO, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			tempIO = thiz->DeriveTemp();
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID FileSysAbsorbTemp( XMP_IORef io, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			thiz->AbsorbTemp();
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID FileSysDeleteTemp( XMP_IORef io, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try
+	{
+		if( io != NULL )
+		{
+			::XMP_IO * thiz = (::XMP_IO*)io;
+			thiz->DeleteTemp();
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static void GetFileSysAPI( FileIO_API* fileSys )
+{
+	if( fileSys )
+	{
+		fileSys->mReadProc			=	FileSysRead;
+		fileSys->mWriteProc			=	FileSysWrite;
+		fileSys->mSeekProc			=	FileSysSeek;
+		fileSys->mLengthProc		=	FileSysLength;
+		fileSys->mTruncateProc		=	FileSysTruncate;
+		fileSys->mDeriveTempProc	=	FileSysDeriveTemp;
+		fileSys->mAbsorbTempProc	=	FileSysAbsorbTemp;
+		fileSys->mDeleteTempProc	=	FileSysDeleteTemp;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		String_API
+//
+
+static XMPErrorID CreateBuffer( StringPtr* buffer, XMP_Uns32 size, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try 
+	{
+		if( buffer != NULL )
+		{
+			*buffer = (StringPtr) malloc( size );
+			if( *buffer != NULL )
+			{
+				wError->mErrorID = kXMPErr_NoError;
+			}
+			else
+			{
+				wError->mErrorMsg = "Allocation failed";
+			}
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID ReleaseBuffer( StringPtr buffer, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	try 
+	{
+		if( buffer )
+		{
+			free( buffer );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static void GetStringAPI( String_API* strAPI )
+{
+	if( strAPI )
+	{
+		strAPI->mCreateBufferProc			=	CreateBuffer;
+		strAPI->mReleaseBufferProc			=	ReleaseBuffer;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		Abort_API
+//
+
+static XMPErrorID CheckAbort( SessionRef session, XMP_Bool * aborted, WXMP_Error* wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_InternalFailure;
+
+	if( aborted )
+	{
+		*aborted = kXMP_Bool_False;
+
+		//
+		// find FileHandlerInstance associated to session reference
+		//
+		FileHandlerInstancePtr instance = PluginManager::getHandlerInstance( session );
+
+		if( instance != NULL )
+		{
+			//
+			// execute abort procedure if available
+			//
+			wError->mErrorID	= kXMPErr_NoError;
+			XMP_AbortProc proc	= instance->parent->abortProc;
+			void* arg			= instance->parent->abortArg;
+
+			if( proc )
+			{
+				try
+				{
+					*aborted = ConvertBoolToXMP_Bool( proc( arg ) );
+				}
+				catch( ... )
+				{
+					HandleException( wError );
+				}
+			}
+		}
+	}
+	else
+	{
+		wError->mErrorMsg = "Invalid parameter";
+	}
+
+	return wError->mErrorID;
+}
+
+static void GetAbortAPI( Abort_API* abortAPI )
+{
+	if( abortAPI )
+	{
+		abortAPI->mCheckAbort = CheckAbort;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		StandardHandler_API
+//
+
+static XMPErrorID CheckFormatStandardHandler( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_Bool & checkOK, WXMP_Error* wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID	= kXMPErr_InternalFailure;
+	wError->mErrorMsg	= NULL;
+	checkOK				= false;
+
+	//
+	// find FileHandlerInstance associated to session reference
+	//
+	FileHandlerInstancePtr instance = PluginManager::getHandlerInstance( session );
+
+	if( instance != NULL && PluginManager::getHandlerPriority( instance ) == PluginManager::kReplacementHandler )
+	{
+		//
+		// find previous file handler for file format identifier
+		//
+		XMPFileHandlerInfo* hdlInfo = HandlerRegistry::getInstance().getStandardHandlerInfo( format );
+
+		if( hdlInfo != NULL && HandlerRegistry::getInstance().isReplaced( format ) )
+		{
+			if( hdlInfo->checkProc != NULL )
+			{
+				try
+				{
+					//
+					// setup temporary XMPFiles instance
+					//
+					XMPFiles standardClient;
+					standardClient.format = format;
+					standardClient.SetFilePath( path );
+
+					if( hdlInfo->flags & kXMPFiles_FolderBasedFormat )
+					{
+						//
+						// process folder based handler
+						//
+						if( path != NULL )
+						{
+							// The following code corresponds to the one found in HandlerRegistry::selectSmartHandler,
+							// in the folder based handler selection section of the function
+							// In this case the format is already known, therefor no folder checks are needed here,
+							// but the path must be split into the meaningful parts to call checkFolderFormat correctly
+
+							std::string rootPath = path;
+							std::string leafName;
+							std::string fileExt;
+							std::string gpName;
+							std::string parentName;
+
+							XIO::SplitLeafName ( &rootPath, &leafName );
+
+							if( !leafName.empty() )
+							{
+								size_t extPos = leafName.size();
+
+								for ( --extPos; extPos > 0; --extPos ) if ( leafName[extPos] == '.' ) break;
+
+								if( leafName[extPos] == '.' ) 
+								{
+									fileExt.assign( &leafName[extPos+1] );
+									MakeLowerCase( &fileExt );
+									leafName.erase( extPos );
+								}
+
+								CheckFolderFormatProc CheckProc = (CheckFolderFormatProc) (hdlInfo->checkProc);
+
+								// The case that a logical path to a clip has been passed, which does not point to a real file 
+								if( Host_IO::GetFileMode( path ) == Host_IO::kFMode_DoesNotExist )
+								{
+									checkOK = CheckProc( hdlInfo->format, rootPath, gpName, parentName, leafName, &standardClient );
+								}
+								else
+								{
+									XIO::SplitLeafName( &rootPath, &parentName );
+									XIO::SplitLeafName( &rootPath, &gpName );
+									std::string origGPName ( gpName );	// ! Save the original case for XDCAM-FAM.
+									MakeUpperCase( &parentName );
+									MakeUpperCase( &gpName );
+
+									if( format == kXMP_XDCAM_FAMFile && ( (parentName == "CLIP") || (parentName == "EDIT") || (parentName == "SUB") ) ) 
+									{
+										// ! The standard says Clip/Edit/Sub, but we just shifted to upper case.
+										gpName = origGPName;	// ! XDCAM-FAM has just 1 level of inner folder, preserve the "MyMovie" case.
+									}
+
+									checkOK = CheckProc( hdlInfo->format, rootPath, gpName, parentName, leafName, &standardClient );
+								}
+							}
+							else
+							{
+								wError->mErrorID = kXMPErr_BadParam;
+							}
+						}
+						else
+						{
+							wError->mErrorID = kXMPErr_BadParam;
+						}
+					}
+					else
+					{
+						//
+						// file based handler (requires XMP_IO object)
+						//
+						CheckFileFormatProc CheckProc = (CheckFileFormatProc) (hdlInfo->checkProc);
+						XMPFiles_IO* io = XMPFiles_IO::New_XMPFiles_IO ( path, true );
+						checkOK = CheckProc( hdlInfo->format, path, io, &standardClient );
+						delete io;
+					}
+
+					wError->mErrorID = kXMPErr_NoError;
+				}
+				catch( ... )
+				{
+					HandleException( wError );
+				}
+			}
+		}
+		else
+		{
+			wError->mErrorMsg = "No standard handler available";
+		}
+	}
+	else
+	{
+		wError->mErrorMsg = "Standard file handler can't call prior handler";
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID GetXMPStandardHandler( SessionRef session, XMP_FileFormat format, StringPtr path, XMPMetaRef xmpRef, XMP_Bool * xmpExists, WXMP_Error* wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID	= kXMPErr_InternalFailure;
+	wError->mErrorMsg	= NULL;
+
+	//
+	// find FileHandlerInstance associated to session reference
+	//
+	FileHandlerInstancePtr instance = PluginManager::getHandlerInstance( session );
+	
+	if( instance != NULL && PluginManager::getHandlerPriority( instance ) == PluginManager::kReplacementHandler )
+	{
+		//
+		// find previous file handler for file format identifier
+		//
+		XMPFileHandlerInfo* hdlInfo = HandlerRegistry::getInstance().getStandardHandlerInfo( format );
+
+		if( hdlInfo != NULL && HandlerRegistry::getInstance().isReplaced( format ) )
+		{
+			//
+			// check format first
+			//
+			XMP_Bool suc = kXMP_Bool_False;
+
+			XMPErrorID errorID = CheckFormatStandardHandler( session, format, path, suc, wError );
+
+			if( errorID == kXMPErr_NoError && ConvertXMP_BoolToBool( suc ) )
+			{
+				//
+				// setup temporary XMPFiles instance
+				//
+				XMPFiles standardClient;
+				standardClient.format = format;
+				standardClient.SetFilePath( path );
+
+				SXMPMeta meta( xmpRef );
+			
+				try
+				{
+					//
+					// open with passed handler info
+					//
+					suc = standardClient.OpenFile( *hdlInfo, path, kXMPFiles_OpenForRead );
+
+					if( suc )
+					{
+						//
+						// read meta data
+						//
+						suc = standardClient.GetXMP( &meta );
+
+						if( xmpExists != NULL )		*xmpExists = suc;
+					}
+				}
+				catch( ... )
+				{
+					HandleException( wError );
+				}
+
+				//
+				// close and cleanup
+				//
+				try
+				{
+					standardClient.CloseFile();
+				}
+				catch( ... )
+				{
+					HandleException( wError );
+				}
+			}
+			else if( errorID == kXMPErr_NoError )
+			{
+				wError->mErrorID = kXMPErr_BadFileFormat;
+				wError->mErrorMsg = "Standard handler can't process file format";
+			}
+		}
+		else
+		{
+			wError->mErrorID = kXMPErr_NoFileHandler;
+			wError->mErrorMsg = "No standard handler available";
+		}
+	}
+	else
+	{
+		wError->mErrorMsg = "Standard file handler can't call prior handler";
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID GetXMPStandardHandler_V2( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_StringPtr* xmpStr, XMP_Bool * xmpExists, WXMP_Error* wError )
+{
+	SXMPMeta meta;
+    std::string xmp;
+	GetXMPStandardHandler( session, format, path, meta.GetInternalRef(),  xmpExists, wError ) ;
+	if( wError->mErrorID != kXMPErr_NoError ) 
+		return wError->mErrorID;
+
+	meta.SerializeToBuffer(&xmp, kXMP_NoOptions, 0);
+	XMP_Uns32 length = (XMP_Uns32)xmp.size() + 1 ;
+	StringPtr buffer = NULL;
+	CreateBuffer( &buffer,length ,wError);	
+	if( wError->mErrorID != kXMPErr_NoError ) 
+		return wError->mErrorID;
+
+	memcpy( buffer, xmp.c_str(), length );
+	*xmpStr = buffer; // callee function should free the memory.
+	return wError->mErrorID ;
+}
+
+
+static void GetStandardHandlerAPI( StandardHandler_API* standardHandlerAPI )
+{
+	if( standardHandlerAPI )
+	{
+		standardHandlerAPI->mCheckFormatStandardHandler	= CheckFormatStandardHandler;
+		standardHandlerAPI->mGetXMPStandardHandler		= GetXMPStandardHandler;
+	}
+
+}
+
+
+static XMPErrorID RequestAPISuite( const char* apiName, XMP_Uns32 apiVersion, void** apiSuite, WXMP_Error* wError )
+{
+	if( wError == NULL )
+	{
+		return kXMPErr_BadParam;
+	}
+	
+	wError->mErrorID = kXMPErr_NoError;
+	
+	if( apiName == NULL
+	   || apiVersion == 0
+	   || apiSuite == NULL )
+	{
+		wError->mErrorID = kXMPErr_BadParam;
+		return kXMPErr_BadParam;
+	}
+	
+	// dummy suite used by unit test
+	if( strcmp( apiName, "testDummy" ) == 0 && apiVersion == 1 )
+	{
+		*apiSuite = (void*) &RequestAPISuite;
+	}
+	else if ( ! strcmp( apiName, "StandardHandler" ) && apiVersion == 2 ) 
+	{
+		static const StandardHandler_API_V2 standardHandlerAPI =
+		{
+			&CheckFormatStandardHandler,
+			&GetXMPStandardHandler_V2
+		};
+		*apiSuite=(void*)&standardHandlerAPI;
+	}
+	else
+	{
+		wError->mErrorID = kXMPErr_Unimplemented;
+	}
+	
+	return wError->mErrorID;
+}
+	
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		Init/Term Host APIs
+//
+
+// Because of changes to the plugin versioning strategy,
+// the host API version is no longer tied to the plugin version
+// and the host API struct is supposed to be frozen.
+// New host APIs can be requested through the new function mRequestAPISuite.
+
+void PluginManager::SetupHostAPI_V1( HostAPIRef hostAPI )
+{
+	// Get XMP_IO APIs
+	hostAPI->mFileIOAPI = new FileIO_API();
+	GetFileSysAPI( hostAPI->mFileIOAPI );
+
+	// Get String APIs
+	hostAPI->mStrAPI = new String_API();
+	GetStringAPI( hostAPI->mStrAPI );
+
+	// Get Abort API
+	hostAPI->mAbortAPI = new Abort_API();
+	GetAbortAPI( hostAPI->mAbortAPI );
+
+	// Get standard handler APIs
+	hostAPI->mStandardHandlerAPI = new StandardHandler_API();
+	GetStandardHandlerAPI( hostAPI->mStandardHandlerAPI );
+
+	hostAPI->mRequestAPISuite = NULL;
+}
+
+void PluginManager::SetupHostAPI_V2( HostAPIRef hostAPI )
+{
+	SetupHostAPI_V1 ( hostAPI );
+}
+
+void PluginManager::SetupHostAPI_V3( HostAPIRef hostAPI )
+{
+	SetupHostAPI_V2 ( hostAPI );
+}
+
+void PluginManager::SetupHostAPI_V4( HostAPIRef hostAPI )
+{
+	SetupHostAPI_V3 ( hostAPI );
+	hostAPI->mRequestAPISuite = RequestAPISuite;
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFiles/source/PluginHandler/Makefile.am b/XMPFiles/source/PluginHandler/Makefile.am
new file mode 100644
index 0000000..0c0a6f6
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/Makefile.am
@@ -0,0 +1,61 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+noinst_LTLIBRARIES = libpluginhandler.la
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions -fno-strict-aliasing
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+if MAC_ENV
+PLATFORM_UTILS=OS_Utils_Mac.cpp
+else
+PLATFORM_UTILS=OS_Utils_Linux.cpp
+endif
+
+libpluginhandler_la_SOURCES = FileHandler.h \
+	FileHandlerInstance.cpp FileHandlerInstance.h \
+	HostAPIImpl.cpp \
+	Module.cpp Module.h ModuleUtils.h \
+	PluginManager.cpp PluginManager.h \
+	XMPAtoms.cpp XMPAtoms.h \
+	$(PLATFORM_UTILS) \
+	$(NULL)
+
+EXTRA_DIST=OS_Utils_Linux.cpp OS_Utils_WIN.cpp OS_Utils_Mac.cpp
diff --git a/XMPFiles/source/PluginHandler/Makefile.in b/XMPFiles/source/PluginHandler/Makefile.in
new file mode 100644
index 0000000..3b7527d
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/Makefile.in
@@ -0,0 +1,698 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFiles/source/PluginHandler
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libpluginhandler_la_LIBADD =
+am__libpluginhandler_la_SOURCES_DIST = FileHandler.h \
+	FileHandlerInstance.cpp FileHandlerInstance.h HostAPIImpl.cpp \
+	Module.cpp Module.h ModuleUtils.h PluginManager.cpp \
+	PluginManager.h XMPAtoms.cpp XMPAtoms.h OS_Utils_Linux.cpp \
+	OS_Utils_Mac.cpp
+@MAC_ENV_FALSE@am__objects_1 = OS_Utils_Linux.lo
+@MAC_ENV_TRUE@am__objects_1 = OS_Utils_Mac.lo
+am_libpluginhandler_la_OBJECTS = FileHandlerInstance.lo HostAPIImpl.lo \
+	Module.lo PluginManager.lo XMPAtoms.lo $(am__objects_1)
+libpluginhandler_la_OBJECTS = $(am_libpluginhandler_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libpluginhandler_la_SOURCES)
+DIST_SOURCES = $(am__libpluginhandler_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libpluginhandler.la
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions -fno-strict-aliasing
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
+
+@MAC_ENV_FALSE@PLATFORM_UTILS = OS_Utils_Linux.cpp
+@MAC_ENV_TRUE@PLATFORM_UTILS = OS_Utils_Mac.cpp
+libpluginhandler_la_SOURCES = FileHandler.h \
+	FileHandlerInstance.cpp FileHandlerInstance.h \
+	HostAPIImpl.cpp \
+	Module.cpp Module.h ModuleUtils.h \
+	PluginManager.cpp PluginManager.h \
+	XMPAtoms.cpp XMPAtoms.h \
+	$(PLATFORM_UTILS) \
+	$(NULL)
+
+EXTRA_DIST = OS_Utils_Linux.cpp OS_Utils_WIN.cpp OS_Utils_Mac.cpp
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFiles/source/PluginHandler/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFiles/source/PluginHandler/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libpluginhandler.la: $(libpluginhandler_la_OBJECTS) $(libpluginhandler_la_DEPENDENCIES) $(EXTRA_libpluginhandler_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libpluginhandler_la_OBJECTS) $(libpluginhandler_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileHandlerInstance.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HostAPIImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Module.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OS_Utils_Linux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OS_Utils_Mac.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PluginManager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPAtoms.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFiles/source/PluginHandler/Module.cpp b/XMPFiles/source/PluginHandler/Module.cpp
new file mode 100644
index 0000000..d76589c
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/Module.cpp
@@ -0,0 +1,278 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "Module.h"
+#include "HostAPI.h"
+
+namespace XMP_PLUGIN
+{
+
+static bool CheckAPICompatibility_V1 ( const PluginAPIRef pluginAPIs )
+{
+	// these plugin APIs are mandatory to run an XMP file handler
+	if ( pluginAPIs->mTerminatePluginProc
+		&& pluginAPIs->mSetHostAPIProc
+		&& pluginAPIs->mInitializeSessionProc
+		&& pluginAPIs->mTerminateSessionProc
+		&& pluginAPIs->mCheckFileFormatProc
+		&& pluginAPIs->mCheckFolderFormatProc
+		&& pluginAPIs->mGetFileModDateProc
+		&& pluginAPIs->mCacheFileDataProc
+		&& pluginAPIs->mUpdateFileProc
+		&& pluginAPIs->mWriteTempFileProc )
+	{
+		return true;
+	}
+	return false;
+}
+
+static bool CheckAPICompatibility_V2 ( const PluginAPIRef pluginAPIs )
+{
+	if ( CheckAPICompatibility_V1 ( pluginAPIs ) )
+	{
+		if ( pluginAPIs->mFillMetadataFilesProc 
+			&& pluginAPIs->mFillAssociatedResourcesProc )
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+static bool CheckAPICompatibility_V3 ( const PluginAPIRef pluginAPIs )
+{
+	if ( CheckAPICompatibility_V2 ( pluginAPIs ) )
+	{
+		if ( pluginAPIs->mIsMetadataWritableProc )
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+static bool CheckAPICompatibility ( const PluginAPIRef pluginAPIs )
+{
+	// Note: This is the place where we can reject old plugins.
+	//       For example if we consider all functionality of
+	//       plugin API version 2 mandatory we can reject
+	//       plugin version 1 by returning false in case 1.
+	switch ( pluginAPIs->mVersion )
+	{
+	case 1:
+		return CheckAPICompatibility_V1 ( pluginAPIs );
+		break;
+
+	case 2:
+		return CheckAPICompatibility_V2 ( pluginAPIs );
+		break;
+
+	case 3:
+		return CheckAPICompatibility_V3 ( pluginAPIs );
+		break;
+
+	default:
+		// The loaded plugin is newer than the host.
+		// Only basic functionality to run the plugin is required.
+		return CheckAPICompatibility_V1 ( pluginAPIs );
+		break;
+	}
+}
+
+PluginAPIRef Module::getPluginAPIs() 
+{ 
+	//
+	// return ref. to Plugin API, load module if not yet loaded
+	//
+	if ( !mPluginAPIs || mLoaded != kModuleLoaded )
+	{
+		if ( !load() )
+		{
+			XMP_Throw ( "Plugin API not available.", kXMPErr_Unavailable );
+		}
+	}
+	return mPluginAPIs;
+}
+
+bool Module::load()
+{
+	XMP_AutoLock lock ( &mLoadingLock, kXMP_WriteLock );
+	return loadInternal();
+}
+
+void Module::unload()
+{
+	XMP_AutoLock lock (&mLoadingLock, kXMP_WriteLock);
+	unloadInternal();
+}
+
+void Module::unloadInternal()
+{
+	WXMP_Error error;
+
+	//
+	// terminate plugin
+	//
+	if( mPluginAPIs != NULL )
+	{
+		if( mPluginAPIs->mTerminatePluginProc ) 
+		{
+			mPluginAPIs->mTerminatePluginProc( &error );
+		}
+		delete mPluginAPIs;
+		mPluginAPIs = NULL;
+	}
+
+	//
+	// unload plugin module
+	//
+	if( mLoaded != kModuleNotLoaded )
+	{
+		UnloadModule(mHandle, false);
+		mHandle = NULL;
+		if( mLoaded == kModuleLoaded )
+		{
+			//
+			// Reset mLoaded to kModuleNotLoaded, if the module was loaded successfully.
+			// Otherwise let it remain kModuleErrorOnLoad so that we won't try to load 
+			// it again if some other handler ask to do so.
+			//
+			mLoaded = kModuleNotLoaded;
+		}
+	}
+
+	CheckError( error );
+}
+
+bool Module::loadInternal()
+{
+	if( mLoaded == kModuleNotLoaded )
+	{
+		const char * errorMsg = NULL;
+
+		//
+		// load module
+		//
+		mLoaded = kModuleErrorOnLoad;
+		mHandle = LoadModule(mPath, false);
+
+		if( mHandle != NULL )
+		{
+			//
+			// get entry point function pointer
+			//
+			InitializePluginProc InitializePlugin = reinterpret_cast<InitializePluginProc>( 
+				GetFunctionPointerFromModuleImpl(mHandle, "InitializePlugin") );	// legacy entry point
+
+			InitializePlugin2Proc InitializePlugin2 = reinterpret_cast<InitializePlugin2Proc>( 
+				GetFunctionPointerFromModuleImpl(mHandle, "InitializePlugin2") );
+
+			if( InitializePlugin2 != NULL || InitializePlugin != NULL )
+			{
+				std::string moduleID;
+				GetResourceDataFromModule(mHandle, "MODULE_IDENTIFIER", "txt", moduleID);
+				mPluginAPIs = new PluginAPI();
+				memset( mPluginAPIs, 0, sizeof(PluginAPI) );
+				mPluginAPIs->mSize = sizeof(PluginAPI);
+				mPluginAPIs->mVersion = XMP_PLUGIN_VERSION;	// informational: the latest version that the host knows about
+
+				WXMP_Error error;
+
+				//
+				// initialize plugin by calling entry point function
+				//
+				if( InitializePlugin2 != NULL )
+				{
+					HostAPIRef hostAPI = PluginManager::getHostAPI( XMP_HOST_API_VERSION );
+					InitializePlugin2( moduleID.c_str(), hostAPI, mPluginAPIs, &error );
+
+					if ( error.mErrorID == kXMPErr_NoError )
+					{
+						// check all function pointers are correct based on version numbers
+						if( CheckAPICompatibility( mPluginAPIs ) )
+						{
+							mLoaded = kModuleLoaded;
+						}
+						else
+						{
+							errorMsg = "Incompatible plugin API version.";
+						}
+					}
+					else
+					{
+						errorMsg = "Plugin initialization failed.";
+					}
+				}
+				else if( InitializePlugin != NULL )
+				{
+					// initialize through legacy plugin entry point
+					InitializePlugin( moduleID.c_str(), mPluginAPIs, &error );
+
+					if ( error.mErrorID == kXMPErr_NoError ) {
+						// check all function pointers are correct based on version numbers
+						bool compatibleAPIs = CheckAPICompatibility(mPluginAPIs);
+
+						if ( compatibleAPIs )
+						{
+							//
+							// set host API at plugin
+							//
+							HostAPIRef hostAPI = PluginManager::getHostAPI( mPluginAPIs->mVersion );
+							
+							mPluginAPIs->mSetHostAPIProc( hostAPI, &error );
+
+							if( error.mErrorID == kXMPErr_NoError )
+							{
+								mLoaded = kModuleLoaded;
+							}
+							else
+							{
+								errorMsg = "Plugin API incomplete.";
+							}
+						}
+						else
+						{
+							errorMsg = "Incompatible plugin API version.";
+						}
+					}
+					else
+					{
+						errorMsg = "Plugin initialization failed.";
+					}
+				}
+			}
+
+			if( mLoaded != kModuleLoaded )
+			{
+				//
+				// plugin wasn't loaded and initialized successfully,
+				// so unload the module
+				//
+				this->unloadInternal();
+			}
+		}
+		else
+		{
+			errorMsg = "Can't load module";
+		}
+
+		if ( mLoaded != kModuleLoaded && errorMsg )
+		{
+			//
+			// error occurred
+			//
+			throw XMP_Error( kXMPErr_InternalFailure, errorMsg);
+		}
+	}
+
+	return ( mLoaded == kModuleLoaded ); 
+
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFiles/source/PluginHandler/Module.h b/XMPFiles/source/PluginHandler/Module.h
new file mode 100644
index 0000000..1d7fdd9
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/Module.h
@@ -0,0 +1,77 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 MODULE_H
+#define MODULE_H
+#include "ModuleUtils.h"
+#include "PluginManager.h"
+
+namespace XMP_PLUGIN
+{
+
+/** @class Module
+ *  @brief Manages module's loading and unloading.
+ */
+class Module
+{
+public:	
+	Module( std::string & path ):
+	  mPath( path ), mHandle( NULL ), mPluginAPIs( NULL ), mLoaded( kModuleNotLoaded ) { }
+	
+	~Module() { unload(); }
+
+	inline OS_ModuleRef getHandle() const { return mHandle; }
+	inline const std::string & getPath() const { return mPath; }
+	
+	/**
+	 *  Returns pluginAPI. It loads the module if not already loaded.
+	 *  @return pluginAPI.
+	 */
+	PluginAPIRef getPluginAPIs();
+
+	/**
+	 *  It loads the module if not already loaded.
+	 *  @return true if module is loaded successfully otherwise returns false.
+	 */
+	bool load();
+
+	/**
+	 *  Unloads the module if it is loaded.
+	 *  @return Void.
+	 */
+	void unload();
+
+private:
+
+	/************************************************************************/
+	/* Loads the module without acquiring the lock                        */
+	/************************************************************************/
+	bool loadInternal();
+
+	/************************************************************************/
+	/* Unloads the module without acquiring the lock                        */
+	/************************************************************************/
+	void unloadInternal();
+
+	typedef enum
+	{
+		kModuleNotLoaded = 0,
+		kModuleLoaded,
+		kModuleErrorOnLoad
+	} LoadStatus;
+	
+	std::string			mPath;
+	OS_ModuleRef		mHandle;
+	PluginAPIRef		mPluginAPIs;
+	LoadStatus			mLoaded;
+	XMP_ReadWriteLock	mLoadingLock;
+};
+
+} //namespace XMP_PLUGIN
+#endif //MODULE_H
diff --git a/XMPFiles/source/PluginHandler/ModuleUtils.h b/XMPFiles/source/PluginHandler/ModuleUtils.h
new file mode 100644
index 0000000..e261271
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/ModuleUtils.h
@@ -0,0 +1,76 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 MODULEUTILS_H
+#define MODULEUTILS_H
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+
+#if XMP_WinBuild
+#include <Windows.h>
+typedef HMODULE OS_ModuleRef;
+#elif XMP_MacBuild
+#include <CoreFoundation/CFBundle.h>
+typedef CFBundleRef OS_ModuleRef;
+#elif XMP_UNIXBuild
+#include <tr1/memory>
+typedef void* OS_ModuleRef;
+#else
+#error	Unsupported operating system
+#endif
+
+namespace XMP_PLUGIN
+{
+
+/**
+ * Platform implementation to retrieve a function pointer of the name \param inSymbol from a module \param inOSModule
+ */
+void* GetFunctionPointerFromModuleImpl(	OS_ModuleRef inOSModule, const char* inSymbol );
+
+/**
+ *  @return true if @param inModulePath points to a valid shared library
+*/
+#if XMP_MacBuild
+bool IsValidLibrary( const std::string & inModulePath );
+#endif
+
+/**
+ *  Load module specified by absolute path \param inModulePath
+ *
+ * Win:
+ * If \param inOnlyResourceAccess = true, only the image is loaded, no referenced dlls are loaded nor initialization code is executed.
+ * If the module is already loaded and executable, it behaves as \param inOnlyResourceAccess = false.
+ * The reference count is increased, so don't forget to call UnloadModule.
+ *
+ * Mac:
+ * If \param inOnlyResourceAccess = true, only the CFBundleRef is created. No code is loaded and executed.
+ */
+OS_ModuleRef LoadModule( const std::string & inModulePath, bool inOnlyResourceAccess = false );
+
+/**
+ *  Unload module
+ *  @param inModule
+ *  @param inOnlyResourceAccess = true, close resource file (only relevant for Linux !!).
+ */
+void UnloadModule( OS_ModuleRef inModule, bool inOnlyResourceAccess = false );
+
+/** @brief Read resource file and fill the data in outBuffer
+ *  @param inOSModule Handle of the module.
+ *  @param inResourceName Name of the resource file which needs to be read.
+ *  @param inResourceType Type/Extension of the resource file.
+ *  @param outBuffer Output buffer where data read from the resource file will be stored.
+ *  @return true on success otherwise false
+ */
+bool GetResourceDataFromModule(
+	OS_ModuleRef inOSModule,
+	const std::string & inResourceName,
+	const std::string & inResourceType,
+	std::string & outBuffer);
+
+} //namespace XMP_PLUGIN
+#endif
diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp
new file mode 100644
index 0000000..7808a98
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp
@@ -0,0 +1,238 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "ModuleUtils.h"
+#include "source/UnicodeConversions.hpp"
+#include "source/XIO.hpp"
+
+#include <iostream>
+#include <map>
+#include <limits>
+#include <dlfcn.h>
+#include <errno.h>
+
+namespace XMP_PLUGIN
+{
+
+// global map of loaded modules (handle, full path)
+typedef std::map<OS_ModuleRef, std::string>			ModuleRefToPathMap;
+static ModuleRefToPathMap							sMapModuleRefToPath;
+//typedef std::map<void*, std::string>				ResourceFileToPathMap;
+typedef std::map<OS_ModuleRef, std::string>			ResourceFileToPathMap;
+static ResourceFileToPathMap						sMapResourceFileToPath;
+static XMP_ReadWriteLock							sMapModuleRWLock;
+
+typedef std::tr1::shared_ptr<int>					FilePtr;
+
+static std::string GetModulePath( OS_ModuleRef inOSModule );
+/** ************************************************************************************************************************
+** CloseFile()
+*/
+void CloseFile(
+	int* inFilePtr)
+{
+	close(*inFilePtr);
+	delete inFilePtr;
+}
+
+/** ************************************************************************************************************************
+** OpenResourceFile()
+*/
+static FilePtr OpenResourceFile(
+	OS_ModuleRef inOSModule,
+	const std::string& inResourceName,
+	const std::string& inResourceType)
+{
+	// It is assumed, that all resources reside in a folder with
+	// the same name as the shared object plus '.resources' extension
+	std::string path( GetModulePath(inOSModule) );
+	
+	XMP_StringPtr extPos = path.c_str() + path.size();
+	for ( ; (extPos != path.c_str()) && (*extPos != '.'); --extPos ) {}
+	path.erase( extPos - path.c_str() ); // Remove extension
+	
+	path += ".resources";
+	path += kDirChar;
+	path += inResourceName + "." + inResourceType;
+
+	FilePtr file;
+	if( Host_IO::GetFileMode(path.c_str()) == Host_IO::kFMode_IsFile )
+	{
+		int fileRef = ::open( path.c_str(), O_RDONLY );
+		if (fileRef != -1)
+		{
+			file.reset(new int(fileRef), CloseFile);
+		}
+	}
+	return file;
+}
+
+OS_ModuleRef LoadModule( const std::string & inModulePath, bool inOnlyResourceAccess)
+{
+	OS_ModuleRef result = NULL;
+	if( inOnlyResourceAccess )
+	{
+		int fileHandle = open(reinterpret_cast<const char*>(inModulePath.c_str()), O_RDONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+		if( !fileHandle )
+		{
+			std::cerr << "Cannot open library for resource access: " << strerror(errno) << std::endl;
+		}
+		else
+		{	// success !
+			result = (void*) fileHandle;
+			ResourceFileToPathMap::const_iterator iter = sMapResourceFileToPath.find(result);
+			if (iter == sMapResourceFileToPath.end())
+			{
+				// not found, so insert
+				sMapResourceFileToPath.insert(std::make_pair(result, inModulePath));
+			}
+		}
+
+	}
+	else
+	{
+		result = dlopen(reinterpret_cast<const char*>(inModulePath.c_str()), RTLD_LAZY/*RTLD_NOW*/);
+
+		if( !result )
+		{
+			std::cerr << "Cannot open library: " << dlerror() << std::endl;
+		}
+		else
+		{	// success !
+			XMP_AutoLock writeLock ( &sMapModuleRWLock, kXMP_WriteLock );
+			ModuleRefToPathMap::const_iterator iter = sMapModuleRefToPath.find(result);
+			if( iter == sMapModuleRefToPath.end() )
+			{
+				// not found, so insert
+				sMapModuleRefToPath.insert(std::make_pair(result, inModulePath));
+			}
+		}
+	}
+
+	return result;
+}
+
+void UnloadModule( OS_ModuleRef inModule, bool inOnlyResourceAccess )
+{
+	if( inModule != NULL )
+	{
+		// we bluntly assume, that only one instance of the same library is loaded ad therefore added to the global map !
+		if( inOnlyResourceAccess )
+		{
+			ResourceFileToPathMap::iterator iter = sMapResourceFileToPath.find(inModule);
+			if( iter != sMapResourceFileToPath.end() )
+			{
+				close((long) inModule);
+				sMapResourceFileToPath.erase(iter);
+			}
+			else
+			{
+				XMP_Throw("OS_Utils_Linux::UnloadModule called with invalid module handle", kXMPErr_InternalFailure);
+			}
+		}
+		else
+		{
+			XMP_AutoLock writeLock ( &sMapModuleRWLock, kXMP_WriteLock );
+			ModuleRefToPathMap::iterator iter = sMapModuleRefToPath.find(inModule);
+			if( iter != sMapModuleRefToPath.end() )
+			{
+				dlclose(inModule);
+				sMapModuleRefToPath.erase(iter);
+			}
+			else
+			{
+				XMP_Throw("OS_Utils_Linux::UnloadModule called with invalid module handle", kXMPErr_InternalFailure);
+			}
+		}
+	}
+}
+
+/** ************************************************************************************************************************
+** GetModulePath()
+*/
+static std::string GetModulePath(
+	OS_ModuleRef inOSModule)
+{
+	std::string result;
+
+	if( inOSModule != NULL )
+	{
+		ModuleRefToPathMap::const_iterator iter;
+		{
+			XMP_AutoLock readLock ( &sMapModuleRWLock, kXMP_ReadLock );
+			iter = sMapModuleRefToPath.find(inOSModule);
+		}
+
+		ResourceFileToPathMap::const_iterator iter2 = sMapResourceFileToPath.find(inOSModule);
+		if( (iter != sMapModuleRefToPath.end()) && (iter2 != sMapResourceFileToPath.end()) )
+		{
+			XMP_Throw("OS_Utils_Linux::GetModulePath: Module handle is present in both global maps", kXMPErr_InternalFailure);
+		}
+		if (iter != sMapModuleRefToPath.end())
+		{
+			result = iter->second;
+		}
+		else if (iter2 != sMapResourceFileToPath.end())
+		{
+			result = iter2->second;
+		}
+		else
+		{
+			XMP_Throw("OS_Utils_Linux::GetModulePath: Failed to find inOSModule in global map !", kXMPErr_InternalFailure);
+		}
+	}
+	
+	return result;
+}
+
+void* GetFunctionPointerFromModuleImpl(	OS_ModuleRef inOSModule, const char* inSymbol )
+{
+	void* proc = NULL;
+	if( inOSModule != NULL )
+	{
+		proc = dlsym(inOSModule, inSymbol);
+		if( !proc )
+		{
+			std::cerr << "Cannot get function " << inSymbol << " : " << dlerror() << std::endl;
+		}
+	}
+	return proc;
+}
+
+bool GetResourceDataFromModule(
+	OS_ModuleRef inOSModule,
+	const std::string & inResourceName,
+	const std::string & inResourceType,
+	std::string & outBuffer)
+{
+	bool success = false;
+	FilePtr file = OpenResourceFile( inOSModule, inResourceName, inResourceType );
+
+	if( file )
+	{
+		ssize_t	size = 0;
+		ssize_t	file_size = ::lseek(*file.get(), 0, SEEK_END);
+		// presumingly we don't want to load more than 2GByte at once (!)
+		if( file_size < std::numeric_limits<XMP_Int32>::max() )
+		{
+			size = file_size;
+			if( size > 0 )
+			{
+				outBuffer.resize(size);
+
+				::lseek(*file.get(), 0, SEEK_SET);
+				ssize_t bytesRead = ::read( *file.get(), (unsigned char*)&outBuffer[0], size );
+				success = bytesRead == size;
+			}
+		}
+	}
+	return success;
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp
new file mode 100644
index 0000000..e9c2b46
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp
@@ -0,0 +1,299 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "ModuleUtils.h"
+#include "source/UnicodeConversions.hpp"
+#include "source/XIO.hpp"
+
+#include <CoreFoundation/CFBundle.h>
+#include <CoreFoundation/CFDate.h>
+#include <CoreFoundation/CFNumber.h>
+#include <CoreFoundation/CFError.h>
+#include <string>
+
+
+namespace XMP_PLUGIN
+{
+
+/** ************************************************************************************************************************
+** Auto-releasing wrapper for Core Foundation objects
+** AutoCFRef is an auto-releasing wrapper for any Core Foundation data type that can be passed
+** to CFRetain and CFRelease. When constructed with a Core Foundation object, it is assumed it
+** has just been created; that constructor does not call CFRetain. This supports reference counting
+** through Core Foundation's own mechanism.
+*/
+template <class T>
+class AutoCFRef
+{
+	
+public:
+	/// Default constructor creates NULL reference
+	AutoCFRef()
+		{
+			mCFTypeRef = NULL;
+		}
+	
+	/// Construct with any CFXXXRef type.
+	explicit AutoCFRef(const T& value)
+		{
+			mCFTypeRef = value;
+		}
+	
+	/// Copy constructor
+	AutoCFRef(const AutoCFRef<T>& rhs)
+		{
+			mCFTypeRef = rhs.mCFTypeRef;
+			if (mCFTypeRef)
+				CFRetain(mCFTypeRef);
+		}
+	
+	/// Destructor
+	~AutoCFRef()
+		{
+			if (mCFTypeRef)
+				CFRelease(mCFTypeRef);
+		}
+	
+	/// Assignment operator
+	void operator=(const AutoCFRef<T>& rhs)
+		{
+			if (!Same(rhs))
+			{
+				if (mCFTypeRef)
+					CFRelease(mCFTypeRef);
+				mCFTypeRef = rhs.mCFTypeRef;
+				if (mCFTypeRef)
+					CFRetain(mCFTypeRef);
+			}
+		}
+	
+	/// Equivalence operator
+	/** operator== returns logical equivalence, the meaning of which varies from class to class
+		in Core Foundation. See also AutoCFRef::Same.
+		@param rhs The AutoCFRef<T> to compare to
+		@return true if objects are logically equivalent.
+	*/
+	bool operator==(const AutoCFRef<T>& rhs) const
+		{
+			if (mCFTypeRef && rhs.mCFTypeRef)
+				return CFEqual(mCFTypeRef, rhs.mCFTypeRef);
+			else
+				return mCFTypeRef == rhs.mCFTypeRef;
+		}
+	
+	/// Non-equivalence operator
+	/** operator!= returns logical equivalence, the meaning of which varies from class to class
+		in Core Foundation. See also AutoCFRef::Same.
+		@param rhs The AutoCFRef<T> to compare to
+		@return true if objects are not logically equivalent.
+	*/
+	bool operator!=(const AutoCFRef<T>& rhs) const
+		{
+			return !operator==(rhs);
+		}
+	
+	/// References same CF object
+	/** Same returns true if both objects reference the same CF object (or both are NULL).
+		For logical equivalence (CFEqual) use == operator.
+		@param rhs The AutoCFRef<T> to compare to
+		@return true if AutoRefs reference the same object.
+	*/
+	bool Same(const AutoCFRef<T>& rhs) const
+		{
+			return mCFTypeRef == rhs.mCFTypeRef;
+		}
+		
+	/// Change the object referenced
+	/** Reset is used to put a new CF object into a preexisting AutoCFRef. Does NOT call CFRetain,
+		so if its ref count is 1 on entry, it will delete on destruction, barring other influences.
+		@param value (optional) the new CFXXXRef to set, default is NULL.
+	*/
+	void Reset(T value = NULL)
+		{
+			if (value != mCFTypeRef)
+			{
+				if (mCFTypeRef)
+					CFRelease(mCFTypeRef);
+				mCFTypeRef = value;
+			}
+		}
+	
+	/// Return true if no object referenced.
+	bool IsNull() const
+		{
+			return mCFTypeRef == NULL;
+		}
+	
+	/// Return retain count.
+	/** Returns retain count of referenced object from Core Foundation. Can be used to track down
+		failures in reference management, but be aware that some objects might be returned to your
+		code by the operating system with a retain count already greater than one.
+		@return Referenced object's retain count.
+	*/
+	CFIndex RetainCount()
+		{
+			return mCFTypeRef ? CFGetRetainCount(mCFTypeRef) : 0;
+		}
+	
+	/// Const dereference operator
+	/** operator* returns a reference to the contained CFTypeRef. Use this to pass the object into
+		Core Foundation functions. DO NOT use this to create a new AutoCFRef; copy construct instead.
+	*/
+	const T& operator*() const
+		{
+			return mCFTypeRef;
+		}
+
+	/// Nonconst dereference operator
+	/** operator* returns a reference to the contained CFTypeRef. Use this to pass the object into
+		Core Foundation functions. DO NOT use this to create a new AutoCFRef; copy construct instead.
+	*/
+	T& operator*()
+		{
+			return mCFTypeRef;
+		}
+
+private:
+	T			mCFTypeRef;
+};
+
+typedef AutoCFRef<CFURLRef>					AutoCFURL;
+typedef AutoCFRef<CFStringRef>				AutoCFString;
+
+/** ************************************************************************************************************************
+** Convert string into CFString
+*/
+static inline CFStringRef MakeCFString(const std::string& inString, CFStringEncoding inEncoding = kCFStringEncodingUTF8)
+{
+	CFStringRef str = ::CFStringCreateWithCString( NULL, inString.c_str(), inEncoding );
+	return str;
+}
+
+bool IsValidLibrary( const std::string & inModulePath )
+{
+	bool result = false;
+	AutoCFURL bundleURL(::CFURLCreateFromFileSystemRepresentation(
+		kCFAllocatorDefault,
+		(const UInt8*) inModulePath.c_str(),
+		inModulePath.size(),
+		false));
+	if (*bundleURL != NULL)
+	{
+		CFBundleRef bundle = ::CFBundleCreate(kCFAllocatorDefault, *bundleURL);
+		if (bundle != NULL)
+		{
+			CFArrayRef arrayRef = ::CFBundleCopyExecutableArchitectures(bundle);
+			if (arrayRef != NULL)
+			{
+				result = true;
+				::CFRelease(arrayRef);
+			}
+
+			::CFRelease(bundle);
+		}
+	}		
+	return result;
+}
+
+OS_ModuleRef LoadModule( const std::string & inModulePath, bool inOnlyResourceAccess )
+{
+	OS_ModuleRef result = NULL;
+	AutoCFURL bundleURL(::CFURLCreateFromFileSystemRepresentation(
+		kCFAllocatorDefault,
+		(const UInt8*) inModulePath.c_str(),
+		inModulePath.size(),
+		false));
+	if (*bundleURL != NULL)
+	{
+		result = ::CFBundleCreate(kCFAllocatorDefault, *bundleURL);
+		if (!inOnlyResourceAccess && (result != NULL))
+		{
+			::CFErrorRef errorRef = NULL;
+			Boolean loaded = ::CFBundleIsExecutableLoaded(result);
+			if (!loaded)
+			{
+				loaded = ::CFBundleLoadExecutableAndReturnError(result, &errorRef);
+				if(!loaded || errorRef != NULL)
+				{
+					::CFRelease(errorRef);
+					// release bundle and return NULL
+					::CFRelease(result);
+					result = NULL;
+					throw XMP_Error( kXMPErr_InternalFailure, "Failed to load module" );
+				}
+			}
+		}
+	}
+	return result;
+}
+
+void UnloadModule( OS_ModuleRef inModule, bool inOnlyResourceAccess )
+{
+	if (inModule != NULL)
+	{
+		::CFRelease(inModule);
+	}
+}
+
+void* GetFunctionPointerFromModuleImpl(	OS_ModuleRef inOSModule, const char* inSymbol )
+{
+	void* proc = NULL;
+	if( inOSModule != NULL)
+	{
+		proc = ::CFBundleGetFunctionPointerForName( inOSModule, *AutoCFString(MakeCFString(inSymbol)) );
+	}
+	return proc;
+}
+
+bool GetResourceDataFromModule(
+	OS_ModuleRef inOSModule,
+	const std::string & inResourceName,
+	const std::string & inResourceType,
+	std::string & outBuffer)
+{
+	bool success = false;
+	bool inSearchInSubFolderWithNameOfResourceType = false;
+	AutoCFString resourceName( MakeCFString( inResourceName ) );
+	AutoCFString resourceType( MakeCFString( inResourceType ) );
+	AutoCFString subfolderName( inSearchInSubFolderWithNameOfResourceType ? MakeCFString( inResourceType ) : nil );
+
+	AutoCFURL url( ::CFBundleCopyResourceURL( inOSModule, *resourceName, *resourceType, *subfolderName ) );
+
+	if ( !url.IsNull() )
+	{
+		typedef AutoCFRef<CFDataRef> AutoCFData;
+		typedef AutoCFRef<CFNumberRef> AutoCFNumber;
+		AutoCFData resourceData;
+		SInt32 errorCode = 0;
+		AutoCFNumber length;
+		*length = reinterpret_cast<CFNumberRef> ( ::CFURLCreatePropertyFromResource( kCFAllocatorDefault, *url, kCFURLFileLength, &errorCode ) );
+
+		if ( !errorCode )
+		{
+			SInt64 sizeOfFile = 0;
+			success = ::CFNumberGetValue( *length, kCFNumberSInt64Type, &sizeOfFile );
+			// presumingly we don't want to load more than 2GByte at once (!)
+			if ( success && sizeOfFile < std::numeric_limits<XMP_Int32>::max() )
+			{
+				success = ::CFURLCreateDataAndPropertiesFromResource( kCFAllocatorDefault, *url, &(*resourceData), NULL, NULL, &errorCode );
+				if ( success && errorCode == 0 )
+				{
+					outBuffer.resize( sizeOfFile );
+					CFRange range = CFRangeMake (0, sizeOfFile );
+					::CFDataGetBytes( *resourceData, range, reinterpret_cast< UInt8 * > (&outBuffer[0]) );
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp b/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp
new file mode 100644
index 0000000..66df45a
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp
@@ -0,0 +1,66 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "ModuleUtils.h"
+#include "source/UnicodeConversions.hpp"
+
+namespace XMP_PLUGIN
+{
+
+OS_ModuleRef LoadModule( const std::string & inModulePath, bool inOnlyResourceAccess)
+{
+	std::string wideString;
+	ToUTF16 ( (UTF8Unit*)inModulePath.c_str(), inModulePath.size() + 1, &wideString, false ); // need +1 character otherwise \0 won't be converted into UTF16
+
+	DWORD flags = inOnlyResourceAccess ? LOAD_LIBRARY_AS_IMAGE_RESOURCE : 0;
+	OS_ModuleRef result = ::LoadLibraryEx((WCHAR*) wideString.c_str(), NULL, flags);
+
+	// anything below indicates error in LoadLibrary
+	if((result != NULL) && (result < OS_ModuleRef(32)))
+	{
+		result = NULL;
+	}
+	return result;
+}
+
+void UnloadModule( OS_ModuleRef inModule, bool inOnlyResourceAccess )
+{
+	::FreeLibrary(inModule);
+}
+
+void* GetFunctionPointerFromModuleImpl(	OS_ModuleRef inOSModule, const char* inSymbol )
+{
+	return reinterpret_cast<void*>(	::GetProcAddress( inOSModule, inSymbol ) );
+}
+
+bool GetResourceDataFromModule(
+	OS_ModuleRef inOSModule,
+	const std::string & inResourceName,
+	const std::string & inResourceType,
+	std::string & outBuffer)
+{
+	HRSRC src = ::FindResourceA(inOSModule, reinterpret_cast<LPCSTR>(inResourceName.c_str()), reinterpret_cast<LPCSTR>(inResourceType.c_str()));
+	if( src != NULL )
+	{
+		HGLOBAL resource = (::LoadResource(inOSModule, src));
+		HGLOBAL data = (::LockResource(resource));
+		std::size_t size = (std::size_t)(::SizeofResource(inOSModule, src));
+		if (size)
+		{
+			outBuffer.assign((const char*)data, size);
+		}
+		UnlockResource(data);
+		::FreeResource(resource);
+
+		return true;
+	}
+	return false;
+}
+
+} //namespace XMP_PLUGIN
\ No newline at end of file
diff --git a/XMPFiles/source/PluginHandler/PluginManager.cpp b/XMPFiles/source/PluginHandler/PluginManager.cpp
new file mode 100644
index 0000000..0f47300
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/PluginManager.cpp
@@ -0,0 +1,823 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "PluginManager.h"
+#include "FileHandler.h"
+#include <algorithm>
+#include "XMPAtoms.h"
+#include "XMPFiles/source/HandlerRegistry.h"
+#include "FileHandlerInstance.h"
+#include "HostAPI.h"
+
+using namespace Common;
+using namespace std;
+
+// =================================================================================================
+
+namespace XMP_PLUGIN
+{
+
+const char* kResourceName_UIDs  = "XMPPLUGINUIDS";
+const char* kLibraryExtensions[] = { "xpi" };
+
+struct FileHandlerPair
+{
+	FileHandlerSharedPtr	mStandardHandler;
+	FileHandlerSharedPtr	mReplacementHandler;
+};
+
+// =================================================================================================
+
+static XMP_FileFormat GetXMPFileFormatFromFilePath( XMP_StringPtr filePath )
+{
+	XMP_StringPtr pathName = filePath + strlen(filePath);
+	for ( ; pathName > filePath; --pathName ) {
+		if ( *pathName == '.' ) break;
+	}
+	
+	XMP_StringPtr fileExt = pathName + 1;
+	return HandlerRegistry::getInstance().getFileFormat ( fileExt );
+}
+
+// =================================================================================================
+
+static XMPFileHandler* Plugin_MetaHandlerCTor ( FileHandlerSharedPtr handler, XMPFiles* parent )
+{
+	SessionRef object;
+	WXMP_Error error;
+
+	if( (handler == 0) || (! handler->load()) ) 
+	{
+		XMP_Throw ( "Plugin not loaded", kXMPErr_InternalFailure );
+	}
+
+	handler->getModule()->getPluginAPIs()->mInitializeSessionProc ( handler->getUID().c_str(), parent->GetFilePath().c_str(), (XMP_Uns32)parent->format, (XMP_Uns32)handler->getHandlerFlags(), (XMP_Uns32)parent->openFlags, &object, &error );
+	CheckError ( error );
+
+	FileHandlerInstance* instance = new FileHandlerInstance ( object, handler, parent );
+	return instance;
+}
+
+static XMPFileHandler* Plugin_MetaHandlerCTor_Standard( XMPFiles * parent )
+{
+	FileHandlerSharedPtr handler = PluginManager::getFileHandler( parent->format, PluginManager::kStandardHandler );
+
+	return Plugin_MetaHandlerCTor( handler, parent );
+}
+
+static XMPFileHandler* Plugin_MetaHandlerCTor_Replacement( XMPFiles * parent )
+{
+	FileHandlerSharedPtr handler = PluginManager::getFileHandler( parent->format, PluginManager::kReplacementHandler );
+
+	return Plugin_MetaHandlerCTor( handler, parent );
+}
+
+// =================================================================================================
+
+static bool Plugin_CheckFileFormat ( FileHandlerSharedPtr handler, XMP_StringPtr filePath, XMP_IO * fileRef, XMPFiles * parent )
+{
+	if ( handler != 0 ) {
+
+		// call into plugin if owning handler or if manifest has no CheckFormat entry
+		if ( fileRef == 0 || handler->getCheckFormatSize() == 0) {
+
+			XMP_Bool ok;
+			WXMP_Error error;
+			CheckSessionFileFormatProc checkProc = handler->getModule()->getPluginAPIs()->mCheckFileFormatProc;
+			checkProc ( handler->getUID().c_str(), filePath, fileRef, &ok, &error );
+			CheckError ( error );
+			return ConvertXMP_BoolToBool( ok );
+
+		} else {
+
+			// all CheckFormat manifest entries must match
+			for ( XMP_Uns32 i=0; i < handler->getCheckFormatSize(); i++ ) {
+
+				CheckFormat checkFormat = handler->getCheckFormat ( i );
+
+				if ( checkFormat.empty() ) return false;
+
+				XMP_Uns8 buffer[1024];
+
+				if ( checkFormat.mLength > 1024 ) {
+					//Ideally check format string should not be that long. 
+					//The check is here to handle only malicious data.
+					checkFormat.mLength = 1024;
+				}
+
+				fileRef->Seek ( checkFormat.mOffset, kXMP_SeekFromStart );
+				XMP_Uns32 len = fileRef->Read ( buffer, checkFormat.mLength );
+
+				if ( len != checkFormat.mLength ) {
+
+					// Not enough byte read from the file.
+					return false;
+
+				} else {
+
+					// Check if byteSeq is hexadecimal byte sequence, e.g 0x03045100
+					
+					bool isHex = ( (checkFormat.mLength > 0 ) &&
+								   (checkFormat.mByteSeq.size() == (2 + 2*checkFormat.mLength) &&
+								   (checkFormat.mByteSeq[0] == '0') &&
+								   (checkFormat.mByteSeq[1] == 'x') )
+								   );
+
+					if ( ! isHex ) {
+
+						if ( memcmp ( buffer, checkFormat.mByteSeq.c_str(), checkFormat.mLength ) != 0 ) return false;
+
+					} else {
+
+						for ( XMP_Uns32 current = 0; current < checkFormat.mLength; current++ ) {
+
+							char oneByteBuffer[3];
+							oneByteBuffer[0] = checkFormat.mByteSeq [ 2 + 2*current ];
+							oneByteBuffer[1] = checkFormat.mByteSeq [ 2 + 2*current + 1 ];
+							oneByteBuffer[2] = '\0';
+
+							XMP_Uns8 oneByte = (XMP_Uns8) strtoul ( oneByteBuffer, 0, 16 );
+							if ( oneByte != buffer[current] ) return false;
+
+						}
+
+					}
+
+				}
+
+			}
+			
+			return true;	// The checkFormat string comparison passed.
+
+		}
+
+	}
+
+	return false;	// Should never get here.
+}	// Plugin_CheckFileFormat
+
+static bool Plugin_CheckFileFormat_Standard( XMP_FileFormat format, XMP_StringPtr filePath, XMP_IO* fileRef, XMPFiles* parent )
+{
+	FileHandlerSharedPtr handler = PluginManager::getFileHandler( format, PluginManager::kStandardHandler );
+
+	return Plugin_CheckFileFormat( handler, filePath, fileRef, parent );
+}
+
+static bool Plugin_CheckFileFormat_Replacement( XMP_FileFormat format, XMP_StringPtr filePath, XMP_IO* fileRef, XMPFiles* parent )
+{
+	FileHandlerSharedPtr handler = PluginManager::getFileHandler( format, PluginManager::kReplacementHandler );
+
+	return Plugin_CheckFileFormat( handler, filePath, fileRef, parent );
+}
+
+// =================================================================================================
+
+static bool Plugin_CheckFolderFormat( FileHandlerSharedPtr handler,
+									  const std::string & rootPath,
+									  const std::string & gpName,
+									  const std::string & parentName,
+									  const std::string & leafName,
+									  XMPFiles * parent )
+{
+	XMP_Bool result = false;
+
+	if ( handler != 0 ) 
+	{
+		WXMP_Error error;
+		CheckSessionFolderFormatProc checkProc = handler->getModule()->getPluginAPIs()->mCheckFolderFormatProc;
+		checkProc ( handler->getUID().c_str(), rootPath.c_str(), gpName.c_str(), parentName.c_str(), leafName.c_str(), &result, &error );
+		CheckError( error );
+	}
+
+	return ConvertXMP_BoolToBool( result );
+
+}
+
+static bool Plugin_CheckFolderFormat_Standard( XMP_FileFormat format,
+	const std::string & rootPath,
+	const std::string & gpName,
+	const std::string & parentName,
+	const std::string & leafName,
+	XMPFiles * parent )
+{
+	FileHandlerSharedPtr handler = PluginManager::getFileHandler( format, PluginManager::kStandardHandler );
+
+	return Plugin_CheckFolderFormat( handler, rootPath, gpName, parentName, leafName, parent );
+}
+
+static bool Plugin_CheckFolderFormat_Replacement( XMP_FileFormat format,
+	const std::string & rootPath,
+	const std::string & gpName,
+	const std::string & parentName,
+	const std::string & leafName,
+	XMPFiles * parent )
+{
+	FileHandlerSharedPtr handler = PluginManager::getFileHandler( format, PluginManager::kReplacementHandler );
+
+	return Plugin_CheckFolderFormat( handler, rootPath, gpName, parentName, leafName, parent );
+}
+
+// =================================================================================================
+
+PluginManager* PluginManager::msPluginManager = 0;
+
+PluginManager::PluginManager( const std::string& pluginDir, const std::string& plugins )
+: mPluginDir ( pluginDir )
+{
+
+	const std::size_t count = sizeof(kLibraryExtensions) / sizeof(kLibraryExtensions[0]);
+
+	for ( std::size_t i = 0; i<count; ++i ) {
+		mExtensions.push_back ( std::string ( kLibraryExtensions[i] ) );
+	}
+
+	size_t pos = std::string::npos;
+
+	#if XMP_WinBuild
+		// convert to Win kDirChar
+		while ( (pos = mPluginDir.find ('/')) != string::npos ) {
+			mPluginDir.replace (pos, 1, "\\");
+		}
+	#else
+		while ( (pos = mPluginDir.find ('\\')) != string::npos ) {
+			mPluginDir.replace (pos, 1, "/");
+		}
+	#endif
+
+	if ( ! mPluginDir.empty() && Host_IO::Exists( mPluginDir.c_str() ) ) {
+
+		XMP_StringPtr strPtr = plugins.c_str();
+		size_t pos = 0;
+		size_t length = 0;
+
+		for ( ; ; ++strPtr, ++length ) {
+
+			if ( (*strPtr == ',') || (*strPtr == '\0') ) {
+
+				if ( length != 0 ) {
+
+					//Remove white spaces from front
+					while ( plugins[pos] == ' ' ) {
+						++pos;
+						--length;
+					}
+
+					std::string pluginName;
+					pluginName.assign ( plugins, pos, length );
+					
+					//Remove extension from the plugin name
+					size_t found = pluginName.find ( '.' );
+					if ( found != string::npos ) pluginName.erase ( found );
+
+					//Remove white spaces from the back
+					found = pluginName.find ( ' ' );
+					if ( found != string::npos ) pluginName.erase ( found );
+					
+					MakeLowerCase ( &pluginName );
+					mPluginsNeeded.push_back ( pluginName );
+
+					//Reset for next plugin
+					pos = pos + length + 1;
+					length = 0;
+
+				}
+
+				if ( *strPtr == '\0' ) break;
+
+			}
+
+		}
+
+	}
+
+}	// PluginManager::PluginManager
+
+// =================================================================================================
+
+PluginManager::~PluginManager()
+{
+	mPluginDir.clear();
+	mExtensions.clear();
+	mPluginsNeeded.clear();
+	mHandlers.clear();
+	mSessions.clear();
+
+	terminateHostAPI();
+}
+
+// =================================================================================================
+
+static bool registerHandler( XMP_FileFormat format, FileHandlerSharedPtr handler )
+{
+	bool ret = false;
+
+	HandlerRegistry& hdlrReg				= HandlerRegistry::getInstance();
+	FileHandlerType type					= handler->getHandlerType();
+	CheckFileFormatProc chkFileFormat		= NULL;
+	CheckFolderFormatProc chkFolderFormat	= NULL;
+	XMPFileHandlerCTor hdlCtor				= NULL;
+
+	if ( handler->getHandlerFlags() & kXMPFiles_NeedsPreloading )
+	{
+		try
+		{
+			handler->load();
+		}
+		catch ( ... )
+		{
+			return false;
+		}
+	}
+
+	if( handler->getOverwriteHandler() )
+	{
+		//
+		// ctor, checkformat function pointers for replacement handler
+		//
+		hdlCtor			= Plugin_MetaHandlerCTor_Replacement;
+		chkFileFormat	= Plugin_CheckFileFormat_Replacement;
+		chkFolderFormat	= Plugin_CheckFolderFormat_Replacement;
+	}
+	else
+	{
+		//
+		// ctor, checkformat function pointers for standard handler
+		//
+		hdlCtor			= Plugin_MetaHandlerCTor_Standard;
+		chkFileFormat	= Plugin_CheckFileFormat_Standard;
+		chkFolderFormat	= Plugin_CheckFolderFormat_Standard;
+	}
+
+	//
+	// register handler according to its type
+	//
+	switch( handler->getHandlerType() ) 
+	{
+		case NormalHandler_K:
+			ret = hdlrReg.registerNormalHandler( format, handler->getHandlerFlags(), chkFileFormat, 
+												 hdlCtor, handler->getOverwriteHandler() );
+			break;
+
+		case OwningHandler_K:
+			ret = hdlrReg.registerOwningHandler( format, handler->getHandlerFlags(), chkFileFormat, 
+												 hdlCtor, handler->getOverwriteHandler() );
+			break;
+
+		case FolderHandler_K:
+			ret = hdlrReg.registerFolderHandler( format, handler->getHandlerFlags(), chkFolderFormat, 
+												 hdlCtor, handler->getOverwriteHandler() );
+			break;
+
+		default:
+			break;
+	}
+
+	return ret;
+}
+
+void PluginManager::initialize( const std::string& pluginDir, const std::string& plugins )
+{
+	try 
+	{
+		if( msPluginManager == 0 ) msPluginManager = new PluginManager( pluginDir, plugins );
+		msPluginManager->initializeHostAPI();
+
+		msPluginManager->doScan( 2 );
+
+		//
+		// Register all the found plugin based file handler
+		//
+		for( PluginHandlerMap::iterator it = msPluginManager->mHandlers.begin(); it != msPluginManager->mHandlers.end(); ++it ) 
+		{
+			XMP_FileFormat format = it->first;
+			FileHandlerPair handlers = it->second;
+
+			if( handlers.mStandardHandler != NULL )
+			{
+				registerHandler( format, handlers.mStandardHandler );
+			}
+
+			if( handlers.mReplacementHandler != NULL )
+			{
+				registerHandler( format, handlers.mReplacementHandler );
+			}
+		}
+	} 
+	catch( ... ) 
+	{
+		// Absorb exceptions. This is the plugin-architecture entry point.
+	}
+
+}	// PluginManager::initialize
+
+// =================================================================================================
+
+void PluginManager::terminate()
+{
+	delete msPluginManager;
+	msPluginManager = 0;
+	ResourceParser::terminate();
+}
+
+// =================================================================================================
+
+void PluginManager::addFileHandler( XMP_FileFormat format, FileHandlerSharedPtr handler )
+{
+	if ( msPluginManager != 0 ) 
+	{
+		PluginHandlerMap & handlerMap = msPluginManager->mHandlers;
+
+		//
+		// Create placeholder in map for format
+		//
+		if ( handlerMap.find(format) == handlerMap.end() ) 
+		{
+			FileHandlerPair pair;
+			handlerMap.insert( handlerMap.end(), std::pair<XMP_FileFormat, FileHandlerPair>( format, pair) );
+		}
+
+		//
+		//
+		// if there is already a standard handler or a replacement handler for the file format
+		// then use the one with the highest version. If both versions are the same the first one wins.
+		//
+		FileHandlerSharedPtr& existingHandler =
+			handler->getOverwriteHandler() ? handlerMap[format].mReplacementHandler : handlerMap[format].mStandardHandler;
+
+		if( ! existingHandler )
+		{
+			existingHandler = handler;
+		}
+		else
+		{
+			if( existingHandler->getUID() == handler->getUID() )
+			{
+				if( existingHandler->getVersion() < handler->getVersion() )
+				{
+					existingHandler = handler;	// replace older handler
+				}
+			}
+			else
+			{
+				// TODO: notify client that two plugin handlers try to handle the same file format
+				// -> need access to the global notification handler
+			}
+		}
+	}
+}
+
+// =================================================================================================
+
+FileHandlerSharedPtr PluginManager::getFileHandler( XMP_FileFormat format, HandlerPriority priority /*= kStandardHandler*/ )
+{
+	if ( msPluginManager != 0 ) 
+	{
+		PluginHandlerMap::iterator it = msPluginManager->mHandlers.find( format );
+	
+		if( it != msPluginManager->mHandlers.end() ) 
+		{
+			if( priority == kStandardHandler )
+			{
+				return it->second.mStandardHandler;
+			}
+			else if( priority == kReplacementHandler )
+			{
+				return it->second.mReplacementHandler;
+			}
+		}
+	}
+	
+	return FileHandlerSharedPtr();
+}
+
+// =================================================================================================
+
+static XMP_ReadWriteLock sSessionMapPluginManagerRWLock;
+
+void PluginManager::addHandlerInstance( SessionRef session, FileHandlerInstancePtr handler )
+{
+	if ( msPluginManager != 0 ) {
+		XMP_AutoLock lock(&sSessionMapPluginManagerRWLock, kXMP_WriteLock);
+		SessionMap & sessionMap = msPluginManager->mSessions;
+		if ( sessionMap.find(session) == sessionMap.end() ) {
+			sessionMap[session] = handler;	
+		}
+	}
+}
+
+// =================================================================================================
+
+void PluginManager::removeHandlerInstance( SessionRef session )
+{
+	if ( msPluginManager != 0 ) {
+		XMP_AutoLock lock(&sSessionMapPluginManagerRWLock, kXMP_WriteLock);
+		SessionMap & sessionMap = msPluginManager->mSessions;
+		sessionMap.erase ( session );
+	}
+}
+
+// =================================================================================================
+
+FileHandlerInstancePtr PluginManager::getHandlerInstance( SessionRef session )
+{
+	FileHandlerInstancePtr ret = 0;
+	if ( msPluginManager != 0 ) {
+		XMP_AutoLock lock(&sSessionMapPluginManagerRWLock, kXMP_ReadLock);
+		ret = msPluginManager->mSessions[session];
+	}
+	return ret;
+}
+
+// =================================================================================================
+
+PluginManager::HandlerPriority PluginManager::getHandlerPriority( FileHandlerInstancePtr handler )
+{
+	if( handler != NULL )
+	{
+		for( PluginHandlerMap::iterator it=msPluginManager->mHandlers.begin();
+			 it != msPluginManager->mHandlers.end(); it++ )
+		{
+			if( it->second.mStandardHandler == handler->GetHandlerInfo() )		return kStandardHandler;
+			if( it->second.mReplacementHandler == handler->GetHandlerInfo() )	return kReplacementHandler;
+		}
+	}
+
+	return kUnknown;
+}
+
+// =================================================================================================
+
+static bool CheckPluginArchitecture ( XMLParserAdapter * xmlParser ) {
+
+	#if XMP_MacBuild
+		bool okArchitecture = true;		// Missing Architecture attribute means load on Mac.
+	#else
+		bool okArchitecture = false;	// Missing Architecture attribute means do not load elsewhere.
+	#endif
+	
+	#if XMP_64
+		const char * nativeArchitecture = "x64";
+	#else
+		const char * nativeArchitecture = "x86";
+	#endif
+
+	size_t i, limit;
+	XML_Node & xmlTree = xmlParser->tree;
+	XML_NodePtr rootElem = 0;
+
+	// Find the outermost XML element and see if it is PluginResource.
+	for ( i = 0, limit = xmlTree.content.size(); i < limit; ++i ) {
+		if ( xmlTree.content[i]->kind == kElemNode ) {
+			rootElem = xmlTree.content[i];
+			break;
+		}
+	}
+	
+	if ( (rootElem == 0) || (rootElem->name != "PluginResource") ) return okArchitecture;
+	
+	// Look for the Architecture attribute and see if it matches.
+
+	XML_NodePtr archAttr = 0;
+	for ( i = 0, limit = rootElem->attrs.size(); i < limit; ++i ) {
+		if ( rootElem->attrs[i]->name == "Architecture" ) {
+			archAttr = rootElem->attrs[i];
+			break;
+		}
+	}
+	
+	if ( archAttr != 0 ) okArchitecture = (archAttr->value == nativeArchitecture);
+	
+	return okArchitecture;
+	
+}	// CheckPluginArchitecture
+
+// =================================================================================================
+
+void PluginManager::loadResourceFile( ModuleSharedPtr module )
+{
+	
+	OS_ModuleRef moduleRef = LoadModule ( module->getPath(), true );
+
+	if ( moduleRef != 0 ) {
+
+		XMLParserAdapter* parser = 0;
+	
+		try {
+
+			std::string buffer;
+			if ( GetResourceDataFromModule ( moduleRef, kResourceName_UIDs, "txt", buffer ) ) {
+
+				ResourceParser::initialize(); // Initialize XMPAtoms before processing resource file.
+
+				parser = XMP_NewExpatAdapter ( ExpatAdapter::kUseGlobalNamespaces );
+				parser->ParseBuffer ( (XMP_Uns8*)buffer.c_str(), buffer.size(), true );
+
+				if ( CheckPluginArchitecture ( parser ) ) {
+					ResourceParser resource ( module );
+					resource.parseElementList ( &parser->tree, true );
+				}
+
+				delete parser;
+
+			}
+
+		} catch ( ... ) {
+
+			if ( parser != 0 ) delete parser;
+			// Otherwise ignore errors.
+
+		}
+		
+		UnloadModule ( moduleRef, true );
+
+	}
+
+}	// PluginManager::loadResourceFile
+
+// =================================================================================================
+
+void PluginManager::scanRecursive( const std::string & tempPath, std::vector<std::string>& ioFoundLibs, XMP_Int32 inLevel, XMP_Int32 inMaxNestingLevel )
+{
+	++inLevel;
+	Host_IO::AutoFolder aFolder;
+	if ( Host_IO::GetFileMode( tempPath.c_str() ) != Host_IO::kFMode_IsFolder ) return;
+
+	aFolder.folder = Host_IO::OpenFolder( tempPath.c_str() );
+	std::string childPath, childName;
+
+	while ( Host_IO::GetNextChild ( aFolder.folder, &childName ) ) {	
+
+		// Make sure the children of CONTENTS are legit.
+		childPath = tempPath;
+		childPath += kDirChar;
+		childPath += childName;
+		Host_IO::FileMode clientMode = Host_IO::GetFileMode ( childPath.c_str() );
+		
+		bool okFolder = (clientMode == Host_IO::kFMode_IsFolder);
+		#if XMP_MacBuild
+			if ( okFolder ) okFolder = ( ! IsValidLibrary ( childPath ) );
+		#endif
+		
+		// only step into non-packages (neither bundle nor framework) on Mac
+		if ( okFolder ) {
+
+			if ( inLevel < inMaxNestingLevel ) {
+				scanRecursive ( childPath + kDirChar, ioFoundLibs, inLevel, inMaxNestingLevel );
+			}
+
+		} else {
+
+			if ( childName[0] == '~' ) continue; // ignore plug-ins like "~PDFL.xpi"
+
+			std::string fileExt;
+			XMP_StringPtr extPos = childName.c_str() + childName.size();
+			for ( ; (extPos != childName.c_str()) && (*extPos != '.'); --extPos ) {}
+			if ( *extPos == '.' ) {
+				fileExt.assign ( extPos+1 );
+				MakeLowerCase ( &fileExt );
+			}
+
+			StringVec::const_iterator iterFound =
+				std::find_if ( mExtensions.begin(), mExtensions.end(), 
+							   std::bind2nd ( std::equal_to<std::string>(), fileExt ) );
+
+			if ( iterFound != mExtensions.end() ) {
+
+				//Check if the found plugin is present in the user's demanding plugin list.
+				childName.erase ( extPos - childName.c_str() );
+				MakeLowerCase ( &childName );
+				
+				StringVec::const_iterator pluginNeeded =
+					std::find_if ( mPluginsNeeded.begin(), mPluginsNeeded.end(),
+								   std::bind2nd ( std::equal_to<std::string>(), childName ) );
+
+				if ( (pluginNeeded != mPluginsNeeded.end()) || mPluginsNeeded.empty() ) {
+					ioFoundLibs.push_back ( childPath );
+				}
+
+			}
+
+		}
+
+	}
+
+	aFolder.Close();
+
+}	// PluginManager::scanRecursive
+
+// =================================================================================================
+
+void PluginManager::doScan( const XMP_Int32 inMaxNumOfNestedFolder )
+{
+	XMP_Assert(inMaxNumOfNestedFolder > 0);
+	if ( inMaxNumOfNestedFolder < 1 ) return; // noop, wrong parameter
+		
+	// scan directory
+	std::vector<std::string> foundLibs;
+	XMP_Int32 iteration = 0;
+	scanRecursive ( mPluginDir, foundLibs, iteration, inMaxNumOfNestedFolder );
+
+	// add found modules
+	std::vector<std::string>::const_iterator iter = foundLibs.begin();
+	std::vector<std::string>::const_iterator iterEnd = foundLibs.end();
+	for ( ; iter != iterEnd; ++iter ) {
+		std::string path ( *iter );
+		ModuleSharedPtr module ( new Module ( path ) );
+		loadResourceFile ( module );
+	}
+
+}	// PluginManager::doScan
+
+// =================================================================================================
+
+HostAPIRef PluginManager::getHostAPI( XMP_Uns32 version )
+{
+	HostAPIRef hostAPI = NULL;
+
+	if( msPluginManager == NULL )	return NULL;
+	if(  version < 1 )				return NULL;
+
+	HostAPIMap::iterator iter = msPluginManager->mHostAPIs.find( version );
+
+	if( iter != msPluginManager->mHostAPIs.end() )
+	{
+		hostAPI = iter->second;
+	}
+
+	return hostAPI;
+}
+
+// =================================================================================================
+
+void PluginManager::terminateHostAPI()
+{
+	for( HostAPIMap::iterator it = msPluginManager->mHostAPIs.begin(); it != msPluginManager->mHostAPIs.end(); ++it )
+	{
+		XMP_Uns32 version = it->first;
+		HostAPIRef hostAPI = it->second;
+
+		switch( version )
+		{
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+			{
+				delete hostAPI->mFileIOAPI;
+				delete hostAPI->mStrAPI;
+				delete hostAPI->mAbortAPI;
+				delete hostAPI->mStandardHandlerAPI;
+				delete hostAPI;
+			}
+			break;
+
+		default:
+			{
+				delete hostAPI;
+			}
+		}
+	}
+}
+
+void PluginManager::initializeHostAPI()
+{
+	HostAPIRef hostAPI = NULL;
+
+
+	for ( int i = 0; i < XMP_HOST_API_VERSION_4; i++ )
+	{
+		hostAPI				= new HostAPI();
+		hostAPI->mSize		= sizeof( HostAPI );
+		hostAPI->mVersion	= i + 1;
+
+		switch( hostAPI->mVersion )
+		{
+		case 1:
+			SetupHostAPI_V1( hostAPI );
+			break;
+
+		case 2:
+			SetupHostAPI_V2( hostAPI );
+			break;
+
+		case 3:
+			SetupHostAPI_V3( hostAPI );
+			break;
+
+		default:
+		case 4:
+			SetupHostAPI_V4( hostAPI );
+			break;
+		}
+
+		msPluginManager->mHostAPIs[ hostAPI->mVersion ] = hostAPI;
+	}
+}
+
+}	// namespace XMP_PLUGIN
diff --git a/XMPFiles/source/PluginHandler/PluginManager.h b/XMPFiles/source/PluginHandler/PluginManager.h
new file mode 100644
index 0000000..85ec785
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/PluginManager.h
@@ -0,0 +1,215 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 PLUGINMANAGER_H
+#define PLUGINMANAGER_H
+#include "PluginHandler.h"
+#include "ModuleUtils.h"
+
+#if XMP_WinBuild && _MSC_VER >= 1700
+	// Visual Studio 2012 or newer supports C++11 (mostly)
+	#include <memory>
+	#include <functional>
+	#define XMP_SHARED_PTR std::shared_ptr
+#elif XMP_MacBuild
+	#include <memory>
+	#define XMP_SHARED_PTR std::shared_ptr
+#else
+	#define XMP_SHARED_PTR std::tr1::shared_ptr
+#endif
+
+namespace XMP_PLUGIN
+{
+
+typedef XMP_Uns32 XMPAtom;
+typedef XMPAtom FileHandlerType;
+
+typedef XMP_SHARED_PTR<class Module>						ModuleSharedPtr;
+typedef XMP_SHARED_PTR<class FileHandler>					FileHandlerSharedPtr;
+
+class FileHandlerInstance;
+typedef FileHandlerInstance*								FileHandlerInstancePtr;
+
+typedef std::vector<std::string>							StringVec;
+typedef std::vector<ModuleSharedPtr>						ModuleVec;
+typedef std::vector<XMP_FileFormat>							XMP_FileFormatVec;
+
+struct FileHandlerPair;
+
+inline void CheckError( WXMP_Error & error )
+{
+	if( error.mErrorID != kXMPErr_NoError )
+	{
+		if( error.mErrorID >= kXMPErr_PluginInternal &&
+			error.mErrorID <= kXMPErr_PluginLastError )
+		{
+			throw XMP_Error( kXMPErr_InternalFailure, error.mErrorMsg );
+		}
+		else
+		{
+			throw XMP_Error( error.mErrorID, error.mErrorMsg );
+		}
+	}
+}
+
+/** @class PluginManager
+ *  @brief Register all file handlers from all the plugins available in Plugin directory.
+ *
+ *  At the initialization time of XMPFiles, PluginManager loads all the available plugins
+ */
+class PluginManager
+{
+public:
+	enum HandlerPriority
+	{
+		kStandardHandler,
+		kReplacementHandler,
+		kUnknown
+	};
+	
+	/**
+	 *  Initialize the plugin manager. It's a singleton class which manages the plugins.
+	 *  @param pluginDir The directory where to search for the plugins. 
+	 *  @param plugins Comma separated list of the plugins which should be loaded from the plugin directory.
+	 *  By default, all plug-ins available in the pluginDir will be loaded.
+	 */
+	static void initialize( const std::string& pluginDir, const std::string& plugins = std::string() );
+	
+	/**
+	 *  Terminate the plugin manager.
+	 */
+	static void terminate();
+
+	/** 
+	 *  Add file handler corresponding to the given format
+	 *  @param format FileFormat supported by the file handler
+	 *  @param handler shared pointer to the file handler which is to be added.
+	 *  @return Void.
+	 */
+	static void addFileHandler( XMP_FileFormat format, FileHandlerSharedPtr handler );
+	
+	/** 
+	 *  Returns file handler corresponding to the given format and priority
+	 *
+	 *  @param format	FileFormat supported by the file handler
+	 *  @param priority	The priority of the handler (there could be one standard and 
+	 *					one replacing handler, use the enums kStandardHandler or kReplacementHandler)
+	 *  @return shared pointer to the file handler. It does not need to be freed.
+	 */
+	static FileHandlerSharedPtr getFileHandler( XMP_FileFormat format, HandlerPriority priority = kStandardHandler );
+
+	/**
+	 * Store mapping between session reference (comes from plugin) and
+	 * FileHandlerInstance.
+	 * @param session	Session reference from plugin
+	 * @param handler	FileHandlerInstance related to the session
+	 */
+	static void addHandlerInstance( SessionRef session, FileHandlerInstancePtr handler );
+
+	/**
+	 * Remove mapping between session reference (comes from plugin) and
+	 * FilehandlerInstance
+	 * @param session	Session reference from plugin
+	 */
+	static void removeHandlerInstance( SessionRef session );
+
+	/**
+	 * Return FileHandlerInstance that is associated to the session reference
+	 * @param session	Session reference from plugin
+	 * @return FileHandlerInstance
+	 */
+	static FileHandlerInstancePtr getHandlerInstance( SessionRef session );
+
+	/**
+	 * Return the priority of the handler
+	 * @param handler	Instance of file handler
+	 * @return			Return kStandardHandler or kReplacementHandler
+	 */
+	static HandlerPriority getHandlerPriority( FileHandlerInstancePtr handler );
+
+	/**
+	 * Return Host API
+	 */
+	static HostAPIRef getHostAPI( XMP_Uns32 version );
+
+private:
+	PluginManager( const std::string& pluginDir, const std::string& plugins );
+	~PluginManager();
+
+	/**
+	 * Terminate host API
+	 */
+	void initializeHostAPI();
+	void terminateHostAPI();
+
+	/** 
+	 *  Load resource file of the given module.
+	 *  @param module
+	 *  @return Void.
+	 */
+	void loadResourceFile( ModuleSharedPtr module );
+	
+	/** 
+	 *  Scan mPluginDir for the plugins. It also scans nested folder upto level inMaxNumOfNestedFolder.
+	 *  @param inMaxNumOfNestedFolder Nested level where to scan.
+	 *  @return Void.
+	 */
+	void doScan( const XMP_Int32 inMaxNumOfNestedFolder = 1 );
+	
+	/** 
+	 *  Scan recursively the directory /a inPath and insert the found plug-in in ioFoundLibs.
+	 *  @param inPath Full path of the directory name to be scanned.
+	 *  @param ioFoundLibs Vector of string. Found plug-in will be inserted in this vector.
+	 *  @param inLevel The current level
+	 *  @param inMaxNumOfNestedFolder Nested level where to scan upto.
+	 *  @return Void.
+	 */
+	void scanRecursive(
+			const std::string& inPath, 
+			std::vector<std::string>& ioFoundLibs, 
+			XMP_Int32 inLevel, 
+			XMP_Int32 inMaxNestingLevel );
+
+	/**
+	 * Setup passed in HostAPI structure for the host API v1
+	 */
+	static void SetupHostAPI_V1( HostAPIRef hostAPI );
+
+	/**
+	 * Setup passed in HostAPI structure for the host API v2
+	 */
+	static void SetupHostAPI_V2( HostAPIRef hostAPI );
+
+	/**
+	 * Setup passed in HostAPI structure for the host API v3
+	 */
+	static void SetupHostAPI_V3( HostAPIRef hostAPI );
+
+		/**
+	 * Setup passed in HostAPI structure for the host API v4
+	 */
+	static void SetupHostAPI_V4( HostAPIRef hostAPI );
+
+
+	typedef std::map<XMP_FileFormat, FileHandlerPair>		PluginHandlerMap;
+	typedef std::map<XMP_Uns32, HostAPIRef>					HostAPIMap;
+	typedef std::map<SessionRef, FileHandlerInstancePtr>	SessionMap;
+
+	std::string						mPluginDir;
+	StringVec						mExtensions;
+	StringVec						mPluginsNeeded;
+	PluginHandlerMap				mHandlers;
+	SessionMap						mSessions;
+	HostAPIMap						mHostAPIs;
+
+	static PluginManager*			msPluginManager;
+};
+
+} //namespace XMP_PLUGIN
+#endif //PLUGINMANAGER_H
diff --git a/XMPFiles/source/PluginHandler/XMPAtoms.cpp b/XMPFiles/source/PluginHandler/XMPAtoms.cpp
new file mode 100644
index 0000000..8379c8b
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/XMPAtoms.cpp
@@ -0,0 +1,429 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "XMPAtoms.h"
+#include "XMPFiles/source/HandlerRegistry.h"
+
+using namespace Common;
+
+namespace XMP_PLUGIN
+{
+
+struct XMPAtomMapping
+{
+	XMP_StringPtr	name;
+	XMPAtom			atom;
+};
+
+const XMPAtomMapping kXMPAtomVec[] =
+{
+	{ "",							emptyStr_K },
+	{ "Handler",					Handler_K },
+	{ "Extensions",					Extensions_K },
+	{ "Extension",					Extension_K },
+	{ "FormatIDs",					FormatIDs_K },
+	{ "FormatID",					FormatID_K },
+	{ "HandlerType",				HandlerType_K },
+	{ "Priority",					OverwriteHdl_K },
+	{ "HandlerFlags",				HandlerFlags_K },
+	{ "HandlerFlag",				HandlerFlag_K },
+	{ "SerializeOptions",			SerializeOptions_K },
+	{ "SerializeOption",			SerializeOption_K },
+	{ "Version",					Version_K },
+	{ "CheckFormat",				CheckFormat_K },
+	{ "Name",						Name_K },
+	{ "Offset",						Offset_K },
+	{ "Length",						Length_K },
+	{ "ByteSeq",					ByteSeq_K },
+
+	// Handler types
+	{ "NormalHandler",				NormalHandler_K },
+	{ "OwningHandler",				OwningHandler_K },
+	{ "FolderHandler",				FolderHandler_K },
+
+	// Handler flags
+	{ "kXMPFiles_CanInjectXMP",			kXMPFiles_CanInjectXMP_K },
+	{ "kXMPFiles_CanExpand",			kXMPFiles_CanExpand_K },
+	{ "kXMPFiles_CanRewrite",			kXMPFiles_CanRewrite_K },
+	{ "kXMPFiles_PrefersInPlace",		kXMPFiles_PrefersInPlace_K },
+	{ "kXMPFiles_CanReconcile",			kXMPFiles_CanReconcile_K },
+	{ "kXMPFiles_AllowsOnlyXMP",		kXMPFiles_AllowsOnlyXMP_K },
+	{ "kXMPFiles_ReturnsRawPacket",		kXMPFiles_ReturnsRawPacket_K },
+	{ "kXMPFiles_HandlerOwnsFile",		kXMPFiles_HandlerOwnsFile_K },
+	{ "kXMPFiles_AllowsSafeUpdate",		kXMPFiles_AllowsSafeUpdate_K },
+	{ "kXMPFiles_NeedsReadOnlyPacket",	kXMPFiles_NeedsReadOnlyPacket_K },
+	{ "kXMPFiles_UsesSidecarXMP",		kXMPFiles_UsesSidecarXMP_K },
+	{ "kXMPFiles_FolderBasedFormat",	kXMPFiles_FolderBasedFormat_K },
+	{ "kXMPFiles_NeedsPreloading",		kXMPFiles_NeedsPreloading_K },
+
+	// Serialize option
+	{ "kXMP_OmitPacketWrapper",			kXMP_OmitPacketWrapper_K },
+	{ "kXMP_ReadOnlyPacket",			kXMP_ReadOnlyPacket_K },
+	{ "kXMP_UseCompactFormat",			kXMP_UseCompactFormat_K },
+	{ "kXMP_UseCanonicalFormat",		kXMP_UseCanonicalFormat_K },
+	{ "kXMP_IncludeThumbnailPad",		kXMP_IncludeThumbnailPad_K },
+	{ "kXMP_ExactPacketLength",			kXMP_ExactPacketLength_K },
+	{ "kXMP_OmitAllFormatting",			kXMP_OmitAllFormatting_K },
+	{ "kXMP_OmitXMPMetaElement",		kXMP_OmitXMPMetaElement_K },
+	{ "kXMP_EncodingMask",				kXMP_EncodingMask_K },
+	{ "kXMP_EncodeUTF8",				kXMP_EncodeUTF8_K },
+	{ "kXMP_EncodeUTF16Big",			kXMP_EncodeUTF16Big_K },
+	{ "kXMP_EncodeUTF16Little",			kXMP_EncodeUTF16Little_K },
+	{ "kXMP_EncodeUTF32Big",			kXMP_EncodeUTF32Big_K },
+	{ "kXMP_EncodeUTF32Little",			kXMP_EncodeUTF32Little_K }
+	
+};
+
+
+XMPAtomsMap* ResourceParser::msXMPAtoms = NULL;
+void ResourceParser::clear()
+{
+	mUID.clear();
+	mFileExtensions.clear();
+	mFormatIDs.clear();
+	mCheckFormat.clear();
+	mHandler = FileHandlerSharedPtr();
+	mFlags = mSerializeOption = mType = 0;
+	mVersion = 0.0;
+}
+
+void ResourceParser::addHandler()
+{
+	if( mUID.empty() || ( mFileExtensions.empty() && mFormatIDs.empty() ) || !isValidHandlerType( mType ) || mFlags == 0 )
+	{
+		XMP_Throw( "Atleast one of uid, format, ext, typeStr, flags non-valid ...", kXMPErr_Unavailable );
+	}
+	else
+	{
+		mHandler->setHandlerFlags( mFlags );
+		mHandler->setHandlerType( mType );
+		mHandler->setSerializeOption( mSerializeOption );
+		mHandler->setOverwriteHandler( mOverwriteHandler );
+		if( mVersion != 0.0)
+		{
+			mHandler->setVersion( mVersion );
+		}
+		
+		// A plugin could define the XMP_FileFormat value in manifest file through keyword "FormatID" and
+		// file extensions for NormalHandler and OwningHandler through keyword "Extension".
+		// If Both are defined then give priority to FormatID.
+
+		std::set<XMP_FileFormat> formatIDs = mFormatIDs.empty() ? mFileExtensions : mFormatIDs;
+		for( std::set<XMP_FileFormat>::const_iterator it = formatIDs.begin(); it != formatIDs.end(); ++it )
+		{
+			PluginManager::addFileHandler(*it, mHandler);
+		}
+	}
+}
+
+bool ResourceParser::parseElementAttrs( const XML_Node * xmlNode, bool isTopLevel )
+{
+	XMPAtom nodeAtom = getXMPAtomFromString( xmlNode->name );
+	if( nodeAtom == Handler_K )
+		this->clear();
+
+	XML_cNodePos currAttr = xmlNode->attrs.begin();
+	XML_cNodePos endAttr  = xmlNode->attrs.end();
+
+	for( ; currAttr != endAttr; ++currAttr ) 
+	{
+		XMP_OptionBits oneflag=0;
+		XMP_FileFormat formatID = kXMP_UnknownFile;
+		std::string formatStr;
+		XMPAtom attrAtom = getXMPAtomFromString( (*currAttr)->name );
+		switch(nodeAtom)
+		{
+		case Handler_K:
+			switch(attrAtom)
+			{
+			case Name_K:
+				this->mUID = (*currAttr)->value;
+				mHandler = FileHandlerSharedPtr( new FileHandler( this->mUID, 0, 0, mModule ) );
+				break;
+			case Version_K:
+				sscanf( (*currAttr)->value.c_str(), "%lf", &this->mVersion );
+				break;
+			case HandlerType_K:
+				this->mType = getXMPAtomFromString( (*currAttr)->value );
+				break;
+			case OverwriteHdl_K:
+				this->mOverwriteHandler = ( (*currAttr)->value == "true" );
+				break;
+			default:
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//XMP_Throw( "Invalid Attr in Handler encountered in resource file", kXMPErr_Unavailable );
+				break;
+			}
+			break;
+		case CheckFormat_K:
+			switch(attrAtom)
+			{
+			case Offset_K:
+				this->mCheckFormat.mOffset = atoi( (*currAttr)->value.c_str() );
+				break;
+			case Length_K:
+				this->mCheckFormat.mLength = atoi( (*currAttr)->value.c_str() );
+				break;
+			case ByteSeq_K:
+				this->mCheckFormat.mByteSeq = (*currAttr)->value;
+				break;
+			default:
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//XMP_Throw( "Invalid Attr in CheckFormat encountered in resource file", kXMPErr_Unavailable );
+				break;
+			}
+			break;
+		case Extension_K:
+			switch(attrAtom)
+			{
+			case Name_K:
+				this->mFileExtensions.insert( HandlerRegistry::getInstance().getFileFormat( (*currAttr)->value, true) );
+				break;
+			default:
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//XMP_Throw( "Invalid Attr in Extension encountered in resource file", kXMPErr_Unavailable );
+				break;
+			}
+			break;
+		case FormatID_K:
+			switch(attrAtom)
+			{
+			case Name_K:
+				formatStr.assign( (*currAttr)->value );
+				
+				// Convert string into 4-byte string by appending space '0x20' character.
+				for( size_t j=formatStr.size(); j<4; j++ )
+					formatStr.push_back(' ');
+				
+				formatID = GetUns32BE( formatStr.c_str() );
+				this->mFormatIDs.insert( formatID );
+				break;
+			default:
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//XMP_Throw( "Invalid Attr in FormatID encountered in resource file", kXMPErr_Unavailable );
+				break;
+			}
+			break;
+		case HandlerFlag_K:
+			switch(attrAtom)
+			{
+			case Name_K:
+				oneflag = getHandlerFlag( (*currAttr)->value );
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//if( 0 == oneflag )
+				//	XMP_Throw( "Invalid handler flag found in resource file...", kXMPErr_Unavailable );
+				this->mFlags |= oneflag;
+				break;
+			default:
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//XMP_Throw( "Invalid handler flag found in resource file...", kXMPErr_Unavailable );
+				break;
+			}
+			break;
+		case SerializeOption_K:
+			switch(attrAtom)
+			{
+			case Name_K:
+				oneflag = getSerializeOption( (*currAttr)->value );
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//if( 0 == oneflag )
+				//	XMP_Throw( "Invalid serialize option found in resource file...", kXMPErr_Unavailable );
+				this->mSerializeOption |= oneflag;
+				break;
+			default:
+				//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+				//XMP_Throw( "Invalid handler flag found in resource file...", kXMPErr_Unavailable );
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	if( nodeAtom == CheckFormat_K )
+		mHandler->addCheckFormat( mCheckFormat );
+
+	return (nodeAtom == Handler_K) ? true : false;
+}	// parseElementAttrs
+
+void ResourceParser::parseElement( const XML_Node * xmlNode, bool isTopLevel )
+{
+	bool HandlerFound = this->parseElementAttrs( xmlNode, isTopLevel );
+	this->parseElementList ( xmlNode, false );
+
+	if(HandlerFound)
+	{
+		this->addHandler();
+	}
+}
+
+void ResourceParser::parseElementList( const XML_Node * xmlParent, bool isTopLevel )
+{
+	initialize(); //Make sure XMPAtoms are initialized.
+
+	XML_cNodePos currChild = xmlParent->content.begin();
+	XML_cNodePos endChild  = xmlParent->content.end();
+
+	for( ; currChild != endChild; ++currChild )
+	{
+		if( (*currChild)->IsWhitespaceNode() ) continue;
+		this->parseElement( *currChild, isTopLevel );
+	}
+}
+
+bool ResourceParser::initialize()
+{
+	//Check if already populated.
+	if( msXMPAtoms == NULL )
+	{
+		msXMPAtoms = new XMPAtomsMap();
+		
+		//Create XMPAtomMap from XMPAtomVec, as we need to do a lot of searching while processing the resource file.
+		int count = sizeof(kXMPAtomVec)/sizeof(XMPAtomMapping);
+		for( int i=0; i<count; i++ )
+		{
+			XMP_StringPtr name = kXMPAtomVec[i].name;
+			XMPAtom atom = kXMPAtomVec[i].atom;
+			(*msXMPAtoms)[name] = atom;
+		}
+	}
+	return true;
+}
+
+void ResourceParser::terminate()
+{
+	delete msXMPAtoms;
+	msXMPAtoms = NULL;
+}
+
+XMPAtom ResourceParser::getXMPAtomFromString( const std::string & stringAtom )
+{
+	XMPAtomsMap::const_iterator it = msXMPAtoms->find(stringAtom);
+
+	if( it != msXMPAtoms->end() )
+		return it->second;
+
+	return XMPAtomNull;
+}
+
+//static 
+XMP_OptionBits ResourceParser::getHandlerFlag( const std::string & stringAtom )
+{
+	XMPAtom atom = getXMPAtomFromString( stringAtom );
+
+	if( !isValidXMPAtom(atom) )
+		return 0;
+
+	switch( atom )
+	{
+	case kXMPFiles_CanInjectXMP_K:
+		return kXMPFiles_CanInjectXMP;
+	case kXMPFiles_CanExpand_K:
+		return kXMPFiles_CanExpand;
+	case kXMPFiles_CanRewrite_K:
+		return kXMPFiles_CanRewrite;
+	case kXMPFiles_PrefersInPlace_K:
+		return kXMPFiles_PrefersInPlace;
+	case kXMPFiles_CanReconcile_K:
+		return kXMPFiles_CanReconcile;
+	case kXMPFiles_AllowsOnlyXMP_K:
+		return kXMPFiles_AllowsOnlyXMP;
+	case kXMPFiles_ReturnsRawPacket_K:
+		return kXMPFiles_ReturnsRawPacket;
+	case kXMPFiles_HandlerOwnsFile_K:
+		return kXMPFiles_HandlerOwnsFile;
+	case kXMPFiles_AllowsSafeUpdate_K:
+		return kXMPFiles_AllowsSafeUpdate;
+	case kXMPFiles_NeedsReadOnlyPacket_K:
+		return kXMPFiles_NeedsReadOnlyPacket;
+	case kXMPFiles_UsesSidecarXMP_K:
+		return kXMPFiles_UsesSidecarXMP;
+	case kXMPFiles_FolderBasedFormat_K:
+		return kXMPFiles_FolderBasedFormat;
+	case kXMPFiles_NeedsPreloading_K:
+		return kXMPFiles_NeedsPreloading;
+	default:
+		//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+		//XMP_Throw( "Invalid PluginhandlerFlag ...", kXMPErr_Unavailable );
+		return 0;
+	}
+}
+
+//static 
+XMP_OptionBits ResourceParser::getSerializeOption( const std::string & stringAtom )
+{
+	XMPAtom atom = getXMPAtomFromString( stringAtom );
+
+	if( !isValidXMPAtom(atom) )
+		return 0;
+
+	switch( atom )
+	{
+	case kXMP_OmitPacketWrapper_K:
+		return kXMP_OmitPacketWrapper;
+    case kXMP_ReadOnlyPacket_K:
+		return kXMP_ReadOnlyPacket;
+    case kXMP_UseCompactFormat_K:
+		return kXMP_UseCompactFormat;
+    case kXMP_UseCanonicalFormat_K:
+		return kXMP_UseCanonicalFormat;
+    case kXMP_IncludeThumbnailPad_K:
+		return kXMP_IncludeThumbnailPad;
+    case kXMP_ExactPacketLength_K:
+		return kXMP_ExactPacketLength;
+    case kXMP_OmitAllFormatting_K:
+		return kXMP_OmitAllFormatting;
+    case kXMP_OmitXMPMetaElement_K:
+		return kXMP_OmitXMPMetaElement;
+    case kXMP_EncodingMask_K:
+		return kXMP_EncodingMask;
+    case kXMP_EncodeUTF8_K:
+		return kXMP_EncodeUTF8;
+    case kXMP_EncodeUTF16Big_K:
+		return kXMP_EncodeUTF16Big;
+    case kXMP_EncodeUTF16Little_K:
+		return kXMP_EncodeUTF16Little;
+    case kXMP_EncodeUTF32Big_K:
+		return kXMP_EncodeUTF32Big;
+    case kXMP_EncodeUTF32Little_K:
+		return kXMP_EncodeUTF32Little;
+	default:
+		//fix for bug 3565147: Plugin Architecture: If any unknown node is present in the Plugin Manifest then the Plugin is not loaded
+		//XMP_Throw( "Invalid Serialize Option ...", kXMPErr_Unavailable );
+		return 0;
+	}
+}
+
+XMP_FileFormat ResourceParser::getPluginFileFormat( const std::string & fileExt, bool AddIfNotFound )
+{
+	XMP_FileFormat format = kXMP_UnknownFile;
+
+	if( msXMPAtoms )
+	{
+		XMPAtomsMap::const_iterator iter = msXMPAtoms->find( fileExt );
+		if( iter != msXMPAtoms->end() )
+		{
+			format = iter->second;
+		}
+		else if( AddIfNotFound )
+		{
+			std::string formatStr(fileExt);
+			MakeUpperCase(&formatStr);
+			for( size_t j=formatStr.size(); j<4; j++ )	// Convert "pdf" to "PDF "
+				formatStr.push_back(' ');
+			format = GetUns32BE( formatStr.c_str() ); //Convert "PDF " into kXMP_PDFFile
+			(*msXMPAtoms)[ fileExt ] = format;
+		}
+	}
+	
+	return format;
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFiles/source/PluginHandler/XMPAtoms.h b/XMPFiles/source/PluginHandler/XMPAtoms.h
new file mode 100644
index 0000000..3daad38
--- /dev/null
+++ b/XMPFiles/source/PluginHandler/XMPAtoms.h
@@ -0,0 +1,201 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 _H_XMPATOMS
+#define _H_XMPATOMS
+#include "FileHandler.h"
+#include "source/ExpatAdapter.hpp"
+#include <set>
+
+namespace XMP_PLUGIN
+{
+
+/** @brief An enum required to parse the resource file of plugin.
+ */
+enum
+{
+	emptyStr_K = 0, //Empty string
+	
+	// Mandatory keys in the resource file
+	Handler_K,
+	Extensions_K,
+	Extension_K,
+	FormatIDs_K,
+	FormatID_K,
+	HandlerType_K,
+	OverwriteHdl_K,
+	HandlerFlags_K,
+	HandlerFlag_K,
+	SerializeOptions_K,
+	SerializeOption_K,
+	Version_K,
+	CheckFormat_K,
+	Name_K,
+	Offset_K,
+	Length_K,
+	ByteSeq_K,
+
+	// Handler types
+	NormalHandler_K,
+	OwningHandler_K,
+	FolderHandler_K,
+
+	// Handler flags
+	kXMPFiles_CanInjectXMP_K,
+	kXMPFiles_CanExpand_K,
+	kXMPFiles_CanRewrite_K,
+	kXMPFiles_PrefersInPlace_K,
+	kXMPFiles_CanReconcile_K,
+	kXMPFiles_AllowsOnlyXMP_K,
+	kXMPFiles_ReturnsRawPacket_K,
+	kXMPFiles_HandlerOwnsFile_K,
+	kXMPFiles_AllowsSafeUpdate_K,
+	kXMPFiles_NeedsReadOnlyPacket_K,
+	kXMPFiles_UsesSidecarXMP_K,
+	kXMPFiles_FolderBasedFormat_K,
+	kXMPFiles_NeedsPreloading_K,
+
+    // Serialize option
+    kXMP_OmitPacketWrapper_K,
+    kXMP_ReadOnlyPacket_K,
+    kXMP_UseCompactFormat_K,
+    kXMP_UseCanonicalFormat_K,
+    kXMP_IncludeThumbnailPad_K,
+    kXMP_ExactPacketLength_K,
+    kXMP_OmitAllFormatting_K,
+    kXMP_OmitXMPMetaElement_K,
+    kXMP_EncodingMask_K,
+    kXMP_EncodeUTF8_K,
+    kXMP_EncodeUTF16Big_K,
+    kXMP_EncodeUTF16Little_K,
+    kXMP_EncodeUTF32Big_K,
+    kXMP_EncodeUTF32Little_K,
+	
+	//Last element
+	lastfinal_K
+};
+
+#define XMPAtomNull emptyStr_K
+
+struct StringCompare : std::binary_function<const std::string &, const std::string &, bool>
+{
+	bool operator() (const std::string & a, const std::string & b) const
+	{
+		return ( a.compare(b) < 0 );
+	}
+};
+typedef std::map<std::string, XMPAtom,			StringCompare>		XMPAtomsMap;
+
+
+/** @class ResourceParser
+ *  @brief Class to parse resource file of the plugin.
+ */
+class ResourceParser
+{
+public:
+	ResourceParser(ModuleSharedPtr module)
+		: mModule(module), mType(0), mFlags(0), mSerializeOption(0), mVersion(0.0), mOverwriteHandler(false) {}
+
+	/** 
+	 *  Initialize the XMPAtoms which will be used in parsing resource files.
+	 *  @return true on success.
+	 */
+	static bool initialize();
+	static void terminate();
+	
+	/** @brief Return file format corresponding to file extension \a fileExt.
+	 *
+	 *  It is similar to GetXMPFileFormat except that it also searches in PluginManager's 
+	 *  private file formats. If the extension is not a public file format and \a AddIfNotFound is true
+	 *  then it also adds the private fileformat. The priavte 4-byte file format is created by converting 
+	 *  extension to upper case and appending space '0x20' to make it 4-byte. For i.e
+	 *  "pdf"  -> 'PDF ' (0x50444620)
+	 *  "tmp"  -> 'TMP ' (0x54415020)
+	 *  "temp" -> 'TEMP' (0x54454150)
+	 * 
+	 *  @param fileExt Extension string of the file. For i.e "pdf"
+	 *  @param AddIfNotFound If AddIfNotFound is true and public format is not found then 
+	 *  priavte format is added.
+	 *  @return File format correspoding to file extension \a fileExt.
+	 */
+	static XMP_FileFormat getPluginFileFormat( const std::string & fileExt, bool AddIfNotFound );
+
+	/** 
+	 *  Parse the XML node's children recursively.
+	 *  @param xmlParent XMLNode which will be parsed. 
+	 *  @return Void.
+	 */
+	void parseElementList( const XML_Node * xmlParent, bool isTopLevel );
+
+private:
+	void clear();		
+	void addHandler();
+
+	/** 
+	 *  Parse the XML node's attribute.
+	 *  @param xmlNode XMLNode which will be parsed. 
+	 *  @return true if xmlNode's name is Handler_K.
+	 */
+	bool parseElementAttrs( const XML_Node * xmlNode, bool isTopLevel );
+	
+	/** 
+	 *  Parse the XML node.
+	 *  @param xmlNode XMLNode which will be parsed. 
+	 *  @return Void.
+	 */
+	void parseElement( const XML_Node * xmlNode, bool isTopLevel );
+
+	/** 
+	 *  Return XMPAtom corresponding to string.
+	 *  @param stringAtom std::string whose XMPAtom will be return.
+	 *  @return XMPAtom corresponding to string.
+	 */
+	static XMPAtom getXMPAtomFromString( const std::string & stringAtom );
+	
+	/** 
+	 *  Return Handler flag corresponding to XMPAtom string.
+	 *  @param stringAtom Handler flag string
+	 *  @return Handler flag.
+	 */
+	static XMP_OptionBits getHandlerFlag( const std::string & stringAtom );
+
+	/** 
+	 *  Return Serialize option corresponding to XMPAtom string.
+	 *  @param stringAtom Handler flag string
+	 *  @return Serialize option.
+	 */
+	static XMP_OptionBits getSerializeOption( const std::string & stringAtom );
+
+	static inline bool isValidXMPAtom( XMPAtom atom )
+	{
+		return ( atom > emptyStr_K && atom < lastfinal_K );
+	}
+
+	static inline bool isValidHandlerType(XMPAtom atom)
+	{
+		return ( atom >= NormalHandler_K && atom <= FolderHandler_K );
+	}
+
+	ModuleSharedPtr       mModule;
+	std::string           mUID;
+	FileHandlerType       mType;
+	XMP_OptionBits        mFlags;
+	XMP_OptionBits        mSerializeOption;
+	double                mVersion;
+	bool				  mOverwriteHandler;
+	CheckFormat           mCheckFormat;
+	std::set<XMP_FileFormat> mFileExtensions;
+	std::set<XMP_FileFormat> mFormatIDs;
+	FileHandlerSharedPtr mHandler;
+
+	static XMPAtomsMap *  msXMPAtoms;
+};
+
+} //namespace XMP_PLUGIN
+#endif	// _H_XMPATOMS
diff --git a/XMPFiles/source/WXMPFiles.cpp b/XMPFiles/source/WXMPFiles.cpp
new file mode 100644
index 0000000..26fdcac
--- /dev/null
+++ b/XMPFiles/source/WXMPFiles.cpp
@@ -0,0 +1,467 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"
+#include "public/include/XMP_Const.h"
+
+#include "public/include/client-glue/WXMPFiles.hpp"
+
+#include "source/XMP_ProgressTracker.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/XMPFiles.hpp"
+
+#if XMP_WinBuild
+	#if XMP_DebugBuild
+		#pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+	#endif
+#endif
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+
+static WXMP_Result voidResult;	// Used for functions that  don't use the normal result mechanism.
+
+// =================================================================================================
+
+void WXMPFiles_GetVersionInfo_1 ( XMP_VersionInfo * versionInfo )
+{
+	WXMP_Result * wResult = &voidResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_NoLock ( "WXMPFiles_GetVersionInfo_1" )
+
+		XMPFiles::GetVersionInfo ( versionInfo );
+
+	XMP_EXIT_NoThrow
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_Initialize_1 ( XMP_OptionBits options,
+							  WXMP_Result *  wResult )
+{
+	XMP_ENTER_NoLock ( "WXMPFiles_Initialize_1" )
+
+		wResult->int32Result = XMPFiles::Initialize ( options, NULL, NULL );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_Initialize_2 ( XMP_OptionBits options,
+							  const char *   pluginFolder,
+							  const char *   plugins,
+							  WXMP_Result *  wResult )
+{
+	XMP_ENTER_NoLock ( "WXMPFiles_Initialize_1" )
+
+		wResult->int32Result = XMPFiles::Initialize ( options, pluginFolder, plugins );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_Terminate_1()
+{
+	WXMP_Result * wResult = &voidResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_NoLock ( "WXMPFiles_Terminate_1" )
+
+		XMPFiles::Terminate();
+
+	XMP_EXIT_NoThrow
+}
+
+// =================================================================================================
+
+void WXMPFiles_CTor_1 ( WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_CTor_1" )	// No lib object yet, use the static entry.
+
+		XMPFiles * newObj = new XMPFiles();
+		++newObj->clientRefs;
+		XMP_Assert ( newObj->clientRefs == 1 );
+		wResult->ptrResult = newObj;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_IncrementRefCount_1 ( XMPFilesRef xmpObjRef )
+{
+	WXMP_Result * wResult = &voidResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_IncrementRefCount_1" )
+
+		++thiz->clientRefs;
+		XMP_Assert ( thiz->clientRefs > 0 );
+
+	XMP_EXIT_NoThrow
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_DecrementRefCount_1 ( XMPFilesRef xmpObjRef )
+{
+	WXMP_Result * wResult = &voidResult;	// ! Needed to "fool" the EnterWrapper macro.
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_DecrementRefCount_1" )
+
+		XMP_Assert ( thiz->clientRefs > 0 );
+		--thiz->clientRefs;
+		if ( thiz->clientRefs <= 0 ) {
+			objLock.Release();
+			delete ( thiz );
+		}
+
+	XMP_EXIT_NoThrow
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_GetFormatInfo_1 ( XMP_FileFormat   format,
+                                 XMP_OptionBits * flags,
+                                 WXMP_Result *    wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_GetFormatInfo_1" )
+
+		wResult->int32Result = XMPFiles::GetFormatInfo ( format, flags );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_CheckFileFormat_1 ( XMP_StringPtr filePath,
+								   WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_CheckFileFormat_1" )
+
+		wResult->int32Result = XMPFiles::CheckFileFormat ( filePath );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_CheckPackageFormat_1 ( XMP_StringPtr folderPath,
+                       				  WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_CheckPackageFormat_1" )
+
+		wResult->int32Result = XMPFiles::CheckPackageFormat ( folderPath );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_GetFileModDate_1 ( XMP_StringPtr    filePath,
+								  XMP_DateTime *   modDate,
+								  XMP_FileFormat * format,
+								  XMP_OptionBits   options,
+								  WXMP_Result *    wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_GetFileModDate_1" )
+
+		wResult->int32Result = XMPFiles::GetFileModDate ( filePath, modDate, format, options );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_GetAssociatedResources_1 ( XMP_StringPtr             filePath,
+										  void *                    resourceList,
+										  XMP_FileFormat            format, 
+										  XMP_OptionBits            options, 
+					                      SetClientStringVectorProc SetClientStringVector,
+										  WXMP_Result *             wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_GetAssociatedResources_1" )
+
+		if ( resourceList == 0 ) XMP_Throw ( "An result resource list vector must be provided", kXMPErr_BadParam );
+
+		std::vector<std::string> resList;	// Pass a local vector, not the client's.
+		(*SetClientStringVector) ( resourceList, 0, 0 );	// Clear the client's result vector.
+		wResult->int32Result = XMPFiles::GetAssociatedResources ( filePath, &resList, format, options );
+
+		if ( wResult->int32Result && (! resList.empty()) ) {
+			const size_t fileCount = resList.size();
+			std::vector<XMP_StringPtr> ptrArray;
+			ptrArray.reserve ( fileCount );
+			for ( size_t i = 0; i < fileCount; ++i ) ptrArray.push_back ( resList[i].c_str() );
+			(*SetClientStringVector) ( resourceList, ptrArray.data(), fileCount );
+		}
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_IsMetadataWritable_1 ( XMP_StringPtr    filePath,
+							          XMP_Bool *       writable, 
+							          XMP_FileFormat   format,
+							          XMP_OptionBits   options, 
+							          WXMP_Result *    wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_IsMetadataWritable_1" )
+		wResult->int32Result = XMPFiles::IsMetadataWritable ( filePath, writable, format, options );
+	XMP_EXIT
+}
+
+
+// =================================================================================================
+
+void WXMPFiles_OpenFile_1 ( XMPFilesRef    xmpObjRef,
+                            XMP_StringPtr  filePath,
+			                XMP_FileFormat format,
+			                XMP_OptionBits openFlags,
+                            WXMP_Result *  wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_OpenFile_1" )
+		StartPerfCheck ( kAPIPerf_OpenFile, filePath );
+
+		bool ok = thiz->OpenFile ( filePath, format, openFlags );
+		wResult->int32Result = ok;
+
+		EndPerfCheck ( kAPIPerf_OpenFile );
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+#if XMP_StaticBuild	// ! Client XMP_IO objects can only be used in static builds.
+void WXMPFiles_OpenFile_2 ( XMPFilesRef    xmpObjRef,
+                            XMP_IO*        clientIO,
+			                XMP_FileFormat format,
+			                XMP_OptionBits openFlags,
+                            WXMP_Result *  wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_OpenFile_2" )
+		StartPerfCheck ( kAPIPerf_OpenFile, "<client-managed>" );
+
+		bool ok = thiz->OpenFile ( clientIO, format, openFlags );
+		wResult->int32Result = ok;
+
+		EndPerfCheck ( kAPIPerf_OpenFile );
+	XMP_EXIT
+}
+#endif
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_CloseFile_1 ( XMPFilesRef    xmpObjRef,
+                             XMP_OptionBits closeFlags,
+                             WXMP_Result *  wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_CloseFile_1" )
+		StartPerfCheck ( kAPIPerf_CloseFile, "" );
+
+		thiz->CloseFile ( closeFlags );
+
+		EndPerfCheck ( kAPIPerf_CloseFile );
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_GetFileInfo_1 ( XMPFilesRef      xmpObjRef,
+                               void *           clientPath,
+			                   XMP_OptionBits * openFlags,
+			                   XMP_FileFormat * format,
+			                   XMP_OptionBits * handlerFlags,
+			                   SetClientStringProc SetClientString,
+                               WXMP_Result *    wResult )
+{
+	XMP_ENTER_ObjRead ( XMPFiles, "WXMPFiles_GetFileInfo_1" )
+
+		XMP_StringPtr pathStr;
+		XMP_StringLen pathLen;
+
+		bool isOpen = thiz.GetFileInfo ( &pathStr, &pathLen, openFlags, format, handlerFlags );
+		if ( isOpen && (clientPath != 0) ) (*SetClientString) ( clientPath, pathStr, pathLen );
+		wResult->int32Result = isOpen;
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_SetAbortProc_1 ( XMPFilesRef   xmpObjRef,
+                         	    XMP_AbortProc abortProc,
+							    void *        abortArg,
+							    WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_SetAbortProc_1" )
+
+		thiz->SetAbortProc ( abortProc, abortArg );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_GetXMP_1 ( XMPFilesRef      xmpObjRef,
+                          XMPMetaRef       xmpRef,
+		                  void *           clientPacket,
+		                  XMP_PacketInfo * packetInfo,
+		                  SetClientStringProc SetClientString,
+                          WXMP_Result *    wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_GetXMP_1" )
+		StartPerfCheck ( kAPIPerf_GetXMP, "" );
+
+		bool hasXMP = false;
+		XMP_StringPtr packetStr;
+		XMP_StringLen packetLen;
+
+		if ( xmpRef == 0 ) {
+			hasXMP = thiz->GetXMP ( 0, &packetStr, &packetLen, packetInfo );
+		} else {
+			SXMPMeta xmpObj ( xmpRef );
+			hasXMP = thiz->GetXMP ( &xmpObj, &packetStr, &packetLen, packetInfo );
+		}
+
+		if ( hasXMP && (clientPacket != 0) ) (*SetClientString) ( clientPacket, packetStr, packetLen );
+		wResult->int32Result = hasXMP;
+
+		EndPerfCheck ( kAPIPerf_GetXMP );
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_PutXMP_1 ( XMPFilesRef   xmpObjRef,
+                          XMPMetaRef    xmpRef,	// ! Only one of the XMP object or packet are passed.
+                          XMP_StringPtr xmpPacket,
+                          XMP_StringLen xmpPacketLen,
+                          WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_PutXMP_1" )
+		StartPerfCheck ( kAPIPerf_PutXMP, "" );
+
+		if ( xmpRef != 0 ) {
+			thiz->PutXMP ( xmpRef );
+		} else {
+			thiz->PutXMP ( xmpPacket, xmpPacketLen );
+		}
+
+		EndPerfCheck ( kAPIPerf_PutXMP );
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_CanPutXMP_1 ( XMPFilesRef   xmpObjRef,
+                             XMPMetaRef    xmpRef,	// ! Only one of the XMP object or packet are passed.
+                             XMP_StringPtr xmpPacket,
+                             XMP_StringLen xmpPacketLen,
+                             WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_CanPutXMP_1" )
+		StartPerfCheck ( kAPIPerf_CanPutXMP, "" );
+
+		if ( xmpRef != 0 ) {
+			wResult->int32Result = thiz->CanPutXMP ( xmpRef );
+		} else {
+			wResult->int32Result = thiz->CanPutXMP ( xmpPacket, xmpPacketLen );
+		}
+
+		EndPerfCheck ( kAPIPerf_CanPutXMP );
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+void WXMPFiles_SetDefaultProgressCallback_1 ( XMP_ProgressReportWrapper wrapperProc,
+											  XMP_ProgressReportProc    clientProc,
+											  void *        context,
+											  float         interval,
+											  XMP_Bool      sendStartStop,
+											  WXMP_Result * wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_SetDefaultProgressCallback_1" )
+	
+		XMP_ProgressTracker::CallbackInfo cbInfo ( wrapperProc, clientProc, context, interval, ConvertXMP_BoolToBool( sendStartStop ) );
+		XMPFiles::SetDefaultProgressCallback ( cbInfo );
+	
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_SetProgressCallback_1 ( XMPFilesRef   xmpObjRef,
+									   XMP_ProgressReportWrapper wrapperProc,
+									   XMP_ProgressReportProc    clientProc,
+									   void *        context,
+									   float         interval,
+									   XMP_Bool      sendStartStop,
+									   WXMP_Result * wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_SetProgressCallback_1" )
+	
+		XMP_ProgressTracker::CallbackInfo cbInfo ( wrapperProc, clientProc, context, interval, ConvertXMP_BoolToBool( sendStartStop) );
+		thiz->SetProgressCallback ( cbInfo );
+	
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_SetDefaultErrorCallback_1 ( XMPFiles_ErrorCallbackWrapper	wrapperProc,
+										   XMPFiles_ErrorCallbackProc		clientProc,
+										   void *							context,
+										   XMP_Uns32						limit,
+										   WXMP_Result *					wResult )
+{
+	XMP_ENTER_Static ( "WXMPFiles_SetDefaultErrorCallback_1" )
+
+		XMPFiles::SetDefaultErrorCallback ( wrapperProc, clientProc, context, limit );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_SetErrorCallback_1 ( XMPFilesRef						xmpObjRef,
+									XMPFiles_ErrorCallbackWrapper	wrapperProc,
+									XMPFiles_ErrorCallbackProc		clientProc,
+									void *							context,
+									XMP_Uns32						limit,
+									WXMP_Result *					wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_SetErrorCallback_1" )
+
+		thiz->SetErrorCallback ( wrapperProc, clientProc, context, limit );
+
+	XMP_EXIT
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void WXMPFiles_ResetErrorCallbackLimit_1 ( XMPFilesRef		xmpObjRef,
+										   XMP_Uns32		limit,
+										   WXMP_Result *	wResult )
+{
+	XMP_ENTER_ObjWrite ( XMPFiles, "WXMPFiles_ResetErrorCallbackLimit_1" )
+
+		thiz->ResetErrorCallbackLimit ( limit );
+
+	XMP_EXIT
+}
+
+// =================================================================================================
+
+#if __cplusplus
+}
+#endif
diff --git a/XMPFiles/source/XMPFiles.cpp b/XMPFiles/source/XMPFiles.cpp
new file mode 100644
index 0000000..ae8f701
--- /dev/null
+++ b/XMPFiles/source/XMPFiles.cpp
@@ -0,0 +1,1628 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! Must be the first #include!
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include <vector>
+#include <string.h>
+
+#include "source/UnicodeConversions.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "XMPFiles/source/HandlerRegistry.h"
+
+#if EnablePluginManager
+	#include "XMPFiles/source/PluginHandler/PluginManager.h"
+#endif
+
+#include "XMPFiles/source/FormatSupport/ID3_Support.hpp"
+#include "XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp"
+
+#if EnablePacketScanning
+	#include "XMPFiles/source/FileHandlers/Scanner_Handler.hpp"
+#endif
+
+#if EnableGenericHandling
+	#include "XMPFiles/source/FileHandlers/Generic_Handler.hpp"
+#endif
+
+// =================================================================================================
+/// \file XMPFiles.cpp
+/// \brief High level support to access metadata in files of interest to Adobe applications.
+///
+/// This header ...
+///
+// =================================================================================================
+
+using namespace Common;
+
+#if EnablePluginManager
+	using namespace XMP_PLUGIN;
+#endif
+
+// =================================================================================================
+
+XMP_Int32 sXMPFilesInitCount = 0;
+
+static XMP_ProgressTracker::CallbackInfo sProgressDefault;
+static XMPFiles::ErrorCallbackInfo sDefaultErrorCallback;
+
+
+#if GatherPerformanceData
+	APIPerfCollection* sAPIPerf = 0;
+#endif
+
+// These are embedded version strings.
+
+#if XMP_DebugBuild
+	#define kXMPFiles_DebugFlag 1
+#else
+	#define kXMPFiles_DebugFlag 0
+#endif
+
+#define kXMPFiles_VersionNumber	( (kXMPFiles_DebugFlag << 31)    |	\
+                                  (XMP_API_VERSION_MAJOR << 24) |	\
+						          (XMP_API_VERSION_MINOR << 16) |	\
+						          (XMP_API_VERSION_MICRO << 8) )
+
+	#define kXMPFilesName "XMP Files"
+	#define kXMPFiles_VersionMessage kXMPFilesName " " XMPFILES_API_VERSION_STRING
+const char * kXMPFiles_EmbeddedVersion   = kXMPFiles_VersionMessage;
+const char * kXMPFiles_EmbeddedCopyright = kXMPFilesName " " kXMP_CopyrightStr;
+
+#define EMPTY_FILE_PATH ""
+#define XMP_FILES_STATIC_START try { int a;
+#define XMP_FILES_STATIC_END1(severity) a = 1; } catch ( XMP_Error & error ) { sDefaultErrorCallback.NotifyClient ( (severity), error, EMPTY_FILE_PATH ); }
+#define XMP_FILES_STATIC_END2(filePath, severity) a = 1; } catch ( XMP_Error & error ) { sDefaultErrorCallback.NotifyClient ( (severity), error, (filePath) ); }
+#define XMP_FILES_START try { int b;
+#define XMP_FILES_END1(severity) b = 1; } catch ( XMP_Error & error ) { errorCallback.NotifyClient ( (severity), error, this->filePath.c_str() ); }
+#define XMP_FILES_END2(filePath, severity) b = 1; } catch ( XMP_Error & error ) { errorCallback.NotifyClient ( (severity), error, (filePath) ); }
+#define XMP_FILES_STATIC_NOTIFY_ERROR(errorCallbackPtr, filePath, severity, error)							\
+	if ( (errorCallbackPtr) != NULL ) (errorCallbackPtr)->NotifyClient ( (severity), (error), (filePath) );
+
+
+// =================================================================================================
+
+#if EnablePacketScanning
+	static XMPFileHandlerInfo kScannerHandlerInfo ( kXMP_UnknownFile, kScanner_HandlerFlags,
+													(CheckFileFormatProc)0, Scanner_MetaHandlerCTor );
+#endif
+
+#if EnableGenericHandling
+	static XMPFileHandlerInfo kGenericHandlerInfo ( kXMP_UnknownFile, kGeneric_HandlerFlags,
+		(CheckFileFormatProc)0, Generic_MetaHandlerCTor );
+#endif
+// =================================================================================================
+
+/* class-static */
+void
+XMPFiles::GetVersionInfo ( XMP_VersionInfo * info )
+{
+	XMP_FILES_STATIC_START
+	memset ( info, 0, sizeof(XMP_VersionInfo) );
+
+	info->major   = XMPFILES_API_VERSION_MAJOR;
+	info->minor   = XMPFILES_API_VERSION_MINOR;
+	info->micro   = 0; //no longer used
+	info->isDebug = kXMPFiles_DebugFlag;
+	info->flags   = 0;	// ! None defined yet.
+	info->message = kXMPFiles_VersionMessage;
+	XMP_FILES_STATIC_END1 ( kXMPErrSev_OperationFatal )
+}	// XMPFiles::GetVersionInfo
+
+// =================================================================================================
+
+#if XMP_TraceFilesCalls
+	FILE * xmpFilesLog = stderr;
+#endif
+
+#if UseGlobalLibraryLock & (! XMP_StaticBuild )
+	XMP_BasicMutex sLibraryLock;	// ! Handled in XMPMeta for static builds.
+#endif
+
+/* class static */
+bool
+XMPFiles::Initialize( XMP_OptionBits options, const char* pluginFolder, const char* plugins /* = NULL */ )
+{
+	XMP_FILES_STATIC_START
+	++sXMPFilesInitCount;
+	if ( sXMPFilesInitCount > 1 ) return true;
+
+	#if XMP_TraceFilesCallsToFile
+		xmpFilesLog = fopen ( "XMPFilesLog.txt", "w" );
+		if ( xmpFilesLog == 0 ) xmpFilesLog = stderr;
+	#endif
+
+	#if UseGlobalLibraryLock & (! XMP_StaticBuild )
+		InitializeBasicMutex ( sLibraryLock );	// ! Handled in XMPMeta for static builds.
+	#endif
+
+	SXMPMeta::Initialize();	// Just in case the client does not.
+
+	if ( ! Initialize_LibUtils() ) return false;
+	if ( ! ID3_Support::InitializeGlobals() ) return false;
+
+	#if GatherPerformanceData
+		sAPIPerf = new APIPerfCollection;
+	#endif
+
+	XMP_Uns16 endianInt  = 0x00FF;
+	XMP_Uns8  endianByte = *((XMP_Uns8*)&endianInt);
+	if ( kBigEndianHost ) {
+		if ( endianByte != 0 ) XMP_Throw ( "Big endian flag mismatch", kXMPErr_InternalFailure );
+	} else {
+		if ( endianByte != 0xFF ) XMP_Throw ( "Little endian flag mismatch", kXMPErr_InternalFailure );
+	}
+
+	XMP_Assert ( kUTF8_PacketHeaderLen == strlen ( "<?xpacket begin='xxx' id='W5M0MpCehiHzreSzNTczkc9d'" ) );
+	XMP_Assert ( kUTF8_PacketTrailerLen == strlen ( (const char *) kUTF8_PacketTrailer ) );
+
+	HandlerRegistry::getInstance().initialize();
+
+	InitializeUnicodeConversions();
+
+	ignoreLocalText = XMP_OptionIsSet ( options, kXMPFiles_IgnoreLocalText );
+	#if XMP_UNIXBuild
+		if ( ! ignoreLocalText ) XMP_Throw ( "Generic UNIX clients must pass kXMPFiles_IgnoreLocalText", kXMPErr_EnforceFailure );
+	#endif
+
+	#if EnablePluginManager
+		if ( pluginFolder != 0 ) {
+			std::string pluginList;
+			if ( plugins != 0 ) pluginList.assign ( plugins );
+			PluginManager::initialize ( pluginFolder, pluginList );  // Load file handler plugins.
+		}
+	#endif
+
+	// Make sure the embedded info strings are referenced and kept.
+	if ( (kXMPFiles_EmbeddedVersion[0] == 0) || (kXMPFiles_EmbeddedCopyright[0] == 0) ) return false;
+	// Verify critical type sizes.
+	XMP_Assert ( sizeof(XMP_Int8) == 1 );
+	XMP_Assert ( sizeof(XMP_Int16) == 2 );
+	XMP_Assert ( sizeof(XMP_Int32) == 4 );
+	XMP_Assert ( sizeof(XMP_Int64) == 8 );
+	XMP_Assert ( sizeof(XMP_Uns8) == 1 );
+	XMP_Assert ( sizeof(XMP_Uns16) == 2 );
+	XMP_Assert ( sizeof(XMP_Uns32) == 4 );
+	XMP_Assert ( sizeof(XMP_Uns64) == 8 );
+	XMP_Assert ( sizeof(XMP_Bool) == 1 );
+	XMP_FILES_STATIC_END1 ( kXMPErrSev_ProcessFatal )
+	return true;
+
+}	// XMPFiles::Initialize
+
+// =================================================================================================
+
+#if GatherPerformanceData
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+#include "PerfUtils.cpp"
+
+static void ReportPerformanceData()
+{
+	struct SummaryInfo {
+		size_t callCount;
+		double totalTime;
+		SummaryInfo() : callCount(0), totalTime(0.0) {};
+	};
+
+	SummaryInfo perfSummary [kAPIPerfProcCount];
+
+	XMP_DateTime now;
+	SXMPUtils::CurrentDateTime ( &now );
+	std::string nowStr;
+	SXMPUtils::ConvertFromDate ( now, &nowStr );
+
+	#if XMP_WinBuild
+		#define kPerfLogPath "C:\\XMPFilesPerformanceLog.txt"
+	#else
+		#define kPerfLogPath "/XMPFilesPerformanceLog.txt"
+	#endif
+	FILE * perfLog = fopen ( kPerfLogPath, "ab" );
+	if ( perfLog == 0 ) return;
+
+	fprintf ( perfLog, "\n\n// =================================================================================================\n\n" );
+	fprintf ( perfLog, "XMPFiles performance data\n" );
+	fprintf ( perfLog, "   %s\n", kXMPFiles_VersionMessage );
+	fprintf ( perfLog, "   Reported at %s\n", nowStr.c_str() );
+	fprintf ( perfLog, "   %s\n", PerfUtils::GetTimerInfo() );
+
+	// Gather and report the summary info.
+
+	for ( size_t i = 0; i < sAPIPerf->size(); ++i ) {
+		SummaryInfo& summaryItem = perfSummary [(*sAPIPerf)[i].whichProc];
+		++summaryItem.callCount;
+		summaryItem.totalTime += (*sAPIPerf)[i].elapsedTime;
+	}
+
+	fprintf ( perfLog, "\nSummary data:\n" );
+
+	for ( size_t i = 0; i < kAPIPerfProcCount; ++i ) {
+		long averageTime = 0;
+		if ( perfSummary[i].callCount != 0 ) {
+			averageTime = (long) (((perfSummary[i].totalTime/perfSummary[i].callCount) * 1000.0*1000.0) + 0.5);
+		}
+		fprintf ( perfLog, "   %s, %d total calls, %d average microseconds per call\n",
+				  kAPIPerfNames[i], perfSummary[i].callCount, averageTime );
+	}
+
+	fprintf ( perfLog, "\nPer-call data:\n" );
+
+	// Report the info for each call.
+
+	for ( size_t i = 0; i < sAPIPerf->size(); ++i ) {
+		long time = (long) (((*sAPIPerf)[i].elapsedTime * 1000.0*1000.0) + 0.5);
+		fprintf ( perfLog, "   %s, %d microSec, ref %.8X, \"%s\"\n",
+				  kAPIPerfNames[(*sAPIPerf)[i].whichProc], time,
+				  (*sAPIPerf)[i].xmpFilesRef, (*sAPIPerf)[i].extraInfo.c_str() );
+	}
+
+	fclose ( perfLog );
+
+}	// ReportAReportPerformanceDataPIPerformance
+
+#endif
+
+// =================================================================================================
+
+/* class static */
+void
+XMPFiles::Terminate()
+{
+	XMP_FILES_STATIC_START
+	--sXMPFilesInitCount;
+	if ( sXMPFilesInitCount != 0 ) return;	// Not ready to terminate, or already terminated.
+
+	#if GatherPerformanceData
+		ReportPerformanceData();
+		EliminateGlobal ( sAPIPerf );
+	#endif
+
+	#if EnablePluginManager
+		PluginManager::terminate();
+	#endif
+
+	HandlerRegistry::terminate();
+
+	SXMPMeta::Terminate();	// Just in case the client does not.
+
+	ID3_Support::TerminateGlobals();
+	ISOMedia::TerminateGlobals();
+	Terminate_LibUtils();
+
+	#if UseGlobalLibraryLock & (! XMP_StaticBuild )
+		TerminateBasicMutex ( sLibraryLock );	// ! Handled in XMPMeta for static builds.
+	#endif
+
+	#if XMP_TraceFilesCallsToFile
+		if ( xmpFilesLog != stderr ) fclose ( xmpFilesLog );
+		xmpFilesLog = stderr;
+	#endif
+
+	// reset static variables
+	sDefaultErrorCallback.Clear();
+	sProgressDefault.Clear();
+	XMP_FILES_STATIC_END1 ( kXMPErrSev_ProcessFatal )
+}	// XMPFiles::Terminate
+
+// =================================================================================================
+
+XMPFiles::XMPFiles()
+	: clientRefs(0)
+	, format(kXMP_UnknownFile)
+	, ioRef(0)
+	, openFlags(0)
+	, handler(0)
+	, tempPtr(0)
+	, tempUI32(0)
+	, abortProc(0)
+	, abortArg(0)
+	, progressTracker(0)
+{
+	XMP_FILES_START
+	if ( sProgressDefault.clientProc != 0 ) {
+		this->progressTracker = new XMP_ProgressTracker ( sProgressDefault );
+		if (this->progressTracker == 0) XMP_Throw ( "XMPFiles: Unable to allocate memory for Progress Tracker", kXMPErr_NoMemory );
+	}
+
+	if ( sDefaultErrorCallback.clientProc != 0 ) {
+		this->errorCallback.wrapperProc = sDefaultErrorCallback.wrapperProc;
+		this->errorCallback.clientProc = sDefaultErrorCallback.clientProc;
+		this->errorCallback.context = sDefaultErrorCallback.context;
+		this->errorCallback.limit = sDefaultErrorCallback.limit;
+	}
+	XMP_FILES_END1 ( kXMPErrSev_OperationFatal );
+}	// XMPFiles::XMPFiles
+
+// =================================================================================================
+
+static inline void CloseLocalFile ( XMPFiles* thiz )
+{
+	if ( thiz->UsesLocalIO() ) {
+
+		XMPFiles_IO* localFile = (XMPFiles_IO*)thiz->ioRef;
+
+		if ( localFile != 0 ) {
+			localFile->Close();
+			delete localFile;
+			thiz->ioRef = 0;
+		}
+
+	}
+
+}	// CloseLocalFile
+
+// =================================================================================================
+
+XMPFiles::~XMPFiles()
+{
+	XMP_FILES_START
+	XMP_Assert ( this->clientRefs <= 0 );
+
+	if ( this->handler != 0 ) {
+		delete this->handler;
+		this->handler = 0;
+	}
+
+	CloseLocalFile ( this );
+
+	if ( this->progressTracker != 0 ) delete this->progressTracker;
+	if ( this->tempPtr != 0 ) free ( this->tempPtr );	// ! Must have been malloc-ed!
+	XMP_FILES_END1 ( kXMPErrSev_OperationFatal )
+
+}	// XMPFiles::~XMPFiles
+
+// =================================================================================================
+
+/* class static */
+bool
+XMPFiles::GetFormatInfo ( XMP_FileFormat   format,
+                          XMP_OptionBits * flags /* = 0 */ )
+{
+	XMP_FILES_STATIC_START
+		return HandlerRegistry::getInstance().getFormatInfo ( format, flags );
+	XMP_FILES_STATIC_END1 ( kXMPErrSev_OperationFatal )
+		return false;
+
+}	// XMPFiles::GetFormatInfo
+
+// =================================================================================================
+
+/* class static */
+XMP_FileFormat
+XMPFiles::CheckFileFormat ( XMP_StringPtr clientPath )
+{
+	XMP_FILES_STATIC_START
+	if ( (clientPath == 0) || (*clientPath == 0) ) return kXMP_UnknownFile;
+
+	XMPFiles bogus;	// Needed to provide context to SelectSmartHandler.
+	bogus.SetFilePath ( clientPath ); // So that XMPFiles destructor cleans up the XMPFiles_IO object.
+	XMPFileHandlerInfo * handlerInfo = HandlerRegistry::getInstance().selectSmartHandler(&bogus, clientPath, kXMP_UnknownFile, kXMPFiles_OpenForRead);
+
+	if ( handlerInfo == 0 ) {
+		if ( !Host_IO::Exists ( clientPath ) ) {
+			XMP_Error error ( kXMPErr_NoFile, "XMPFiles: file does not exist" );
+			XMP_FILES_STATIC_NOTIFY_ERROR ( &sDefaultErrorCallback, clientPath, kXMPErrSev_Recoverable, error );
+		}
+		return kXMP_UnknownFile;
+	}
+	return handlerInfo->format;
+	XMP_FILES_STATIC_END2 ( clientPath, kXMPErrSev_OperationFatal )
+	return kXMP_UnknownFile;
+
+}	// XMPFiles::CheckFileFormat
+
+// =================================================================================================
+
+/* class static */
+XMP_FileFormat
+XMPFiles::CheckPackageFormat ( XMP_StringPtr folderPath )
+{
+	XMP_FILES_STATIC_START
+	// This is called with a path to a folder, and checks to see if that folder is the top level of
+	// a "package" that should be recognized by one of the folder-oriented handlers. The checks here
+	// are not overly extensive, but hopefully enough to weed out false positives.
+	//
+	// Since we don't have many folder handlers, this is simple hardwired code.
+
+	#if ! EnableDynamicMediaHandlers
+		return kXMP_UnknownFile;
+	#else
+		Host_IO::FileMode folderMode = Host_IO::GetFileMode ( folderPath );
+		if ( folderMode != Host_IO::kFMode_IsFolder ) return kXMP_UnknownFile;
+		return HandlerRegistry::checkTopFolderName ( std::string ( folderPath ) );
+	#endif
+	XMP_FILES_STATIC_END2 ( folderPath, kXMPErrSev_OperationFatal )
+	return kXMP_UnknownFile;
+
+}	// XMPFiles::CheckPackageFormat
+
+// =================================================================================================
+
+static bool FileIsExcluded (
+	XMP_StringPtr clientPath,
+	std::string * fileExt,
+	Host_IO::FileMode * clientMode,
+	const XMPFiles::ErrorCallbackInfo * _errorCallbackInfoPtr = NULL )
+{
+	// ! Return true for excluded files, false for OK files.
+	
+	*clientMode = Host_IO::GetFileMode ( clientPath );
+
+	if ( (*clientMode == Host_IO::kFMode_IsFolder) || (*clientMode == Host_IO::kFMode_IsOther) ) {
+		XMP_Error error ( kXMPErr_FilePathNotAFile, "XMPFiles: path specified is not a file" );
+		XMP_FILES_STATIC_NOTIFY_ERROR ( _errorCallbackInfoPtr, clientPath, kXMPErrSev_Recoverable, error );
+		return true;
+	}
+
+	XMP_Assert ( (*clientMode == Host_IO::kFMode_IsFile) || (*clientMode == Host_IO::kFMode_DoesNotExist) );
+
+	if ( *clientMode == Host_IO::kFMode_IsFile ) {
+
+		// Find the file extension. OK to be "wrong" for something like "C:\My.dir\file". Any
+		// filtering looks for matches with real extensions, "dir\file" won't match any of these.
+		XMP_StringPtr extPos = clientPath + strlen ( clientPath );
+		for ( ; (extPos != clientPath) && (*extPos != '.'); --extPos ) {}
+		if ( *extPos == '.' ) {
+			fileExt->assign ( extPos+1 );
+			MakeLowerCase ( fileExt );
+		}
+
+		// See if this file is one that XMPFiles should never process.
+		for ( size_t i = 0; kKnownRejectedFiles[i] != 0; ++i ) {
+			if ( *fileExt == kKnownRejectedFiles[i] ) {
+				XMP_Error error ( kXMPErr_RejectedFileExtension, "XMPFiles: rejected file extension specified" );
+				XMP_FILES_STATIC_NOTIFY_ERROR ( _errorCallbackInfoPtr, clientPath, kXMPErrSev_Recoverable, error );
+				return true;
+			}
+		}
+
+	}
+	
+	return false;
+
+}	// FileIsExcluded
+
+static XMPFileHandlerInfo* CreateFileHandlerInfo (
+	XMPFiles* dummyParent,
+	XMP_FileFormat * format,
+	XMP_OptionBits   options,
+	XMP_Bool&  excluded,
+	const XMPFiles::ErrorCallbackInfo * _errorCallbackInfoPtr = NULL )
+{
+	Host_IO::FileMode clientMode;
+	std::string fileExt;	// Used to check for excluded files.
+	excluded = FileIsExcluded ( dummyParent->GetFilePath().c_str(), &fileExt, &clientMode, &sDefaultErrorCallback );	// ! Fills in fileExt and clientMode.
+	if ( excluded ) return 0;
+
+	XMPFileHandlerInfo * handlerInfo  = 0;
+
+	XMP_FileFormat dummyFormat = kXMP_UnknownFile;
+	if ( format == 0 ) format = &dummyFormat;
+
+	options |= kXMPFiles_OpenForRead;
+	handlerInfo = HandlerRegistry::getInstance().selectSmartHandler ( dummyParent, dummyParent->GetFilePath().c_str(), *format, options );
+
+	if ( handlerInfo == 0 ) {
+		if ( clientMode == Host_IO::kFMode_DoesNotExist ) {
+			XMP_Error error ( kXMPErr_NoFile, "XMPFiles: file does not exist" );
+			XMP_FILES_STATIC_NOTIFY_ERROR ( _errorCallbackInfoPtr, dummyParent->GetFilePath().c_str(), kXMPErrSev_Recoverable, error );
+		}else{
+			XMP_Error error ( kXMPErr_NoFileHandler, "XMPFiles: No smart file handler available to handle file" );
+			XMP_FILES_STATIC_NOTIFY_ERROR ( _errorCallbackInfoPtr, dummyParent->GetFilePath().c_str(), kXMPErrSev_Recoverable, error );
+		}
+		return 0;
+	}
+	return handlerInfo;
+}
+
+// =================================================================================================
+
+/* class static */
+bool
+XMPFiles::GetFileModDate ( XMP_StringPtr    clientPath,
+						   XMP_DateTime *   modDate,
+						   XMP_FileFormat * format, /* = 0 */
+						   XMP_OptionBits   options /* = 0 */ )
+{
+	XMP_FILES_STATIC_START
+	// ---------------------------------------------------------------
+	// First try to select a smart handler. Return false if not found.
+	
+	XMPFiles dummyParent;	// GetFileModDate is static, but the handler needs a parent.
+	dummyParent.SetFilePath ( clientPath );
+	
+	
+	XMPFileHandlerInfo * handlerInfo  = 0;
+	XMP_Bool excluded=false;
+	handlerInfo = CreateFileHandlerInfo ( &dummyParent, format, options, excluded, &sDefaultErrorCallback );
+#if EnableGenericHandling
+#if GenericHandlingAlwaysOn
+	XMP_OptionBits oldOptions = options;
+	options |= kXMPFiles_OpenUseGenericHandler;
+#endif
+	if (handlerInfo == 0 && !excluded
+		&& (options & kXMPFiles_OpenUseGenericHandler)  )
+	{
+		Host_IO::FileMode fileMode = Host_IO::GetFileMode( clientPath );
+		if ( fileMode == Host_IO::kFMode_DoesNotExist )
+			return false;
+
+		handlerInfo = &kGenericHandlerInfo;
+	}
+#if GenericHandlingAlwaysOn
+	options = oldOptions;
+#endif
+#endif
+	if ( handlerInfo == 0 ) return false;
+	
+	// -------------------------------------------------------------------------
+	// Fill in the format output. Call the handler to get the modification date.
+
+	dummyParent.format = handlerInfo->format;
+	if ( format ) *format = handlerInfo->format;
+
+	dummyParent.handler = handlerInfo->handlerCTor ( &dummyParent );
+
+	bool ok = false;
+
+	std::vector <std::string> resourceList;
+	try{
+		XMP_DateTime lastModDate;
+		XMP_DateTime junkDate;
+		if ( modDate == 0 ) modDate = &junkDate;
+		dummyParent.handler->FillAssociatedResources ( &resourceList );
+		size_t countRes = resourceList.size();
+		for ( size_t index = 0; index < countRes ; ++index ){
+			XMP_StringPtr curFilePath = resourceList[index].c_str();
+			if( Host_IO::GetFileMode ( curFilePath ) != Host_IO::kFMode_IsFile ) continue;// only interested in files
+			if (!Host_IO::GetModifyDate ( curFilePath, &lastModDate ) ) continue;
+			if ( ! ok || ( SXMPUtils::CompareDateTime ( *modDate , lastModDate ) < 0 ) ) 
+			{
+				*modDate = lastModDate;
+				ok = true;
+			}
+		}
+	}
+	catch(...){
+		// Fallback to the old way 
+		// eventually this method would go away as 
+		// soon as the implementation for
+		// GetAssociatedResources is added to all 
+		// the file/Plugin Handlers
+		ok = dummyParent.handler->GetFileModDate ( modDate );
+	}
+	delete dummyParent.handler;
+	dummyParent.handler = 0;
+
+	return ok;
+	XMP_FILES_STATIC_END2 ( clientPath, kXMPErrSev_OperationFatal )
+	return false;
+
+}	// XMPFiles::GetFileModDate
+
+// =================================================================================================
+
+/* class static */
+bool
+XMPFiles::GetAssociatedResources ( 
+		XMP_StringPtr              filePath,
+        std::vector<std::string> * resourceList,
+        XMP_FileFormat             format  /* = kXMP_UnknownFile */, 
+        XMP_OptionBits             options /*  = 0 */ )
+{
+	XMP_FILES_STATIC_START
+	XMP_Assert ( (resourceList != 0) && resourceList->empty() );	// Ensure that the glue passes in an empty local.
+
+	// Try to select a handler.
+
+	if ( (filePath == 0) || (*filePath == 0) ) return false;
+
+	XMPFiles dummyParent;	// GetAssociatedResources is static, but the handler needs a parent.
+	dummyParent.SetFilePath ( filePath );
+
+	XMPFileHandlerInfo * handlerInfo  = 0;
+	XMP_Bool excluded=false;
+	handlerInfo = CreateFileHandlerInfo ( &dummyParent, &format, options, excluded, &sDefaultErrorCallback );
+#if EnableGenericHandling
+#if GenericHandlingAlwaysOn
+	XMP_OptionBits oldOptions = options;
+	options |= kXMPFiles_OpenUseGenericHandler;
+#endif	
+	if (handlerInfo == 0 && !excluded
+		&& (options & kXMPFiles_OpenUseGenericHandler)  )
+	{
+		Host_IO::FileMode fileMode = Host_IO::GetFileMode( filePath );
+		if ( fileMode == Host_IO::kFMode_DoesNotExist )
+			return false;
+
+		handlerInfo = &kGenericHandlerInfo;
+	}
+#if GenericHandlingAlwaysOn
+	options = oldOptions;
+#endif
+#endif
+	if ( handlerInfo == 0 ) return false;
+
+	// -------------------------------------------------------------------------
+	// Fill in the format output. Call the handler to get the Associated Resources.
+
+	dummyParent.format = handlerInfo->format;
+
+	dummyParent.handler = handlerInfo->handlerCTor ( &dummyParent );
+	
+	try {
+		dummyParent.handler->FillAssociatedResources ( resourceList );
+	} catch ( XMP_Error& error ) {
+		if ( error.GetID() == kXMPErr_Unimplemented ) {
+			XMP_FILES_STATIC_NOTIFY_ERROR ( &sDefaultErrorCallback, filePath, kXMPErrSev_Recoverable, error );
+			return false;
+		} else {
+			throw;
+		}
+	}
+	XMP_Assert ( ! resourceList->empty() );
+
+	delete dummyParent.handler;
+	dummyParent.handler = 0;
+	
+	return true;
+
+	XMP_FILES_STATIC_END2 ( filePath, kXMPErrSev_OperationFatal )
+	return false;
+
+}	// XMPFiles::GetAssociatedResources
+
+bool 
+XMPFiles::IsMetadataWritable (
+		XMP_StringPtr  filePath,
+        XMP_Bool *     writable,
+        XMP_FileFormat format  /* = kXMP_UnknownFile */,
+        XMP_OptionBits options  /* = 0 */ )
+{
+	XMP_FILES_STATIC_START
+	// Try to select a handler.
+	
+	if ( (filePath == 0) || (*filePath == 0) ) return false;
+	
+	XMPFiles dummyParent;	// IsMetadataWritable is static, but the handler needs a parent.
+	dummyParent.SetFilePath ( filePath );
+
+	XMPFileHandlerInfo * handlerInfo  = 0;
+	XMP_Bool excluded=false;
+	handlerInfo = CreateFileHandlerInfo ( &dummyParent, &format, options, excluded, &sDefaultErrorCallback );
+#if EnableGenericHandling
+#if GenericHandlingAlwaysOn
+	XMP_OptionBits oldOptions = options;
+	options |= kXMPFiles_OpenUseGenericHandler;
+#endif
+	if (handlerInfo == 0 && !excluded
+		&& (options & kXMPFiles_OpenUseGenericHandler))	
+	{
+		Host_IO::FileMode fileMode = Host_IO::GetFileMode( filePath );
+		if ( fileMode == Host_IO::kFMode_DoesNotExist )
+			return false;
+
+		handlerInfo = &kGenericHandlerInfo;
+	}
+#if GenericHandlingAlwaysOn
+	options = oldOptions;
+#endif
+#endif
+	if ( handlerInfo == 0 ) return false;
+
+	if ( writable == 0 ) {
+		XMP_Throw("Boolean parameter is required for IsMetadataWritable() API.", kXMPErr_BadParam);
+	} else {
+		*writable = kXMP_Bool_False;
+	}
+
+
+	dummyParent.format = handlerInfo->format;
+	dummyParent.handler = handlerInfo->handlerCTor ( &dummyParent );
+	
+	// We don't require any of the files to be opened at this point.
+	// Also, if We don't close them then this will be a problem for embedded handlers because we will be checking
+	// write permission on the same file which could be open (in some mode) already.
+	CloseLocalFile(&dummyParent);
+	
+	try {
+		*writable = ConvertBoolToXMP_Bool( dummyParent.handler->IsMetadataWritable() );
+	} catch ( XMP_Error& error ) {
+		delete dummyParent.handler;
+		dummyParent.handler = 0;
+		if ( error.GetID() == kXMPErr_Unimplemented ) {
+			XMP_FILES_STATIC_NOTIFY_ERROR ( &sDefaultErrorCallback, filePath, kXMPErrSev_Recoverable, error );
+			return false;
+		} else {
+			throw;
+		}
+	}
+	if ( dummyParent.handler ) {
+		delete dummyParent.handler;
+		dummyParent.handler = 0;
+	}
+	XMP_FILES_STATIC_END2 ( filePath, kXMPErrSev_OperationFatal )
+	return true;
+} // XMPFiles::IsMetadataWritable 
+
+
+// =================================================================================================
+
+static bool
+DoOpenFile ( XMPFiles *     thiz,
+			 XMP_IO *       clientIO,
+			 XMP_StringPtr  clientPath,
+	         XMP_FileFormat format /* = kXMP_UnknownFile */,
+	         XMP_OptionBits openFlags /* = 0 */ )
+{
+	XMP_Assert ( (clientIO == 0) ? (clientPath[0] != 0) : (clientPath[0] == 0) );
+	
+	openFlags &= ~kXMPFiles_ForceGivenHandler;	// Don't allow this flag for OpenFile.
+
+	if ( (openFlags & kXMPFiles_OptimizeFileLayout) && (! (openFlags & kXMPFiles_OpenForUpdate)) ) {
+			XMP_Throw ( "OptimizeFileLayout requires OpenForUpdate", kXMPErr_BadParam );
+	}
+
+	if ( thiz->handler != 0 ) XMP_Throw ( "File already open", kXMPErr_BadParam );
+	CloseLocalFile ( thiz );	// Sanity checks if prior call failed.
+
+	thiz->ioRef = clientIO;
+	thiz->SetFilePath ( clientPath );
+
+	thiz->format = kXMP_UnknownFile;	// Make sure it is preset for later check.
+	thiz->openFlags = openFlags;
+
+	bool readOnly = XMP_OptionIsClear ( openFlags, kXMPFiles_OpenForUpdate );
+
+	Host_IO::FileMode clientMode;
+	std::string fileExt;	// Used to check for camera raw files and OK to scan files.
+
+	if ( thiz->UsesClientIO() ) {
+		clientMode = Host_IO::kFMode_IsFile;
+	} else {
+		bool excluded = FileIsExcluded ( clientPath, &fileExt, &clientMode, &thiz->errorCallback );	// ! Fills in fileExt and clientMode.
+		if ( excluded ) return false;
+	}
+
+	// Find the handler, fill in the XMPFiles member variables, cache the desired file data.
+
+	XMPFileHandlerInfo * handlerInfo  = 0;
+	XMPFileHandlerCTor   handlerCTor  = 0;
+	XMP_OptionBits       handlerFlags = 0;
+
+	if ( ! (openFlags & kXMPFiles_OpenUsePacketScanning) ) {
+		handlerInfo = HandlerRegistry::getInstance().selectSmartHandler( thiz, clientPath, format, openFlags );
+#if EnableGenericHandling
+#if GenericHandlingAlwaysOn
+		XMP_OptionBits oldOpenFlags = openFlags;
+		openFlags |= kXMPFiles_OpenUseGenericHandler;
+#endif
+	if (handlerInfo==0 
+		&& !(openFlags & kXMPFiles_OpenStrictly) 
+		&& (openFlags & kXMPFiles_OpenUseGenericHandler)) 
+		{
+			if ( clientMode == Host_IO::kFMode_DoesNotExist )
+				return false;
+
+			handlerInfo = &kGenericHandlerInfo;
+		}
+#if GenericHandlingAlwaysOn
+		openFlags = oldOpenFlags;
+#endif
+#endif
+	}
+
+	#if ! EnablePacketScanning
+
+		if ( handlerInfo == 0 ) {
+			if ( clientMode == Host_IO::kFMode_DoesNotExist ) {
+				XMP_Error error ( kXMPErr_NoFile, "XMPFiles: file does not exist" );
+				XMP_FILES_STATIC_NOTIFY_ERROR ( &thiz->errorCallback, clientPath, kXMPErrSev_Recoverable, error );
+			}
+			return false;
+		}
+
+	#else
+
+		if ( handlerInfo == 0 ) {
+
+			// No smart handler, packet scan if appropriate.
+			if ( clientMode == Host_IO::kFMode_DoesNotExist ) {
+				XMP_Error error ( kXMPErr_NoFile, "XMPFiles: file does not exist" );
+				XMP_FILES_STATIC_NOTIFY_ERROR ( &thiz->errorCallback, clientPath, kXMPErrSev_Recoverable, error );
+				return false;
+			} else if ( clientMode != Host_IO::kFMode_IsFile ) {
+				return false;
+			}
+
+			if ( openFlags & kXMPFiles_OpenUseSmartHandler ) {
+				CloseLocalFile ( thiz );
+				XMP_Error error ( kXMPErr_NoFileHandler, "XMPFiles: No smart file handler available to handle file" );
+				XMP_FILES_STATIC_NOTIFY_ERROR ( &thiz->errorCallback, clientPath, kXMPErrSev_Recoverable, error );
+				return false;
+			}
+
+#if EnableGenericHandling
+			if ( openFlags & kXMPFiles_OpenUseGenericHandler ) {
+				CloseLocalFile ( thiz );
+				XMP_Error error ( kXMPErr_NoFileHandler, "XMPFiles: Generic handler not available to handle file" );
+				XMP_FILES_STATIC_NOTIFY_ERROR ( &thiz->errorCallback, clientPath, kXMPErrSev_Recoverable, error );
+				return false;
+			}
+#endif
+
+			if ( openFlags & kXMPFiles_OpenLimitedScanning ) {
+				bool scanningOK = false;
+				for ( size_t i = 0; kKnownScannedFiles[i] != 0; ++i ) {
+					if ( fileExt == kKnownScannedFiles[i] ) { scanningOK = true; break; }
+				}
+				if ( ! scanningOK ) return false;
+			}
+
+			handlerInfo = &kScannerHandlerInfo;
+			if ( thiz->ioRef == 0 ) {	// Normally opened in SelectSmartHandler, but might not be open yet.
+				thiz->ioRef = XMPFiles_IO::New_XMPFiles_IO ( clientPath, readOnly );
+				if ( thiz->ioRef == 0 ) return false;
+			}
+
+		}
+
+	#endif
+
+	XMP_Assert ( handlerInfo != 0 );
+	handlerCTor  = handlerInfo->handlerCTor;
+	handlerFlags = handlerInfo->flags;
+
+	XMP_Assert ( (thiz->ioRef != 0) ||
+				 (handlerFlags & kXMPFiles_UsesSidecarXMP) ||
+				 (handlerFlags & kXMPFiles_HandlerOwnsFile) ||
+				 (handlerFlags & kXMPFiles_FolderBasedFormat) );
+
+	if ( thiz->format == kXMP_UnknownFile ) thiz->format = handlerInfo->format;	// ! The CheckProc might have set it.
+	XMPFileHandler* handler = (*handlerCTor) ( thiz );
+	XMP_Assert ( handlerFlags == handler->handlerFlags );
+
+	thiz->handler = handler;
+
+	try {
+		if ( !readOnly && handlerFlags & kXMPFiles_FolderBasedFormat ) {
+			bool isMetadataWritable = handler->IsMetadataWritable();
+			if ( !isMetadataWritable ) {
+				XMP_Throw ( "Open, file permission error", kXMPErr_FilePermission );
+			}
+		}
+		handler->CacheFileData();
+	} catch ( ... ) {
+		delete thiz->handler;
+		thiz->handler = 0;
+		if ( ! (handlerFlags & kXMPFiles_HandlerOwnsFile) ) CloseLocalFile ( thiz );
+		throw;
+	}
+
+	if ( handler->containsXMP ) FillPacketInfo ( handler->xmpPacket, &handler->packetInfo );
+
+	if ( (! (openFlags & kXMPFiles_OpenForUpdate)) && (! (handlerFlags & kXMPFiles_HandlerOwnsFile)) ) {
+		// Close the disk file now if opened for read-only access.
+		CloseLocalFile ( thiz );
+	}
+
+	return true;
+
+}	// DoOpenFile
+
+// =================================================================================================
+
+static bool DoOpenFile( XMPFiles* thiz, 
+						const Common::XMPFileHandlerInfo& hdlInfo, 
+						XMP_IO* clientIO, 
+						XMP_StringPtr clientPath, 
+						XMP_OptionBits openFlags )
+{
+	XMP_Assert ( (clientIO == 0) ? (clientPath[0] != 0) : (clientPath[0] == 0) );
+	
+	openFlags &= ~kXMPFiles_ForceGivenHandler;	// Don't allow this flag for OpenFile.
+
+	if ( (openFlags & kXMPFiles_OptimizeFileLayout) && (! (openFlags & kXMPFiles_OpenForUpdate)) ) {
+			XMP_Throw ( "OptimizeFileLayout requires OpenForUpdate", kXMPErr_BadParam );
+	}
+
+	if ( thiz->handler != 0 ) XMP_Throw ( "File already open", kXMPErr_BadParam );
+
+	//
+	// setup members
+	//
+	thiz->ioRef		= clientIO;
+	thiz->SetFilePath ( clientPath );
+	thiz->format	= hdlInfo.format;
+	thiz->openFlags = openFlags;
+
+	//
+	// create file handler instance
+	//
+	XMPFileHandlerCTor handlerCTor	= hdlInfo.handlerCTor;
+	XMP_OptionBits handlerFlags		= hdlInfo.flags;
+
+	XMPFileHandler* handler			= (*handlerCTor) ( thiz );
+	XMP_Assert ( handlerFlags == handler->handlerFlags );
+
+	thiz->handler = handler;
+	bool readOnly = XMP_OptionIsClear ( openFlags, kXMPFiles_OpenForUpdate );
+
+	if ( thiz->ioRef == 0 ) {	//Need to open the file if not done already
+		thiz->ioRef = XMPFiles_IO::New_XMPFiles_IO ( clientPath, readOnly );
+		if ( thiz->ioRef == 0 ) return false;
+	}
+	//
+	// try to read metadata
+	//
+	try 
+	{
+		handler->CacheFileData();
+
+		if( handler->containsXMP ) 
+		{
+			FillPacketInfo( handler->xmpPacket, &handler->packetInfo );
+		}
+
+		if( (! (openFlags & kXMPFiles_OpenForUpdate)) && (! (handlerFlags & kXMPFiles_HandlerOwnsFile)) ) 
+		{
+			// Close the disk file now if opened for read-only access.
+			CloseLocalFile ( thiz );
+		}
+	} 
+	catch( ... ) 
+	{
+		delete thiz->handler;
+		thiz->handler = NULL;
+
+		if( ! (handlerFlags & kXMPFiles_HandlerOwnsFile) ) 
+		{
+			CloseLocalFile( thiz );
+		}
+
+		throw;
+	}
+
+	return true;
+}
+
+// =================================================================================================
+
+bool
+XMPFiles::OpenFile ( XMP_StringPtr  clientPath,
+	                 XMP_FileFormat format /* = kXMP_UnknownFile */,
+	                 XMP_OptionBits openFlags /* = 0 */ )
+{
+	XMP_FILES_START
+	return DoOpenFile ( this, 0, clientPath, format, openFlags );
+	XMP_FILES_END2 ( clientPath, kXMPErrSev_FileFatal )
+	return false;
+}
+
+// =================================================================================================
+
+#if XMP_StaticBuild	// ! Client XMP_IO objects can only be used in static builds.
+
+bool
+XMPFiles::OpenFile ( XMP_IO*        clientIO,
+	                 XMP_FileFormat format /* = kXMP_UnknownFile */,
+	                 XMP_OptionBits openFlags /* = 0 */ )
+{
+	XMP_FILES_START
+	this->progressTracker = 0;	// Progress tracking is not supported for client-managed I/O.
+	return DoOpenFile ( this, clientIO, "", format, openFlags );
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+	return false;
+
+}	// XMPFiles::OpenFile
+
+bool XMPFiles::OpenFile ( const Common::XMPFileHandlerInfo&	hdlInfo,
+						 XMP_IO*							clientIO,
+						 XMP_OptionBits						openFlags /*= 0*/ )
+{
+	XMP_FILES_START
+	this->progressTracker = 0;	// Progress tracking is not supported for client-managed I/O.
+	return DoOpenFile ( this, hdlInfo, clientIO, NULL, openFlags );
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+	return false;
+
+}
+
+#endif	// XMP_StaticBuild
+
+// =================================================================================================
+
+bool XMPFiles::OpenFile ( const Common::XMPFileHandlerInfo&	hdlInfo,
+						 XMP_StringPtr						filePath,
+						 XMP_OptionBits						openFlags /*= 0*/ )
+{
+	XMP_FILES_START
+	return DoOpenFile ( this, hdlInfo, NULL, filePath, openFlags );
+	XMP_FILES_END2 (filePath, kXMPErrSev_FileFatal )
+	return false;
+}
+
+// =================================================================================================
+
+void
+XMPFiles::CloseFile ( XMP_OptionBits closeFlags /* = 0 */ )
+{
+	XMP_FILES_START
+	if ( this->handler == 0 ) return;	// Return if there is no open file (not an error).
+
+	bool needsUpdate = this->handler->needsUpdate;
+	bool optimizeFileLayout = XMP_OptionIsSet ( this->openFlags, kXMPFiles_OptimizeFileLayout );
+
+	XMP_OptionBits handlerFlags = this->handler->handlerFlags;
+
+	// Decide if we're doing a safe update. If so, make sure the handler supports it. All handlers
+	// that don't own the file tolerate safe update using common code below.
+
+	bool doSafeUpdate = XMP_OptionIsSet ( closeFlags, kXMPFiles_UpdateSafely );
+	#if GatherPerformanceData
+		if ( doSafeUpdate ) sAPIPerf->back().extraInfo += ", safe update";	// Client wants safe update.
+	#endif
+
+	if ( ! (this->openFlags & kXMPFiles_OpenForUpdate) ) doSafeUpdate = false;
+	if ( ! needsUpdate ) doSafeUpdate = false;
+
+	bool safeUpdateOK = ( (handlerFlags & kXMPFiles_AllowsSafeUpdate) ||
+						  (! (handlerFlags & kXMPFiles_HandlerOwnsFile)) );
+	if ( doSafeUpdate && (! safeUpdateOK) ) {
+		XMP_Throw ( "XMPFiles::CloseFile - Safe update not supported", kXMPErr_Unavailable );
+	}
+
+	if ( (this->progressTracker != 0) && this->UsesLocalIO() ) {
+		XMPFiles_IO * localFile = (XMPFiles_IO*)this->ioRef;
+		localFile->SetProgressTracker ( this->progressTracker );
+	}
+
+	// Try really hard to make sure the file is closed and the handler is deleted.
+
+	try {
+
+		if ( (! doSafeUpdate) || (handlerFlags & kXMPFiles_HandlerOwnsFile) ) {	// ! Includes no update case.
+
+			// Close the file without doing common crash-safe writing. The handler might do it.
+
+			needsUpdate |= optimizeFileLayout;
+
+			if ( needsUpdate ) {
+				#if GatherPerformanceData
+					sAPIPerf->back().extraInfo += ", direct update";
+				#endif
+				this->handler->UpdateFile ( doSafeUpdate );
+			}
+
+			delete this->handler;
+			this->handler = 0;
+			CloseLocalFile ( this );
+
+		} else {
+
+			// Update the file in a crash-safe manner using common control of a temp file.
+
+			XMP_IO* tempFileRef = this->ioRef->DeriveTemp();
+			if ( tempFileRef == 0 ) XMP_Throw ( "XMPFiles::CloseFile, cannot create temp", kXMPErr_InternalFailure );
+
+			if ( handlerFlags & kXMPFiles_CanRewrite ) {
+
+				// The handler can rewrite an entire file based on the original.
+
+				#if GatherPerformanceData
+					sAPIPerf->back().extraInfo += ", file rewrite";
+				#endif
+
+				this->handler->WriteTempFile ( tempFileRef );
+
+			} else {
+
+				// The handler can only update an existing file. Copy to the temp then update.
+
+
+				#if GatherPerformanceData
+					sAPIPerf->back().extraInfo += ", copy update";
+				#endif
+
+
+				XMP_IO* origFileRef = this->ioRef;
+
+				origFileRef->Rewind();
+				if ( this->progressTracker != 0 && (this->handler->handlerFlags & kXMPFiles_CanNotifyProgress) ) progressTracker->BeginWork ( (float) origFileRef->Length() );
+				XIO::Copy ( origFileRef, tempFileRef, origFileRef->Length(), abortProc, abortArg );
+
+				try {
+
+					this->ioRef = tempFileRef;
+					this->handler->UpdateFile ( false );	// We're doing the safe update, not the handler.
+					this->ioRef = origFileRef;
+
+				} catch ( ... ) {
+
+					this->ioRef->DeleteTemp();
+					this->ioRef = origFileRef;
+					throw;
+
+				}
+
+				if ( progressTracker != 0 && (this->handler->handlerFlags & kXMPFiles_CanNotifyProgress)) progressTracker->WorkComplete();
+
+			}
+
+			this->ioRef->AbsorbTemp();
+			CloseLocalFile ( this );
+
+			delete this->handler;
+			this->handler = 0;
+
+		}
+
+	} catch ( ... ) {
+
+		// *** Don't delete the temp or copy files, not sure which is best.
+
+		try {
+			if ( this->handler != 0 ) {
+				delete this->handler;
+				this->handler = 0;
+			}
+		} catch ( ... ) { /* Do nothing, throw the outer exception later. */ }
+
+		if ( this->ioRef ) this->ioRef->DeleteTemp();
+		CloseLocalFile ( this );
+		this->ClearFilePath();
+
+		this->handler   = 0;
+		this->format    = kXMP_UnknownFile;
+		this->ioRef     = 0;
+		this->openFlags = 0;
+
+		if ( this->tempPtr != 0 ) free ( this->tempPtr );	// ! Must have been malloc-ed!
+		this->tempPtr  = 0;
+		this->tempUI32 = 0;
+
+		throw;
+
+	}
+
+	// Clear the XMPFiles member variables.
+
+	CloseLocalFile ( this );
+	this->ClearFilePath();
+
+	this->handler   = 0;
+	this->format    = kXMP_UnknownFile;
+	this->ioRef     = 0;
+	this->openFlags = 0;
+
+	if ( this->tempPtr != 0 ) free ( this->tempPtr );	// ! Must have been malloc-ed!
+	this->tempPtr  = 0;
+	this->tempUI32 = 0;
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+
+}	// XMPFiles::CloseFile
+
+// =================================================================================================
+
+bool
+XMPFiles::GetFileInfo ( XMP_StringPtr *  filePath /* = 0 */,
+                        XMP_StringLen *  pathLen /* = 0 */,
+	                    XMP_OptionBits * openFlags /* = 0 */,
+	                    XMP_FileFormat * format /* = 0 */,
+	                    XMP_OptionBits * handlerFlags /* = 0 */ ) const
+{
+	XMP_FILES_START
+	if ( this->handler == 0 ) return false;
+	XMPFileHandler * handler = this->handler;
+
+	if ( filePath == 0 ) filePath = &voidStringPtr;
+	if ( pathLen == 0 ) pathLen = &voidStringLen;
+	if ( openFlags == 0 ) openFlags = &voidOptionBits;
+	if ( format == 0 ) format = &voidFileFormat;
+	if ( handlerFlags == 0 ) handlerFlags = &voidOptionBits;
+
+	*filePath     = this->filePath.c_str();
+	*pathLen      = (XMP_StringLen) this->filePath.size();
+	*openFlags    = this->openFlags;
+	*format       = this->format;
+	*handlerFlags = this->handler->handlerFlags;
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+	return true;
+
+}	// XMPFiles::GetFileInfo
+
+// =================================================================================================
+
+void
+XMPFiles::SetAbortProc ( XMP_AbortProc abortProc,
+						 void *        abortArg )
+{
+	XMP_FILES_START
+	this->abortProc = abortProc;
+	this->abortArg  = abortArg;
+
+	XMP_Assert ( (abortProc != (XMP_AbortProc)0) || (abortArg != (void*)(unsigned long long)0xDEADBEEFULL) );	// Hack to test the assert callback.
+	XMP_FILES_END1 ( kXMPErrSev_OperationFatal )
+}	// XMPFiles::SetAbortProc
+
+// =================================================================================================
+// SetClientPacketInfo
+// ===================
+//
+// Set the packet info returned to the client. This is the internal packet info at first, which
+// tells what is in the file. But once the file needs update (PutXMP has been called), we return
+// info about the latest XMP. The internal packet info is left unchanged since it is needed when
+// the file is updated to locate the old packet in the file.
+
+static void
+SetClientPacketInfo ( XMP_PacketInfo * clientInfo, const XMP_PacketInfo & handlerInfo,
+					  const std::string & xmpPacket, bool needsUpdate )
+{
+
+	if ( clientInfo == 0 ) return;
+
+	if ( ! needsUpdate ) {
+		*clientInfo = handlerInfo;
+	} else {
+		clientInfo->offset = kXMPFiles_UnknownOffset;
+		clientInfo->length = (XMP_Int32) xmpPacket.size();
+		FillPacketInfo ( xmpPacket, clientInfo );
+	}
+
+}	// SetClientPacketInfo
+
+// =================================================================================================
+
+bool
+XMPFiles::GetXMP ( SXMPMeta *       xmpObj /* = 0 */,
+                   XMP_StringPtr *  xmpPacket /* = 0 */,
+                   XMP_StringLen *  xmpPacketLen /* = 0 */,
+                   XMP_PacketInfo * packetInfo /* = 0 */ )
+{
+	XMP_FILES_START
+	if ( this->handler == 0 ) XMP_Throw ( "XMPFiles::GetXMP - No open file", kXMPErr_BadObject );
+
+	XMP_OptionBits applyTemplateFlags = kXMPTemplate_AddNewProperties | kXMPTemplate_IncludeInternalProperties;
+
+	if ( ! this->handler->processedXMP ) {
+		try {
+			this->handler->ProcessXMP();
+		} catch ( ... ) {
+			// Return the outputs then rethrow the exception.
+			if ( xmpObj != 0 ) {
+				// ! Don't use Clone, that replaces the internal ref in the local xmpObj, leaving the client unchanged!
+				xmpObj->Erase();
+				SXMPUtils::ApplyTemplate ( xmpObj, this->handler->xmpObj, applyTemplateFlags );
+			}
+			if ( xmpPacket != 0 ) *xmpPacket = this->handler->xmpPacket.c_str();
+			if ( xmpPacketLen != 0 ) *xmpPacketLen = (XMP_StringLen) this->handler->xmpPacket.size();
+			SetClientPacketInfo ( packetInfo, this->handler->packetInfo,
+								  this->handler->xmpPacket, this->handler->needsUpdate );
+			throw;
+		}
+	}
+
+	if ( ! this->handler->containsXMP ) return false;
+
+	#if 0	// *** See bug 1131815. A better way might be to pass the ref up from here.
+		if ( xmpObj != 0 ) *xmpObj = this->handler->xmpObj.Clone();
+	#else
+		if ( xmpObj != 0 ) {
+			// ! Don't use Clone, that replaces the internal ref in the local xmpObj, leaving the client unchanged!
+			xmpObj->Erase();
+			SXMPUtils::ApplyTemplate ( xmpObj, this->handler->xmpObj, applyTemplateFlags );
+		}
+	#endif
+
+	if ( xmpPacket != 0 ) *xmpPacket = this->handler->xmpPacket.c_str();
+	if ( xmpPacketLen != 0 ) *xmpPacketLen = (XMP_StringLen) this->handler->xmpPacket.size();
+	SetClientPacketInfo ( packetInfo, this->handler->packetInfo,
+						  this->handler->xmpPacket, this->handler->needsUpdate );
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+	return true;
+
+}	// XMPFiles::GetXMP
+
+// =================================================================================================
+
+static bool
+DoPutXMP ( XMPFiles * thiz, const SXMPMeta & xmpObj, const bool doIt )
+{
+	// Check some basic conditions to see if the Put should be attempted.
+
+	if ( thiz->handler == 0 ) XMP_Throw ( "XMPFiles::PutXMP - No open file", kXMPErr_BadObject );
+	if ( ! (thiz->openFlags & kXMPFiles_OpenForUpdate) ) {
+		XMP_Throw ( "XMPFiles::PutXMP - Not open for update", kXMPErr_BadObject );
+	}
+
+	XMPFileHandler * handler      = thiz->handler;
+	XMP_OptionBits   handlerFlags = handler->handlerFlags;
+	XMP_PacketInfo & packetInfo   = handler->packetInfo;
+	std::string &    xmpPacket    = handler->xmpPacket;
+
+	if ( ! handler->processedXMP ) handler->ProcessXMP();	// Might have Open/Put with no GetXMP.
+
+	size_t oldPacketOffset = (size_t)packetInfo.offset;
+	size_t oldPacketLength = packetInfo.length;
+
+	if ( oldPacketOffset == (size_t)kXMPFiles_UnknownOffset ) oldPacketOffset = 0;	// ! Simplify checks.
+	if ( oldPacketLength == (size_t)kXMPFiles_UnknownLength ) oldPacketLength = 0;
+
+	bool fileHasPacket = (oldPacketOffset != 0) && (oldPacketLength != 0);
+
+	if ( ! fileHasPacket ) {
+		if ( ! (handlerFlags & kXMPFiles_CanInjectXMP) ) {
+			XMP_Throw ( "XMPFiles::PutXMP - Can't inject XMP", kXMPErr_Unavailable );
+		}
+		if ( handler->stdCharForm == kXMP_CharUnknown ) {
+			XMP_Throw ( "XMPFiles::PutXMP - No standard character form", kXMPErr_InternalFailure );
+		}
+	}
+
+	// Serialize the XMP and update the handler's info.
+
+	XMP_Uns8 charForm = handler->stdCharForm;
+	if ( charForm == kXMP_CharUnknown ) charForm = packetInfo.charForm;
+
+	XMP_OptionBits options = handler->GetSerializeOptions() | XMP_CharToSerializeForm ( charForm );
+	if ( handlerFlags & kXMPFiles_NeedsReadOnlyPacket ) options |= kXMP_ReadOnlyPacket;
+	if ( fileHasPacket && (thiz->format == kXMP_UnknownFile) && (! packetInfo.writeable) ) options |= kXMP_ReadOnlyPacket;
+
+	bool preferInPlace = ((handlerFlags & kXMPFiles_PrefersInPlace) != 0);
+	bool tryInPlace    = (fileHasPacket & preferInPlace) || (! (handlerFlags & kXMPFiles_CanExpand));
+
+	if ( handlerFlags & kXMPFiles_UsesSidecarXMP ) tryInPlace = false;
+
+	if ( tryInPlace ) {
+		try {
+			xmpObj.SerializeToBuffer ( &xmpPacket, (options | kXMP_ExactPacketLength), (XMP_StringLen) oldPacketLength );
+			XMP_Assert ( xmpPacket.size() == oldPacketLength );
+		} catch ( ... ) {
+			if ( preferInPlace ) {
+				tryInPlace = false;	// ! Try again, out of place this time.
+			} else {
+				if ( ! doIt ) return false;
+				throw;
+			}
+		}
+	}
+
+	if ( ! tryInPlace ) {
+		try {
+			xmpObj.SerializeToBuffer ( &xmpPacket, options );
+		} catch ( ... ) {
+			if ( ! doIt ) return false;
+			throw;
+		}
+	}
+
+	if ( doIt ) {
+		handler->xmpObj = xmpObj.Clone();
+		handler->containsXMP = true;
+		handler->processedXMP = true;
+		handler->needsUpdate = true;
+	}
+
+	return true;
+
+}	// DoPutXMP
+
+// =================================================================================================
+
+void
+XMPFiles::PutXMP ( const SXMPMeta & xmpObj )
+{
+	XMP_FILES_START
+	(void) DoPutXMP ( this, xmpObj, true );
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+
+}	// XMPFiles::PutXMP
+
+// =================================================================================================
+
+void
+XMPFiles::PutXMP ( XMP_StringPtr xmpPacket,
+                   XMP_StringLen xmpPacketLen /* = kXMP_UseNullTermination */ )
+{
+	XMP_FILES_START
+	SXMPMeta xmpObj;
+	xmpObj.SetErrorCallback ( ErrorCallbackForXMPMeta, &errorCallback );
+	xmpObj.ParseFromBuffer ( xmpPacket, xmpPacketLen );
+	this->PutXMP ( xmpObj );
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+}	// XMPFiles::PutXMP
+
+// =================================================================================================
+
+bool
+XMPFiles::CanPutXMP ( const SXMPMeta & xmpObj )
+{
+	XMP_FILES_START
+	if ( this->handler == 0 ) XMP_Throw ( "XMPFiles::CanPutXMP - No open file", kXMPErr_BadObject );
+
+	if ( ! (this->openFlags & kXMPFiles_OpenForUpdate) ) return false;
+
+	if ( this->handler->handlerFlags & kXMPFiles_CanInjectXMP ) return true;
+	if ( ! this->handler->containsXMP ) return false;
+	if ( this->handler->handlerFlags & kXMPFiles_CanExpand ) return true;
+
+	return DoPutXMP ( this, xmpObj, false );
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+	return false;
+
+}	// XMPFiles::CanPutXMP
+
+// =================================================================================================
+
+bool
+XMPFiles::CanPutXMP ( XMP_StringPtr xmpPacket,
+                      XMP_StringLen xmpPacketLen /* = kXMP_UseNullTermination */ )
+{
+	XMP_FILES_START
+	SXMPMeta xmpObj;
+	xmpObj.SetErrorCallback ( ErrorCallbackForXMPMeta, &errorCallback );
+	xmpObj.ParseFromBuffer ( xmpPacket, xmpPacketLen );
+	return this->CanPutXMP ( xmpObj );
+	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
+	return false;
+
+}	// XMPFiles::CanPutXMP
+
+// =================================================================================================
+
+/* class-static */
+void
+XMPFiles::SetDefaultProgressCallback ( const XMP_ProgressTracker::CallbackInfo & cbInfo )
+{
+	XMP_FILES_STATIC_START
+	XMP_Assert ( cbInfo.wrapperProc != 0 );	// ! Should be provided by the glue code.
+
+	sProgressDefault = cbInfo;
+	XMP_FILES_STATIC_END1 ( kXMPErrSev_OperationFatal )
+
+}	// XMPFiles::SetDefaultProgressCallback
+
+// =================================================================================================
+
+void
+XMPFiles::SetProgressCallback ( const XMP_ProgressTracker::CallbackInfo & cbInfo )
+{
+	XMP_FILES_START
+	XMP_Assert ( cbInfo.wrapperProc != 0 );	// ! Should be provided by the glue code.
+
+	if ( (this->handler != 0) && this->UsesClientIO() ) return;	// Can't use progress tracking.
+
+	if ( this->progressTracker != 0 ) {
+		delete this->progressTracker;	// ! Delete any existing tracker.
+		this->progressTracker = 0;
+	}
+	
+	if ( cbInfo.clientProc != 0 ) {
+		this->progressTracker = new XMP_ProgressTracker ( cbInfo );
+	}
+	XMP_FILES_END1 ( kXMPErrSev_OperationFatal )
+
+}	// XMPFiles::SetProgressCallback
+
+// =================================================================================================
+// Error notifications
+// ===================
+
+// -------------------------------------------------------------------------------------------------
+// SetDefaultErrorCallback
+// -----------------------
+
+/* class-static */ 
+void XMPFiles::SetDefaultErrorCallback ( XMPFiles_ErrorCallbackWrapper	wrapperProc,
+										 XMPFiles_ErrorCallbackProc		clientProc,
+										 void *							context,
+										 XMP_Uns32						limit )
+{
+	XMP_FILES_STATIC_START
+	XMP_Assert ( wrapperProc != 0 );	// Must always be set by the glue;
+
+	sDefaultErrorCallback.wrapperProc = wrapperProc;
+	sDefaultErrorCallback.clientProc = clientProc;
+	sDefaultErrorCallback.context = context;
+	sDefaultErrorCallback.limit = limit;
+	XMP_FILES_STATIC_END1 ( kXMPErrSev_OperationFatal )
+}	// SetDefaultErrorCallback
+
+// -------------------------------------------------------------------------------------------------
+// SetErrorCallback
+// ----------------
+
+void XMPFiles::SetErrorCallback ( XMPFiles_ErrorCallbackWrapper	wrapperProc,
+								  XMPFiles_ErrorCallbackProc	clientProc,
+								  void *						context,
+								  XMP_Uns32						limit )
+{
+	XMP_FILES_START
+	XMP_Assert ( wrapperProc != 0 );	// Must always be set by the glue;
+
+	this->errorCallback.Clear();
+	this->errorCallback.wrapperProc = wrapperProc;
+	this->errorCallback.clientProc = clientProc;
+	this->errorCallback.context = context;
+	this->errorCallback.limit = limit;
+	XMP_FILES_END1 ( kXMPErrSev_OperationFatal )
+}	// SetErrorCallback
+
+// -------------------------------------------------------------------------------------------------
+// ResetErrorCallbackLimit
+// -----------------------
+
+void XMPFiles::ResetErrorCallbackLimit ( XMP_Uns32 limit ) {
+	XMP_FILES_START
+	this->errorCallback.limit = limit;
+	this->errorCallback.notifications = 0;
+	this->errorCallback.topSeverity = kXMPErrSev_Recoverable;
+	XMP_FILES_END1 ( kXMPErrSev_OperationFatal )
+}	// ResetErrorCallbackLimit
+
+// -------------------------------------------------------------------------------------------------
+// ErrorCallbackInfo::CanNotify
+// -------------------------------
+//
+// This is const just to be usable from const XMPMeta functions.
+
+bool 
+	XMPFiles::ErrorCallbackInfo::CanNotify() const
+{
+	XMP_Assert ( (this->clientProc == 0) || (this->wrapperProc != 0) );
+	return ( this->clientProc != 0 );
+}
+
+// -------------------------------------------------------------------------------------------------
+// ErrorCallbackInfo::ClientCallbackWrapper
+// -------------------------------
+//
+// This is const just to be usable from const XMPMeta functions.
+
+bool
+	XMPFiles::ErrorCallbackInfo::ClientCallbackWrapper ( XMP_StringPtr filePath,
+														 XMP_ErrorSeverity severity,
+														 XMP_Int32 cause,
+														 XMP_StringPtr messsage ) const
+{
+	
+	XMP_StringPtr filePathPtr = filePath;
+	if ( filePathPtr == 0 ) {
+		filePathPtr = this->filePath.c_str();
+	}
+
+	XMP_Bool retValue = (*this->wrapperProc) ( this->clientProc, this->context, filePathPtr, severity, cause, messsage );
+	return ConvertXMP_BoolToBool(retValue);
+}
+
+// -------------------------------------------------------------------------------------------------
+// ErrorCallbackForXMPMeta
+// -------------------------------
+
+bool
+	ErrorCallbackForXMPMeta ( void * context, XMP_ErrorSeverity severity, 
+							   XMP_Int32 cause,
+							   XMP_StringPtr message)
+{
+	//typecast context to GenericErrorCallback
+	GenericErrorCallback * callback = ( GenericErrorCallback * ) context;
+	XMP_Error error ( cause, message );
+	callback->NotifyClient ( severity, error );
+	return !kXMP_Bool_False;
+}
+
+// =================================================================================================
diff --git a/XMPFiles/source/XMPFiles.hpp b/XMPFiles/source/XMPFiles.hpp
new file mode 100644
index 0000000..e3ecb8b
--- /dev/null
+++ b/XMPFiles/source/XMPFiles.hpp
@@ -0,0 +1,292 @@
+#ifndef __XMPFiles_hpp__
+#define __XMPFiles_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include <string>
+#define TXMP_STRING_TYPE std::string
+#include "public/include/XMP.hpp"
+
+#include "public/include/XMP_IO.hpp"
+#include "source/SafeStringAPIs.h"
+#include "source/XMP_ProgressTracker.hpp"
+
+class XMPFileHandler;
+namespace Common{ struct XMPFileHandlerInfo; }
+
+// =================================================================================================
+/// \file XMPFiles.hpp
+/// \brief High level support to access metadata in files of interest to Adobe applications.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// =================================================================================================
+// *** Usage Notes (eventually to become Doxygen comments) ***
+// ===========================================================
+//
+// This is the main part of the internal (DLL side) implementation of XMPFiles. Other parts are
+// the entry point wrappers and the file format handlers. The XMPFiles class distills the client
+// API from TXMPFiles.hpp, removing convenience overloads and substituting a pointer/length pair
+// for output strings.
+//
+// The wrapper functions provide a stable binary interface and perform minor impedance correction
+// between the client template API from TDocMeta.hpp and the DLL's XMPFiles class. The details of
+// the wrappers should be considered private.
+//
+// File handlers are registered during DLL initialization with hard coded calls in Init_XMPFiles.
+// Each file handler provides 2 standalone functions, CheckFormatProc and DocMetaHandlerCTor, plus a
+// class derived from DocMetaHandler. The format and capability flags are passed when registering.
+// This allows the same physical handler to be registered for multiple formats.
+//
+// -------------------------------------------------------------------------------------------------
+//
+// Basic outlines of the processing by the XMPFiles methods:
+//
+//	Constructor:
+//		- Minimal work to create an empty XMPFiles object, set the ref count to 1.
+//
+//	Destructor:
+//		- Decrement the ref count, return if greater than zero.
+//		- Call LFA_Close if necessary.
+////
+//	GetFormatInfo:
+//		- Return the flags for the registered handler.
+//
+//	OpenFile:
+//		- The physical file is opened via LFA_OpenFile.
+//		- A handler is selected by calling the registered format checkers.
+//		- The handler object is created by calling the registered constructor proc.
+//
+//	CloseFile:
+//		- Return if there is no open file (not an error).
+//		- If not a crash-safe update (includes read-only or no update), or the handler owns the file:
+//			- Throw an exception if the handler owns the file but does not support safe update.
+//			- If the file needs updating, call the handler's UpdateFile method.
+//		- else:
+//			- If the handler supports file rewrite:
+//				- *** This might not preserve ownership and permissions.
+//				- Create an empty temp file.
+//				- Call the handler's WriteFile method, writing to the temp file.
+//			- else
+//				- *** This preserves ownership, permissions, and Mac resources.
+//				- Copy the original file to a temp name (Mac data fork only).
+//				- Rename the original file to a different temp name.
+//				- Rename the copy file back to the original name.
+//				- Call the handler's UpdateFile method for the "original as temp" file.
+//			- Close both the original and temp files.
+//			- Delete the file with the original name.
+//			- Rename the temp file to the original name.
+//		- Delete the handler object.
+//		- Call LFA_Close if necessary.
+//
+//	GetFileInfo:
+//		- Return the file info from the XMPFiles member variables.
+//
+//	GetXMP:
+//		- Throw an exception if there is no open file.
+//		- Call the handler's GetXMP method.
+//
+//	PutXMP:
+//		- Throw an exception if there is no open file.
+//		- Call the handler's PutXMP method.
+//
+//	CanPutXMP:
+//		- Implement roughly as shown in TXMPFiles.hpp, there is no handler CanPutXMP method.
+//
+// -------------------------------------------------------------------------------------------------
+//
+// The format checker should do nothing but the minimal work to identify the overall file format.
+// In particular it should not look for XMP or other metadata. Note that the format checker has no
+// means to carry state forward, it just returns a yes/no answer about a particular file format.
+//
+// The format checker and file handler should use the LFA_* functions for all I/O. They should not
+// open or close the file themselves unless the handler sets the "handler-owns-file" flag.
+//
+// The format checker is passed the format being checked, allowing one checker to handle multiple
+// formats. It is passed the LFA file ref so that it can do additional reads if necessary. The
+// buffer is from the start of the file, the file will be positioned to the byte following the
+// buffer. The buffer length will be at least 4K, unless the file is smaller in which case it will
+// be the length of the file. This buffer may be reused for additional reads.
+//
+// Identifying some file formats can require checking variable length strings. Doing seeks and reads
+// for each is suboptimal. There are utilities to maintain a rolling buffer and ensure that a given
+// amount of data is available. See the template file handler code for details.
+//
+// -------------------------------------------------------------------------------------------------
+//
+// The file handler has no explicit open and close methods. These are implicit in the handler's
+// constructor and destructor. The file handler should use the XMPFiles member variables for the
+// active file ref (and path if necessary), unless it owns the file. Note that these might change
+// between the open and close in the case of crash-safe updates. Don't copy the XMPFiles member
+// variables in the handler's constructor, save the pointer to the XMPFiles object and access
+// directly as needed.
+//
+// The handler should have an UpdateFile method. This is called from XMPFiles::CloseFile if the
+// file needs to be updated. The handler's destructor must only close the file, not update it.
+// The handler can optionally have a WriteFile method, if it can rewrite the entire file.
+//
+// The handler is free to use its best judgment about caching parts of the file in memory. Overall
+// speed of a single open/get/put/close cycle is probably the best goal, assuming a modern processor
+// with a reasonable (significant but not enormous) amount of RAM.
+//
+// The handler methods will be called in a per-object thread safe manner. Concurrent access might
+// occur for different objects, but not for the same object. The handler's constructor and destructor
+// will always be globally serialized, so they can safely modify global data structures.
+//
+// (Testing issue: What about separate XMPFiles objects accessing the same file?)
+//
+// Handler's must not have any global objects that are heap allocated. Use pointers to objects that
+// are allocated and deleted during the XMPFiles initialization and termination process. Some
+// client apps are very picky about what they detect as memory leaks.
+//
+//    static char gSomeBuffer [10*1000];          // OK, not from the heap.
+//    static std::string gSomeString;             // Not OK, content from the heap.
+//    static std::vector<int> gSomeVector;        // Not OK, content from the heap.
+//    static std::string * gSomeString = 0;       // OK, alloc at init, delete at term.
+//    static std::vector<int> * gSomeVector = 0;  // OK, alloc at init, delete at term.
+//
+// =================================================================================================
+
+class XMPFiles {
+public:
+	static bool Initialize(XMP_OptionBits options, const char* pluginFolder, const char* plugins = NULL);
+	static void Terminate();
+
+	static void GetVersionInfo(XMP_VersionInfo * info);
+
+	static bool GetFormatInfo(XMP_FileFormat format, XMP_OptionBits * flags = 0);
+
+	static bool GetFileModDate(
+		XMP_StringPtr filePath,
+		XMP_DateTime * modDate,
+		XMP_FileFormat * format = 0,
+		XMP_OptionBits options = 0);
+
+	static XMP_FileFormat CheckFileFormat(XMP_StringPtr filePath);
+	static XMP_FileFormat CheckPackageFormat(XMP_StringPtr folderPath);
+
+	static bool GetAssociatedResources ( 
+		XMP_StringPtr              filePath,
+        std::vector<std::string> * resourceList,
+        XMP_FileFormat             format  = kXMP_UnknownFile , 
+        XMP_OptionBits             options  = 0 );
+
+	static bool IsMetadataWritable ( 
+		XMP_StringPtr  filePath,
+        XMP_Bool *     writable,    
+        XMP_FileFormat format  = kXMP_UnknownFile ,
+        XMP_OptionBits options  = 0 );
+
+	static void SetDefaultProgressCallback(const XMP_ProgressTracker::CallbackInfo & cbInfo);
+	static void SetDefaultErrorCallback(XMPFiles_ErrorCallbackWrapper wrapperProc,
+		XMPFiles_ErrorCallbackProc clientProc,
+		void * context,
+		XMP_Uns32 limit);
+
+	XMPFiles();
+	virtual ~XMPFiles();
+
+	bool OpenFile(XMP_StringPtr filePath, XMP_FileFormat format = kXMP_UnknownFile, XMP_OptionBits openFlags = 0);
+	bool OpenFile(const Common::XMPFileHandlerInfo & hdlInfo, XMP_StringPtr filePath, XMP_OptionBits openFlags = 0);
+
+#if XMP_StaticBuild	// ! Client XMP_IO objects can only be used in static builds.
+	bool OpenFile(XMP_IO * clientIO, XMP_FileFormat format = kXMP_UnknownFile, XMP_OptionBits openFlags = 0);
+	bool OpenFile(const Common::XMPFileHandlerInfo & hdlInfo, XMP_IO * clientIO, XMP_OptionBits openFlags = 0);
+#endif
+
+	void CloseFile(XMP_OptionBits closeFlags = 0);
+
+	bool GetFileInfo(
+		XMP_StringPtr * filePath = 0,
+		XMP_StringLen * filePathLen = 0,
+		XMP_OptionBits * openFlags = 0,
+		XMP_FileFormat * format = 0,
+		XMP_OptionBits * handlerFlags = 0 ) const;
+
+	bool GetXMP(
+		SXMPMeta * xmpObj = 0,
+		XMP_StringPtr * xmpPacket = 0,
+		XMP_StringLen * xmpPacketLen = 0,
+		XMP_PacketInfo * packetInfo = 0);
+
+	void PutXMP(const SXMPMeta & xmpObj);
+	void PutXMP(XMP_StringPtr xmpPacket, XMP_StringLen xmpPacketLen = kXMP_UseNullTermination);
+
+	bool CanPutXMP(const SXMPMeta & xmpObj);
+	bool CanPutXMP(XMP_StringPtr xmpPacket, XMP_StringLen xmpPacketLen = kXMP_UseNullTermination);
+
+	void SetAbortProc(XMP_AbortProc abortProc, void * abortArg);
+
+	void SetProgressCallback(const XMP_ProgressTracker::CallbackInfo & cbInfo);
+
+	void SetErrorCallback(
+		XMPFiles_ErrorCallbackWrapper wrapperProc,
+		XMPFiles_ErrorCallbackProc clientProc,
+		void * context,
+		XMP_Uns32 limit);
+	void ResetErrorCallbackLimit(XMP_Uns32 limit);
+
+	class ErrorCallbackInfo : public GenericErrorCallback {
+	public:
+		XMPFiles_ErrorCallbackWrapper	wrapperProc;
+		XMPFiles_ErrorCallbackProc		clientProc;
+		void *							context;
+		std::string						filePath;
+
+		ErrorCallbackInfo()
+			: wrapperProc(0)
+			, clientProc(0)
+			, context(0) {};
+
+		void Clear() {
+			this->wrapperProc = 0; this->clientProc = 0; this->context = 0;
+			GenericErrorCallback::Clear(); 
+		};
+
+		bool CanNotify() const;
+
+		bool ClientCallbackWrapper(
+			XMP_StringPtr filePath,
+			XMP_ErrorSeverity severity,
+			XMP_Int32 cause,
+			XMP_StringPtr messsage) const;
+	};
+
+	inline bool UsesClientIO() { return this->filePath.empty(); };
+	inline bool UsesLocalIO() { return ( ! this->UsesClientIO() ); };
+	inline void SetFilePath(XMP_StringPtr _filePath) { filePath = _filePath; errorCallback.filePath = _filePath; }
+	inline void ClearFilePath() { filePath.clear(); errorCallback.filePath.clear(); }
+	inline const std::string& GetFilePath() { return filePath; }
+
+	// Leave this data public so file handlers can see it.
+	XMP_Int32				clientRefs;	// ! Must be signed to allow decrement from zero.
+	XMP_ReadWriteLock		lock;
+	XMP_FileFormat			format;
+	XMP_IO *				ioRef;		// Non-zero if a file is open.
+	XMP_OptionBits			openFlags;
+	XMPFileHandler *		handler;	// Non-null if a file is open.
+	void *					tempPtr;	// For use between the CheckProc and handler creation.
+	XMP_Uns32				tempUI32;
+	XMP_AbortProc			abortProc;
+	void *					abortArg;
+	XMP_ProgressTracker *	progressTracker;
+	ErrorCallbackInfo		errorCallback;
+
+private:
+	std::string				filePath;	// Empty for client-managed I/O.
+};
+
+bool ErrorCallbackForXMPMeta(void * context, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr message);
+
+#endif /* __XMPFiles_hpp__ */
diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp
new file mode 100644
index 0000000..cf4c768
--- /dev/null
+++ b/XMPFiles/source/XMPFiles_Impl.cpp
@@ -0,0 +1,520 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "XMPFiles/source/XMPFiles_Impl.hpp"
+#include "source/XIO.hpp"
+
+#include "source/UnicodeConversions.hpp"
+
+using namespace std;
+
+// Internal code should be using #if with XMP_MacBuild, XMP_WinBuild, or XMP_UNIXBuild.
+// This is a sanity check in case of accidental use of *_ENV. Some clients use the poor
+// practice of defining the *_ENV macro with an empty value.
+#if defined ( MAC_ENV )
+	#if ! MAC_ENV
+		#error "MAC_ENV must be defined so that \"#if MAC_ENV\" is true"
+	#endif
+#elif defined ( WIN_ENV )
+	#if ! WIN_ENV
+		#error "WIN_ENV must be defined so that \"#if WIN_ENV\" is true"
+	#endif
+#elif defined ( UNIX_ENV )
+	#if ! UNIX_ENV
+		#error "UNIX_ENV must be defined so that \"#if UNIX_ENV\" is true"
+	#endif
+#endif
+
+// =================================================================================================
+/// \file XMPFiles_Impl.cpp
+/// \brief ...
+///
+/// This file ...
+///
+// =================================================================================================
+
+#if ! XMP_StaticBuild
+	#include "public/include/XMP.incl_cpp"
+#endif
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4290 )	// C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+bool ignoreLocalText = false;
+
+XMP_FileFormat voidFileFormat = 0;	// Used as sink for unwanted output parameters.
+
+#if ! XMP_StaticBuild
+	XMP_PacketInfo voidPacketInfo;
+	void *         voidVoidPtr    = 0;
+	XMP_StringPtr  voidStringPtr  = 0;
+	XMP_StringLen  voidStringLen  = 0;
+	XMP_OptionBits voidOptionBits = 0;
+#endif
+
+// =================================================================================================
+
+// Add all known mappings, multiple mappings (tif, tiff) are OK.
+const FileExtMapping kFileExtMap[] =
+	{ { "pdf",  kXMP_PDFFile },
+	  { "ps",   kXMP_PostScriptFile },
+	  { "eps",  kXMP_EPSFile },
+
+	  { "jpg",  kXMP_JPEGFile },
+	  { "jpeg", kXMP_JPEGFile },
+	  { "jpx",  kXMP_JPEG2KFile },
+	  { "tif",  kXMP_TIFFFile },
+	  { "tiff", kXMP_TIFFFile },
+	  { "dng",  kXMP_TIFFFile },	// DNG files are well behaved TIFF.
+	  { "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 },
+	  { "webp", kXMP_WEBPFile },
+	  { "mp3",  kXMP_MP3File },
+	  { "mp4",  kXMP_MPEG4File },
+	  { "m4v",  kXMP_MPEG4File },
+	  { "m4a",  kXMP_MPEG4File },
+	  { "f4v",  kXMP_MPEG4File },
+	  { "ses",  kXMP_SESFile },
+	  { "cel",  kXMP_CELFile },
+	  { "wma",  kXMP_WMAVFile },
+	  { "wmv",  kXMP_WMAVFile },
+	  { "mxf",  kXMP_MXFFile },
+	  { "r3d",  kXMP_REDFile },
+
+	  { "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 },
+	  { "aepx", kXMP_AEProjectFile },
+	  { "aet",  kXMP_AEProjTemplateFile },
+	  { "ffx",  kXMP_AEFilterPresetFile },
+	  { "ncor", kXMP_EncoreProjectFile },
+	  { "prproj", kXMP_PremiereProjectFile },
+	  { "prtl", kXMP_PremiereTitleFile },
+	  { "ucf", kXMP_UCFFile },
+	  { "xfl", kXMP_UCFFile },
+	  { "pdfxml", kXMP_UCFFile },
+	  { "mars", kXMP_UCFFile },
+	  { "idml", kXMP_UCFFile },
+	  { "idap", kXMP_UCFFile },
+	  { "icap", kXMP_UCFFile },
+	  { "", 0 } };	// ! Must be last as a sentinel.
+
+// Files known to contain XMP but have no smart handling, here or elsewhere.
+const char * kKnownScannedFiles[] =
+	{
+	  "ai",		// Illustrator, actually a PDF file.
+	  "ait",	// Illustrator template, actually a PDF file.
+	  "svg",	// SVG, an XML file.
+	  "aet",	// After Effects template project file.
+	  "ffx",	// After Effects filter preset file.
+	  "aep",	// After Effects project file in proprietary format
+	  "aepx",	// After Effects project file in XML format
+	  "inx",	// InDesign interchange, an XML file.
+	  "inds",	// InDesign snippet, an XML file.
+	  "inpk",	// InDesign package for GoLive, a text file (not XML).
+	  "incd",	// InCopy story, an XML file.
+	  "inct",	// InCopy template, an XML file.
+	  "incx",	// InCopy interchange, an XML file.
+	  "fm",		// FrameMaker file, proprietary format.
+	  "book",	// FrameMaker book, proprietary format.
+	  "icml",	// an inCopy (inDesign) format
+	  "icmt",	// an inCopy (inDesign) format
+	  "idms",	// an inCopy (inDesign) format
+	  0 };		// ! Keep a 0 sentinel at the end.
+
+
+// Extensions that XMPFiles never handles.
+const char * kKnownRejectedFiles[] =
+	{
+		// RAW files
+		"cr2", "erf", "fff", "dcr", "kdc", "mos", "mfw", "mef",
+		"raw", "nef", "orf", "pef", "arw", "sr2", "srf", "sti",
+		"3fr", "rwl", "crw", "sraw", "mos", "mrw", "nrw", "rw2",
+		"c3f",
+		// UCF subformats
+		"air",
+		// Others
+	  0 };	// ! Keep a 0 sentinel at the end.
+
+// =================================================================================================
+
+// =================================================================================================
+
+// =================================================================================================
+// GetPacketCharForm
+// =================
+//
+// The first character must be U+FEFF or ASCII, typically '<' for an outermost element, initial
+// processing instruction, or XML declaration. The second character can't be U+0000.
+// The possible input sequences are:
+//   Cases with U+FEFF
+//      EF BB BF -- - UTF-8
+//      FE FF -- -- - Big endian UTF-16
+//      00 00 FE FF - Big endian UTF 32
+//      FF FE 00 00 - Little endian UTF-32
+//      FF FE -- -- - Little endian UTF-16
+//   Cases with ASCII
+//      nn mm -- -- - UTF-8 -
+//      00 00 00 nn - Big endian UTF-32
+//      00 nn -- -- - Big endian UTF-16
+//      nn 00 00 00 - Little endian UTF-32
+//      nn 00 -- -- - Little endian UTF-16
+
+static XMP_Uns8 GetPacketCharForm ( XMP_StringPtr packetStr, XMP_StringLen packetLen )
+{
+	XMP_Uns8   charForm = kXMP_CharUnknown;
+	XMP_Uns8 * unsBytes = (XMP_Uns8*)packetStr;	// ! Make sure comparisons are unsigned.
+
+	if ( packetLen < 2 ) return kXMP_Char8Bit;
+
+	if ( packetLen < 4 ) {
+
+		// These cases are based on the first 2 bytes:
+		//   00 nn Big endian UTF-16
+		//   nn 00 Little endian UTF-16
+		//   FE FF Big endian UTF-16
+		//   FF FE Little endian UTF-16
+		//   Otherwise UTF-8
+
+		if ( packetStr[0] == 0 ) return kXMP_Char16BitBig;
+		if ( packetStr[1] == 0 ) return kXMP_Char16BitLittle;
+		if ( CheckBytes ( packetStr, "\xFE\xFF", 2 ) ) return kXMP_Char16BitBig;
+		if ( CheckBytes ( packetStr, "\xFF\xFE", 2 ) ) return kXMP_Char16BitLittle;
+		return kXMP_Char8Bit;
+
+	}
+
+	// If we get here the packet is at least 4 bytes, could be any form.
+
+	if ( unsBytes[0] == 0 ) {
+
+		// These cases are:
+		//   00 nn -- -- - Big endian UTF-16
+		//   00 00 00 nn - Big endian UTF-32
+		//   00 00 FE FF - Big endian UTF 32
+
+		if ( unsBytes[1] != 0 ) {
+			charForm = kXMP_Char16BitBig;			// 00 nn
+		} else {
+			if ( (unsBytes[2] == 0) && (unsBytes[3] != 0) ) {
+				charForm = kXMP_Char32BitBig;		// 00 00 00 nn
+			} else if ( (unsBytes[2] == 0xFE) && (unsBytes[3] == 0xFF) ) {
+				charForm = kXMP_Char32BitBig;		// 00 00 FE FF
+			}
+		}
+
+	} else {
+
+		// These cases are:
+		//   FE FF -- -- - Big endian UTF-16, FE isn't valid UTF-8
+		//   FF FE 00 00 - Little endian UTF-32, FF isn't valid UTF-8
+		//   FF FE -- -- - Little endian UTF-16
+		//   nn mm -- -- - UTF-8, includes EF BB BF case
+		//   nn 00 00 00 - Little endian UTF-32
+		//   nn 00 -- -- - Little endian UTF-16
+
+		if ( unsBytes[0] == 0xFE ) {
+			if ( unsBytes[1] == 0xFF ) charForm = kXMP_Char16BitBig;	// FE FF
+		} else if ( unsBytes[0] == 0xFF ) {
+			if ( unsBytes[1] == 0xFE ) {
+				if ( (unsBytes[2] == 0) && (unsBytes[3] == 0) ) {
+					charForm = kXMP_Char32BitLittle;	// FF FE 00 00
+				} else {
+					charForm = kXMP_Char16BitLittle;	// FF FE
+				}
+			}
+		} else if ( unsBytes[1] != 0 ) {
+			charForm = kXMP_Char8Bit;					// nn mm
+		} else {
+			if ( (unsBytes[2] == 0) && (unsBytes[3] == 0) ) {
+				charForm = kXMP_Char32BitLittle;		// nn 00 00 00
+			} else {
+				charForm = kXMP_Char16BitLittle;		// nn 00
+			}
+		}
+
+	}
+
+	//	XMP_Assert ( charForm != kXMP_CharUnknown );
+	return charForm;
+
+}	// GetPacketCharForm
+
+// =================================================================================================
+// FillPacketInfo
+// ==============
+//
+// If a packet wrapper is present, the the packet string is roughly:
+//   <?xpacket begin= ...?>
+//   <outer-XML-element>
+//     ... more XML ...
+//   </outer-XML-element>
+//   ... whitespace padding ...
+//   <?xpacket end='.'?>
+
+// The 8-bit form is 14 bytes, the 16-bit form is 28 bytes, the 32-bit form is 56 bytes.
+#define k8BitTrailer  "<?xpacket end="
+#define k16BitTrailer "<\0?\0x\0p\0a\0c\0k\0e\0t\0 \0e\0n\0d\0=\0"
+#define k32BitTrailer "<\0\0\0?\0\0\0x\0\0\0p\0\0\0a\0\0\0c\0\0\0k\0\0\0e\0\0\0t\0\0\0 \0\0\0e\0\0\0n\0\0\0d\0\0\0=\0\0\0"
+static XMP_StringPtr kPacketTrailiers[3] = { k8BitTrailer, k16BitTrailer, k32BitTrailer };
+
+void FillPacketInfo ( const std::string & packet, XMP_PacketInfo * info )
+{
+	XMP_StringPtr packetStr = packet.c_str();
+	XMP_StringLen packetLen = (XMP_StringLen) packet.size();
+	if ( packetLen == 0 ) return;
+
+	info->charForm = GetPacketCharForm ( packetStr, packetLen );
+	XMP_StringLen charSize = XMP_GetCharSize ( info->charForm );
+
+	// Look for a packet wrapper. For our purposes, we can be lazy and just look for the trailer PI.
+	// If that is present we'll assume that a recognizable header is present. First do a bytewise
+	// search for '<', then a char sized comparison for the start of the trailer. We don't really
+	// care about big or little endian here. We're looking for ASCII bytes with zeroes between.
+	// Shorten the range comparisons (n*charSize) by 1 to easily tolerate both big and little endian.
+
+	XMP_StringLen padStart, padEnd;
+	XMP_StringPtr packetTrailer = kPacketTrailiers [ charSize>>1 ];
+
+	padEnd = packetLen - 1;
+	for ( ; padEnd > 0; --padEnd ) if ( packetStr[padEnd] == '<' ) break;
+	if ( (packetStr[padEnd] != '<') || ((packetLen - padEnd) < (18*charSize)) ) return;
+	if ( ! CheckBytes ( &packetStr[padEnd], packetTrailer, (13*charSize) ) ) return;
+
+	info->hasWrapper = true;
+
+	char rwFlag = packetStr [padEnd + 15*charSize];
+	if ( rwFlag == 'w' ) info->writeable = true;
+
+	// Look for the start of the padding, right after the last XML end tag.
+
+	padStart = padEnd;	// Don't do the -charSize here, might wrap below zero.
+	for ( ; padStart >= charSize; padStart -= charSize ) if ( packetStr[padStart] == '>' ) break;
+	if ( padStart < charSize ) return;
+	padStart += charSize;	// The padding starts after the '>'.
+
+	info->padSize = padEnd - padStart;	// We want bytes of padding, not character units.
+
+}	// FillPacketInfo
+
+// =================================================================================================
+// ReadXMPPacket
+// =============
+
+void ReadXMPPacket ( XMPFileHandler * handler )
+{
+	XMP_IO* fileRef   = handler->parent->ioRef;
+	std::string & xmpPacket = handler->xmpPacket;
+	XMP_StringLen packetLen = handler->packetInfo.length;
+
+	if ( packetLen == 0 ) XMP_Throw ( "ReadXMPPacket - No XMP packet", kXMPErr_BadXMP );
+
+	xmpPacket.erase();
+	xmpPacket.reserve ( packetLen );
+	xmpPacket.append ( packetLen, ' ' );
+
+	XMP_StringPtr packetStr = XMP_StringPtr ( xmpPacket.c_str() );	// Don't set until after reserving the space!
+
+	fileRef->Seek ( handler->packetInfo.offset, kXMP_SeekFromStart );
+	fileRef->ReadAll ( (char*)packetStr, packetLen );
+
+}	// ReadXMPPacket
+
+// =================================================================================================
+// XMPFileHandler::GetFileModDate
+// ==============================
+//
+// The base implementation is only for typical embedding handlers. It returns the modification date
+// of the named file.
+
+bool XMPFileHandler::GetFileModDate ( XMP_DateTime * modDate )
+{
+
+	XMP_OptionBits flags = this->handlerFlags;
+	if ( (flags & kXMPFiles_HandlerOwnsFile) ||
+		 (flags & kXMPFiles_UsesSidecarXMP) ||
+		 (flags & kXMPFiles_FolderBasedFormat) ) {
+		XMP_Throw ( "Base implementation of GetFileModDate only for typical embedding handlers", kXMPErr_InternalFailure );
+	}
+	
+	if ( this->parent->GetFilePath().empty() ) {
+		XMP_Throw ( "GetFileModDate cannot be used with client-provided I/O", kXMPErr_InternalFailure );
+	}
+	
+	return Host_IO::GetModifyDate ( this->parent->GetFilePath().c_str(), modDate );
+
+}	// XMPFileHandler::GetFileModDate
+
+// =================================================================================================
+// XMPFileHandler::FillMetadataFiles
+// ==============================
+//
+// The base implementation is only for files having embedded metadata for which the same file will
+// be returned.
+
+void XMPFileHandler::FillMetadataFiles ( std::vector<std::string> * metadataFiles )
+{
+	XMP_OptionBits flags = this->handlerFlags;
+	if ( (flags & kXMPFiles_HandlerOwnsFile) ||
+		 (flags & kXMPFiles_UsesSidecarXMP) ||
+		 (flags & kXMPFiles_FolderBasedFormat) ) {
+		XMP_Throw ( "Base implementation of FillMetadataFiles only for typical embedding handlers", kXMPErr_InternalFailure );
+	}
+	
+	if ( this->parent->GetFilePath().empty() ) {
+		XMP_Throw ( "FillMetadataFiles cannot be used with client-provided I/O", kXMPErr_InternalFailure );
+	}
+	
+	metadataFiles->push_back ( std::string ( this->parent->GetFilePath().c_str() ) );
+}	// XMPFileHandler::FillMetadataFiles
+
+// =================================================================================================
+// XMPFileHandler::FillAssociatedResources
+// =======================================
+//
+// The base implementation is only for files having embedded metadata for which the same file will
+// be returned as the associated resource.
+// 
+
+void XMPFileHandler::FillAssociatedResources ( std::vector<std::string> * metadataFiles )
+{
+	XMP_OptionBits flags = this->handlerFlags;
+	if ( (flags & kXMPFiles_HandlerOwnsFile) ||
+		 (flags & kXMPFiles_UsesSidecarXMP) ||
+		 (flags & kXMPFiles_FolderBasedFormat) ) {
+		XMP_Throw ( "GetAssociatedResources is not implemented for this file format", kXMPErr_InternalFailure );
+	}
+	
+	if ( this->parent->GetFilePath().empty() ) {
+		XMP_Throw ( "GetAssociatedResources cannot be used with client-provided I/O", kXMPErr_InternalFailure );
+	}
+	
+	metadataFiles->push_back ( std::string ( this->parent->GetFilePath().c_str() ) );
+}	// XMPFileHandler::FillAssociatedResources
+
+// =================================================================================================
+// XMPFileHandler::IsMetadataWritable
+// =======================================
+//
+// The base implementation is only for files having embedded metadata and it checks whether that 
+// file is writable or no.Returns true if the file is writable. 
+// 
+bool XMPFileHandler::IsMetadataWritable ( )
+{
+	XMP_OptionBits flags = this->handlerFlags;
+	if ( (flags & kXMPFiles_HandlerOwnsFile) ||
+		 (flags & kXMPFiles_UsesSidecarXMP)  ||
+		 (flags & kXMPFiles_FolderBasedFormat) ) {
+		XMP_Throw ( "IsMetadataWritable is not implemented for this file format", kXMPErr_InternalFailure );
+	}
+
+	if ( this->parent->GetFilePath().empty() ) {
+		XMP_Throw ( "IsMetadataWritable cannot be used with client-provided I/O", kXMPErr_InternalFailure );
+	}
+
+	try {
+		return Host_IO::Writable( this->parent->GetFilePath().c_str() );
+	} catch ( ... ) {
+
+	}
+	return false;
+}
+
+// =================================================================================================
+// XMPFileHandler::ProcessXMP
+// ==========================
+//
+// This base implementation just parses the XMP. If the derived handler does reconciliation then it
+// must have its own implementation of ProcessXMP.
+
+void XMPFileHandler::ProcessXMP()
+{
+
+	if ( (!this->containsXMP) || this->processedXMP ) return;
+
+	if ( this->handlerFlags & kXMPFiles_CanReconcile ) {
+		XMP_Throw ( "Reconciling file handlers must implement ProcessXMP", kXMPErr_InternalFailure );
+	}
+
+	SXMPUtils::RemoveProperties ( &this->xmpObj, 0, 0, kXMPUtil_DoAllProperties );
+	this->xmpObj.ParseFromBuffer ( this->xmpPacket.c_str(), (XMP_StringLen)this->xmpPacket.size() );
+	this->processedXMP = true;
+
+}	// XMPFileHandler::ProcessXMP
+
+// =================================================================================================
+// XMPFileHandler::GetSerializeOptions
+// ===================================
+//
+// This base implementation just selects compact serialization. The character form and padding/in-place
+// settings are added in the common code before calling SerializeToBuffer.
+
+XMP_OptionBits XMPFileHandler::GetSerializeOptions()
+{
+
+	return kXMP_UseCompactFormat;
+
+}	// XMPFileHandler::GetSerializeOptions
+
+// =================================================================================================
+// XMPFileHandler::NotifyClient
+// ===================================
+//
+// Generic function for all the file handlers to replace existing exception throws
+//
+void XMPFileHandler::NotifyClient(GenericErrorCallback * errCBptr, XMP_ErrorSeverity severity, XMP_Error & error)
+{	
+	if (errCBptr)
+		errCBptr->NotifyClient( severity, error );
+	else {
+		if ( severity != kXMPErrSev_Recoverable )
+			throw error;
+	}
+}
+// =================================================================================================
diff --git a/XMPFiles/source/XMPFiles_Impl.hpp b/XMPFiles/source/XMPFiles_Impl.hpp
new file mode 100644
index 0000000..c67d391
--- /dev/null
+++ b/XMPFiles/source/XMPFiles_Impl.hpp
@@ -0,0 +1,353 @@
+#ifndef __XMPFiles_Impl_hpp__
+#define __XMPFiles_Impl_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! Must be the first #include!
+#include "public/include/XMP_Const.h"
+#include "build/XMP_BuildInfo.h"
+#include "source/XMP_LibUtils.hpp"
+#include "source/EndianUtils.hpp"
+
+#include <string>
+#define TXMP_STRING_TYPE std::string
+#define XMP_INCLUDE_XMPFILES 1
+#include "public/include/XMP.hpp"
+
+#include "XMPFiles/source/XMPFiles.hpp"
+#include "public/include/XMP_IO.hpp"
+#include "source/Host_IO.hpp"
+
+#include <vector>
+#include <map>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
+
+#if XMP_WinBuild
+
+	#define snprintf _snprintf
+
+#else
+
+	#if XMP_MacBuild
+		#include <CoreServices/CoreServices.h>
+	#endif
+	
+	// POSIX headers for both Mac and generic UNIX.
+	#include <fcntl.h>
+	#include <unistd.h>
+	#include <dirent.h>
+	#include <sys/stat.h>
+	#include <sys/types.h>
+
+#endif
+
+// =================================================================================================
+// General global variables and macros
+// ===================================
+
+typedef std::vector<XMP_Uns8> RawDataBlock;
+
+extern bool ignoreLocalText;
+
+#ifndef EnablePhotoHandlers
+	#define EnablePhotoHandlers 1
+#endif
+
+#ifndef EnableDynamicMediaHandlers
+	#define EnableDynamicMediaHandlers 1
+#endif
+
+#ifndef EnableMiscHandlers
+	#define EnableMiscHandlers 1
+#endif
+
+#ifndef EnablePacketScanning
+	#define EnablePacketScanning 1
+#endif
+
+#ifndef EnablePluginManager
+	#if XMP_iOSBuild
+		#define EnablePluginManager 0
+	#else
+		#define EnablePluginManager 1
+	#endif
+#endif
+
+extern XMP_Int32 sXMPFilesInitCount;
+
+#ifndef GatherPerformanceData
+	#define GatherPerformanceData 0
+#endif
+
+#if ! GatherPerformanceData
+
+	#define StartPerfCheck(proc,info)	/* do nothing */
+	#define EndPerfCheck(proc)	/* do nothing */
+
+#else
+
+	#include "PerfUtils.hpp"
+	
+	enum {
+		kAPIPerf_OpenFile,
+		kAPIPerf_CloseFile,
+		kAPIPerf_GetXMP,
+		kAPIPerf_PutXMP,
+		kAPIPerf_CanPutXMP,
+		kAPIPerfProcCount	// Last, count of the procs.
+	};
+	
+	static const char* kAPIPerfNames[] =
+	{ "OpenFile", "CloseFile", "GetXMP", "PutXMP", "CanPutXMP", 0 };
+	
+	struct APIPerfItem {
+		XMP_Uns8    whichProc;
+		double      elapsedTime;
+		XMPFilesRef xmpFilesRef;
+		std::string extraInfo;
+		APIPerfItem ( XMP_Uns8 proc, double time, XMPFilesRef ref, const char * info )
+			: whichProc(proc), elapsedTime(time), xmpFilesRef(ref), extraInfo(info) {};
+	};
+	
+	typedef std::vector<APIPerfItem> APIPerfCollection;
+	
+	extern APIPerfCollection* sAPIPerf;
+	
+	#define StartPerfCheck(proc,info)	\
+		sAPIPerf->push_back ( APIPerfItem ( proc, 0.0, xmpFilesRef, info ) );	\
+		APIPerfItem & thisPerf = sAPIPerf->back();								\
+		PerfUtils::MomentValue startTime, endTime;								\
+		try {																	\
+		startTime = PerfUtils::NoteThisMoment();
+	
+	#define EndPerfCheck(proc)	\
+		endTime = PerfUtils::NoteThisMoment();										\
+		thisPerf.elapsedTime = PerfUtils::GetElapsedSeconds ( startTime, endTime );	\
+	} catch ( ... ) {																\
+		endTime = PerfUtils::NoteThisMoment();										\
+		thisPerf.elapsedTime = PerfUtils::GetElapsedSeconds ( startTime, endTime );	\
+		thisPerf.extraInfo += "  ** THROW **";										\
+		throw;																		\
+	}
+
+#endif
+
+extern XMP_FileFormat voidFileFormat;	// Used as sink for unwanted output parameters.
+extern XMP_PacketInfo voidPacketInfo;
+extern void *         voidVoidPtr;
+extern XMP_StringPtr  voidStringPtr;
+extern XMP_StringLen  voidStringLen;
+extern XMP_OptionBits voidOptionBits;
+
+#define kUTF8_PacketStart (const XMP_Uns8 *)"<?xpacket begin="
+#define kUTF8_PacketID    (const XMP_Uns8 *)"W5M0MpCehiHzreSzNTczkc9d"
+static const size_t     kUTF8_PacketHeaderLen = 51;	// ! strlen ( "<?xpacket begin='xxx' id='W5M0MpCehiHzreSzNTczkc9d'" )
+
+#define kUTF8_PacketTrailer    (const XMP_Uns8 *)"<?xpacket end=\"w\"?>"
+static const size_t     kUTF8_PacketTrailerLen = 19;	// ! strlen ( kUTF8_PacketTrailer )
+
+struct FileExtMapping {
+	XMP_StringPtr  ext;
+	XMP_FileFormat format;
+};
+
+extern const FileExtMapping kFileExtMap[];
+extern const char * kKnownScannedFiles[];
+extern const char * kKnownRejectedFiles[];
+
+class CharStarLess {	// Comparison object for the genre code maps.
+public:
+	bool operator() ( const char * left, const char * right ) const {
+		int order = strcmp ( left, right );
+		return order < 0;
+	}
+};
+
+typedef std::map < const char *, const char *, CharStarLess >		ID3GenreMap;
+extern ID3GenreMap* kMapID3GenreCodeToName;	// Storage defined in ID3_Support.cpp.
+extern ID3GenreMap* kMapID3GenreNameToCode;
+
+#define Uns8Ptr(p) ((XMP_Uns8 *) (p))
+
+#define IsNewline( ch )    ( ((ch) == kLF) || ((ch) == kCR) )
+#define IsSpaceOrTab( ch ) ( ((ch) == ' ') || ((ch) == kTab) )
+#define IsWhitespace( ch ) ( IsSpaceOrTab ( ch ) || IsNewline ( ch ) )
+
+static inline void MakeLowerCase ( std::string * str )
+{
+	for ( size_t i = 0, limit = str->size(); i < limit; ++i ) {
+		char ch = (*str)[i];
+		if ( ('A' <= ch) && (ch <= 'Z') ) (*str)[i] += 0x20;
+	}
+}
+
+static inline void MakeUpperCase ( std::string * str )
+{
+	for ( size_t i = 0, limit = str->size(); i < limit; ++i ) {
+		char ch = (*str)[i];
+		if ( ('a' <= ch) && (ch <= 'z') ) (*str)[i] -= 0x20;
+	}
+}
+
+#define XMP_LitMatch(s,l)		(strcmp((s),(l)) == 0)
+#define XMP_LitNMatch(s,l,n)	(strncmp((s),(l),(n)) == 0)
+
+// =================================================================================================
+// Support for call tracing
+// ========================
+
+#ifndef XMP_TraceFilesCalls
+	#define XMP_TraceFilesCalls			0
+	#define XMP_TraceFilesCallsToFile	0
+#endif
+
+#if XMP_TraceFilesCalls
+
+	#undef AnnounceThrow
+	#undef AnnounceCatch
+	
+	#undef AnnounceEntry
+	#undef AnnounceNoLock
+	#undef AnnounceExit
+	
+	extern FILE * xmpFilesLog;
+	
+	#define AnnounceThrow(msg)	\
+		fprintf ( xmpFilesLog, "XMP_Throw: %s\n", msg ); fflush ( xmpFilesLog )
+	#define AnnounceCatch(msg)	\
+		fprintf ( xmpFilesLog, "Catch in %s: %s\n", procName, msg ); fflush ( xmpFilesLog )
+	
+	#define AnnounceEntry(proc)			\
+		const char * procName = proc;	\
+		fprintf ( xmpFilesLog, "Entering %s\n", procName ); fflush ( xmpFilesLog )
+	#define AnnounceNoLock(proc)		\
+		const char * procName = proc;	\
+		fprintf ( xmpFilesLog, "Entering %s (no lock)\n", procName ); fflush ( xmpFilesLog )
+	#define AnnounceExit()	\
+		fprintf ( xmpFilesLog, "Exiting %s\n", procName ); fflush ( xmpFilesLog )
+
+#endif
+
+// =================================================================================================
+// Support for memory leak tracking
+// ================================
+
+#ifndef TrackMallocAndFree
+	#define TrackMallocAndFree 0
+#endif
+
+#if TrackMallocAndFree
+
+	static void* ChattyMalloc ( size_t size )
+	{
+		void* ptr = malloc ( size );
+		fprintf ( stderr, "Malloc %d bytes @ %.8X\n", size, ptr );
+		return ptr;
+	}
+	
+	static void ChattyFree ( void* ptr )
+	{
+		fprintf ( stderr, "Free @ %.8X\n", ptr );
+		free ( ptr );
+	}
+	
+	#define malloc(s) ChattyMalloc ( s )
+	#define free(p) ChattyFree ( p )
+
+#endif
+
+// =================================================================================================
+// FileHandler declarations
+// ========================
+
+extern void ReadXMPPacket ( XMPFileHandler * handler );
+
+extern void FillPacketInfo ( const XMP_VarString & packet, XMP_PacketInfo * info );
+
+class XMPFileHandler {	// See XMPFiles.hpp for usage notes.
+public:
+
+#define DefaultCTorPresets							\
+	handlerFlags(0), stdCharForm(kXMP_CharUnknown),	\
+	containsXMP(false), processedXMP(false), needsUpdate(false)
+
+	XMPFileHandler() : parent(0), DefaultCTorPresets {};
+	XMPFileHandler (XMPFiles * _parent) : parent(_parent), DefaultCTorPresets
+	{
+		xmpObj.SetErrorCallback(ErrorCallbackForXMPMeta, &parent->errorCallback);
+	};
+
+	virtual ~XMPFileHandler() {};	// ! The specific handler is responsible for tnailInfo.tnailImage.
+	
+	virtual bool GetFileModDate ( XMP_DateTime * modDate );	// The default implementation is for embedding handlers.
+	virtual void FillMetadataFiles ( std::vector<std::string> * metadataFiles );
+	virtual void FillAssociatedResources ( std::vector<std::string> * resourceList );
+	virtual bool IsMetadataWritable ( );
+
+	virtual void CacheFileData() = 0;
+	virtual void ProcessXMP();		// The default implementation just parses the XMP.
+
+	virtual XMP_OptionBits GetSerializeOptions();	// The default is compact.
+
+	virtual void UpdateFile ( bool doSafeUpdate ) = 0;
+	virtual void WriteTempFile ( XMP_IO* tempRef ) = 0;
+
+	static void NotifyClient(GenericErrorCallback * errCBptr, XMP_ErrorSeverity severity, XMP_Error & error);
+
+	// ! Leave the data members public so common code can see them.
+
+	XMPFiles *     parent;			// Let's the handler see the file info.
+	XMP_OptionBits handlerFlags;	// Capabilities of this handler.
+	XMP_Uns8       stdCharForm;		// The standard character form for output.
+
+	bool containsXMP;		// True if the file has XMP or PutXMP has been called.
+	bool processedXMP;		// True if the XMP is parsed and reconciled.
+	bool needsUpdate;		// True if the file needs to be updated.
+
+	XMP_PacketInfo packetInfo;	// ! This is always info about the packet in the file, if any!
+	std::string    xmpPacket;	// ! This is the current XMP, updated by XMPFiles::PutXMP.
+	SXMPMeta       xmpObj;
+
+};	// XMPFileHandler
+
+typedef XMPFileHandler * (* XMPFileHandlerCTor) ( XMPFiles * parent );
+
+typedef bool (* CheckFileFormatProc ) ( XMP_FileFormat format,
+									   XMP_StringPtr  filePath,
+									   XMP_IO *       fileRef,
+									   XMPFiles *     parent );
+
+typedef bool (*CheckFolderFormatProc ) ( XMP_FileFormat format,
+										const std::string & rootPath,
+										const std::string & gpName,
+										const std::string & parentName,
+										const std::string & leafName,
+										XMPFiles * parent );
+
+// =================================================================================================
+
+// -------------------------------------------------------------------------------------------------
+
+static inline bool CheckBytes ( const void * left, const void * right, size_t length )
+{
+	return (memcmp ( left, right, length ) == 0);
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline bool CheckCString ( const void * left, const void * right )
+{
+	return (strcmp ( (char*)left, (char*)right ) == 0);
+}
+
+#endif /* __XMPFiles_Impl_hpp__ */
diff --git a/XMPFilesPlugins/Makefile.am b/XMPFilesPlugins/Makefile.am
new file mode 100644
index 0000000..24fd3a6
--- /dev/null
+++ b/XMPFilesPlugins/Makefile.am
@@ -0,0 +1,4 @@
+
+
+
+SUBDIRS=api PDF_Handler
diff --git a/XMPFilesPlugins/Makefile.in b/XMPFilesPlugins/Makefile.in
new file mode 100644
index 0000000..206658a
--- /dev/null
+++ b/XMPFilesPlugins/Makefile.in
@@ -0,0 +1,642 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFilesPlugins
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = api PDF_Handler
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFilesPlugins/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFilesPlugins/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFilesPlugins/PDF_Handler/Makefile.am b/XMPFilesPlugins/PDF_Handler/Makefile.am
new file mode 100644
index 0000000..310146c
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/Makefile.am
@@ -0,0 +1,3 @@
+
+
+EXTRA_DIST = README.exempi
diff --git a/XMPFilesPlugins/PDF_Handler/Makefile.in b/XMPFilesPlugins/PDF_Handler/Makefile.in
new file mode 100644
index 0000000..2737278
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/Makefile.in
@@ -0,0 +1,462 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFilesPlugins/PDF_Handler
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = README.exempi
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFilesPlugins/PDF_Handler/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFilesPlugins/PDF_Handler/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFilesPlugins/PDF_Handler/README.exempi b/XMPFilesPlugins/PDF_Handler/README.exempi
new file mode 100644
index 0000000..f5fceac
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/README.exempi
@@ -0,0 +1,6 @@
+This directory usually contains a proprietary PDF Handler
+written by Adobe. There is no source code.
+
+It has been omitted from the Exempi tarball.
+
+Check the source code repository.
\ No newline at end of file
diff --git a/XMPFilesPlugins/api/Makefile.am b/XMPFilesPlugins/api/Makefile.am
new file mode 100644
index 0000000..57fb028
--- /dev/null
+++ b/XMPFilesPlugins/api/Makefile.am
@@ -0,0 +1,2 @@
+
+SUBDIRS=source
diff --git a/XMPFilesPlugins/api/Makefile.in b/XMPFilesPlugins/api/Makefile.in
new file mode 100644
index 0000000..6d4805e
--- /dev/null
+++ b/XMPFilesPlugins/api/Makefile.in
@@ -0,0 +1,642 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFilesPlugins/api
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = source
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFilesPlugins/api/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFilesPlugins/api/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFilesPlugins/api/source/HostAPI.h b/XMPFilesPlugins/api/source/HostAPI.h
new file mode 100644
index 0000000..d94aae0
--- /dev/null
+++ b/XMPFilesPlugins/api/source/HostAPI.h
@@ -0,0 +1,326 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 __HOSTAPI_H__
+#define __HOSTAPI_H__	1
+#include "PluginHandler.h"
+
+#define XMP_HOST_API_VERSION_1	1	// CS6
+#define XMP_HOST_API_VERSION_4	4	// CS7 and beyond
+
+#define XMP_HOST_API_VERSION	XMP_HOST_API_VERSION_4
+
+
+namespace XMP_PLUGIN
+{
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct FileIO_API;
+struct String_API;
+struct Abort_API;
+struct StandardHandler_API;
+typedef char* StringPtr;
+
+/** @brief Request additional API suite from the host.
+ *
+ *  RequestAPISuite should be called during plugin initialization time
+ *  to request additional versioned APIs from the plugin host. If the name or version
+ *  of the requested API suite is unknown to the host an error is returned.
+ *
+ *  @param apiName The name of the API suite.
+ *  @param apiVersion The version of the API suite.
+ *  @param apiSuite On successful exit points to the API suite.
+ *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return kXMPErr_NoError on success otherwise error id of the failure.
+ */	
+typedef XMPErrorID (*RequestAPISuiteFn)( const char* apiName, XMP_Uns32 apiVersion, void** apiSuite, WXMP_Error* wError );
+	
+
+/** @struct HostAPI
+ *  @brief This is a Host API structure.
+ *
+ *  Please don't change this struct.
+ *  Additional host functionality should be added through RequestAPISuite().
+ */
+struct HostAPI
+{
+	/** 
+	 *  Size of the structure.
+	 */
+	XMP_Uns32				mSize;
+   
+	/** 
+	 *  Version number of the API.
+	 */
+	XMP_Uns32				mVersion;
+	
+	/**
+	 *  Pointer to a structure which contains file system APIs to access XMP_IO.
+	 */
+	FileIO_API*				mFileIOAPI;
+
+	/**
+	 *  Pointer to a structure which contains string related api.
+	 */
+	String_API*				mStrAPI;
+
+	/**
+	 * Pointer to a structure which contains API for user abort functionality
+	 */
+	Abort_API*				mAbortAPI;
+
+	/**
+	 * Pointer to a structure which contains API for accessing the standard file handler
+	 */
+	StandardHandler_API*	mStandardHandlerAPI;
+	
+	//
+	// VERSION 4
+	//
+	
+	/**
+	 * Function to request additional APIs from the host
+	 */
+	RequestAPISuiteFn		mRequestAPISuite;
+	
+};
+
+
+/** @struct FileIO_API
+ *  @brief APIs for file I/O inside XMPFiles. These APIs are provided by the host.
+ *
+ *  This structure contains function pointers to access XMP_IO.
+ */
+struct FileIO_API
+{
+	/** 
+	 *  Size of the structure.
+	 */
+	XMP_Uns32		mSize;
+   
+	/** @brief Read into a buffer, returning the number of bytes read.
+	 *  @param io pointer to the file.
+	 *  @param buffer A pointer to the buffer which will be filled in.
+	 *  @param count The length of the buffer in bytes.
+	 *  @param readAll True if reading less than the requested amount is a failure.
+	 *  @param byteRead contains the number of bytes read from io.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */	
+	typedef XMPErrorID (*ReadProc)( XMP_IORef io, void* buffer, XMP_Uns32 count, XMP_Bool readAll, XMP_Uns32& byteRead, WXMP_Error * wError );
+	ReadProc		mReadProc;
+
+	/** @brief Write from a buffer.
+	 *  @param io pointer to the file.
+	 *  @param buffer A pointer to the buffer.
+	 *  @param count The length of the buffer in bytes.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */	
+	typedef XMPErrorID (*WriteProc)( XMP_IORef io, void* buffer, XMP_Uns32 count, WXMP_Error * wError );
+	WriteProc		mWriteProc;
+
+	/** @brief Set the I/O position, returning the new absolute offset in bytes.
+	 *
+	 *  Set the I/O position, returning the new absolute offset in bytes. The offset parameter may
+	 *  be positive or negative. A seek beyond EOF is allowed when writing and extends the file, it
+	 *  is equivalent to seeking to EOF then writing the needed amount of undefined data. A
+	 *  read-only seek beyond EOF throws an exception. Throwing \c XMPError is recommended.
+	 *
+	 *  @param offset The offset relative to the mode.
+	 *  @param mode The mode, or origin, of the seek.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*SeekProc)( XMP_IORef io, XMP_Int64& offset, SeekMode mode, WXMP_Error * wError );
+	SeekProc		mSeekProc;
+
+	/** @brief length pointer to an 64 bit integer which will be filled.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*LengthProc)( XMP_IORef io, XMP_Int64& length, WXMP_Error * wError );
+	LengthProc		mLengthProc;
+
+	/** @brief Truncate the file to the given length.
+	 *
+	 *  Truncate the file to the given length. The I/O position after truncation is unchanged if
+	 *  still valid, otherwise it is set to the new EOF. Throws an exception if the new length is
+	 *  longer than the file's current length. Throwing \c XMPError is recommended.
+	 *
+	 *  @param length The new length for the file, must be less than or equal to the current length.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*TruncateProc)( XMP_IORef io, XMP_Int64 length, WXMP_Error * wError );
+	TruncateProc		mTruncateProc;
+
+	/** @brief Create an associated temp file for use in a safe-save style operation.
+	 *
+	 *  Create an associated temp file, for example in the same directory and with a related name.
+	 *  Returns an already existing temp with no other action. The temp must be opened for
+	 *  read-write access. It will be used in a safe-save style operation, using some of the
+	 *  original file plus new portions to write the temp, then replacing the original from the temp
+	 *  when done. Throws an exception if the owning object is opened for read-only access, or if
+	 *  the temp file cannot be created. Throwing \c XMPError is recommended.
+	 *
+	 *  The temp file is normally closed and deleted, and the temporary \c XMP_IO object deleted, by
+	 *  a call to \c AbsorbTemp or \c DeleteTemp. It must be closed and deleted by the derived \c
+	 *  XMP_IO object's destructor if necessary.
+	 *
+	 *  DeriveTemp may be called on a temporary \c XMP_IO object.
+	 *
+	 *  @tempIO A pointer to the XMP_IO which will be filled by the function.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*DeriveTempProc)( XMP_IORef io, XMP_IORef& tempIO, WXMP_Error * wError );
+	DeriveTempProc		mDeriveTempProc;
+
+	/** @brief Replace the owning file's content with that of the temp.
+	 *
+	 *  Used at the end of a safe-save style operation to replace the original content with that
+	 *  from the associated temp file. The temp file must be closed and deleted after the content
+	 *  swap. The temporary \c XMP_IO object is deleted. Throws an exception if the temp file cannot
+	 *  be absorbed. Throwing \c XMPError is recommended.
+	 *  @param io pointer to the file.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*AbsorbTempProc)( XMP_IORef io, WXMP_Error * wError );
+	AbsorbTempProc		mAbsorbTempProc;
+
+	/** @brief Delete a temp file, leaving the original alone.
+	 *
+	 *  Used for a failed safe-save style operation. The temp file is closed and deleted without
+	 *  being absorbed, and the temporary \c XMP_IO object is deleted. Does nothing if no temp
+	 *  exists.
+	 *  @param io pointer to the file.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*DeleteTempProc)( XMP_IORef io, WXMP_Error * wError );
+	DeleteTempProc		mDeleteTempProc;
+};
+
+/** @struct String_API
+ *  @brief APIs to provide functionality to create and release string buffer.
+ */
+struct String_API
+{
+	/** @brief Allocate a buffer of size /param size. This buffer should be released by calling ReleaseBufferProc.
+	 *
+	 *  @param buffer Pointer to StringBuffer which will be assigned a memory block of size /param size.
+	 *  @param size Size of the buffer.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*CreateBufferProc)( StringPtr* buffer, XMP_Uns32 size, WXMP_Error * wError );
+	CreateBufferProc   mCreateBufferProc;
+
+	/** @brief Release the buffer allocated by CreateBufferProc.
+	 *
+	 *  @param buffer The buffer pointer which needs to be released.
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*ReleaseBufferProc)( StringPtr buffer, WXMP_Error * wError );
+	ReleaseBufferProc  mReleaseBufferProc;
+};
+
+/** @string Abort_API
+ *  @brief API to handle user abort functionality.
+ */
+struct Abort_API
+{
+	/** @brief Ask XMPFiles if current operation should be aborted.
+	 *
+	 *  @param aborted Contains true if the current operation should be aborted
+	 *  @param wError WXMP_Error structure which will be filled by the API if any error occurs.
+	 *  @return kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*CheckAbort)( SessionRef session, XMP_Bool * aborted, WXMP_Error* wError );
+	CheckAbort	mCheckAbort;
+};
+
+struct StandardHandler_API
+{
+	/** @brief Check format with standard file handler
+	 *
+	 * Call the replaced file handler (if available) to check the format of the data source.
+	 *
+	 * @param session		File handler session (referring to replacement handler)
+	 * @param format		The file format identifier
+	 * @param path			Path to the file that needs to be checked
+	 * @param checkOK		On return true if the data can be handled by the file handler
+	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*CheckFormatStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_Bool & checkOK, WXMP_Error* wError );
+	CheckFormatStandardHandler mCheckFormatStandardHandler;
+
+	/** @brief Get XMP from standard file handler
+	 *
+	 * Call the standard file handler in order to retrieve XMP from it.
+	 *
+	 * @param session		File handler session (referring to replacement handler)
+	 * @param format		The file format identifier
+	 * @param path			Path to the file that should be proceeded
+	 * @param meta			Will on success contain reference to the XMP data as returned by the standard handler
+	 * @param containsXMP	Returns true if the standard handler detected XMP
+	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*GetXMPStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMPMetaRef meta, XMP_Bool * containsXMP, WXMP_Error* wError );
+	GetXMPStandardHandler	mGetXMPStandardHandler;
+};
+
+struct StandardHandler_API_V2
+{
+	/** @brief Check format with standard file handler
+	 *
+	 * Call the replaced file handler (if available) to check the format of the data source.
+	 *
+	 * @param session		File handler session (referring to replacement handler)
+	 * @param format		The file format identifier
+	 * @param path			Path to the file that needs to be checked
+	 * @param checkOK		On return true if the data can be handled by the file handler
+	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*CheckFormatStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_Bool & checkOK, WXMP_Error* wError );
+	CheckFormatStandardHandler mCheckFormatStandardHandler;
+
+	/** @brief Get XMP from standard file handler
+	 *
+	 * Call the standard file handler in order to retrieve XMP from it.
+	 *
+	 * @param session		File handler session (referring to replacement handler)
+	 * @param format		The file format identifier
+	 * @param path			Path to the file that should be proceeded
+	 * @param xmpStr		Will on success contain serialized XMP Packet from the standard Handler
+	 * @param containsXMP	Returns true if the standard handler detected XMP
+	 * @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+	 * @return				kXMPErr_NoError on success otherwise error id of the failure.
+	 */
+	typedef XMPErrorID (*GetXMPStandardHandler)( SessionRef session, XMP_FileFormat format, StringPtr path, XMP_StringPtr* xmpStr, XMP_Bool * containsXMP, WXMP_Error* wError );
+	GetXMPStandardHandler	mGetXMPStandardHandler;
+};
+
+
+#ifdef __cplusplus
+}
+#endif
+
+} //namespace XMP_PLUGIN
+#endif // __HOSTAPI_H__
diff --git a/XMPFilesPlugins/api/source/HostAPIAccess.cpp b/XMPFilesPlugins/api/source/HostAPIAccess.cpp
new file mode 100644
index 0000000..4215b99
--- /dev/null
+++ b/XMPFilesPlugins/api/source/HostAPIAccess.cpp
@@ -0,0 +1,301 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "HostAPIAccess.h"
+#include <cstring>
+#include <string>
+#define TXMP_STRING_TYPE std::string
+#include "XMP.hpp"
+
+namespace XMP_PLUGIN
+{
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// API handling 
+//
+	
+static HostAPIRef sHostAPI = NULL;
+static XMP_Uns32 sHostAPIVersion = 0;
+
+StandardHandler_API_V2* sStandardHandler_V2 = NULL;
+	
+// ============================================================================
+	
+static bool CheckAPICompatibility_V1 ( const HostAPIRef hostAPI )
+{
+	return ( hostAPI
+			&& hostAPI->mFileIOAPI
+			&& hostAPI->mStrAPI
+			&& hostAPI->mAbortAPI
+			&& hostAPI->mStandardHandlerAPI );
+}
+
+static bool CheckAPICompatibility_V4 ( const HostAPIRef hostAPI )
+{
+	return ( CheckAPICompatibility_V1( hostAPI )
+			&& hostAPI->mRequestAPISuite != NULL );
+}
+
+// ============================================================================
+
+bool SetHostAPI( HostAPIRef hostAPI )
+{
+	bool valid = false;
+	if( hostAPI && hostAPI->mVersion > 0 )
+	{
+		if ( hostAPI->mVersion <= 3 )
+		{
+			// Old host API before plugin versioning changes
+			valid = CheckAPICompatibility_V1( hostAPI );
+		}
+		else
+		{
+			// New host API including RequestAPISuite.
+			// This version of the HostAPI struct should not be changed.
+			valid = CheckAPICompatibility_V4( hostAPI );
+		}
+	}
+	
+	if( valid )
+	{
+		sHostAPI = hostAPI;
+		sHostAPIVersion = hostAPI->mVersion;
+	}
+	
+	return valid;
+}
+
+// ============================================================================
+
+static HostAPIRef GetHostAPI()
+{
+	return sHostAPI;
+}
+
+// ============================================================================
+
+static XMP_Uns32 GetHostAPIVersion()
+{
+	return sHostAPIVersion;
+}
+
+// ============================================================================
+
+inline void CheckError( WXMP_Error & error )
+{
+	if( error.mErrorID != kXMPErr_NoError )
+	{
+		throw XMP_Error( error.mErrorID, error.mErrorMsg );
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// class IOAdapter
+//
+
+XMP_Uns32 IOAdapter::Read( void* buffer, XMP_Uns32 count, bool readAll ) const
+{
+	WXMP_Error error;
+	XMP_Uns32 result;
+	GetHostAPI()->mFileIOAPI->mReadProc( this->mFileRef, buffer, count, readAll, result, &error );
+	CheckError( error );
+	return result;
+}
+
+// ============================================================================
+
+void IOAdapter::Write( void* buffer, XMP_Uns32 count ) const
+{
+	WXMP_Error error;
+	GetHostAPI()->mFileIOAPI->mWriteProc( this->mFileRef, buffer, count, &error );
+	CheckError( error );
+}
+
+// ============================================================================
+
+void IOAdapter::Seek( XMP_Int64& offset, SeekMode mode ) const
+{
+	WXMP_Error error;
+	GetHostAPI()->mFileIOAPI->mSeekProc( this->mFileRef, offset, mode, &error );
+	CheckError( error );
+}
+
+// ============================================================================
+
+XMP_Int64 IOAdapter::Length() const
+{
+	WXMP_Error error;
+	XMP_Int64 length = 0;
+	GetHostAPI()->mFileIOAPI->mLengthProc( this->mFileRef, length, &error );
+	CheckError( error );
+	return length;
+}
+
+// ============================================================================
+
+void IOAdapter::Truncate( XMP_Int64 length ) const
+{
+	WXMP_Error error;
+	GetHostAPI()->mFileIOAPI->mTruncateProc( this->mFileRef, length, &error );
+	CheckError( error );
+}
+
+// ============================================================================
+
+XMP_IORef IOAdapter::DeriveTemp() const
+{
+	WXMP_Error error;
+	XMP_IORef tempIO;
+	GetHostAPI()->mFileIOAPI->mDeriveTempProc( this->mFileRef, tempIO, &error );
+	CheckError( error );
+	return tempIO;
+}
+
+// ============================================================================
+
+void IOAdapter::AbsorbTemp() const
+{
+	WXMP_Error error;
+	GetHostAPI()->mFileIOAPI->mAbsorbTempProc( this->mFileRef, &error );
+	CheckError( error );
+}
+
+// ============================================================================
+
+void IOAdapter::DeleteTemp() const
+{
+	WXMP_Error error;
+	GetHostAPI()->mFileIOAPI->mDeleteTempProc( this->mFileRef, &error );
+	CheckError( error );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Host Strings
+//
+
+StringPtr HostStringCreateBuffer( XMP_Uns32 size )
+{
+	WXMP_Error error;
+	StringPtr buffer = NULL;
+	GetHostAPI()->mStrAPI->mCreateBufferProc( &buffer, size, &error );
+	CheckError( error );
+	return buffer;
+}
+
+// ============================================================================
+
+void HostStringReleaseBuffer( StringPtr buffer )
+{
+	WXMP_Error error;
+	GetHostAPI()->mStrAPI->mReleaseBufferProc( buffer, &error );
+	CheckError( error );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Abort functionality
+//
+
+bool CheckAbort( SessionRef session )
+{
+	WXMP_Error error;
+	XMP_Bool abort = false;
+	GetHostAPI()->mAbortAPI->mCheckAbort( session, &abort, &error );
+
+	if( error.mErrorID == kXMPErr_Unavailable )
+	{
+		abort = false;
+	}
+	else if( error.mErrorID != kXMPErr_NoError )
+	{
+		throw XMP_Error( error.mErrorID, error.mErrorMsg );
+	}
+
+	return ConvertXMP_BoolToBool( abort );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Standard file handler access
+//
+
+
+bool CheckFormatStandard( SessionRef session, XMP_FileFormat format, const StringPtr path )
+{
+	WXMP_Error error;
+	XMP_Bool ret = true;
+	if ( sStandardHandler_V2 == NULL )
+	{
+		throw XMP_Error( kXMPErr_Unavailable, "StandardHandler suite unavailable" );
+	}
+	sStandardHandler_V2->mCheckFormatStandardHandler( session, format, path, ret, &error );
+
+	if( error.mErrorID != kXMPErr_NoError )
+	{
+		throw XMP_Error( error.mErrorID, error.mErrorMsg );
+	}
+
+	return ConvertXMP_BoolToBool( ret );
+}
+
+// ============================================================================
+
+bool GetXMPStandard( SessionRef session, XMP_FileFormat format, const StringPtr path, std::string& xmpStr, bool* containsXMP )
+{
+	WXMP_Error error;
+	bool ret = true;
+	XMP_StringPtr outXmp= NULL;
+	XMP_Bool cXMP = kXMP_Bool_False;
+	if ( sStandardHandler_V2 == NULL )
+	{
+		throw XMP_Error( kXMPErr_Unavailable, "StandardHandler suite unavailable" );
+	}
+	sStandardHandler_V2->mGetXMPStandardHandler( session, format, path, &outXmp, &cXMP, &error );
+	*containsXMP = ConvertXMP_BoolToBool( cXMP );
+
+	if( error.mErrorID == kXMPErr_NoFileHandler || error.mErrorID == kXMPErr_BadFileFormat)
+	{
+		ret = false;
+	}
+	else if( error.mErrorID != kXMPErr_NoError )
+	{
+		throw XMP_Error( error.mErrorID, error.mErrorMsg );
+	}
+	xmpStr=outXmp;
+	HostStringReleaseBuffer( (StringPtr)outXmp ) ;
+	return ret;
+}
+
+// ============================================================================
+
+void* RequestAPISuite( const char* apiName, XMP_Uns32 apiVersion )
+{
+	void* suite = NULL;
+	
+	WXMP_Error error;
+	
+	if (GetHostAPIVersion() >= 4)
+	{
+		GetHostAPI()->mRequestAPISuite( apiName, apiVersion, &suite, &error );
+		CheckError(error);
+	}
+	else
+	{
+		throw XMP_Error( kXMPErr_Unavailable, "RequestAPISuite unavailable (host too old)" );
+	}
+	
+
+	return suite;
+}
+
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFilesPlugins/api/source/HostAPIAccess.h b/XMPFilesPlugins/api/source/HostAPIAccess.h
new file mode 100644
index 0000000..baae239
--- /dev/null
+++ b/XMPFilesPlugins/api/source/HostAPIAccess.h
@@ -0,0 +1,206 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 __HostAPIAccess_h__
+#define __HostAPIAccess_h__	1
+#include "HostAPI.h"
+#include <string>
+
+namespace XMP_PLUGIN
+{
+
+/** @brief Sets the host API struct for the plugin
+ *
+ *  The HostAPI struct will be passed in from the host during plugin initialization.
+ *  The struct will contain a mVersion field which contains the actual version of the host API.
+ *  As the plugin might be newer than the plugin host the plugin must always check if
+ *  a host function is available before calling into the host.
+ *
+ *  @param hostAPI The HostAPI struct. The struct can be smaller than expected.
+ *  @return True if the hostAPI was accepted by the plugin.
+ */
+bool SetHostAPI( HostAPIRef hostAPI );
+
+
+/** @class IOAdapter
+ *  @brief This class deals with file I/O. It's a wrapper class over host API's functions hostAPI->mFileIOAPI.
+ *
+ *  This class is a wrapper class over hostAPI File I/O apis. This class gives easy interface 
+ *  for plug-in developer so that they can use it very easily.
+ */
+class IOAdapter 
+{
+public:
+
+	/** @brief Read into a buffer, returning the number of bytes read.
+	 *
+	 *  Read into a buffer, returning the number of bytes read. Returns the actual number of bytes
+	 *  read. Throws an exception if requireSuccess is true and not enough data is available.
+	 *  Throwing \c XMPError is recommended. The buffer content and I/O position after a throw are
+	 *  undefined.
+	 *
+	 *  @param buffer A pointer to the buffer.
+	 *  @param count The length of the buffer in bytes.
+	 *  @param readAll True if reading less than the requested amount is a failure.
+	 *  @return Returns the number of bytes read.
+	 */
+	XMP_Uns32 Read( void* buffer, XMP_Uns32 count, bool readAll ) const;
+	
+	/** @brief Write from a buffer.
+	 *
+	 *  Write from a buffer, overwriting existing data and extending the file as necessary. All data
+	 *  must be written or an exception thrown. Throwing \c XMPError is recommended.
+	 *
+	 *  @param buffer A pointer to the buffer.
+	 *  @param count The length of the buffer in bytes.
+	 */
+	void Write( void* buffer, XMP_Uns32 count ) const;
+	
+	/** @brief Set the I/O position, returning the new absolute offset in bytes.
+	 *
+	 *  Set the I/O position, returning the new absolute offset in bytes. The offset parameter may
+	 *  be positive or negative. A seek beyond EOF is allowed when writing and extends the file, it
+	 *  is equivalent to seeking to EOF then writing the needed amount of undefined data. A
+	 *  read-only seek beyond EOF throws an exception. Throwing \c XMPError is recommended.
+	 *
+	 *  @param offset The offset relative to the mode.
+	 *  @param mode The mode, or origin, of the seek.
+	 *  @return The new absolute offset in bytes.
+	 */
+	void Seek( XMP_Int64& offset, SeekMode mode ) const;
+	
+	/** @brief Return the length of the file in bytes.
+	 *
+	 *  Return the length of the file in bytes. The I/O position is unchanged.
+	 *  @return The length of the file in bytes.
+	 */
+	XMP_Int64 Length() const;
+
+	/** @brief Truncate the file to the given length.
+	 *
+	 *  Truncate the file to the given length. The I/O position after truncation is unchanged if
+	 *  still valid, otherwise it is set to the new EOF. Throws an exception if the new length is
+	 *  longer than the file's current length. Throwing \c XMPError is recommended.
+	 *  @param length The new length for the file, must be less than or equal to the current length.
+	 */	
+	void Truncate( XMP_Int64 length ) const;
+
+	/** @brief Create an associated temp file for use in a safe-save style operation.
+	 *
+	 *  Create an associated temp file, for example in the same directory and with a related name.
+	 *  Returns an already existing temp with no other action. The temp must be opened for
+	 *  read-write access. It will be used in a safe-save style operation, using some of the
+	 *  original file plus new portions to write the temp, then replacing the original from the temp
+	 *  when done. Throws an exception if the owning object is opened for read-only access, or if
+	 *  the temp file cannot be created. Throwing \c XMPError is recommended.
+	 *
+	 *  The temp file is normally closed and deleted, and the temporary \c XMP_IO object deleted, by
+	 *  a call to \c AbsorbTemp or \c DeleteTemp. It must be closed and deleted by the derived \c
+	 *  XMP_IO object's destructor if necessary.
+	 * 
+	 *  \c DeriveTemp may be called on a temporary \c XMP_IO object.
+	 *
+	 *  @return A pointer to the associated temporary \c XMP_IO object.
+	 */
+	XMP_IORef DeriveTemp() const;
+	
+	/** @brief Replace the owning file's content with that of the temp.
+	 *
+	 *  Used at the end of a safe-save style operation to replace the original content with that
+	 *  from the associated temp file. The temp file must be closed and deleted after the content
+	 *  swap. The temporary \c XMP_IO object is deleted. Throws an exception if the temp file cannot
+	 *  be absorbed. Throwing \c XMPError is recommended.
+	 */
+	void AbsorbTemp() const;
+	
+	/** @brief Delete a temp file, leaving the original alone.
+	 *
+	 *  Used for a failed safe-save style operation. The temp file is closed and deleted without
+	 *  being absorbed, and the temporary \c XMP_IO object is deleted. Does nothing if no temp exists.
+	 */
+	void DeleteTemp() const;
+	
+	IOAdapter( XMP_IORef io ) : mFileRef( io ) { }
+	~IOAdapter() { }
+
+private:
+	XMP_IORef		mFileRef;	
+};
+
+typedef IOAdapter HostFileSys;
+
+/** @brief Allocate a buffer of size /param size.
+ *
+ *  It is a wrapper function of host API function 'hostAPI->mStrAPI->mCreateBufferProc'. 
+ *  Buffer allocated by this function should be released by calling HostStringReleaseBuffer.
+ *
+ *  @param size Size of the buffer.
+ *  @return Pointer to a memory block of /param size. It throws exception if memory couldn't be allocated.
+ */
+StringPtr HostStringCreateBuffer( XMP_Uns32 size );
+
+/** @brief Release the buffer allocated by HostStringCreateBuffer.
+ *
+ *  It is a wrapper function of host API function 'hostAPI->mStrAPI->mReleaseBufferProc'. 
+ *
+ *  @param buffer The buffer pointer which needs to be released.
+ */
+void HostStringReleaseBuffer( StringPtr buffer );
+
+/** @brief Ask XMPFiles if current operation should be aborted.
+ *
+ *  @param session Related session
+ *  @return true if the current operation should be aborted
+ */
+bool CheckAbort( SessionRef session );
+
+/** @brief Check format with standard file handler
+ *
+ * Call the standard file handler to check the format of the data source.
+ * This call expects that session refers to a replacement file handler. Otherwise
+ * the call fails with an exception.
+ *
+ * @param session		File handler session (should refer to replacement handler)
+ * @param format		The file format identifier
+ * @param path			Path to the file that needs to be checked
+ * @return				true on success
+ */
+bool CheckFormatStandard( SessionRef session, XMP_FileFormat format, const StringPtr path );
+
+/** @brief Get XMP from standard file handler
+ *
+ * Call the standard file handler in order to retrieve XMP from it.
+ * This call expects that session refers to a replacement file handler. Otherwise
+ * this call fails with an exception.
+ *
+ * @param session		File handler session  (should refer to replacement handler)
+ * @param format		The file format identifier
+ * @param path			Path to the file that should be proceeded
+ * @param xmpStr		Reference to serialized XMP packet. Will be populated with the XMP Packet as read by the standard file handler
+ * @param containsXMP	Returns true if the standard handler detected XMP
+ * @return				true on success
+ */
+bool GetXMPStandard( SessionRef session, XMP_FileFormat format, const StringPtr path, std::string& xmpStr, bool* containsXMP );
+
+/** @brief Request additional API suite from the host.
+ *
+ *  RequestAPISuite should be called during plugin initialization time
+ *  to request additional versioned APIs from the plugin host. If the name or version
+ *  of the requested API suite is unknown NULL is returned.
+ *
+ *  @param apiName The name of the API suite.
+ *  @param apiVersion The version of the API suite.
+ *  @return pointer to the suite struct or NULL if name/version is unknown.
+ */	
+void* RequestAPISuite( const char* apiName, XMP_Uns32 apiVersion );
+
+
+} //namespace XMP_PLUGIN
+
+#endif  // __HostAPIAccess_h__
diff --git a/XMPFilesPlugins/api/source/Makefile.am b/XMPFilesPlugins/api/source/Makefile.am
new file mode 100644
index 0000000..ece8912
--- /dev/null
+++ b/XMPFilesPlugins/api/source/Makefile.am
@@ -0,0 +1,13 @@
+
+
+EXTRA_DIST = HostAPIAccess.cpp \
+	HostAPIAccess.h\
+	HostAPI.h\
+	PluginAPIImpl.cpp\
+	PluginBase.cpp\
+	PluginBase.h\
+	PluginConst.h\
+	PluginHandler.h\
+	PluginRegistry.cpp\
+	PluginRegistry.h\
+	$(NULL)
diff --git a/XMPFilesPlugins/api/source/Makefile.in b/XMPFilesPlugins/api/source/Makefile.in
new file mode 100644
index 0000000..1c99ba1
--- /dev/null
+++ b/XMPFilesPlugins/api/source/Makefile.in
@@ -0,0 +1,473 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = XMPFilesPlugins/api/source
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = HostAPIAccess.cpp \
+	HostAPIAccess.h\
+	HostAPI.h\
+	PluginAPIImpl.cpp\
+	PluginBase.cpp\
+	PluginBase.h\
+	PluginConst.h\
+	PluginHandler.h\
+	PluginRegistry.cpp\
+	PluginRegistry.h\
+	$(NULL)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign XMPFilesPlugins/api/source/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign XMPFilesPlugins/api/source/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/XMPFilesPlugins/api/source/PluginAPIImpl.cpp b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp
new file mode 100644
index 0000000..ec22cee
--- /dev/null
+++ b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp
@@ -0,0 +1,553 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "HostAPIAccess.h"
+#include "PluginBase.h"
+#include "PluginHandler.h"
+#include "PluginRegistry.h"
+
+namespace XMP_PLUGIN
+{
+
+#define XMP_MIN(a, b) (((a) < (b)) ? (a) : (b))
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		Exception handler
+//
+
+static void HandleException( WXMP_Error* wError ) 
+{
+	try
+	{
+		throw;
+	}
+	catch(  XMP_Error& xmpErr )
+	{
+		wError->mErrorMsg = xmpErr.GetErrMsg();
+		wError->mErrorID = xmpErr.GetID();
+	}
+	catch( std::exception& stdErr )
+	{
+		wError->mErrorMsg = stdErr.what();
+	}
+	catch( ... )
+	{
+		wError->mErrorMsg = "Caught unknown exception";
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//		Plugin API
+//
+
+static XMPErrorID Static_TerminatePlugin( WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginTerminate;
+
+	try 
+	{
+		PluginRegistry::terminate();
+		wError->mErrorID = kXMPErr_NoError;
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+	
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_SetHostAPI( HostAPIRef hostAPI, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_SetHostAPI;
+
+	if( SetHostAPI( hostAPI ) )
+	{
+		wError->mErrorID = kXMPErr_NoError;
+	}
+	
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_InitializeSession( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_Uns32 format, XMP_Uns32 handlerFlags, XMP_Uns32 openFlags, SessionRef * session, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginSessionInit;
+
+	try
+	{
+		*session = PluginRegistry::create(uid, filePath, openFlags, format, handlerFlags );
+
+		if( *session != NULL )
+		{
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+	
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_TerminateSession( SessionRef session, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginSessionTerm;
+	PluginBase* thiz = (PluginBase*) session;
+	
+	try 
+	{
+		delete thiz;
+		wError->mErrorID = kXMPErr_NoError;
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_CheckFileFormat( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_IORef fileRef, XMP_Bool * value, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginCheckFileFormat;
+
+	try 
+	{
+		IOAdapter file( fileRef );
+		*value = PluginRegistry::checkFileFormat( uid, filePath, file );
+		wError->mErrorID = kXMPErr_NoError;
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_CheckFolderFormat( XMP_StringPtr uid, XMP_StringPtr rootPath, XMP_StringPtr gpName, XMP_StringPtr parentName, XMP_StringPtr leafName, XMP_Bool * value, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginCheckFolderFormat;
+	
+	try
+	{
+		*value = PluginRegistry::checkFolderFormat( uid, rootPath, gpName, parentName, leafName );
+		wError->mErrorID = kXMPErr_NoError;
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_GetFileModDate ( SessionRef session, XMP_Bool * ok, XMP_DateTime * modDate, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginGetFileModDate;
+	PluginBase* thiz = (PluginBase*) session;
+	if ( (thiz == 0) || (ok == 0) || (modDate == 0) ) return kXMPErr_PluginGetFileModDate;
+
+	try 	
+	{
+		*ok = thiz->getFileModDate ( modDate );
+		wError->mErrorID = kXMPErr_NoError;
+	} 
+	catch ( ... ) 
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID Static_CacheFileData( SessionRef session, XMP_IORef fileRef, XMP_StringPtr* xmpStr, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginCacheFileData;
+	
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->cacheFileData( fileRef, xmpStr );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_UpdateFile( SessionRef session, XMP_IORef fileRef, XMP_Bool doSafeUpdate, XMP_StringPtr xmpStr, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginUpdateFile;
+	
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->updateFile( fileRef, ConvertXMP_BoolToBool( doSafeUpdate ), xmpStr );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_WriteTempFile( SessionRef session, XMP_IORef srcFileRef, XMP_IORef fileRef, XMP_StringPtr xmpStr, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginWriteTempFile;
+	
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->writeTempFile( srcFileRef, fileRef, xmpStr );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_ImportToXMP( SessionRef session, XMPMetaRef xmp, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+
+	wError->mErrorID = kXMPErr_NoError;
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_ExportFromXMP( SessionRef session, XMPMetaRef xmp, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+
+	wError->mErrorID = kXMPErr_NoError;
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_FillMetadataFiles( SessionRef session, StringVectorRef metadataFiles,
+	SetStringVectorProc SetStringVector, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginFillMetadataFiles;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->FillMetadataFiles(metadataFiles, SetStringVector);
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+
+static XMPErrorID Static_FillAssociatedResources( SessionRef session, StringVectorRef resourceList,
+	SetStringVectorProc SetStringVector, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginFillAssociatedResources;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->FillAssociatedResources(resourceList, SetStringVector);
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+static XMPErrorID Static_ImportToXMPString( SessionRef session, XMP_StringPtr* xmpStr, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginImportToXMP;
+	
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->importToXMP( xmpStr );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+// ============================================================================
+
+static XMPErrorID Static_ExportFromXMPString( SessionRef session, XMP_StringPtr xmpStr, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginExportFromXMP;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			thiz->exportFromXMP( xmpStr );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+
+static XMPErrorID Static_IsMetadataWritable( SessionRef session, XMP_Bool * result, WXMP_Error * wError )
+{
+	if( wError == NULL || result == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginIsMetadataWritable;
+
+	PluginBase* thiz = (PluginBase*) session;
+	try
+	{
+		if(thiz)
+		{
+			*result = false;
+			*result = ConvertBoolToXMP_Bool( thiz->IsMetadataWritable( ) );
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+// ============================================================================
+
+XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXMP_Error * wError )
+{
+	if( wError == NULL )	return kXMPErr_BadParam;
+
+	wError->mErrorID = kXMPErr_PluginInitialized;
+	
+	if( !pluginAPI || moduleID == NULL )
+	{
+		wError->mErrorID = kXMPErr_BadParam;
+		wError->mErrorMsg = "pluginAPI or moduleID is NULL";
+		return wError->mErrorID;
+	}
+
+	try
+	{
+		// Test if module identifier is same as found in the resource file MODULE_IDENTIFIER.txt
+		bool identical = (0 == memcmp(GetModuleIdentifier(), moduleID, XMP_MIN(strlen(GetModuleIdentifier()), strlen(moduleID))));
+		if ( !identical )
+		{
+			wError->mErrorMsg = "Module identifier doesn't match";
+			return wError->mErrorID;
+		}
+	
+		RegisterFileHandlers(); // Register all file handlers
+
+		bool initialized = PluginRegistry::initialize(); // Initialize all the registered file handlers
+
+		if( initialized )
+		{
+			XMP_Uns32 size = sizeof(*pluginAPI);
+			
+			// The pluginAPI struct from the (older) host might be smaller than expected
+			// so make sure that we don't write over the end of the struct.
+			pluginAPI->mVersion = XMP_PLUGIN_VERSION;
+			
+			pluginAPI->mTerminatePluginProc = Static_TerminatePlugin;
+			pluginAPI->mSetHostAPIProc      = Static_SetHostAPI;
+
+			pluginAPI->mInitializeSessionProc = Static_InitializeSession;
+			pluginAPI->mTerminateSessionProc = Static_TerminateSession;
+
+			pluginAPI->mCheckFileFormatProc = Static_CheckFileFormat;
+			pluginAPI->mCheckFolderFormatProc = Static_CheckFolderFormat;
+			pluginAPI->mGetFileModDateProc = Static_GetFileModDate;
+			pluginAPI->mCacheFileDataProc = Static_CacheFileData;
+			pluginAPI->mUpdateFileProc = Static_UpdateFile;
+			pluginAPI->mWriteTempFileProc = Static_WriteTempFile;
+
+			pluginAPI->mImportToXMPProc = Static_ImportToXMP;
+			pluginAPI->mExportFromXMPProc = Static_ExportFromXMP;
+			
+			// version 2
+			if( pluginAPI->mSize > offsetof( PluginAPI, mFillMetadataFilesProc ) )
+			{
+				pluginAPI->mFillMetadataFilesProc = Static_FillMetadataFiles;
+				pluginAPI->mImportToXMPStringProc = Static_ImportToXMPString;
+				pluginAPI->mExportFromXMPStringProc = Static_ExportFromXMPString;
+				pluginAPI->mFillAssociatedResourcesProc = Static_FillAssociatedResources;
+			}
+			
+			// version 3
+			if( pluginAPI->mSize > offsetof( PluginAPI, mIsMetadataWritableProc ) )
+			{
+				pluginAPI->mIsMetadataWritableProc = Static_IsMetadataWritable;
+			}
+			
+			// Compatibility hack for CS6 (plugin version 1):
+			// set mVersion to 1 if pluginAPI is for version 1
+			// because in CS6 plugin version is used to determine the hostAPI version.
+			if (pluginAPI->mSize <= offsetof( PluginAPI, mFillMetadataFilesProc ))
+			{
+				pluginAPI->mVersion = 1;
+			}
+
+			wError->mErrorID = kXMPErr_NoError;
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+	
+	return wError->mErrorID;
+}
+	
+// ============================================================================
+
+XMPErrorID InitializePlugin2( XMP_StringPtr moduleID, HostAPIRef hostAPI, PluginAPIRef pluginAPI, WXMP_Error * wError )
+{
+	if( wError == NULL )
+	{
+		return kXMPErr_BadParam;	
+	}
+	
+	if( hostAPI == NULL )
+	{
+		wError->mErrorID = kXMPErr_BadParam;
+		wError->mErrorMsg = "hostAPI is NULL";
+		return wError->mErrorID;
+	}
+	
+	wError->mErrorID = kXMPErr_PluginInitialized;
+	
+	try
+	{
+		if( SetHostAPI(hostAPI) )
+		{
+			if( SetupPlugin() )
+			{
+				if( InitializePlugin( moduleID, pluginAPI, wError ) )
+				{
+					wError->mErrorID = kXMPErr_NoError;
+				}
+			}
+			else
+			{
+				wError->mErrorMsg = "SetupPlugin failed";
+			}
+		}
+		else
+		{
+			wError->mErrorMsg = "SetHostAPI failed";			
+		}
+	}
+	catch( ... )
+	{
+		HandleException( wError );
+	}
+
+	return wError->mErrorID;
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFilesPlugins/api/source/PluginBase.cpp b/XMPFilesPlugins/api/source/PluginBase.cpp
new file mode 100644
index 0000000..06c53ae
--- /dev/null
+++ b/XMPFilesPlugins/api/source/PluginBase.cpp
@@ -0,0 +1,357 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "PluginBase.h"
+#include "source/XMP_LibUtils.hpp"
+#include "source/Host_IO.hpp"
+#include "XMP.incl_cpp"
+
+#if XMP_WinBuild
+#include <Windows.h>
+#endif
+
+#if ( XMP_MacBuild || XMP_UNIXBuild )
+#include <sys/stat.h>
+#endif
+
+namespace XMP_PLUGIN
+{
+static bool GetModifyDate ( const char* filePath, XMP_DateTime* modifyDate );
+	
+void PluginBase::cacheFileData( XMP_IORef fileRef, XMP_StringPtr* xmpStr )
+{
+	std::string buffer;
+	IOAdapter file( fileRef );
+	
+	this->cacheFileData( file, buffer );
+
+	if( !buffer.empty() )
+	{
+		XMP_Uns32 length = (XMP_Uns32)buffer.size() + 1 ;
+		StringPtr bufferPtr = HostStringCreateBuffer( length );
+		memcpy( bufferPtr, buffer.c_str(), length );
+		*xmpStr = bufferPtr; // callee function should free the memory.
+	}
+}
+
+// ============================================================================
+
+void PluginBase::updateFile( XMP_IORef fileRef, bool doSafeUpdate, XMP_StringPtr xmpStr )
+{
+	IOAdapter file( fileRef );
+	std::string buffer( xmpStr );
+
+	this->updateFile( file, doSafeUpdate, buffer );
+}
+
+// ============================================================================
+
+void PluginBase::writeTempFile( XMP_IORef srcFileRef, XMP_IORef tmpFileRef, XMP_StringPtr xmpStr )
+{
+	IOAdapter srcFile( srcFileRef );
+	IOAdapter tmpFile( tmpFileRef );
+	std::string buffer( xmpStr );
+
+	this->writeTempFile( srcFile, tmpFile, buffer );
+}
+
+void PluginBase::FillMetadataFiles( StringVectorRef metadataFiles, SetStringVectorProc SetStringVector )
+{
+	if ( metadataFiles == 0 ) 
+		XMP_Throw ( "A result file list vector must be provided", kXMPErr_BadParam );
+
+	std::vector<std::string> fileList;	// Pass a local vector, not the client's.
+	(*SetStringVector)( metadataFiles, 0, 0 );	// Clear the client's result vector.
+	FillMetadataFiles( &fileList );
+
+	// since we are dealing with STL ojbects across different DLL boundaries,
+	// we are extracting const char* to actual path strings, constructing a vector
+	// using these pointers and then passing the address of the underlying data
+	// to the clients procedure which will repopulate its own vector of strings
+	// using this information.
+	if ( ! fileList.empty() ) {
+		const size_t fileCount = fileList.size();
+		std::vector<XMP_StringPtr> ptrArray;
+		ptrArray.reserve ( fileCount );
+		for ( size_t i = 0; i < fileCount; ++i ) {
+			ptrArray.push_back ( fileList[i].c_str() );
+		}
+		(*SetStringVector) ( metadataFiles, ptrArray.data(), fileCount );
+	}
+}
+
+void PluginBase::FillMetadataFiles( std::vector<std::string> * metadataFiles )
+{
+	XMP_OptionBits flags = this->mHandlerFlags;
+	if ( (flags & kXMPFiles_UsesSidecarXMP) ||
+		(flags & kXMPFiles_FolderBasedFormat) ) {
+			XMP_Throw ( "Base implementation of FillMetadataFiles only for embedding handlers", kXMPErr_PluginFillMetadataFiles );
+	}
+
+	metadataFiles->push_back ( this->getPath() );
+}
+
+
+void PluginBase::FillAssociatedResources( StringVectorRef resourceList, SetStringVectorProc SetStringVector )
+{
+	if ( resourceList == 0 ) 
+		XMP_Throw ( "A result file list vector must be provided", kXMPErr_BadParam );
+
+	std::vector<std::string> resList;	// Pass a local vector, not the client's.
+	(*SetStringVector)( resourceList, 0, 0 );	// Clear the client's result vector.
+	FillAssociatedResources( &resList );
+
+	if ( ! resList.empty() ) {
+		const size_t fileCount = resList.size();
+		std::vector<XMP_StringPtr> ptrArray;
+		ptrArray.reserve ( fileCount );
+		for ( size_t i = 0; i < fileCount; ++i ) {
+			ptrArray.push_back ( resList[i].c_str() );
+		}
+		(*SetStringVector) ( resourceList, ptrArray.data(), fileCount );
+	}
+}
+
+
+void PluginBase::FillAssociatedResources( std::vector<std::string> * resourceList ) 
+{	
+	XMP_OptionBits flags = this->mHandlerFlags;
+	if ( (flags & kXMPFiles_HandlerOwnsFile) ||
+		 (flags & kXMPFiles_UsesSidecarXMP) ||
+		 (flags & kXMPFiles_FolderBasedFormat) ) {
+			XMP_Throw ( "GetAssociatedResources is not implemented for this file format", kXMPErr_PluginFillAssociatedResources );
+	}
+	resourceList->push_back ( this->getPath() );
+}
+
+// ============================================================================
+// ============================================================================
+// ============================================================================
+
+
+void PluginBase::importToXMP( XMP_StringPtr* xmpStr ) 
+{
+	// To be implemented by the Plug-In Developer
+	// Generally a Plugin developer should follow the following steps
+	// when implementing this function
+	// a) Create a XMP object from serialized XMP packet.
+	// b) Import the data from Non-XMP content to XMP object
+	// c) Serialize the XMP object to a dynamic buffer.
+	//    Dynamic buffer is allocated using HostAPI HostStringCreateBuffer
+	// d) Copy the dynamic buffer address to xmpStr
+}
+
+// ============================================================================
+
+void PluginBase::exportFromXMP( XMP_StringPtr xmpStr ) 
+{
+	// To be implemented by the Plug-In Developer
+	// Generally a Plugin developer should follow the following steps
+	// when implementing this function
+	// a) Create a XMP object from serialized XMP packet.
+	// b) Export the data from XMP object to non-XMP Content.
+}
+
+
+// ============================================================================
+
+bool PluginBase::getFileModDate ( XMP_DateTime * modDate )
+{
+	XMP_OptionBits flags = this->getHandlerFlags();
+	const std::string & filePath = this->getPath();
+	
+	if ( (flags & kXMPFiles_HandlerOwnsFile)   ||
+		 (flags & kXMPFiles_UsesSidecarXMP)    ||
+		 (flags & kXMPFiles_FolderBasedFormat) ||
+		 filePath.empty() )
+	{
+		return false;
+	}
+
+	return GetModifyDate ( filePath.c_str(), modDate );
+}
+
+bool PluginBase::IsMetadataWritable ( )
+{
+	XMP_OptionBits flags = this->getHandlerFlags();
+	const std::string & filePath = this->getPath();
+	
+	if ( (flags & kXMPFiles_HandlerOwnsFile)   ||
+		 (flags & kXMPFiles_UsesSidecarXMP)    ||
+		 (flags & kXMPFiles_FolderBasedFormat) ||
+		 filePath.empty() )
+	{
+		XMP_Throw ( "IsMetadataWritable is not implemented for this file format", kXMPErr_PluginIsMetadataWritable );
+	}
+
+	try {
+		return Host_IO::Writable( this->getPath().c_str() );
+	} catch ( ... ) {
+
+	}
+	return false;
+}
+
+// ============================================================================
+
+bool PluginBase::checkAbort( bool doAbort /*= false*/)
+{
+	bool abort = CheckAbort( this );
+
+	if( abort && doAbort )
+	{
+		throw XMP_Error( kXMPErr_UserAbort, "User abort" );
+	}
+
+	return abort;
+}
+
+// ============================================================================
+
+
+bool PluginBase::checkFormatStandard( const std::string* path /*= NULL*/ )
+{
+	const StringPtr _path	= (const StringPtr)( path == NULL ? this->getPath().c_str() : path->c_str() );
+
+	return CheckFormatStandard( this, this->getFormat(), _path );
+}
+
+// ============================================================================
+
+bool PluginBase::getXMPStandard( std::string& xmpStr, const std::string* path /*= NULL*/, bool* containsXMP /*= NULL*/ )
+{
+	const StringPtr _path	= (const StringPtr)( path == NULL ? this->getPath().c_str() : path->c_str() );
+
+	bool ret = GetXMPStandard( this, this->getFormat(), _path, xmpStr, containsXMP );
+
+	return ret;
+}
+
+// ============================================================================
+
+#if XMP_WinBuild
+	
+static bool GetModifyDate ( const char* filePath, XMP_DateTime* modifyDate )
+{
+	bool ret = false;
+	
+	//
+	// open file
+	//
+	HANDLE fileHandle = INVALID_HANDLE_VALUE;
+	DWORD access = GENERIC_READ;	// read only
+	DWORD share  = FILE_SHARE_READ;
+
+	std::string wideName;
+	const size_t utf8Len = strlen(filePath);
+	const size_t maxLen = 2 * (utf8Len+1);
+	
+	wideName.reserve ( maxLen );
+	wideName.assign ( maxLen, ' ' );
+	
+	if( MultiByteToWideChar ( CP_UTF8, 0, filePath, -1, (LPWSTR)wideName.data(), (int)maxLen ) != 0 )
+	{
+		if ( GetFileAttributes ( (LPCWSTR)wideName.data() ) != INVALID_FILE_ATTRIBUTES )
+		{
+			fileHandle = CreateFileW ( (LPCWSTR)wideName.data(), access, share, 0, OPEN_EXISTING,
+											  (FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS), 0 );
+		}
+	}
+
+	//
+	// get the file modification time
+	//
+	if( fileHandle != INVALID_HANDLE_VALUE )
+	{
+		FILETIME binTime;
+		
+		if ( GetFileTime ( fileHandle, 0, 0, &binTime ) )
+		{
+			SYSTEMTIME utcTime;
+			
+			if ( FileTimeToSystemTime ( &binTime, &utcTime ) )
+			{
+				if ( modifyDate != NULL )
+				{
+					// Ignore the fractional seconds for consistency with UNIX and to avoid false newness even on
+					// Windows. Some other sources of time only resolve to seconds, we don't want 25.3 looking
+					// newer than 25.
+					
+					modifyDate->year		= utcTime.wYear;
+					modifyDate->month		= utcTime.wMonth;
+					modifyDate->day			= utcTime.wDay;
+					modifyDate->hasDate		= true;
+					
+					modifyDate->hour		= utcTime.wHour;
+					modifyDate->minute		= utcTime.wMinute;
+					modifyDate->second		= utcTime.wSecond;
+					modifyDate->nanoSecond	= 0;	// See note above; winTime.wMilliseconds * 1000*1000;
+					modifyDate->hasTime		= true;
+					
+					modifyDate->tzSign		= kXMP_TimeIsUTC;
+					modifyDate->tzHour		= 0;
+					modifyDate->tzMinute	= 0;
+					modifyDate->hasTimeZone	= true;
+				}
+				
+				ret = true;
+			}
+		}
+
+		CloseHandle ( fileHandle );
+	}
+	
+	return ret;
+}
+
+#endif
+	
+#if ( XMP_MacBuild || XMP_UNIXBuild )
+
+static bool GetModifyDate ( const char* filePath, XMP_DateTime* modifyDate )
+{
+	bool ret = false;
+	struct stat info;
+	
+	if ( stat ( filePath, &info ) == 0 )
+	{
+		if ( S_ISREG(info.st_mode) || S_ISDIR(info.st_mode) )
+		{
+			ret = true;
+			
+			if( modifyDate != NULL )
+			{
+				struct tm posixUTC;
+				gmtime_r ( &(info.st_mtime), &posixUTC );
+				
+				modifyDate->year		= posixUTC.tm_year + 1900;
+				modifyDate->month		= posixUTC.tm_mon + 1;
+				modifyDate->day			= posixUTC.tm_mday;
+				modifyDate->hasDate		= true;
+				
+				modifyDate->hour		= posixUTC.tm_hour;
+				modifyDate->minute		= posixUTC.tm_min;
+				modifyDate->second		= posixUTC.tm_sec;
+				modifyDate->nanoSecond	= 0;	// The time_t resolution is only to seconds.
+				modifyDate->hasTime		= true;
+				
+				modifyDate->tzSign		= kXMP_TimeIsUTC;
+				modifyDate->tzHour		= 0;
+				modifyDate->tzMinute	= 0;
+				modifyDate->hasTimeZone = true;
+			}
+		}
+	}
+	
+	return ret;
+}
+
+#endif	
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFilesPlugins/api/source/PluginBase.h b/XMPFilesPlugins/api/source/PluginBase.h
new file mode 100644
index 0000000..a827687
--- /dev/null
+++ b/XMPFilesPlugins/api/source/PluginBase.h
@@ -0,0 +1,238 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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.
+// =================================================================================================
+
+/**************************************************************************
+* @file PluginBase.h
+* @brief Basic functionality of the plugin.
+*
+* All plugin should be derived from PluginBase. This is the basic miinimum 
+* functionalty which a  plugin should provide.
+* 
+***************************************************************************/
+
+#ifndef PLUGINBASE_H
+#define PLUGINBASE_H
+
+
+#include <cstring>
+#include <vector>
+#include <string>
+#include "HostAPIAccess.h"
+#define TXMP_STRING_TYPE std::string
+#include "XMP.hpp"
+
+namespace XMP_PLUGIN
+{
+
+/** Base class for the plugin file handler. All file handler should be derived from PluginBase, 
+    which is an abstract class. Plugin developer need to implement all of the virtual functions. 
+
+	virtual void cacheFileData( const IOAdapter& file, std::string& xmpStr );
+	virtual void updateFile( const IOAdapter& file, bool doSafeUpdate, const std::string& xmpStr );
+	virtual void writeTempFile( const IOAdapter& srcFile, const IOAdapter& tmpFile, const std::string& xmpStr ) ;
+	virtual void importToXMP( XMP_StringPtr* xmpStr  );
+	virtual void exportFromXMP( XMP_StringPtr xmpStr  );
+
+    First two functions are pure virtual functions so these should be implemented for sure. 
+    Last three functions(eg. writeTempFile, importToXMP, exportToXMP) may not be required by the file
+    handler so plug-in developer may want to skip these functions. 
+
+    Plugin developer also need to implement following static functions.
+
+	static bool initialize();
+	static bool terminate();
+	static bool checkFileFormat( const std::string& filePath, const HostFileSys& file );
+	static inline bool checkFolderFormat( const std::string& rootPath, const std::string& gpName, const std::string& parentName, const std::string& leafName );
+
+	Though file handler may need only one of the last two function but both of them need to be implemented.
+	One function which is actually required, should be implemented properly and the other function will just return false.
+ */
+
+/** @class PluginBase
+ *  @brief Base class of the plugin.
+ *
+ *  All plugin should be derived from PluginBase. This is the basic minimum 
+ *  functionality which a file handler should provide.
+ */
+
+class PluginBase
+{
+public:
+	PluginBase( const std::string& filePath, XMP_Uns32 openFlags, XMP_Uns32 format = 0, XMP_Uns32 handlerFlags = 0 ) 
+		: mPath( filePath ),mHandlerFlags(handlerFlags), mOpenFlags( openFlags ), mFormat( format ) {}
+	virtual ~PluginBase(){};
+
+	/** @brief Delegator functions which will eventually call the corresponding virtual function.
+	 */
+	void cacheFileData( XMP_IORef fileRef, XMP_StringPtr* xmpStr );
+	void updateFile( XMP_IORef fileRef, bool doSafeUpdate, XMP_StringPtr xmpStr );
+	void writeTempFile( XMP_IORef srcFileRef, XMP_IORef fileRef, XMP_StringPtr xmpStr );
+	void FillMetadataFiles( StringVectorRef metadataFiles, SetStringVectorProc SetStringVector );
+	void FillAssociatedResources( StringVectorRef resourceList, SetStringVectorProc SetStringVector );
+	/** @brief Check format with standard file handler
+	*
+	* Call the standard file handler to check the format of the data source.
+	* This call expects that this is a replacement file handler. Otherwise
+	* the call fails with an exception.
+	*
+	* @param path	Pointer to the path string of the file to be checked. Pass NULL to check the
+	*				file passed in during initialization (see PluginBase::getPath() )
+	* @return		true on success
+	*/
+	bool checkFormatStandard( const std::string* path = NULL );
+
+	/** @brief Get metadata from standard file handler
+	 *
+	 * Call the standard file handler in order to retrieve XMP from it.
+	 * This call expects that session refers to a replacement file handler. Otherwise
+	 * this call fails with an exception.
+	 * Calls checkFormatStandard internally before calling the actual standard handler.
+	 *
+	 * @param xmpStr		Serialized to XMP packet. Will be populated with XMP read from standard handler.
+	 * @param path			Pointer to the path string of the file to be checked. Pass NULL to check the
+	 *						file passed in during initialization (see PluginBase::getPath() )
+	 * @param containsXMP	Returns true if the standard handler detected XMP
+	 * @return				true on success
+	 */
+	bool getXMPStandard( std::string& xmpStr, const std::string* path = NULL, bool* containsXMP = NULL );
+
+	/** @brief Get file format
+	 *
+	 * Get the file format of this handler. 
+	 * The format is defined in the plugin manifest.
+	 */
+	inline XMP_FileFormat getFormat() const					{ return mFormat; }
+
+	/** @brief Get handler flags
+	 *
+	 * Get the handler flags for the file handler related to the current format.
+	 * The flags are defined in the plugin manifest.
+	 */
+	inline XMP_OptionBits getHandlerFlags() const			{ return mHandlerFlags; }
+
+
+	/** @brief Return the path to the input file/folder
+	 *
+	 *  Return the path to the input file/folder. Empty if the data source is neither
+	 *  a file nor folder.
+	 *  @return Path string
+	 */
+	inline const std::string& getPath() const { return mPath; }
+
+	/** @brief Return the open flags.
+	 *
+	 *  Return the flags that describe the desired access
+	 *  @return flags
+	 */
+	inline XMP_OptionBits getOpenFlags() const { return mOpenFlags; }
+
+	/** @brief Ask XMPFiles if current operation should be aborted.
+	 *
+	 *  @param doAbort	If true and the operation should be aborted then
+	 *					abort it by throwing an exception
+	 *  @return true if the current operation should be aborted
+	 */
+	bool checkAbort( bool doAbort = false );
+
+	/** @brief Return the modification date/time of the metadata file
+	 *
+	 * The purpose of the method getFileModDate is to return the most recent file system modification timestamp 
+	 * for any associated file containing metadata, XMP or non-XMP. In the case of a typical single file with 
+	 * embedded metadata this is that one file. In the case of embedded non-XMP and sidecar XMP, this is the more 
+	 * recent of both files.
+	 * 
+	 * The default implementation only cares about the case of a single file with embedded metadata.
+	 * All other cases will fail and return false.
+	 *
+	 * @param modDate	A required pointer to return the modification date.
+	 * @return			True if a modification date could be determined
+	 *
+	 */
+	virtual bool getFileModDate ( XMP_DateTime* modDate );
+	virtual void FillMetadataFiles ( std::vector<std::string> * metadataFiles );
+
+	 /** @brief Return the list of all resources associated to the opened filePath
+	 *
+	 * The purpose of the method FillAssociatedResources is to return all files, XMP or non-XMP, 
+	 * that are associated to the current opened filePath.In the case of a typical single file with 
+	 * embedded metadata this is that one file. In the simple sidecar case one or two paths will be 
+     * returned, one if there is no sidecar XMP and two if sidecar XMP exists. For folder-based 
+     * handlers paths to all associated files is returned, including the files and folders necessary
+     * to identify the format.In general, all the returned paths are existent.
+	 * 
+	 * The default implementation only cares about the case of a single file with embedded metadata.
+	 * All other cases will fail and return false.
+	 *
+	 * @param resourceList	A required pointer to return the list of all associated resources.
+	 *
+	 */
+	virtual void FillAssociatedResources ( std::vector<std::string> * resourceList );
+
+	
+	 /** @brief Returns true if the Metadata can be updated for the opened filePath
+	 *
+	 * The purpose of the method IsMetadataWritable is to to check if metadata can be updated or 
+	 * written to the format. In the case of folder-based video formats only if all the metadata  
+	 * files can be written to, true is returned.In other words, false is returned for a 
+     * partial-write state of metadata files in folder-based media formats. 
+	 * 
+	 * The default implementation only cares about the case of a single file with embedded metadata.
+	 * All other cases will fail and return false.
+	 *
+	 * @return	True if the metadata can be updated, otherwise false
+	 *
+	 */
+	virtual bool IsMetadataWritable ( );
+
+	/** Virtual functions which need to be implemented by the plugin Developer in the derived class. 
+	 */
+	virtual void cacheFileData( const IOAdapter& file, std::string& xmpStr ) = 0;
+	virtual void updateFile( const IOAdapter& file, bool doSafeUpdate, const std::string& xmpStr ) = 0;
+	virtual void writeTempFile( const IOAdapter& srcFile, const IOAdapter& tmpFile, const std::string& xmpStr ) {}
+	virtual void importToXMP( XMP_StringPtr* xmpStr );
+	virtual void exportFromXMP( XMP_StringPtr xmpStr );
+private:
+	std::string		mPath;
+	XMP_OptionBits	mHandlerFlags;
+	XMP_OptionBits	mOpenFlags;
+	XMP_FileFormat	mFormat;
+};
+
+
+/** External functions which need to be implemented by Plugin Developer.
+ *  This function are unique for a plugins. Unlike PluginBase class which is used 
+ *  for each file handler, these function are written only once for each plug-in.
+ */
+ 
+/** @brief Returns the unique identifier string of the plug-in.
+ *
+ *  Return the uid string of the plugin. This string should match with the string which is present in
+ *  plugins resource file "MODULE_IDENTIFIER.txt".
+ */
+const char* GetModuleIdentifier();
+
+/** @brief Do additional steps to setup the plugin during plugin initialization.
+ *
+ *  This function will be called during initialization of the plugin and can be
+ *  used to request additional host API suites using RequestAPISuite().
+ *  The plugin initialization will be aborted if false is returned.
+ */
+bool SetupPlugin();
+
+/** @brief Register the file handlers available in the plug-in. 
+ *
+ *  This function need to be implemented by plugin-developer. This function register the file handlers available in the plugin. 
+ *  Plug-in developer may want to register only few of the available plug-ins as per requirement. 
+ *  Only registered plug-in will be loaded by the XMPFiles.
+ */
+void RegisterFileHandlers();
+	
+} //namespace XMP_PLUGIN
+#endif // PLUGINBASE_H
+
diff --git a/XMPFilesPlugins/api/source/PluginConst.h b/XMPFilesPlugins/api/source/PluginConst.h
new file mode 100644
index 0000000..d17e8fb
--- /dev/null
+++ b/XMPFilesPlugins/api/source/PluginConst.h
@@ -0,0 +1,59 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 __PLUGIN_CONST_H__
+#define __PLUGIN_CONST_H__
+
+#include "XMP_Const.h"
+
+typedef void * StringVectorRef;
+typedef void (* SetStringVectorProc) ( StringVectorRef vectorRef, XMP_StringPtr * arrayPtr, XMP_Uns32 stringCount );
+
+enum 
+{
+	/// Plugin-internal failures
+	kXMPErr_PluginInternal			      = 500,
+	/// 
+	kXMPErr_PluginInitialized		      = 501,
+	/// 
+	kXMPErr_PluginTerminate			      = 502,
+	/// 
+	kXMPErr_PluginSessionInit		      = 503,
+	/// 
+	kXMPErr_PluginSessionTerm		      = 504,
+	/// 
+	kXMPErr_PluginCacheFileData		      = 505,
+	/// 
+	kXMPErr_PluginUpdateFile		      = 506,
+	/// 
+	kXMPErr_PluginWriteTempFile		      = 507,
+	/// 
+	kXMPErr_PluginImportToXMP		      = 508,
+	/// 
+	kXMPErr_PluginExportFromXMP		      = 509,
+	/// 
+	kXMPErr_PluginCheckFileFormat	      = 510,
+	/// 
+	kXMPErr_PluginCheckFolderFormat	      = 511,
+	///
+	kXMPErr_SetHostAPI	                  = 512,
+	///
+	kXMPErr_PluginGetFileModDate          = 513,
+	///
+	kXMPErr_PluginFillMetadataFiles       = 514,
+	///
+	kXMPErr_PluginFillAssociatedResources = 515,
+	///
+	kXMPErr_PluginIsMetadataWritable	  = 516,
+	
+	/// last plugin error, please add new errors before this one
+	kXMPErr_PluginLastError
+};
+
+#endif	// __PLUGIN_CONST_H__
diff --git a/XMPFilesPlugins/api/source/PluginHandler.h b/XMPFilesPlugins/api/source/PluginHandler.h
new file mode 100644
index 0000000..21c3d43
--- /dev/null
+++ b/XMPFilesPlugins/api/source/PluginHandler.h
@@ -0,0 +1,350 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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.
+// =================================================================================================
+
+/**************************************************************************
+* @file Plugin_Handler.h
+* @brief Function prototypes for the XMP Plugin.
+*
+* This contains the prototype for the plug-in based File Handlers. Plug-in need 
+* to implement exported function InitializePlugin.
+* 
+***************************************************************************/
+
+#ifndef __Plugin_Handler_hpp__
+#define __Plugin_Handler_hpp__	1
+#include "PluginConst.h"
+
+// versioning
+#define XMP_PLUGIN_VERSION_1	1	// CS6
+#define XMP_PLUGIN_VERSION_2	2	//
+#define XMP_PLUGIN_VERSION_3	3	// CS7
+
+#define XMP_PLUGIN_VERSION		XMP_PLUGIN_VERSION_3
+
+namespace XMP_PLUGIN
+{
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__GNUC__)
+	#define DllExport		__attribute__((visibility("default")))
+#else
+	#define DllExport		__declspec( dllexport )
+#endif
+
+struct PluginAPI;
+struct HostAPI;
+
+typedef PluginAPI*		PluginAPIRef;
+typedef HostAPI*		HostAPIRef;
+typedef void*			SessionRef;
+typedef void*			XMP_IORef;
+typedef int				XMPErrorID;
+
+/** @struct WXMP_Error
+ *
+ *  This is used to pass error number and error message by the host(the XMPFiles) and the plugin.
+ *  All plugin APIs and host APIs return kXMPErr_NoError on success otherwise return error id.
+ *  All such APIs also take 'WXMP_Error wError' as the last argument. This structure will be filled
+ *  by the error id and message if any error is encountered. The return value and wError->mErrorID
+ *  contains the same number.
+ */
+struct WXMP_Error
+{
+   XMPErrorID		mErrorID;
+   XMP_StringPtr	mErrorMsg;
+   WXMP_Error() : mErrorID( kXMPErr_NoError ), mErrorMsg( NULL ) {}
+};
+
+
+/** 
+ *  Function pointer to the function TerminatePlugin which will be called
+ *  at the time of unloading of the plugin.
+ *
+ *  @param wError	WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return			kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*TerminatePluginProc)( WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function SetHostAPIProc which will be called to 
+ *  set the hostAPI. These host APIs will be used in the plugin to use the Host(the XMPFiles) functionality.
+ *
+ *  @param hostAPI		An API that is provided by the host (the XMPFiles) that can be used by a plugin implementaion.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*SetHostAPIProc)( HostAPIRef hostAPI, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function InitializeSession which will be called
+ *  at the time of creating instance of the file handler with /param uid for file /param filePath.
+ *
+ *  @param uid				Unique identifier string (uid) of the file handler whose instance is to be created.
+ *  @param filePath			FilePath of the file which is to be opened.
+ *  @param format			File format id for the session
+ *	@param handlerFlags		Handler flags as defined in the plugin manifest
+ *  @param openFlags		Flags that describe the desired access.
+ *  @param session			Pointer to a file Handler instance.
+ *  @return					kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*InitializeSessionProc)( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_Uns32 format, XMP_Uns32 handlerFlags, XMP_Uns32 openFlags, SessionRef * session, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function TerminateSession which will be called
+ *  at the time of terminating instance of the file handler.
+ *
+ *  @param session		File Handler instance.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*TerminateSessionProc)( SessionRef session, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function CheckFileFormat which will be called to
+ *  check whether the input file /param filePath is supported by the file handler with /param uid.
+ *
+ *  @param uid			Unique identifier string (uid) of the file handler.
+ *  @param filePath		FilePath of the file which is to be opened.
+ *  @para fileRef		File reference to the input file.
+ *  @param result		[out] pointer to a boolean which will be true if /param filePath is supported by the file handler.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*CheckSessionFileFormatProc)( XMP_StringPtr uid, XMP_StringPtr filePath, XMP_IORef fileRef, XMP_Bool * result, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function CheckFolderFormat which will be called to
+ *  check whether the input folder name is supported by the file handler with /param uid.
+ *
+ *  @param uid Unique identifier string (uid) of the file handler.
+ *  @param rootPath
+ *  @param gpName
+ *  @param parentName
+ *  @param leafName
+ *  @param result		[out] pointer to a boolen which will be true if it is supported by the file handler.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*CheckSessionFolderFormatProc)( XMP_StringPtr uid, XMP_StringPtr rootPath, XMP_StringPtr gpName, XMP_StringPtr parentName, XMP_StringPtr leafName, XMP_Bool * result, WXMP_Error * wError );
+
+/**
+ * Function type for GetFileModDate. Returns the most recent file modification date for any file
+ * associated with the path that is read to obtain metadata. A static routine in XMPFiles.
+ *
+ *  @param session		File Handler instance.
+ *	@param ok			A pointer to a XMP_Bool for the eventual public API function result.
+ *	@param modDate		A pointer to the date to be returned.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ */
+typedef XMPErrorID (*GetSessionFileModDateProc) ( SessionRef session, XMP_Bool * ok, XMP_DateTime * modDate, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function CacheFileData which will be called to
+ *  cache xmpData from the file format of the session.
+ *
+ *  @param session		File Handler instance.
+ *  @param fileRef		File reference of the file format which may be needed to read the data.
+ *  @param xmpStr		A pointer to a buffer where xmpData will be stored.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*CacheFileDataProc)( SessionRef session, XMP_IORef fileRef, XMP_StringPtr* xmpStr, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function UpdateFileData which will be called to
+ *  update the file format of the session with the /param xmpPacket.
+ *
+ *  @param session		File Handler instance.
+ *  @param fileRef		File reference of the file format which may be needed to read the data.
+ *  @param doSafeUpdate If true, file is saved in safe mode that means it write into a temporary file then swap for crash safety.
+ *  @param xmpStr		A pointer to a buffer which contain the xmpData.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*UpdateFileProc)( SessionRef session, XMP_IORef fileRef, XMP_Bool doSafeUpdate, XMP_StringPtr xmpStr, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function WriteTempFile. It write the entire file format into a
+ *  temporary file /param fileRef.
+ *
+ *  @param session		File Handler instance.
+ *  @param orgFileRef	File reference to the original source file.
+ *  @param fileRef		File reference to a temporary file where file format will be written into.
+ *  @param xmpStr		A pointer to a buffer which contain the xmpData.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*WriteTempFileProc)( SessionRef session, XMP_IORef orgFileRef, XMP_IORef fileRef, XMP_StringPtr xmpStr, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function ImportToXMP. Any non metadata from a file that is supposed 
+ *  to be mapped into a XMP namespace should be added to the XMP packet using this function.
+ *
+ *  @param session		File Handler instance.
+ *  @param xmp			XMPMeta reference which will be filled by the function.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*ImportToXMPProc)( SessionRef session, XMPMetaRef xmp, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function ExportFromXMP. The XMP packet is supposed to be 
+ *  written to the file. If the packet contains any data that should be mapped back to
+ *  native (non-XMP) metadata values then that should happen here.
+ *
+ *  @param session		File Handler instance.
+ *  @param xmp			XMPMeta reference where the xmpData will be picked from.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*ExportFromXMPProc)( SessionRef session, XMPMetaRef xmp, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function FillMetadataFiles. This function returns the list of file paths
+ *  associated with storing the metadata information.
+ *
+ *  @param session					File Handler instance.
+ *  @param metadataFiles			pointer of std::vector of std::string
+ *  @param SetClientStringVector	pointer to client provided function to fill the vector with strings.
+ *  @param wError					WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return							kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*FillMetadataFilesProc)( SessionRef session, StringVectorRef metadataFiles,
+	SetStringVectorProc SetClientStringVector, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function FillAssociatedResources. This function returns the list of all file paths
+ *  associated to the opened session 
+ *
+ *  @param session					File Handler instance.
+ *  @param resourceList			    pointer of std::vector of std::string
+ *  @param SetClientStringVector	pointer to client provided function to fill the vector with strings.
+ *  @param wError					WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return							kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*FillAssociatedResourcesProc)( SessionRef session, StringVectorRef resourceList,
+	SetStringVectorProc SetClientStringVector, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function ImportToXMP. Any non metadata from a file that is supposed 
+ *  to be mapped into a XMP namespace should be added to the XMP packet using this function.
+ *
+ *  @param session		File Handler instance.
+ *  @param xmpStr		A pointer to a buffer which contain the xmpData.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*ImportToXMPStringProc)( SessionRef session, XMP_StringPtr* xmpStr , WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function ExportFromXMP. The XMP packet is supposed to be 
+ *  written to the file. If the packet contains any data that should be mapped back to
+ *  native (non-XMP) metadata values then that should happen here.
+ *
+ *  @param session		File Handler instance.
+ *  @param xmpStr		A pointer to a buffer which contain the xmpData.
+ *  @param wError		WXMP_Error structure which will be filled by the API if any error occurs.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*ExportFromXMPStringProc)( SessionRef session, XMP_StringPtr xmpStr, WXMP_Error * wError );
+
+/** 
+ *  Function pointer to the function IsMetadataWritable. This function returns if the metadata can be updated  
+ *  for the opened session 
+ *
+ *  @param session					File Handler instance.
+ *  @param result					[out] pointer to a boolen which will be true if the metadata can be updated.
+ *  @return							kXMPErr_NoError on success otherwise error id of the failure.
+ */
+typedef XMPErrorID (*IsMetadataWritableProc)( SessionRef session, XMP_Bool * result, WXMP_Error * wError );
+
+
+/** @struct PluginAPI
+ *  @brief This is a Plugin API structure.
+ *
+ *  This will consists of init/term of the plugin, init/term of a file handler session,
+ *  read from fie and update file.
+ */
+struct PluginAPI
+{
+	/** 
+	 *  Size of the PluginAPI structure.
+	 */
+	XMP_Uns32						mSize;
+   
+	/** 
+	 *  Version number of the plugin.
+	 */
+	XMP_Uns32						mVersion;
+	
+	// version 1
+	TerminatePluginProc				mTerminatePluginProc;
+	SetHostAPIProc					mSetHostAPIProc;
+	
+	InitializeSessionProc			mInitializeSessionProc;
+	TerminateSessionProc			mTerminateSessionProc;
+	
+	CheckSessionFileFormatProc		mCheckFileFormatProc;
+	CheckSessionFolderFormatProc	mCheckFolderFormatProc;
+	GetSessionFileModDateProc		mGetFileModDateProc;
+
+	CacheFileDataProc				mCacheFileDataProc;
+	UpdateFileProc					mUpdateFileProc;
+	WriteTempFileProc				mWriteTempFileProc;
+	
+	ImportToXMPProc					mImportToXMPProc;			// deprecated in version 2 in favour of mImportToXMPStringProc
+	ExportFromXMPProc				mExportFromXMPProc;			// deprecated in version 2 in favour of mExportFromXMPStringProc
+
+	// version 2
+	FillMetadataFilesProc			mFillMetadataFilesProc;
+	ImportToXMPStringProc			mImportToXMPStringProc;
+	ExportFromXMPStringProc			mExportFromXMPStringProc;
+	FillAssociatedResourcesProc     mFillAssociatedResourcesProc;
+
+	// version 3
+	IsMetadataWritableProc			mIsMetadataWritableProc;
+};
+
+
+/** @brief Plugin Entry point (legacy).
+ *
+ *  This is the legacy entry point for the plugin. It will fill \param pluginAPI inside the plugin.
+ * 
+ *  @param moduleID		It is the module identifier string which is present in plugin's resource 
+ *						file 'MODULE_IDENTIFIER.txt". It should be same as the one which is present in plugin's library.
+ *  @param pluginAPI	structure pointer to PluginAPI which will be filled by the plugin.
+ *  @param wError		structure pointer to WXMP_Error which will be filled in case of an error.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+DllExport XMPErrorID InitializePlugin( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXMP_Error * wError );
+typedef XMPErrorID (*InitializePluginProc)( XMP_StringPtr moduleID, PluginAPIRef pluginAPI, WXMP_Error * wError );
+
+/** @brief Plugin Entry point.
+ *
+ *  This is the entry point for the plugin. It will fill \param pluginAPI inside the plugin.
+ * 
+ *  @param moduleID		It is the module identifier string which is present in plugin's resource 
+ *						file 'MODULE_IDENTIFIER.txt". It should be same as the one which is present in plugin's library.
+ *  @param hostAPI		structure pointer to HostAPI which will be stored by the plugin.
+ *  @param pluginAPI	structure pointer to PluginAPI which will be filled by the plugin.
+ *  @param wError		structure pointer to WXMP_Error which will be filled in case of an error.
+ *  @return				kXMPErr_NoError on success otherwise error id of the failure.
+ */
+DllExport XMPErrorID InitializePlugin2( XMP_StringPtr moduleID, HostAPIRef hostAPI, PluginAPIRef pluginAPI, WXMP_Error * wError );
+typedef XMPErrorID (*InitializePlugin2Proc)( XMP_StringPtr moduleID, HostAPIRef hostAPI, PluginAPIRef pluginAPI, WXMP_Error * wError );
+
+#ifdef __cplusplus
+}
+#endif
+
+} //namespace XMP_PLUGIN
+#endif // __Plugin_Handler_hpp__
diff --git a/XMPFilesPlugins/api/source/PluginRegistry.cpp b/XMPFilesPlugins/api/source/PluginRegistry.cpp
new file mode 100644
index 0000000..1f7c340
--- /dev/null
+++ b/XMPFilesPlugins/api/source/PluginRegistry.cpp
@@ -0,0 +1,128 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 "PluginRegistry.h"
+#include "PluginBase.h"
+
+namespace XMP_PLUGIN
+{
+
+// static class member initialization
+PluginRegistry* PluginRegistry::msRegistry = NULL;
+
+PluginRegistry::~PluginRegistry()
+{
+	RegistryEntryMap::iterator iter = msRegistry->mRegistryEntries.begin();
+	RegistryEntryMap::iterator iterEnd = msRegistry->mRegistryEntries.end();
+	
+	for( ; iter != iterEnd; )
+	{
+		RegistryEntryMap::iterator temp = iter++;
+		delete temp->second;
+	}
+}
+
+// ============================================================================
+
+/*static*/
+void PluginRegistry::registerHandler( const PluginCreatorBase* inCreator )
+{
+	if( msRegistry == NULL )
+		msRegistry = new PluginRegistry();
+	
+	msRegistry->mRegistryEntries[inCreator->GetUID()] = inCreator;
+}
+
+// ============================================================================
+
+/*static*/
+PluginBase* PluginRegistry::create( const std::string& uid, const std::string& filePath, XMP_Uns32 openFlags, XMP_Uns32 format, XMP_Uns32 handlerFlags )
+{
+	if( msRegistry != NULL )
+	{
+		RegistryEntryMap::const_iterator iter = msRegistry->mRegistryEntries.find(uid);
+		if( iter != msRegistry->mRegistryEntries.end() )
+			return iter->second->create(filePath, openFlags, format, handlerFlags);
+	}
+	
+	return NULL;
+}
+
+// ============================================================================
+
+/*static*/
+bool PluginRegistry::checkFileFormat( const std::string& uid, const std::string& filePath, const IOAdapter& file )
+{
+	if( msRegistry != NULL )
+	{
+		RegistryEntryMap::const_iterator iter = msRegistry->mRegistryEntries.find(uid);
+		if( iter != msRegistry->mRegistryEntries.end() )
+			return iter->second->checkFileFormat( filePath, file );
+	}
+	
+	return false;
+}
+
+// ============================================================================
+
+/*static*/
+bool PluginRegistry::checkFolderFormat( const std::string& uid, const std::string& rootPath, const std::string& gpName, const std::string& parentName, const std::string& leafName )
+{
+	if( msRegistry != NULL )
+	{
+		RegistryEntryMap::const_iterator iter = msRegistry->mRegistryEntries.find(uid);
+		if( iter != msRegistry->mRegistryEntries.end() )
+			return iter->second->checkFolderFormat( rootPath, gpName, parentName, leafName );
+	}
+	
+	return false;
+}
+
+// ============================================================================
+
+/*static*/
+bool PluginRegistry::initialize()
+{
+	if( msRegistry != NULL )
+	{			
+		RegistryEntryMap::const_iterator iter = msRegistry->mRegistryEntries.begin();
+		RegistryEntryMap::const_iterator iterEnd = msRegistry->mRegistryEntries.end();
+		
+		for( ; iter != iterEnd; ++iter )
+		{
+			if( iter->second->initialize() == false )
+				return false;
+		}
+	}
+	
+	return true;
+}
+
+// ============================================================================
+
+/*static*/
+bool PluginRegistry::terminate()
+{
+	if( msRegistry != NULL )
+	{
+		RegistryEntryMap::const_iterator iter = msRegistry->mRegistryEntries.begin();
+		RegistryEntryMap::const_iterator iterEnd = msRegistry->mRegistryEntries.end();
+		
+		for( ; iter != iterEnd; ++iter )
+		{
+			iter->second->terminate();
+		}
+		
+		delete msRegistry;
+		msRegistry = NULL;
+	}
+	return true;
+}
+
+} //namespace XMP_PLUGIN
diff --git a/XMPFilesPlugins/api/source/PluginRegistry.h b/XMPFilesPlugins/api/source/PluginRegistry.h
new file mode 100644
index 0000000..acfe3bf
--- /dev/null
+++ b/XMPFilesPlugins/api/source/PluginRegistry.h
@@ -0,0 +1,199 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2011 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 PLUGINREGISTRY_H
+#define PLUGINREGISTRY_H
+#include "PluginHandler.h"
+#include "HostAPIAccess.h"
+#include "PluginBase.h"
+#include <map>
+#include <string>
+
+namespace XMP_PLUGIN
+{
+
+class PluginCreatorBase;
+class PluginBase;
+
+/** @class PluginRegistry
+ *  @brief It registers file handler in the plugin.
+ *  It is singleton class which register the file handlers in one plugin.
+ */
+
+class PluginRegistry
+{
+public:
+	
+	/** @brief Register file handlers.
+	 *  @param pointer to PluginCreator, created with the file handler which needs to be registered.
+	 *  @return Void.
+	 */
+	static void registerHandler( const PluginCreatorBase* inCreator );
+
+	/** @brief Initialize all the registered file handlers.
+	 *  @return Void.
+	 */
+	static bool initialize();
+	
+	/** @brief Terminate all the registered file handlers.
+	 *  @return Void.
+	 */
+	static bool terminate();
+
+	/** @brief Create instance of the file handler with the given uid.
+	 *  @param uid Unique identifier string (uid) of the file handler whose instance is to be created.
+	 *  @param openFlags Flags that describe the desired access.
+	 *	@param format File format id the class is created for
+	 *	@param handlerFlags	According handler flags
+	 *  @param filePath FilePath of the file which is to be opened.
+	 *  @return Pointer to file Handler instance.
+	 */
+	static PluginBase* create( const std::string& uid, const std::string& filePath, XMP_Uns32 openFlags, XMP_Uns32 format, XMP_Uns32 handlerFlags );
+	
+	/** @brief Check whether the input file /a filePath is supported by the file handler with uid /a uid.
+	 *  @param uid Unique identifier string (uid) of the file handler.
+	 *  @param filePath FilePath of the file which is to be opened.
+	 *  @return true if input file is supported by the file handler otherwise false.
+	 */
+	static bool checkFileFormat( const std::string& uid, const std::string& filePath, const IOAdapter& file );
+	static bool checkFolderFormat( const std::string& uid, const std::string& rootPath, const std::string& gpName, const std::string& parentName, const std::string& leafName );
+	
+private:
+
+	struct StringCompare : std::binary_function< const std::string &, const std::string &, bool >
+	{
+		bool operator()( const std::string & a, const std::string & b ) const
+		{
+			return ( a.compare(b) < 0 );
+		}
+	};
+	typedef std::map<std::string, const PluginCreatorBase*,	StringCompare>		RegistryEntryMap;
+	
+	PluginRegistry(){}
+	~PluginRegistry();
+	
+	RegistryEntryMap mRegistryEntries;
+	static PluginRegistry* msRegistry;
+};
+
+
+/** @class PluginCreatorBase
+ *  @brief It is a base class which help in registering the file handler.
+ *  
+ *  The use of this class is only enabling calling of some basic functions on the template class 
+ *  using the base class pointer. For actual details see class PluginCreator
+ *  
+ *  @see PluginCreator
+ */
+
+class PluginCreatorBase
+{
+public:
+	PluginCreatorBase() {}
+	virtual ~PluginCreatorBase() {}
+
+	virtual PluginBase* create( const std::string& filePath, XMP_Uns32 openFlags, XMP_Uns32 format, XMP_Uns32 handlerFlags ) const = 0;
+	
+	/** A File handler should provide either checkFileFormat if it is OwningHandler or NormalHandler
+	 *  OR it should provide checkFolderFormat if it is FolderHandler. Default implementation returns false
+	 *  which mean the handler does not support the file format.
+	 */
+	virtual bool checkFileFormat( const std::string& filePath, const IOAdapter& file ) const = 0;
+	virtual bool checkFolderFormat( const std::string& rootPath, const std::string& gpName, const std::string& parentName, const std::string& leafName ) const = 0;
+	
+	virtual const std::string & GetUID() const = 0;
+	virtual bool initialize() const = 0;
+	virtual bool terminate() const = 0;
+};
+
+/** @class PluginCreator
+ *  @brief This template class is used to register the file handler 'TFileHandler'.
+ *  TFileHandler is the actual file handler which needs to be registered.
+ *  The file handler need to implement following static functions.
+ *  TFileHandler::checkFileFormat(); // Required for checking the format.
+ *  TFileHandler::initialize(); // Initialize the file handler.
+ *  TFileHandler::terminate(); // Terminate the file handler.
+ */
+
+template<typename TFileHandler>
+class PluginCreator : public PluginCreatorBase
+{
+public:
+	
+	/** @brief CTOR
+	 *
+	 * @param inUID unique identifier string (uid) of the file handler.
+	 * @param format id type of the file format, currently this argument is not being used in the implementation.
+	 * @param flags File handler's flag. 
+	 */
+	PluginCreator( const char* inUID ) 
+		: mUID( inUID )
+	{}
+
+	/** @deprecated */
+	PluginCreator( const char* inUID, XMP_FileFormat , XMP_OptionBits ) 
+	: mUID( inUID )
+	{}
+	
+	/** @brief Create instance of file handler TFileHandler.
+	 *  @param filePath FilePath of the file which is to be opened.
+	 *  @param openFlags Flags that describe the desired access.
+	 *	@param format File format id the class is created for
+	 *	@param handlerFlags	According handler flags
+	 *  @return Pointer to file Handler instance.
+	 */
+	inline PluginBase* create( const std::string& filePath, XMP_Uns32 openFlags, XMP_Uns32 format, XMP_Uns32 handlerFlags ) const
+	{
+		TFileHandler* instance = new TFileHandler(filePath, openFlags, format, handlerFlags);
+		PluginBase* handler = dynamic_cast<PluginBase*>(instance);
+
+		return handler;
+	}
+
+	/** @brief Check whether the input file /a filePath is supported by file handler TFileHandler.
+	 *  @param filePath FilePath of the file which is to be opened.
+	 *  @return true if input file is supported by TFileHandler otherwise false.
+	 */
+	inline bool checkFileFormat( const std::string& filePath, const IOAdapter& file ) const
+	{
+		return TFileHandler::checkFileFormat( filePath, file );
+	}
+
+	inline bool checkFolderFormat( const std::string& rootPath, const std::string& gpName, const std::string& parentName, const std::string& leafName ) const
+	{
+		return TFileHandler::checkFolderFormat( rootPath, gpName, parentName, leafName );
+	}
+
+	inline const std::string & GetUID() const
+	{ 
+		return mUID; 
+	}
+
+	/** @brief initialize the file handler.
+	 *  @return Void.
+	 */
+	inline bool initialize() const
+	{
+		return TFileHandler::initialize();
+	}
+
+	/** @brief terminate the file handler.
+	 *  @return Void.
+	 */
+	inline bool terminate() const
+	{
+		return TFileHandler::terminate();
+	}
+
+private:
+	std::string			mUID;
+};
+
+} //namespace XMP_PLUGIN
+#endif // PLUGINREGISTRY_H
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..e63fadb
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,1198 @@
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.15'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.15.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/ax_cflags_gcc_option.m4])
+m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
+m4_include([m4/ax_ld_check_flag.m4])
+m4_include([m4/ax_tls.m4])
+m4_include([m4/boost.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..9bb10bc
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+#
+# part of libopenraw
+#
+
+
+topsrcdir=`dirname $0`
+if test x$topsrcdir = x ; then
+        topsrcdir=.
+fi
+
+builddir=`pwd`
+
+AUTOCONF=autoconf
+
+LIBTOOL=$(command -v glibtool)
+if [ -z "$LIBTOOL" ]; then
+    LIBTOOL=libtool
+fi
+
+LIBTOOLIZE=$(command -v glibtoolize)
+if [ -z "$LIBTOOLIZE" ]; then
+    LIBTOOLIZE=libtoolize
+fi
+
+
+AUTOMAKE=automake
+ACLOCAL=aclocal
+
+cd $topsrcdir
+
+rm -f autogen.err
+$LIBTOOLIZE --force
+$ACLOCAL -I m4 >> autogen.err 2>&1
+
+#autoheader --force
+$AUTOMAKE --add-missing --copy --foreign 
+$AUTOCONF
+
+cd $builddir
+
+
+if [ "$NOCONFIGURE" = "" ]; then
+    if test -z "$*"; then
+        echo "I am going to run ./configure with --enable-maintainer-mode"
+	echo "If you wish to pass any to it, please specify them on "
+	echo "the $0 command line."
+    fi
+    echo "Running configure..."
+    $topsrcdir/configure --enable-maintainer-mode "$@"
+fi
diff --git a/build/GNUmakefile.am b/build/GNUmakefile.am
new file mode 100644
index 0000000..1cdb0f1
--- /dev/null
+++ b/build/GNUmakefile.am
@@ -0,0 +1,37 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+noinst_HEADERS=XMP_BuildInfo.h
\ No newline at end of file
diff --git a/build/GNUmakefile.in b/build/GNUmakefile.in
new file mode 100644
index 0000000..bb0b975
--- /dev/null
+++ b/build/GNUmakefile.in
@@ -0,0 +1,566 @@
+# GNUmakefile.in generated by automake 1.15.1 from GNUmakefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = build
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/GNUmakefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/GNUmakefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_HEADERS = XMP_BuildInfo.h
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/GNUmakefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/GNUmakefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/GNUmakefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign build/GNUmakefile
+GNUmakefile: $(srcdir)/GNUmakefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: GNUmakefile $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f GNUmakefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f GNUmakefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: GNUmakefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/build/XMP_BuildInfo.h b/build/XMP_BuildInfo.h
new file mode 100644
index 0000000..35fe00e
--- /dev/null
+++ b/build/XMP_BuildInfo.h
@@ -0,0 +1,17 @@
+#ifndef __XMP_BuildInfo_h__
+#define __XMP_BuildInfo_h__ 1
+
+/*
+// =================================================================================================
+// Copyright 2002 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.
+// =================================================================================================
+*/
+
+#define kXMP_Copyright Copyright (c) 2013
+#define kXMP_CopyrightStr "Copyright (c) 2013"
+
+#endif	/* __XMP_BuildInfo_h__ */
diff --git a/compile b/compile
new file mode 100755
index 0000000..a85b723
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.guess b/config.guess
new file mode 100755
index 0000000..dc84c68
--- /dev/null
+++ b/config.guess
@@ -0,0 +1,1501 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
+
+timestamp='2009-11-20'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[456])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+        exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config.sub b/config.sub
new file mode 100755
index 0000000..2a55a50
--- /dev/null
+++ b/config.sub
@@ -0,0 +1,1705 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
+
+timestamp='2009-11-20'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+        -bluegene*)
+	        os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+        -os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+        mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+    	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/configure b/configure
new file mode 100755
index 0000000..b5d7eb7
--- /dev/null
+++ b/configure
@@ -0,0 +1,19928 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for exempi 2.4.5.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='exempi'
+PACKAGE_TARNAME='exempi'
+PACKAGE_VERSION='2.4.5'
+PACKAGE_STRING='exempi 2.4.5'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+XMPCORE_CPPFLAGS
+VALGRIND
+WITH_UNIT_TEST_FALSE
+WITH_UNIT_TEST_TRUE
+UNIX_ENV_FALSE
+UNIX_ENV_TRUE
+MAC_ENV_FALSE
+MAC_ENV_TRUE
+EXEMPI_PLATFORM_DEF
+BOOST_UNIT_TEST_FRAMEWORK_LIBS
+BOOST_LDPATH
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS
+BOOST_CPPFLAGS
+DISTCHECK_CONFIGURE_FLAGS
+BOOST_ROOT
+HAVE_SYMBOLS_FILE_FALSE
+HAVE_SYMBOLS_FILE_TRUE
+HAVE_CXX11
+CXXCPP
+CPP
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LIBTOOL
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+pkgconfigdir
+EXEMPI_INCLUDE_BASE
+EXEMPI_MAJOR_VERSION
+EXEMPI_VERSION_INFO
+EXEMPI_CURRENT_MIN
+EXEMPI_CURRENT
+EXEMPI_AGE
+EXEMPI_REVISION
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_maintainer_mode
+enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+with_darwinports
+with_fink
+enable_unittest
+with_boost
+enable_static_boost
+enable_asan
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+LT_SYS_LIBRARY_PATH
+CPP
+CXXCPP
+BOOST_ROOT'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures exempi 2.4.5 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/exempi]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of exempi 2.4.5:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-unittest=yes|no
+                          enable the unittest. requires boost (default is yes)
+  --enable-static-boost   Prefer the static boost libraries over the shared
+                          ones [no]
+  --enable-asan    Turn on address sanitizer
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+  --with-darwinports     add /opt/local/... to CPP/LDFLAGS (Mac OSX)
+  --with-fink          add /sw/... to CPP/LDFLAGS (Mac OSX)
+  --with-boost=DIR        prefix of Boost 1.48.0 [guess]
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
+  CPP         C preprocessor
+  CXXCPP      C++ preprocessor
+  BOOST_ROOT  Location of Boost installation
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+exempi configure 2.4.5
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_cxx_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_header_mongrel
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by exempi $as_me 2.4.5, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+am__api_version='1.15'
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='exempi'
+ VERSION='2.4.5'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+
+EXEMPI_REVISION=5
+
+EXEMPI_AGE=4
+
+EXEMPI_CURRENT=7
+
+EXEMPI_CURRENT_MIN=`expr $EXEMPI_CURRENT - $EXEMPI_AGE`
+
+EXEMPI_VERSION_INFO=$EXEMPI_CURRENT:$EXEMPI_REVISION:$EXEMPI_AGE
+
+
+EXEMPI_MAJOR_VERSION=2.0
+
+
+EXEMPI_INCLUDE_BASE=exempi-$EXEMPI_MAJOR_VERSION
+
+
+pkgconfigdir='${libdir}/pkgconfig'
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.6'
+macro_revision='2.4.6'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[012][,.]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+func_stripname_cnf ()
+{
+  case $2 in
+  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
+  esac
+} # func_stripname_cnf
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
+	else
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report what library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+
+      if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          hardcode_direct_CXX=no
+          hardcode_direct_absolute_CXX=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          no_undefined_flag_CXX='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+	    hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' $wl-bernotok'
+	    allow_undefined_flag_CXX=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
+	    archive_cmds_need_lc_CXX=yes
+	    archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+       if test yes != "$lt_cv_apple_cc_single_mod"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      os2*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+	hardcode_minus_L_CXX=yes
+	allow_undefined_flag_CXX=unsupported
+	shrext_cmds=.dll
+	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	enable_shared_with_static_runtimes_CXX=yes
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='$wl-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='$wl-E'
+	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      no_undefined_flag_CXX=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='$wl-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='$wl-z,text'
+	allow_undefined_flag_CXX='$wl-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+              '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+              '"$reload_cmds_CXX"
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test no = "$ld_shlibs_CXX" && can_build_shared=no
+
+    GCC_CXX=$GXX
+    LD_CXX=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX=$prev$p
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX=$prev$p
+	 else
+	   postdeps_CXX="${postdeps_CXX} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX=$p
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX=$p
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_CXX='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test no = "$ld_shlibs_CXX" && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec_CXX='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test yes = "$hardcode_automatic_CXX"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct_CXX" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+     test no != "$hardcode_minus_L_CXX"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test relink = "$hardcode_action_CXX" ||
+   test yes = "$inherit_rpath_CXX"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+    ax_cxx_compile_cxx11_required=truednl
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+  ac_success=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5
+$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; }
+if ${ax_cv_cxx_compile_cxx11+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = static_cast<check_type&&>(c);
+
+    auto d = a;
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ax_cv_cxx_compile_cxx11=yes
+else
+  ax_cv_cxx_compile_cxx11=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5
+$as_echo "$ax_cv_cxx_compile_cxx11" >&6; }
+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+    ac_success=yes
+  fi
+
+
+
+    if test x$ac_success = xno; then
+    for switch in -std=c++11 -std=c++0x; do
+      cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = static_cast<check_type&&>(c);
+
+    auto d = a;
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval $cachevar=yes
+else
+  eval $cachevar=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         CXXFLAGS="$ac_save_CXXFLAGS"
+fi
+eval ac_res=\$$cachevar
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
+    if test x$ac_success = xno; then
+      as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5
+    fi
+  else
+    if test x$ac_success = xno; then
+      HAVE_CXX11=0
+      { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
+$as_echo "$as_me: No compiler with C++11 support was found" >&6;}
+    else
+      HAVE_CXX11=1
+
+$as_echo "#define HAVE_CXX11 1" >>confdefs.h
+
+    fi
+
+
+  fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+$as_echo "#define CHECKED_ENDIANNESS 1" >>confdefs.h
+
+
+
+# Check whether --with-darwinports was given.
+if test "${with_darwinports+set}" = set; then :
+  withval=$with_darwinports;
+        if test "x$withval" != "xno"; then
+                CPPFLAGS="$CPPFLAGS -I/opt/local/include"
+                LDFLAGS="$LDFLAGS -L/opt/local/lib"
+		CC=g++
+        fi
+
+fi
+
+
+# Check whether --with-fink was given.
+if test "${with_fink+set}" = set; then :
+  withval=$with_fink;
+        if test "x$withval" != "xno"; then
+                CPPFLAGS="$CPPFLAGS -I/sw/include"
+                LDFLAGS="$LDFLAGS -L/sw/lib"
+		CC=g++
+        fi
+
+fi
+
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
+if test "x$ac_cv_header_expat_h" = xyes; then :
+
+else
+  as_fn_error $? "expat headers missing" "$LINENO" 5
+fi
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
+if test "x$ac_cv_header_iconv_h" = xyes; then :
+
+else
+  as_fn_error $? "iconv headers missing" "$LINENO" 5
+fi
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+
+else
+  as_fn_error $? "zlib headers missing" "$LINENO" 5
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+if ${am_cv_proto_iconv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  am_cv_proto_iconv_arg1=""
+else
+  am_cv_proto_iconv_arg1="const"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+fi
+
+    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+         }$am_cv_proto_iconv" >&5
+$as_echo "${ac_t:-
+         }$am_cv_proto_iconv" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+_ACEOF
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread local storage (TLS) class" >&5
+$as_echo_n "checking for thread local storage (TLS) class... " >&6; }
+  if ${ac_cv_tls+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ax_tls_keywords="__thread __declspec(thread) none"
+    for ax_tls_keyword in $ax_tls_keywords; do
+       case $ax_tls_keyword in
+          none) ac_cv_tls=none ; break ;;
+	  *)
+             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+                 static void
+                 foo(void) {
+                 static  $ax_tls_keyword  int bar;
+                 exit(1);
+                 }
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_tls=$ax_tls_keyword ; break
+else
+  ac_cv_tls=none
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	  esac
+    done
+
+fi
+
+
+  if test "$ac_cv_tls" != "none"; then
+
+cat >>confdefs.h <<_ACEOF
+#define TLS $ac_cv_tls
+_ACEOF
+
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
+$as_echo "$ac_cv_tls" >&6; }
+
+if test "$ac_cv_tls" != "none"; then
+
+$as_echo "#define HAVE_NATIVE_TLS 1" >>confdefs.h
+
+fi
+
+cat >> _ac_foo.sym << _ACEOF
+foo
+_ACEOF
+
+
+
+
+
+  flag=`echo "-Wl,--retain-symbols-file=_ac_foo.sym" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts the -Wl,--retain-symbols-file=_ac_foo.sym flag" >&5
+$as_echo_n "checking whether the linker accepts the -Wl,--retain-symbols-file=_ac_foo.sym flag... " >&6; }
+if eval \${ax_cv_ld_check_flag_$flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+    #AC_LANG_PUSH([C])
+
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS -Wl,--retain-symbols-file=_ac_foo.sym"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+      eval "ax_cv_ld_check_flag_$flag=yes"
+
+else
+
+      eval "ax_cv_ld_check_flag_$flag=no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+    LDFLAGS="$save_LDFLAGS"
+
+    #AC_LANG_POP
+
+
+fi
+eval ac_res=\$ax_cv_ld_check_flag_$flag
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+  if eval "test \"`echo '$ax_cv_ld_check_flag_'$flag`\" = yes"; then :
+
+    :
+
+cv_support_symfile=yes
+
+
+else
+
+    :
+
+cv_support_symfile=no
+
+
+fi
+
+rm -f _ac_foo.sym
+ if test x$cv_support_symfile = "xyes"; then
+  HAVE_SYMBOLS_FILE_TRUE=
+  HAVE_SYMBOLS_FILE_FALSE='#'
+else
+  HAVE_SYMBOLS_FILE_TRUE='#'
+  HAVE_SYMBOLS_FILE_FALSE=
+fi
+
+
+
+# Check whether --enable-unittest was given.
+if test "${enable_unittest+set}" = set; then :
+  enableval=$enable_unittest; ENABLE_UNITTEST=$enableval
+else
+  ENABLE_UNITTEST=yes
+fi
+
+if test x$ENABLE_UNITTEST = xyes ; then
+
+echo "$as_me: this is boost.m4 serial 25" >&5
+boost_save_IFS=$IFS
+boost_version_req=1.48.0
+IFS=.
+set x $boost_version_req 0 0 0
+IFS=$boost_save_IFS
+shift
+boost_version_req=`expr "$1" '*' 100000 + "$2" '*' 100 + "$3"`
+boost_version_req_string=$1.$2.$3
+
+# Check whether --with-boost was given.
+if test "${with_boost+set}" = set; then :
+  withval=$with_boost;
+fi
+# If BOOST_ROOT is set and the user has not provided a value to
+# --with-boost, then treat BOOST_ROOT as if it the user supplied it.
+if test x"$BOOST_ROOT" != x; then
+  if test x"$with_boost" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&5
+$as_echo "$as_me: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&6;}
+    with_boost=$BOOST_ROOT
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&5
+$as_echo "$as_me: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&6;}
+  fi
+fi
+DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"
+boost_save_CPPFLAGS=$CPPFLAGS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost headers version >= $boost_version_req_string" >&5
+$as_echo_n "checking for Boost headers version >= $boost_version_req_string... " >&6; }
+if ${boost_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  boost_cv_inc_path=no
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <boost/version.hpp>
+#if !defined BOOST_VERSION
+# error BOOST_VERSION is not defined
+#elif BOOST_VERSION < $boost_version_req
+# error Boost headers version < $boost_version_req
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+    # If the user provided a value to --with-boost, use it and only it.
+    case $with_boost in #(
+      ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
+                 /usr/include C:/Boost/include;; #(
+      *)      set x "$with_boost/include" "$with_boost";;
+    esac
+    shift
+    for boost_dir
+    do
+    # Without --layout=system, Boost (or at least some versions) installs
+    # itself in <prefix>/include/boost-<version>.  This inner loop helps to
+    # find headers in such directories.
+    #
+    # Any ${boost_dir}/boost-x_xx directories are searched in reverse version
+    # order followed by ${boost_dir}.  The final '.' is a sentinel for
+    # searching $boost_dir" itself.  Entries are whitespace separated.
+    #
+    # I didn't indent this loop on purpose (to avoid over-indented code)
+    boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \
+        && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \
+        && echo .`
+    for boost_inc in $boost_layout_system_search_list
+    do
+      if test x"$boost_inc" != x.; then
+        boost_inc="$boost_dir/$boost_inc"
+      else
+        boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list
+      fi
+      if test x"$boost_inc" != x; then
+        # We are going to check whether the version of Boost installed
+        # in $boost_inc is usable by running a compilation that
+        # #includes it.  But if we pass a -I/some/path in which Boost
+        # is not installed, the compiler will just skip this -I and
+        # use other locations (either from CPPFLAGS, or from its list
+        # of system include directories).  As a result we would use
+        # header installed on the machine instead of the /some/path
+        # specified by the user.  So in that precise case (trying
+        # $boost_inc), make sure the version.hpp exists.
+        #
+        # Use test -e as there can be symlinks.
+        test -e "$boost_inc/boost/version.hpp" || continue
+        CPPFLAGS="$CPPFLAGS -I$boost_inc"
+      fi
+      if ac_fn_cxx_try_compile "$LINENO"; then :
+  boost_cv_inc_path=yes
+else
+  boost_cv_version=no
+fi
+rm -f core conftest.err conftest.$ac_objext
+      if test x"$boost_cv_inc_path" = xyes; then
+        if test x"$boost_inc" != x; then
+          boost_cv_inc_path=$boost_inc
+        fi
+        break 2
+      fi
+    done
+    done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_inc_path" >&5
+$as_echo "$boost_cv_inc_path" >&6; }
+    case $boost_cv_inc_path in #(
+      no)
+        boost_errmsg="cannot find Boost headers version >= $boost_version_req_string"
+        as_fn_error $? "$boost_errmsg" "$LINENO" 5
+
+        ;;#(
+      yes)
+        BOOST_CPPFLAGS=
+        ;;#(
+      *)
+        BOOST_CPPFLAGS="-I$boost_cv_inc_path"
+        ;;
+    esac
+  if test x"$boost_cv_inc_path" != xno; then
+
+$as_echo "#define HAVE_BOOST 1" >>confdefs.h
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost's header version" >&5
+$as_echo_n "checking for Boost's header version... " >&6; }
+if ${boost_cv_lib_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+       ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <boost/version.hpp>
+boost-lib-version = BOOST_LIB_VERSION
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  grep -v '#' |
+  tr -d '\r' |
+  tr -s '\n' ' ' |
+  $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
+  boost_cv_lib_version=`cat conftest.i`
+fi
+rm -rf conftest*
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5
+$as_echo "$boost_cv_lib_version" >&6; }
+    # e.g. "134" for 1_34_1 or "135" for 1_35
+    boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
+    case $boost_major_version in #(
+      '' | *[!0-9]*)
+        as_fn_error $? "invalid value: boost_major_version='$boost_major_version'" "$LINENO" 5
+        ;;
+    esac
+fi
+CPPFLAGS=$boost_save_CPPFLAGS
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the toolset name used by Boost for $CXX" >&5
+$as_echo_n "checking for the toolset name used by Boost for $CXX... " >&6; }
+if ${boost_cv_lib_tag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  boost_cv_lib_tag=unknown
+if test x$boost_cv_inc_path != xno; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+  # The following tests are mostly inspired by boost/config/auto_link.hpp
+  # The list is sorted to most recent/common to oldest compiler (in order
+  # to increase the likelihood of finding the right compiler with the
+  # least number of compilation attempt).
+  # Beware that some tests are sensible to the order (for instance, we must
+  # look for MinGW before looking for GCC3).
+  # I used one compilation test per compiler with a #error to recognize
+  # each compiler so that it works even when cross-compiling (let me know
+  # if you know a better approach).
+  # Known missing tags (known from Boost's tools/build/v2/tools/common.jam):
+  #   como, edg, kcc, bck, mp, sw, tru, xlc
+  # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
+  # the same defines as GCC's).
+  for i in \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 3 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw53" \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc53" \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 2 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw52" \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc52" \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 1 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw51" \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc51" \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 0 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw50" \
+    "defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc50" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 10 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw410" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 10 && !defined __ICC @ gcc410" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw49" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9 && !defined __ICC @ gcc49" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 8 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw48" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 8 && !defined __ICC @ gcc48" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw47" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && !defined __ICC @ gcc47" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw46" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && !defined __ICC @ gcc46" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 5 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw45" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 5 && !defined __ICC @ gcc45" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw44" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc44" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw43" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc43" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw42" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc42" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw41" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc41" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw40" \
+    "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc40" \
+    "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
+     && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \
+    "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 4 && !defined __ICC @ gcc34" \
+    "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc33" \
+    "defined _MSC_VER && _MSC_VER >= 1500 @ vc90" \
+    "defined _MSC_VER && _MSC_VER == 1400 @ vc80" \
+    "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 2 && !defined __ICC @ gcc32" \
+    "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \
+    "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 1 && !defined __ICC @ gcc31" \
+    "defined __GNUC__ && __GNUC__ == 3 && __GNUC_MINOR__ == 0 && !defined __ICC @ gcc30" \
+    "defined __BORLANDC__ @ bcb" \
+    "defined __ICC && (defined __unix || defined ) @ il" \
+    "defined __ICL @ iw" \
+    "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \
+    "defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ == 95 && !defined __ICC @ gcc295" \
+    "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \
+    "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \
+    "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \
+    "defined __MWERKS__ && __MWERKS__ <= 0x31FF @ cw8"
+  do
+    boost_tag_test=`expr "X$i" : 'X\([^@]*\) @ '`
+    boost_tag=`expr "X$i" : 'X[^@]* @ \(.*\)'`
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if $boost_tag_test
+/* OK */
+#else
+# error $boost_tag_test
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  boost_cv_lib_tag=$boost_tag; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+  case $boost_cv_lib_tag in #(
+    # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed
+    # to "gcc41" for instance.
+    *-gcc | *'-gcc ') :;; #(  Don't re-add -gcc: it's already in there.
+    gcc*)
+      boost_tag_x=
+      case $host_os in #(
+        darwin*)
+          if test $boost_major_version -ge 136; then
+            # The `x' added in r46793 of Boost.
+            boost_tag_x=x
+          fi;;
+      esac
+      # We can specify multiple tags in this variable because it's used by
+      # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ...
+      boost_cv_lib_tag="$boost_tag_x$boost_cv_lib_tag -${boost_tag_x}gcc"
+      ;; #(
+    unknown)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not figure out which toolset name to use for $CXX" >&5
+$as_echo "$as_me: WARNING: could not figure out which toolset name to use for $CXX" >&2;}
+      boost_cv_lib_tag=
+      ;;
+  esac
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_tag" >&5
+$as_echo "$boost_cv_lib_tag" >&6; }
+# Check whether --enable-static-boost was given.
+if test "${enable_static_boost+set}" = set; then :
+  enableval=$enable_static_boost; enable_static_boost=yes
+else
+  enable_static_boost=no
+fi
+
+# Check whether we do better use `mt' even though we weren't ask to.
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if defined _REENTRANT || defined _MT || defined __MT__
+/* use -mt */
+#else
+# error MT not needed
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  boost_guess_use_mt=:
+else
+  boost_guess_use_mt=false
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost unit_test_framework library" >&5
+$as_echo "$as_me: Boost not available, not searching for the Boost unit_test_framework library" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/test/unit_test.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/test/unit_test.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/test/unit_test.hpp" "ac_cv_header_boost_test_unit_test_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_test_unit_test_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_TEST_UNIT_TEST_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/test/unit_test.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost unit_test_framework library" >&5
+$as_echo_n "checking for the Boost unit_test_framework library... " >&6; }
+if ${boost_cv_lib_unit_test_framework+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  boost_cv_lib_unit_test_framework=no
+  case "mt-s" in #(
+    (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
+    (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "Xmt-s" : 'Xmt-*\(.*\)'`;; #(
+    (*) boost_mt=; boost_rtopt=mt-s;;
+  esac
+  if test $enable_static_boost = yes; then
+    boost_rtopt="s$boost_rtopt"
+  fi
+  # Find the proper debug variant depending on what we've been asked to find.
+  case $boost_rtopt in #(
+    (*d*) boost_rt_d=$boost_rtopt;; #(
+    (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
+      boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
+    (*) boost_rt_d='-d';;
+  esac
+  # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
+  test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
+  $boost_guess_use_mt && boost_mt=-mt
+  # Look for the abs path the static archive.
+  # $libext is computed by Libtool but let's make sure it's non empty.
+  test -z "$libext" &&
+    as_fn_error $? "the libext variable is empty, did you invoke Libtool?" "$LINENO" 5
+  boost_save_ac_objext=$ac_objext
+  # Generate the test file.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
+               test_suite* init_unit_test_suite(int argc, char ** argv)
+               { return NULL; }
+int
+main ()
+{
+BOOST_CHECK(2 == 2);
+  ;
+  return 0;
+}
+_ACEOF
+  if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_objext=do_not_rm_me_plz
+else
+  as_fn_error $? "cannot compile a test that uses Boost unit_test_framework" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext
+  ac_objext=$boost_save_ac_objext
+  boost_failed_libs=
+# Don't bother to ident the following nested for loops, only the 2
+# innermost ones matter.
+for boost_lib_ in unit_test_framework; do
+for boost_tag_ in -$boost_cv_lib_tag ''; do
+for boost_ver_ in -$boost_cv_lib_version ''; do
+for boost_mt_ in $boost_mt -mt ''; do
+for boost_rtopt_ in $boost_rtopt '' -d; do
+  for boost_lib in \
+    boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
+    boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
+    boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
+    boost_$boost_lib_$boost_tag_$boost_ver_
+  do
+    # Avoid testing twice the same lib
+    case $boost_failed_libs in #(
+      (*@$boost_lib@*) continue;;
+    esac
+    # If with_boost is empty, we'll search in /lib first, which is not quite
+    # right so instead we'll try to a location based on where the headers are.
+    boost_tmp_lib=$with_boost
+    test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
+    for boost_ldpath in "$boost_tmp_lib/lib" '' \
+             /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+             "$with_boost" C:/Boost/lib /lib*
+    do
+      # Don't waste time with directories that don't exist.
+      if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
+        continue
+      fi
+      boost_save_LDFLAGS=$LDFLAGS
+      # Are we looking for a static library?
+      case $boost_ldpath:$boost_rtopt_ in #(
+        (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
+          boost_cv_lib_unit_test_framework_LIBS="$boost_ldpath/lib$boost_lib.$libext"
+          test -e "$boost_cv_lib_unit_test_framework_LIBS" || continue;; #(
+        (*) # No: use -lboost_foo to find the shared library.
+          boost_cv_lib_unit_test_framework_LIBS="-l$boost_lib";;
+      esac
+      boost_save_LIBS=$LIBS
+      LIBS="$boost_cv_lib_unit_test_framework_LIBS $LIBS"
+      test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath"
+      rm -f conftest$ac_exeext
+boost_save_ac_ext=$ac_ext
+boost_use_source=:
+# If we already have a .o, re-use it.  We change $ac_ext so that $ac_link
+# tries to link the existing object file instead of compiling from source.
+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+         test -z "$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+         test "$cross_compiling" = yes ||
+         $as_executable_p conftest$ac_exeext
+       }; then :
+  boost_cv_lib_unit_test_framework=yes
+else
+  if $boost_use_source; then
+         $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       fi
+       boost_cv_lib_unit_test_framework=no
+fi
+ac_objext=$boost_save_ac_objext
+ac_ext=$boost_save_ac_ext
+rm -f core conftest.err conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+      ac_objext=$boost_save_ac_objext
+      LDFLAGS=$boost_save_LDFLAGS
+      LIBS=$boost_save_LIBS
+      if test x"$boost_cv_lib_unit_test_framework" = xyes; then
+        # Check or used cached result of whether or not using -R or
+        # -rpath makes sense.  Some implementations of ld, such as for
+        # Mac OSX, require -rpath but -R is the flag known to work on
+        # other systems.  https://github.com/tsuna/boost.m4/issues/19
+        if ${boost_cv_rpath_link_ldflag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $boost_ldpath in
+           '') # Nothing to do.
+             boost_cv_rpath_link_ldflag=
+             boost_rpath_link_ldflag_found=yes;;
+           *)
+            for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
+              LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+              LIBS="$boost_save_LIBS $boost_cv_lib_unit_test_framework_LIBS"
+              rm -f conftest$ac_exeext
+boost_save_ac_ext=$ac_ext
+boost_use_source=:
+# If we already have a .o, re-use it.  We change $ac_ext so that $ac_link
+# tries to link the existing object file instead of compiling from source.
+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+         test -z "$ac_cxx_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+         test "$cross_compiling" = yes ||
+         $as_executable_p conftest$ac_exeext
+       }; then :
+  boost_rpath_link_ldflag_found=yes
+                break
+else
+  if $boost_use_source; then
+         $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       fi
+       boost_rpath_link_ldflag_found=no
+fi
+ac_objext=$boost_save_ac_objext
+ac_ext=$boost_save_ac_ext
+rm -f core conftest.err conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+            done
+            ;;
+          esac
+          if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
+  as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
+fi
+          LDFLAGS=$boost_save_LDFLAGS
+          LIBS=$boost_save_LIBS
+
+fi
+
+        test x"$boost_ldpath" != x &&
+          boost_cv_lib_unit_test_framework_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+        boost_cv_lib_unit_test_framework_LDPATH="$boost_ldpath"
+        break 7
+      else
+        boost_failed_libs="$boost_failed_libs@$boost_lib@"
+      fi
+    done
+  done
+done
+done
+done
+done
+done # boost_lib_
+rm -f conftest.$ac_objext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_unit_test_framework" >&5
+$as_echo "$boost_cv_lib_unit_test_framework" >&6; }
+case $boost_cv_lib_unit_test_framework in #(
+  (no) $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    as_fn_error $? "cannot find the flags to link with Boost unit_test_framework" "$LINENO" 5
+    ;;
+esac
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS=$boost_cv_lib_unit_test_framework_LDFLAGS
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH=$boost_cv_lib_unit_test_framework_LDPATH
+BOOST_LDPATH=$boost_cv_lib_unit_test_framework_LDPATH
+BOOST_UNIT_TEST_FRAMEWORK_LIBS=$boost_cv_lib_unit_test_framework_LIBS
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+fi
+
+
+
+else
+   ENABLE_UNITTEST=no
+fi
+
+
+case $build_vendor in
+	apple)
+		EXEMPI_PLATFORM_DEF=MAC_ENV
+		LDFLAGS="$LDFLAGS -framework CoreServices -stdlib=libc++"
+		CPPFLAGS="$CPPFLAGS -std=c++11 -stdlib=libc++"
+		;;
+	*)
+		EXEMPI_PLATFORM_DEF=UNIX_ENV
+		;;
+esac
+
+
+ if test x$EXEMPI_PLATFORM_DEF = xMAC_ENV; then
+  MAC_ENV_TRUE=
+  MAC_ENV_FALSE='#'
+else
+  MAC_ENV_TRUE='#'
+  MAC_ENV_FALSE=
+fi
+
+ if test x$EXEMPI_PLATFORM_DEF = xUNIX_ENV; then
+  UNIX_ENV_TRUE=
+  UNIX_ENV_FALSE='#'
+else
+  UNIX_ENV_TRUE='#'
+  UNIX_ENV_FALSE=
+fi
+
+
+ if test x$ENABLE_UNITTEST = xyes; then
+  WITH_UNIT_TEST_TRUE=
+  WITH_UNIT_TEST_FALSE='#'
+else
+  WITH_UNIT_TEST_TRUE='#'
+  WITH_UNIT_TEST_FALSE=
+fi
+
+
+for ac_header in valgrind/memcheck.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "valgrind/memcheck.h" "ac_cv_header_valgrind_memcheck_h" "$ac_includes_default"
+if test "x$ac_cv_header_valgrind_memcheck_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VALGRIND_MEMCHECK_H 1
+_ACEOF
+
+fi
+
+done
+
+if test "$VALGRIND" = ""; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Valgrind is missing. checks will run without" >&5
+$as_echo "$as_me: WARNING: Valgrind is missing. checks will run without" >&2;}
+fi
+if test "$VALGRIND" != ""; then
+        vg_ver=`valgrind --version | sed -e  's/.*-\([0-9]\)\.[0-9].*/\1/'`
+        VALGRIND="$VALGRIND --tool=memcheck --leak-check=yes --num-callers=10 --error-exitcode=100"
+        if test "$vg_ver" != "3" ; then
+           VALGRIND="$VALGRIND --logfile-fd=-1"
+        fi
+fi
+
+
+# Check whether --enable-asan was given.
+if test "${enable_asan+set}" = set; then :
+  enableval=$enable_asan;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -fsanitize=address -fno-omit-frame-pointer" >&5
+$as_echo_n "checking CFLAGS for gcc -fsanitize=address -fno-omit-frame-pointer... " >&6; }
+if ${ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer="no, unknown"
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ ac_save_CFLAGS="$CFLAGS"
+for ac_arg in "-pedantic -Werror % -fsanitize=address -fno-omit-frame-pointer"     "-pedantic % -fsanitize=address -fno-omit-frame-pointer %% no, obsolete"     #
+do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+ CFLAGS="$ac_save_CFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer" >&5
+$as_echo "$ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer" >&6; }
+case ".$ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer" in
+     .ok|.ok,*)  ;;
+   .|.no|.no,*)  ;;
+   *)
+   if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer " 2>&1 >/dev/null
+   then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer"; } >&5
+  (: CFLAGS does contain $ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+   else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer\""; } >&5
+  (: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+                      CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__fsanitize_address__fno_omit_frame_pointer"
+   fi
+ ;;
+esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for gcc -fsanitize=address -fno-omit-frame-pointer" >&5
+$as_echo_n "checking CXXFLAGS for gcc -fsanitize=address -fno-omit-frame-pointer... " >&6; }
+if ${ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer="no, unknown"
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ ac_save_CXXFLAGS="$CXXFLAGS"
+for ac_arg in "-pedantic -Werror % -fsanitize=address -fno-omit-frame-pointer"     "-pedantic % -fsanitize=address -fno-omit-frame-pointer %% no, obsolete"     #
+do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer" >&5
+$as_echo "$ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer" >&6; }
+case ".$ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer" in
+     .ok|.ok,*)  ;;
+   .|.no|.no,*)  ;;
+   *)
+   if echo " $CXXFLAGS " | grep " $ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer " 2>&1 >/dev/null
+   then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS does contain \$ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer"; } >&5
+  (: CXXFLAGS does contain $ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+   else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer\""; } >&5
+  (: CXXFLAGS="$CXXFLAGS $ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+                      CXXFLAGS="$CXXFLAGS $ac_cv_cxxflags_gcc_option__fsanitize_address__fno_omit_frame_pointer"
+   fi
+ ;;
+esac
+
+
+
+fi
+
+
+XMPCORE_CPPFLAGS="-D$EXEMPI_PLATFORM_DEF=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
+	-DXMP_StaticBuild=1 -DBanAllEntityUsage=1 \
+	-D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \
+	-DDISABLE_QUICKTIME"
+
+
+ac_config_files="$ac_config_files Makefile third-party/Makefile third-party/zuid/interfaces/Makefile third-party/zlib/Makefile third-party/expat/Makefile source/Makefile XMPCore/Makefile XMPCore/source/Makefile XMPFiles/Makefile XMPFiles/source/Makefile XMPFiles/source/FileHandlers/Makefile XMPFiles/source/FormatSupport/Makefile XMPFiles/source/NativeMetadataSupport/Makefile XMPFiles/source/PluginHandler/Makefile XMPFilesPlugins/Makefile XMPFilesPlugins/api/Makefile XMPFilesPlugins/api/source/Makefile XMPFilesPlugins/PDF_Handler/Makefile samples/Makefile samples/source/Makefile samples/testfiles/Makefile build/GNUmakefile public/Makefile public/include/Makefile public/include/client-glue/Makefile exempi/Makefile exempi/doc/Makefile exempi/doc/Doxyfile exempi/tests/Makefile exempi/exempi-2.0.pc"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+if test -z "${HAVE_SYMBOLS_FILE_TRUE}" && test -z "${HAVE_SYMBOLS_FILE_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_SYMBOLS_FILE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MAC_ENV_TRUE}" && test -z "${MAC_ENV_FALSE}"; then
+  as_fn_error $? "conditional \"MAC_ENV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${UNIX_ENV_TRUE}" && test -z "${UNIX_ENV_FALSE}"; then
+  as_fn_error $? "conditional \"UNIX_ENV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_UNIT_TEST_TRUE}" && test -z "${WITH_UNIT_TEST_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_UNIT_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by exempi $as_me 2.4.5, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+exempi config.status 2.4.5
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "third-party/Makefile") CONFIG_FILES="$CONFIG_FILES third-party/Makefile" ;;
+    "third-party/zuid/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES third-party/zuid/interfaces/Makefile" ;;
+    "third-party/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES third-party/zlib/Makefile" ;;
+    "third-party/expat/Makefile") CONFIG_FILES="$CONFIG_FILES third-party/expat/Makefile" ;;
+    "source/Makefile") CONFIG_FILES="$CONFIG_FILES source/Makefile" ;;
+    "XMPCore/Makefile") CONFIG_FILES="$CONFIG_FILES XMPCore/Makefile" ;;
+    "XMPCore/source/Makefile") CONFIG_FILES="$CONFIG_FILES XMPCore/source/Makefile" ;;
+    "XMPFiles/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFiles/Makefile" ;;
+    "XMPFiles/source/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFiles/source/Makefile" ;;
+    "XMPFiles/source/FileHandlers/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFiles/source/FileHandlers/Makefile" ;;
+    "XMPFiles/source/FormatSupport/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFiles/source/FormatSupport/Makefile" ;;
+    "XMPFiles/source/NativeMetadataSupport/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFiles/source/NativeMetadataSupport/Makefile" ;;
+    "XMPFiles/source/PluginHandler/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFiles/source/PluginHandler/Makefile" ;;
+    "XMPFilesPlugins/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFilesPlugins/Makefile" ;;
+    "XMPFilesPlugins/api/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFilesPlugins/api/Makefile" ;;
+    "XMPFilesPlugins/api/source/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFilesPlugins/api/source/Makefile" ;;
+    "XMPFilesPlugins/PDF_Handler/Makefile") CONFIG_FILES="$CONFIG_FILES XMPFilesPlugins/PDF_Handler/Makefile" ;;
+    "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
+    "samples/source/Makefile") CONFIG_FILES="$CONFIG_FILES samples/source/Makefile" ;;
+    "samples/testfiles/Makefile") CONFIG_FILES="$CONFIG_FILES samples/testfiles/Makefile" ;;
+    "build/GNUmakefile") CONFIG_FILES="$CONFIG_FILES build/GNUmakefile" ;;
+    "public/Makefile") CONFIG_FILES="$CONFIG_FILES public/Makefile" ;;
+    "public/include/Makefile") CONFIG_FILES="$CONFIG_FILES public/include/Makefile" ;;
+    "public/include/client-glue/Makefile") CONFIG_FILES="$CONFIG_FILES public/include/client-glue/Makefile" ;;
+    "exempi/Makefile") CONFIG_FILES="$CONFIG_FILES exempi/Makefile" ;;
+    "exempi/doc/Makefile") CONFIG_FILES="$CONFIG_FILES exempi/doc/Makefile" ;;
+    "exempi/doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES exempi/doc/Doxyfile" ;;
+    "exempi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES exempi/tests/Makefile" ;;
+    "exempi/exempi-2.0.pc") CONFIG_FILES="$CONFIG_FILES exempi/exempi-2.0.pc" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+
+echo "
+Defines:
+
+   EXEMPI_PLATFORM_DEF  = $EXEMPI_PLATFORM_DEF
+   CPPFLAGS             = $CPPFLAGS
+   LDFLAGS              = $LDFLAGS
+   Thread Local Storage = $ac_cv_tls
+   Run unit test        = $ENABLE_UNITTEST
+"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..48c09d8
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,273 @@
+dnl Copyright (C) 2007-2010 Hubert Figuiere
+dnl Small portions are:
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_PREREQ(2.50)
+AC_INIT(exempi, 2.4.5)
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
+AM_MAINTAINER_MODE
+m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+AM_SILENT_RULES([yes])
+
+dnl ---------------------------------------------------------------------------
+dnl Advanced information about versioning:
+dnl   * "Writing shared libraries" by Mike Hearn
+dnl         http://plan99.net/~mike/writing-shared-libraries.html
+dnl   * libtool.info chapter "Versioning"
+dnl   * libtool.info chapter "Updating library version information"
+dnl ---------------------------------------------------------------------------
+dnl Versioning:
+dnl  - CURRENT (Major):  Increment if the interface has changes. AGE is always
+dnl                      *changed* at the same time.
+dnl  - AGE (Micro):      Increment if any interfaces have been added; set to 0
+dnl                      if any interfaces have been removed. Removal has
+dnl                      precedence over adding, so set to 0 if both happened.
+dnl                      It denotes upward compatibility.
+dnl  - REVISION (Minor): Increment any time the source changes; set to
+dnl                      0 if you incremented CURRENT.
+dnl
+dnl  To summarize. Any interface *change* increment CURRENT. If that interface
+dnl  change does not break upward compatibility (ie it is an addition),
+dnl  increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed,
+dnl  REVISION is set to 0, otherwise REVISION is incremented.
+dnl ---------------------------------------------------------------------------
+dnl 1.99.0 is the revision 2 0 0
+dnl 1.99.1 is the revision 3 1 0
+dnl 1.99.2 is the revision 4 2 0
+dnl 1.99.3 is the revision 5 3 0
+dnl 1.99.4 is the revision 6 4 0
+dnl ABI breakage reset major to 3
+dnl 1.99.5 is the revision 3.0.0
+dnl 1.99.6 is the revision 3.1.0 WHICH IS WRONG!!!
+dnl 1.99.7 is the revision 4.1.0
+dnl 1.99.8 is the revision 4.1.1
+dnl 1.99.9 is the revision 4.1.1 (no library change have been made)
+dnl 2.0.0 is the revision 4.1.2
+dnl 2.0.1 is the revision 4.1.3
+dnl 2.0.2 is the revision 4.1.4
+dnl 2.1.0 is the revision 5.2.0
+dnl 2.1.1 is the revision 5.2.1
+dnl 2.2.0 is the revision 5.2.2 -- no public API change
+dnl 2.2.1 is the revision 5.2.3 -- no public API change
+dnl 2.2.2 is the revision 5.2.4 -- no public API change
+dnl 2.2.3 is the revision 5.2.5 -- no public API change
+dnl 2.3.0 is the revision 6.3.0
+dnl 2.4.0 is the revision 7.4.0
+dnl 2.4.1 is the revision 7.4.1
+dnl 2.4.2 is the revision 7.4.2
+dnl 2.4.3 is the revision 7.4.3
+dnl 2.4.4 is the revision 7.4.4
+dnl 2.4.5 is the revision 7.4.5
+AC_SUBST([EXEMPI_REVISION], [5])
+AC_SUBST([EXEMPI_AGE],      [4])
+AC_SUBST([EXEMPI_CURRENT],  [7])
+AC_SUBST([EXEMPI_CURRENT_MIN],
+         [`expr $EXEMPI_CURRENT - $EXEMPI_AGE`])
+AC_SUBST([EXEMPI_VERSION_INFO],
+         [$EXEMPI_CURRENT:$EXEMPI_REVISION:$EXEMPI_AGE])
+
+dnl the major version. used for package names, etc
+EXEMPI_MAJOR_VERSION=2.0
+AC_SUBST(EXEMPI_MAJOR_VERSION)
+
+dnl the path where includes are installed
+EXEMPI_INCLUDE_BASE=exempi-$EXEMPI_MAJOR_VERSION
+AC_SUBST(EXEMPI_INCLUDE_BASE)
+
+dnl --------------------------------------------------------------------
+dnl guess directory to install *.pc into
+dnl --------------------------------------------------------------------
+pkgconfigdir='${libdir}/pkgconfig'
+AC_SUBST(pkgconfigdir)
+
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
+
+AC_C_BIGENDIAN
+AC_DEFINE(CHECKED_ENDIANNESS)
+
+AC_ARG_WITH(darwinports,[  --with-darwinports     add /opt/local/... to CPP/LDFLAGS (Mac OSX)],[
+        if test "x$withval" != "xno"; then
+                CPPFLAGS="$CPPFLAGS -I/opt/local/include"
+                LDFLAGS="$LDFLAGS -L/opt/local/lib"
+		CC=g++
+        fi
+])
+AC_ARG_WITH(fink,[  --with-fink          add /sw/... to CPP/LDFLAGS (Mac OSX)],[
+        if test "x$withval" != "xno"; then
+                CPPFLAGS="$CPPFLAGS -I/sw/include"
+                LDFLAGS="$LDFLAGS -L/sw/lib"
+		CC=g++
+        fi
+])
+
+
+AC_CHECK_HEADER(expat.h, ,
+	 AC_MSG_ERROR([expat headers missing]))
+AC_CHECK_HEADER(iconv.h, ,
+	 AC_MSG_ERROR([iconv headers missing]))
+AC_CHECK_HEADER(zlib.h, ,
+	 AC_MSG_ERROR([zlib headers missing]))
+
+dnl Blatently copied from iconv.m4 to remove the crack about libtool
+dnl But check for constness of the iconv parameters.
+AC_MSG_CHECKING([for iconv declaration])
+AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+dnl end iconv checks
+
+
+dnl TLS.
+AX_TLS
+if test "$ac_cv_tls" != "none"; then
+   AC_DEFINE(HAVE_NATIVE_TLS, [1], [Define if compiler has native TLS.])
+fi
+dnl end TLS
+
+dnl check LD Flags
+dnl we need a valid symfile. Make one.
+cat >> _ac_foo.sym << _ACEOF
+foo
+_ACEOF
+AX_LD_CHECK_FLAG([-Wl,--retain-symbols-file=_ac_foo.sym],[],[],[
+dnl success
+cv_support_symfile=yes
+],[
+dnl fail
+cv_support_symfile=no
+])
+rm -f _ac_foo.sym
+AM_CONDITIONAL(HAVE_SYMBOLS_FILE, test x$cv_support_symfile = "xyes")
+
+
+AC_ARG_ENABLE(unittest,
+              AC_HELP_STRING([--enable-unittest=yes|no],
+                            [enable the unittest. requires boost (default is yes)]),
+              ENABLE_UNITTEST=$enableval,
+              ENABLE_UNITTEST=yes)
+if test x$ENABLE_UNITTEST = xyes ; then
+   BOOST_REQUIRE([1.48.0])
+   BOOST_TEST([mt-s])
+else
+   ENABLE_UNITTEST=no
+fi
+
+
+case $build_vendor in
+	apple)
+		EXEMPI_PLATFORM_DEF=MAC_ENV
+		LDFLAGS="$LDFLAGS -framework CoreServices -stdlib=libc++"
+		CPPFLAGS="$CPPFLAGS -std=c++11 -stdlib=libc++"
+		;;
+	*)
+		EXEMPI_PLATFORM_DEF=UNIX_ENV
+		;;
+esac
+
+AC_SUBST(EXEMPI_PLATFORM_DEF)
+AM_CONDITIONAL(MAC_ENV, test x$EXEMPI_PLATFORM_DEF = xMAC_ENV)
+AM_CONDITIONAL(UNIX_ENV, test x$EXEMPI_PLATFORM_DEF = xUNIX_ENV)
+
+AM_CONDITIONAL(WITH_UNIT_TEST, test x$ENABLE_UNITTEST = xyes)
+
+dnl Check for valgrind (optional) for make check.
+dnl AC_CHECK_PROG(VALGRIND, valgrind, valgrind)
+AC_CHECK_HEADERS(valgrind/memcheck.h)
+if test "$VALGRIND" = ""; then
+        AC_MSG_WARN([Valgrind is missing. checks will run without])
+fi
+if test "$VALGRIND" != ""; then
+dnl due to stupid m4 I had to double the [ and ] in the regexp
+        vg_ver=`valgrind --version | sed -e  's/.*-\([[0-9]]\)\.[[0-9]].*/\1/'`
+        VALGRIND="$VALGRIND --tool=memcheck --leak-check=yes --num-callers=10 --error-exitcode=100"
+        if test "$vg_ver" != "3" ; then
+           VALGRIND="$VALGRIND --logfile-fd=-1"
+        fi
+fi
+AC_SUBST(VALGRIND)
+
+AC_ARG_ENABLE(asan,[  --enable-asan    Turn on address sanitizer],[
+    AX_CFLAGS_GCC_OPTION([-fsanitize=address -fno-omit-frame-pointer])
+    AX_CXXFLAGS_GCC_OPTION([-fsanitize=address -fno-omit-frame-pointer])
+]
+,
+[
+
+])
+
+XMPCORE_CPPFLAGS="-D$EXEMPI_PLATFORM_DEF=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
+	-DXMP_StaticBuild=1 -DBanAllEntityUsage=1 \
+	-D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \
+	-DDISABLE_QUICKTIME"
+AC_SUBST(XMPCORE_CPPFLAGS)
+
+AC_OUTPUT([
+Makefile
+third-party/Makefile
+third-party/zuid/interfaces/Makefile
+third-party/zlib/Makefile
+third-party/expat/Makefile
+source/Makefile
+XMPCore/Makefile
+XMPCore/source/Makefile
+XMPFiles/Makefile
+XMPFiles/source/Makefile
+XMPFiles/source/FileHandlers/Makefile
+XMPFiles/source/FormatSupport/Makefile
+XMPFiles/source/NativeMetadataSupport/Makefile
+XMPFiles/source/PluginHandler/Makefile
+XMPFilesPlugins/Makefile
+XMPFilesPlugins/api/Makefile
+XMPFilesPlugins/api/source/Makefile
+XMPFilesPlugins/PDF_Handler/Makefile
+samples/Makefile
+samples/source/Makefile
+samples/testfiles/Makefile
+build/GNUmakefile
+public/Makefile
+public/include/Makefile
+public/include/client-glue/Makefile
+exempi/Makefile
+exempi/doc/Makefile
+exempi/doc/Doxyfile
+exempi/tests/Makefile
+exempi/exempi-2.0.pc
+])
+
+
+echo "
+Defines:
+
+   EXEMPI_PLATFORM_DEF  = $EXEMPI_PLATFORM_DEF
+   CPPFLAGS             = $CPPFLAGS
+   LDFLAGS              = $LDFLAGS
+   Thread Local Storage = $ac_cv_tls
+   Run unit test        = $ENABLE_UNITTEST
+"
diff --git a/depcomp b/depcomp
new file mode 100755
index 0000000..fc98710
--- /dev/null
+++ b/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/exempi/Makefile.am b/exempi/Makefile.am
new file mode 100644
index 0000000..4a65f91
--- /dev/null
+++ b/exempi/Makefile.am
@@ -0,0 +1,79 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+SUBDIRS = tests
+DIST_SUBDIRS = tests doc
+
+exempidir = $(includedir)/@EXEMPI_INCLUDE_BASE@/exempi
+exempi_HEADERS = xmp.h xmpconsts.h xmperrors.h xmp++.hpp
+
+bin_PROGRAMS = exempi
+
+exempi_SOURCES = main.cpp
+exempi_CPPFLAGS = -I$(srcdir)/..
+exempi_LDADD = libexempi.la
+
+AM_CPPFLAGS = -I$(top_srcdir)/public/include -I$(top_srcdir)/XMPCore/source \
+	-I$(top_srcdir)/build/ -I$(top_srcdir) \
+	-I$(top_srcdir)/source/common/ \
+	-Wall -D@EXEMPI_PLATFORM_DEF@=1
+
+lib_LTLIBRARIES = libexempi.la
+
+pkgconfig_DATA = exempi-@EXEMPI_MAJOR_VERSION@.pc
+
+libexempi_la_SOURCES = exempi.cpp
+
+libexempi_la_LIBADD = $(top_builddir)/source/libxmpcommon.la \
+	$(top_builddir)/XMPCore/source/libXMPCore.la \
+	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
+	$(top_builddir)/third-party/zuid/interfaces/libmd5.la \
+	-lexpat -lz -ldl
+
+if UNIX_ENV
+libexempi_la_LIBADD += -lrt
+endif
+
+libexempi_la_LDFLAGS = -version-info @EXEMPI_VERSION_INFO@
+
+if HAVE_SYMBOLS_FILE
+libexempi_la_LDFLAGS += -Wl,--retain-symbols-file=$(srcdir)/libexempi.sym
+endif
+
+dist_man1_MANS = exempi.1
+
+EXTRA_DIST = libexempi.sym
+
diff --git a/exempi/Makefile.in b/exempi/Makefile.in
new file mode 100644
index 0000000..e71f0e1
--- /dev/null
+++ b/exempi/Makefile.in
@@ -0,0 +1,1030 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = exempi$(EXEEXT)
+@UNIX_ENV_TRUE@am__append_1 = -lrt
+@HAVE_SYMBOLS_FILE_TRUE@am__append_2 = -Wl,--retain-symbols-file=$(srcdir)/libexempi.sym
+subdir = exempi
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(exempi_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES = exempi-2.0.pc
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(exempidir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libexempi_la_DEPENDENCIES = $(top_builddir)/source/libxmpcommon.la \
+	$(top_builddir)/XMPCore/source/libXMPCore.la \
+	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
+	$(top_builddir)/third-party/zuid/interfaces/libmd5.la \
+	$(am__DEPENDENCIES_1)
+am_libexempi_la_OBJECTS = exempi.lo
+libexempi_la_OBJECTS = $(am_libexempi_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libexempi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libexempi_la_LDFLAGS) $(LDFLAGS) -o $@
+PROGRAMS = $(bin_PROGRAMS)
+am_exempi_OBJECTS = exempi-main.$(OBJEXT)
+exempi_OBJECTS = $(am_exempi_OBJECTS)
+exempi_DEPENDENCIES = libexempi.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libexempi_la_SOURCES) $(exempi_SOURCES)
+DIST_SOURCES = $(libexempi_la_SOURCES) $(exempi_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(dist_man1_MANS)
+DATA = $(pkgconfig_DATA)
+HEADERS = $(exempi_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
+	$(srcdir)/exempi-2.0.pc.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = tests
+DIST_SUBDIRS = tests doc
+exempidir = $(includedir)/@EXEMPI_INCLUDE_BASE@/exempi
+exempi_HEADERS = xmp.h xmpconsts.h xmperrors.h xmp++.hpp
+exempi_SOURCES = main.cpp
+exempi_CPPFLAGS = -I$(srcdir)/..
+exempi_LDADD = libexempi.la
+AM_CPPFLAGS = -I$(top_srcdir)/public/include -I$(top_srcdir)/XMPCore/source \
+	-I$(top_srcdir)/build/ -I$(top_srcdir) \
+	-I$(top_srcdir)/source/common/ \
+	-Wall -D@EXEMPI_PLATFORM_DEF@=1
+
+lib_LTLIBRARIES = libexempi.la
+pkgconfig_DATA = exempi-@EXEMPI_MAJOR_VERSION@.pc
+libexempi_la_SOURCES = exempi.cpp
+libexempi_la_LIBADD = $(top_builddir)/source/libxmpcommon.la \
+	$(top_builddir)/XMPCore/source/libXMPCore.la \
+	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
+	$(top_builddir)/third-party/zuid/interfaces/libmd5.la -lexpat \
+	-lz -ldl $(am__append_1)
+libexempi_la_LDFLAGS = -version-info @EXEMPI_VERSION_INFO@ \
+	$(am__append_2)
+dist_man1_MANS = exempi.1
+EXTRA_DIST = libexempi.sym
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exempi/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign exempi/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+exempi-2.0.pc: $(top_builddir)/config.status $(srcdir)/exempi-2.0.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libexempi.la: $(libexempi_la_OBJECTS) $(libexempi_la_DEPENDENCIES) $(EXTRA_libexempi_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libexempi_la_LINK) -rpath $(libdir) $(libexempi_la_OBJECTS) $(libexempi_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+exempi$(EXEEXT): $(exempi_OBJECTS) $(exempi_DEPENDENCIES) $(EXTRA_exempi_DEPENDENCIES) 
+	@rm -f exempi$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(exempi_OBJECTS) $(exempi_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exempi-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exempi.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+exempi-main.o: main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exempi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT exempi-main.o -MD -MP -MF $(DEPDIR)/exempi-main.Tpo -c -o exempi-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/exempi-main.Tpo $(DEPDIR)/exempi-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='main.cpp' object='exempi-main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exempi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o exempi-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
+
+exempi-main.obj: main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exempi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT exempi-main.obj -MD -MP -MF $(DEPDIR)/exempi-main.Tpo -c -o exempi-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/exempi-main.Tpo $(DEPDIR)/exempi-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='main.cpp' object='exempi-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(exempi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o exempi-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(dist_man1_MANS)
+	@$(NORMAL_INSTALL)
+	@list1='$(dist_man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-exempiHEADERS: $(exempi_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(exempi_HEADERS)'; test -n "$(exempidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(exempidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(exempidir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(exempidir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(exempidir)" || exit $$?; \
+	done
+
+uninstall-exempiHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(exempi_HEADERS)'; test -n "$(exempidir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(exempidir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(exempidir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-exempiHEADERS install-man \
+	install-pkgconfigDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-exempiHEADERS \
+	uninstall-libLTLIBRARIES uninstall-man uninstall-pkgconfigDATA
+
+uninstall-man: uninstall-man1
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-binPROGRAMS clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exempiHEADERS \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-man1 install-pdf \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-exempiHEADERS \
+	uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
+	uninstall-pkgconfigDATA
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/exempi/doc/Doxyfile.in b/exempi/doc/Doxyfile.in
new file mode 100644
index 0000000..21033dc
--- /dev/null
+++ b/exempi/doc/Doxyfile.in
@@ -0,0 +1,1869 @@
+# Doxyfile 1.8.3.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME           = @PACKAGE@
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         = @VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = .
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented classes,
+# or namespaces to their corresponding documentation. Such a link can be
+# prevented in individual cases by by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE      = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = ..
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          = *.h
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page (index.html).
+# This can be useful if you have a project on for instance GitHub and want reuse
+# the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+#  for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search engine
+# library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  = *.h
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG        = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
diff --git a/exempi/doc/Makefile.am b/exempi/doc/Makefile.am
new file mode 100644
index 0000000..012eac6
--- /dev/null
+++ b/exempi/doc/Makefile.am
@@ -0,0 +1,38 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+EXTRA_DIST = Doxyfile.in
+
diff --git a/exempi/doc/Makefile.in b/exempi/doc/Makefile.in
new file mode 100644
index 0000000..47730d8
--- /dev/null
+++ b/exempi/doc/Makefile.in
@@ -0,0 +1,500 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = exempi/doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES = Doxyfile
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = Doxyfile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exempi/doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign exempi/doc/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/exempi/exempi-2.0.pc.in b/exempi/exempi-2.0.pc.in
new file mode 100644
index 0000000..e8d6745
--- /dev/null
+++ b/exempi/exempi-2.0.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+VERSION=@VERSION@
+
+Name: exempi
+Description: Library for easy parsing of XMP metadata.
+Requires:
+Version: @VERSION@
+Libs: -L${libdir} -lexempi
+Cflags: -I${includedir}/@EXEMPI_INCLUDE_BASE@ -I${includedir}
diff --git a/exempi/exempi.1 b/exempi/exempi.1
new file mode 100644
index 0000000..01bb741
--- /dev/null
+++ b/exempi/exempi.1
@@ -0,0 +1,40 @@
+.TH exempi 1 "February 10 2013"
+
+.SH NAME
+
+exempi - command line tool to manipulate XMP metadata
+
+.SH SYNTAX
+
+exempi { -h | [ -R ] [ -x ] [ { -w | -o <file> } ] [ { -g <prop_name> | -s <prop_name> -v <value> }  ] } <files>
+
+.SH OPTIONS
+
+.IP "-h: show this help"
+.IP "-R: don't reconcile"
+.IP "-x: dump XML"
+.IP "-X: file(s) is XMP"
+.IP "-w: write in place. Only for -s. Not compatible with -o."
+.IP "-o <file>: file to write the output to."
+.IP "-n <ns> <prefix>: set the prefix for a namespace."
+.IP "-g <prop_name>: retrieve the value with prop_name."
+.IP "-s <prop_name> -v <value>: retrieve or get the value."
+.IP "<files> the files to read from."
+
+.SH SECURITY
+
+The source code hasn't been audited for security. The command line tool doesn't have a strong input sanity checking easier.
+.P
+Be careful not to run the tool as super-user. Be careful if you decide to use it in an online (web) application.
+.P
+Patches and suggestions welcome.
+
+.SH AUHTORS
+
+Exempi is written by Hubert Figuiere
+.P
+It contains the XMP SDK written by Adobe Systems Inc.
+
+.SH LICENSE
+
+Exempi is licensed under the BSD license.
diff --git a/exempi/exempi.cpp b/exempi/exempi.cpp
new file mode 100644
index 0000000..584aaf1
--- /dev/null
+++ b/exempi/exempi.cpp
@@ -0,0 +1,1177 @@
+/*
+ * exempi - exempi.cpp
+ *
+ * Copyright (C) 2007-2016 Hubert Figuière
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @brief this file implement the glue for XMP API
+ */
+
+#include "xmpconsts.h"
+#include "xmp.h"
+#include "xmperrors.h"
+
+#include <string>
+#include <iostream>
+#include <memory>
+
+#define XMP_INCLUDE_XMPFILES 1
+#define TXMP_STRING_TYPE std::string
+#include "XMP.hpp"
+#include "XMP.incl_cpp"
+#include "XMPUtils.hpp"
+
+#if HAVE_NATIVE_TLS
+
+static TLS int g_error = 0;
+
+static void set_error(int err)
+{
+    g_error = err;
+}
+
+#else
+
+#include <pthread.h>
+
+/* Portable thread local storage using pthreads */
+static pthread_key_t key = NULL;
+static pthread_once_t key_once = PTHREAD_ONCE_INIT;
+
+/* Destructor called when a thread exits - ensure to delete allocated int
+ * pointer */
+static void destroy_tls_key(void *ptr)
+{
+    int *err_ptr = static_cast<int *>(ptr);
+    delete err_ptr;
+}
+
+/* Create a key for use with pthreads local storage */
+static void create_tls_key()
+{
+    (void)pthread_key_create(&key, destroy_tls_key);
+}
+
+/* Obtain the latest xmp error for this specific thread - defaults to 0 */
+static int get_error_for_thread()
+{
+    int *err_ptr;
+
+    pthread_once(&key_once, create_tls_key);
+    err_ptr = (int *)pthread_getspecific(key);
+
+    if (err_ptr == NULL) {
+        return 0;
+    }
+
+    return *err_ptr;
+}
+
+/* set the current xmp error for this specific thread */
+static void set_error(int err)
+{
+    int *err_ptr;
+
+    // Ensure that create_thread_local_storage_key is only called
+    // once, by the first thread, to create the key.
+    pthread_once(&key_once, create_tls_key);
+
+    // Retrieve pointer to int for this thread.
+    err_ptr = (int *)pthread_getspecific(key);
+
+    // Allocate it, if it does not exists.
+    if (err_ptr == NULL) {
+        err_ptr = new int;
+        pthread_setspecific(key, err_ptr);
+    }
+
+    // Save the error for this thread.
+    *err_ptr = err;
+}
+
+#endif
+
+static void set_error(const XMP_Error &e)
+{
+    set_error(-e.GetID());
+    std::cerr << e.GetErrMsg() << std::endl;
+}
+
+#define RESET_ERROR set_error(0)
+
+// Hack: assign between XMP_DateTime and XmpDateTime
+#define ASSIGN(dst, src)                                                       \
+    (dst).year = (src).year;                                                   \
+    (dst).month = (src).month;                                                 \
+    (dst).day = (src).day;                                                     \
+    (dst).hour = (src).hour;                                                   \
+    (dst).minute = (src).minute;                                               \
+    (dst).second = (src).second;                                               \
+    (dst).tzSign = (src).tzSign;                                               \
+    (dst).tzHour = (src).tzHour;                                               \
+    (dst).tzMinute = (src).tzMinute;                                           \
+    (dst).nanoSecond = (src).nanoSecond;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char NS_XMP_META[] = "adobe:ns:meta/";
+const char NS_RDF[] = kXMP_NS_RDF;
+const char NS_EXIF[] = kXMP_NS_EXIF;
+const char NS_TIFF[] = kXMP_NS_TIFF;
+const char NS_XAP[] = kXMP_NS_XMP;
+const char NS_XAP_RIGHTS[] = kXMP_NS_XMP_Rights;
+const char NS_DC[] = kXMP_NS_DC;
+const char NS_EXIF_AUX[] = kXMP_NS_EXIF_Aux;
+const char NS_CRS[] = kXMP_NS_CameraRaw;
+const char NS_LIGHTROOM[] = "http://ns.adobe.com/lightroom/1.0/";
+const char NS_CAMERA_RAW_SETTINGS[] = kXMP_NS_CameraRaw;
+const char NS_CAMERA_RAW_SAVED_SETTINGS[] =
+    "http://ns.adobe.com/camera-raw-saved-settings/1.0/";
+const char NS_PHOTOSHOP[] = kXMP_NS_Photoshop;
+const char NS_IPTC4XMP[] = kXMP_NS_IPTCCore;
+const char NS_TPG[] = kXMP_NS_XMP_PagedFile;
+const char NS_DIMENSIONS_TYPE[] = kXMP_NS_XMP_Dimensions;
+const char NS_CC[] = "http://creativecommons.org/ns#";
+const char NS_PDF[] = kXMP_NS_PDF;
+
+#define STRING(x) reinterpret_cast<std::string *>(x)
+
+#define CHECK_PTR(p, r)                                                        \
+    if (p == NULL) {                                                           \
+        set_error(XMPErr_BadObject);                                           \
+        return r;                                                              \
+    }
+
+int xmp_get_error()
+{
+#if HAVE_NATIVE_TLS
+    return g_error;
+#else
+    return get_error_for_thread();
+#endif
+}
+
+// the error callback - force throwing exceptions
+static bool _xmp_error_callback(void* context, XMP_ErrorSeverity severity,
+                                XMP_Int32 cause, XMP_StringPtr message)
+{
+    return false;
+}
+
+bool xmp_init()
+{
+    RESET_ERROR;
+    try {
+        // no need to initialize anything else.
+        // XMP SDK 5.1.2 needs this because it has been stripped off local
+        // text conversion the one that was done in Exempi with libiconv.
+        bool result = SXMPFiles::Initialize(kXMPFiles_IgnoreLocalText);
+        SXMPMeta::SetDefaultErrorCallback(&_xmp_error_callback, nullptr, 1);
+        return result;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return false;
+}
+
+void xmp_terminate()
+{
+    RESET_ERROR;
+    SXMPFiles::Terminate();
+}
+
+bool xmp_register_namespace(const char *namespaceURI,
+                            const char *suggestedPrefix,
+                            XmpStringPtr registeredPrefix)
+{
+    RESET_ERROR;
+    try {
+        return SXMPMeta::RegisterNamespace(namespaceURI, suggestedPrefix,
+                                           STRING(registeredPrefix));
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return false;
+}
+
+bool xmp_namespace_prefix(const char *ns, XmpStringPtr prefix)
+{
+    CHECK_PTR(ns, false);
+    RESET_ERROR;
+    try {
+        return SXMPMeta::GetNamespacePrefix(ns, STRING(prefix));
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return false;
+}
+
+bool xmp_prefix_namespace_uri(const char *prefix, XmpStringPtr ns)
+{
+    CHECK_PTR(prefix, false);
+    RESET_ERROR;
+    try {
+        return SXMPMeta::GetNamespaceURI(prefix, STRING(ns));
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return false;
+}
+
+XmpFilePtr xmp_files_new()
+{
+    RESET_ERROR;
+
+    try {
+        auto txf = std::unique_ptr<SXMPFiles>(new SXMPFiles());
+
+        return reinterpret_cast<XmpFilePtr>(txf.release());
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return NULL;
+}
+
+XmpFilePtr xmp_files_open_new(const char *path, XmpOpenFileOptions options)
+{
+    CHECK_PTR(path, NULL);
+    RESET_ERROR;
+
+    try {
+        auto txf = std::unique_ptr<SXMPFiles>(new SXMPFiles);
+
+        txf->OpenFile(path, XMP_FT_UNKNOWN, options);
+
+        return reinterpret_cast<XmpFilePtr>(txf.release());
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+
+    return NULL;
+}
+
+bool xmp_files_open(XmpFilePtr xf, const char *path, XmpOpenFileOptions options)
+{
+    CHECK_PTR(xf, false);
+    RESET_ERROR;
+    auto txf = reinterpret_cast<SXMPFiles *>(xf);
+    try {
+        return txf->OpenFile(path, XMP_FT_UNKNOWN, options);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return false;
+}
+
+bool xmp_files_close(XmpFilePtr xf, XmpCloseFileOptions options)
+{
+    CHECK_PTR(xf, false);
+    RESET_ERROR;
+    try {
+        auto txf = reinterpret_cast<SXMPFiles *>(xf);
+        txf->CloseFile(options);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+    return true;
+}
+
+XmpPtr xmp_files_get_new_xmp(XmpFilePtr xf)
+{
+    CHECK_PTR(xf, NULL);
+    RESET_ERROR;
+    auto txf = reinterpret_cast<SXMPFiles *>(xf);
+
+    bool result = false;
+    try {
+        auto xmp = std::unique_ptr<SXMPMeta>(new SXMPMeta);
+        result = txf->GetXMP(xmp.get());
+        if (result) {
+            return reinterpret_cast<XmpPtr>(xmp.release());
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return NULL;
+}
+
+bool xmp_files_get_xmp(XmpFilePtr xf, XmpPtr xmp)
+{
+    CHECK_PTR(xf, false);
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+    bool result = false;
+    try {
+        auto txf = reinterpret_cast<SXMPFiles *>(xf);
+
+        result = txf->GetXMP(reinterpret_cast<SXMPMeta *>(xmp));
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return result;
+}
+
+bool xmp_files_get_xmp_xmpstring(XmpFilePtr xf, XmpStringPtr xmp_packet,
+                                 XmpPacketInfo* packet_info)
+{
+  CHECK_PTR(xf, false);
+  CHECK_PTR(xmp_packet, false);
+  RESET_ERROR;
+  bool result = false;
+  try {
+    SXMPFiles *txf = reinterpret_cast<SXMPFiles*>(xf);
+
+    XMP_PacketInfo xmp_packet_info;
+    result = txf->GetXMP(NULL,
+                         reinterpret_cast<std::string*>(xmp_packet),
+                         &xmp_packet_info);
+    if (packet_info) {
+      packet_info->offset = xmp_packet_info.offset;
+      packet_info->length = xmp_packet_info.length;
+      packet_info->padSize = xmp_packet_info.padSize;
+      packet_info->charForm = xmp_packet_info.charForm;
+      packet_info->writeable = xmp_packet_info.writeable;
+      packet_info->hasWrapper = xmp_packet_info.hasWrapper;
+      packet_info->pad = xmp_packet_info.pad;
+    }
+  }
+  catch(const XMP_Error & e) {
+    set_error(e);
+  }
+  return result;
+}
+
+
+bool xmp_files_can_put_xmp(XmpFilePtr xf, XmpPtr xmp)
+{
+    CHECK_PTR(xf, false);
+    RESET_ERROR;
+    auto txf = reinterpret_cast<SXMPFiles *>(xf);
+    bool result = false;
+
+    try {
+        result = txf->CanPutXMP(*reinterpret_cast<const SXMPMeta *>(xmp));
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+    return result;
+}
+
+bool xmp_files_can_put_xmp_xmpstring(XmpFilePtr xf, XmpStringPtr xmp_packet)
+{
+  CHECK_PTR(xf, false);
+  RESET_ERROR;
+  SXMPFiles *txf = reinterpret_cast<SXMPFiles*>(xf);
+  bool result = false;
+
+  try {
+    result = txf->CanPutXMP(*reinterpret_cast<const std::string*>(xmp_packet));
+  }
+  catch(const XMP_Error & e) {
+    set_error(e);
+    return false;
+  }
+  return result;
+}
+
+bool xmp_files_can_put_xmp_cstr(XmpFilePtr xf, const char* xmp_packet, size_t len)
+{
+  CHECK_PTR(xf, false);
+  RESET_ERROR;
+  SXMPFiles *txf = reinterpret_cast<SXMPFiles*>(xf);
+  bool result = false;
+
+  try {
+    result = txf->CanPutXMP(xmp_packet, len);
+  }
+  catch(const XMP_Error & e) {
+    set_error(e);
+    return false;
+  }
+  return result;
+}
+
+bool xmp_files_put_xmp(XmpFilePtr xf, XmpPtr xmp)
+{
+    CHECK_PTR(xf, false);
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+    auto txf = reinterpret_cast<SXMPFiles *>(xf);
+
+    try {
+        txf->PutXMP(*reinterpret_cast<const SXMPMeta *>(xmp));
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+    return true;
+}
+
+bool xmp_files_put_xmp_xmpstring(XmpFilePtr xf, XmpStringPtr xmp_packet)
+{
+  CHECK_PTR(xf, false);
+  CHECK_PTR(xmp_packet, false);
+  RESET_ERROR;
+  SXMPFiles *txf = reinterpret_cast<SXMPFiles*>(xf);
+
+  try {
+    txf->PutXMP(*reinterpret_cast<const std::string*>(xmp_packet));
+  }
+  catch(const XMP_Error & e) {
+    set_error(e);
+    return false;
+  }
+  return true;
+}
+
+bool xmp_files_put_xmp_cstr(XmpFilePtr xf, const char* xmp_packet, size_t len)
+{
+  CHECK_PTR(xf, false);
+  CHECK_PTR(xmp_packet, false);
+  RESET_ERROR;
+  SXMPFiles *txf = reinterpret_cast<SXMPFiles*>(xf);
+
+  try {
+    txf->PutXMP(xmp_packet, len);
+  }
+  catch(const XMP_Error & e) {
+    set_error(e);
+    return false;
+  }
+  return true;
+}
+
+bool xmp_files_get_file_info(XmpFilePtr xf, XmpStringPtr filePath,
+                             XmpOpenFileOptions *options,
+                             XmpFileType *file_format,
+                             XmpFileFormatOptions *handler_flags)
+{
+    CHECK_PTR(xf, false);
+    RESET_ERROR;
+
+    bool result = false;
+    auto txf = reinterpret_cast<SXMPFiles *>(xf);
+    try {
+        result = txf->GetFileInfo(STRING(filePath), (XMP_OptionBits *)options,
+                                  (XMP_FileFormat *)file_format,
+                                  (XMP_OptionBits *)handler_flags);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+
+    return result;
+}
+
+bool xmp_files_free(XmpFilePtr xf)
+{
+    CHECK_PTR(xf, false);
+    RESET_ERROR;
+    auto txf = reinterpret_cast<SXMPFiles *>(xf);
+    try {
+        delete txf;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+    return true;
+}
+
+bool xmp_files_get_format_info(XmpFileType format,
+                               XmpFileFormatOptions *options)
+{
+    RESET_ERROR;
+
+    bool result = false;
+    try {
+        result = SXMPFiles::GetFormatInfo(format, (XMP_OptionBits *)options);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+    return result;
+}
+
+XmpFileType xmp_files_check_file_format(const char *filePath)
+{
+    CHECK_PTR(filePath, XMP_FT_UNKNOWN);
+    RESET_ERROR;
+
+    XmpFileType file_type = XMP_FT_UNKNOWN;
+    try {
+        file_type = (XmpFileType)SXMPFiles::CheckFileFormat(filePath);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return XMP_FT_UNKNOWN;
+    }
+    return file_type;
+}
+
+XmpPtr xmp_new_empty()
+{
+    RESET_ERROR;
+    SXMPMeta *txmp = new SXMPMeta;
+    return (XmpPtr)txmp;
+}
+
+XmpPtr xmp_new(const char *buffer, size_t len)
+{
+    CHECK_PTR(buffer, NULL);
+    RESET_ERROR;
+
+    try {
+        auto txmp = std::unique_ptr<SXMPMeta>(new SXMPMeta(buffer, len));
+        return reinterpret_cast<XmpPtr>(txmp.release());
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return NULL;
+}
+
+XmpPtr xmp_copy(XmpPtr xmp)
+{
+    CHECK_PTR(xmp, NULL);
+    RESET_ERROR;
+
+    try {
+        auto txmp = std::unique_ptr<SXMPMeta>(new SXMPMeta(*(SXMPMeta *)xmp));
+        return reinterpret_cast<XmpPtr>(txmp.release());
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return NULL;
+}
+
+bool xmp_parse(XmpPtr xmp, const char *buffer, size_t len)
+{
+    CHECK_PTR(xmp, false);
+    CHECK_PTR(buffer, false);
+
+    SXMPMeta *txmp = (SXMPMeta *)xmp;
+    try {
+        txmp->ParseFromBuffer(buffer, len, kXMP_RequireXMPMeta);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+    return true;
+}
+
+bool xmp_serialize(XmpPtr xmp, XmpStringPtr buffer, uint32_t options,
+                   uint32_t padding)
+{
+    RESET_ERROR;
+    return xmp_serialize_and_format(xmp, buffer, options, padding, "\n", " ",
+                                    0);
+}
+
+bool xmp_serialize_and_format(XmpPtr xmp, XmpStringPtr buffer, uint32_t options,
+                              uint32_t padding, const char *newline,
+                              const char *tab, int32_t indent)
+{
+    CHECK_PTR(xmp, false);
+    CHECK_PTR(buffer, false);
+    RESET_ERROR;
+
+    SXMPMeta *txmp = (SXMPMeta *)xmp;
+    try {
+        txmp->SerializeToBuffer(STRING(buffer), options, padding, newline, tab,
+                                indent);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        return false;
+    }
+    return true;
+}
+
+bool xmp_free(XmpPtr xmp)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+    SXMPMeta *txmp = (SXMPMeta *)xmp;
+    delete txmp;
+    return true;
+}
+
+bool xmp_get_property(XmpPtr xmp, const char *schema, const char *name,
+                      XmpStringPtr property, uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        ret = txmp->GetProperty(schema, name, STRING(property), &optionBits);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return ret;
+}
+
+bool xmp_get_property_date(XmpPtr xmp, const char *schema, const char *name,
+                           XmpDateTime *property, uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        XMP_DateTime dt;
+        //		memset((void*)&dt, 1, sizeof(XMP_DateTime));
+        ret = txmp->GetProperty_Date(schema, name, &dt, &optionBits);
+        ASSIGN((*property), dt);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return ret;
+}
+
+bool xmp_get_property_float(XmpPtr xmp, const char *schema, const char *name,
+                            double *property, uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        ret = txmp->GetProperty_Float(schema, name, property, &optionBits);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return ret;
+}
+
+bool xmp_get_property_bool(XmpPtr xmp, const char *schema, const char *name,
+                           bool *property, uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        ret = txmp->GetProperty_Bool(schema, name, property, &optionBits);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return ret;
+}
+
+bool xmp_get_property_int32(XmpPtr xmp, const char *schema, const char *name,
+                            int32_t *property, uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        // the long converstion is needed until XMPCore is fixed it use proper
+        // types.
+        ret = txmp->GetProperty_Int(schema, name, property, &optionBits);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return ret;
+}
+
+bool xmp_get_property_int64(XmpPtr xmp, const char *schema, const char *name,
+                            int64_t *property, uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        ret = txmp->GetProperty_Int64(schema, name, property, &optionBits);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return ret;
+}
+
+bool xmp_get_array_item(XmpPtr xmp, const char *schema, const char *name,
+                        int32_t index, XmpStringPtr property,
+                        uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        ret = txmp->GetArrayItem(schema, name, index, STRING(property),
+                                 &optionBits);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    return ret;
+}
+
+bool xmp_set_property(XmpPtr xmp, const char *schema, const char *name,
+                      const char *value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    // see bug #16030
+    // when it is a struct or an array, get prop return an empty string
+    // but it fail if passed an empty string
+    if ((optionBits & (XMP_PROP_VALUE_IS_STRUCT | XMP_PROP_VALUE_IS_ARRAY)) &&
+        (*value == 0)) {
+        value = NULL;
+    }
+    try {
+        txmp->SetProperty(schema, name, value, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_set_property_date(XmpPtr xmp, const char *schema, const char *name,
+                           const XmpDateTime *value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        XMP_DateTime dt;
+        ASSIGN(dt, (*value));
+        txmp->SetProperty_Date(schema, name, dt, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_set_property_float(XmpPtr xmp, const char *schema, const char *name,
+                            double value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->SetProperty_Float(schema, name, value, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_set_property_bool(XmpPtr xmp, const char *schema, const char *name,
+                           bool value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->SetProperty_Bool(schema, name, value, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_set_property_int32(XmpPtr xmp, const char *schema, const char *name,
+                            int32_t value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->SetProperty_Int(schema, name, value, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_set_property_int64(XmpPtr xmp, const char *schema, const char *name,
+                            int64_t value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->SetProperty_Int64(schema, name, value, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_set_array_item(XmpPtr xmp, const char *schema, const char *name,
+                        int32_t index, const char *value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->SetArrayItem(schema, name, index, value, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_append_array_item(XmpPtr xmp, const char *schema, const char *name,
+                           uint32_t arrayOptions, const char *value,
+                           uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->AppendArrayItem(schema, name, arrayOptions, value, optionBits);
+        ret = true;
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+    catch (...) {
+    }
+    return ret;
+}
+
+bool xmp_delete_property(XmpPtr xmp, const char *schema, const char *name)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = true;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->DeleteProperty(schema, name);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        ret = false;
+    }
+    catch (...) {
+        ret = false;
+    }
+    return ret;
+}
+
+bool xmp_has_property(XmpPtr xmp, const char *schema, const char *name)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = true;
+    auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+    try {
+        ret = txmp->DoesPropertyExist(schema, name);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        ret = false;
+    }
+    catch (...) {
+        ret = false;
+    }
+    return ret;
+}
+
+bool xmp_get_localized_text(XmpPtr xmp, const char *schema, const char *name,
+                            const char *genericLang, const char *specificLang,
+                            XmpStringPtr actualLang, XmpStringPtr itemValue,
+                            uint32_t *propsBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = false;
+    try {
+        auto txmp = reinterpret_cast<const SXMPMeta *>(xmp);
+        XMP_OptionBits optionBits;
+        ret = txmp->GetLocalizedText(schema, name, genericLang, specificLang,
+                                     STRING(actualLang), STRING(itemValue),
+                                     &optionBits);
+        if (propsBits) {
+            *propsBits = optionBits;
+        }
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        ret = false;
+    }
+    return ret;
+}
+
+bool xmp_set_localized_text(XmpPtr xmp, const char *schema, const char *name,
+                            const char *genericLang, const char *specificLang,
+                            const char *value, uint32_t optionBits)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = true;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->SetLocalizedText(schema, name, genericLang, specificLang, value,
+                               optionBits);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        ret = false;
+    }
+    catch (...) {
+        ret = false;
+    }
+    return ret;
+}
+
+bool xmp_delete_localized_text(XmpPtr xmp, const char *schema, const char *name,
+                               const char *genericLang,
+                               const char *specificLang)
+{
+    CHECK_PTR(xmp, false);
+    RESET_ERROR;
+
+    bool ret = true;
+    auto txmp = reinterpret_cast<SXMPMeta *>(xmp);
+    try {
+        txmp->DeleteLocalizedText(schema, name, genericLang, specificLang);
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+        ret = false;
+    }
+    catch (...) {
+        ret = false;
+    }
+    return ret;
+}
+
+XmpStringPtr xmp_string_new()
+{
+    return (XmpStringPtr) new std::string;
+}
+
+void xmp_string_free(XmpStringPtr s)
+{
+    auto str = reinterpret_cast<std::string *>(s);
+    delete str;
+}
+
+const char *xmp_string_cstr(XmpStringPtr s)
+{
+    CHECK_PTR(s, NULL);
+    return reinterpret_cast<const std::string *>(s)->c_str();
+}
+
+size_t xmp_string_len(XmpStringPtr s)
+{
+    CHECK_PTR(s, 0);
+    return reinterpret_cast<const std::string *>(s)->size();
+}
+
+XmpIteratorPtr xmp_iterator_new(XmpPtr xmp, const char *schema,
+                                const char *propName, XmpIterOptions options)
+{
+    CHECK_PTR(xmp, NULL);
+    RESET_ERROR;
+
+    try {
+        auto xiter = std::unique_ptr<SXMPIterator>(
+            new SXMPIterator(*(SXMPMeta *)xmp, schema, propName, options));
+
+        return reinterpret_cast<XmpIteratorPtr>(xiter.release());
+    }
+    catch (const XMP_Error &e) {
+        set_error(e);
+    }
+
+    return NULL;
+}
+
+bool xmp_iterator_free(XmpIteratorPtr iter)
+{
+    CHECK_PTR(iter, false);
+    RESET_ERROR;
+    auto titer = reinterpret_cast<SXMPIterator *>(iter);
+    delete titer;
+    return true;
+}
+
+bool xmp_iterator_next(XmpIteratorPtr iter, XmpStringPtr schema,
+                       XmpStringPtr propName, XmpStringPtr propValue,
+                       uint32_t *options)
+{
+    CHECK_PTR(iter, false);
+    RESET_ERROR;
+    auto titer = reinterpret_cast<SXMPIterator *>(iter);
+    return titer->Next(reinterpret_cast<std::string *>(schema),
+                       reinterpret_cast<std::string *>(propName),
+                       reinterpret_cast<std::string *>(propValue), options);
+}
+
+bool xmp_iterator_skip(XmpIteratorPtr iter, XmpIterSkipOptions options)
+{
+    CHECK_PTR(iter, false);
+    RESET_ERROR;
+    auto titer = reinterpret_cast<SXMPIterator *>(iter);
+    titer->Skip(options);
+    return true;
+}
+
+int xmp_datetime_compare(XmpDateTime *left, XmpDateTime *right)
+{
+    if (!left && !right) {
+        return 0;
+    }
+    if (!left) {
+        return -1;
+    }
+    if (!right) {
+        return 1;
+    }
+    XMP_DateTime _left;
+    ASSIGN(_left, *left);
+    XMP_DateTime _right;
+    ASSIGN(_right, *right);
+    return XMPUtils::CompareDateTime(_left, _right);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/exempi/libexempi.sym b/exempi/libexempi.sym
new file mode 100644
index 0000000..d75d5c0
--- /dev/null
+++ b/exempi/libexempi.sym
@@ -0,0 +1,67 @@
+xmp_append_array_item
+xmp_copy
+xmp_delete_localized_text
+xmp_delete_property
+xmp_files_can_put_xmp
+xmp_files_close
+xmp_files_free
+xmp_files_get_new_xmp
+xmp_files_get_xmp
+xmp_files_new
+xmp_files_open
+xmp_files_open_new
+xmp_files_put_xmp
+xmp_free
+xmp_get_array_item
+xmp_get_error
+xmp_get_localized_text
+xmp_get_property
+xmp_get_property_bool
+xmp_get_property_date
+xmp_get_property_float
+xmp_get_property_int32
+xmp_get_property_int64
+xmp_has_property
+xmp_init
+xmp_iterator_free
+xmp_iterator_new
+xmp_iterator_next
+xmp_iterator_skip
+xmp_namespace_prefix
+xmp_new
+xmp_new_empty
+xmp_parse
+xmp_prefix_namespace_uri
+xmp_register_namespace
+xmp_serialize
+xmp_serialize_and_format
+xmp_set_array_item
+xmp_set_localized_text
+xmp_set_property
+xmp_set_property_bool
+xmp_set_property_date
+xmp_set_property_float
+xmp_set_property_int32
+xmp_set_property_int64
+xmp_string_cstr
+xmp_string_free
+xmp_string_new
+xmp_terminate
+NS_CAMERA_RAW_SAVED_SETTINGS
+NS_CAMERA_RAW_SETTINGS
+NS_CC
+NS_CRS
+NS_DC
+NS_DIMENSIONS_TYPE
+NS_EXIF
+NS_EXIF_AUX
+NS_IPTC4XMP
+NS_LIGHTROOM
+NS_PDF
+NS_PHOTOSHOP
+NS_RDF
+NS_TIFF
+NS_TPG
+NS_XAP
+NS_XAP_RIGHTS
+NS_XMP_META
diff --git a/exempi/main.cpp b/exempi/main.cpp
new file mode 100644
index 0000000..4cca1ca
--- /dev/null
+++ b/exempi/main.cpp
@@ -0,0 +1,357 @@
+/* -*- tab-width:4; c-basic-offset:4; indent-tabs-mode:nil;
+ * c-file-style:"stroustrup" -*- */
+/*
+ * exempi - exempi.cpp
+ *
+ * Copyright (C) 2011-2013 Hubert Figuiere
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <string>
+#include <vector>
+
+#include <exempi/xmp.h>
+#include <exempi/xmp++.hpp>
+
+enum { ACTION_NONE = 0, ACTION_SET, ACTION_GET };
+
+static void process_file(const char *filename, bool no_reconcile,
+                         bool is_an_xmp, bool dump_xml, bool write_in_place,
+                         int action, const std::string &value_name,
+                         const std::string &prop_value,
+                         const std::string &output);
+
+/** fatal error in argument. Display and quit. */
+static void fatal_error(const char *error)
+{
+    fprintf(stderr, "ERROR: %s\n", error);
+    exit(128);
+}
+
+/** Print the usage, and quit. Exit code is 255.
+ */
+static void usage()
+{
+    fprintf(stderr, "Exempi version %s\n", VERSION);
+    fprintf(stderr, "exempi { -h | [ -R ] [ -x ] [ { -w | -o <file> } ] [ { -g "
+                    "<prop_name> | -s <prop_name> -v <value> }  ] } <files>\n");
+    fprintf(stderr, "\t-h: show this help\n");
+    fprintf(stderr, "\t-R: don't reconcile\n");
+    fprintf(stderr, "\t-x: dump XML packet.\n");
+    fprintf(stderr, "\t-X: file(s) is XMP\n");
+    fprintf(stderr,
+            "\t-w: write in place. Only for -s. Not compatible with -o.\n");
+    fprintf(stderr, "\t-o <file>: file to write the output to.\n");
+    fprintf(stderr, "\t-n <uri> <prefix>: create a new namespace.\n");
+    fprintf(stderr, "\t-g <prop_name>: retrieve the value with prop_name.\n");
+    fprintf(stderr,
+            "\t-s <prop_name> -v <value>: retrieve or get the value.\n");
+    fprintf(stderr, "\t<files> the files to read from.\n");
+
+    exit(255);
+}
+
+int main(int argc, char **argv)
+{
+    int ch;
+
+    int action = ACTION_NONE;
+    bool dont_reconcile = false;
+    bool write_in_place = false;
+    bool dump_xml = false;
+    bool is_an_xmp = false;
+    std::string output_file;
+    std::string value_name;
+    std::string prop_value;
+    std::vector<std::pair<std::string, std::string>> namespaces;
+
+    while ((ch = getopt(argc, argv, "hRo:wxXn:g:s:v:")) != -1) {
+        switch (ch) {
+
+        case 'R':
+            dont_reconcile = true;
+            break;
+        case 'o':
+            output_file = optarg;
+            break;
+        case 'w':
+            write_in_place = true;
+            break;
+        case 'x':
+            dump_xml = true;
+            break;
+        case 'X':
+            is_an_xmp = true;
+            break;
+        case 'g':
+            if (!value_name.empty()) {
+                usage();
+            }
+            action = ACTION_GET;
+            value_name = optarg;
+            break;
+        case 'n': {
+            std::string ns = optarg;
+            std::string prefix = argv[optind];
+            if (prefix[0] && prefix[0] != '-') {
+                namespaces.push_back(make_pair(ns, prefix));
+                optind++;
+            }
+            break;
+        }
+        case 's':
+            if (!value_name.empty()) {
+                usage();
+            }
+            action = ACTION_SET;
+            value_name = optarg;
+            break;
+        case 'v':
+            if (action != ACTION_SET || value_name.empty()) {
+                fatal_error("-v needs to come after -s");
+            }
+            prop_value = optarg;
+            break;
+        case 'h':
+        case '?':
+            usage();
+            break;
+        }
+    }
+
+    argc -= optind;
+    argv += optind;
+
+    if (optind == 1 || argc == 0) {
+        fatal_error("Missing input.");
+        return 1;
+    }
+
+    if (write_in_place && (!output_file.empty() || action != ACTION_SET)) {
+        fatal_error(
+            "Need to write in place and output file are mutually exclusive.");
+        return 1;
+    }
+
+    if (action == ACTION_SET && (!write_in_place && argc > 1)) {
+        fatal_error("Need to write in place for more than one file.");
+        return 1;
+    }
+
+    xmp_init();
+    if (!namespaces.empty()) {
+        for (std::vector<std::pair<std::string, std::string>>::const_iterator
+                 iter = namespaces.begin();
+             iter != namespaces.end(); ++iter) {
+            xmp_register_namespace(iter->first.c_str(), iter->second.c_str(),
+                                   NULL);
+        }
+    }
+    while (argc) {
+
+        process_file(*argv, dont_reconcile, is_an_xmp, write_in_place, dump_xml,
+                     action, value_name, prop_value, output_file);
+        argc--;
+        argv++;
+    }
+
+    xmp_terminate();
+    return 0;
+}
+
+static XmpPtr get_xmp_from_sidecar(const char *filename, bool is_an_xmp)
+{
+    struct stat s;
+
+    if (stat(filename, &s) == -1) {
+        perror("exempi:");
+        return NULL;
+    }
+
+    off_t size = s.st_size;
+    FILE *file = fopen(filename, "r");
+    if (!file) {
+        perror("exempi:");
+        return NULL;
+    }
+
+    char *buffer = (char *)malloc(size);
+    size_t len = fread(buffer, 1, size, file);
+
+    XmpPtr xmp = xmp_new_empty();
+    if (!xmp_parse(xmp, buffer, len)) {
+        xmp_free(xmp);
+        xmp = NULL;
+    }
+    free(buffer);
+    fclose(file);
+    return xmp;
+}
+
+/** Helper to get the XMP for the file */
+static XmpPtr get_xmp_from_file(const char *filename, bool no_reconcile,
+                                bool is_an_xmp)
+{
+    if (is_an_xmp) {
+        return get_xmp_from_sidecar(filename, is_an_xmp);
+    }
+
+    xmp::ScopedPtr<XmpFilePtr> f(xmp_files_open_new(
+        filename, (XmpOpenFileOptions)(XMP_OPEN_READ |
+                                       (no_reconcile ? XMP_OPEN_ONLYXMP : 0))));
+    if (f) {
+        XmpPtr xmp = xmp_files_get_new_xmp(f);
+        xmp_files_close(f, XMP_CLOSE_NOOPTION);
+        return xmp;
+    }
+    return NULL;
+}
+
+/** dump the XMP xml to the output IO */
+static void dump_xmp(const char *filename, bool no_reconcile, bool is_an_xmp,
+                     FILE *outio)
+{
+    printf("dump_xmp for file %s\n", filename);
+    xmp::ScopedPtr<XmpPtr> xmp(
+        get_xmp_from_file(filename, no_reconcile, is_an_xmp));
+
+    xmp::ScopedPtr<XmpStringPtr> output(xmp_string_new());
+
+    xmp_serialize_and_format(xmp, output, XMP_SERIAL_OMITPACKETWRAPPER, 0, "\n",
+                             " ", 0);
+
+    fprintf(outio, "%s", xmp_string_cstr(output));
+}
+
+/** get an xmp prop and dump it to the output IO */
+static void get_xmp_prop(const char *filename, const std::string &value_name,
+                         bool no_reconcile, bool is_an_xmp, FILE *outio)
+{
+    xmp::ScopedPtr<XmpPtr> xmp(
+        get_xmp_from_file(filename, no_reconcile, is_an_xmp));
+
+    std::string prefix;
+    size_t idx = value_name.find(':');
+    if (idx != std::string::npos) {
+        prefix = std::string(value_name, 0, idx);
+    }
+
+    xmp::ScopedPtr<XmpStringPtr> property(xmp_string_new());
+    xmp::ScopedPtr<XmpStringPtr> ns(xmp_string_new());
+    xmp_prefix_namespace_uri(prefix.c_str(), ns);
+    xmp_get_property(xmp, xmp_string_cstr(ns), value_name.c_str(), property,
+                     NULL);
+    fprintf(outio, "%s\n", xmp_string_cstr(property));
+}
+
+static void set_xmp_prop(const char *filename, const std::string &value_name,
+                         const std::string &prop_value, bool no_reconcile,
+                         bool is_an_xmp, bool write_in_place, FILE *outio)
+{
+    xmp::ScopedPtr<XmpPtr> xmp(
+        get_xmp_from_file(filename, no_reconcile, is_an_xmp));
+
+    std::string prefix;
+    size_t idx = value_name.find(':');
+    if (idx != std::string::npos) {
+        prefix = std::string(value_name, 0, idx);
+    }
+
+    xmp::ScopedPtr<XmpStringPtr> ns(xmp_string_new());
+    xmp_prefix_namespace_uri(prefix.c_str(), ns);
+    if (!xmp_set_property(xmp, xmp_string_cstr(ns),
+                          value_name.c_str() + idx + 1, prop_value.c_str(),
+                          0)) {
+        fprintf(stderr, "set error = %d\n", xmp_get_error());
+    }
+
+    if (write_in_place) {
+        xmp::ScopedPtr<XmpFilePtr> f(xmp_files_open_new(
+            filename,
+            (XmpOpenFileOptions)(XMP_OPEN_FORUPDATE |
+                                 (no_reconcile ? XMP_OPEN_ONLYXMP : 0))));
+
+        if (!xmp_files_can_put_xmp(f, xmp)) {
+            fprintf(stderr, "can put xmp error = %d\n", xmp_get_error());
+        }
+        if (!xmp_files_put_xmp(f, xmp)) {
+            fprintf(stderr, "put xmp error = %d\n", xmp_get_error());
+        }
+        if (!xmp_files_close(f, XMP_CLOSE_SAFEUPDATE)) {
+            fprintf(stderr, "close error = %d\n", xmp_get_error());
+        }
+    }
+}
+
+/** process a file with all the options */
+static void process_file(const char *filename, bool no_reconcile,
+                         bool is_an_xmp, bool write_in_place, bool dump_xml,
+                         int action, const std::string &value_name,
+                         const std::string &prop_value,
+                         const std::string &output)
+{
+    printf("processing file %s\n", filename);
+
+    FILE *outio = stdout;
+
+    bool needclose = false;
+    if (!output.empty()) {
+        outio = fopen(output.c_str(), "a+");
+        needclose = true;
+    }
+
+    switch (action) {
+    case ACTION_NONE:
+        if (dump_xml) {
+            dump_xmp(filename, no_reconcile, is_an_xmp, outio);
+        }
+        break;
+    case ACTION_SET:
+        set_xmp_prop(filename, value_name, prop_value, no_reconcile, is_an_xmp,
+                     write_in_place, outio);
+        break;
+    case ACTION_GET:
+        get_xmp_prop(filename, value_name, no_reconcile, is_an_xmp, outio);
+        break;
+    default:
+        break;
+    }
+
+    if (needclose) {
+        fclose(outio);
+    }
+}
diff --git a/exempi/tests/Makefile.am b/exempi/tests/Makefile.am
new file mode 100644
index 0000000..7c92001
--- /dev/null
+++ b/exempi/tests/Makefile.am
@@ -0,0 +1,114 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2011 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+
+AUTOMAKE_OPTIONS = parallel-tests
+TEST_EXTENSIONS = .sh
+
+if WITH_UNIT_TEST
+check_PROGRAMS = testexempicore testserialise testwritenewprop \
+	testtiffleak testxmpfiles testxmpfileswrite \
+	testparse testiterator testinit testfdo18635 testfdo83313 testcpp testwebp
+TESTS = testcore.sh testinit testexempicore testserialise testwritenewprop \
+	testtiffleak testxmpfiles testxmpfileswrite \
+	testparse testiterator testfdo18635 testfdo83313 testcpp testwebp
+TESTS_ENVIRONMENT = TEST_DIR=$(srcdir) BOOST_TEST_CATCH_SYSTEM_ERRORS=no VALGRIND="$(VALGRIND)"
+LOG_COMPILER = $(VALGRIND)
+endif
+check_SCRIPTS = testcore.sh
+
+check_DATA = test1.xmp fdo18635.jpg fdo83313.jpg
+
+noinst_HEADERS = utils.h
+
+EXTRA_DIST = $(check_DATA) $(check_SCRIPTS)
+CLEANFILES = test.jpg test.webp
+
+AM_CXXFLAGS = @BOOST_CPPFLAGS@
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/public/include -I$(top_srcdir)
+
+testinit_SOURCES = testinit.cpp utils.cpp
+testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testexempicore_SOURCES = test-exempi-core.cpp utils.cpp
+testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testserialise_SOURCES = test-serialise.cpp utils.cpp
+testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testwritenewprop_SOURCES = test-write-new-prop.cpp utils.cpp
+testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testtiffleak_SOURCES = test-tiff-leak.cpp utils.cpp
+testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testxmpfiles_SOURCES = test-xmpfiles.cpp utils.cpp
+testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testxmpfileswrite_SOURCES = test-xmpfiles-write.cpp utils.cpp
+testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testparse_SOURCES = testparse.cpp utils.cpp
+testparse_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testparse_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testiterator_SOURCES = test-iterator.cpp utils.cpp
+testiterator_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testiterator_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testfdo18635_SOURCES = test-bgo.cpp utils.cpp
+testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testfdo83313_SOURCES = test-fdo83313.cpp utils.cpp
+testfdo83313_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testfdo83313_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testcpp_SOURCES = testcpp.cpp utils.cpp
+testcpp_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testcpp_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+
+testwebp_SOURCES = test-webp.cpp utils.cpp
+testwebp_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testwebp_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
diff --git a/exempi/tests/Makefile.in b/exempi/tests/Makefile.in
new file mode 100644
index 0000000..1afe460
--- /dev/null
+++ b/exempi/tests/Makefile.in
@@ -0,0 +1,1328 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2011 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@WITH_UNIT_TEST_TRUE@check_PROGRAMS = testexempicore$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testserialise$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testwritenewprop$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testtiffleak$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testxmpfiles$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testxmpfileswrite$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testparse$(EXEEXT) testiterator$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testinit$(EXEEXT) testfdo18635$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testfdo83313$(EXEEXT) testcpp$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testwebp$(EXEEXT)
+@WITH_UNIT_TEST_TRUE@TESTS = testcore.sh testinit$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testexempicore$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testserialise$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testwritenewprop$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testtiffleak$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testxmpfiles$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testxmpfileswrite$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testparse$(EXEEXT) testiterator$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testfdo18635$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testfdo83313$(EXEEXT) testcpp$(EXEEXT) \
+@WITH_UNIT_TEST_TRUE@	testwebp$(EXEEXT)
+subdir = exempi/tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am_testcpp_OBJECTS = testcpp.$(OBJEXT) utils.$(OBJEXT)
+testcpp_OBJECTS = $(am_testcpp_OBJECTS)
+testcpp_DEPENDENCIES = ../libexempi.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+testcpp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testcpp_LDFLAGS) $(LDFLAGS) -o $@
+am_testexempicore_OBJECTS = test-exempi-core.$(OBJEXT) utils.$(OBJEXT)
+testexempicore_OBJECTS = $(am_testexempicore_OBJECTS)
+testexempicore_DEPENDENCIES = ../libexempi.la
+testexempicore_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(testexempicore_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_testfdo18635_OBJECTS = test-bgo.$(OBJEXT) utils.$(OBJEXT)
+testfdo18635_OBJECTS = $(am_testfdo18635_OBJECTS)
+testfdo18635_DEPENDENCIES = ../libexempi.la
+testfdo18635_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testfdo18635_LDFLAGS) $(LDFLAGS) -o $@
+am_testfdo83313_OBJECTS = test-fdo83313.$(OBJEXT) utils.$(OBJEXT)
+testfdo83313_OBJECTS = $(am_testfdo83313_OBJECTS)
+testfdo83313_DEPENDENCIES = ../libexempi.la
+testfdo83313_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testfdo83313_LDFLAGS) $(LDFLAGS) -o $@
+am_testinit_OBJECTS = testinit.$(OBJEXT) utils.$(OBJEXT)
+testinit_OBJECTS = $(am_testinit_OBJECTS)
+testinit_DEPENDENCIES = ../libexempi.la
+testinit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testinit_LDFLAGS) $(LDFLAGS) -o $@
+am_testiterator_OBJECTS = test-iterator.$(OBJEXT) utils.$(OBJEXT)
+testiterator_OBJECTS = $(am_testiterator_OBJECTS)
+testiterator_DEPENDENCIES = ../libexempi.la
+testiterator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testiterator_LDFLAGS) $(LDFLAGS) -o $@
+am_testparse_OBJECTS = testparse.$(OBJEXT) utils.$(OBJEXT)
+testparse_OBJECTS = $(am_testparse_OBJECTS)
+testparse_DEPENDENCIES = ../libexempi.la
+testparse_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testparse_LDFLAGS) $(LDFLAGS) -o $@
+am_testserialise_OBJECTS = test-serialise.$(OBJEXT) utils.$(OBJEXT)
+testserialise_OBJECTS = $(am_testserialise_OBJECTS)
+testserialise_DEPENDENCIES = ../libexempi.la
+testserialise_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(testserialise_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_testtiffleak_OBJECTS = test-tiff-leak.$(OBJEXT) utils.$(OBJEXT)
+testtiffleak_OBJECTS = $(am_testtiffleak_OBJECTS)
+testtiffleak_DEPENDENCIES = ../libexempi.la
+testtiffleak_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testtiffleak_LDFLAGS) $(LDFLAGS) -o $@
+am_testwebp_OBJECTS = test-webp.$(OBJEXT) utils.$(OBJEXT)
+testwebp_OBJECTS = $(am_testwebp_OBJECTS)
+testwebp_DEPENDENCIES = ../libexempi.la
+testwebp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testwebp_LDFLAGS) $(LDFLAGS) -o $@
+am_testwritenewprop_OBJECTS = test-write-new-prop.$(OBJEXT) \
+	utils.$(OBJEXT)
+testwritenewprop_OBJECTS = $(am_testwritenewprop_OBJECTS)
+testwritenewprop_DEPENDENCIES = ../libexempi.la
+testwritenewprop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(testwritenewprop_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_testxmpfiles_OBJECTS = test-xmpfiles.$(OBJEXT) utils.$(OBJEXT)
+testxmpfiles_OBJECTS = $(am_testxmpfiles_OBJECTS)
+testxmpfiles_DEPENDENCIES = ../libexempi.la
+testxmpfiles_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(testxmpfiles_LDFLAGS) $(LDFLAGS) -o $@
+am_testxmpfileswrite_OBJECTS = test-xmpfiles-write.$(OBJEXT) \
+	utils.$(OBJEXT)
+testxmpfileswrite_OBJECTS = $(am_testxmpfileswrite_OBJECTS)
+testxmpfileswrite_DEPENDENCIES = ../libexempi.la
+testxmpfileswrite_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(testxmpfileswrite_LDFLAGS) \
+	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(testcpp_SOURCES) $(testexempicore_SOURCES) \
+	$(testfdo18635_SOURCES) $(testfdo83313_SOURCES) \
+	$(testinit_SOURCES) $(testiterator_SOURCES) \
+	$(testparse_SOURCES) $(testserialise_SOURCES) \
+	$(testtiffleak_SOURCES) $(testwebp_SOURCES) \
+	$(testwritenewprop_SOURCES) $(testxmpfiles_SOURCES) \
+	$(testxmpfileswrite_SOURCES)
+DIST_SOURCES = $(testcpp_SOURCES) $(testexempicore_SOURCES) \
+	$(testfdo18635_SOURCES) $(testfdo83313_SOURCES) \
+	$(testinit_SOURCES) $(testiterator_SOURCES) \
+	$(testparse_SOURCES) $(testserialise_SOURCES) \
+	$(testtiffleak_SOURCES) $(testwebp_SOURCES) \
+	$(testwritenewprop_SOURCES) $(testxmpfiles_SOURCES) \
+	$(testxmpfileswrite_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.sh.log=.log)
+SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	$(top_srcdir)/test-driver
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = parallel-tests
+TEST_EXTENSIONS = .sh
+@WITH_UNIT_TEST_TRUE@TESTS_ENVIRONMENT = TEST_DIR=$(srcdir) BOOST_TEST_CATCH_SYSTEM_ERRORS=no VALGRIND="$(VALGRIND)"
+@WITH_UNIT_TEST_TRUE@LOG_COMPILER = $(VALGRIND)
+check_SCRIPTS = testcore.sh
+check_DATA = test1.xmp fdo18635.jpg fdo83313.jpg
+noinst_HEADERS = utils.h
+EXTRA_DIST = $(check_DATA) $(check_SCRIPTS)
+CLEANFILES = test.jpg test.webp
+AM_CXXFLAGS = @BOOST_CPPFLAGS@
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/public/include -I$(top_srcdir)
+testinit_SOURCES = testinit.cpp utils.cpp
+testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testexempicore_SOURCES = test-exempi-core.cpp utils.cpp
+testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testserialise_SOURCES = test-serialise.cpp utils.cpp
+testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testwritenewprop_SOURCES = test-write-new-prop.cpp utils.cpp
+testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testtiffleak_SOURCES = test-tiff-leak.cpp utils.cpp
+testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testxmpfiles_SOURCES = test-xmpfiles.cpp utils.cpp
+testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testxmpfileswrite_SOURCES = test-xmpfiles-write.cpp utils.cpp
+testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testparse_SOURCES = testparse.cpp utils.cpp
+testparse_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testparse_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testiterator_SOURCES = test-iterator.cpp utils.cpp
+testiterator_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testiterator_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testfdo18635_SOURCES = test-bgo.cpp utils.cpp
+testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testfdo83313_SOURCES = test-fdo83313.cpp utils.cpp
+testfdo83313_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testfdo83313_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testcpp_SOURCES = testcpp.cpp utils.cpp
+testcpp_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testcpp_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+testwebp_SOURCES = test-webp.cpp utils.cpp
+testwebp_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+testwebp_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .log .o .obj .sh .sh$(EXEEXT) .trs
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign exempi/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign exempi/tests/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+testcpp$(EXEEXT): $(testcpp_OBJECTS) $(testcpp_DEPENDENCIES) $(EXTRA_testcpp_DEPENDENCIES) 
+	@rm -f testcpp$(EXEEXT)
+	$(AM_V_CXXLD)$(testcpp_LINK) $(testcpp_OBJECTS) $(testcpp_LDADD) $(LIBS)
+
+testexempicore$(EXEEXT): $(testexempicore_OBJECTS) $(testexempicore_DEPENDENCIES) $(EXTRA_testexempicore_DEPENDENCIES) 
+	@rm -f testexempicore$(EXEEXT)
+	$(AM_V_CXXLD)$(testexempicore_LINK) $(testexempicore_OBJECTS) $(testexempicore_LDADD) $(LIBS)
+
+testfdo18635$(EXEEXT): $(testfdo18635_OBJECTS) $(testfdo18635_DEPENDENCIES) $(EXTRA_testfdo18635_DEPENDENCIES) 
+	@rm -f testfdo18635$(EXEEXT)
+	$(AM_V_CXXLD)$(testfdo18635_LINK) $(testfdo18635_OBJECTS) $(testfdo18635_LDADD) $(LIBS)
+
+testfdo83313$(EXEEXT): $(testfdo83313_OBJECTS) $(testfdo83313_DEPENDENCIES) $(EXTRA_testfdo83313_DEPENDENCIES) 
+	@rm -f testfdo83313$(EXEEXT)
+	$(AM_V_CXXLD)$(testfdo83313_LINK) $(testfdo83313_OBJECTS) $(testfdo83313_LDADD) $(LIBS)
+
+testinit$(EXEEXT): $(testinit_OBJECTS) $(testinit_DEPENDENCIES) $(EXTRA_testinit_DEPENDENCIES) 
+	@rm -f testinit$(EXEEXT)
+	$(AM_V_CXXLD)$(testinit_LINK) $(testinit_OBJECTS) $(testinit_LDADD) $(LIBS)
+
+testiterator$(EXEEXT): $(testiterator_OBJECTS) $(testiterator_DEPENDENCIES) $(EXTRA_testiterator_DEPENDENCIES) 
+	@rm -f testiterator$(EXEEXT)
+	$(AM_V_CXXLD)$(testiterator_LINK) $(testiterator_OBJECTS) $(testiterator_LDADD) $(LIBS)
+
+testparse$(EXEEXT): $(testparse_OBJECTS) $(testparse_DEPENDENCIES) $(EXTRA_testparse_DEPENDENCIES) 
+	@rm -f testparse$(EXEEXT)
+	$(AM_V_CXXLD)$(testparse_LINK) $(testparse_OBJECTS) $(testparse_LDADD) $(LIBS)
+
+testserialise$(EXEEXT): $(testserialise_OBJECTS) $(testserialise_DEPENDENCIES) $(EXTRA_testserialise_DEPENDENCIES) 
+	@rm -f testserialise$(EXEEXT)
+	$(AM_V_CXXLD)$(testserialise_LINK) $(testserialise_OBJECTS) $(testserialise_LDADD) $(LIBS)
+
+testtiffleak$(EXEEXT): $(testtiffleak_OBJECTS) $(testtiffleak_DEPENDENCIES) $(EXTRA_testtiffleak_DEPENDENCIES) 
+	@rm -f testtiffleak$(EXEEXT)
+	$(AM_V_CXXLD)$(testtiffleak_LINK) $(testtiffleak_OBJECTS) $(testtiffleak_LDADD) $(LIBS)
+
+testwebp$(EXEEXT): $(testwebp_OBJECTS) $(testwebp_DEPENDENCIES) $(EXTRA_testwebp_DEPENDENCIES) 
+	@rm -f testwebp$(EXEEXT)
+	$(AM_V_CXXLD)$(testwebp_LINK) $(testwebp_OBJECTS) $(testwebp_LDADD) $(LIBS)
+
+testwritenewprop$(EXEEXT): $(testwritenewprop_OBJECTS) $(testwritenewprop_DEPENDENCIES) $(EXTRA_testwritenewprop_DEPENDENCIES) 
+	@rm -f testwritenewprop$(EXEEXT)
+	$(AM_V_CXXLD)$(testwritenewprop_LINK) $(testwritenewprop_OBJECTS) $(testwritenewprop_LDADD) $(LIBS)
+
+testxmpfiles$(EXEEXT): $(testxmpfiles_OBJECTS) $(testxmpfiles_DEPENDENCIES) $(EXTRA_testxmpfiles_DEPENDENCIES) 
+	@rm -f testxmpfiles$(EXEEXT)
+	$(AM_V_CXXLD)$(testxmpfiles_LINK) $(testxmpfiles_OBJECTS) $(testxmpfiles_LDADD) $(LIBS)
+
+testxmpfileswrite$(EXEEXT): $(testxmpfileswrite_OBJECTS) $(testxmpfileswrite_DEPENDENCIES) $(EXTRA_testxmpfileswrite_DEPENDENCIES) 
+	@rm -f testxmpfileswrite$(EXEEXT)
+	$(AM_V_CXXLD)$(testxmpfileswrite_LINK) $(testxmpfileswrite_OBJECTS) $(testxmpfileswrite_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bgo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-exempi-core.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fdo83313.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iterator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-serialise.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tiff-leak.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-webp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-write-new-prop.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xmpfiles-write.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xmpfiles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testcpp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testinit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testparse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS) $(check_SCRIPTS) $(check_DATA)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+testinit.log: testinit$(EXEEXT)
+	@p='testinit$(EXEEXT)'; \
+	b='testinit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testexempicore.log: testexempicore$(EXEEXT)
+	@p='testexempicore$(EXEEXT)'; \
+	b='testexempicore'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testserialise.log: testserialise$(EXEEXT)
+	@p='testserialise$(EXEEXT)'; \
+	b='testserialise'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testwritenewprop.log: testwritenewprop$(EXEEXT)
+	@p='testwritenewprop$(EXEEXT)'; \
+	b='testwritenewprop'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testtiffleak.log: testtiffleak$(EXEEXT)
+	@p='testtiffleak$(EXEEXT)'; \
+	b='testtiffleak'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testxmpfiles.log: testxmpfiles$(EXEEXT)
+	@p='testxmpfiles$(EXEEXT)'; \
+	b='testxmpfiles'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testxmpfileswrite.log: testxmpfileswrite$(EXEEXT)
+	@p='testxmpfileswrite$(EXEEXT)'; \
+	b='testxmpfileswrite'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testparse.log: testparse$(EXEEXT)
+	@p='testparse$(EXEEXT)'; \
+	b='testparse'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testiterator.log: testiterator$(EXEEXT)
+	@p='testiterator$(EXEEXT)'; \
+	b='testiterator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testfdo18635.log: testfdo18635$(EXEEXT)
+	@p='testfdo18635$(EXEEXT)'; \
+	b='testfdo18635'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testfdo83313.log: testfdo83313$(EXEEXT)
+	@p='testfdo83313$(EXEEXT)'; \
+	b='testfdo83313'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testcpp.log: testcpp$(EXEEXT)
+	@p='testcpp$(EXEEXT)'; \
+	b='testcpp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+testwebp.log: testwebp$(EXEEXT)
+	@p='testwebp$(EXEEXT)'; \
+	b='testwebp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.sh.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.sh$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) \
+	  $(check_DATA)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/exempi/tests/fdo18635.jpg b/exempi/tests/fdo18635.jpg
new file mode 100644
index 0000000..0f8f38f
Binary files /dev/null and b/exempi/tests/fdo18635.jpg differ
diff --git a/exempi/tests/fdo83313.jpg b/exempi/tests/fdo83313.jpg
new file mode 100644
index 0000000..59c5c43
Binary files /dev/null and b/exempi/tests/fdo83313.jpg differ
diff --git a/exempi/tests/test-bgo.cpp b/exempi/tests/test-bgo.cpp
new file mode 100644
index 0000000..1919780
--- /dev/null
+++ b/exempi/tests/test-bgo.cpp
@@ -0,0 +1,74 @@
+/*
+ * exempi - test-bgo.cpp
+ *
+ * Copyright (C) 2007-2008 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmpconsts.h"
+#include "xmp.h"
+
+int test_main(int argc, char* argv[])
+{
+  prepare_test(argc, argv, "fdo18635.jpg");
+
+  BOOST_CHECK(xmp_init());
+
+  XmpFilePtr xf = xmp_files_open_new(g_testfile.c_str(), XMP_OPEN_READ);
+
+  BOOST_CHECK(xf != NULL);
+  if (xf == NULL) {
+    return 1;
+  }
+
+  XmpPtr xmp = xmp_files_get_new_xmp(xf);
+
+  BOOST_CHECK(xmp != NULL);
+
+  BOOST_CHECK(xmp_free(xmp));
+  BOOST_CHECK(xmp_files_free(xf));
+
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test-exempi-core.cpp b/exempi/tests/test-exempi-core.cpp
new file mode 100644
index 0000000..c71f1b2
--- /dev/null
+++ b/exempi/tests/test-exempi-core.cpp
@@ -0,0 +1,231 @@
+/*
+ * exempi - test-exempi-core.cpp
+ *
+ * Copyright (C) 2007-2013 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmpconsts.h"
+#include "xmp.h"
+
+using boost::unit_test::test_suite;
+
+// void test_exempi()
+int test_main(int argc, char *argv[])
+{
+  prepare_test(argc, argv, "test1.xmp");
+
+  size_t len;
+  char *buffer;
+
+  FILE *f = fopen(g_testfile.c_str(), "rb");
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    exit(128);
+  }
+  fseek(f, 0, SEEK_END);
+  len = ftell(f);
+  fseek(f, 0, SEEK_SET);
+
+  buffer = (char *)malloc(len + 1);
+  size_t rlen = fread(buffer, 1, len, f);
+
+  BOOST_CHECK(rlen == len);
+  BOOST_CHECK(len != 0);
+
+  BOOST_CHECK(xmp_init());
+
+  XmpPtr xmp = xmp_new_empty();
+
+  BOOST_CHECK(xmp_parse(xmp, buffer, len));
+
+  BOOST_CHECK(xmp != NULL);
+
+  XmpStringPtr the_prop = xmp_string_new();
+  BOOST_CHECK(xmp_string_len(the_prop) == 0);
+
+  BOOST_CHECK(xmp_has_property(xmp, NS_TIFF, "Make"));
+  BOOST_CHECK(!xmp_has_property(xmp, NS_TIFF, "Foo"));
+
+  BOOST_CHECK(xmp_get_property(xmp, NS_TIFF, "Make", the_prop, NULL));
+  BOOST_CHECK(strcmp("Canon", xmp_string_cstr(the_prop)) == 0);
+  BOOST_CHECK(xmp_string_len(the_prop) == 5);
+
+  BOOST_CHECK(xmp_set_property(xmp, NS_TIFF, "Make", "Leica", 0));
+  BOOST_CHECK(xmp_get_property(xmp, NS_TIFF, "Make", the_prop, NULL));
+  BOOST_CHECK(strcmp("Leica", xmp_string_cstr(the_prop)) == 0);
+  BOOST_CHECK(xmp_string_len(the_prop) == 5);
+
+  uint32_t bits;
+  BOOST_CHECK(
+    xmp_get_property(xmp, NS_DC, "rights[1]/?xml:lang", the_prop, &bits));
+  BOOST_CHECK(bits == 0x20);
+  BOOST_CHECK(XMP_IS_PROP_QUALIFIER(bits));
+
+  BOOST_CHECK(xmp_get_property(xmp, NS_DC, "rights[1]", the_prop, &bits));
+  BOOST_CHECK(bits == 0x50);
+  BOOST_CHECK(XMP_HAS_PROP_QUALIFIERS(bits));
+
+  XmpStringPtr the_lang = xmp_string_new();
+  BOOST_CHECK(xmp_get_localized_text(xmp, NS_DC, "rights", NULL, "x-default",
+                                     the_lang, the_prop, &bits));
+  BOOST_CHECK(strcmp("x-default", xmp_string_cstr(the_lang)) == 0);
+  BOOST_CHECK(strcmp("2006, Hubert Figuiere", xmp_string_cstr(the_prop)) == 0);
+
+  // This will modify the default property.
+  BOOST_CHECK(
+    xmp_set_localized_text(xmp, NS_DC, "rights", "en", "en-CA", "Foo Bar", 0));
+  // Ask for the en_US alternative.
+  BOOST_CHECK(xmp_get_localized_text(xmp, NS_DC, "rights", "en", "en-US",
+                                     the_lang, the_prop, &bits));
+  // And we only got the "en-CA" as the only "en"
+  BOOST_CHECK(strcmp("en-US", xmp_string_cstr(the_lang)) != 0);
+  BOOST_CHECK(strcmp("en-CA", xmp_string_cstr(the_lang)) == 0);
+  // Check its value
+  BOOST_CHECK(strcmp("Foo Bar", xmp_string_cstr(the_prop)) == 0);
+  // The default property is supposed to have been changed too.
+  BOOST_CHECK(xmp_get_localized_text(xmp, NS_DC, "rights", NULL, "x-default",
+                                     the_lang, the_prop, &bits));
+  BOOST_CHECK(strcmp("Foo Bar", xmp_string_cstr(the_prop)) == 0);
+
+  // This should also remove the property x-default. (SDK 5.2.2)
+  BOOST_CHECK(xmp_delete_localized_text(xmp, NS_DC, "rights", "en", "en-CA"));
+
+  BOOST_CHECK(!xmp_has_property(xmp, NS_DC, "rights[1]"));
+  BOOST_CHECK(!xmp_has_property(xmp, NS_DC, "rights[2]"));
+
+  xmp_string_free(the_lang);
+
+  BOOST_CHECK(xmp_set_array_item(xmp, NS_DC, "creator", 2, "foo", 0));
+  BOOST_CHECK(xmp_get_array_item(xmp, NS_DC, "creator", 2, the_prop, &bits));
+  BOOST_CHECK(XMP_IS_PROP_SIMPLE(bits));
+  BOOST_CHECK(strcmp("foo", xmp_string_cstr(the_prop)) == 0);
+  BOOST_CHECK(xmp_append_array_item(xmp, NS_DC, "creator", 0, "bar", 0));
+
+  BOOST_CHECK(xmp_get_array_item(xmp, NS_DC, "creator", 3, the_prop, &bits));
+  BOOST_CHECK(XMP_IS_PROP_SIMPLE(bits));
+  BOOST_CHECK(strcmp("bar", xmp_string_cstr(the_prop)) == 0);
+
+  BOOST_CHECK(xmp_delete_property(xmp, NS_DC, "creator[3]"));
+  BOOST_CHECK(!xmp_has_property(xmp, NS_DC, "creator[3]"));
+
+  BOOST_CHECK(
+    xmp_get_property(xmp, NS_EXIF, "DateTimeOriginal", the_prop, NULL));
+  BOOST_CHECK(strcmp("2006-12-07T23:20:43-05:00", xmp_string_cstr(the_prop)) ==
+              0);
+
+  BOOST_CHECK(xmp_get_property(xmp, NS_XAP, "Rating", the_prop, NULL));
+  BOOST_CHECK(strcmp("3", xmp_string_cstr(the_prop)) == 0);
+
+  xmp_string_free(the_prop);
+
+  // testing date time get
+  XmpDateTime the_dt;
+  bool ret;
+  BOOST_CHECK(ret = xmp_get_property_date(xmp, NS_EXIF, "DateTimeOriginal",
+                                          &the_dt, NULL));
+  BOOST_CHECK(the_dt.year == 2006);
+  BOOST_CHECK(the_dt.minute == 20);
+  BOOST_CHECK(the_dt.tzSign == XMP_TZ_WEST);
+
+  // testing compare
+  XmpDateTime the_other_dt;
+  BOOST_CHECK(ret = xmp_get_property_date(xmp, NS_EXIF, "DateTimeOriginal",
+                                          &the_other_dt, NULL));
+  BOOST_CHECK(xmp_datetime_compare(&the_dt, &the_other_dt) == 0);
+  the_other_dt.year++;
+  BOOST_CHECK(xmp_datetime_compare(&the_dt, &the_other_dt) < 0);
+  BOOST_CHECK(xmp_datetime_compare(&the_other_dt, &the_dt) > 0);
+  // NULL checks - this is Exempi API
+  BOOST_CHECK(xmp_datetime_compare(NULL, NULL) == 0);
+  BOOST_CHECK(xmp_datetime_compare(NULL, &the_other_dt) < 0);
+  BOOST_CHECK(xmp_datetime_compare(&the_other_dt, NULL) > 0);
+
+  // testing float get set
+  double float_value = 0.0;
+  BOOST_CHECK(xmp_get_property_float(xmp, NS_CAMERA_RAW_SETTINGS,
+                                     "SharpenRadius", &float_value, NULL));
+  BOOST_CHECK(float_value == 1.0);
+  BOOST_CHECK(xmp_set_property_float(xmp, NS_CAMERA_RAW_SETTINGS,
+                                     "SharpenRadius", 2.5, 0));
+  BOOST_CHECK(xmp_get_property_float(xmp, NS_CAMERA_RAW_SETTINGS,
+                                     "SharpenRadius", &float_value, NULL));
+  BOOST_CHECK(float_value == 2.5);
+
+  // testing bool get set
+  bool bool_value = true;
+  BOOST_CHECK(xmp_get_property_bool(xmp, NS_CAMERA_RAW_SETTINGS,
+                                    "AlreadyApplied", &bool_value, NULL));
+  BOOST_CHECK(!bool_value);
+  BOOST_CHECK(xmp_set_property_bool(xmp, NS_CAMERA_RAW_SETTINGS,
+                                    "AlreadyApplied", true, 0));
+  BOOST_CHECK(xmp_get_property_bool(xmp, NS_CAMERA_RAW_SETTINGS,
+                                    "AlreadyApplied", &bool_value, NULL));
+  BOOST_CHECK(bool_value);
+
+  // testing int get set
+  int32_t value = 0;
+  BOOST_CHECK(
+    xmp_get_property_int32(xmp, NS_EXIF, "MeteringMode", &value, NULL));
+  BOOST_CHECK(value == 5);
+  BOOST_CHECK(xmp_set_property_int32(xmp, NS_EXIF, "MeteringMode", 10, 0));
+  int64_t valuelarge = 0;
+  BOOST_CHECK(
+    xmp_get_property_int64(xmp, NS_EXIF, "MeteringMode", &valuelarge, NULL));
+  BOOST_CHECK(valuelarge == 10);
+  BOOST_CHECK(xmp_set_property_int64(xmp, NS_EXIF, "MeteringMode", 32, 0));
+
+  BOOST_CHECK(
+    xmp_get_property_int32(xmp, NS_EXIF, "MeteringMode", &value, NULL));
+  BOOST_CHECK(value == 32);
+
+  BOOST_CHECK(xmp_free(xmp));
+
+  free(buffer);
+  fclose(f);
+
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test-fdo83313.cpp b/exempi/tests/test-fdo83313.cpp
new file mode 100644
index 0000000..38ff771
--- /dev/null
+++ b/exempi/tests/test-fdo83313.cpp
@@ -0,0 +1,74 @@
+/*
+ * exempi - test-bgo.cpp
+ *
+ * Copyright (C) 2007-2008 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmpconsts.h"
+#include "xmp.h"
+
+int test_main(int argc, char* argv[])
+{
+  prepare_test(argc, argv, "fdo83313.jpg");
+
+  BOOST_CHECK(xmp_init());
+
+  XmpFilePtr xf = xmp_files_open_new(g_testfile.c_str(), XMP_OPEN_READ);
+
+  BOOST_CHECK(xf != NULL);
+  if (xf == NULL) {
+    return 1;
+  }
+
+  XmpPtr xmp = xmp_files_get_new_xmp(xf);
+
+  BOOST_CHECK(xmp != NULL);
+
+  BOOST_CHECK(xmp_free(xmp));
+  BOOST_CHECK(xmp_files_free(xf));
+
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test-iterator.cpp b/exempi/tests/test-iterator.cpp
new file mode 100644
index 0000000..f78910e
--- /dev/null
+++ b/exempi/tests/test-iterator.cpp
@@ -0,0 +1,172 @@
+/*
+ * exempi - test3.cpp
+ *
+ * Copyright (C) 2007-2017 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+#include <iostream>
+
+#include <boost/test/minimal.hpp>
+#include <boost/format.hpp>
+
+#include "utils.h"
+#include "xmp.h"
+#include "xmpconsts.h"
+
+using boost::unit_test::test_suite;
+
+// void test_exempi_iterate()
+int test_main(int argc, char *argv[])
+{
+  prepare_test(argc, argv, "test1.xmp");
+
+  size_t len;
+  char *buffer;
+
+  FILE *f = fopen(g_testfile.c_str(), "rb");
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    exit(128);
+  }
+  fseek(f, 0, SEEK_END);
+  len = ftell(f);
+  fseek(f, 0, SEEK_SET);
+
+  buffer = (char *)malloc(len + 1);
+  size_t rlen = fread(buffer, 1, len, f);
+
+  BOOST_CHECK(rlen == len);
+  BOOST_CHECK(len != 0);
+  BOOST_CHECK(xmp_init());
+
+  XmpPtr xmp = xmp_new_empty();
+
+  BOOST_CHECK(xmp_parse(xmp, buffer, len));
+
+  BOOST_CHECK(xmp != NULL);
+
+  XmpStringPtr the_schema = xmp_string_new();
+  XmpStringPtr the_path = xmp_string_new();
+  XmpStringPtr the_prop = xmp_string_new();
+  uint32_t options;
+
+  typedef std::array<std::string, 3> tuple3;
+
+  {
+    // leafnodes iteration
+    XmpIteratorPtr iter =
+      xmp_iterator_new(xmp, NS_DC, NULL, XMP_ITER_JUSTLEAFNODES);
+
+    BOOST_CHECK(iter);
+    std::vector<tuple3> props;
+
+    while (xmp_iterator_next(iter, the_schema, the_path, the_prop, &options)) {
+      props.push_back(tuple3 {
+          xmp_string_cstr(the_schema),
+          xmp_string_cstr(the_path),
+          xmp_string_cstr(the_prop)
+        });
+    }
+
+    BOOST_CHECK(props.size() == 7);
+    for (auto prop_tuple : props) {
+      BOOST_CHECK(prop_tuple[0] == NS_DC);
+    }
+    BOOST_CHECK(props[0][2] == "unknown");
+    BOOST_CHECK(props[3][1] == "dc:subject[1]");
+
+    BOOST_CHECK(xmp_iterator_free(iter));
+  }
+
+  {
+    // leafname iteration
+    XmpIteratorPtr iter =
+      xmp_iterator_new(xmp, NS_DC, "rights", XMP_ITER_JUSTLEAFNAME);
+
+    BOOST_CHECK(iter);
+    std::vector<tuple3> props;
+
+    while (xmp_iterator_next(iter, the_schema, the_path, the_prop, &options)) {
+      props.push_back(tuple3 {
+          xmp_string_cstr(the_schema),
+          xmp_string_cstr(the_path),
+          xmp_string_cstr(the_prop)
+        });
+    }
+
+    BOOST_CHECK(props.size() == 3);
+
+    BOOST_CHECK(props[0] == tuple3({ NS_DC, "dc:rights", "" }));
+    BOOST_CHECK(props[1] == tuple3({ "", "[1]", "2006, Hubert Figuiere" }));
+    BOOST_CHECK(props[2] == tuple3({ "http://www.w3.org/XML/1998/namespace", "xml:lang", "x-default" }));
+
+    BOOST_CHECK(xmp_iterator_free(iter));
+  }
+
+  {
+    // Iterator with property but no NS is invalid.
+    XmpIteratorPtr iter =
+      xmp_iterator_new(xmp, NULL, "rights", XMP_ITER_JUSTLEAFNODES);
+
+    // Invalid iterator
+    BOOST_CHECK(!iter);
+  }
+
+  {
+    // Iterating namespaces is invalid.
+    XmpIteratorPtr iter =
+      xmp_iterator_new(xmp, NULL, NULL, XMP_ITER_NAMESPACES);
+
+    // Invalid iterator
+    BOOST_CHECK(!iter);
+  }
+
+  xmp_string_free(the_prop);
+  xmp_string_free(the_path);
+  xmp_string_free(the_schema);
+  BOOST_CHECK(xmp_free(xmp));
+
+  free(buffer);
+  fclose(f);
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test-serialise.cpp b/exempi/tests/test-serialise.cpp
new file mode 100644
index 0000000..6175a16
--- /dev/null
+++ b/exempi/tests/test-serialise.cpp
@@ -0,0 +1,102 @@
+/*
+ * exempi - test-serialise.cpp
+ *
+ * Copyright (C) 2007-2008 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmpconsts.h"
+#include "xmp.h"
+
+using boost::unit_test::test_suite;
+
+// void test_serialize()
+int test_main(int argc, char *argv[])
+{
+  prepare_test(argc, argv, "test1.xmp");
+
+  size_t len;
+  char *buffer;
+  FILE *f = fopen(g_testfile.c_str(), "rb");
+
+  fseek(f, 0, SEEK_END);
+  len = ftell(f);
+  fseek(f, 0, SEEK_SET);
+
+  buffer = (char *)malloc(len + 1);
+  size_t rlen = fread(buffer, 1, len, f);
+
+  BOOST_CHECK(rlen == len);
+  BOOST_CHECK(len != 0);
+  buffer[rlen] = 0;
+
+  BOOST_CHECK(xmp_init());
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  XmpPtr xmp = xmp_new_empty();
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  BOOST_CHECK(xmp_parse(xmp, buffer, len));
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  std::string b1(buffer);
+  std::string b2;
+  XmpStringPtr output = xmp_string_new();
+
+  BOOST_CHECK(xmp_serialize_and_format(
+    xmp, output, XMP_SERIAL_OMITPACKETWRAPPER, 0, "\n", " ", 0));
+  BOOST_CHECK(xmp_get_error() == 0);
+  b2 = xmp_string_cstr(output);
+  // find a way to compare that.
+  //	BOOST_CHECK_EQUAL(b1, b2);
+
+  xmp_string_free(output);
+  BOOST_CHECK(xmp_free(xmp));
+
+  free(buffer);
+  fclose(f);
+
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test-tiff-leak.cpp b/exempi/tests/test-tiff-leak.cpp
new file mode 100644
index 0000000..729cced
--- /dev/null
+++ b/exempi/tests/test-tiff-leak.cpp
@@ -0,0 +1,86 @@
+/*
+ * exempi - test-tiff-leak.cpp
+ *
+ * Copyright (C) 2007-2008,2010 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmp.h"
+#include "xmpconsts.h"
+
+/**  See http://www.adobeforums.com/webx/.3bc42b73 for the orignal
+ *   test case */
+// void test_tiff_leak()
+int test_main(int argc, char *argv[])
+{
+  prepare_test(argc, argv, "../../samples/testfiles/BlueSquare.jpg");
+
+  std::string orig_tiff_file =
+    g_src_testdir + "../../samples/testfiles/BlueSquare.tif";
+  BOOST_CHECK(copy_file(orig_tiff_file, "test.tif"));
+  BOOST_CHECK(chmod("test.tif", S_IRUSR | S_IWUSR) == 0);
+  BOOST_CHECK(xmp_init());
+
+  XmpFilePtr f = xmp_files_open_new("test.tif", XMP_OPEN_FORUPDATE);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    return 1;
+  }
+
+  XmpPtr xmp;
+
+  BOOST_CHECK(xmp = xmp_files_get_new_xmp(f));
+  BOOST_CHECK(xmp != NULL);
+
+  xmp_set_localized_text(xmp, NS_DC, "description", "en", "en-US", "foo", 0);
+  BOOST_CHECK(xmp_files_put_xmp(f, xmp));
+  BOOST_CHECK(xmp_files_close(f, XMP_CLOSE_NOOPTION));
+  BOOST_CHECK(xmp_free(xmp));
+  BOOST_CHECK(xmp_files_free(f));
+  xmp_terminate();
+
+  BOOST_CHECK(unlink("test.tif") == 0);
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test-webp.cpp b/exempi/tests/test-webp.cpp
new file mode 100644
index 0000000..47aa7dc
--- /dev/null
+++ b/exempi/tests/test-webp.cpp
@@ -0,0 +1,119 @@
+/*
+ * exempi - test-webp.cpp
+ *
+ * Copyright (C) 2007-2016 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmp.h"
+#include "xmpconsts.h"
+
+using boost::unit_test::test_suite;
+
+
+int test_main(int argc, char *argv[])
+{
+  prepare_test(argc, argv, "../../samples/testfiles/BlueSquare.webp");
+
+  BOOST_CHECK(xmp_init());
+
+  BOOST_CHECK(xmp_files_check_file_format(g_testfile.c_str()) == XMP_FT_WEBP);
+  XmpFilePtr f = xmp_files_open_new(g_testfile.c_str(), XMP_OPEN_READ);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    return 1;
+  }
+
+  XmpPtr xmp = xmp_files_get_new_xmp(f);
+  BOOST_CHECK(xmp != NULL);
+
+  BOOST_CHECK(xmp_files_free(f));
+
+  BOOST_CHECK(copy_file(g_testfile, "test.webp"));
+  BOOST_CHECK(chmod("test.webp", S_IRUSR | S_IWUSR) == 0);
+
+  BOOST_CHECK(xmp_files_check_file_format("test.webp") == XMP_FT_WEBP);
+
+  f = xmp_files_open_new("test.webp", XMP_OPEN_FORUPDATE);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    return 2;
+  }
+
+  BOOST_CHECK(xmp_set_property(xmp, NS_PHOTOSHOP, "ICCProfile", "foo", 0));
+
+  BOOST_CHECK(xmp_files_can_put_xmp(f, xmp));
+  BOOST_CHECK(xmp_files_put_xmp(f, xmp));
+
+  BOOST_CHECK(xmp_free(xmp));
+  BOOST_CHECK(xmp_files_close(f, XMP_CLOSE_SAFEUPDATE));
+  BOOST_CHECK(xmp_files_free(f));
+
+  f = xmp_files_open_new("test.webp", XMP_OPEN_READ);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    return 3;
+  }
+  xmp = xmp_files_get_new_xmp(f);
+  BOOST_CHECK(xmp != NULL);
+
+  XmpStringPtr the_prop = xmp_string_new();
+  BOOST_CHECK(
+    xmp_get_property(xmp, NS_PHOTOSHOP, "ICCProfile", the_prop, NULL));
+  BOOST_CHECK(strcmp("foo", xmp_string_cstr(the_prop)) == 0);
+
+  xmp_string_free(the_prop);
+
+  BOOST_CHECK(xmp_free(xmp));
+  BOOST_CHECK(xmp_files_close(f, XMP_CLOSE_NOOPTION));
+  BOOST_CHECK(xmp_files_free(f));
+
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+
+  return 0;
+}
diff --git a/exempi/tests/test-write-new-prop.cpp b/exempi/tests/test-write-new-prop.cpp
new file mode 100644
index 0000000..524376e
--- /dev/null
+++ b/exempi/tests/test-write-new-prop.cpp
@@ -0,0 +1,150 @@
+/*
+ * exempi - test1.cpp
+ *
+ * Copyright (C) 2007-2008 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmpconsts.h"
+#include "xmp.h"
+
+using boost::unit_test::test_suite;
+
+// void test_write_new_property()
+int test_main(int argc, char *argv[])
+{
+  prepare_test(argc, argv, "test1.xmp");
+
+  size_t len;
+  char *buffer;
+
+  FILE *f = fopen(g_testfile.c_str(), "rb");
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    exit(128);
+  }
+  fseek(f, 0, SEEK_END);
+  len = ftell(f);
+  fseek(f, 0, SEEK_SET);
+
+  buffer = (char *)malloc(len + 1);
+  size_t rlen = fread(buffer, 1, len, f);
+
+  BOOST_CHECK(rlen == len);
+  BOOST_CHECK(len != 0);
+
+  BOOST_CHECK(xmp_init());
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  XmpPtr xmp = xmp_new_empty();
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  BOOST_CHECK(xmp_parse(xmp, buffer, len));
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  BOOST_CHECK(xmp != NULL);
+
+  XmpStringPtr reg_prefix = xmp_string_new();
+  BOOST_CHECK(xmp_register_namespace(NS_CC, "cc", reg_prefix));
+  BOOST_CHECK(xmp_get_error() == 0);
+  BOOST_CHECK(strcmp("cc:", xmp_string_cstr(reg_prefix)) == 0);
+
+  BOOST_CHECK(xmp_prefix_namespace_uri("cc", reg_prefix));
+  BOOST_CHECK(xmp_get_error() == 0);
+  BOOST_CHECK(strcmp(NS_CC, xmp_string_cstr(reg_prefix)) == 0);
+
+  BOOST_CHECK(xmp_namespace_prefix(NS_CC, reg_prefix));
+  BOOST_CHECK(xmp_get_error() == 0);
+  BOOST_CHECK(strcmp("cc:", xmp_string_cstr(reg_prefix)) == 0);
+
+  xmp_string_free(reg_prefix);
+
+  BOOST_CHECK(xmp_set_property(xmp, NS_CC, "License", "Foo", 0));
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  XmpStringPtr the_prop = xmp_string_new();
+  BOOST_CHECK(xmp_get_property(xmp, NS_CC, "License", the_prop, NULL));
+  BOOST_CHECK(xmp_get_error() == 0);
+  BOOST_CHECK(strcmp("Foo", xmp_string_cstr(the_prop)) == 0);
+
+  XmpDateTime the_dt;
+  the_dt.year = 2005;
+  the_dt.month = 12;
+  the_dt.day = 25;
+  the_dt.hour = 12;
+  the_dt.minute = 42;
+  the_dt.second = 42;
+  the_dt.tzSign = XMP_TZ_UTC;
+  the_dt.tzHour = 0;
+  the_dt.tzMinute = 0;
+  the_dt.nanoSecond = 0;
+  BOOST_CHECK(
+    xmp_set_property_date(xmp, NS_EXIF, "DateTimeOriginal", &the_dt, 0));
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  BOOST_CHECK(
+    xmp_get_property(xmp, NS_EXIF, "DateTimeOriginal", the_prop, NULL));
+  BOOST_CHECK(xmp_get_error() == 0);
+  BOOST_CHECK(strcmp("2005-12-25T12:42:42", xmp_string_cstr(the_prop)) == 0);
+
+  XmpDateTime the_dt2;
+  BOOST_CHECK(
+    xmp_get_property_date(xmp, NS_EXIF, "DateTimeOriginal", &the_dt2, NULL));
+  BOOST_CHECK(xmp_get_error() == 0);
+
+  BOOST_CHECK(the_dt2.year == 2005);
+  BOOST_CHECK(the_dt2.minute == 42);
+  BOOST_CHECK(the_dt2.tzSign == XMP_TZ_UTC);
+
+  xmp_string_free(the_prop);
+
+  BOOST_CHECK(xmp_free(xmp));
+
+  free(buffer);
+  fclose(f);
+
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test-xmpfiles-write.cpp b/exempi/tests/test-xmpfiles-write.cpp
new file mode 100644
index 0000000..e44e242
--- /dev/null
+++ b/exempi/tests/test-xmpfiles-write.cpp
@@ -0,0 +1,120 @@
+/*
+ * exempi - test-xmpfile-write.cpp
+ *
+ * Copyright (C) 2007-2008,2010 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmp.h"
+#include "xmpconsts.h"
+
+using boost::unit_test::test_suite;
+
+// void test_xmpfiles_write()
+int test_main(int argc, char *argv[])
+{
+  prepare_test(argc, argv, "../../samples/testfiles/BlueSquare.jpg");
+
+  BOOST_CHECK(xmp_init());
+
+  BOOST_CHECK(xmp_files_check_file_format(g_testfile.c_str()) == XMP_FT_JPEG);
+  XmpFilePtr f = xmp_files_open_new(g_testfile.c_str(), XMP_OPEN_READ);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    return 1;
+  }
+
+  XmpPtr xmp = xmp_files_get_new_xmp(f);
+  BOOST_CHECK(xmp != NULL);
+
+  BOOST_CHECK(xmp_files_free(f));
+
+  BOOST_CHECK(copy_file(g_testfile, "test.jpg"));
+  BOOST_CHECK(chmod("test.jpg", S_IRUSR | S_IWUSR) == 0);
+
+  BOOST_CHECK(xmp_files_check_file_format("test.jpg") == XMP_FT_JPEG);
+
+  f = xmp_files_open_new("test.jpg", XMP_OPEN_FORUPDATE);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    return 2;
+  }
+
+  BOOST_CHECK(xmp_set_property(xmp, NS_PHOTOSHOP, "ICCProfile", "foo", 0));
+
+  BOOST_CHECK(xmp_files_can_put_xmp(f, xmp));
+  BOOST_CHECK(xmp_files_put_xmp(f, xmp));
+
+  BOOST_CHECK(xmp_free(xmp));
+  BOOST_CHECK(xmp_files_close(f, XMP_CLOSE_SAFEUPDATE));
+  BOOST_CHECK(xmp_files_free(f));
+
+  f = xmp_files_open_new("test.jpg", XMP_OPEN_READ);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    return 3;
+  }
+  xmp = xmp_files_get_new_xmp(f);
+  BOOST_CHECK(xmp != NULL);
+
+  XmpStringPtr the_prop = xmp_string_new();
+  BOOST_CHECK(
+    xmp_get_property(xmp, NS_PHOTOSHOP, "ICCProfile", the_prop, NULL));
+  BOOST_CHECK(strcmp("foo", xmp_string_cstr(the_prop)) == 0);
+
+  xmp_string_free(the_prop);
+
+  BOOST_CHECK(xmp_free(xmp));
+  BOOST_CHECK(xmp_files_close(f, XMP_CLOSE_NOOPTION));
+  BOOST_CHECK(xmp_files_free(f));
+
+  //	unlink("test.jpg");
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+
+  return 0;
+}
diff --git a/exempi/tests/test-xmpfiles.cpp b/exempi/tests/test-xmpfiles.cpp
new file mode 100644
index 0000000..9a2bfca
--- /dev/null
+++ b/exempi/tests/test-xmpfiles.cpp
@@ -0,0 +1,129 @@
+/*
+ * exempi - test-xmpfiles.cpp
+ *
+ * Copyright (C) 2007-2016 Hubert Figuière
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmp.h"
+#include "xmpconsts.h"
+
+using boost::unit_test::test_suite;
+
+// void test_xmpfiles()
+int test_main(int argc, char* argv[])
+{
+  prepare_test(argc, argv, "../../samples/testfiles/BlueSquare.jpg");
+
+  BOOST_CHECK(xmp_init());
+
+  XmpFilePtr f = xmp_files_open_new(g_testfile.c_str(), XMP_OPEN_READ);
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    exit(128);
+  }
+
+  BOOST_CHECK(xmp_files_check_file_format(g_testfile.c_str()) == XMP_FT_JPEG);
+
+  XmpStringPtr file_path = xmp_string_new();
+  XmpOpenFileOptions options;
+  XmpFileType file_format;
+  XmpFileFormatOptions handler_flags;
+  BOOST_CHECK(xmp_files_get_file_info(f, file_path, &options, &file_format,
+                                      &handler_flags));
+  BOOST_CHECK(options == XMP_OPEN_READ);
+  BOOST_CHECK(file_format == XMP_FT_JPEG);
+  // the value check might break at each SDK update. You have been warned.
+  BOOST_CHECK(handler_flags == 0x27f);
+  BOOST_CHECK(g_testfile == xmp_string_cstr(file_path));
+  xmp_string_free(file_path);
+
+  XmpPtr xmp = xmp_new_empty();
+
+  BOOST_CHECK(xmp != NULL);
+
+  BOOST_CHECK(xmp_files_get_xmp(f, xmp));
+
+  {
+    XmpStringPtr thestring = xmp_string_new();
+    XmpPacketInfo packet_info;
+    BOOST_CHECK(xmp_files_get_xmp_xmpstring(f, thestring, &packet_info));
+    BOOST_CHECK(packet_info.offset == 2189);
+    BOOST_CHECK(packet_info.length == 4782);
+    BOOST_CHECK(packet_info.padSize == 2049);
+    BOOST_CHECK(packet_info.hasWrapper);
+
+    const char *xmp_str = xmp_string_cstr(thestring);
+    BOOST_CHECK(xmp_str);
+    xmp_string_free(thestring);
+  }
+
+  XmpStringPtr the_prop = xmp_string_new();
+
+  BOOST_CHECK(
+    xmp_get_property(xmp, NS_PHOTOSHOP, "ICCProfile", the_prop, NULL));
+  BOOST_CHECK(strcmp("sRGB IEC61966-2.1", xmp_string_cstr(the_prop)) == 0);
+
+  xmp_string_free(the_prop);
+  BOOST_CHECK(xmp_free(xmp));
+
+  BOOST_CHECK(xmp_files_free(f));
+
+  XmpFileFormatOptions formatOptions;
+
+  // the value check might break at each SDK update. You have been warned.
+  BOOST_CHECK(xmp_files_get_format_info(XMP_FT_JPEG, &formatOptions));
+  BOOST_CHECK(formatOptions == 0x27f);
+  BOOST_CHECK(xmp_files_get_format_info(XMP_FT_GIF, &formatOptions));
+  BOOST_CHECK(formatOptions == 0x46b);
+  BOOST_CHECK(xmp_files_get_format_info(XMP_FT_PNG, &formatOptions));
+  BOOST_CHECK(formatOptions == 0x46b);
+  // PDF doesn't have a smart handler.
+  BOOST_CHECK(!xmp_files_get_format_info(XMP_FT_PDF, &formatOptions));
+
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/test1.xmp b/exempi/tests/test1.xmp
new file mode 100644
index 0000000..281f936
--- /dev/null
+++ b/exempi/tests/test1.xmp
@@ -0,0 +1,255 @@
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Public XMP Toolkit Core 3.5">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
+   <tiff:Make>Canon</tiff:Make>
+   <tiff:Model>Canon EOS 20D</tiff:Model>
+   <tiff:Orientation>1</tiff:Orientation>
+   <tiff:ImageWidth>3504</tiff:ImageWidth>
+   <tiff:ImageLength>2336</tiff:ImageLength>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:exif="http://ns.adobe.com/exif/1.0/">
+   <exif:ExifVersion>0221</exif:ExifVersion>
+   <exif:ExposureTime>15/1</exif:ExposureTime>
+   <exif:ShutterSpeedValue>-3906891/1000000</exif:ShutterSpeedValue>
+   <exif:FNumber>8/1</exif:FNumber>
+   <exif:ApertureValue>6/1</exif:ApertureValue>
+   <exif:ExposureProgram>1</exif:ExposureProgram>
+   <exif:DateTimeOriginal>2006-12-07T23:20:43-05:00</exif:DateTimeOriginal>
+   <exif:DateTimeDigitized>2006-12-07T23:20:43-05:00</exif:DateTimeDigitized>
+   <exif:ExposureBiasValue>0/2</exif:ExposureBiasValue>
+   <exif:MaxApertureValue>3625/1000</exif:MaxApertureValue>
+   <exif:MeteringMode>5</exif:MeteringMode>
+   <exif:FocalLength>32/1</exif:FocalLength>
+   <exif:CustomRendered>0</exif:CustomRendered>
+   <exif:ExposureMode>1</exif:ExposureMode>
+   <exif:WhiteBalance>0</exif:WhiteBalance>
+   <exif:SceneCaptureType>0</exif:SceneCaptureType>
+   <exif:FocalPlaneXResolution>3504000/885</exif:FocalPlaneXResolution>
+   <exif:FocalPlaneYResolution>2336000/590</exif:FocalPlaneYResolution>
+   <exif:FocalPlaneResolutionUnit>2</exif:FocalPlaneResolutionUnit>
+   <exif:ISOSpeedRatings>
+    <rdf:Seq>
+     <rdf:li>100</rdf:li>
+    </rdf:Seq>
+   </exif:ISOSpeedRatings>
+   <exif:Flash rdf:parseType="Resource">
+    <exif:Fired>False</exif:Fired>
+    <exif:Return>0</exif:Return>
+    <exif:Mode>2</exif:Mode>
+    <exif:Function>False</exif:Function>
+    <exif:RedEyeMode>False</exif:RedEyeMode>
+   </exif:Flash>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:xap="http://ns.adobe.com/xap/1.0/">
+   <xap:ModifyDate>2006-12-07T23:20:43-05:00</xap:ModifyDate>
+   <xap:Rating>3</xap:Rating>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/">
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>unknown</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:rights>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">2006, Hubert Figuiere</rdf:li>
+    </rdf:Alt>
+   </dc:rights>
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>night</rdf:li>
+     <rdf:li>ontario</rdf:li>
+     <rdf:li>ottawa</rdf:li>
+     <rdf:li>parliament of canada</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:aux="http://ns.adobe.com/exif/1.0/aux/">
+   <aux:SerialNumber>420103070</aux:SerialNumber>
+   <aux:LensInfo>24/1 85/1 0/0 0/0</aux:LensInfo>
+   <aux:Lens>24.0-85.0 mm</aux:Lens>
+   <aux:ImageNumber>176</aux:ImageNumber>
+   <aux:FlashCompensation>-2/1</aux:FlashCompensation>
+   <aux:OwnerName>unknown</aux:OwnerName>
+   <aux:Firmware>1.1.0</aux:Firmware>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/">
+       <crs:AlreadyApplied>False</crs:AlreadyApplied>
+       <crs:WhiteBalance>As Shot</crs:WhiteBalance>
+       <crs:Exposure>0.00</crs:Exposure>
+       <crs:Shadows>5</crs:Shadows>
+       <crs:Brightness>+50</crs:Brightness>
+       <crs:Contrast>+25</crs:Contrast>
+       <crs:Saturation>0</crs:Saturation>
+       <crs:Sharpness>25</crs:Sharpness>
+       <crs:LuminanceSmoothing>0</crs:LuminanceSmoothing>
+       <crs:ColorNoiseReduction>25</crs:ColorNoiseReduction>
+       <crs:ChromaticAberrationR>0</crs:ChromaticAberrationR>
+       <crs:ChromaticAberrationB>0</crs:ChromaticAberrationB>
+       <crs:VignetteAmount>0</crs:VignetteAmount>
+       <crs:ShadowTint>0</crs:ShadowTint>
+       <crs:RedHue>0</crs:RedHue>
+       <crs:RedSaturation>0</crs:RedSaturation>
+       <crs:GreenHue>0</crs:GreenHue>
+       <crs:GreenSaturation>0</crs:GreenSaturation>
+       <crs:BlueHue>0</crs:BlueHue>
+       <crs:BlueSaturation>0</crs:BlueSaturation>
+       <crs:FillLight>0</crs:FillLight>
+       <crs:Vibrance>0</crs:Vibrance>
+       <crs:HighlightRecovery>0</crs:HighlightRecovery>
+       <crs:Clarity>0</crs:Clarity>
+       <crs:Defringe>0</crs:Defringe>
+       <crs:HueAdjustmentRed>0</crs:HueAdjustmentRed>
+       <crs:HueAdjustmentOrange>0</crs:HueAdjustmentOrange>
+       <crs:HueAdjustmentYellow>0</crs:HueAdjustmentYellow>
+       <crs:HueAdjustmentGreen>0</crs:HueAdjustmentGreen>
+       <crs:HueAdjustmentAqua>0</crs:HueAdjustmentAqua>
+       <crs:HueAdjustmentBlue>0</crs:HueAdjustmentBlue>
+       <crs:HueAdjustmentPurple>0</crs:HueAdjustmentPurple>
+       <crs:HueAdjustmentMagenta>0</crs:HueAdjustmentMagenta>
+       <crs:SaturationAdjustmentRed>0</crs:SaturationAdjustmentRed>
+       <crs:SaturationAdjustmentOrange>0</crs:SaturationAdjustmentOrange>
+       <crs:SaturationAdjustmentYellow>0</crs:SaturationAdjustmentYellow>
+       <crs:SaturationAdjustmentGreen>0</crs:SaturationAdjustmentGreen>
+       <crs:SaturationAdjustmentAqua>0</crs:SaturationAdjustmentAqua>
+       <crs:SaturationAdjustmentBlue>0</crs:SaturationAdjustmentBlue>
+       <crs:SaturationAdjustmentPurple>0</crs:SaturationAdjustmentPurple>
+       <crs:SaturationAdjustmentMagenta>0</crs:SaturationAdjustmentMagenta>
+       <crs:LuminanceAdjustmentRed>0</crs:LuminanceAdjustmentRed>
+       <crs:LuminanceAdjustmentOrange>0</crs:LuminanceAdjustmentOrange>
+       <crs:LuminanceAdjustmentYellow>0</crs:LuminanceAdjustmentYellow>
+       <crs:LuminanceAdjustmentGreen>0</crs:LuminanceAdjustmentGreen>
+       <crs:LuminanceAdjustmentAqua>0</crs:LuminanceAdjustmentAqua>
+       <crs:LuminanceAdjustmentBlue>0</crs:LuminanceAdjustmentBlue>
+       <crs:LuminanceAdjustmentPurple>0</crs:LuminanceAdjustmentPurple>
+       <crs:LuminanceAdjustmentMagenta>0</crs:LuminanceAdjustmentMagenta>
+       <crs:SplitToningShadowHue>0</crs:SplitToningShadowHue>
+       <crs:SplitToningShadowSaturation>0</crs:SplitToningShadowSaturation>
+       <crs:SplitToningHighlightHue>0</crs:SplitToningHighlightHue>
+       <crs:SplitToningHighlightSaturation>0</crs:SplitToningHighlightSaturation>
+       <crs:SplitToningBalance>0</crs:SplitToningBalance>
+       <crs:ParametricShadows>0</crs:ParametricShadows>
+       <crs:ParametricDarks>0</crs:ParametricDarks>
+       <crs:ParametricLights>0</crs:ParametricLights>
+       <crs:ParametricHighlights>0</crs:ParametricHighlights>
+       <crs:ParametricShadowSplit>25</crs:ParametricShadowSplit>
+       <crs:ParametricMidtoneSplit>50</crs:ParametricMidtoneSplit>
+       <crs:ParametricHighlightSplit>75</crs:ParametricHighlightSplit>
+       <crs:SharpenRadius>+1.0</crs:SharpenRadius>
+       <crs:SharpenDetail>25</crs:SharpenDetail>
+       <crs:SharpenEdgeMasking>0</crs:SharpenEdgeMasking>
+       <crs:ConvertToGrayscale>False</crs:ConvertToGrayscale>
+       <crs:ToneCurveName>Medium Contrast</crs:ToneCurveName>
+       <crs:ToneCurve>
+        <rdf:Seq>
+         <rdf:li>0, 0</rdf:li>
+         <rdf:li>32, 22</rdf:li>
+         <rdf:li>64, 56</rdf:li>
+         <rdf:li>128, 128</rdf:li>
+         <rdf:li>192, 196</rdf:li>
+         <rdf:li>255, 255</rdf:li>
+        </rdf:Seq>
+       </crs:ToneCurve>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:crx="http://ns.adobe.com/lightroom-settings-experimental/1.0/">
+   <crx:ConvertToGrayscale>false</crx:ConvertToGrayscale>
+   <crx:SplitToningHighlightHue>0</crx:SplitToningHighlightHue>
+   <crx:Sharpness>25</crx:Sharpness>
+   <crx:CropBottom>1</crx:CropBottom>
+   <crx:GreenSaturation>0</crx:GreenSaturation>
+   <crx:Exposure>0</crx:Exposure>
+   <crx:LuminanceAdjustmentGreens>0</crx:LuminanceAdjustmentGreens>
+   <crx:SplitToningShadowHue>0</crx:SplitToningShadowHue>
+   <crx:BlueHue>0</crx:BlueHue>
+   <crx:GreenHue>0</crx:GreenHue>
+   <crx:FillLight>0</crx:FillLight>
+   <crx:HueAdjustmentCyans>0</crx:HueAdjustmentCyans>
+   <crx:SaturationAdjustmentGreens>0</crx:SaturationAdjustmentGreens>
+   <crx:Saturation>0</crx:Saturation>
+   <crx:SaturationAdjustmentBlues>0</crx:SaturationAdjustmentBlues>
+   <crx:VignetteMidpoint>50</crx:VignetteMidpoint>
+   <crx:ToneHighlightSplit>75</crx:ToneHighlightSplit>
+   <crx:ToneShadowSplit>25</crx:ToneShadowSplit>
+   <crx:Contrast>25</crx:Contrast>
+   <crx:WhiteBalance>As Shot</crx:WhiteBalance>
+   <crx:HueAdjustmentMagentas>0</crx:HueAdjustmentMagentas>
+   <crx:HighlightRecovery>0</crx:HighlightRecovery>
+   <crx:SaturationAdjustmentCyans>0</crx:SaturationAdjustmentCyans>
+   <crx:GrayMixerYellows>100</crx:GrayMixerYellows>
+   <crx:HueAdjustmentGreens>0</crx:HueAdjustmentGreens>
+   <crx:ToneShadows>0</crx:ToneShadows>
+   <crx:GrayMixerGreens>71</crx:GrayMixerGreens>
+   <crx:GrayMixerBlues>0</crx:GrayMixerBlues>
+   <crx:ColorNoiseReduction>25</crx:ColorNoiseReduction>
+   <crx:ShadowTint>0</crx:ShadowTint>
+   <crx:Shadows>5</crx:Shadows>
+   <crx:RedHue>0</crx:RedHue>
+   <crx:Brightness>50</crx:Brightness>
+   <crx:BlueSaturation>0</crx:BlueSaturation>
+   <crx:CropTop>0</crx:CropTop>
+   <crx:SaturationAdjustmentMagentas>0</crx:SaturationAdjustmentMagentas>
+   <crx:GrayMixerReds>29</crx:GrayMixerReds>
+   <crx:AutoBrightness>false</crx:AutoBrightness>
+   <crx:AutoTonality>false</crx:AutoTonality>
+   <crx:AutoExposure>false</crx:AutoExposure>
+   <crx:RedSaturation>0</crx:RedSaturation>
+   <crx:LuminanceAdjustmentMagentas>0</crx:LuminanceAdjustmentMagentas>
+   <crx:LuminanceAdjustmentBlues>0</crx:LuminanceAdjustmentBlues>
+   <crx:HueAdjustmentBlues>0</crx:HueAdjustmentBlues>
+   <crx:SaturationAdjustmentReds>0</crx:SaturationAdjustmentReds>
+   <crx:LuminanceAdjustmentYellows>0</crx:LuminanceAdjustmentYellows>
+   <crx:SplitToningShadowSaturation>0</crx:SplitToningShadowSaturation>
+   <crx:ChromaticAberrationR>0</crx:ChromaticAberrationR>
+   <crx:LuminanceAdjustmentCyans>0</crx:LuminanceAdjustmentCyans>
+   <crx:CropAngle>0</crx:CropAngle>
+   <crx:ChromaticAberrationB>0</crx:ChromaticAberrationB>
+   <crx:AutoShadows>false</crx:AutoShadows>
+   <crx:CropRight>1</crx:CropRight>
+   <crx:ToneLights>0</crx:ToneLights>
+   <crx:HueAdjustmentReds>0</crx:HueAdjustmentReds>
+   <crx:Vibrance>0</crx:Vibrance>
+   <crx:ToneDarks>0</crx:ToneDarks>
+   <crx:GrayMixerMagentas>29</crx:GrayMixerMagentas>
+   <crx:LuminanceSmoothing>0</crx:LuminanceSmoothing>
+   <crx:SplitToningHighlightSaturation>0</crx:SplitToningHighlightSaturation>
+   <crx:HueAdjustmentYellows>0</crx:HueAdjustmentYellows>
+   <crx:GrayMixerCyans>71</crx:GrayMixerCyans>
+   <crx:ToneMidtoneSplit>50</crx:ToneMidtoneSplit>
+   <crx:VignetteAmount>0</crx:VignetteAmount>
+   <crx:AutoContrast>false</crx:AutoContrast>
+   <crx:CropLeft>0</crx:CropLeft>
+   <crx:ToneHighlights>0</crx:ToneHighlights>
+   <crx:AutoGrayscaleWeights>true</crx:AutoGrayscaleWeights>
+   <crx:SaturationAdjustmentYellows>0</crx:SaturationAdjustmentYellows>
+   <crx:LuminanceAdjustmentReds>0</crx:LuminanceAdjustmentReds>
+   <crx:Tint>1</crx:Tint>
+   <crx:Temperature>4350</crx:Temperature>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:lr="http://ns.adobe.com/lightroom/1.0/">
+   <lr:hierarchicalKeywords>aGllcmFyY2hpY2FsS2V5d29yZHMgPSB7Cgl7CgkJZmxhdCA9IHsKCQkJIm5pZ2h0IiwKCQl9LAoJCXBhdGggPSB7CgkJCSJuaWdodCIsCgkJfSwKCQlwcmltYXJ5ID0gIm5pZ2h0IiwKCQl1dWlkID0gIkU1RDEwQTFELTU3QUYtMTFEQi04RTMzLTAwMEQ5MzVDODY5QSIsCgl9LAoJewoJCWZsYXQgPSB7CgkJCSJvbnRhcmlvIiwKCQkJIm90dGF3YSIsCgkJfSwKCQlwYXRoID0gewoJCQkib250YXJpbyIsCgkJCSJvdHRhd2EiLAoJCX0sCgkJcHJpbWFyeSA9ICJvdHRhd2EiLAoJCXV1aWQgPSAiQjgzMTc4RkItNTdBRi0xMURCLThFMzMtMDAwRDkzNUM4NjlBIiwKCX0sCgl7CgkJZmxhdCA9IHsKCQkJInBhcmxpYW1lbnQgb2YgY2FuYWRhIiwKCQkJIm9udGFyaW8iLAoJCQkib3R0YXdhIiwKCQl9LAoJCXBhdGggPSB7CgkJCSJvbnRhcmlvIiwKCQkJIm90dGF3YSIsCgkJCSJwYXJsaWFtZW50IG9mIGNhbmFkYSIsCgkJfSwKCQlwcmltYXJ5ID0gInBhcmxpYW1lbnQgb2YgY2FuYWRhIiwKCQl1dWlkID0gIkU1RDMzMEZDLTU3QUYtMTFEQi04RTMzLTAwMEQ5MzVDODY5QSIsCgl9LAp9Cg==</lr:hierarchicalKeywords>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+        xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/">
+   <xmpTPg:MaxPageSize>
+    <rdf:Description
+            xmlns:stDim="http:ns.adobe.com/xap/1.0/sType/Dimensions#">
+     <stDim:w>4</stDim:w>
+     <stDim:h>3</stDim:h>
+     <stDim:unit>inches</stDim:unit>
+    </rdf:Description>
+   </xmpTPg:MaxPageSize>
+  </rdf:Description>
+  <rdf:Description rdf:about=""
+    xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/">
+   <Iptc4xmpCore:Location>Parliament Hill, Ottawa, Ontario, Canada</Iptc4xmpCore:Location>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
diff --git a/exempi/tests/testcore.sh b/exempi/tests/testcore.sh
new file mode 100755
index 0000000..94c67b4
--- /dev/null
+++ b/exempi/tests/testcore.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Test script.
+# Currently only make sure dumpmainxmp does not crash
+# Written by Hubert Figuiere <hub@figuiere.net>
+
+if [ -z $srcdir ] ; then
+    echo "$srcdir srcdir not defined."
+    exit 255
+fi
+
+SAMPLES="BlueSquare.ai  BlueSquare.eps BlueSquare.gif  BlueSquare.jpg  BlueSquare.mp3  BlueSquare.png  BlueSquare.tif BlueSquare.avi  BlueSquare.indd BlueSquare.pdf  BlueSquare.psd  BlueSquare.wav"
+SAMPLES_DIR=$srcdir/../../samples/testfiles
+DUMPMAINXMP_PROG=../../samples/source/dumpmainxmp
+
+if [ ! -x $DUMPMAINXMP_PROG ] ; then
+    echo "$DUMPMAINXMP_PROG not executable."
+    exit 255
+fi
+
+for i in $SAMPLES
+do
+  echo "Running $DUMPMAINXMP_PROG $SAMPLES_DIR/$i"
+  $VALGRIND $DUMPMAINXMP_PROG $SAMPLES_DIR/$i > /dev/null
+  if [ $? -ne 0 ] ; then
+      echo "Failed"
+      exit 255
+  fi
+done
diff --git a/exempi/tests/testcpp.cpp b/exempi/tests/testcpp.cpp
new file mode 100644
index 0000000..13f944f
--- /dev/null
+++ b/exempi/tests/testcpp.cpp
@@ -0,0 +1,69 @@
+/*
+ * exempi - testcpp.cpp
+ *
+ * Copyright (C) 2011 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmp.h"
+#include "xmpconsts.h"
+#include "xmp++.hpp"
+
+using boost::unit_test::test_suite;
+
+int test_main(int argc, char* argv[])
+{
+  // this test is totally useless without leak checking.
+  // but for compiling.
+  {
+    xmp::ScopedPtr<XmpStringPtr> ptr(xmp_string_new());
+  }
+
+  {
+    xmp::ScopedPtr<XmpFilePtr> ptr(xmp_files_new());
+  }
+
+  {
+    xmp::ScopedPtr<XmpPtr> ptr(xmp_new_empty());
+    {
+      xmp::ScopedPtr<XmpIteratorPtr> iterptr(
+        xmp_iterator_new(ptr, NS_EXIF, NULL, XMP_ITER_JUSTLEAFNODES));
+    }
+  }
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/testinit.cpp b/exempi/tests/testinit.cpp
new file mode 100644
index 0000000..0ce70aa
--- /dev/null
+++ b/exempi/tests/testinit.cpp
@@ -0,0 +1,94 @@
+/*
+ * exempi - testinit.cpp
+ *
+ * Copyright (C) 2007 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+
+#include <boost/test/minimal.hpp>
+
+#include "utils.h"
+#include "xmpconsts.h"
+#include "xmp.h"
+
+// void test_exempi_init()
+int test_main(int argc, char* argv[])
+{
+  prepare_test(argc, argv, "test1.xmp");
+
+  size_t len;
+  char* buffer;
+
+  FILE* f = fopen(g_testfile.c_str(), "rb");
+
+  BOOST_CHECK(f != NULL);
+  if (f == NULL) {
+    exit(128);
+  }
+  fseek(f, 0, SEEK_END);
+  len = ftell(f);
+  fseek(f, 0, SEEK_SET);
+
+  buffer = (char*)malloc(len + 1);
+  size_t rlen = fread(buffer, 1, len, f);
+
+  BOOST_CHECK(rlen == len);
+  BOOST_CHECK(len != 0);
+
+  BOOST_CHECK(xmp_init());
+  BOOST_CHECK(xmp_init());
+
+  XmpPtr xmp = xmp_new_empty();
+  BOOST_CHECK(xmp_parse(xmp, buffer, len));
+  BOOST_CHECK(xmp != NULL);
+  BOOST_CHECK(xmp_free(xmp));
+
+  xmp_terminate();
+
+  xmp = xmp_new_empty();
+  BOOST_CHECK(xmp_parse(xmp, buffer, len));
+  BOOST_CHECK(xmp != NULL);
+  BOOST_CHECK(xmp_free(xmp));
+
+  xmp_terminate();
+
+  free(buffer);
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/testparse.cpp b/exempi/tests/testparse.cpp
new file mode 100644
index 0000000..f3a42df
--- /dev/null
+++ b/exempi/tests/testparse.cpp
@@ -0,0 +1,77 @@
+/*
+ * exempi - test3.cpp
+ *
+ * Copyright (C) 2007-2017 Hubert Figuiere
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+#include <iostream>
+
+#include <boost/test/minimal.hpp>
+#include <boost/format.hpp>
+
+#include "utils.h"
+#include "xmp.h"
+#include "xmpconsts.h"
+
+using boost::unit_test::test_suite;
+
+// void test_exempi_iterate()
+int test_main(int argc, char *argv[])
+{
+  char *buffer;
+
+  buffer = strdup("This is not even XML");
+  size_t len = strlen(buffer);
+
+  BOOST_CHECK(len != 0);
+  BOOST_CHECK(xmp_init());
+
+  XmpPtr xmp = xmp_new_empty();
+
+  BOOST_CHECK(!xmp_parse(xmp, buffer, len));
+
+  BOOST_CHECK(xmp != NULL);
+
+  BOOST_CHECK(xmp_free(xmp));
+
+  free(buffer);
+  xmp_terminate();
+
+  BOOST_CHECK(!g_lt->check_leaks());
+  BOOST_CHECK(!g_lt->check_errors());
+  return 0;
+}
diff --git a/exempi/tests/utils.cpp b/exempi/tests/utils.cpp
new file mode 100644
index 0000000..1620597
--- /dev/null
+++ b/exempi/tests/utils.cpp
@@ -0,0 +1,119 @@
+/*
+ * exempi - utils.cpp
+ *
+ * Copyright (C) 2007-2016 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <cstdio>
+#include <cstdlib>
+#include <memory>
+
+#include <boost/test/unit_test.hpp>
+
+#include "utils.h"
+
+std::string g_testfile;
+std::string g_src_testdir;
+std::unique_ptr<LeakTracker> g_lt(new LeakTracker) ;
+
+void prepare_test(int argc, char *argv[], const char *filename)
+{
+  if (argc == 1) {
+    // no argument, lets run like we are in "check"
+    const char *srcdir = getenv("TEST_DIR");
+
+    BOOST_ASSERT(srcdir != NULL);
+    g_src_testdir = std::string(srcdir) + "/";
+    g_testfile = g_src_testdir + filename;
+  } else {
+    g_src_testdir = "./";
+    g_testfile = argv[1];
+  }
+}
+
+bool copy_file(const std::string &source, const std::string &dest)
+{
+  std::string command = "cp ";
+  command += source + " " + dest;
+  return (system(command.c_str()) >= 0);
+}
+
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+#include <valgrind/memcheck.h>
+#include <valgrind/valgrind.h>
+#define CC_EXTENSION __extension__
+#else
+#define VALGRIND_COUNT_ERRORS 0
+#define VALGRIND_DO_LEAK_CHECK
+#define VALGRIND_COUNT_LEAKS(a, b, c, d) (a = b = c = d = 0)
+#define CC_EXTENSION
+#endif
+
+LeakTracker::LeakTracker()
+  : m_leaks(0), m_dubious(0), m_reachable(0), m_suppressed(0), m_errors(0)
+{
+}
+
+LeakTracker::~LeakTracker()
+{
+  printf("LeakTracker: leaked = %d, errors = %d\n", m_leaks, m_errors);
+}
+
+int LeakTracker::check_leaks()
+{
+  int leaked = 0;
+  int dubious = 0;
+  int reachable = 0;
+  int suppressed = 0;
+
+  VALGRIND_DO_LEAK_CHECK;
+  VALGRIND_COUNT_LEAKS(leaked, dubious, reachable, suppressed);
+  printf("memleaks: sure:%d dubious:%d reachable:%d suppress:%d\n", leaked,
+         dubious, reachable, suppressed);
+  bool has_leaks = (m_leaks != leaked);
+
+  m_leaks = leaked;
+  m_dubious = dubious;
+  m_reachable = reachable;
+  m_suppressed = suppressed;
+
+  return has_leaks;
+}
+
+int LeakTracker::check_errors()
+{
+  int errors = (int)(CC_EXTENSION VALGRIND_COUNT_ERRORS);
+  bool has_new_errors = (m_errors != errors);
+  m_errors = errors;
+  return has_new_errors;
+}
diff --git a/exempi/tests/utils.h b/exempi/tests/utils.h
new file mode 100644
index 0000000..a26ccd2
--- /dev/null
+++ b/exempi/tests/utils.h
@@ -0,0 +1,69 @@
+/*
+ * exempi - utils.h
+ *
+ * Copyright (C) 2007,2010 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __TEST_UTILS_H__
+#define __TEST_UTILS_H__
+
+#include <string>
+
+#include <memory>
+
+extern std::string g_testfile;
+extern std::string g_src_testdir;
+
+void prepare_test(int argc, char* argv[], const char* filename);
+
+bool copy_file(const std::string& source, const std::string& dest);
+
+class LeakTracker {
+public:
+  LeakTracker();
+  ~LeakTracker();
+  /** return false if there is NO leak. Will print on stdout */
+  int check_leaks();
+  int check_errors();
+
+private:
+  int m_leaks;
+  int m_dubious;
+  int m_reachable;
+  int m_suppressed;
+  int m_errors;
+};
+
+extern std::unique_ptr<LeakTracker> g_lt;
+
+#endif
diff --git a/exempi/xmp++.hpp b/exempi/xmp++.hpp
new file mode 100644
index 0000000..15b7351
--- /dev/null
+++ b/exempi/xmp++.hpp
@@ -0,0 +1,61 @@
+/*
+ *
+ * Copyright (C) 2011 Hubert Figuiere
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See
+ *  accompanying file LICENSE_1_0.txt or copy at
+ *  http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef __XMP_PLUSPLUS_H__
+#define __XMP_PLUSPLUS_H__
+
+#include <exempi/xmp.h>
+
+namespace xmp {
+
+inline void release(XmpIteratorPtr ptr)
+{
+    xmp_iterator_free(ptr);
+}
+
+inline void release(XmpStringPtr ptr)
+{
+    xmp_string_free(ptr);
+}
+
+inline void release(XmpFilePtr ptr)
+{
+    xmp_files_free(ptr);
+}
+
+inline void release(XmpPtr ptr)
+{
+    xmp_free(ptr);
+}
+
+/**
+ * @brief a scoped pointer for Xmp opaque types
+ */
+template <class T>
+class ScopedPtr {
+public:
+    ScopedPtr(T p) : _p(p) {}
+    ~ScopedPtr()
+    {
+        if (_p)
+            release(_p);
+    }
+    operator T() const { return _p; }
+
+private:
+    T _p;
+
+    // private copy constructor and assignment
+    // to make the class non copiable
+    ScopedPtr(const ScopedPtr<T> &);
+    ScopedPtr &operator=(const ScopedPtr<T> &);
+};
+}
+
+#endif
diff --git a/exempi/xmp.h b/exempi/xmp.h
new file mode 100644
index 0000000..c3cfea9
--- /dev/null
+++ b/exempi/xmp.h
@@ -0,0 +1,742 @@
+/*
+ * exempi - xmp.h
+ *
+ * Copyright (C) 2007-2016 Hubert Figuiere
+ * Copyright 2002-2007 Adobe Systems Incorporated
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __EXEMPI_XMP_H_
+#define __EXEMPI_XMP_H_
+
+#include <stdlib.h>
+/* stdbool choke on Sun (bug #14612) */
+#if !(defined(__sun) && defined(__cplusplus))
+#include <stdbool.h>
+#endif
+#include <stdint.h>
+
+#include <time.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* enums grafted from XMP_Const.h */
+
+/** Option bits for xmp_files_open() */
+typedef enum {
+    XMP_OPEN_NOOPTION = 0x00000000,        /**< No open option */
+    XMP_OPEN_READ = 0x00000001,            /**< Open for read-only access. */
+    XMP_OPEN_FORUPDATE = 0x00000002,       /**< Open for reading and writing. */
+    XMP_OPEN_ONLYXMP = 0x00000004,         /**< Only the XMP is wanted,
+                                            * allows space/time optimizations. */
+    XMP_OPEN_CACHETNAIL = 0x00000008,      /**< Cache thumbnail if possible,
+                                            * GetThumbnail will be called. */
+    XMP_OPEN_STRICTLY = 0x00000010,        /**< Be strict about locating XMP
+                                            * and reconciling with other forms. */
+    XMP_OPEN_USESMARTHANDLER = 0x00000020, /**< Require the use of a smart
+                                            * handler. */
+    XMP_OPEN_USEPACKETSCANNING = 0x00000040, /**< Force packet scanning,
+                                              * don't use a smart handler. */
+    XMP_OPEN_LIMITSCANNING = 0x00000080,     /**< Only packet scan files "known"
+                                              * to need scanning. */
+    XMP_OPEN_REPAIR_FILE =
+        0x00000100, /**< Attempt to repair a file opened for update,
+                     * default is to not open (throw an exception). */
+    XMP_OPEN_OPTIMIZEFILELAYOUT =
+        0x00000200, /**< Optimize MPEG4 to support stream when updating
+                     * This can take some time */
+    XMP_OPEN_INBACKGROUND = 0x10000000 /**< Set if calling from background
+                                        * thread. */
+} XmpOpenFileOptions;
+
+/** Option bits for xmp_files_close() */
+typedef enum {
+    XMP_CLOSE_NOOPTION = 0x0000,  /**< No close option */
+    XMP_CLOSE_SAFEUPDATE = 0x0001 /**< Write into a temporary file and
+                                   * swap for crash safety. */
+} XmpCloseFileOptions;
+
+typedef enum {
+
+    /* Public file formats. Hex used to avoid gcc warnings. */
+    /* ! Leave them as big endian. There seems to be no decent way on UNIX to
+       determine the target */
+    /* ! endianness at compile time. Forcing it on the client isn't acceptable.
+       */
+
+    XMP_FT_PDF = 0x50444620UL, /* 'PDF ' */
+    XMP_FT_PS = 0x50532020UL,  /* 'PS  ', general PostScript following DSC
+                                  conventions. */
+    XMP_FT_EPS = 0x45505320UL, /* 'EPS ', encapsulated PostScript. */
+
+    XMP_FT_JPEG = 0x4A504547UL,   /* 'JPEG' */
+    XMP_FT_JPEG2K = 0x4A505820UL, /* 'JPX ', ISO 15444-1 */
+    XMP_FT_TIFF = 0x54494646UL,   /* 'TIFF' */
+    XMP_FT_GIF = 0x47494620UL,    /* 'GIF ' */
+    XMP_FT_PNG = 0x504E4720UL,    /* 'PNG ' */
+    XMP_FT_WEBP = 0x57454250UL,   /* 'WEBP' */
+
+    XMP_FT_SWF = 0x53574620UL, /* 'SWF ' */
+    XMP_FT_FLA = 0x464C4120UL, /* 'FLA ' */
+    XMP_FT_FLV = 0x464C5620UL, /* 'FLV ' */
+
+    XMP_FT_MOV = 0x4D4F5620UL,   /* 'MOV ', Quicktime */
+    XMP_FT_AVI = 0x41564920UL,   /* 'AVI ' */
+    XMP_FT_CIN = 0x43494E20UL,   /* 'CIN ', Cineon */
+    XMP_FT_WAV = 0x57415620UL,   /* 'WAV ' */
+    XMP_FT_MP3 = 0x4D503320UL,   /* 'MP3 ' */
+    XMP_FT_SES = 0x53455320UL,   /* 'SES ', Audition session */
+    XMP_FT_CEL = 0x43454C20UL,   /* 'CEL ', Audition loop */
+    XMP_FT_MPEG = 0x4D504547UL,  /* 'MPEG' */
+    XMP_FT_MPEG2 = 0x4D503220UL, /* 'MP2 ' */
+    XMP_FT_MPEG4 = 0x4D503420UL, /* 'MP4 ', ISO 14494-12 and -14 */
+    XMP_FT_WMAV = 0x574D4156UL,  /* 'WMAV', Windows Media Audio and Video */
+    XMP_FT_AIFF = 0x41494646UL,  /* 'AIFF' */
+
+    XMP_FT_HTML = 0x48544D4CUL, /* 'HTML' */
+    XMP_FT_XML = 0x584D4C20UL,  /* 'XML ' */
+    XMP_FT_TEXT = 0x74657874UL, /* 'text' */
+
+    /* Adobe application file formats. */
+    XMP_FT_PHOTOSHOP = 0x50534420UL,   /* 'PSD ' */
+    XMP_FT_ILLUSTRATOR = 0x41492020UL, /* 'AI  ' */
+    XMP_FT_INDESIGN = 0x494E4444UL,    /* 'INDD' */
+    XMP_FT_AEPROJECT = 0x41455020UL,   /* 'AEP ' */
+    XMP_FT_AEPROJTEMPLATE =
+        0x41455420UL, /* 'AET ', After Effects Project Template */
+    XMP_FT_AEFILTERPRESET = 0x46465820UL,  /* 'FFX ' */
+    XMP_FT_ENCOREPROJECT = 0x4E434F52UL,   /* 'NCOR' */
+    XMP_FT_PREMIEREPROJECT = 0x5052504AUL, /* 'PRPJ' */
+    XMP_FT_PREMIERETITLE = 0x5052544CUL,   /* 'PRTL' */
+
+    /* Catch all. */
+    XMP_FT_UNKNOWN = 0x20202020UL /* '    ' */
+} XmpFileType;
+
+typedef enum {
+
+    XMP_FMT_CAN_INJECT_XMP = 0x00000001,
+    XMP_FMT_CAN_EXPAND = 0x00000002,
+    XMP_FMT_CAN_REWRITE = 0x00000004,
+    XMP_FMT_PREFERS_IN_PLACE = 0x00000008,
+    XMP_FMT_CAN_RECONCILE = 0x00000010,
+    XMP_FMT_ALLOWS_ONLY_XMP = 0x00000020,
+    XMP_FMT_RETURNS_RAW_PACKET = 0x00000040,
+    XMP_FMT_HANDLER_OWNS_FILE = 0x00000100,
+    XMP_FMT_ALLOW_SAFE_UPDATE = 0x00000200,
+    XMP_FMT_NEEDS_READONLY_PACKET = 0x00000400,
+    XMP_FMT_USE_SIDECAR_XMP = 0x00000800,
+    XMP_FMT_FOLDER_BASED_FORMAT = 0x00001000,
+
+    _XMP_FMT_LAST
+} XmpFileFormatOptions;
+
+typedef enum {
+    XMP_ITER_CLASSMASK = 0x00FFUL,  /**< The low 8 bits are an enum of
+                                     * what data structure to iterate. */
+    XMP_ITER_PROPERTIES = 0x0000UL, /**< Iterate the property tree of
+                                     * a TXMPMeta object. */
+    XMP_ITER_ALIASES = 0x0001UL,    /**< Iterate the global alias table. */
+    XMP_ITER_NAMESPACES = 0x0002UL, /**< Iterate the global namespace table. */
+    XMP_ITER_JUSTCHILDREN = 0x0100UL,   /**< Just do the immediate children
+                                         * of the root, default is subtree. */
+    XMP_ITER_JUSTLEAFNODES = 0x0200UL,  /**< Just do the leaf nodes, default
+                                         * is all nodes in the subtree. */
+    XMP_ITER_JUSTLEAFNAME = 0x0400UL,   /**< Return just the leaf part of the
+                                         * path, default is the full path. */
+    XMP_ITER_INCLUDEALIASES = 0x0800UL, /**< Include aliases, default is just
+                                         * actual properties. */
+    XMP_ITER_OMITQUALIFIERS = 0x1000UL  /* Omit all qualifiers. */
+} XmpIterOptions;
+
+typedef enum {
+    XMP_ITER_SKIPSUBTREE = 0x0001UL, /**< Skip the subtree below the
+                                      * current node. */
+    XMP_ITER_SKIPSIBLINGS =
+        0x0002UL /**< Skip the subtree below and remaining
+                                                      * siblings of the current
+                  * node. */
+} XmpIterSkipOptions;
+
+typedef enum {
+    /** Options relating to the XML string form of the property value. */
+    XMP_PROP_VALUE_IS_URI = 0x00000002UL, /**< The value is a URI, use
+                                           * rdf:resource attribute.
+                                           * DISCOURAGED */
+    /** Options relating to qualifiers attached to a property. */
+    XMP_PROP_HAS_QUALIFIERS = 0x00000010UL, /**< The property has qualifiers,
+                                             * includes rdf:type and
+                                             * xml:lang. */
+    XMP_PROP_IS_QUALIFIER = 0x00000020UL,   /**< This is a qualifier,
+                                             * includes rdf:type and
+                                             * xml:lang. */
+    XMP_PROP_HAS_LANG = 0x00000040UL,       /**< Implies XMP_PropHasQualifiers,
+                                             * property has xml:lang. */
+    XMP_PROP_HAS_TYPE = 0x00000080UL,       /**< Implies XMP_PropHasQualifiers,
+                                             * property has rdf:type. */
+
+    /* Options relating to the data structure form. */
+    XMP_PROP_VALUE_IS_STRUCT = 0x00000100UL, /**< The value is a structure
+                                              * with nested fields. */
+    XMP_PROP_VALUE_IS_ARRAY = 0x00000200UL,  /**< The value is an array
+                                              * (RDF alt/bag/seq). */
+    XMP_PROP_ARRAY_IS_UNORDERED = XMP_PROP_VALUE_IS_ARRAY, /**< The item order
+                                                            * does not matter.*/
+    XMP_PROP_ARRAY_IS_ORDERED = 0x00000400UL, /**< Implies XMP_PropValueIsArray,
+                                               * item order matters. */
+    XMP_PROP_ARRAY_IS_ALT = 0x00000800UL, /**< Implies XMP_PropArrayIsOrdered,
+                                           * items are alternates. */
+
+    /** Additional struct and array options. */
+    XMP_PROP_ARRAY_IS_ALTTEXT =
+        0x00001000UL, /**< Implies kXMP_PropArrayIsAlternate,
+                       * items are localized text. */
+    XMP_PROP_ARRAY_INSERT_BEFORE =
+        0x00004000UL,                           /**< Used by array functions. */
+    XMP_PROP_ARRAY_INSERT_AFTER = 0x00008000UL, /**< Used by array functions. */
+
+    /* Other miscellaneous options. */
+    XMP_PROP_IS_ALIAS = 0x00010000UL,    /**< This property is an alias name for
+                                            another property. */
+    XMP_PROP_HAS_ALIASES = 0x00020000UL, /**< This property is the base value
+                                            for a set of aliases. */
+    XMP_PROP_IS_INTERNAL = 0x00040000UL, /**< This property is an "internal"
+                                            property, owned by applications. */
+    XMP_PROP_IS_STABLE = 0x00100000UL,   /**< This property is not derived from
+                                          * the document content.
+                                            */
+    XMP_PROP_IS_DERIVED = 0x00200000UL,  /**< This property is derived from the
+                                            document content. */
+    /* kXMPUtil_AllowCommas   = 0x10000000UL,  ! Used by
+       TXMPUtils::CatenateArrayItems and ::SeparateArrayItems. */
+    /* kXMP_DeleteExisting    = 0x20000000UL,  ! Used by TXMPMeta::SetXyz
+       functions to delete any pre-existing property. */
+    /* kXMP_SchemaNode        = 0x80000000UL,  ! Returned by iterators - #define
+       to avoid warnings */
+
+    /* Masks that are multiple flags. */
+    XMP_PROP_ARRAY_FORM_MASK = XMP_PROP_VALUE_IS_ARRAY |
+                               XMP_PROP_ARRAY_IS_ORDERED |
+                               XMP_PROP_ARRAY_IS_ALT |
+                               XMP_PROP_ARRAY_IS_ALTTEXT,
+    XMP_PROP_COMPOSITE_MASK = XMP_PROP_VALUE_IS_STRUCT |
+                              XMP_PROP_ARRAY_FORM_MASK, /* Is it simple or
+                                                           composite (array or
+                                                           struct)? */
+    XMP_IMPL_RESERVED_MASK =
+        0x70000000L /**< Reserved for transient use by the implementation. */
+} XmpPropsBits;
+
+/* convenience macros */
+
+/** set option bits */
+#define XMP_SET_OPTION(var, opt) var |= (opt)
+/** clear option bits */
+#define XMP_CLEAR_OPTION(var, opt) var &= ~(opt)
+/** test if option is set */
+#define XMP_TEST_OPTION_SET(var, opt) (((var) & (opt)) != 0)
+/** test if option is clear */
+#define XMP_TEST_OPTION_CLEAR(var, opt) (((var) & (opt)) == 0)
+
+#define XMP_IS_PROP_SIMPLE(opt) (((opt)&XMP_PROP_COMPOSITE_MASK) == 0)
+#define XMP_IS_PROP_STRUCT(opt) (((opt)&XMP_PROP_VALUE_IS_STRUCT) != 0)
+#define XMP_IS_PROP_ARRAY(opt) (((opt)&XMP_PROP_VALUE_IS_ARRAY) != 0)
+#define XMP_IS_ARRAY_UNORDERED(opt) (((opt)&XMP_PROP_ARRAY_IS_ORDERED) == 0)
+#define XMP_IS_ARRAY_ORDERED(opt) (((opt)&XMP_PROP_ARRAY_IS_ORDERED) != 0)
+#define XMP_IS_ARRAY_ALT(opt) (((opt)&XMP_PROP_ARRAY_IS_ALT) != 0)
+#define XMP_IS_ARRAY_ALTTEXT(opt) (((opt)&XMP_PROP_ARRAY_IS_ALTTEXT) != 0)
+
+#define XMP_HAS_PROP_QUALIFIERS(opt) (((opt)&XMP_PROP_HAS_QUALIFIERS) != 0)
+#define XMP_IS_PROP_QUALIFIER(opt) (((opt)&XMP_PROP_IS_QUALIFIER) != 0)
+#define XMP_HAS_PROP_LANG(opt) (((opt)&XMP_PROP_HAS_LANG) != 0)
+
+#define XMP_IS_NODE_SCHEMA(opt) (((opt)&XMP_SCHEMA_NODE) != 0)
+#define XMP_IS_PROP_ALIAS(opt) (((opt)&XMP_PROP_IS_ALIAS) != 0)
+
+enum {                                          /* Options for xmp_serialize */
+       XMP_SERIAL_OMITPACKETWRAPPER = 0x0010UL, /**< Omit the XML packet
+                                                 * wrapper. */
+       XMP_SERIAL_READONLYPACKET = 0x0020UL,    /**< Default is a writeable
+                                                 * packet. */
+       XMP_SERIAL_USECOMPACTFORMAT = 0x0040UL,  /**< Use a compact form of
+                                                 * RDF. */
+
+       XMP_SERIAL_INCLUDETHUMBNAILPAD =
+           0x0100UL,                            /**< Include a padding allowance
+                                                 * for a thumbnail image. */
+       XMP_SERIAL_EXACTPACKETLENGTH = 0x0200UL, /**< The padding parameter is
+                                                 * the overall packet length. */
+       XMP_SERIAL_WRITEALIASCOMMENTS = 0x0400UL, /**< Show aliases as XML
+                                                  * comments. */
+       XMP_SERIAL_OMITALLFORMATTING = 0x0800UL,  /**< Omit all formatting
+                                                  * whitespace. */
+
+       _XMP_LITTLEENDIAN_BIT =
+           0x0001UL, /* ! Don't use directly, see the combined values below! */
+       _XMP_UTF16_BIT = 0x0002UL,
+       _XMP_UTF32_BIT = 0x0004UL,
+
+       XMP_SERIAL_ENCODINGMASK = 0x0007UL,
+       XMP_SERIAL_ENCODEUTF8 = 0UL,
+       XMP_SERIAL_ENCODEUTF16BIG = _XMP_UTF16_BIT,
+       XMP_SERIAL_ENCODEUTF16LITTLE = _XMP_UTF16_BIT | _XMP_LITTLEENDIAN_BIT,
+       XMP_SERIAL_ENCODEUTF32BIG = _XMP_UTF32_BIT,
+       XMP_SERIAL_ENCODEUTF32LITTLE = _XMP_UTF32_BIT | _XMP_LITTLEENDIAN_BIT
+};
+
+/** pointer to XMP packet. Opaque. */
+typedef struct _Xmp *XmpPtr;
+typedef struct _XmpFile *XmpFilePtr;
+typedef struct _XmpString *XmpStringPtr;
+typedef struct _XmpIterator *XmpIteratorPtr;
+
+typedef struct _XmpDateTime {
+    int32_t year;
+    int32_t month;    /* 1..12 */
+    int32_t day;      /* 1..31 */
+    int32_t hour;     /* 0..23 */
+    int32_t minute;   /* 0..59 */
+    int32_t second;   /* 0..59 */
+    int32_t tzSign;   /* -1..+1, 0 means UTC, -1 is west, +1 is east. */
+    int32_t tzHour;   /* 0..23 */
+    int32_t tzMinute; /* 0..59 */
+    int32_t nanoSecond;
+} XmpDateTime;
+
+typedef struct _XmpPacketInfo {
+  /// Packet offset in the file in bytes, -1 if unknown.
+  int64_t offset;
+  /// Packet length in the file in bytes, -1 if unknown.
+  int32_t length;
+  /// Packet padding size in bytes, zero if unknown.
+  int32_t padSize;
+
+  /// Character format using the values \c kXMP_Char8Bit,
+  /// \c kXMP_Char16BitBig, etc.
+  uint8_t  charForm;
+  /// True if there is a packet wrapper and the trailer says writeable
+  /// by dumb packet scanners.
+  bool  writeable;
+  /// True if there is a packet wrapper, the "<?xpacket...>"
+  /// XML processing instructions.
+  bool  hasWrapper;
+
+  /// Padding to make the struct's size be a multiple 4.
+  uint8_t  pad;
+} XmpPacketInfo;
+
+/** Values used for tzSign field. */
+enum {
+    XMP_TZ_WEST = -1, /**< West of UTC   */
+    XMP_TZ_UTC = 0,   /**< UTC           */
+    XMP_TZ_EAST = +1  /**< East of UTC   */
+};
+
+/** Init the library. Must be called before anything else */
+bool xmp_init(void);
+void xmp_terminate(void);
+
+/** get the error code that last occurred.
+ * @todo make this thread-safe. Getting the error code
+ * from another thread than the on it occurred in is undefined.
+ */
+int xmp_get_error(void);
+
+XmpFilePtr xmp_files_new(void);
+XmpFilePtr xmp_files_open_new(const char *, XmpOpenFileOptions options);
+
+bool xmp_files_open(XmpFilePtr xf, const char *, XmpOpenFileOptions options);
+
+/** Close an XMP file. Will flush the changes
+ * @param xf the file object
+ * @param options the options to close.
+ * @return true on succes, false on error
+ * xmp_get_error() will give the error code.
+ */
+bool xmp_files_close(XmpFilePtr xf, XmpCloseFileOptions options);
+
+/** Get the XMP packet from the file
+ * @param xf the %XmpFilePtr to get the XMP packet from
+ * @return a newly allocated XmpPtr. Use %xmp_free to release it.
+ */
+XmpPtr xmp_files_get_new_xmp(XmpFilePtr xf);
+
+/** File the XMP packet from the file
+ * @param xf the %XmpFilePtr to get the XMP packet from
+ * @param xmp the XMP Packet to fill. Must be valid.
+ */
+bool xmp_files_get_xmp(XmpFilePtr xf, XmpPtr xmp);
+bool xmp_files_get_xmp_xmpstring(XmpFilePtr xf, XmpStringPtr xmp_packet,
+                                 XmpPacketInfo* packet_info);
+
+bool xmp_files_can_put_xmp(XmpFilePtr xf, XmpPtr xmp);
+bool xmp_files_can_put_xmp_xmpstring(XmpFilePtr xf, XmpStringPtr xmp_packet);
+bool xmp_files_can_put_xmp_cstr(XmpFilePtr xf, const char* xmp_packet,
+                                size_t len);
+
+bool xmp_files_put_xmp(XmpFilePtr xf, XmpPtr xmp);
+bool xmp_files_put_xmp_xmpstring(XmpFilePtr xf, XmpStringPtr xmp_packet);
+bool xmp_files_put_xmp_cstr(XmpFilePtr xf, const char* xmp_packet, size_t len);
+
+/** Get the file info from the open file
+ * @param xf the file object
+ * @param[out] filePath the file path object to store the path in. Pass NULL if
+ * not needed.
+ * @param[out] options the options for open. Pass NULL if not needed.
+ * @param[out] file_format the detected file format. Pass NULL if not needed.
+ * @param[out] handler_flags the format options like from
+ * %xmp_files_get_format_info.
+ * @return false in case of error.
+ */
+bool xmp_files_get_file_info(XmpFilePtr xf, XmpStringPtr filePath,
+                             XmpOpenFileOptions *options,
+                             XmpFileType *file_format,
+                             XmpFileFormatOptions *handler_flags);
+
+/** Free a XmpFilePtr
+ * @param xf the file ptr. Cannot be NULL
+ * @return false on error.
+ * Calll %xmp_get_error to retrieve the error code.
+ */
+bool xmp_files_free(XmpFilePtr xf);
+
+/** Get the format info
+ * @param format type identifier
+ * @param options the options for the file format handler
+ * @return false on error
+ */
+bool xmp_files_get_format_info(XmpFileType format,
+                               XmpFileFormatOptions *options);
+
+/** Check the file format of a file. Use the same logic as in xmp_files_open()
+ * @param filePath the path to the file
+ * @return XMP_FT_UNKNOWN on error or if the file type is unknown
+ */
+XmpFileType xmp_files_check_file_format(const char *filePath);
+
+/** Register a new namespace to add properties to
+ *  This is done automatically when reading the metadata block
+ *  @param namespaceURI the namespace URI to register
+ *  @param suggestedPrefix the suggested prefix
+ *  @param registeredPrefix the really registered prefix. Not necessarily
+ *  %suggestedPrefix.
+ *  @return true if success, false otherwise.
+ */
+bool xmp_register_namespace(const char *namespaceURI,
+                            const char *suggestedPrefix,
+                            XmpStringPtr registeredPrefix);
+
+/** Check is a namespace is registered
+ *  @param ns the namespace to check.
+ *  @param prefix The prefix associated if registered. Pass NULL
+ *  if not interested.
+ *  @return true if registered.
+ *  NEW in 2.1
+ */
+bool xmp_namespace_prefix(const char *ns, XmpStringPtr prefix);
+
+/** Check if a ns prefix is registered.
+ *  @param prefix the prefix to check.
+ *  @param ns the namespace associated if registered. Pass NULL
+ *  if not interested.
+ *  @return true if registered.
+ *  NEW in 2.1
+ */
+bool xmp_prefix_namespace_uri(const char *prefix, XmpStringPtr ns);
+
+/** Create a new empty XMP packet
+ * @return the packet pointer. Must be free with xmp_free()
+ */
+XmpPtr xmp_new_empty(void);
+
+/** Create a new XMP packet
+ * @param buffer the buffer to load data from. UTF-8 encoded.
+ * @param len the buffer length in byte
+ * @return the packet pointer. Must be free with xmp_free()
+ */
+XmpPtr xmp_new(const char *buffer, size_t len);
+
+/** Create a new XMP packet from the one passed.
+ * @param xmp the instance to copy. Can be NULL.
+ * @return the packet pointer. NULL is failer (or NULL is passed).
+ */
+XmpPtr xmp_copy(XmpPtr xmp);
+
+/** Free the xmp packet
+ * @param xmp the xmp packet to free
+ */
+bool xmp_free(XmpPtr xmp);
+
+/** Parse the XML passed through the buffer and load it.
+ * @param xmp the XMP packet.
+ * @param buffer the buffer.
+ * @param len the length of the buffer.
+ */
+bool xmp_parse(XmpPtr xmp, const char *buffer, size_t len);
+
+/** Serialize the XMP Packet to the given buffer
+ * @param xmp the XMP Packet
+ * @param buffer the buffer to write the XMP to
+ * @param options options on how to write the XMP.  See XMP_SERIAL_*
+ * @param padding number of bytes of padding, useful for modifying
+ *                embedded XMP in place.
+ * @return TRUE if success.
+ */
+bool xmp_serialize(XmpPtr xmp, XmpStringPtr buffer, uint32_t options,
+                   uint32_t padding);
+
+/** Serialize the XMP Packet to the given buffer with formatting
+ * @param xmp the XMP Packet
+ * @param buffer the buffer to write the XMP to
+ * @param options options on how to write the XMP.  See XMP_SERIAL_*
+ * @param padding number of bytes of padding, useful for modifying
+ *                embedded XMP in place.
+ * @param newline the new line character to use
+ * @param tab the indentation character to use
+ * @param indent the initial indentation level
+ * @return TRUE if success.
+ */
+bool xmp_serialize_and_format(XmpPtr xmp, XmpStringPtr buffer, uint32_t options,
+                              uint32_t padding, const char *newline,
+                              const char *tab, int32_t indent);
+
+/** Get an XMP property and it option bits from the XMP packet
+ * @param xmp the XMP packet
+ * @param schema
+ * @param name
+ * @param property the allocated XmpStringPtr
+ * @param propsBits pointer to the option bits. Pass NULL if not needed
+ * @return true if found
+ */
+bool xmp_get_property(XmpPtr xmp, const char *schema, const char *name,
+                      XmpStringPtr property, uint32_t *propsBits);
+
+bool xmp_get_property_date(XmpPtr xmp, const char *schema, const char *name,
+                           XmpDateTime *property, uint32_t *propsBits);
+bool xmp_get_property_float(XmpPtr xmp, const char *schema, const char *name,
+                            double *property, uint32_t *propsBits);
+bool xmp_get_property_bool(XmpPtr xmp, const char *schema, const char *name,
+                           bool *property, uint32_t *propsBits);
+bool xmp_get_property_int32(XmpPtr xmp, const char *schema, const char *name,
+                            int32_t *property, uint32_t *propsBits);
+bool xmp_get_property_int64(XmpPtr xmp, const char *schema, const char *name,
+                            int64_t *property, uint32_t *propsBits);
+
+/** Get an item frpm an array property
+ * @param xmp the xmp meta
+ * @param schema the schema
+ * @param name the property name
+ * @param index the index in the array
+ * @param property the property value
+ * @param propsBits the property bits. Pass NULL is unwanted.
+ * @return TRUE if success.
+ */
+bool xmp_get_array_item(XmpPtr xmp, const char *schema, const char *name,
+                        int32_t index, XmpStringPtr property,
+                        uint32_t *propsBits);
+
+/** Set an XMP property in the XMP packet
+ * @param xmp the XMP packet
+ * @param schema
+ * @param name
+ * @param value 0 terminated string
+ * @param optionBits
+ * @return false if failure
+ */
+bool xmp_set_property(XmpPtr xmp, const char *schema, const char *name,
+                      const char *value, uint32_t optionBits);
+
+/** Set a date XMP property in the XMP packet
+ * @param xmp the XMP packet
+ * @param schema
+ * @param name
+ * @param value the date-time struct
+ * @param optionBits
+ * @return false if failure
+ */
+bool xmp_set_property_date(XmpPtr xmp, const char *schema, const char *name,
+                           const XmpDateTime *value, uint32_t optionBits);
+
+/** Set a float XMP property in the XMP packet
+ * @param xmp the XMP packet
+ * @param schema
+ * @param name
+ * @param value the float value
+ * @param optionBits
+ * @return false if failure
+ */
+bool xmp_set_property_float(XmpPtr xmp, const char *schema, const char *name,
+                            double value, uint32_t optionBits);
+bool xmp_set_property_bool(XmpPtr xmp, const char *schema, const char *name,
+                           bool value, uint32_t optionBits);
+bool xmp_set_property_int32(XmpPtr xmp, const char *schema, const char *name,
+                            int32_t value, uint32_t optionBits);
+bool xmp_set_property_int64(XmpPtr xmp, const char *schema, const char *name,
+                            int64_t value, uint32_t optionBits);
+
+bool xmp_set_array_item(XmpPtr xmp, const char *schema, const char *name,
+                        int32_t index, const char *value, uint32_t optionBits);
+
+/** Append a value to the XMP Property array in the XMP Packet provided
+ * @param xmp the XMP packet
+ * @param schema the schema of the property
+ * @param name the name of the property
+ * @param arrayOptions option bits of the parent array
+ * @param value null-terminated string
+ * @param optionBits option bits of the value itself.
+ */
+bool xmp_append_array_item(XmpPtr xmp, const char *schema, const char *name,
+                           uint32_t arrayOptions, const char *value,
+                           uint32_t optionBits);
+
+/** Delete a property from the XMP Packet provided
+ * @param xmp the XMP packet
+ * @param schema the schema of the property
+ * @param name the name of the property
+ */
+bool xmp_delete_property(XmpPtr xmp, const char *schema, const char *name);
+
+/** Determines if a property exists in the XMP Packet provided
+ * @param xmp the XMP packet
+ * @param schema the schema of the property. Can't be NULL or empty.
+ * @param name the name of the property. Can't be NULL or empty.
+ * @return true is the property exists
+ */
+bool xmp_has_property(XmpPtr xmp, const char *schema, const char *name);
+
+/** Get a localised text from a localisable property.
+ * @param xmp the XMP packet
+ * @param schema the schema
+ * @param name the property name.
+ * @param genericLang the generic language you may want as a fall back.
+ * Can be NULL or empty.
+ * @param specificLang the specific language you want. Can't be NULL or empty.
+ * @param actualLang the actual language of the value. Can be NULL if
+ * not wanted.
+ * @param itemValue the localized value. Can be NULL if not wanted.
+ * @param propBits the options flags describing the property. Can be NULL.
+ * @return true if found, false otherwise.
+ */
+bool xmp_get_localized_text(XmpPtr xmp, const char *schema, const char *name,
+                            const char *genericLang, const char *specificLang,
+                            XmpStringPtr actualLang, XmpStringPtr itemValue,
+                            uint32_t *propBits);
+
+/** Set a localised text in a localisable property.
+ * @param xmp the XMP packet
+ * @param schema the schema
+ * @param name the property name.
+ * @param genericLang the generic language you may want to set too.
+ * Can be NULL or empty.
+ * @param specificLang the specific language you want. Can't be NULL or empty.
+ * @param value the localized value. Cannot be NULL.
+ * @param optionBits the options flags describing the property.
+ * @return true if set, false otherwise.
+ */
+bool xmp_set_localized_text(XmpPtr xmp, const char *schema, const char *name,
+                            const char *genericLang, const char *specificLang,
+                            const char *value, uint32_t optionBits);
+
+bool xmp_delete_localized_text(XmpPtr xmp, const char *schema, const char *name,
+                               const char *genericLang,
+                               const char *specificLang);
+
+/** Instanciate a new string
+ * @return the new instance. Must be freed with
+ * xmp_string_free()
+ */
+XmpStringPtr xmp_string_new(void);
+
+/** Free a XmpStringPtr
+ * @param s the string to free
+ */
+void xmp_string_free(XmpStringPtr s);
+
+/** Get the C string from the XmpStringPtr
+ * @param s the string object
+ * @return the const char * for the XmpStringPtr. It
+ * belong to the object.
+ */
+const char * xmp_string_cstr(XmpStringPtr s);
+
+/** Get the string length from the XmpStringPtr
+ * @param s the string object
+ * @return the string length. The unerlying implementation has it.
+ */
+size_t xmp_string_len(XmpStringPtr s);
+
+/** Create a new iterator.
+ * @param xmp the packet
+ * @param schema the property schema
+ * @param propName the property name
+ * @param options
+ * @return an iterator must be freed with % xmp_iterator_free
+ */
+XmpIteratorPtr xmp_iterator_new(XmpPtr xmp, const char *schema,
+                                const char *propName, XmpIterOptions options);
+
+/** Free an iterator.
+ * @param iter the iterator to free.
+ */
+bool xmp_iterator_free(XmpIteratorPtr iter);
+
+/** Iterate to the next value
+ * @param iter the iterator
+ * @param schema the schema name. Pass NULL if not wanted
+ * @param propName the property path. Pass NULL if not wanted
+ * @param propValue the value of the property. Pass NULL if not wanted.
+ * @param options the options for the property. Pass NULL if not wanted.
+ * @return true if still something, false if none
+ */
+bool xmp_iterator_next(XmpIteratorPtr iter, XmpStringPtr schema,
+                       XmpStringPtr propName, XmpStringPtr propValue,
+                       uint32_t *options);
+
+/**
+ */
+bool xmp_iterator_skip(XmpIteratorPtr iter, XmpIterSkipOptions options);
+
+/** Compare two XmpDateTime
+ * @param left value
+ * @param right value
+ * @return if left < right, return < 0. If left > right, return > 0.
+ * if left == right, return 0.
+ */
+int xmp_datetime_compare(XmpDateTime *left, XmpDateTime *right);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/exempi/xmpconsts.h b/exempi/xmpconsts.h
new file mode 100644
index 0000000..c985d42
--- /dev/null
+++ b/exempi/xmpconsts.h
@@ -0,0 +1,69 @@
+/*
+ * exempi - xmpconsts.h
+ *
+ * Copyright (C) 2007 Hubert Figuiere
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _EXEMPI_XMP_CONSTS_H_
+#define _EXEMPI_XMP_CONSTS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const char NS_XMP_META[];
+extern const char NS_RDF[];
+extern const char NS_EXIF[];
+extern const char NS_TIFF[];
+extern const char NS_XAP[];
+extern const char NS_XAP_RIGHTS[];
+extern const char NS_DC[];
+extern const char NS_EXIF_AUX[];
+extern const char NS_CRS[];
+extern const char NS_LIGHTROOM[];
+extern const char NS_PHOTOSHOP[];
+extern const char NS_CAMERA_RAW_SETTINGS[];
+extern const char NS_CAMERA_RAW_SAVED_SETTINGS[];
+extern const char NS_IPTC4XMP[];
+extern const char NS_TPG[];
+extern const char NS_DIMENSIONS_TYPE[];
+/** Creative Commons namespace */
+extern const char NS_CC[];
+/* Added in Exempi 2.1 */
+extern const char NS_PDF[];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/exempi/xmperrors.h b/exempi/xmperrors.h
new file mode 100644
index 0000000..438294e
--- /dev/null
+++ b/exempi/xmperrors.h
@@ -0,0 +1,86 @@
+/*
+ * exempi - xmperror.h
+ *
+ * Copyright (C) 2007 Hubert Figuiere
+ * Copyright 2002-2007 Adobe Systems Incorporated
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2 Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3 Neither the name of the Authors, nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software wit hout specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __EXEMPI_XMPERROR_H_
+#define __EXEMPI_XMPERROR_H_
+
+enum {
+    /* More or less generic error codes. */
+    XMPErr_Unknown = 0,
+    XMPErr_TBD = -1,
+    XMPErr_Unavailable = -2,
+    XMPErr_BadObject = -3,
+    XMPErr_BadParam = -4,
+    XMPErr_BadValue = -5,
+    XMPErr_AssertFailure = -6,
+    XMPErr_EnforceFailure = -7,
+    XMPErr_Unimplemented = -8,
+    XMPErr_InternalFailure = -9,
+    XMPErr_Deprecated = -10,
+    XMPErr_ExternalFailure = -11,
+    XMPErr_UserAbort = -12,
+    XMPErr_StdException = -13,
+    XMPErr_UnknownException = -14,
+    XMPErr_NoMemory = -15,
+
+    /* More specific parameter error codes.  */
+    XMPErr_BadSchema = -101,
+    XMPErr_BadXPath = -102,
+    XMPErr_BadOptions = -103,
+    XMPErr_BadIndex = -104,
+    XMPErr_BadIterPosition = -105,
+    XMPErr_BadParse = -106,
+    XMPErr_BadSerialize = -107,
+    XMPErr_BadFileFormat = -108,
+    XMPErr_NoFileHandler = -109,
+    XMPErr_TooLargeForJPEG = -110,
+
+    /* File format and internal structure error codes. */
+    XMPErr_BadXML = -201,
+    XMPErr_BadRDF = -202,
+    XMPErr_BadXMP = -203,
+    XMPErr_EmptyIterator = -204,
+    XMPErr_BadUnicode = -205,
+    XMPErr_BadTIFF = -206,
+    XMPErr_BadJPEG = -207,
+    XMPErr_BadPSD = -208,
+    XMPErr_BadPSIR = -209,
+    XMPErr_BadIPTC = -210,
+    XMPErr_BadMPEG = -211
+};
+
+#endif
diff --git a/install-sh b/install-sh
new file mode 100755
index 0000000..6781b98
--- /dev/null
+++ b/install-sh
@@ -0,0 +1,520 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2009-04-28.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/ltmain.sh b/ltmain.sh
new file mode 100644
index 0000000..0f0a2da
--- /dev/null
+++ b/ltmain.sh
@@ -0,0 +1,11147 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
+
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.6
+package_revision=2.4.6
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
+fi
+
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+	fi"
+done
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $debug_cmd
+
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
+    else
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+    fi
+
+    $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    $debug_cmd
+
+    case $1 in
+      *[\\\`\"]*)
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        _G_arg=$1 ;;
+    esac
+
+    case $_G_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        _G_arg=\"$_G_arg\"
+        ;;
+    esac
+
+    func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
+    exit_cmd=exit
+}
+
+
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.6
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
+}
+
+
+# func_config
+# -----------
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+
+# func_features
+# -------------
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+
+# func_enable_tag TAGNAME
+# -----------------------
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+    # Global variable:
+    tagname=$1
+
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
+
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
+    *)
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
+
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
+}
+
+
+# func_check_version_match
+# ------------------------
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
+    fi
+}
+
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    esac
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
+
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if 'file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case $lalib_p_line in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test yes = "$lalib_p"
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $debug_cmd
+
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
+      IFS=$save_ifs
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# 'FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $debug_cmd
+
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $debug_cmd
+
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with '--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $debug_cmd
+
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg=$arg
+	arg_mode=normal
+	;;
+
+      target )
+	libobj=$arg
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify '-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs=$IFS; IFS=,
+	  for arg in $args; do
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS=$save_ifs
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg=$srcfile
+	  srcfile=$arg
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with '-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj=$func_basename_result
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from '$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test yes = "$build_old_libs"; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test yes = "$need_locks"; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test warn = "$need_locks"; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test yes = "$build_libtool_libs"; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test no != "$pic_mode"; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test yes = "$suppress_opt"; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test no != "$need_locks"; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to '-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the '--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the 'install' or 'cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with '-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in '.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
+
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode '$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $debug_cmd
+
+    # The first argument is the command name.
+    cmd=$nonopt
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "'$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "'$file' was not linked with '-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+	;;
+
+      *)
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir=$absdir
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic=$magic
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd=\$cmd$args
+    fi
+}
+
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $debug_cmd
+
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_quiet && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $debug_cmd
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=false
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=: ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir=$func_dirname_result
+      destname=$func_basename_result
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "'$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "'$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir=$func_dirname_result
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking '$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname=$1
+	  shift
+
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme=$stripme
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib=$destdir/$realname
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name=$func_basename_result
+	instname=$dir/${name}i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest=$destfile
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test yes = "$build_old_libs"; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=.exe
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+	  finalize=:
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test no = "$fast_install" && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if $finalize; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_quiet || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink '$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file=$outputname
+	      else
+	        func_warning "cannot relink '$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name=$func_basename_result
+
+      # Set up the ranlib parameters.
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run '$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms=${my_outputname}S.c
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist=$output_objdir/$my_outputname.nm
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols=$output_objdir/$outputname.exp
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from '$dlprefile'"
+	  func_basename "$dlprefile"
+	  name=$func_basename_result
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname"; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj=$output_objdir/${my_outputname}S.$objext
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $debug_cmd
+
+  win32_libid_type=unknown
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
+	    1,100{
+		/ I /{
+		    s|.*|import|
+		    p
+		    q
+		}
+	    }'`
+	;;
+      esac
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $debug_cmd
+
+    my_gentop=$1; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib=$func_basename_result
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result=$my_oldobjs
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test yes = "$fast_install"; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	\$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
+# define LT_PATHMAX PATH_MAX
+#elif defined MAXPATHLEN
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free (stale); stale = 0; } \
+} while (0)
+
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test yes = "$fast_install"; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  int rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (STREQ (argv[i], dumpscript_opt))
+	{
+EOF
+	    case $host in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (STREQ (argv[i], debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (STREQ (argv[i], ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  size_t tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = (size_t) (q - p);
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (STREQ (str, pat))
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[--len] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $debug_cmd
+
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # what system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll that has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    os2dllname=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=false
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module=$wl-single_module
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg=$1
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  $preload || {
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=:
+	  }
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test no = "$dlself"; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test dlprefiles = "$prev"; then
+	      dlself=yes
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols=$arg
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file '$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir=$func_dirname_result
+
+		if test none != "$pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object=$xdir$pic_object
+
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test dlprefiles = "$prev"; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg=$pic_object
+		fi
+
+		# Non-PIC object.
+		if test none != "$non_pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object=$xdir$non_pic_object
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object=$pic_object
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir=$func_dirname_result
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "'$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file '$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release=-$arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test rpath = "$prev"; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds=$arg
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg=$arg
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test X-export-symbols = "X$arg"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between '-L' and '$1'"
+	  else
+	    func_fatal_error "need path for '-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  esac
+	elif test X-lc_r = "X$arg"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module=$wl-multi_module
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -stdlib=*            select c++ std lib with clang
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir=$func_dirname_result
+
+	  test none = "$pic_object" || {
+	    # Prepend the subdirectory the object is found in.
+	    pic_object=$xdir$pic_object
+
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test dlprefiles = "$prev"; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg=$pic_object
+	  }
+
+	  # Non-PIC object.
+	  if test none != "$non_pic_object"; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object=$xdir$non_pic_object
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object=$pic_object
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir=$func_dirname_result
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "'$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test dlprefiles = "$prev"; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
+    func_dirname "$output" "/" ""
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test lib = "$linkmode"; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=false
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test lib,link = "$linkmode,$pass"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs=$tmp_deplibs
+      fi
+
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
+	deplibs=
+      fi
+      if test prog = "$linkmode"; then
+	case $pass in
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test lib,dlpreopen = "$linkmode,$pass"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs=$dlprefiles
+      fi
+      if test dlopen = "$pass"; then
+	# Collect dlpreopened libraries
+	save_deplibs=$deplibs
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=false
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test lib = "$linkmode"; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib=$searchdir/lib$name$search_ext
+	      if test -f "$lib"; then
+		if test .la = "$search_ext"; then
+		  found=:
+		else
+		  found=false
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if $found; then
+	    # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll=$l
+		  done
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
+		    func_dirname "$lib" "" "."
+		    ladir=$func_dirname_result
+		    lib=$ladir/$old_library
+		    if test prog,link = "$linkmode,$pass"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test conv = "$pass" && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test conv = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test scan = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "'-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test link = "$pass"; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=false
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=:
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=:
+		;;
+	      esac
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test link != "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=:
+	  continue
+	  ;;
+	esac # case $deplib
+
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir=$func_dirname_result
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test conv = "$pass"; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for '$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib=$l
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for '$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
+	  if test -z "$dlname" ||
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of '$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir=$ladir
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname=$func_basename_result
+
+	# Find the relevant object directory and library name.
+	if test yes = "$installed"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
+	  else
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
+	  fi
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
+	  fi
+	  case $host in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test lib = "$linkmode"; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if $linkalldeplibs; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test prog,link = "$linkmode,$pass"; then
+	  if test -n "$library_names" &&
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
+	      # Make sure the rpath contains only unique directories.
+	      case $temp_rpath: in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test built = "$use_static_libs" && test yes = "$installed"; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule=$dlpremoduletest
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    if test prog = "$linkmode"; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname=$1
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname=$dlname
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc* | *os2*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix=-$major
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname=$realname
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot=$soname
+	    func_basename "$soroot"
+	    soname=$func_basename_result
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from '$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for '$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir=-L$dir ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we cannot
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add=$dir/$old_library
+			fi
+		      elif test -n "$old_library"; then
+			add=$dir/$old_library
+		      fi
+		    fi
+		esac
+	      elif test no = "$hardcode_minus_L"; then
+		case $host in
+		*-*-sunos*) add_shlibpath=$dir ;;
+		esac
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test yes != "$lib_linked"; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
+	      else
+		add=$libdir/$linklib
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir=-L$libdir
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add=-l$name
+	    fi
+
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test prog = "$linkmode"; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test yes = "$build_libtool_libs"; then
+	  # Not a shared library
+	  if test pass_all != "$deplibs_check_method"; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test yes = "$module"; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test no = "$build_old_libs"; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test lib = "$linkmode"; then
+	  if test -n "$dependency_libs" &&
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs=$temp_deplibs
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test no != "$link_all_deplibs"; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path=$deplib ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path=-L$absdir/$objdir
+		  ;;
+		esac
+		else
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "'$deplib' seems to be moved"
+
+		  path=-L$absdir
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	}
+
+	if test prog,link = "$linkmode,$pass"; then
+	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=
+	  ;;
+	esac
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
+    fi
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "'-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs=$output
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form 'libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+	if test no != "$need_lib_prefix"; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test yes = "$build_libtool_libs"; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a '.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "'-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs=$IFS; IFS=:
+	set dummy $vinfo 0 0 0
+	shift
+	IFS=$save_ifs
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to '-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # that has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_revision
+	    ;;
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_minor
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current=$1
+	  revision=$2
+	  age=$3
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
+	  ;;
+
+	freebsd-aout)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	freebsd-elf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	irix | nonstopux)
+	  if test no = "$lt_irix_increment"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring=$verstring_prefix$major.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test 0 -ne "$loop"; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring_prefix$major.$iface:$verstring
+	  done
+
+	  # Before this point, $major must not contain '.'.
+	  major=.$major
+	  versuffix=$major.$revision
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test 0 -ne "$loop"; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring:$iface.0
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":$current.0"
+	  ;;
+
+	qnx)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sunos)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 file systems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix=-$major
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type '$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring=0.0
+	    ;;
+	  esac
+	  if test no = "$need_version"; then
+	    versuffix=
+	  else
+	    versuffix=.0.0
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test yes,no = "$avoid_version,$need_version"; then
+	  major=
+	  versuffix=
+	  verstring=
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag=$no_undefined_flag
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
+
+      if test relink != "$opt_mode"; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles=$dlfiles
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles=$dlprefiles
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test yes = "$build_libtool_libs"; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=
+	versuffix=
+	major=
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=
+		    ;;
+		  esac
+		fi
+		if test -n "$i"; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i"; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib=$potent_lib
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test none = "$deplibs_check_method"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test no = "$allow_undefined"; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs=$new_libs
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test yes = "$hardcode_into_libs"; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs=$libdir
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname=$1
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname=$realname
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib=$output_objdir/$realname
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    func_dll_def_p "$export_symbols" || {
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols=$export_symbols
+	      export_symbols=
+	      always_export_symbols=yes
+	    }
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs=$IFS; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS=$save_ifs
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=$output_objdir/$output_la.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs=$tmp_deplibs
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test yes = "$compiler_needs_object" &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test yes = "$module" && test -n "$module_cmds"; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test : != "$skipped_export" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test yes = "$compiler_needs_object"; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-$k.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test -z "$objlist" ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test 1 -eq "$k"; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-$k.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    }
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs=$IFS; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS=$save_ifs
+	      $opt_quiet || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test relink = "$opt_mode"; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS=$save_ifs
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          ${skipped_export-false} && {
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  }
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test yes = "$module" && test -n "$module_cmds"; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs=$IFS; IFS='~'
+	for cmd in $cmds; do
+	  IFS=$sp$nl
+	  eval cmd=\"$cmd\"
+	  IFS=$save_ifs
+	  $opt_quiet || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test relink = "$opt_mode"; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS=$save_ifs
+
+	# Restore the uninstalled library and exit
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test yes = "$module" || test yes = "$export_dynamic"; then
+	  # On all known operating systems, these are identical.
+	  dlname=$soname
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj=$output
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
+	else
+	  gentop=$output_objdir/${obj}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
+      # Create the old-style object.
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
+
+      output=$obj
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      test yes = "$build_libtool_libs" || {
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      }
+
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output=$libobj
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for programs"
+
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test CXX = "$tagname"; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs=$new_libs
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath=$rpath
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath=$rpath
+
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=:
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
+        ;;
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
+        ;;
+      *)
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
+        fi
+        ;;
+      esac
+      $wrappers_required || {
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
+	fi
+
+	exit $exit_status
+      }
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test yes = "$no_install"; then
+	# We don't need to create a wrapper script.
+	link_command=$compile_var$compile_command$compile_rpath
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host"; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
+	  build_libtool_libs=no
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
+
+      if test -n "$addlibs"; then
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase=$func_basename_result
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj"; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test -z "$oldobjs"; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test yes = "$build_old_libs" && old_library=$libname.$libext
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test yes = "$hardcode_automatic"; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test yes = "$installed"; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output=$output_objdir/${outputname}i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name=$func_basename_result
+		func_resolve_sysroot "$deplib"
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs=$newdependency_libs
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles=$newdlprefiles
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles=$newdlprefiles
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test no,yes = "$installed,$need_relink"; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $debug_cmd
+
+    RM=$nonopt
+    files=
+    rmforce=false
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
+      else
+	odir=$dir/$objdir
+      fi
+      func_basename "$file"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif $rmforce; then
+	continue
+      fi
+
+      rmfiles=$file
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case $opt_mode in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" && test none != "$pic_object"; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test clean = "$opt_mode"; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the $objdir's in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
+
+test -z "$opt_mode" && {
+  help=$generic_help
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode '$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# where we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/m4/ax_cflags_gcc_option.m4 b/m4/ax_cflags_gcc_option.m4
new file mode 100644
index 0000000..9a4d62a
--- /dev/null
+++ b/m4/ax_cflags_gcc_option.m4
@@ -0,0 +1,230 @@
+##### http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html
+#
+# SYNOPSIS
+#
+#   AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
+#
+# DESCRIPTION
+#
+#   AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
+#   "checking CFLAGS for gcc -fvomit-frame ... yes" and adds the
+#   optionflag to CFLAGS if it is understood. You can override the
+#   shellvar-default of CFLAGS of course. The order of arguments stems
+#   from the explicit macros like AX_CFLAGS_WARN_ALL.
+#
+#   The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add
+#   to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
+#   (since it is possible to use different compilers for C and C++).
+#
+#   The macro is a lot simpler than any special AX_CFLAGS_* macro (or
+#   ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
+#   However, if you use this macro in a few places, it would be great
+#   if you would make up a new function-macro and submit it to the
+#   ac-archive.
+#
+#     - $1 option-to-check-for : required ("-option" as non-value)
+#     - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
+#     - $3 action-if-found : add value to shellvariable
+#     - $4 action-if-not-found : nothing
+#
+#   note: in earlier versions, $1-$2 were swapped. We try to detect the
+#   situation and accept a $2=~/-/ as being the old
+#   option-to-check-for.
+#
+#   also: there are other variants that emerged from the original macro
+#   variant which did just test an option to be possibly added.
+#   However, some compilers accept an option silently, or possibly for
+#   just another option that was not intended. Therefore, we have to do
+#   a generic test for a compiler family. For gcc we check "-pedantic"
+#   being accepted which is also understood by compilers who just want
+#   to be compatible with gcc even when not being made from gcc
+#   sources.
+#
+#   see also:
+#
+#         AX_CFLAGS_SUN_OPTION               AX_CFLAGS_HPUX_OPTION
+#         AX_CFLAGS_AIX_OPTION               AX_CFLAGS_IRIX_OPTION
+#
+# LAST MODIFICATION
+#
+#   2006-12-12
+#
+# COPYLEFT
+#
+#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.
+
+AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_C
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
+   #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   AC_TRY_COMPILE([],[return 0;],
+   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+     .ok|.ok,*) m4_ifvaln($3,$3) ;;
+   .|.no|.no,*) m4_ifvaln($4,$4) ;;
+   *) m4_ifvaln($3,$3,[
+   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+   fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+
+dnl the only difference - the LANG selection... and the default FLAGS
+
+AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
+   #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   AC_TRY_COMPILE([],[return 0;],
+   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+     .ok|.ok,*) m4_ifvaln($3,$3) ;;
+   .|.no|.no,*) m4_ifvaln($4,$4) ;;
+   *) m4_ifvaln($3,$3,[
+   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+   fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+dnl -------------------------------------------------------------------------
+
+AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl
+AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_C
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
+   #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   AC_TRY_COMPILE([],[return 0;],
+   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+     .ok|.ok,*) m4_ifvaln($3,$3) ;;
+   .|.no|.no,*) m4_ifvaln($4,$4) ;;
+   *) m4_ifvaln($3,$3,[
+   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
+   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
+                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
+   fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+
+dnl the only difference - the LANG selection... and the default FLAGS
+
+AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
+AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
+   #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   AC_TRY_COMPILE([],[return 0;],
+   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+     .ok|.ok,*) m4_ifvaln($3,$3) ;;
+   .|.no|.no,*) m4_ifvaln($4,$4) ;;
+   *) m4_ifvaln($3,$3,[
+   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
+   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
+                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
+   fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
+[AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])])
+
+AC_DEFUN([AX_CXXFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
+[AX_CXXFLAGS_GCC_OPTION_NEW($@)],[AX_CXXFLAGS_GCC_OPTION_OLD($@)])])
diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 100644
index 0000000..af37acd
--- /dev/null
+++ b/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1,133 @@
+# ============================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++11
+#   standard; if necessary, add switches to CXXFLAGS to enable support.
+#
+#   The first argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The second argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline C++11 support is required and that the macro
+#   should error out if no mode with that support is found.  If specified
+#   'optional', then configuration proceeds regardless, after defining
+#   HAVE_CXX11 if and only if a supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 3
+
+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = static_cast<check_type&&>(c);
+
+    auto d = a;
+])
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
+  m4_if([$1], [], [],
+        [$1], [ext], [],
+        [$1], [noext], [],
+        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
+        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
+        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
+  ax_cv_cxx_compile_cxx11,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+    [ax_cv_cxx_compile_cxx11=yes],
+    [ax_cv_cxx_compile_cxx11=no])])
+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$1], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++11 -std=gnu++0x; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$1], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=c++11 -std=c++0x; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+    fi
+  else
+    if test x$ac_success = xno; then
+      HAVE_CXX11=0
+      AC_MSG_NOTICE([No compiler with C++11 support was found])
+    else
+      HAVE_CXX11=1
+      AC_DEFINE(HAVE_CXX11,1,
+                [define if the compiler supports basic C++11 syntax])
+    fi
+
+    AC_SUBST(HAVE_CXX11)
+  fi
+])
diff --git a/m4/ax_ld_check_flag.m4 b/m4/ax_ld_check_flag.m4
new file mode 100644
index 0000000..2339657
--- /dev/null
+++ b/m4/ax_ld_check_flag.m4
@@ -0,0 +1,96 @@
+# ===========================================================================
+#            http://autoconf-archive.cryp.to/ax_ld_check_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LD_CHECK_FLAG(FLAG-TO-CHECK,[PROLOGUE],[BODY],[ACTION-IF-SUCCESS],[ACTION-IF-FAILURE])
+#
+# DESCRIPTION
+#
+#   This macro tests if the C++ compiler supports the flag FLAG-TO-CHECK. If
+#   successfull execute ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE.
+#   PROLOGUE and BODY are optional and should be used as in AC_LANG_PROGRAM
+#   macro.
+#
+#   Example:
+#
+#     AX_LD_CHECK_FLAG([-Wl,-L/usr/lib],[],[],[
+#       ...
+#     ],[
+#       ...
+#     ])
+#
+#   This code is inspired from KDE_CHECK_COMPILER_FLAG macro. Thanks to
+#   Bogdan Drozdowski <bogdandr@op.pl> for testing and bug fixes.
+#
+# LAST MODIFICATION
+#
+#   2008-04-12
+#
+# COPYLEFT
+#
+#   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Macro Archive. When you make and
+#   distribute a modified version of the Autoconf Macro, you may extend this
+#   special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([AX_LD_CHECK_FLAG],[
+  AC_PREREQ([2.61])
+  AC_REQUIRE([AC_PROG_CXX])
+  AC_REQUIRE([AC_PROG_SED])
+
+  flag=`echo "$1" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
+
+  AC_CACHE_CHECK([whether the linker accepts the $1 flag],
+    [ax_cv_ld_check_flag_$flag],[
+
+    #AC_LANG_PUSH([C])
+
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $1"
+    AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([$2],[$3])
+    ],[
+      eval "ax_cv_ld_check_flag_$flag=yes"
+    ],[
+      eval "ax_cv_ld_check_flag_$flag=no"
+    ])
+
+    LDFLAGS="$save_LDFLAGS"
+
+    #AC_LANG_POP
+
+  ])
+
+  AS_IF([eval "test \"`echo '$ax_cv_ld_check_flag_'$flag`\" = yes"],[
+    :
+    $4
+  ],[
+    :
+    $5
+  ])
+])
diff --git a/m4/ax_tls.m4 b/m4/ax_tls.m4
new file mode 100644
index 0000000..41620a7
--- /dev/null
+++ b/m4/ax_tls.m4
@@ -0,0 +1,78 @@
+# ===========================================================================
+#                 http://autoconf-archive.cryp.to/ax_tls.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_TLS
+#
+# DESCRIPTION
+#
+#   Provides a test for the compiler support of thread local storage (TLS)
+#   extensions. Defines TLS if it is found. Currently only knows about GCC
+#   and MSVC. I think SunPro uses the same as GCC, and Borland apparently
+#   supports either.
+#
+# LAST MODIFICATION
+#
+#   2008-04-12
+#
+# COPYLEFT
+#
+#   Copyright (c) 2008 Alan Woodland <ajw05@aber.ac.uk>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Macro Archive. When you make and
+#   distribute a modified version of the Autoconf Macro, you may extend this
+#   special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([AX_TLS], [
+  AC_MSG_CHECKING(for thread local storage (TLS) class)
+  AC_CACHE_VAL(ac_cv_tls, [
+    ax_tls_keywords="__thread __declspec(thread) none"
+    for ax_tls_keyword in $ax_tls_keywords; do
+       case $ax_tls_keyword in
+          none) ac_cv_tls=none ; break ;;
+	  *)
+             AC_TRY_COMPILE(
+                [#include <stdlib.h>
+                 static void
+                 foo(void) {
+                 static ] $ax_tls_keyword [ int bar;
+                 exit(1);
+                 }],
+                 [],
+                 [ac_cv_tls=$ax_tls_keyword ; break],
+                 ac_cv_tls=none
+             )
+	  esac
+    done
+])
+
+  if test "$ac_cv_tls" != "none"; then
+    dnl AC_DEFINE([TLS], [], [If the compiler supports a TLS storage class define it to that here])
+    AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [If the compiler supports a TLS storage class define it to that here])
+  fi
+  AC_MSG_RESULT($ac_cv_tls)
+])
diff --git a/m4/boost.m4 b/m4/boost.m4
new file mode 100644
index 0000000..27d063f
--- /dev/null
+++ b/m4/boost.m4
@@ -0,0 +1,1560 @@
+# boost.m4: Locate Boost headers and libraries for autoconf-based projects.
+# Copyright (C) 2007-2011, 2014  Benoit Sigoure <tsuna@lrde.epita.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Additional permission under section 7 of the GNU General Public
+# License, version 3 ("GPLv3"):
+#
+# If you convey this file as part of a work that contains a
+# configuration script generated by Autoconf, you may do so under
+# terms of your choice.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+m4_define([_BOOST_SERIAL], [m4_translit([
+# serial 25
+], [#
+], [])])
+
+# Original sources can be found at http://github.com/tsuna/boost.m4
+# You can fetch the latest version of the script by doing:
+#   wget http://github.com/tsuna/boost.m4/raw/master/build-aux/boost.m4
+
+# ------ #
+# README #
+# ------ #
+
+# This file provides several macros to use the various Boost libraries.
+# The first macro is BOOST_REQUIRE.  It will simply check if it's possible to
+# find the Boost headers of a given (optional) minimum version and it will
+# define BOOST_CPPFLAGS accordingly.  It will add an option --with-boost to
+# your configure so that users can specify non standard locations.
+# If the user's environment contains BOOST_ROOT and --with-boost was not
+# specified, --with-boost=$BOOST_ROOT is implicitly used.
+# For more README and documentation, go to http://github.com/tsuna/boost.m4
+# Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL.  If you don't, don't worry,
+# simply read the README, it will show you what to do step by step.
+
+m4_pattern_forbid([^_?(BOOST|Boost)_])
+
+
+# _BOOST_SED_CPP(SED-PROGRAM, PROGRAM,
+#                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# --------------------------------------------------------
+# Same as AC_EGREP_CPP, but leave the result in conftest.i.
+#
+# SED-PROGRAM is *not* overquoted, as in AC_EGREP_CPP.  It is expanded
+# in double-quotes, so escape your double quotes.
+#
+# It could be useful to turn this into a macro which extracts the
+# value of any macro.
+m4_define([_BOOST_SED_CPP],
+[AC_LANG_PUSH([C++])dnl
+AC_LANG_PREPROC_REQUIRE()dnl
+AC_REQUIRE([AC_PROG_SED])dnl
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])])
+AS_IF([dnl eval is necessary to expand ac_cpp.
+dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell.
+dnl Beware of Windows end-of-lines, for instance if we are running
+dnl some Windows programs under Wine.  In that case, boost/version.hpp
+dnl is certainly using "\r\n", but the regular Unix shell will only
+dnl strip `\n' with backquotes, not the `\r'.  This results in
+dnl boost_cv_lib_version='1_37\r' for instance, which breaks
+dnl everything else.
+dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
+dnl
+dnl Beware that GCC 5, when expanding macros, may embed # line directives
+dnl a within single line:
+dnl
+dnl # 1 "conftest.cc"
+dnl # 1 "<built-in>"
+dnl # 1 "<command-line>"
+dnl # 1 "conftest.cc"
+dnl # 1 "/opt/local/include/boost/version.hpp" 1 3
+dnl # 2 "conftest.cc" 2
+dnl boost-lib-version =
+dnl # 2 "conftest.cc" 3
+dnl                    "1_56"
+dnl
+dnl So get rid of the # lines, and glue the remaining ones together.
+(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+  grep -v '#' |
+  tr -d '\r' |
+  tr -s '\n' ' ' |
+  $SED -n -e "$1" >conftest.i 2>&1],
+  [$3],
+  [$4])
+rm -rf conftest*
+AC_LANG_POP([C++])dnl
+])# _BOOST_SED_CPP
+
+
+
+# BOOST_REQUIRE([VERSION], [ACTION-IF-NOT-FOUND])
+# -----------------------------------------------
+# Look for Boost.  If version is given, it must either be a literal of the form
+# "X.Y.Z" where X, Y and Z are integers (the ".Z" part being optional) or a
+# variable "$var".
+# Defines the value BOOST_CPPFLAGS.  This macro only checks for headers with
+# the required version, it does not check for any of the Boost libraries.
+# On # success, defines HAVE_BOOST.  On failure, calls the optional
+# ACTION-IF-NOT-FOUND action if one was supplied.
+# Otherwise aborts with an error message.
+AC_DEFUN_ONCE([BOOST_REQUIRE],
+[AC_REQUIRE([AC_PROG_CXX])dnl
+AC_REQUIRE([AC_PROG_GREP])dnl
+echo "$as_me: this is boost.m4[]_BOOST_SERIAL" >&AS_MESSAGE_LOG_FD
+boost_save_IFS=$IFS
+boost_version_req=$1
+IFS=.
+set x $boost_version_req 0 0 0
+IFS=$boost_save_IFS
+shift
+boost_version_req=`expr "$[1]" '*' 100000 + "$[2]" '*' 100 + "$[3]"`
+boost_version_req_string=$[1].$[2].$[3]
+AC_ARG_WITH([boost],
+   [AS_HELP_STRING([--with-boost=DIR],
+                   [prefix of Boost $1 @<:@guess@:>@])])dnl
+AC_ARG_VAR([BOOST_ROOT],[Location of Boost installation])dnl
+# If BOOST_ROOT is set and the user has not provided a value to
+# --with-boost, then treat BOOST_ROOT as if it the user supplied it.
+if test x"$BOOST_ROOT" != x; then
+  if test x"$with_boost" = x; then
+    AC_MSG_NOTICE([Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT])
+    with_boost=$BOOST_ROOT
+  else
+    AC_MSG_NOTICE([Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost])
+  fi
+fi
+AC_SUBST([DISTCHECK_CONFIGURE_FLAGS],
+         ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"])dnl
+boost_save_CPPFLAGS=$CPPFLAGS
+  AC_CACHE_CHECK([for Boost headers version >= $boost_version_req_string],
+    [boost_cv_inc_path],
+    [boost_cv_inc_path=no
+AC_LANG_PUSH([C++])dnl
+m4_pattern_allow([^BOOST_VERSION$])dnl
+    AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#include <boost/version.hpp>
+#if !defined BOOST_VERSION
+# error BOOST_VERSION is not defined
+#elif BOOST_VERSION < $boost_version_req
+# error Boost headers version < $boost_version_req
+#endif
+]])])
+    # If the user provided a value to --with-boost, use it and only it.
+    case $with_boost in #(
+      ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
+                 /usr/include C:/Boost/include;; #(
+      *)      set x "$with_boost/include" "$with_boost";;
+    esac
+    shift
+    for boost_dir
+    do
+    # Without --layout=system, Boost (or at least some versions) installs
+    # itself in <prefix>/include/boost-<version>.  This inner loop helps to
+    # find headers in such directories.
+    #
+    # Any ${boost_dir}/boost-x_xx directories are searched in reverse version
+    # order followed by ${boost_dir}.  The final '.' is a sentinel for
+    # searching $boost_dir" itself.  Entries are whitespace separated.
+    #
+    # I didn't indent this loop on purpose (to avoid over-indented code)
+    boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \
+        && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \
+        && echo .`
+    for boost_inc in $boost_layout_system_search_list
+    do
+      if test x"$boost_inc" != x.; then
+        boost_inc="$boost_dir/$boost_inc"
+      else
+        boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list
+      fi
+      if test x"$boost_inc" != x; then
+        # We are going to check whether the version of Boost installed
+        # in $boost_inc is usable by running a compilation that
+        # #includes it.  But if we pass a -I/some/path in which Boost
+        # is not installed, the compiler will just skip this -I and
+        # use other locations (either from CPPFLAGS, or from its list
+        # of system include directories).  As a result we would use
+        # header installed on the machine instead of the /some/path
+        # specified by the user.  So in that precise case (trying
+        # $boost_inc), make sure the version.hpp exists.
+        #
+        # Use test -e as there can be symlinks.
+        test -e "$boost_inc/boost/version.hpp" || continue
+        CPPFLAGS="$CPPFLAGS -I$boost_inc"
+      fi
+      AC_COMPILE_IFELSE([], [boost_cv_inc_path=yes], [boost_cv_version=no])
+      if test x"$boost_cv_inc_path" = xyes; then
+        if test x"$boost_inc" != x; then
+          boost_cv_inc_path=$boost_inc
+        fi
+        break 2
+      fi
+    done
+    done
+AC_LANG_POP([C++])dnl
+    ])
+    case $boost_cv_inc_path in #(
+      no)
+        boost_errmsg="cannot find Boost headers version >= $boost_version_req_string"
+        m4_if([$2], [],  [AC_MSG_ERROR([$boost_errmsg])],
+                        [AC_MSG_NOTICE([$boost_errmsg])])
+        $2
+        ;;#(
+      yes)
+        BOOST_CPPFLAGS=
+        ;;#(
+      *)
+        AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"])dnl
+        ;;
+    esac
+  if test x"$boost_cv_inc_path" != xno; then
+  AC_DEFINE([HAVE_BOOST], [1],
+            [Defined if the requested minimum BOOST version is satisfied])
+  AC_CACHE_CHECK([for Boost's header version],
+    [boost_cv_lib_version],
+    [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
+     _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
+                    [#include <boost/version.hpp>
+boost-lib-version = BOOST_LIB_VERSION],
+    [boost_cv_lib_version=`cat conftest.i`])])
+    # e.g. "134" for 1_34_1 or "135" for 1_35
+    boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
+    case $boost_major_version in #(
+      '' | *[[!0-9]]*)
+        AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
+        ;;
+    esac
+fi
+CPPFLAGS=$boost_save_CPPFLAGS
+])# BOOST_REQUIRE
+
+
+# BOOST_STATIC()
+# --------------
+# Add the "--enable-static-boost" configure argument. If this argument is given
+# on the command line, static versions of the libraries will be looked up.
+AC_DEFUN([BOOST_STATIC],
+  [AC_ARG_ENABLE([static-boost],
+     [AS_HELP_STRING([--enable-static-boost],
+               [Prefer the static boost libraries over the shared ones [no]])],
+     [enable_static_boost=yes],
+     [enable_static_boost=no])])# BOOST_STATIC
+
+
+# BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND])
+# --------------------------------------------------------------------------
+# Wrapper around AC_CHECK_HEADER for Boost headers.  Useful to check for
+# some parts of the Boost library which are only made of headers and don't
+# require linking (such as Boost.Foreach).
+#
+# Default ACTION-IF-NOT-FOUND: Fail with a fatal error unless Boost couldn't be
+# found in the first place, in which case by default a notice is issued to the
+# user.  Presumably if we haven't died already it's because it's OK to not have
+# Boost, which is why only a notice is issued instead of a hard error.
+#
+# Default ACTION-IF-FOUND: define the preprocessor symbol HAVE_<HEADER-NAME> in
+# case of success # (where HEADER-NAME is written LIKE_THIS, e.g.,
+# HAVE_BOOST_FOREACH_HPP).
+AC_DEFUN([BOOST_FIND_HEADER],
+[AC_REQUIRE([BOOST_REQUIRE])dnl
+if test x"$boost_cv_inc_path" = xno; then
+  m4_default([$2], [AC_MSG_NOTICE([Boost not available, not searching for $1])])
+else
+AC_LANG_PUSH([C++])dnl
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+AC_CHECK_HEADER([$1],
+  [m4_default([$3], [AC_DEFINE(AS_TR_CPP([HAVE_$1]), [1],
+                               [Define to 1 if you have <$1>])])],
+  [m4_default([$2], [AC_MSG_ERROR([cannot find $1])])])
+CPPFLAGS=$boost_save_CPPFLAGS
+AC_LANG_POP([C++])dnl
+fi
+])# BOOST_FIND_HEADER
+
+
+# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES],
+#                 [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
+#                 [CXX-PROLOGUE])
+# --------------------------------------------------------------
+# Look for the Boost library COMPONENT-NAME (e.g., `thread', for
+# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g.,
+# "thread_win32 thread").  Check that HEADER-NAME works and check that
+# libboost_LIB-NAME can link with the code CXX-TEST.  The optional
+# argument CXX-PROLOGUE can be used to include some C++ code before
+# the `main' function.
+#
+# Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above).
+#
+# Boost libraries typically come compiled with several flavors (with different
+# runtime options) so PREFERRED-RT-OPT is the preferred suffix.  A suffix is one
+# or more of the following letters: sgdpn (in that order).  s = static
+# runtime, d = debug build, g = debug/diagnostic runtime, p = STLPort build,
+# n = (unsure) STLPort build without iostreams from STLPort (it looks like `n'
+# must always be used along with `p').  Additionally, PREFERRED-RT-OPT can
+# start with `mt-' to indicate that there is a preference for multi-thread
+# builds.  Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp
+# ...  If you want to make sure you have a specific version of Boost
+# (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro.
+AC_DEFUN([BOOST_FIND_LIBS],
+[AC_REQUIRE([BOOST_REQUIRE])dnl
+AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl
+AC_REQUIRE([BOOST_STATIC])dnl
+AC_REQUIRE([_BOOST_GUESS_WHETHER_TO_USE_MT])dnl
+if test x"$boost_cv_inc_path" = xno; then
+  AC_MSG_NOTICE([Boost not available, not searching for the Boost $1 library])
+else
+dnl The else branch is huge and wasn't intended on purpose.
+AC_LANG_PUSH([C++])dnl
+AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl
+AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl
+AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl
+AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl
+BOOST_FIND_HEADER([$4])
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
+               [_BOOST_FIND_LIBS($@)])
+case $Boost_lib in #(
+  (no) _AC_MSG_LOG_CONFTEST
+    AC_MSG_ERROR([cannot find the flags to link with Boost $1])
+    ;;
+esac
+AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
+AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
+AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
+AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
+CPPFLAGS=$boost_save_CPPFLAGS
+AS_VAR_POPDEF([Boost_lib])dnl
+AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
+AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
+AS_VAR_POPDEF([Boost_lib_LIBS])dnl
+AC_LANG_POP([C++])dnl
+fi
+])
+
+
+# BOOST_FIND_LIB([LIB-NAME],
+#                [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
+#                [CXX-PROLOGUE])
+# --------------------------------------------------------------
+# Backward compatibility wrapper for BOOST_FIND_LIBS.
+AC_DEFUN([BOOST_FIND_LIB],
+[BOOST_FIND_LIBS([$1], $@)])
+
+
+# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES],
+#                 [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
+#                 [CXX-PROLOGUE])
+# --------------------------------------------------------------
+# Real implementation of BOOST_FIND_LIBS: rely on these local macros:
+# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS
+#
+# The algorithm is as follows: first look for a given library name
+# according to the user's PREFERRED-RT-OPT.  For each library name, we
+# prefer to use the ones that carry the tag (toolset name).  Each
+# library is searched through the various standard paths were Boost is
+# usually installed.  If we can't find the standard variants, we try
+# to enforce -mt (for instance on MacOSX, libboost_thread.dylib
+# doesn't exist but there's -obviously- libboost_thread-mt.dylib).
+AC_DEFUN([_BOOST_FIND_LIBS],
+[Boost_lib=no
+  case "$3" in #(
+    (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
+    (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #(
+    (*) boost_mt=; boost_rtopt=$3;;
+  esac
+  if test $enable_static_boost = yes; then
+    boost_rtopt="s$boost_rtopt"
+  fi
+  # Find the proper debug variant depending on what we've been asked to find.
+  case $boost_rtopt in #(
+    (*d*) boost_rt_d=$boost_rtopt;; #(
+    (*[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
+      boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
+    (*) boost_rt_d='-d';;
+  esac
+  # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
+  test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
+  $boost_guess_use_mt && boost_mt=-mt
+  # Look for the abs path the static archive.
+  # $libext is computed by Libtool but let's make sure it's non empty.
+  test -z "$libext" &&
+    AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?])
+  boost_save_ac_objext=$ac_objext
+  # Generate the test file.
+  AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$4>
+$6], [$5])])
+dnl Optimization hacks: compiling C++ is slow, especially with Boost.  What
+dnl we're trying to do here is guess the right combination of link flags
+dnl (LIBS / LDFLAGS) to use a given library.  This can take several
+dnl iterations before it succeeds and is thus *very* slow.  So what we do
+dnl instead is that we compile the code first (and thus get an object file,
+dnl typically conftest.o).  Then we try various combinations of link flags
+dnl until we succeed to link conftest.o in an executable.  The problem is
+dnl that the various TRY_LINK / COMPILE_IFELSE macros of Autoconf always
+dnl remove all the temporary files including conftest.o.  So the trick here
+dnl is to temporarily change the value of ac_objext so that conftest.o is
+dnl preserved accross tests.  This is obviously fragile and I will burn in
+dnl hell for not respecting Autoconf's documented interfaces, but in the
+dnl mean time, it optimizes the macro by a factor of 5 to 30.
+dnl Another small optimization: the first argument of AC_COMPILE_IFELSE left
+dnl empty because the test file is generated only once above (before we
+dnl start the for loops).
+  AC_COMPILE_IFELSE([],
+    [ac_objext=do_not_rm_me_plz],
+    [AC_MSG_ERROR([cannot compile a test that uses Boost $1])])
+  ac_objext=$boost_save_ac_objext
+  boost_failed_libs=
+# Don't bother to ident the following nested for loops, only the 2
+# innermost ones matter.
+for boost_lib_ in $2; do
+for boost_tag_ in -$boost_cv_lib_tag ''; do
+for boost_ver_ in -$boost_cv_lib_version ''; do
+for boost_mt_ in $boost_mt -mt ''; do
+for boost_rtopt_ in $boost_rtopt '' -d; do
+  for boost_lib in \
+    boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
+    boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
+    boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
+    boost_$boost_lib_$boost_tag_$boost_ver_
+  do
+    # Avoid testing twice the same lib
+    case $boost_failed_libs in #(
+      (*@$boost_lib@*) continue;;
+    esac
+    # If with_boost is empty, we'll search in /lib first, which is not quite
+    # right so instead we'll try to a location based on where the headers are.
+    boost_tmp_lib=$with_boost
+    test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
+    for boost_ldpath in "$boost_tmp_lib/lib" '' \
+             /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+             "$with_boost" C:/Boost/lib /lib*
+    do
+      # Don't waste time with directories that don't exist.
+      if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
+        continue
+      fi
+      boost_save_LDFLAGS=$LDFLAGS
+      # Are we looking for a static library?
+      case $boost_ldpath:$boost_rtopt_ in #(
+        (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
+          Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext"
+          test -e "$Boost_lib_LIBS" || continue;; #(
+        (*) # No: use -lboost_foo to find the shared library.
+          Boost_lib_LIBS="-l$boost_lib";;
+      esac
+      boost_save_LIBS=$LIBS
+      LIBS="$Boost_lib_LIBS $LIBS"
+      test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath"
+dnl First argument of AC_LINK_IFELSE left empty because the test file is
+dnl generated only once above (before we start the for loops).
+      _BOOST_AC_LINK_IFELSE([],
+                            [Boost_lib=yes], [Boost_lib=no])
+      ac_objext=$boost_save_ac_objext
+      LDFLAGS=$boost_save_LDFLAGS
+      LIBS=$boost_save_LIBS
+      if test x"$Boost_lib" = xyes; then
+        # Check or used cached result of whether or not using -R or
+        # -rpath makes sense.  Some implementations of ld, such as for
+        # Mac OSX, require -rpath but -R is the flag known to work on
+        # other systems.  https://github.com/tsuna/boost.m4/issues/19
+        AC_CACHE_VAL([boost_cv_rpath_link_ldflag],
+          [case $boost_ldpath in
+           '') # Nothing to do.
+             boost_cv_rpath_link_ldflag=
+             boost_rpath_link_ldflag_found=yes;;
+           *)
+            for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
+              LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+              LIBS="$boost_save_LIBS $Boost_lib_LIBS"
+              _BOOST_AC_LINK_IFELSE([],
+                [boost_rpath_link_ldflag_found=yes
+                break],
+                [boost_rpath_link_ldflag_found=no])
+            done
+            ;;
+          esac
+          AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"],
+            [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])])
+          LDFLAGS=$boost_save_LDFLAGS
+          LIBS=$boost_save_LIBS
+          ])
+        test x"$boost_ldpath" != x &&
+          Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+        Boost_lib_LDPATH="$boost_ldpath"
+        break 7
+      else
+        boost_failed_libs="$boost_failed_libs@$boost_lib@"
+      fi
+    done
+  done
+done
+done
+done
+done
+done # boost_lib_
+rm -f conftest.$ac_objext
+])
+
+
+
+# --------------------------------------- #
+# Checks for the various Boost libraries. #
+# --------------------------------------- #
+
+# List of boost libraries: http://www.boost.org/libs/libraries.htm
+# The page http://beta.boost.org/doc/libs is useful: it gives the first release
+# version of each library (among other things).
+
+# BOOST_DEFUN(LIBRARY, CODE)
+# --------------------------
+# Define BOOST_<LIBRARY-UPPERCASE> as a macro that runs CODE.
+#
+# Use indir to avoid the warning on underquoted macro name given to AC_DEFUN.
+m4_define([BOOST_DEFUN],
+[m4_indir([AC_DEFUN],
+          m4_toupper([BOOST_$1]),
+[m4_pushdef([BOOST_Library], [$1])dnl
+$2
+m4_popdef([BOOST_Library])dnl
+])
+])
+
+# BOOST_ARRAY()
+# -------------
+# Look for Boost.Array
+BOOST_DEFUN([Array],
+[BOOST_FIND_HEADER([boost/array.hpp])])
+
+
+# BOOST_ASIO()
+# ------------
+# Look for Boost.Asio (new in Boost 1.35).
+BOOST_DEFUN([Asio],
+[AC_REQUIRE([BOOST_SYSTEM])dnl
+BOOST_FIND_HEADER([boost/asio.hpp])])
+
+
+# BOOST_BIND()
+# ------------
+# Look for Boost.Bind.
+BOOST_DEFUN([Bind],
+[BOOST_FIND_HEADER([boost/bind.hpp])])
+
+
+# BOOST_CHRONO()
+# --------------
+# Look for Boost.Chrono.
+BOOST_DEFUN([Chrono],
+[# Do we have to check for Boost.System?  This link-time dependency was
+# added as of 1.35.0.  If we have a version <1.35, we must not attempt to
+# find Boost.System as it didn't exist by then.
+if test $boost_major_version -ge 135; then
+  BOOST_SYSTEM([$1])
+fi # end of the Boost.System check.
+boost_filesystem_save_LIBS=$LIBS
+boost_filesystem_save_LDFLAGS=$LDFLAGS
+m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
+LIBS="$LIBS $BOOST_SYSTEM_LIBS"
+LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+BOOST_FIND_LIB([chrono], [$1],
+                [boost/chrono.hpp],
+                [boost::chrono::thread_clock d;])
+if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
+  BOOST_CHRONO_LIBS="$BOOST_CHRONO_LIBS $BOOST_SYSTEM_LIBS"
+fi
+LIBS=$boost_filesystem_save_LIBS
+LDFLAGS=$boost_filesystem_save_LDFLAGS
+])# BOOST_CHRONO
+
+
+# BOOST_CONTEXT([PREFERRED-RT-OPT])
+# -----------------------------------
+# Look for Boost.Context.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+#
+# * This library was introduced in Boost 1.51.0
+# * The signatures of make_fcontext() and jump_fcontext were changed in 1.56.0
+# * A dependency on boost_thread appears in 1.57.0
+BOOST_DEFUN([Context],
+[boost_context_save_LIBS=$LIBS
+ boost_context_save_LDFLAGS=$LDFLAGS
+if test $boost_major_version -ge 157; then
+  BOOST_THREAD([$1])
+  m4_pattern_allow([^BOOST_THREAD_(LIBS|LDFLAGS)$])dnl
+  LIBS="$LIBS $BOOST_THREAD_LIBS"
+  LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS"
+fi
+BOOST_FIND_LIB([context], [$1],
+                [boost/context/all.hpp],[[
+
+// creates a stack
+void * stack_pointer = new void*[4096];
+std::size_t const size = sizeof(void*[4096]);
+
+#if BOOST_VERSION <= 105100
+ctx::make_fcontext(&fc, f);
+return ctx::jump_fcontext(&fcm, &fc, 3) == 6;
+
+#else
+
+fc = ctx::make_fcontext(stack_pointer, size, f);
+return ctx::jump_fcontext(&fcm, fc, 3) == 6;
+
+#endif
+
+
+]],[dnl
+
+#include <boost/version.hpp>
+#if BOOST_VERSION <= 105100
+
+namespace ctx = boost::ctx;
+
+static ctx::fcontext_t fcm, fc;
+
+static void f(intptr_t i) {
+    ctx::jump_fcontext(&fc, &fcm, i * 2);
+}
+
+#elif BOOST_VERSION <= 105500
+
+namespace ctx = boost::context;
+
+// context
+static ctx::fcontext_t fcm, *fc;
+
+// context-function
+static void f(intptr_t i) {
+    ctx::jump_fcontext(fc, &fcm, i * 2);
+}
+
+#else
+
+namespace ctx = boost::context;
+
+// context
+static ctx::fcontext_t fcm, fc;
+
+// context-function
+static void f(intptr_t i) {
+    ctx::jump_fcontext(&fc, fcm, i * 2);
+}
+#endif
+])
+LIBS=$boost_context_save_LIBS
+LDFLAGS=$boost_context_save_LDFLAGS
+])# BOOST_CONTEXT
+
+
+# BOOST_CONVERSION()
+# ------------------
+# Look for Boost.Conversion (cast / lexical_cast)
+BOOST_DEFUN([Conversion],
+[BOOST_FIND_HEADER([boost/cast.hpp])
+BOOST_FIND_HEADER([boost/lexical_cast.hpp])
+])# BOOST_CONVERSION
+
+
+# BOOST_COROUTINE([PREFERRED-RT-OPT])
+# -----------------------------------
+# Look for Boost.Coroutine.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.  This library was introduced in Boost
+# 1.53.0
+BOOST_DEFUN([Coroutine],
+[
+boost_coroutine_save_LIBS=$LIBS
+boost_coroutine_save_LDFLAGS=$LDFLAGS
+# Link-time dependency from coroutine to context
+BOOST_CONTEXT([$1])
+# Starting from Boost 1.55 a dependency on Boost.System is added
+if test $boost_major_version -ge 155; then
+  BOOST_SYSTEM([$1])
+fi
+m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)])
+LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS"
+LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS"
+
+# in 1.53 coroutine was a header only library
+if test $boost_major_version -eq 153; then
+  BOOST_FIND_HEADER([boost/coroutine/coroutine.hpp])
+else
+  BOOST_FIND_LIB([coroutine], [$1],
+		  [boost/coroutine/coroutine.hpp],
+		  [
+  #include <boost/version.hpp>
+  #if   BOOST_VERSION <= 105500
+  boost::coroutines::coroutine<int(int)> coro; coro.get();
+  #else
+  boost::coroutines::asymmetric_coroutine<int>::pull_type coro; coro.get();
+  #endif
+  ])
+fi
+# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54
+# coroutine doesn't use context from its headers but from its library.
+if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then
+  BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS"
+  BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS"
+fi
+if test $enable_static_boost = yes && test $boost_major_version -ge 155; then
+  BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS"
+  BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+fi
+LIBS=$boost_coroutine_save_LIBS
+LDFLAGS=$boost_coroutine_save_LDFLAGS
+])# BOOST_COROUTINE
+
+
+# BOOST_CRC()
+# -----------
+# Look for Boost.CRC
+BOOST_DEFUN([CRC],
+[BOOST_FIND_HEADER([boost/crc.hpp])
+])# BOOST_CRC
+
+
+# BOOST_DATE_TIME([PREFERRED-RT-OPT])
+# -----------------------------------
+# Look for Boost.Date_Time.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Date_Time],
+[BOOST_FIND_LIB([date_time], [$1],
+                [boost/date_time/posix_time/posix_time.hpp],
+                [boost::posix_time::ptime t;])
+])# BOOST_DATE_TIME
+
+
+# BOOST_FILESYSTEM([PREFERRED-RT-OPT])
+# ------------------------------------
+# Look for Boost.Filesystem.  For the documentation of PREFERRED-RT-OPT, see
+# the documentation of BOOST_FIND_LIB above.
+# Do not check for boost/filesystem.hpp because this file was introduced in
+# 1.34.
+BOOST_DEFUN([Filesystem],
+[# Do we have to check for Boost.System?  This link-time dependency was
+# added as of 1.35.0.  If we have a version <1.35, we must not attempt to
+# find Boost.System as it didn't exist by then.
+if test $boost_major_version -ge 135; then
+  BOOST_SYSTEM([$1])
+fi # end of the Boost.System check.
+boost_filesystem_save_LIBS=$LIBS
+boost_filesystem_save_LDFLAGS=$LDFLAGS
+m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
+LIBS="$LIBS $BOOST_SYSTEM_LIBS"
+LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+BOOST_FIND_LIB([filesystem], [$1],
+                [boost/filesystem/path.hpp], [boost::filesystem::path p;])
+if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
+  BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
+fi
+LIBS=$boost_filesystem_save_LIBS
+LDFLAGS=$boost_filesystem_save_LDFLAGS
+])# BOOST_FILESYSTEM
+
+
+# BOOST_FLYWEIGHT()
+# -----------------
+# Look for Boost.Flyweight.
+BOOST_DEFUN([Flyweight],
+[dnl There's a hidden dependency on pthreads.
+AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
+BOOST_FIND_HEADER([boost/flyweight.hpp])
+AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag])
+])
+
+
+# BOOST_FOREACH()
+# ---------------
+# Look for Boost.Foreach.
+BOOST_DEFUN([Foreach],
+[BOOST_FIND_HEADER([boost/foreach.hpp])])
+
+
+# BOOST_FORMAT()
+# --------------
+# Look for Boost.Format.
+# Note: we can't check for boost/format/format_fwd.hpp because the header isn't
+# standalone.  It can't be compiled because it triggers the following error:
+# boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std'
+#                                                  does not name a type
+BOOST_DEFUN([Format],
+[BOOST_FIND_HEADER([boost/format.hpp])])
+
+
+# BOOST_FUNCTION()
+# ----------------
+# Look for Boost.Function
+BOOST_DEFUN([Function],
+[BOOST_FIND_HEADER([boost/function.hpp])])
+
+
+# BOOST_GEOMETRY()
+# ----------------
+# Look for Boost.Geometry (new since 1.47.0).
+BOOST_DEFUN([Geometry],
+[BOOST_FIND_HEADER([boost/geometry.hpp])
+])# BOOST_GEOMETRY
+
+
+# BOOST_GRAPH([PREFERRED-RT-OPT])
+# -------------------------------
+# Look for Boost.Graphs.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Graph],
+[boost_graph_save_LIBS=$LIBS
+boost_graph_save_LDFLAGS=$LDFLAGS
+# Link-time dependency from graph to regex was added as of 1.40.0.
+if test $boost_major_version -ge 140; then
+  BOOST_REGEX([$1])
+  m4_pattern_allow([^BOOST_REGEX_(LIBS|LDFLAGS)$])dnl
+  LIBS="$LIBS $BOOST_REGEX_LIBS"
+  LDFLAGS="$LDFLAGS $BOOST_REGEX_LDFLAGS"
+fi
+BOOST_FIND_LIB([graph], [$1],
+                [boost/graph/adjacency_list.hpp], [boost::adjacency_list<> g;])
+LIBS=$boost_graph_save_LIBS
+LDFLAGS=$boost_graph_save_LDFLAGS
+])# BOOST_GRAPH
+
+
+# BOOST_IOSTREAMS([PREFERRED-RT-OPT])
+# -----------------------------------
+# Look for Boost.IOStreams.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([IOStreams],
+[BOOST_FIND_LIB([iostreams], [$1],
+                [boost/iostreams/device/file_descriptor.hpp],
+                [boost::iostreams::file_descriptor fd; fd.close();])
+])# BOOST_IOSTREAMS
+
+
+# BOOST_HASH()
+# ------------
+# Look for Boost.Functional/Hash
+BOOST_DEFUN([Hash],
+[BOOST_FIND_HEADER([boost/functional/hash.hpp])])
+
+
+# BOOST_LAMBDA()
+# --------------
+# Look for Boost.Lambda
+BOOST_DEFUN([Lambda],
+[BOOST_FIND_HEADER([boost/lambda/lambda.hpp])])
+
+
+# BOOST_LOCALE()
+# --------------
+# Look for Boost.Locale
+BOOST_DEFUN([Locale],
+[
+boost_locale_save_LIBS=$LIBS
+boost_locale_save_LDFLAGS=$LDFLAGS
+# require SYSTEM for boost-1.50.0 and up
+if test $boost_major_version -ge 150; then
+  BOOST_SYSTEM([$1])
+  m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
+  LIBS="$LIBS $BOOST_SYSTEM_LIBS"
+  LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+fi # end of the Boost.System check.
+BOOST_FIND_LIB([locale], [$1],
+    [boost/locale.hpp],
+    [[boost::locale::generator gen; std::locale::global(gen(""));]])
+LIBS=$boost_locale_save_LIBS
+LDFLAGS=$boost_locale_save_LDFLAGS
+])# BOOST_LOCALE
+
+# BOOST_LOG([PREFERRED-RT-OPT])
+# -----------------------------
+# Look for Boost.Log.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Log],
+[boost_log_save_LIBS=$LIBS
+boost_log_save_LDFLAGS=$LDFLAGS
+BOOST_SYSTEM([$1])
+BOOST_FILESYSTEM([$1])
+BOOST_DATE_TIME([$1])
+m4_pattern_allow([^BOOST_(SYSTEM|FILESYSTEM|DATE_TIME)_(LIBS|LDFLAGS)$])dnl
+LIBS="$LIBS $BOOST_DATE_TIME_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
+LDFLAGS="$LDFLAGS $BOOST_DATE_TIME_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+BOOST_FIND_LIB([log], [$1],
+    [boost/log/core/core.hpp],
+    [boost::log::attribute a; a.get_value();])
+LIBS=$boost_log_save_LIBS
+LDFLAGS=$boost_log_save_LDFLAGS
+])# BOOST_LOG
+
+
+# BOOST_LOG_SETUP([PREFERRED-RT-OPT])
+# -----------------------------------
+# Look for Boost.Log.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Log_Setup],
+[boost_log_setup_save_LIBS=$LIBS
+boost_log_setup_save_LDFLAGS=$LDFLAGS
+BOOST_LOG([$1])
+m4_pattern_allow([^BOOST_LOG_(LIBS|LDFLAGS)$])dnl
+LIBS="$LIBS $BOOST_LOG_LIBS"
+LDFLAGS="$LDFLAGS $BOOST_LOG_LDFLAGS"
+BOOST_FIND_LIB([log_setup], [$1],
+    [boost/log/utility/setup/from_settings.hpp],
+    [boost::log::basic_settings<char> bs; bs.empty();])
+LIBS=$boost_log_setup_save_LIBS
+LDFLAGS=$boost_log_setup_save_LDFLAGS
+])# BOOST_LOG_SETUP
+
+
+# BOOST_MATH()
+# ------------
+# Look for Boost.Math
+# TODO: This library isn't header-only but it comes in multiple different
+# flavors that don't play well with BOOST_FIND_LIB (e.g, libboost_math_c99,
+# libboost_math_c99f, libboost_math_c99l, libboost_math_tr1,
+# libboost_math_tr1f, libboost_math_tr1l).  This macro must be fixed to do the
+# right thing anyway.
+BOOST_DEFUN([Math],
+[BOOST_FIND_HEADER([boost/math/special_functions.hpp])])
+
+
+# BOOST_MPI([PREFERRED-RT-OPT])
+# -------------------------------
+# Look for Boost MPI.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.  Uses MPICXX variable if it is
+# set, otherwise tries CXX
+#
+BOOST_DEFUN([MPI],
+[boost_save_CXX=${CXX}
+boost_save_CXXCPP=${CXXCPP}
+if test x"${MPICXX}" != x; then
+  CXX=${MPICXX}
+  CXXCPP="${MPICXX} -E"
+fi
+BOOST_FIND_LIB([mpi], [$1],
+               [boost/mpi.hpp],
+               [int argc = 0;
+                char **argv = 0;
+                boost::mpi::environment env(argc,argv);])
+CXX=${boost_save_CXX}
+CXXCPP=${boost_save_CXXCPP}
+])# BOOST_MPI
+
+
+# BOOST_MULTIARRAY()
+# ------------------
+# Look for Boost.MultiArray
+BOOST_DEFUN([MultiArray],
+[BOOST_FIND_HEADER([boost/multi_array.hpp])])
+
+
+# BOOST_NUMERIC_UBLAS()
+# --------------------------
+# Look for Boost.NumericUblas (Basic Linear Algebra)
+BOOST_DEFUN([Numeric_Ublas],
+[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp])
+])# BOOST_NUMERIC_UBLAS
+
+
+# BOOST_NUMERIC_CONVERSION()
+# --------------------------
+# Look for Boost.NumericConversion (policy-based numeric conversion)
+BOOST_DEFUN([Numeric_Conversion],
+[BOOST_FIND_HEADER([boost/numeric/conversion/converter.hpp])
+])# BOOST_NUMERIC_CONVERSION
+
+
+# BOOST_OPTIONAL()
+# ----------------
+# Look for Boost.Optional
+BOOST_DEFUN([Optional],
+[BOOST_FIND_HEADER([boost/optional.hpp])])
+
+
+# BOOST_PREPROCESSOR()
+# --------------------
+# Look for Boost.Preprocessor
+BOOST_DEFUN([Preprocessor],
+[BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])])
+
+
+# BOOST_RANGE()
+# --------------------
+# Look for Boost.Range
+BOOST_DEFUN([Range],
+[BOOST_FIND_HEADER([boost/range/adaptors.hpp])])
+
+# BOOST_UNORDERED()
+# -----------------
+# Look for Boost.Unordered
+BOOST_DEFUN([Unordered],
+[BOOST_FIND_HEADER([boost/unordered_map.hpp])])
+
+
+# BOOST_UUID()
+# ------------
+# Look for Boost.Uuid
+BOOST_DEFUN([Uuid],
+[BOOST_FIND_HEADER([boost/uuid/uuid.hpp])])
+
+
+# BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT])
+# -----------------------------------------
+# Look for Boost.Program_options.  For the documentation of PREFERRED-RT-OPT,
+# see the documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Program_Options],
+[BOOST_FIND_LIB([program_options], [$1],
+                [boost/program_options.hpp],
+                [boost::program_options::options_description d("test");])
+])# BOOST_PROGRAM_OPTIONS
+
+
+
+# _BOOST_PYTHON_CONFIG(VARIABLE, FLAG)
+# ------------------------------------
+# Save VARIABLE, and define it via `python-config --FLAG`.
+# Substitute BOOST_PYTHON_VARIABLE.
+m4_define([_BOOST_PYTHON_CONFIG],
+[AC_SUBST([BOOST_PYTHON_$1],
+          [`python-config --$2 2>/dev/null`])dnl
+boost_python_save_$1=$$1
+$1="$$1 $BOOST_PYTHON_$1"])
+
+
+# BOOST_PYTHON([PREFERRED-RT-OPT])
+# --------------------------------
+# Look for Boost.Python.  For the documentation of PREFERRED-RT-OPT,
+# see the documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Python],
+[_BOOST_PYTHON_CONFIG([CPPFLAGS], [includes])
+_BOOST_PYTHON_CONFIG([LDFLAGS],   [ldflags])
+_BOOST_PYTHON_CONFIG([LIBS],      [libs])
+m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl
+BOOST_FIND_LIBS([python], [python python3], [$1],
+                [boost/python.hpp],
+                [], [BOOST_PYTHON_MODULE(empty) {}])
+CPPFLAGS=$boost_python_save_CPPFLAGS
+LDFLAGS=$boost_python_save_LDFLAGS
+LIBS=$boost_python_save_LIBS
+])# BOOST_PYTHON
+
+
+# BOOST_REF()
+# -----------
+# Look for Boost.Ref
+BOOST_DEFUN([Ref],
+[BOOST_FIND_HEADER([boost/ref.hpp])])
+
+
+# BOOST_REGEX([PREFERRED-RT-OPT])
+# -------------------------------
+# Look for Boost.Regex.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Regex],
+[BOOST_FIND_LIB([regex], [$1],
+                [boost/regex.hpp],
+                [boost::regex exp("*"); boost::regex_match("foo", exp);])
+])# BOOST_REGEX
+
+
+# BOOST_SERIALIZATION([PREFERRED-RT-OPT])
+# ---------------------------------------
+# Look for Boost.Serialization.  For the documentation of PREFERRED-RT-OPT, see
+# the documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Serialization],
+[BOOST_FIND_LIB([serialization], [$1],
+                [boost/archive/text_oarchive.hpp],
+                [std::ostream* o = 0; // Cheap way to get an ostream...
+                boost::archive::text_oarchive t(*o);])
+])# BOOST_SERIALIZATION
+
+
+# BOOST_SIGNALS([PREFERRED-RT-OPT])
+# ---------------------------------
+# Look for Boost.Signals.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Signals],
+[BOOST_FIND_LIB([signals], [$1],
+                [boost/signal.hpp],
+                [boost::signal<void ()> s;])
+])# BOOST_SIGNALS
+
+
+# BOOST_SIGNALS2()
+# ----------------
+# Look for Boost.Signals2 (new since 1.39.0).
+BOOST_DEFUN([Signals2],
+[BOOST_FIND_HEADER([boost/signals2.hpp])
+])# BOOST_SIGNALS2
+
+
+# BOOST_SMART_PTR()
+# -----------------
+# Look for Boost.SmartPtr
+BOOST_DEFUN([Smart_Ptr],
+[BOOST_FIND_HEADER([boost/scoped_ptr.hpp])
+BOOST_FIND_HEADER([boost/shared_ptr.hpp])
+])
+
+
+# BOOST_STATICASSERT()
+# --------------------
+# Look for Boost.StaticAssert
+BOOST_DEFUN([StaticAssert],
+[BOOST_FIND_HEADER([boost/static_assert.hpp])])
+
+
+# BOOST_STRING_ALGO()
+# -------------------
+# Look for Boost.StringAlgo
+BOOST_DEFUN([String_Algo],
+[BOOST_FIND_HEADER([boost/algorithm/string.hpp])
+])
+
+
+# BOOST_SYSTEM([PREFERRED-RT-OPT])
+# --------------------------------
+# Look for Boost.System.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.  This library was introduced in Boost
+# 1.35.0.
+BOOST_DEFUN([System],
+[BOOST_FIND_LIB([system], [$1],
+                [boost/system/error_code.hpp],
+                [boost::system::error_code e; e.clear();])
+])# BOOST_SYSTEM
+
+
+# BOOST_TEST([PREFERRED-RT-OPT])
+# ------------------------------
+# Look for Boost.Test.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Test],
+[m4_pattern_allow([^BOOST_CHECK$])dnl
+BOOST_FIND_LIB([unit_test_framework], [$1],
+               [boost/test/unit_test.hpp], [BOOST_CHECK(2 == 2);],
+               [using boost::unit_test::test_suite;
+               test_suite* init_unit_test_suite(int argc, char ** argv)
+               { return NULL; }])
+])# BOOST_TEST
+
+
+# BOOST_THREAD([PREFERRED-RT-OPT])
+# ---------------------------------
+# Look for Boost.Thread.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Thread],
+[dnl Having the pthread flag is required at least on GCC3 where
+dnl boost/thread.hpp would complain if we try to compile without
+dnl -pthread on GNU/Linux.
+AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
+boost_thread_save_LIBS=$LIBS
+boost_thread_save_LDFLAGS=$LDFLAGS
+boost_thread_save_CPPFLAGS=$CPPFLAGS
+# Link-time dependency from thread to system was added as of 1.49.0.
+if test $boost_major_version -ge 149; then
+BOOST_SYSTEM([$1])
+fi # end of the Boost.System check.
+m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
+LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
+LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag"
+
+# When compiling for the Windows platform, the threads library is named
+# differently.  This suffix doesn't exist in new versions of Boost, or
+# possibly new versions of GCC on mingw I am assuming it's Boost's change for
+# now and I am setting version to 1.48, for lack of knowledge as to when this
+# change occurred.
+if test $boost_major_version -lt 148; then
+  case $host_os in
+    (*mingw*) boost_thread_lib_ext=_win32;;
+  esac
+fi
+BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext],
+                [$1],
+                [boost/thread.hpp], [boost::thread t; boost::mutex m;])
+
+case $host_os in
+  (*mingw*) boost_thread_w32_socket_link=-lws2_32;;
+esac
+
+BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag $boost_thread_w32_socket_link"
+BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS"
+BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag"
+LIBS=$boost_thread_save_LIBS
+LDFLAGS=$boost_thread_save_LDFLAGS
+CPPFLAGS=$boost_thread_save_CPPFLAGS
+])# BOOST_THREAD
+
+AU_ALIAS([BOOST_THREADS], [BOOST_THREAD])
+
+
+# BOOST_TOKENIZER()
+# -----------------
+# Look for Boost.Tokenizer
+BOOST_DEFUN([Tokenizer],
+[BOOST_FIND_HEADER([boost/tokenizer.hpp])])
+
+
+# BOOST_TRIBOOL()
+# ---------------
+# Look for Boost.Tribool
+BOOST_DEFUN([Tribool],
+[BOOST_FIND_HEADER([boost/logic/tribool_fwd.hpp])
+BOOST_FIND_HEADER([boost/logic/tribool.hpp])
+])
+
+
+# BOOST_TUPLE()
+# -------------
+# Look for Boost.Tuple
+BOOST_DEFUN([Tuple],
+[BOOST_FIND_HEADER([boost/tuple/tuple.hpp])])
+
+
+# BOOST_TYPETRAITS()
+# --------------------
+# Look for Boost.TypeTraits
+BOOST_DEFUN([TypeTraits],
+[BOOST_FIND_HEADER([boost/type_traits.hpp])])
+
+
+# BOOST_UTILITY()
+# ---------------
+# Look for Boost.Utility (noncopyable, result_of, base-from-member idiom,
+# etc.)
+BOOST_DEFUN([Utility],
+[BOOST_FIND_HEADER([boost/utility.hpp])])
+
+
+# BOOST_VARIANT()
+# ---------------
+# Look for Boost.Variant.
+BOOST_DEFUN([Variant],
+[BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp])
+BOOST_FIND_HEADER([boost/variant.hpp])])
+
+
+# BOOST_POINTER_CONTAINER()
+# ------------------------
+# Look for Boost.PointerContainer
+BOOST_DEFUN([Pointer_Container],
+[BOOST_FIND_HEADER([boost/ptr_container/ptr_deque.hpp])
+BOOST_FIND_HEADER([boost/ptr_container/ptr_list.hpp])
+BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp])
+BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp])
+BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp])
+BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp])
+])# BOOST_POINTER_CONTAINER
+
+
+# BOOST_WAVE([PREFERRED-RT-OPT])
+# ------------------------------
+# NOTE: If you intend to use Wave/Spirit with thread support, make sure you
+# call BOOST_THREAD first.
+# Look for Boost.Wave.  For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Wave],
+[AC_REQUIRE([BOOST_FILESYSTEM])dnl
+AC_REQUIRE([BOOST_DATE_TIME])dnl
+boost_wave_save_LIBS=$LIBS
+boost_wave_save_LDFLAGS=$LDFLAGS
+m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl
+LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS \
+$BOOST_THREAD_LIBS"
+LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS \
+$BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS"
+BOOST_FIND_LIB([wave], [$1],
+                [boost/wave.hpp],
+                [boost::wave::token_id id; get_token_name(id);])
+LIBS=$boost_wave_save_LIBS
+LDFLAGS=$boost_wave_save_LDFLAGS
+])# BOOST_WAVE
+
+
+# BOOST_XPRESSIVE()
+# -----------------
+# Look for Boost.Xpressive (new since 1.36.0).
+BOOST_DEFUN([Xpressive],
+[BOOST_FIND_HEADER([boost/xpressive/xpressive.hpp])])
+
+
+# ----------------- #
+# Internal helpers. #
+# ----------------- #
+
+
+# _BOOST_PTHREAD_FLAG()
+# ---------------------
+# Internal helper for BOOST_THREAD.  Computes boost_cv_pthread_flag
+# which must be used in CPPFLAGS and LIBS.
+#
+# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
+# boost/thread.hpp will trigger a #error if -pthread isn't used:
+#   boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
+#   is not turned on. Please set the correct command line options for
+#   threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
+#
+# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html
+AC_DEFUN([_BOOST_PTHREAD_FLAG],
+[AC_REQUIRE([AC_PROG_CXX])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_LANG_PUSH([C++])dnl
+AC_CACHE_CHECK([for the flags needed to use pthreads], [boost_cv_pthread_flag],
+[ boost_cv_pthread_flag=
+  # The ordering *is* (sometimes) important.  Some notes on the
+  # individual items follow:
+  # (none): in case threads are in libc; should be tried before -Kthread and
+  #       other compiler flags to prevent continual compiler warnings
+  # -lpthreads: AIX (must check this before -lpthread)
+  # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+  # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+  # -llthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+  # -pthread: GNU Linux/GCC (kernel threads), BSD/GCC (userland threads)
+  # -pthreads: Solaris/GCC
+  # -mthreads: MinGW32/GCC, Lynx/GCC
+  # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+  #      doesn't hurt to check since this sometimes defines pthreads too;
+  #      also defines -D_REENTRANT)
+  #      ... -mt is also the pthreads flag for HP/aCC
+  # -lpthread: GNU Linux, etc.
+  # --thread-safe: KAI C++
+  case $host_os in #(
+    *solaris*)
+      # On Solaris (at least, for some versions), libc contains stubbed
+      # (non-functional) versions of the pthreads routines, so link-based
+      # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+      # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+      # a function called by this macro, so we could check for that, but
+      # who knows whether they'll stub that too in a future libc.)  So,
+      # we'll just look for -pthreads and -lpthread first:
+      boost_pthread_flags="-pthreads -lpthread -mt -pthread";; #(
+    *)
+      boost_pthread_flags="-lpthreads -Kthread -kthread -llthread -pthread \
+                           -pthreads -mthreads -lpthread --thread-safe -mt";;
+  esac
+  # Generate the test file.
+  AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <pthread.h>],
+    [pthread_t th; pthread_join(th, 0);
+    pthread_attr_init(0); pthread_cleanup_push(0, 0);
+    pthread_create(0,0,0,0); pthread_cleanup_pop(0);])])
+  for boost_pthread_flag in '' $boost_pthread_flags; do
+    boost_pthread_ok=false
+dnl Re-use the test file already generated.
+    boost_pthreads__save_LIBS=$LIBS
+    LIBS="$LIBS $boost_pthread_flag"
+    AC_LINK_IFELSE([],
+      [if grep ".*$boost_pthread_flag" conftest.err; then
+         echo "This flag seems to have triggered warnings" >&AS_MESSAGE_LOG_FD
+       else
+         boost_pthread_ok=:; boost_cv_pthread_flag=$boost_pthread_flag
+       fi])
+    LIBS=$boost_pthreads__save_LIBS
+    $boost_pthread_ok && break
+  done
+])
+AC_LANG_POP([C++])dnl
+])# _BOOST_PTHREAD_FLAG
+
+
+# _BOOST_gcc_test(MAJOR, MINOR)
+# -----------------------------
+# Internal helper for _BOOST_FIND_COMPILER_TAG.
+m4_define([_BOOST_gcc_test],
+["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl
+
+# _BOOST_mingw_test(MAJOR, MINOR)
+# -----------------------------
+# Internal helper for _BOOST_FIND_COMPILER_TAG.
+m4_define([_BOOST_mingw_test],
+["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \
+  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl
+
+
+# _BOOST_FIND_COMPILER_TAG()
+# --------------------------
+# Internal.  When Boost is installed without --layout=system, each library
+# filename will hold a suffix that encodes the compiler used during the
+# build.  The Boost build system seems to call this a `tag'.
+AC_DEFUN([_BOOST_FIND_COMPILER_TAG],
+[AC_REQUIRE([AC_PROG_CXX])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_CACHE_CHECK([for the toolset name used by Boost for $CXX],
+               [boost_cv_lib_tag],
+[boost_cv_lib_tag=unknown
+if test x$boost_cv_inc_path != xno; then
+  AC_LANG_PUSH([C++])dnl
+  # The following tests are mostly inspired by boost/config/auto_link.hpp
+  # The list is sorted to most recent/common to oldest compiler (in order
+  # to increase the likelihood of finding the right compiler with the
+  # least number of compilation attempt).
+  # Beware that some tests are sensible to the order (for instance, we must
+  # look for MinGW before looking for GCC3).
+  # I used one compilation test per compiler with a #error to recognize
+  # each compiler so that it works even when cross-compiling (let me know
+  # if you know a better approach).
+  # Known missing tags (known from Boost's tools/build/v2/tools/common.jam):
+  #   como, edg, kcc, bck, mp, sw, tru, xlc
+  # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
+  # the same defines as GCC's).
+  for i in \
+    _BOOST_mingw_test(5, 3) \
+    _BOOST_gcc_test(5, 3) \
+    _BOOST_mingw_test(5, 2) \
+    _BOOST_gcc_test(5, 2) \
+    _BOOST_mingw_test(5, 1) \
+    _BOOST_gcc_test(5, 1) \
+    _BOOST_mingw_test(5, 0) \
+    _BOOST_gcc_test(5, 0) \
+    _BOOST_mingw_test(4, 10) \
+    _BOOST_gcc_test(4, 10) \
+    _BOOST_mingw_test(4, 9) \
+    _BOOST_gcc_test(4, 9) \
+    _BOOST_mingw_test(4, 8) \
+    _BOOST_gcc_test(4, 8) \
+    _BOOST_mingw_test(4, 7) \
+    _BOOST_gcc_test(4, 7) \
+    _BOOST_mingw_test(4, 6) \
+    _BOOST_gcc_test(4, 6) \
+    _BOOST_mingw_test(4, 5) \
+    _BOOST_gcc_test(4, 5) \
+    _BOOST_mingw_test(4, 4) \
+    _BOOST_gcc_test(4, 4) \
+    _BOOST_mingw_test(4, 3) \
+    _BOOST_gcc_test(4, 3) \
+    _BOOST_mingw_test(4, 2) \
+    _BOOST_gcc_test(4, 2) \
+    _BOOST_mingw_test(4, 1) \
+    _BOOST_gcc_test(4, 1) \
+    _BOOST_mingw_test(4, 0) \
+    _BOOST_gcc_test(4, 0) \
+    "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
+     && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \
+    _BOOST_gcc_test(3, 4) \
+    _BOOST_gcc_test(3, 3) \
+    "defined _MSC_VER && _MSC_VER >= 1500 @ vc90" \
+    "defined _MSC_VER && _MSC_VER == 1400 @ vc80" \
+    _BOOST_gcc_test(3, 2) \
+    "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \
+    _BOOST_gcc_test(3, 1) \
+    _BOOST_gcc_test(3, 0) \
+    "defined __BORLANDC__ @ bcb" \
+    "defined __ICC && (defined __unix || defined __unix__) @ il" \
+    "defined __ICL @ iw" \
+    "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \
+    _BOOST_gcc_test(2, 95) \
+    "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \
+    "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \
+    "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \
+    "defined __MWERKS__ && __MWERKS__ <= 0x31FF @ cw8"
+  do
+    boost_tag_test=`expr "X$i" : 'X\([[^@]]*\) @ '`
+    boost_tag=`expr "X$i" : 'X[[^@]]* @ \(.*\)'`
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#if $boost_tag_test
+/* OK */
+#else
+# error $boost_tag_test
+#endif
+]])], [boost_cv_lib_tag=$boost_tag; break], [])
+  done
+AC_LANG_POP([C++])dnl
+  case $boost_cv_lib_tag in #(
+    # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed
+    # to "gcc41" for instance.
+    *-gcc | *'-gcc ') :;; #(  Don't re-add -gcc: it's already in there.
+    gcc*)
+      boost_tag_x=
+      case $host_os in #(
+        darwin*)
+          if test $boost_major_version -ge 136; then
+            # The `x' added in r46793 of Boost.
+            boost_tag_x=x
+          fi;;
+      esac
+      # We can specify multiple tags in this variable because it's used by
+      # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ...
+      boost_cv_lib_tag="$boost_tag_x$boost_cv_lib_tag -${boost_tag_x}gcc"
+      ;; #(
+    unknown)
+      AC_MSG_WARN([[could not figure out which toolset name to use for $CXX]])
+      boost_cv_lib_tag=
+      ;;
+  esac
+fi])dnl end of AC_CACHE_CHECK
+])# _BOOST_FIND_COMPILER_TAG
+
+
+# _BOOST_GUESS_WHETHER_TO_USE_MT()
+# --------------------------------
+# Compile a small test to try to guess whether we should favor MT (Multi
+# Thread) flavors of Boost.  Sets boost_guess_use_mt accordingly.
+AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT],
+[# Check whether we do better use `mt' even though we weren't ask to.
+AC_LANG_PUSH([C++])dnl
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#if defined _REENTRANT || defined _MT || defined __MT__
+/* use -mt */
+#else
+# error MT not needed
+#endif
+]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false])
+AC_LANG_POP([C++])dnl
+])
+
+# _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# -------------------------------------------------------------------
+# Fork of _AC_LINK_IFELSE that preserves conftest.o across calls.  Fragile,
+# will break when Autoconf changes its internals.  Requires that you manually
+# rm -f conftest.$ac_objext in between to really different tests, otherwise
+# you will try to link a conftest.o left behind by a previous test.
+# Used to aggressively optimize BOOST_FIND_LIB (see the big comment in this
+# macro).
+#
+# Don't use "break" in the actions, as it would short-circuit some code
+# this macro runs after the actions.
+m4_define([_BOOST_AC_LINK_IFELSE],
+[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
+rm -f conftest$ac_exeext
+boost_save_ac_ext=$ac_ext
+boost_use_source=:
+# If we already have a .o, re-use it.  We change $ac_ext so that $ac_link
+# tries to link the existing object file instead of compiling from source.
+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+  _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
+AS_IF([_AC_DO_STDERR($ac_link) && {
+         test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+         test "$cross_compiling" = yes ||
+         $as_executable_p conftest$ac_exeext
+dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough.
+       }],
+      [$2],
+      [if $boost_use_source; then
+         _AC_MSG_LOG_CONFTEST
+       fi
+       $3])
+ac_objext=$boost_save_ac_objext
+ac_ext=$boost_save_ac_ext
+dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization)
+dnl information created by the PGI compiler (conftest_ipa8_conftest.oo),
+dnl as it would interfere with the next link command.
+rm -f core conftest.err conftest_ipa8_conftest.oo \
+      conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl
+])# _BOOST_AC_LINK_IFELSE
+
+# Local Variables:
+# mode: autoconf
+# End:
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 100644
index 0000000..a644432
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1,8372 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 58 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]][[,.]]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    m4_if([$1], [CXX],
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test yes = "$GCC"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report what library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 100644
index 0000000..94b0829
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 8 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 100644
index 0000000..48bc934
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 100644
index 0000000..fa04b52
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.6'
+macro_revision='2.4.6'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 100644
index 0000000..c6b26f8
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/missing b/missing
new file mode 100755
index 0000000..f62bbae
--- /dev/null
+++ b/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2013-10-28.13; # UTC
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/public/Makefile.am b/public/Makefile.am
new file mode 100644
index 0000000..bb4f0aa
--- /dev/null
+++ b/public/Makefile.am
@@ -0,0 +1,38 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+DIST_SUBDIRS = include
\ No newline at end of file
diff --git a/public/Makefile.in b/public/Makefile.in
new file mode 100644
index 0000000..5f0faeb
--- /dev/null
+++ b/public/Makefile.in
@@ -0,0 +1,678 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = public
+SUBDIRS =
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DIST_SUBDIRS = include
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign public/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign public/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/public/include/Makefile.am b/public/include/Makefile.am
new file mode 100644
index 0000000..866c7f9
--- /dev/null
+++ b/public/include/Makefile.am
@@ -0,0 +1,50 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+DIST_SUBDIRS = client-glue
+
+xmpdir = $(includedir)/@EXEMPI_INCLUDE_BASE@
+xmp_HEADERS =
+
+noinst_HEADERS = TXMPFiles.hpp  TXMPIterator.hpp \
+	TXMPMeta.hpp  TXMPUtils.hpp \
+	XMP.hpp  XMP_Version.h\
+	XMP.incl_cpp\
+	XMP_Const.h XMP_Environment.h \
+	XMP_IO.hpp \
+	XMP_UnixEndian.h \
+	$(NULL)
diff --git a/public/include/Makefile.in b/public/include/Makefile.in
new file mode 100644
index 0000000..21dc9ed
--- /dev/null
+++ b/public/include/Makefile.in
@@ -0,0 +1,745 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = public/include
+SUBDIRS =
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) $(xmp_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(xmpdir)"
+HEADERS = $(noinst_HEADERS) $(xmp_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DIST_SUBDIRS = client-glue
+xmpdir = $(includedir)/@EXEMPI_INCLUDE_BASE@
+xmp_HEADERS = 
+noinst_HEADERS = TXMPFiles.hpp  TXMPIterator.hpp \
+	TXMPMeta.hpp  TXMPUtils.hpp \
+	XMP.hpp  XMP_Version.h\
+	XMP.incl_cpp\
+	XMP_Const.h XMP_Environment.h \
+	XMP_IO.hpp \
+	XMP_UnixEndian.h \
+	$(NULL)
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign public/include/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign public/include/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-xmpHEADERS: $(xmp_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(xmp_HEADERS)'; test -n "$(xmpdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(xmpdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(xmpdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(xmpdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(xmpdir)" || exit $$?; \
+	done
+
+uninstall-xmpHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xmp_HEADERS)'; test -n "$(xmpdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(xmpdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(xmpdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-xmpHEADERS
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-xmpHEADERS
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-xmpHEADERS installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-xmpHEADERS
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/public/include/TXMPFiles.hpp b/public/include/TXMPFiles.hpp
new file mode 100644
index 0000000..27ee413
--- /dev/null
+++ b/public/include/TXMPFiles.hpp
@@ -0,0 +1,855 @@
+#ifndef __TXMPFiles_hpp__
+#define __TXMPFiles_hpp__    1
+
+#if ( ! __XMP_hpp__ )
+    #error "Do not directly include, use XMP.hpp"
+#endif
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+// =================================================================================================
+/// \file TXMPFiles.hpp
+/// \brief API for access to the main (document-level) metadata in a file_.
+///
+/// The Adobe XMP Toolkit's file handling component, XMPFiles, is a front end to a set of
+/// format-specific file handlers that support file I/O for XMP. The file handlers implement smart,
+/// efficient support for those file formats for which the means to embed XMP is defined in the XMP
+/// Specification. Where possible, this support allows:
+///   \li Injection    of XMP where none currently exists
+///   \li Expansion of XMP without regard to existing padding
+///   \li Reconciliation of the XMP and other legacy forms of metadata.
+///
+/// \c TXMPFiles is designed for use by clients interested in the metadata and not in the primary
+/// file content; the Adobe Bridge application is a typical example. \c TXMPFiles is not intended to
+/// be appropriate for files authored by an application; that is, those files for which the
+/// application has explicit knowledge of the file format.
+// =================================================================================================
+
+
+// =================================================================================================
+/// \class TXMPFiles TXMPFiles.hpp
+/// \brief API for access to the main (document-level) metadata in a file.
+///
+/// \c TXMPFiles is a template class that provides the API for the Adobe XMP Toolkit's XMPFiles
+/// component. This provides convenient access to the main, or document level, XMP for a file. Use
+/// it to obtain metadata from a file, which you can then manipulate with the XMP Core component
+/// (the classes \c TXMPMeta, \c TXMPUtils, and \c TXMPIterator); and to write new or changed
+/// metadata back out to a file.
+///
+/// The functions allow you to open a file, read and write the metadata, then close the file.
+/// While open, portions of the file might be maintained in RAM data structures. Memory
+/// usage can vary considerably depending onfile format and access options.
+///
+/// A file can be opened for read-only or read-write access, with typical exclusion for both
+/// modes. Errors result in the throw of an \c XMPError exception.
+///
+/// \c TXMPFiles is the template class. It must be instantiated with a string class such as
+/// \c std::string. Read the Toolkit Overview for information about the overall architecture of the XMP
+/// API, and the documentation for \c XMP.hpp for specific instantiation instructions.
+///
+/// Access these functions through the concrete class, \c SXMPFiles.
+// =================================================================================================
+
+
+#if XMP_StaticBuild    // ! Client XMP_IO objects can only be used in static builds.
+    #include "XMP_IO.hpp"
+#endif
+
+
+template <class tStringObj>
+class TXMPFiles {
+
+public:
+
+    // =============================================================================================
+    /// \name Initialization and termination
+    /// @{
+    ///
+    /// A \c TXMPFiles object must be initialized before use and can be terminated when done.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetVersionInfo() retrieves version information for the XMPFiles component.
+    ///
+    /// Can be called before \c #Initialize(). This function is static; make the call directly from
+    /// the concrete class (\c SXMPFiles).
+    ///
+    /// @param versionInfo [out] A buffer in which to return the version information.
+
+    static void GetVersionInfo ( XMP_VersionInfo * versionInfo );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Initializes the XMPFiles library; must be called before creating an \c SXMPFiles object.
+    ///
+    /// The main action is to activate the available smart file handlers. Must be called before
+    /// using any methods except \c GetVersionInfo().
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPFiles).
+    ///
+    /// @return True on success.
+
+    static bool Initialize();
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Initializes the XMPFiles library; must be called before creating an \c SXMPFiles object.
+    ///
+    /// This overload of TXMPFiles::Initialize() accepts option bits to customize the initialization
+    /// actions. At this time no option is defined.
+    ///
+    /// The main action is to activate the available smart file handlers. Must be called before
+    /// using any methods except \c GetVersionInfo().
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPFiles).
+    ///
+    /// @param options Option flags to control the initialization actions.
+    ///
+    /// @return True on success.
+
+    static bool Initialize ( XMP_OptionBits options );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Initializes the XMPFiles library; must be called before creating an \c SXMPFiles object.
+    ///
+    /// This overload of TXMPFiles::Initialize() accepts plugin directory and name of the plug-ins 
+    /// as a comma separated list to load the file handler plug-ins. If plugins == NULL, then all
+    /// plug-ins present in the plug-in directory will be loaded.
+    ///
+    /// The main action is to activate the available smart file handlers. Must be called before
+    /// using any methods except \c GetVersionInfo().
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPFiles).
+    ///
+    /// @param pluginFolder Pugin directorty to load the file handler plug-ins.
+    /// @param plugins Comma sepearted list of plug-ins which should be loaded from the plug-in directory. 
+    /// If plugin == NULL, then all plug-ins availbale in the plug-in directory will be loaded.
+    ///
+    /// @return True on success.
+
+    static bool Initialize ( const char* pluginFolder, const char* plugins = NULL );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Initializes the XMPFiles library; must be called before creating an \c SXMPFiles object.
+    ///
+    /// This overload of TXMPFiles::Initialize( XMP_OptionBits options ) accepts plugin directory and 
+    /// name of the plug-ins as a comma separated list to load the file handler plug-ins. 
+    /// If plugins == NULL, then all plug-ins present in the plug-in directory will be loaded.
+    ///
+    /// The main action is to activate the available smart file handlers. Must be called before
+    /// using any methods except \c GetVersionInfo().
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPFiles).
+    ///
+    /// @param options Option flags to control the initialization actions.
+    /// @param pluginFolder Pugin directorty to load the file handler plug-ins.
+    /// @param plugins Comma sepearted list of plug-ins which should be loaded from the plug-in directory. 
+    /// If plugin == NULL, then all plug-ins availbale in the plug-in directory will be loaded.
+    ///
+    /// @return True on success.
+
+    static bool Initialize ( XMP_OptionBits options, const char* pluginFolder, const char* plugins = NULL );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Terminates use of the XMPFiles library.
+    ///
+    /// Optional. Deallocates global data structures created by intialization. Its main action is to
+    /// deallocate heap-allocated global storage, for the benefit of client leak checkers.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPFiles).
+
+    static void Terminate();
+
+    /// @}
+
+    // =============================================================================================
+    /// \name Constructors and destructor
+    /// @{
+    ///
+    /// The default constructor initializes an object that is associated with no file. The alternate
+    /// constructors call \c OpenFile().
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Default constructor initializes an object that is associated with no file.
+
+    TXMPFiles();
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Destructor; typical virtual destructor.
+    ///
+    /// The destructor does not call \c CloseFile(); pending updates are lost when the destructor is run.
+    ///
+    /// @see \c OpenFile(), \c CloseFile()
+
+    virtual ~TXMPFiles() throw();
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Alternate constructor associates the new \c XMPFiles object with a specific file.
+    ///
+    /// Calls \c OpenFile() to open the specified file after performing a default construct.
+    ///
+    /// @param filePath    The path for the file, specified as a nul-terminated UTF-8 string.
+    ///
+    /// @param format A format hint for the file, if known.
+    ///
+    /// @param openFlags Options for how the file is to be opened (for read or read/write, for
+    /// example). Use a logical OR of these bit-flag constants:
+    ///
+    ///   \li \c #kXMPFiles_OpenForRead
+    ///   \li \c #kXMPFiles_OpenForUpdate
+    ///   \li \c #kXMPFiles_OpenOnlyXMP
+    ///   \li \c #kXMPFiles_OpenStrictly
+    ///   \li \c #kXMPFiles_OpenUseSmartHandler
+    ///   \li \c #kXMPFiles_OpenUsePacketScanning
+    ///   \li \c #kXMPFiles_OpenLimitedScanning
+    ///
+    /// @return The new \c TXMPFiles object.
+
+    TXMPFiles ( XMP_StringPtr  filePath,
+                XMP_FileFormat format = kXMP_UnknownFile,
+                XMP_OptionBits openFlags = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Alternate constructor associates the new \c XMPFiles object with a specific file,
+    /// using a string object.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object
+    /// for the file path. It is otherwise identical; see details in the canonical form.
+
+    TXMPFiles ( const tStringObj & filePath,
+                XMP_FileFormat     format = kXMP_UnknownFile,
+                XMP_OptionBits     openFlags = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Copy constructor
+    ///
+    /// Increments an internal reference count but does not perform a deep copy.
+    ///
+    /// @param original The existing \c TXMPFiles object to copy.
+    ///
+    /// @return The new \c TXMPFiles object.
+
+    TXMPFiles ( const TXMPFiles<tStringObj> & original );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Assignment operator
+    ///
+    /// Increments an internal reference count but does not perform a deep copy.
+    ///
+    /// @param rhs The existing \c TXMPFiles object.
+
+    void operator= ( const TXMPFiles<tStringObj> & rhs );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Reconstructs a \c TXMPFiles object from an internal reference.
+    ///
+    /// This constructor creates a new \c TXMPFiles object that refers to the underlying reference
+    /// object of an existing \c TXMPFiles object. Use to safely pass \c SXMPFiles references across
+    /// DLL boundaries.
+    ///
+    /// @param xmpFilesObj The underlying reference object, obtained from some other XMP object
+    /// with \c TXMPFiles::GetInternalRef().
+    ///
+    /// @return The new object.
+
+    TXMPFiles ( XMPFilesRef xmpFilesObj );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief GetInternalRef() retrieves an internal reference that can be safely passed across DLL
+    /// boundaries and reconstructed.
+    ///
+    /// Use with the reconstruction constructor to safely pass \c SXMPFiles references across DLL
+    /// boundaries where the clients might have used different string types when instantiating
+    /// \c TXMPFiles.
+    ///
+    /// @return The internal reference.
+    ///
+    /// @see \c TXMPMeta::GetInternalRef() for usage.
+
+    XMPFilesRef GetInternalRef();
+
+    /// @}
+
+    // =============================================================================================
+    /// \name File handler information
+    /// @{
+    ///
+    /// Call this static function from the concrete class, \c SXMPFiles, to obtain information about
+    /// the file handlers for the XMPFiles component.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief  GetFormatInfo() reports what features are supported for a specific file format.
+    ///
+    /// The file handlers for different file formats vary considerably in what features they
+    /// support. Support depends on both the general capabilities of the format and the
+    /// implementation of the handler for that format.
+    ///
+    ///This function is static; make the call directly from the concrete class (\c SXMPFiles).
+    ///
+    /// @param format The file format whose support flags are desired.
+    ///
+    /// @param handlerFlags [out] A buffer in which to return a logical OR of option bit flags.
+    /// The following constants are defined:
+    ///
+    ///   \li \c #kXMPFiles_CanInjectXMP - Can inject first-time XMP into an existing file.
+    ///   \li \c #kXMPFiles_CanExpand - Can expand XMP or other metadata in an existing file.
+    ///   \li \c #kXMPFiles_CanRewrite - Can copy one file to another, writing new metadata (as in SaveAs)
+    ///   \li \c #kXMPFiles_CanReconcile - Supports reconciliation between XMP and other forms.
+    ///   \li \c #kXMPFiles_AllowsOnlyXMP - Allows access to just the XMP, ignoring other forms.
+    ///   This is only meaningful if \c #kXMPFiles_CanReconcile is set.
+    ///   \li \c #kXMPFiles_ReturnsRawPacket - File handler returns raw XMP packet information and string.
+    ///
+    /// Even if \c #kXMPFiles_ReturnsRawPacket is set, the returned packet information might have an
+    /// offset of -1 to indicate an unknown offset. While all file handlers should be able to return
+    /// the raw packet, some might not know the offset of the packet within the file. This is
+    /// typical in cases where external libraries are used. These cases might not even allow return
+    /// of the raw packet.
+    ///
+    /// @return True if the format has explicit "smart" support, false if the format is handled by
+    /// the default packet scanning plus heuristics. */
+
+
+    static bool GetFormatInfo ( XMP_FileFormat   format,
+                                XMP_OptionBits * handlerFlags = 0 );
+
+    /// @}
+
+    // =============================================================================================
+    /// \name File operations
+    /// @{
+    ///
+    /// These functions allow you to open, close, and query files.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CheckFileFormat() tries to determine the format of a file.
+    ///
+    /// Tries to determine the format of a file, returning an \c #XMP_FileFormat value. Uses the
+    /// same logic as \c OpenFile() to select a smart handler.
+    ///
+    /// @param filePath The path for the file, appropriate for the local operating system. Passed as
+    /// a nul-terminated UTF-8 string. The path is the same as would be passed to \c OpenFile.
+    ///
+    /// @return The file's format if a smart handler would be selected by \c OpenFile(), otherwise
+    /// \c #kXMP_UnknownFile.
+
+    static XMP_FileFormat CheckFileFormat ( XMP_StringPtr filePath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CheckPackageFormat() tries to determine the format of a "package" folder.
+    ///
+    /// Tries to determine the format of a package, given the name of the top-level folder. Returns
+    /// an \c #XMP_FileFormat value. Examples of recognized packages include the video formats P2,
+    /// XDCAM, or Sony HDV. These packages contain collections of "clips", stored as multiple files
+    /// in specific subfolders.
+    ///
+    /// @param folderPath The path for the top-level folder, appropriate for the local operating
+    /// system. Passed as a nul-terminated UTF-8 string. This is not the same path you would pass to
+    /// \c OpenFile(). For example, the top-level path for a package might be ".../MyMovie", while
+    /// the path to a file you wish to open would be ".../MyMovie/SomeClip".
+    ///
+    /// @return The package's format if it can be determined, otherwise \c #kXMP_UnknownFile.
+
+    static XMP_FileFormat CheckPackageFormat ( XMP_StringPtr folderPath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetFileModDate() returns the last modification date of all files that are returned
+    /// by \c GetAssociatedResources()
+    ///
+    /// Returns the most recent O/S file modification date of all associated files. In the typical case
+    /// of a single file containing embedded XMP, returned date value is the modification date of the 
+    /// same file. For sidecar and folder based video packages, returned date value is the modification 
+    /// date of that associated file which was updated last.
+    ///
+    /// @param filePath A path exactly as would be passed to \c OpenFile.
+    /// 
+    /// @param modDate A required pointer to return the last modification date.
+    ///
+    /// @param format A format hint as would be passed to \c OpenFile.
+    ///
+    /// @param options An optional set of option flags. The only defined one is \c kXMPFiles_ForceGivenHandler,
+    /// used to shortcut the handler selection logic if the caller is certain of the format.
+    ///
+    /// @return Returns true if the file path is valid to select a smart handler, false for an
+    /// invalid path or if fallback packet scanning would be selected. 
+
+    static bool GetFileModDate ( XMP_StringPtr    filePath,
+                                 XMP_DateTime *   modDate,
+                                 XMP_FileFormat * format = 0,
+                                 XMP_OptionBits   options = 0 );
+	
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetAssociatedResources() returns a list of files and folders associated to filePath.
+    ///
+    /// \c GetAssociatedResources is provided to locate all files that are associated to the given
+    /// filePath such as sidecar-based XMP or folder-based video packages.If a smart 
+    /// handler can be selected (not fallback packet scanning) then a list of file/folder paths is
+    /// returned for the related files that can be safely copied/imported to a different location,
+    /// keeping intact metadata(XMP and non-XMP),content and the necessary folder structure of the 
+    /// format. The necessary folder structure here is the structure that is needed to uniquely 
+    /// identify a folder-based format.The filePath and format parameters are exactly as would be 
+    /// used for OpenFile. In the simple embedded XMP case just one path is returned. In the simple
+    /// sidecar case one or two paths will be returned, one if there is no sidecar XMP and two if 
+    /// sidecar XMP exists. For folder-based handlers paths to all associated files is returned, 
+    /// including the files and folders necessary to identify the format.In general, all the returned
+    /// paths are existent.In case of folder based video formats the first associated resource in the 
+	/// resourceList is the root folder.
+    ///
+    /// @param filePath A path exactly as would be passed to \c OpenFile.
+    /// 
+    /// @param resourceList Address of a vector of strings to receive all associated resource paths.
+    ///
+    /// @param format A format hint as would be passed to \c OpenFile.
+    ///
+    /// @param options An optional set of option flags. The only defined one is \c kXMPFiles_ForceGivenHandler,
+    /// used to shortcut the handler selection logic if the caller is certain of the format.
+    ///
+    /// @return Returns true if the file path is valid to select a smart handler, false for an
+    /// invalid path or if fallback packet scanning would be selected. Can also return false for
+    /// unexpected errors that prevent knowledge of the file usage.
+    
+    static bool GetAssociatedResources ( XMP_StringPtr            filePath,
+                                         std::vector<tStringObj>* resourceList,
+                                         XMP_FileFormat           format = kXMP_UnknownFile, 
+                                         XMP_OptionBits           options = 0);
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c IsMetadataWritable() returns true if metadata can be updated for the given media path.
+    ///
+    /// \c IsMetadataWritable is provided to check if metadata can be updated or written to the format.In  
+    /// the case of folder-based video formats only if all the metadata files can be written to, true is 
+    /// returned.In other words, false is returned for a partial-write state of metadata files in
+    /// folder-based media formats. 
+    ///
+    /// @param filePath A path exactly as would be passed to \c OpenFile.
+    ///
+    /// @param writable A pointer to the result flag. Is true if the metadata can be updated in the format,
+    /// otherwise false.
+    ///
+    /// @param format A format hint as would be passed to \c OpenFile.
+    ///
+    /// @param options An optional set of option flags. The only defined one is \c kXMPFiles_ForceGivenHandler,
+    /// used to shortcut the handler selection logic if the caller is certain of the format.
+    ///
+    /// @return Returns true if the file path is valid to select a smart handler, false for an
+    /// invalid path or if fallback packet scanning would be selected. 
+    
+    static bool IsMetadataWritable (XMP_StringPtr  filePath,
+                                   bool *         writable,    
+                                   XMP_FileFormat format = kXMP_UnknownFile,
+                                   XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c OpenFile() opens a file for metadata access.
+    ///
+    /// Opens a file for the requested forms of metadata access. Opening the file at a minimum
+    /// causes the raw XMP packet to be read from the file. If the file handler supports legacy
+    /// metadata reconciliation then legacy metadata is also read, unless \c #kXMPFiles_OpenOnlyXMP
+    /// is passed.
+    ///
+    /// If the file is opened for read-only access (passing \c #kXMPFiles_OpenForRead), the disk
+    /// file is closed immediately after reading the data from it; the \c XMPFiles object, however,
+    /// remains in the open state. You must call \c CloseFile() when finished using it. Other
+    /// methods, such as \c GetXMP(), can only be used between the \c OpenFile() and \c CloseFile()
+    /// calls. The \c XMPFiles destructor does not call \c CloseFile(); if you call it without
+    /// closing, any pending updates are lost.
+    ///
+    /// If the file is opened for update (passing \c #kXMPFiles_OpenForUpdate), the disk file
+    /// remains open until \c CloseFile() is called. The disk file is only updated once, when
+    /// \c CloseFile() is called, regardless of how many calls are made to \c PutXMP().
+    ///
+    /// Typically, the XMP is not parsed and legacy reconciliation is not performed until \c GetXMP()
+    /// is called, but this is not guaranteed. Specific file handlers might do earlier parsing of
+    /// the XMP. Delayed parsing and early disk file close for read-only access are optimizations
+    /// to help clients implementing file browsers, so that they can access the file briefly
+    /// and possibly display a thumbnail, then postpone more expensive XMP processing until later.
+    ///
+    /// @param filePath The path for the file, appropriate for the local operating system. Passed as
+    /// a nul-terminated UTF-8 string.
+    ///
+    /// @param format The format of the file. If the format is unknown (\c #kXMP_UnknownFile) the
+    /// format is determined from the file content. The first handler to check is guessed from the
+    /// file's extension. Passing a specific format value is generally just a hint about what file
+    /// handler to try first (instead of the one based on the extension). If
+    /// \c #kXMPFiles_OpenStrictly is set, then any format other than \c #kXMP_UnknownFile requires
+    /// that the file actually be that format; otherwise an exception is thrown.
+    ///
+    /// @param openFlags A set of option flags that describe the desired access. By default (zero)
+    /// the file is opened for read-only access and the format handler decides on the level of
+    /// reconciliation that will be performed. A logical OR of these bit-flag constants:
+    ///
+    ///   \li \c #kXMPFiles_OpenForRead - Open for read-only access.
+    ///   \li \c #kXMPFiles_OpenForUpdate - Open for reading and writing.
+    ///   \li \c #kXMPFiles_OpenOnlyXMP - Only the XMP is wanted, no reconciliation.
+    ///   \li \c #kXMPFiles_OpenStrictly - Be strict about locating XMP and reconciling with other
+    ///   forms. By default, a best effort is made to locate the    correct XMP and to reconcile XMP
+    ///   with other forms (if reconciliation is done). This option forces stricter rules, resulting
+    ///   in exceptions for errors. The definition of strictness is specific to each handler, there
+    ///   might be no difference.
+    ///   \li \c #kXMPFiles_OpenUseSmartHandler - Require the use of a smart handler.
+    ///   \li \c #kXMPFiles_OpenUsePacketScanning - Force packet scanning, do not use a smart handler.
+	///   \li \c #kXMPFiles_OptimizeFileLayout - When updating a file, spend the effort necessary 
+	///    to optimize file layout.
+    ///
+    /// @return True if the file is succesfully opened and attached to a file handler. False for
+    /// anticipated problems, such as passing \c #kXMPFiles_OpenUseSmartHandler but not having an
+    /// appropriate smart handler. Throws an exception for serious problems.
+
+    bool OpenFile ( XMP_StringPtr  filePath,
+                    XMP_FileFormat format = kXMP_UnknownFile,
+                    XMP_OptionBits openFlags = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c OpenFile() opens a file for metadata access, using a string object
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object for the file
+    /// path. It is otherwise identical; see details in the canonical form.
+
+    bool OpenFile ( const tStringObj & filePath,
+                    XMP_FileFormat     format = kXMP_UnknownFile,
+                    XMP_OptionBits     openFlags = 0 );
+
+    #if XMP_StaticBuild    // ! Client XMP_IO objects can only be used in static builds.
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c OpenFile() opens a client-provided XMP_IO object for metadata access.
+    ///
+    /// Alternative to the basic form of the function, allowing you to pass an XMP_IO object for
+    /// client-managed I/O.
+    ///
+
+    bool OpenFile ( XMP_IO *       clientIO,
+                    XMP_FileFormat format = kXMP_UnknownFile,
+                    XMP_OptionBits openFlags = 0 );
+    #endif
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief CloseFile() explicitly closes an opened file.
+    ///
+    /// Performs any necessary output to the file and closes it. Files that are opened for update
+    /// are written to only when closing.
+    ///
+    /// If the file is opened for read-only access (passing \c #kXMPFiles_OpenForRead), the disk
+    /// file is closed immediately after reading the data from it; the \c XMPFiles object, however,
+    /// remains in the open state. You must call \c CloseFile() when finished using it. Other
+    /// methods, such as \c GetXMP(), can only be used between the \c OpenFile() and \c CloseFile()
+    /// calls. The \c XMPFiles destructor does not call \c CloseFile(); if you call it without closing,
+    /// any pending updates are lost.
+    ///
+    /// If the file is opened for update (passing \c #kXMPFiles_OpenForUpdate), the disk file remains
+    /// open until \c CloseFile() is called. The disk file is only updated once, when \c CloseFile()
+    /// is called, regardless of how many calls are made to \c PutXMP().
+    ///
+    /// @param closeFlags Option flags for optional closing actions. This bit-flag constant is
+    /// defined:
+    ///
+    ///   \li \c #kXMPFiles_UpdateSafely - Write into a temporary file then swap for crash safety.
+
+    void CloseFile ( XMP_OptionBits closeFlags = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetFileInfo() retrieves basic information about an opened file.
+    ///
+    /// @param filePath [out] A buffer in which to return the path passed to \c OpenFile(). Can be
+    /// null if value is not wanted.
+    ///
+    /// @param openFlags  [out] A buffer in which to return the option flags passed to
+    /// \c OpenFile(). Can be null if value is not wanted.
+    ///
+    /// @param format [out] A buffer in which to return the file format. Can be null if value is not
+    /// wanted.
+    /// @param handlerFlags  [out] A buffer in which to return the handler's capability flags. Can
+    /// be null if value is not wanted.
+    ///
+    /// @return True if the file object is in the open state; that is, \c OpenFile() has been called
+    /// but \c CloseFile() has not. False otherwise. Even if the file object is open, the actual
+    /// disk file might be closed in the host file-system sense; see \c OpenFile().
+
+    bool GetFileInfo ( tStringObj *     filePath = 0,
+                       XMP_OptionBits * openFlags = 0,
+                       XMP_FileFormat * format = 0,
+                       XMP_OptionBits * handlerFlags = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetAbortProc() registers a callback function used to check for a user-signaled abort.
+    ///
+    /// The specified procedure is called periodically to allow a user to cancel time-consuming
+    /// operations. The callback function should return true to signal an abort, which results in an
+    /// exception being thrown.
+    ///
+    /// @param abortProc The callback function.
+    ///
+    /// @param abortArg A pointer to caller-defined data to pass to the callback function.
+
+    void SetAbortProc ( XMP_AbortProc abortProc,
+                        void *        abortArg );
+
+    /// @}
+
+    // =============================================================================================
+    /// \name Accessing metadata
+    /// @{
+    ///
+    /// These functions allow you to retrieve XMP metadata from open files, so that you can use the
+    /// \c TXMPMeta API to manipulate it. The \c PutXMP() functions update the XMP packet in memory.
+    /// Changed XMP is not actually written out to the file until the file is closed.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetXMP() retrieves the XMP metadata from an open file.
+    ///
+    /// The function reports whether XMP is present in the file; you can choose to retrieve any or
+    /// all of the parsed XMP, the raw XMP packet,or information about the raw XMP packet. The
+    /// options provided when the file was opened determine if reconciliation is done with other
+    /// forms of metadata.
+    ///
+    /// @param xmpObj [out] An XMP object in which to return the parsed XMP metadata. Can be null.
+    ///
+    /// @param xmpPacket [out] An string object in which to return the raw XMP packet as stored in
+    /// the file. Can be null. The encoding of the packet is given in the \c packetInfo. Returns an
+    /// empty string if the low level file handler does not provide the raw packet.
+    ///
+    /// @param packetInfo [out] An string object in which to return the location and form of the raw
+    /// XMP in the file. \c #XMP_PacketInfo::charForm and \c #XMP_PacketInfo::writeable reflect the
+    /// raw XMP in the file. The parsed XMP property values are always UTF-8. The writeable flag is
+    /// taken from the packet trailer; it applies only to "format ignorant" writing. The
+    /// \c #XMP_PacketInfo structure always reflects the state of the XMP in the file. The offset,
+    /// length, and character form do not change as a result of calling \c PutXMP() unless the file
+    /// is also written. Some file handlers might not return location or contents of the raw packet
+    /// string. To determine whether one does, check the \c #kXMPFiles_ReturnsRawPacket bit returned
+    /// by \c GetFormatInfo(). If the low-level file handler does not provide the raw packet
+    /// location, \c #XMP_PacketInfo::offset and \c #XMP_PacketInfo::length are both 0,
+    /// \c #XMP_PacketInfo::charForm is UTF-8, and \c #XMP_PacketInfo::writeable is false.
+    ///
+    /// @return True if the file has XMP, false otherwise.
+
+    bool GetXMP ( SXMPMeta *       xmpObj = 0,
+                  tStringObj *     xmpPacket = 0,
+                  XMP_PacketInfo * packetInfo = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c PutXMP() updates the XMP metadata in this object without writing out the file.
+    ///
+    /// This function supplies new XMP for the file. However, the disk file is not written until the
+    /// object is closed with \c CloseFile(). The options provided when the file was opened
+    /// determine if reconciliation is done with other forms of metadata.
+    ///
+    /// @param xmpObj The new metadata as an XMP object.
+
+    void PutXMP ( const SXMPMeta & xmpObj );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c PutXMP() updates the XMP metadata in this object without writing out the file,
+    /// using a string object for input.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass the metadata as a string object
+    /// instead of an XMP object. It is otherwise identical; see details in the canonical form.
+    ///
+    /// @param xmpPacket The new metadata as a string object containing a complete XMP packet.
+
+    void PutXMP ( const tStringObj & xmpPacket );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c PutXMP() updates the XMP metadata in this object without writing out the file,
+       /// using a string object and optional length.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass the metadata as a string object
+    /// instead of an XMP object. It is otherwise identical; see details in the canonical form.
+    ///
+    /// @param xmpPacket The new metadata as a <tt>const char *</tt> string containing an XMP packet.
+    ///
+    /// @param xmpLength Optional. The number of bytes in the string. If not supplied, the string is
+    /// assumed to be nul-terminated.
+
+    void PutXMP ( XMP_StringPtr xmpPacket,
+                  XMP_StringLen xmpLength = kXMP_UseNullTermination );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CanPutXMP() reports whether this file can be updated with a specific XMP packet.
+    ///
+    /// Use to determine if the file can probably be updated with a given set of XMP metadata. This
+    /// depends on the size of the packet, the options with which the file was opened, and the
+    /// capabilities of the handler for the file format. The function obtains the length of the
+    /// serialized packet for the provided XMP, but does not keep it or modify it, and does not
+    /// cause the file to be written when closed. This is implemented roughly as follows:
+    ///
+    /// <pre>
+    /// bool CanPutXMP ( XMP_StringPtr xmpPacket )
+    /// {
+    ///    XMP_FileFormat format;
+    ///    this->GetFileInfo ( 0, &format, 0 );
+    ///
+    ///    XMP_OptionBits formatFlags;
+    ///    GetFormatInfo ( format, &formatFlags );
+    ///
+    ///    if ( (formatFlags & kXMPFiles_CanInjectXMP) && (formatFlags & kXMPFiles_CanExpand) ) return true;
+    ///
+    ///    XMP_PacketInfo packetInfo;
+    ///    bool hasXMP = this->GetXMP ( 0, 0, &packetInfo );
+    ///
+    ///    if ( ! hasXMP ) {
+    ///       if ( formatFlags & kXMPFiles_CanInjectXMP ) return true;
+    ///    } else {
+    ///       if ( (formatFlags & kXMPFiles_CanExpand) ||
+    ///            (packetInfo.length >= strlen(xmpPacket)) ) return true;
+    ///    }
+    ///    return false;
+    /// }
+    /// </pre>
+    ///
+    /// @param xmpObj The proposed new metadata as an XMP object.
+
+    bool CanPutXMP ( const SXMPMeta & xmpObj );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CanPutXMP() reports whether this file can be updated with a specific XMP packet,
+    /// passed in a string object.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass the metadata as a string object
+    /// instead of an XMP object. It is otherwise identical; see details in the canonical form.
+    ///
+    /// @param xmpPacket The proposed new metadata as a string object containing an XMP packet.
+
+    bool CanPutXMP ( const tStringObj & xmpPacket );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CanPutXMP() reports whether this file can be updated with a specific XMP packet,
+    /// passed in a string object.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass the metadata as a string object
+    /// instead of an XMP object. It is otherwise identical; see details in the canonical form.
+    ///
+    /// @param xmpPacket The proposed new metadata as a <tt>const char *</tt> string containing an XMP packet.
+    ///
+    /// @param xmpLength Optional. The number of bytes in the string. If not supplied, the string
+    /// is assumed to be nul-terminated.
+
+    bool CanPutXMP ( XMP_StringPtr xmpPacket,
+                     XMP_StringLen xmpLength = kXMP_UseNullTermination );
+
+    /// @}
+
+    // =============================================================================================
+    /// \name Progress notifications
+    /// @{
+    ///
+    /// These functions allow track the progress of file operations. Initially only file updates are
+    /// tracked, these all occur within calls to SXMPFiles::CloseFile. There are no plans to track
+    /// other operations at this time. Tracking support must be added to specific file handlers,
+    /// there are no guarantees about which handlers will have support. To simplify the logic only
+    /// file writes will be estimated and measured.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetDefaultProgressCallback() sets a global default for progress tracking. This is
+    /// used as a default for XMPFiles (library) objects created after the default is set. This does
+    /// not affect the callback for new SXMPFiles (client) objects with an existing XMPFiles object.
+    ///
+    /// @param proc The client's callback function. Can be zero to disable notifications.
+    ///
+    /// @param context A pointer used to carry client-private context.
+    ///
+    /// @param interval The desired number of seconds between notifications. Ideally the first
+    /// notification is sent after this interval, then at each following multiple of this interval.
+    ///
+    /// @param sendStartStop A Boolean value indicating if initial and final notifications are
+    /// wanted in addition to those at the reporting intervals.
+
+    static void SetDefaultProgressCallback ( XMP_ProgressReportProc proc, void * context = 0,
+                                             float interval = 1.0, bool sendStartStop = false );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProgressCallback() sets the progress notification callback for the associated
+    /// XMPFiles (library) object.
+    ///
+    /// @param proc The client's callback function. Can be zero to disable notifications.
+    ///
+    /// @param context A pointer used to carry client-private context.
+    ///
+    /// @param interval The desired number of seconds between notifications. Ideally the first
+    /// notification is sent after this interval, then at each following multiple of this interval.
+    ///
+    /// @param sendStartStop A Boolean value indicating if initial and final notifications are
+    /// wanted in addition to those at the reporting intervals.
+
+    void SetProgressCallback ( XMP_ProgressReportProc proc, void * context = 0,
+                               float interval = 1.0, bool sendStartStop = false );
+                                             
+    /// @}
+
+    // =============================================================================================
+    // Error notifications
+    // ===================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Error notifications
+    /// @{
+    ///
+    /// From the beginning through version 5.5, XMP Toolkit errors result in throwing an \c XMP_Error
+    /// exception. For the most part exceptions were thrown early and thus API calls aborted as soon
+    /// as an error was detected. Starting in version 5.5, support has been added for notifications
+    /// of errors arising in calls to \c TXMPFiles functions.
+    ///
+    /// A client can register an error notification callback function for a \c TXMPFile object. This
+    /// can be done as a global default or individually to each object. The global default applies
+    /// to all objects created after it is registered. Within the object there is no difference
+    /// between the global default or explicitly registered callback. The callback function returns
+    /// a \c bool value indicating if recovery should be attempted (true) or an exception thrown
+    /// (false). If no callback is registered, a best effort at recovery and continuation will be
+    /// made with an exception thrown if recovery is not possible.
+    ///
+    /// The number of notifications delivered for a given TXMPFiles object can be limited. This is
+    /// intended to reduce chatter from multiple or cascading errors. The limit is set when the
+    /// callback function is registered. This limits the number of notifications of the highest
+    /// severity delivered or less. If a higher severity error occurs, the counting starts again.
+    /// The limit and counting can be reset at any time, see \c ResetErrorCallbackLimit.
+
+    //  --------------------------------------------------------------------------------------------
+    /// @brief SetDefaultErrorCallback() registers a global default error notification callback.
+    ///
+    /// @param proc The client's callback function.
+    ///
+    /// @param context Client-provided context for the callback.
+    ///
+    /// @param limit A limit on the number of notifications to be delivered.
+
+    static void SetDefaultErrorCallback ( XMPFiles_ErrorCallbackProc proc, void* context = 0, XMP_Uns32 limit = 1 );
+
+    //  --------------------------------------------------------------------------------------------
+    /// @brief SetErrorCallback() registers an error notification callback.
+    ///
+    /// @param proc The client's callback function.
+    ///
+    /// @param context Client-provided context for the callback.
+    ///
+    /// @param limit A limit on the number of notifications to be delivered.
+
+    void SetErrorCallback ( XMPFiles_ErrorCallbackProc proc, void* context = 0, XMP_Uns32 limit = 1 );
+
+    //  --------------------------------------------------------------------------------------------
+    /// @brief ResetErrorCallbackLimit() resets the error notification limit and counting. It has no
+    /// effect if an error notification callback function is not registered. 
+    ///
+    /// @param limit A limit on the number of notifications to be delivered.
+
+    void ResetErrorCallbackLimit ( XMP_Uns32 limit = 1 );
+
+    /// @}
+
+    // =============================================================================================
+
+private:
+
+    XMPFilesRef xmpFilesRef;
+
+    // These are used as callbacks from the library code to the client when returning values that
+    // involve heap allocations. This ensures the allocations occur within the client.
+    static void SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen );
+    static void SetClientStringVector ( void * clientPtr, XMP_StringPtr* arrayPtr, XMP_Uns32 stringCount );
+
+};    // class TXMPFiles
+
+// =================================================================================================
+
+#endif // __TXMPFiles_hpp__
diff --git a/public/include/TXMPIterator.hpp b/public/include/TXMPIterator.hpp
new file mode 100644
index 0000000..603db68
--- /dev/null
+++ b/public/include/TXMPIterator.hpp
@@ -0,0 +1,235 @@
+#ifndef __TXMPIterator_hpp__
+#define __TXMPIterator_hpp__ 1
+
+#if ( ! __XMP_hpp__ )
+    #error "Do not directly include, use XMP.hpp"
+#endif
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+// =================================================================================================
+/// \file TXMPIterator.hpp
+/// \brief API for access to the XMP Toolkit iteration services.
+///
+/// \c TXMPIterator is the template class providing iteration services for the XMP Toolkit. It must
+/// be instantiated with a string class such as \c std::string. See the instructions in XMP.hpp, and
+/// the Overview for a discussion of the overall architecture of the XMP API.
+// =================================================================================================
+
+// =================================================================================================
+/// \class TXMPIterator TXMPIterator.hpp
+/// @brief API for access to the XMP Toolkit iteration services.
+///
+/// \c TXMPIterator provides a uniform means to iterate over the schema and properties within an XMP
+/// object. \c TXMPIterator is a template class which must be instantiated with a string class such
+/// as \c std::string. See the instructions in XMP.hpp, and the Overview for a discussion of the
+/// overall architecture of the XMP API. Access these functions through the concrete class,
+/// \c SXMPIterator.
+///
+/// @note Only XMP object iteration is currently available. Future development may include iteration
+/// over global tables, such as registered namespaces.
+///
+/// To understand how iteration works, you should have a thorough understanding of the XMP data
+/// tree, as described in the XMP Specification Part 1. You might also find it helpful to create
+/// some complex XMP and examine the output of \c TXMPMeta::DumpObject().
+///
+///   \li The top of the XMP data tree is a single root node. This does not explicitly appear in the
+///   dump and is never visited by an iterator; that is, it is never returned from
+///   \c TXMPIterator::Next().
+///
+///   \li Beneath the root are schema nodes; these collect the top-level properties in the same
+///   namespace. They are created and destroyed implicitly.
+///
+///   \li Beneath the schema nodes are the property nodes. The nodes below a property node depend on
+///   its type (simple, struct, or array) and whether it has qualifiers.
+///
+/// A \c TXMPIterator constructor defines a starting point for the iteration, and options that
+/// control how it proceeds. By default, iteration starts at the root and visits all nodes beneath
+/// it in a depth-first manner. The root node iteself is not visited; the first visited node is a
+/// schema node. You can provide a schema name or property path to select a different starting node.
+/// By default, this visits the named root node first then all nodes beneath it in a depth-first
+/// manner.
+///
+/// The function \c TXMPIterator::Next() delivers the schema URI, path, and option flags for the
+/// node being visited. If the node is simple, it also delivers the value. Qualifiers for this node
+/// are visited next. The fields of a struct or items of an array are visited after the qualifiers
+/// of the parent.
+///
+/// You can specify options when contructing the iteration object to control how the iteration is
+/// performed.
+///
+///   \li \c #kXMP_IterJustChildren - Visit just the immediate children of the root. Skip the root
+///   itself and all nodes below the immediate children. This omits the qualifiers of the immediate
+///   children, the qualifier nodes being below what they qualify.
+///   \li \c #kXMP_IterJustLeafNodes - Visit just the leaf property nodes and their qualifiers.
+///   \li \c #kXMP_IterJustLeafName - Return just the leaf component of the node names. The default
+///   is to return the full path name.
+///   \li \c #kXMP_IterOmitQualifiers - Do not visit the qualifiers of a node.
+// =================================================================================================
+
+#include "client-glue/WXMPIterator.hpp"
+
+template <class tStringObj> class TXMPIterator {
+
+public:
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Assignment operator, assigns the internal ref and increments the ref count.
+    ///
+    /// Assigns the internal reference from an existing object and increments the reference count on
+    /// the underlying internal XMP iterator.
+    ///
+    /// @param rhs An existing iteration object.
+
+    void operator= ( const TXMPIterator<tStringObj> & rhs );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Copy constructor, creates a client object refering to the same internal object.
+    ///
+    /// Creates a new client iterator that refers to the same underlying iterator as an existing object.
+    ///
+    /// @param original An existing iteration object to copy.
+
+    TXMPIterator ( const TXMPIterator<tStringObj> & original );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Constructs an iterator for properties within a schema in an XMP object.
+    ///
+    /// See the class description for the general operation of an  XMP object iterator.
+    /// Overloaded forms are provided to iterate the entire data tree,
+    /// a subtree rooted at a specific node, or properties within a specific schema.
+    ///
+    /// @param xmpObj The XMP object over which to iterate.
+    ///
+    /// @param schemaNS Optional schema namespace URI to restrict the iteration. To visit all of the
+    /// schema, pass 0 or the empty string "".
+    ///
+    /// @param propName Optional property name to restrict the iteration. May be an arbitrary path
+    /// expression. If provided, a schema URI must also be provided. To visit all properties, pass 0
+    /// or the empty string "".
+    ///
+    /// @param options Option flags to control the iteration. A logical OR of these bit flag constants:
+    ///   \li \c #kXMP_IterJustChildren - Visit only the immediate children of the root; default visits subtrees.
+    ///   \li \c #kXMP_IterJustLeafNodes - Visit only the leaf nodes; default visits all nodes.
+    ///   \li \c #kXMP_IterJustLeafName - Return just the leaf part of the path; default returns the full path.
+    ///   \li \c #kXMP_IterOmitQualifiers - Omit all qualifiers.
+    ///
+    /// @return The new TXMPIterator object.
+
+    TXMPIterator ( const TXMPMeta<tStringObj> & xmpObj,
+                   XMP_StringPtr  schemaNS,
+                   XMP_StringPtr  propName,
+                   XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Constructs an iterator for a subtree of properties within an XMP object.
+    ///
+    /// See the class description for the general operation of an  XMP object iterator. Overloaded
+    /// forms are provided to iterate the entire data tree, a subtree rooted at a specific node, or
+    /// properties within a specific schema.
+    ///
+    /// @param xmpObj The XMP object over which to iterate.
+    ///
+    /// @param schemaNS Optional schema namespace URI to restrict the iteration. To visit all of the
+    /// schema, pass 0 or the empty string "".
+    ///
+    /// @param options Option flags to control the iteration. A logical OR of these bit flag constants:
+    ///   \li \c #kXMP_IterJustChildren - Visit only the immediate children of the root; default visits subtrees.
+    ///   \li \c #kXMP_IterJustLeafNodes - Visit only the leaf nodes; default visits all nodes.
+    ///   \li \c #kXMP_IterJustLeafName - Return just the leaf part of the path; default returns the full path.
+    ///   \li \c #kXMP_IterOmitQualifiers - Omit all qualifiers.
+    ///
+    /// @return The new TXMPIterator object.
+
+    TXMPIterator ( const TXMPMeta<tStringObj> & xmpObj,
+                   XMP_StringPtr  schemaNS,
+                   XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Constructs an iterator for the entire data tree within an XMP object.
+    ///
+    /// See the class description for the general operation of an  XMP object iterator. Overloaded
+    /// forms are provided to iterate the entire data tree, a subtree rooted at a specific node, or
+    /// properties within a specific schema.
+    ///
+    /// @param xmpObj The XMP object over which to iterate.
+    ///
+    /// @param options Option flags to control the iteration. A logical OR of these bit flag constants:
+    ///   \li \c #kXMP_IterJustChildren - Visit only the immediate children of the root; default visits subtrees.
+    ///   \li \c #kXMP_IterJustLeafNodes - Visit only the leaf nodes; default visits all nodes.
+    ///   \li \c #kXMP_IterJustLeafName - Return just the leaf part of the path; default returns the full path.
+    ///   \li \c #kXMP_IterOmitQualifiers - Omit all qualifiers.
+    ///
+    /// @return The new \c TXMPIterator object.
+
+    TXMPIterator ( const TXMPMeta<tStringObj> & xmpObj,
+                   XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Constructs an iterator for the global tables of the XMP toolkit.	Not implemented.
+
+    TXMPIterator ( XMP_StringPtr  schemaNS,
+                   XMP_StringPtr  propName,
+                   XMP_OptionBits options );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Destructor, typical virtual destructor.
+
+    virtual ~TXMPIterator() throw();
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c Next() visits the next node in the iteration.
+    ///
+    /// Proceeds to the next node according to the options specified on creation of this object, and
+    /// delivers the schema URI, path, and option flags for the node being visited. If the node is
+    /// simple, it also delivers the value.
+    ///
+    /// @param schemaNS [out] A string object in which to return the assigned the schema namespace
+    /// URI of the current property. Can be null if the value is not wanted.
+    ///
+    /// @param propPath [out]  A string object in which to return the XPath name of the current
+    /// property. Can be null if the value is not wanted.
+    ///
+    /// @param propValue  [out] A string object in which to return the value of the current
+    /// property. Can be null if the value is not wanted.
+    ///
+    /// @param options  [out] A buffer in which to return the flags describing the current property,
+    /// which are a logical OR of \c #XMP_OptionBits bit-flag constants.
+    ///
+    /// @return True if there was another node to visit, false if the iteration is complete.
+
+    bool Next ( tStringObj *     schemaNS = 0,
+          		tStringObj *     propPath = 0,
+           		tStringObj *     propValue = 0,
+           		XMP_OptionBits * options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c Skip() skips some portion of the remaining iterations.
+    ///
+    /// @param options Option flags to control the iteration, a logical OR of these bit-flag
+    /// constants:
+    ///   \li \c #kXMP_IterSkipSubtree -  Skip the subtree below the current node.
+    ///   \li \c #kXMP_IterSkipSiblings - Skip the subtree below and remaining siblings of the current node.
+
+    void Skip ( XMP_OptionBits options );
+
+private:
+
+    XMPIteratorRef  iterRef;
+
+    TXMPIterator();	// ! Hidden, must choose property or table iteration.
+
+	static void SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen );
+
+};  // class TXMPIterator
+
+// =================================================================================================
+
+#endif // __TXMPIterator_hpp__
diff --git a/public/include/TXMPMeta.hpp b/public/include/TXMPMeta.hpp
new file mode 100644
index 0000000..57aa62a
--- /dev/null
+++ b/public/include/TXMPMeta.hpp
@@ -0,0 +1,1751 @@
+#ifndef __TXMPMeta_hpp__
+#define __TXMPMeta_hpp__    1
+
+#if ( ! __XMP_hpp__ )
+    #error "Do not directly include, use XMP.hpp"
+#endif
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+// =================================================================================================
+/// \file TXMPMeta.hpp
+/// \brief API for access to the XMP Toolkit core services.
+///
+/// \c TXMPMeta is the template class providing the core services of the XMP Toolkit. It must be
+/// instantiated with a string class such as \c std::string. Read the Toolkit Overview for
+/// information about the overall architecture of the XMP API, and the documentation for \c XMP.hpp
+/// for specific instantiation instructions. Please that you MUST NOT derive a class from this class,
+/// consider this class FINAL, use it directly. [1279031]
+///
+/// Access these functions through the concrete class, \c SXMPMeta.
+// =================================================================================================
+
+// =================================================================================================
+/// \class TXMPMeta TXMPMeta.hpp
+/// \brief API for access to the XMP Toolkit core services.
+///
+/// \c TXMPMeta is the template class providing the core services of the XMP Toolkit. It should be
+/// instantiated with a string class such as \c std::string. Read the Toolkit Overview for
+/// information about the overall architecture of the XMP API, and the documentation for \c XMP.hpp
+/// for specific instantiation instructions.
+///
+/// Access these functions through the concrete class, \c SXMPMeta.
+///
+/// You can create \c TXMPMeta objects (also called XMP objects) from metadata that you construct,
+/// or that you obtain from files using the XMP Toolkit's XMPFiles component; see \c TXMPFiles.hpp.
+// =================================================================================================
+
+template <class tStringObj> class TXMPIterator;
+template <class tStringObj> class TXMPUtils;
+
+// -------------------------------------------------------------------------------------------------
+
+template <class tStringObj> class TXMPMeta {
+
+public:
+
+    // =============================================================================================
+    // Initialization and termination
+    // ==============================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Initialization and termination
+    ///
+    /// @{
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetVersionInfo() retrieves runtime version information.
+    ///
+    /// The header \c XMPVersion.hpp defines a static version number for the XMP Toolkit, which
+    /// describes the version of the API used at client compile time. It is not necessarily the same
+    /// as the runtime version. Do not base runtime decisions on the static version alone; you can,
+    /// however, compare the runtime and static versions.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta). The
+    /// function can be called before calling \c TXMPMeta::Initialize().
+    ///
+    /// @param info [out] A buffer in which to return the version information.
+
+    static void GetVersionInfo ( XMP_VersionInfo * info );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c Initialize() explicitly initializes the XMP Toolkit before use. */
+
+    /// Initializes the XMP Toolkit.
+    ///
+    /// Call this function before making any other calls to the \c TXMPMeta functions, except
+    /// \c TXMPMeta::GetVersionInfo().
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
+    ///
+    /// @return True on success. */
+    static bool Initialize();
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c Terminate() explicitly terminates usage of the XMP Toolkit.
+    ///
+    /// Frees structures created on initialization.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
+
+    static void Terminate();
+
+    /// @}
+
+    // =============================================================================================
+    // Constuctors and destructor
+    // ==========================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Constructors and destructor
+    /// @{
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Default constructor, creates an empty object.
+    ///
+    /// The default constructor creates a new empty \c TXMPMeta object.
+    ///
+    /// @return The new object. */
+    TXMPMeta();
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Copy constructor, creates a client object refering to the same internal object.
+    ///
+    /// The copy constructor creates a new \c TXMPMeta object that refers to the same internal XMP
+    /// object. as an existing \c TXMPMeta object.
+    ///
+    /// @param original The object to copy.
+    ///
+    /// @return The new object. */
+
+    TXMPMeta ( const TXMPMeta<tStringObj> & original );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Assignment operator, assigns the internal reference and increments the reference count.
+    ///
+    /// The assignment operator assigns the internal ref from the rhs object and increments the
+    /// reference count on the underlying internal XMP object.
+
+    void operator= ( const TXMPMeta<tStringObj> & rhs );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Reconstructs an XMP object from an internal reference.
+    ///
+    /// This constructor creates a new \c TXMPMeta object that refers to the underlying reference object
+    /// of an existing \c TXMPMeta object. Use to safely pass XMP objects across DLL boundaries.
+    ///
+    /// @param xmpRef The underlying reference object, obtained from some other XMP object with
+    /// \c TXMPMeta::GetInternalRef().
+    ///
+    /// @return The new object.
+
+    TXMPMeta ( XMPMetaRef xmpRef );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Constructs an object and parse one buffer of RDF into it.
+    ///
+    /// This constructor creates a new \c TXMPMeta object and populates it with metadata from a
+    /// buffer containing serialized RDF. This buffer must be a complete RDF parse stream.
+    ///
+    /// The result of passing serialized data to this function is identical to creating an empty
+    /// object then calling \c TXMPMeta::ParseFromBuffer(). To use the constructor, however, the RDF
+    /// must be complete. If you need to parse data from multiple buffers, create an empty object
+    /// and use  \c TXMPMeta::ParseFromBuffer().
+    ///
+    /// @param buffer  A pointer to the buffer of RDF to be parsed. Can be null if the length is 0;
+    /// in this case, the function creates an empty object.
+    ///
+    /// @param xmpSize  The length in bytes of the buffer.
+    ///
+    /// @return The new object.
+
+    TXMPMeta ( XMP_StringPtr buffer,
+               XMP_StringLen xmpSize );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Destructor, typical virtual destructor. */
+    virtual ~TXMPMeta() throw();
+
+    /// @}
+
+    // =============================================================================================
+    // Global state functions
+    // ======================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Global option flags
+    /// @{
+    /// Global option flags affect the overall behavior of the XMP Toolkit. The available options
+    /// will be declared in \c XMP_Const.h. There are none in this version of the Toolkit.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetGlobalOptions() retrieves the set of global option flags. There are none in
+    /// this version of the Toolkit.
+    ///
+    /// This function is static; you can make the call from the class without instantiating it.
+    ///
+    /// @return A logical OR of global option bit-flag constants.
+
+     static XMP_OptionBits GetGlobalOptions();
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetGlobalOptions() updates the set of global option flags. There are none in this
+    /// version of the Toolkit.
+    ///
+    /// The entire set is replaced with the new values. If only one flag is to be modified, use
+    /// \c TXMPMeta::GetGlobalOptions() to obtain the current set, modify the desired flag, then use
+    /// this function to reset the value.
+    ///
+    /// This function is static; you can make the call from the class without instantiating it.
+    ///
+    /// @param options A logical OR of global option bit-flag constants.
+
+    static void SetGlobalOptions ( XMP_OptionBits options );
+
+    /// @}
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Internal data structure dump utilities
+    /// @{
+    ///
+    /// These are debugging utilities that dump internal data structures, to be handled by
+    /// client-defined callback described in \c XMP_Const.h.
+	///
+	/// @see Member function \c TXMPMeta::DumpObject()
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DumpNamespaces() sends the list of registered namespace URIs and prefixes to a handler.
+    ///
+    /// For debugging. Invokes a client-defined callback for each line of output.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
+    ///
+    /// @param outProc The client-defined procedure to handle each line of output.
+    ///
+    /// @param clientData A pointer to client-defined data to pass to the handler.
+    ///
+    /// @return	A success-fail status value, returned from the handler. Zero is success, failure
+    /// values are client-defined.
+
+    static XMP_Status DumpNamespaces ( XMP_TextOutputProc outProc,
+                     				   void *             clientData );
+
+    /// @}
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Namespace Functions
+    /// @{
+    ///
+    /// Namespaces must be registered before use in namespace URI parameters or path expressions.
+    /// Within the XMP Toolkit the registered namespace URIs and prefixes must be unique. Additional
+    /// namespaces encountered when parsing RDF are automatically registered.
+    ///
+    /// The namespace URI should always end in an XML name separator such as '/' or '#'. This is
+    /// because some forms of RDF shorthand catenate a namespace URI with an element name to form a
+    /// new URI.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c RegisterNamespace() registers a namespace URI with a suggested prefix.
+    ///
+    /// If the URI is not registered but the suggested prefix is in use, a unique prefix is created
+    /// from the suggested one. The actual registered prefix is returned. The function result tells
+    /// if the registered prefix is the suggested one. It is not an error if the URI is already
+    /// registered, regardless of the prefix.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
+    ///
+    /// @param namespaceURI The URI for the namespace. Must be a valid XML URI.
+    ///
+    /// @param suggestedPrefix The suggested prefix to be used if the URI is not yet registered.
+    /// Must be a valid XML name.
+    ///
+    /// @param registeredPrefix [out] A string object in which to return the prefix actually
+    /// registered for this URI.
+    ///
+    /// @return True if the registered prefix matches the suggested prefix.
+    ///
+    /// @note No checking is done on either the URI or the prefix.  */
+
+    static bool RegisterNamespace ( XMP_StringPtr namespaceURI,
+                        			XMP_StringPtr suggestedPrefix,
+                       				tStringObj *  registeredPrefix );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetNamespacePrefix() obtains the prefix for a registered namespace URI, and
+    /// reports whether the URI is registered.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
+    ///
+    /// @param namespaceURI The URI for the namespace. Must not be null or the empty string. It is
+    /// not an error if the namespace URI is not registered.
+    ///
+    /// @param namespacePrefix [out] A string object in which to return the prefix registered for
+    /// this URI, with a terminating colon character, ':'. If the namespace is not registered, this
+    /// string is not modified.
+    ///
+    /// @return True if the namespace URI is registered.
+
+    static bool GetNamespacePrefix ( XMP_StringPtr namespaceURI,
+                         			 tStringObj *  namespacePrefix );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetNamespaceURI() obtains the URI for a registered namespace prefix, and reports
+    /// whether the prefix is registered.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
+    ///
+    /// @param namespacePrefix The prefix for the namespace. Must not be null or the empty string.
+    /// It is not an error if the namespace prefix is not registered.
+    ///
+    /// @param namespaceURI [out] A string object in which to return the URI registered for this
+    /// prefix. If the prefix is not registered, this string is not modified.
+    ///
+    /// @return True if the namespace prefix is registered.
+
+    static bool GetNamespaceURI ( XMP_StringPtr namespacePrefix,
+                      			  tStringObj *  namespaceURI );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Not implemented.
+    ///
+    /// Deletes a namespace from the registry. Does nothing if the URI is not registered, or if the
+    /// parameter is null or the empty string.
+    ///
+    /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
+    ///
+    /// @param namespaceURI The URI for the namespace.
+
+    static void DeleteNamespace ( XMP_StringPtr namespaceURI );
+
+    /// @}
+
+    // =============================================================================================
+    // Basic property manipulation functions
+    // =====================================
+
+    // *** Should add discussion of schemaNS and propName prefix usage.
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Accessing property values
+    /// @{
+    ///
+    /// The property value accessors all take a property specification; the top level namespace URI
+    ///	(the "schema" namespace) and the basic name of the property being referenced. See the
+    ///	introductory discussion of path expression usage for more information.
+	///
+    /// The accessor functions return true if the specified property exists. If it does, output
+    /// parameters return the value (if any) and option flags describing the property. The option
+    /// bit-flag constants that describe properties are \c kXMP_PropXx and
+	/// \c kXMP_ArrayIsXx. See \c #kXMP_PropValueIsURI and following, and macros \c #XMP_PropIsSimple
+	/// and following in \c XMP_Const.h. If the property exists and has a value, it is returned as a
+	/// Unicode string in UTF-8 encoding. Arrays and the non-leaf levels of structs do not have
+	/// values.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetProperty() reports whether a property exists, and retrieves its value.
+    ///
+    /// This is the simplest property accessor. Use this to retrieve the values of top-level simple
+    /// properties, or after using the path composition functions in \c TXMPUtils.
+    ///
+    /// When specifying a namespace and path (in this and all other accessors):
+    ///   \li If a namespace URI is specified, it must be for a registered namespace.
+    ///   \li If the namespace is specified only by a prefix in the property name path,
+    /// it must be a registered prefix.
+    ///   \li If both a URI and path prefix are present, they must be corresponding
+    /// parts of a registered namespace.
+    ///
+    /// @param schemaNS The namespace URI for the property. The URI must be for a registered
+    /// namespace. Must not be null or the empty string.
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string. The first component can be a namespace prefix; if present without a
+    /// \c schemaNS value, the prefix specifies the namespace. The prefix must be for a registered
+    /// namespace, and if a namespace URI is specified, must match the registered prefix for that
+    /// namespace.
+    ///
+    /// @param propValue [out] A string object in which to return the value of the property, if the
+    /// property exists and has a value. Arrays and non-leaf levels of structs do not have values.
+    /// Can be null if the value is not wanted.
+    ///
+    /// @param options A buffer in which to return option flags describing the property. Can be null
+    /// if the flags are not wanted.
+    ///
+    /// @return True if the property exists.
+
+    bool GetProperty ( XMP_StringPtr    schemaNS,
+                 	   XMP_StringPtr    propName,
+                       tStringObj *     propValue,
+                  	   XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetArrayItem() provides access to items within an array.
+    ///
+    /// Reports whether the item exists; if it does, and if it has a value, the function retrieves
+    /// the value. Items are accessed by an integer index, where the first item has index 1.
+    ///
+    /// @param schemaNS The namespace URI for the array; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param itemIndex The 1-based index of the desired item. Use the macro \c #kXMP_ArrayLastItem
+    /// to specify the last existing array item.
+    ///
+    /// @param itemValue [out] A string object in which to return the value of the array item, if it
+    /// has a value. Arrays and non-leaf levels of structs do not have values. Can be null if the
+    /// value is not wanted.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the array item.
+    /// Can be null if the flags are not wanted.
+    ///
+    /// @return True if the array item exists.
+
+    bool GetArrayItem ( XMP_StringPtr    schemaNS,
+                   		XMP_StringPtr    arrayName,
+                   		XMP_Index        itemIndex,
+                   		tStringObj *     itemValue,
+                   		XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetStructField() provides access to fields within a nested structure.
+    ///
+    /// Reports whether the field exists; if it does, and if it has a value, the function retrieves
+    /// the value.
+    ///
+    /// @param schemaNS The namespace URI for the struct; see \c GetProperty().
+    ///
+    /// @param structName The name of the struct. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param fieldNS The namespace URI for the field. Same URI and prefix usage as the \c schemaNS
+    /// and \c structName parameters.
+    ///
+    /// @param fieldName The name of the field. Must be a single XML name, must not be null or the
+    /// empty string. Same URI and prefix usage as the \c schemaNS and \c structName parameters.
+    ///
+    /// @param fieldValue [out] A string object in which to return the value of the field, if the
+    /// field has a value. Arrays and non-leaf levels of structs do not have values. Can be null if
+    /// the value is not wanted.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the field. Can
+    /// be null if the flags are not wanted.
+    ///
+    /// @return True if the field exists.
+
+    bool GetStructField ( XMP_StringPtr    schemaNS,
+                     	  XMP_StringPtr    structName,
+                     	  XMP_StringPtr    fieldNS,
+                     	  XMP_StringPtr    fieldName,
+                     	  tStringObj *     fieldValue,
+                     	  XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetQualifier() provides access to a qualifier attached to a property.
+    ///
+    /// @note In this version of the Toolkit, qualifiers are supported only for simple leaf properties.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property to which the qualifier is attached. Can be a
+    /// general path expression, must not be null or the empty string; see \c GetProperty() for
+    /// namespace prefix usage.
+    ///
+    /// @param qualNS The namespace URI for the qualifier. Same URI and prefix usage as the
+    /// \c schemaNS and \c propName parameters.
+    ///
+    /// @param qualName The name of the qualifier. Must be a single XML name, must not be null or
+    /// the empty string. Same URI and prefix usage as the \c schemaNS and \c propName parameters.
+    ///
+    /// @param qualValue [out] A string object in which to return the value of the qualifier, if the
+    /// qualifier has a value. Arrays and non-leaf levels of structs do not have values. Can be null
+    /// if the value is not wanted.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the qualifier.
+    /// Can be null if the flags are not wanted.
+    ///
+    /// @return True if the qualifier exists.
+
+    bool GetQualifier ( XMP_StringPtr    schemaNS,
+                   		XMP_StringPtr    propName,
+                  		XMP_StringPtr    qualNS,
+                  		XMP_StringPtr    qualName,
+                   		tStringObj *     qualValue,
+                   		XMP_OptionBits * options ) const;
+
+    /// @}
+
+    // =============================================================================================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Creating properties and setting their values
+ 	/// @{
+ 	///
+    /// These functions all take a property specification; the top level namespace URI (the "schema"
+    /// namespace) and the basic name of the property being referenced. See the introductory
+    /// discussion of path expression usage for more information.
+	///
+    /// All of the functions take a UTF-8 encoded Unicode string for the property value. Arrays and
+    /// non-leaf levels of structs do not have values. The value can be passed as an
+    /// \c #XMP_StringPtr (a pointer to a null-terminated string), or as a string object
+    /// (\c tStringObj).
+
+    /// Each function takes an options flag that describes the property. You can use these functions
+    /// to create empty arrays and structs by setting appropriate option flags. When you assign a
+    /// value, all levels of a struct that are implicit in the assignment are created if necessary.
+    /// \c TXMPMeta::AppendArrayItem() implicitly creates the named array if necessary.
+    ///
+    /// The allowed option bit-flags include:
+    ///   \li \c #kXMP_PropValueIsStruct - Can be used to create an empty struct.
+    ///		A struct is implicitly created when the first field is set.
+    ///   \li \c #kXMP_PropValueIsArray - By default, a general unordered array (bag).
+    ///   \li \c #kXMP_PropArrayIsOrdered - An ordered array.
+   	///   \li \c #kXMP_PropArrayIsAlternate - An alternative array.
+   	///   \li \c #kXMP_PropArrayIsAltText - An alt-text array. Each array element must
+    /// 	be a simple property with an \c xml:lang attribute.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProperty() creates or sets a property value.
+    ///
+    /// This is the simplest property setter. Use it for top-level simple properties, or after using
+    /// the path composition functions in \c TXMPUtils.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue The new value, a pointer to a null terminated UTF-8 string. Must be null
+    /// for arrays and non-leaf levels of structs that do not have values.
+    ///
+    /// @param options Option flags describing the property; a logical OR of allowed bit-flag
+    /// constants; see \c #kXMP_PropValueIsStruct and following. Must match the type of a property
+    /// that already exists.
+
+    void SetProperty ( XMP_StringPtr  schemaNS,
+					   XMP_StringPtr  propName,
+					   XMP_StringPtr  propValue,
+					   XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProperty() creates or sets a property value using a string object.
+	///
+    /// Overloads the basic form of the function, allowing you to pass a string object
+	/// for the item value. It is otherwise identical; see details in the canonical form.
+
+    void SetProperty ( XMP_StringPtr      schemaNS,
+					   XMP_StringPtr      propName,
+					   const tStringObj & propValue,
+					   XMP_OptionBits     options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetArrayItem() creates or sets the value of an item within an array.
+    ///
+    /// Items are accessed by an integer index, where the first item has index 1. This function
+    /// creates the item if necessary, but the array itself must already exist Use
+    /// \c AppendArrayItem() to create arrays. A new item is automatically appended if the index is the
+    /// array size plus 1. To insert a new item before or after an existing item, use option flags.
+    ///
+    /// Use \c TXMPUtils::ComposeArrayItemPath() to create a complex path.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param itemIndex The 1-based index of the desired item. Use the macro \c #kXMP_ArrayLastItem
+    /// to specify the last existing array item.
+    ///
+    /// @param itemValue The new item value, a null-terminated UTF-8 string, if the array item has a
+    /// value.
+    ///
+    /// @param options Option flags describing the array type and insertion location for a new item;
+    /// a logical OR of allowed bit-flag constants. The type, if specified, must match the existing
+    /// array type, \c #kXMP_PropArrayIsOrdered, \c #kXMP_PropArrayIsAlternate, or
+    /// \c #kXMP_PropArrayIsAltText. Default (0 or \c #kXMP_NoOptions) matches the  existing array type.
+    ///
+    /// To insert a new item before or after the specified index, set flag \c #kXMP_InsertBeforeItem
+    /// or \c #kXMP_InsertAfterItem.
+
+    void SetArrayItem ( XMP_StringPtr  schemaNS,
+					    XMP_StringPtr  arrayName,
+					    XMP_Index      itemIndex,
+					    XMP_StringPtr  itemValue,
+					    XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetArrayItem() creates or sets the value of an item within an array using a string object.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object in which to
+	/// return the item value. It is otherwise identical; see details in the canonical form.
+
+    void SetArrayItem ( XMP_StringPtr      schemaNS,
+					    XMP_StringPtr      arrayName,
+					    XMP_Index          itemIndex,
+					    const tStringObj & itemValue,
+					    XMP_OptionBits     options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c AppendArrayItem() adds an item to an array, creating the array if necessary.
+    ///
+    /// This function simplifies construction of an array by not requiring that you pre-create an
+    /// empty array. The array that is assigned is created automatically if it does not yet exist.
+    /// If the array exists, it must have the form specified by the options. Each call appends a new
+    /// item to the array.
+    ///
+    /// Use \c TXMPUtils::ComposeArrayItemPath() to create a complex path.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param arrayOptions Option flags describing the array type to create; a logical OR of
+    /// allowed bit-flag constants, \c #kXMP_PropArrayIsOrdered, \c #kXMP_PropArrayIsAlternate, or
+    /// \c #kXMP_PropArrayIsAltText. If the array exists, must match the existing array type or be
+    /// null (0 or \c #kXMP_NoOptions).
+    ///
+    /// @param itemValue The new item value, a null-terminated UTF-8 string, if the array item has a
+    /// value.
+    ///
+    /// @param itemOptions Option flags describing the item type to create; one of the bit-flag
+    /// constants \c #kXMP_PropValueIsArray or \c #kXMP_PropValueIsStruct to create a complex array
+    /// item.
+
+    void AppendArrayItem ( XMP_StringPtr  schemaNS,
+						   XMP_StringPtr  arrayName,
+						   XMP_OptionBits arrayOptions,
+						   XMP_StringPtr  itemValue,
+						   XMP_OptionBits itemOptions = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c AppendArrayItem() adds an item to an array using a string object value, creating
+    /// the array if necessary.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object in which to
+	/// return the item value. It is otherwise identical; see details in the canonical form.
+
+    void AppendArrayItem ( XMP_StringPtr      schemaNS,
+						   XMP_StringPtr      arrayName,
+						   XMP_OptionBits     arrayOptions,
+						   const tStringObj & itemValue,
+						   XMP_OptionBits     itemOptions = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetStructField() creates or sets the value of a field within a nested structure.
+    ///
+    /// Use this to  set a value within an existing structure, create a new field within an existing
+    /// structure, or create an empty structure of any depth. If you set a field in a structure that
+    /// does not exist, the structure is automatically created.
+    ///
+    /// Use \c TXMPUtils::ComposeStructFieldPath() to create a complex path.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param structName The name of the struct. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param fieldNS The namespace URI for the field. Same namespace and prefix usage as
+    /// \c GetProperty().
+    ///
+    /// @param fieldName The name of the field. Must be a single XML name, must not be null or the
+    /// empty string. Same namespace and prefix usage as \c GetProperty().
+    ///
+    /// @param fieldValue The new value, a null-terminated UTF-8 string, if the field has a value.
+    /// Null to create a new, empty struct or empty field in an existing struct.
+    ///
+    /// @param options Option flags describing the property, in which the bit-flag
+    /// \c #kXMP_PropValueIsStruct must be set to create a struct.
+
+    void SetStructField ( XMP_StringPtr   schemaNS,
+						  XMP_StringPtr   structName,
+						  XMP_StringPtr   fieldNS,
+						  XMP_StringPtr   fieldName,
+						  XMP_StringPtr   fieldValue,
+						  XMP_OptionBits  options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetStructField() creates or sets the value of a field within a nested structure,
+    /// using a string object.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object in which to
+	/// return the field value. It is otherwise identical; see details in the canonical form.
+
+    void SetStructField ( XMP_StringPtr      schemaNS,
+						  XMP_StringPtr      structName,
+						  XMP_StringPtr      fieldNS,
+						  XMP_StringPtr      fieldName,
+						  const tStringObj & fieldValue,
+						  XMP_OptionBits     options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetQualifier() creates or sets a qualifier attached to a property.
+    ///
+    /// Use this to  set a value for an existing qualifier, or create a new qualifier. <<how do
+    /// options work? macro vs bit-flag? interaction w/XMP_PropHasQualifier?>> Use
+    /// \c TXMPUtils::ComposeQualifierPath() to create a complex path.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property to which the qualifier is attached. Can be a
+    /// general path expression, must not be null or the empty string; see \c GetProperty() for
+    /// namespace prefix usage.
+    ///
+    /// @param qualNS The namespace URI for the qualifier. Same namespace and prefix usage as
+    /// \c GetProperty().
+    ///
+    /// @param qualName The name of the qualifier. Must be a single XML name, must not be null or
+    /// the empty string. Same namespace and prefix usage as \c GetProperty().
+    ///
+    /// @param qualValue The new value, a null-terminated UTF-8 string, if the qualifier has a
+    /// value. Null to create a new, empty qualifier.
+    ///
+    /// @param options Option flags describing the <<qualified property? qualifier?>>, a logical OR
+    /// of property-type bit-flag constants. Use the macro \c #XMP_PropIsQualifier to create a
+    /// qualifier.	 <<??>>
+
+    void SetQualifier ( XMP_StringPtr  schemaNS,
+					    XMP_StringPtr  propName,
+					    XMP_StringPtr  qualNS,
+					    XMP_StringPtr  qualName,
+					    XMP_StringPtr  qualValue,
+					    XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetQualifier() creates or sets a qualifier attached to a property using a string object.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object
+	/// for the qualifier value. It is otherwise identical; see details in the canonical form.
+
+    void SetQualifier ( XMP_StringPtr      schemaNS,
+					    XMP_StringPtr      propName,
+					    XMP_StringPtr      qualNS,
+					    XMP_StringPtr      qualName,
+					    const tStringObj & qualValue,
+					    XMP_OptionBits     options = 0 );
+
+    /// @}
+
+    // =============================================================================================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Detecting and deleting properties.
+    /// @{
+    ///
+    /// The namespace URI and prefix usage for property specifiers in these functions is the same as
+    /// for \c TXMPMeta::GetProperty().
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DeleteProperty() deletes an XMP subtree rooted at a given property.
+    ///
+    /// It is not an error if the property does not exist.
+    ///
+    /// @param schemaNS The namespace URI for the property; see \c GetProperty().
+    ///
+    /// @param propName The name of the property; see \c GetProperty().
+
+    void DeleteProperty ( XMP_StringPtr schemaNS,
+                     	  XMP_StringPtr propName );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DeleteArrayItem() deletes an XMP subtree rooted at a given array item.
+    ///
+    /// It is not an error if the array item does not exist. Use
+    /// \c TXMPUtils::ComposeArrayItemPath() to create a complex path.
+    ///
+    /// @param schemaNS The namespace URI for the array; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param itemIndex The 1-based index of the desired item. Use the macro \c #kXMP_ArrayLastItem
+    /// to specify the last existing array item.
+
+    void DeleteArrayItem ( XMP_StringPtr schemaNS,
+						   XMP_StringPtr arrayName,
+						   XMP_Index     itemIndex );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DeleteStructField() deletes an XMP subtree rooted at a given struct field.
+    ///
+    /// It is not an error if the field does not exist.
+    ///
+    /// @param schemaNS The namespace URI for the struct; see \c GetProperty().
+    ///
+    /// @param structName The name of the struct. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param fieldNS The namespace URI for the field. Same namespace and prefix usage as
+    /// \c GetProperty().
+    ///
+    /// @param fieldName The name of the field. Must be a single XML name, must not be null or the
+    /// empty string. Same namespace and prefix usage as \c GetProperty().
+
+    void DeleteStructField ( XMP_StringPtr schemaNS,
+							 XMP_StringPtr structName,
+							 XMP_StringPtr fieldNS,
+							 XMP_StringPtr fieldName );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DeleteQualifier() deletes an XMP subtree rooted at a given qualifier.
+    ///
+    /// It is not an error if the qualifier does not exist.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property to which the qualifier is attached. Can be a
+    /// general path expression, must not be null or the empty string; see \c GetProperty() for
+    /// namespace prefix usage.
+    ///
+    /// @param qualNS The namespace URI for the qualifier. Same namespace and prefix usage as
+    /// \c GetProperty().
+    ///
+    /// @param qualName The name of the qualifier. Must be a single XML name, must not be null or
+    /// the empty string. Same namespace and prefix usage as \c GetProperty().
+
+    void DeleteQualifier ( XMP_StringPtr schemaNS,
+						   XMP_StringPtr propName,
+						   XMP_StringPtr qualNS,
+						   XMP_StringPtr qualName );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DoesPropertyExist() reports whether a property currently exists.
+    ///
+    /// @param schemaNS The namespace URI for the property; see \c GetProperty().
+    ///
+    /// @param propName The name of the property; see \c GetProperty().
+    ///
+    /// @return True if the property exists.
+
+    bool DoesPropertyExist ( XMP_StringPtr schemaNS,
+                        	 XMP_StringPtr propName ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DoesArrayItemExist() reports whether an array item currently exists.
+    ///
+    /// Use \c TXMPUtils::ComposeArrayItemPath() to create a complex path.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param itemIndex The 1-based index of the desired item. Use the macro \c #kXMP_ArrayLastItem
+    /// to specify the last existing array item.
+    ///
+    /// @return True if the array item exists.
+
+    bool DoesArrayItemExist ( XMP_StringPtr schemaNS,
+							  XMP_StringPtr arrayName,
+							  XMP_Index     itemIndex ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DoesStructFieldExist() reports whether a struct field currently exists.
+    ///
+    /// Use \c TXMPUtils::ComposeStructFieldPath() to create a complex path.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param structName The name of the struct. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param fieldNS The namespace URI for the field. Same namespace and prefix usage as
+    /// \c GetProperty().
+    ///
+    /// @param fieldName The name of the field. Must be a single XML name, must not be null or the
+    /// empty string. Same namespace and prefix usage as \c GetProperty().
+    ///
+    /// @return True if the field exists.
+
+    bool DoesStructFieldExist ( XMP_StringPtr schemaNS,
+							    XMP_StringPtr structName,
+							    XMP_StringPtr fieldNS,
+							    XMP_StringPtr fieldName ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DoesQualifierExist() reports whether a qualifier currently exists.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property to which the qualifier is attached. Can be a
+    /// general path expression, must not be null or the empty string; see \c GetProperty() for
+    /// namespace prefix usage.
+    ///
+    /// @param qualNS The namespace URI for the qualifier. Same namespace and prefix usage as
+    /// \c GetProperty().
+    ///
+    /// @param qualName The name of the qualifier. Must be a single XML name, must not be null or
+    /// the empty string. Same namespace and prefix usage as \c GetProperty().
+    ///
+    /// @return True if the qualifier exists.
+
+    bool DoesQualifierExist ( XMP_StringPtr schemaNS,
+							  XMP_StringPtr propName,
+							  XMP_StringPtr qualNS,
+							  XMP_StringPtr qualName ) const;
+
+    /// @}
+
+    // =============================================================================================
+    // Specialized Get and Set functions
+    // =============================================================================================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Accessing properties as binary values.
+    /// @{
+    ///
+	/// These are very similar to \c TXMPMeta::GetProperty() and \c TXMPMeta::SetProperty(), except
+	/// that the value is returned or provided in binary form instead of as a UTF-8 string.
+	/// \c TXMPUtils provides functions for converting between binary and string values.
+    /// Use the path composition functions in  \c TXMPUtils	to compose complex path expressions
+    /// for fields or items in nested structures or arrays, or for qualifiers.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetProperty_Bool() retrieves the value of a Boolean property as a C++ bool.
+    ///
+    /// Reports whether a property exists, and retrieves its binary value and property type information.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue [out] A buffer in which to return the binary value. Can be null if the
+    /// value is not wanted. Must be null for arrays and non-leaf levels of structs that do not have
+    /// values.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the property, a
+    /// logical OR of allowed bit-flag constants; see \c #kXMP_PropValueIsStruct and following. Can
+    /// be null if flags are not wanted.
+    ///
+    /// @return True if the property exists.
+
+    bool GetProperty_Bool ( XMP_StringPtr    schemaNS,
+						    XMP_StringPtr    propName,
+						    bool *           propValue,
+						    XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetProperty_Int() retrieves the value of an integer property as a C long integer.
+    ///
+    /// Reports whether a property exists, and retrieves its binary value and property type information.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue [out] A buffer in which to return the binary value. Can be null if the
+    /// value is not wanted. Must be null for arrays and non-leaf levels of structs that do not have
+    /// values.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the property, a
+    /// logical OR of allowed bit-flag constants; see \c #kXMP_PropValueIsStruct and following. Can
+    /// be null if flags are not wanted.
+    ///
+    /// @return True if the property exists.
+
+    bool GetProperty_Int ( XMP_StringPtr    schemaNS,
+						   XMP_StringPtr    propName,
+						   XMP_Int32 *           propValue,
+						   XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetProperty_Int64() retrieves the value of an integer property as a C long long integer.
+    ///
+    /// Reports whether a property exists, and retrieves its binary value and property type information.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue [out] A buffer in which to return the binary value. Can be null if the
+    /// value is not wanted. Must be null for arrays and non-leaf levels of structs that do not have
+    /// values.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the property, a
+    /// logical OR of allowed bit-flag constants; see \c #kXMP_PropValueIsStruct and following. Can
+    /// be null if flags are not wanted.
+    ///
+    /// @return True if the property exists.
+
+    bool GetProperty_Int64 ( XMP_StringPtr    schemaNS,
+							 XMP_StringPtr    propName,
+							 XMP_Int64 *      propValue,
+							 XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetProperty_Float() retrieves the value of a floating-point property as a C double float.
+    ///
+    /// Reports whether a property exists, and retrieves its binary value and property type information.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue [out] A buffer in which to return the binary value. Can be null if the
+    /// value is not wanted. Must be null for arrays and non-leaf levels of structs that do not have
+    /// values.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the property, a
+    /// logical OR of allowed bit-flag constants; see \c #kXMP_PropValueIsStruct and following. Can
+    /// be null if flags are not wanted.
+    ///
+    /// @return True if the property exists.
+
+    bool GetProperty_Float ( XMP_StringPtr    schemaNS,
+							 XMP_StringPtr    propName,
+							 double *         propValue,
+							 XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetProperty_Date() retrieves the value of a date-time property as an \c #XMP_DateTime structure.
+    ///
+    /// Reports whether a property exists, and retrieves its binary value and property type information.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue [out] A buffer in which to return the binary value. Can be null if the
+    /// value is not wanted. Must be null for arrays and non-leaf levels of structs that do not have
+    /// values.
+    ///
+    /// @param options [out] A buffer in which to return the option flags describing the property, a
+    /// logical OR of allowed bit-flag constants; see \c #kXMP_PropValueIsStruct and following. Can
+    /// be null if flags are not wanted.
+    ///
+    /// @return True if the property exists.
+
+    bool GetProperty_Date ( XMP_StringPtr    schemaNS,
+						    XMP_StringPtr    propName,
+						    XMP_DateTime *   propValue,
+						    XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProperty_Bool() sets the value of a Boolean property using a C++ bool.
+    ///
+    /// Sets a property with a binary value, creating it if necessary.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue The new binary value. Can be null if creating the property. Must be null
+    /// for arrays and non-leaf levels of structs that do not have values.
+    ///
+    /// @param options Option flags describing the property; a logical OR of allowed bit-flag
+    /// constants; see \c #kXMP_PropValueIsStruct and following. Must match the type of a property
+    /// that already exists.
+
+    void SetProperty_Bool ( XMP_StringPtr  schemaNS,
+						    XMP_StringPtr  propName,
+						    bool           propValue,
+						    XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProperty_Int() sets the value of an integer property using a C long integer.
+    ///
+    /// Sets a property with a binary value, creating it if necessary.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue The new binary value. Can be null if creating the property. Must be null
+    /// for arrays and non-leaf levels of structs that do not have values.
+    ///
+    /// @param options Option flags describing the property; a logical OR of allowed bit-flag
+    /// constants; see \c #kXMP_PropValueIsStruct and following. Must match the type of a property
+    /// that already exists.
+
+    void SetProperty_Int ( XMP_StringPtr  schemaNS,
+						   XMP_StringPtr  propName,
+						   XMP_Int32      propValue,
+						   XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProperty_Int64() sets the value of an integer property using a C long long integer.
+    ///
+    /// Sets a property with a binary value, creating it if necessary.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue The new binary value. Can be null if creating the property. Must be null
+    /// for arrays and non-leaf levels of structs that do not have values.
+    ///
+    /// @param options Option flags describing the property; a logical OR of allowed bit-flag
+    /// constants; see \c #kXMP_PropValueIsStruct and following. Must match the type of a property
+    /// that already exists.
+
+    void SetProperty_Int64 ( XMP_StringPtr  schemaNS,
+							 XMP_StringPtr  propName,
+							 XMP_Int64     propValue,
+							 XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProperty_Float() sets the value of a floating-point property using a C double float.
+    ///
+    /// Sets a property with a binary value, creating it if necessary.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue The new binary value. Can be null if creating the property. Must be null
+    /// for arrays and non-leaf levels of structs that do not have values.
+    ///
+    /// @param options Option flags describing the property; a logical OR of allowed bit-flag
+    /// constants; see \c #kXMP_PropValueIsStruct and following. Must match the type of a property
+    /// that already exists.
+
+    void SetProperty_Float ( XMP_StringPtr  schemaNS,
+							 XMP_StringPtr  propName,
+							 double         propValue,
+							 XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetProperty_Date() sets the value of a date/time property using an \c #XMP_DateTime structure.
+    ///
+    /// Sets a property with a binary value, creating it if necessary.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param propValue The new binary value. Can be null if creating the property. Must be null
+    /// for arrays and non-leaf levels of structs that do not have values.
+    ///
+    /// @param options Option flags describing the property; a logical OR of allowed bit-flag
+    /// constants; see \c #kXMP_PropValueIsStruct and following. Must match the type of a property
+    /// that already exists.
+
+    void SetProperty_Date ( XMP_StringPtr         schemaNS,
+						    XMP_StringPtr         propName,
+						    const XMP_DateTime &  propValue,
+						    XMP_OptionBits        options = 0 );
+
+    /// @}
+    // =============================================================================================
+    /// \name Accessing localized text (alt-text) properties.
+    /// @{
+    ///
+	/// Localized text properties are stored in alt-text arrays. They allow multiple concurrent
+	/// localizations of a property value, for example a document title or copyright in several
+	/// languages.
+    ///
+    /// These functions provide convenient support for localized text properties, including a
+    /// number of special and obscure aspects. The most important aspect of these functions is that
+    /// they select an appropriate array item based on one or two RFC 3066 language tags. One of
+    /// these languages, the "specific" language, is preferred and selected if there is an exact
+    /// match. For many languages it is also possible to define a "generic" language that can be
+    /// used if there is no specific language match. The generic language must be a valid RFC 3066
+    /// primary subtag, or the empty string.
+    ///
+    /// For example, a specific language of "en-US" should be used in the US, and a specific
+    /// language of "en-UK" should be used in England. It is also appropriate to use "en" as the
+    /// generic language in each case. If a US document goes to England, the "en-US" title is
+    /// selected by using the "en" generic language and the "en-UK" specific language.
+    ///
+    /// It is considered poor practice, but allowed, to pass a specific language that is just an
+    /// RFC 3066 primary tag. For example "en" is not a good specific language, it should only be
+    /// used as a generic language. Passing "i" or "x" as the generic language is also considered
+    /// poor practice but allowed.
+    ///
+    /// Advice from the W3C about the use of RFC 3066 language tags can be found at:
+    ///     \li http://www.w3.org/International/articles/language-tags/
+    ///
+    /// \note RFC 3066 language tags must be treated in a case insensitive manner. The XMP toolkit
+    /// does this by normalizing their capitalization:
+ 	/// 	\li The primary subtag is lower case, the suggested practice of ISO 639.
+	/// 	\li All 2 letter secondary subtags are upper case, the suggested practice of ISO 3166.
+	/// 	\li All other subtags are lower case.
+    ///
+    /// The XMP specification defines an artificial language, "x-default", that is used to
+    /// explicitly denote a default item in an alt-text array. The XMP toolkit normalizes alt-text
+    /// arrays such that the x-default item is the first item. The \c SetLocalizedText() function
+    /// has several special features related to the x-default item, see its description for details.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetLocalizedText() retrieves information about a selected item in an alt-text array.
+    ///
+    /// The array item is selected according to these rules:
+    ///   \li Look for an exact match with the specific language.
+    ///   \li If a generic language is given, look for a partial match.
+    ///   \li Look for an x-default item.
+    ///   \li Choose the first item.
+    ///
+    /// A partial match with the generic language is where the start of the item's language matches
+    /// the generic string and the next character is '-'. An exact match is also recognized as a
+    /// degenerate case.
+    ///
+    /// You can pass "x-default" as the specific language. In this case, selection of an
+    /// \c x-default item is an exact match by the first rule, not a selection by the 3rd rule. The
+    /// last 2 rules are fallbacks used when the specific and generic languages fail to produce a
+    /// match.
+    ///
+    /// The return value reports whether a match was successfully made.
+    ///
+    /// @param schemaNS The namespace URI for the alt-text array; see \c GetProperty().
+    ///
+    /// @param altTextName The name of the alt-text array. Can be a general path expression, must
+    /// not be null or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param genericLang The name of the generic language as an RFC 3066 primary subtag. Can be
+    /// null or the empty string if no generic language is wanted.
+    ///
+    /// @param specificLang The name of the specific language as an RFC 3066 tag, or "x-default".
+    /// Must not be null or the empty string.
+    ///
+    /// @param actualLang [out] A string object in which to return the language of the selected
+    /// array item, if an appropriate array item is found. Can be null if the language is not wanted.
+    ///
+    /// @param itemValue [out] A string object in which to return the value of the array item, if an
+    /// appropriate array item is found. Can be null if the value is not wanted.
+    ///
+    /// @param options A buffer in which to return the option flags that describe the array item, if
+    /// an appropriate array item is found. Can be null if the flags are not wanted.
+    ///
+    /// @return True if an appropriate array item exists.
+
+    bool GetLocalizedText ( XMP_StringPtr    schemaNS,
+						    XMP_StringPtr    altTextName,
+						    XMP_StringPtr    genericLang,
+						    XMP_StringPtr    specificLang,
+						    tStringObj *     actualLang,
+						    tStringObj *     itemValue,
+						    XMP_OptionBits * options ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetLocalizedText() modifies the value of a selected item in an alt-text array.
+    ///
+    /// Creates an appropriate array item if necessary, and handles special cases for the x-default
+    /// item.
+    ///
+    /// The array item is selected according to these rules:
+    ///   \li Look for an exact match with the specific language.
+    ///   \li If a generic language is given, look for a partial match.
+    ///   \li Look for an x-default item.
+    ///   \li Choose the first item.
+    ///
+    /// A partial match with the generic language is where the start of the item's language matches
+    /// the generic string and the next character is '-'. An exact match is also recognized as a
+    /// degenerate case.
+    ///
+    /// You can pass "x-default" as the specific language. In this case, selection of an
+    /// \c x-default item is an exact match by the first rule, not a selection by the 3rd rule. The
+    /// last 2 rules are fallbacks used when the specific and generic languages fail to produce a
+    /// match.
+    ///
+    /// Item values are modified according to these rules:
+    ///
+    ///   \li If the selected item is from a match with the specific language, the value of that
+    ///   item is modified. If the existing value of that item matches the existing value of the
+    ///   x-default item, the x-default item is also modified. If the array only has 1 existing item
+    ///   (which is not x-default), an x-default item is added with the given value.
+    ///
+    ///   \li If the selected item is from a match with the generic language and there are no other
+    ///   generic matches, the value of that item is modified. If the existing value of that item
+    ///   matches the existing value of the x-default item, the x-default item is also modified. If
+    ///   the array only has 1 existing item (which is not x-default), an x-default item is added
+    ///   with the given value.
+    ///
+    ///   \li If the selected item is from a partial match with the generic language and there are
+    ///   other partial matches, a new item is created for the specific language. The x-default item
+    ///   is not modified.
+    ///
+    ///   \li If the selected item is from the last 2 rules then a new item is created for the
+    ///   specific language. If the array only had an x-default item, the x-default item is also
+    ///   modified. If the array was empty, items are created for the specific language and
+    ///   x-default.
+    ///
+    /// @param schemaNS The namespace URI for the alt-text array; see \c GetProperty().
+    ///
+    /// @param altTextName The name of the alt-text array. Can be a general path expression, must
+    /// not be null or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param genericLang The name of the generic language as an RFC 3066 primary subtag. Can be
+    /// null or the empty string if no generic language is wanted.
+    ///
+    /// @param specificLang The name of the specific language as an RFC 3066 tag, or "x-default".
+    /// Must not be null or the empty string.
+    ///
+    /// @param itemValue The new value for the matching array item, specified as a null-terminated
+    /// UTF-8 string.
+    ///
+    /// @param options Option flags, none currently defined.
+
+    void SetLocalizedText ( XMP_StringPtr  schemaNS,
+						    XMP_StringPtr  altTextName,
+						    XMP_StringPtr  genericLang,
+						    XMP_StringPtr  specificLang,
+						    XMP_StringPtr  itemValue,
+						    XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetLocalizedText() modifies the value of a selected item in an alt-text array using
+    /// a string object.
+    ///
+    /// Creates an appropriate array item if necessary, and handles special cases for the x-default
+    /// item.
+    ///
+    /// The array item is selected according to these rules:
+    ///   \li Look for an exact match with the specific language.
+    ///   \li If a generic language is given, look for a partial match.
+    ///   \li Look for an x-default item.
+    ///   \li Choose the first item.
+    ///
+    /// A partial match with the generic language is where the start of the item's language matches
+    /// the generic string and the next character is '-'. An exact match is also recognized as a
+    /// degenerate case.
+    ///
+    /// You can pass "x-default" as the specific language. In this case, selection of an \c x-default
+    /// item is an exact match by the first rule, not a selection by the 3rd rule. The last 2 rules
+    /// are fallbacks used when the specific and generic languages fail to produce a match.
+    ///
+    /// Item values are modified according to these rules:
+    ///
+    ///   \li If the selected item is from a match with the specific language, the value of that
+    ///   item is modified. If the existing value of that item matches the existing value of the
+    ///   x-default item, the x-default item is also modified. If the array only has 1 existing item
+    ///   (which is not x-default), an x-default item is added with the given value.
+    ///
+    ///   \li If the selected item is from a match with the generic language and there are no other
+    ///   generic matches, the value of that item is modified. If the existing value of that item
+    ///   matches the existing value of the x-default item, the x-default item is also modified. If
+    ///   the array only has 1 existing item (which is not x-default), an x-default item is added
+    ///   with the given value.
+    ///
+    ///   \li If the selected item is from a partial match with the generic language and there are
+    ///   other partial matches, a new item is created for the specific language. The x-default item
+    ///   is not modified.
+    ///
+    ///   \li If the selected item is from the last 2 rules then a new item is created for the
+    ///   specific language. If the array only had an x-default item, the x-default item is also
+    ///   modified. If the array was empty, items are created for the specific language and
+    ///   x-default.
+    ///
+    /// @param schemaNS The namespace URI for the alt-text array; see \c GetProperty().
+    ///
+    /// @param altTextName The name of the alt-text array. Can be a general path expression, must
+    /// not be null or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param genericLang The name of the generic language as an RFC 3066 primary subtag. Can be
+    /// null or the empty string if no generic language is wanted.
+    ///
+    /// @param specificLang The name of the specific language as an RFC 3066 tag, or "x-default".
+    /// Must not be null or the empty string.
+    ///
+    /// @param itemValue The new value for the matching array item, specified as a string object.
+    ///
+    /// @param options Option flags, none currently defined.
+
+    void SetLocalizedText ( XMP_StringPtr      schemaNS,
+						    XMP_StringPtr      altTextName,
+						    XMP_StringPtr      genericLang,
+						    XMP_StringPtr      specificLang,
+						    const tStringObj & itemValue,
+						    XMP_OptionBits     options = 0 );
+	
+    // ---------------------------------------------------------------------------------------------
+	/// @brief \c DeleteLocalizedText() deletes specific language alternatives from an alt-text array.
+	///
+	///	The rules for finding the language value to delete are similar to those for \c #SetLocalizedText().
+	///
+	/// @param schemaNS The namespace URI for the alt-text array; see \c #GetProperty().
+	///
+	/// @param altTextName The name of the alt-text array. Can be a general path expression, must
+	/// not be null or the empty string; see \c #GetProperty() for namespace prefix usage.
+	///
+	/// @param genericLang The name of the generic language as an RFC 3066 primary subtag. Can be
+	/// null or the empty string if no generic language is wanted.
+	///
+	/// @param specificLang The name of the specific language as an RFC 3066 tag, or "x-default".
+	/// Must not be null or the empty string.
+    ///
+	void
+	DeleteLocalizedText ( XMP_StringPtr    schemaNS,
+							XMP_StringPtr    altTextName,
+							XMP_StringPtr    genericLang,
+							XMP_StringPtr    specificLang );
+
+	/// @}
+
+   	// =============================================================================================
+    /// \name Creating and reading serialized RDF.
+    /// @{
+    ///
+	/// The metadata contained in an XMP object must be serialized as RDF for storage in an XMP
+	/// packet and output to a file. Similarly, metadata in the form of serialized RDF (such as
+	/// metadata read from a file using \c TXMPFiles) must be parsed into an XMP object for
+	/// manipulation with the XMP Toolkit.
+	///
+	/// These functions support parsing serialized RDF into an XMP object, and serializing an XMP
+    /// object into RDF. The input for parsing can be any valid Unicode encoding. ISO Latin-1 is
+    /// also recognized, but its use is strongly discouraged. Serialization is always as UTF-8.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ParseFromBuffer() parses RDF from a series of input buffers into this XMP object.
+    ///
+    /// Use this to convert metadata from serialized RDF form (as, for example, read from an XMP
+    /// packet embedded in a file) into an XMP object that you can manipulate with the XMP Toolkit.
+    /// If this XMP object is empty and the input buffer contains a complete XMP packet, this is the
+    /// same as creating a new XMP object from that buffer with the constructor.
+    ///
+    /// You can use this function to combine multiple buffers into a single metadata tree. To
+    /// terminate an input loop conveniently, pass  the option \c #kXMP_ParseMoreBuffers for all
+    /// real input, then make a final call with a zero length and \c #kXMP_NoOptions. The buffers
+    /// can be any length. The buffer boundaries need not respect XML tokens or even Unicode
+    /// characters.
+    ///
+    /// @param buffer A pointer to a buffer of input. Can be null if \c bufferSize is 0.
+    ///
+    /// @param bufferSize The length of the input buffer in bytes. Zero is a valid value.
+    ///
+    /// @param options An options flag that controls how the parse operation is performed. A logical
+    /// OR of these bit-flag constants:
+    ///   \li \c #kXMP_ParseMoreBuffers - This is not the last buffer of input, more calls follow.
+    ///   \li \c #kXMP_RequireXMPMeta - The \c x:xmpmeta XML element is required around \c rdf:RDF.
+    ///
+    /// @see \c TXMPFiles::GetXMP()
+
+    void ParseFromBuffer ( XMP_StringPtr  buffer,
+						   XMP_StringLen  bufferSize,
+						   XMP_OptionBits options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SerializeToBuffer() serializes metadata in this XMP object into a string as RDF.
+    ///
+    /// Use this to prepare metadata for storage as an XMP packet embedded in a file. See \c TXMPFiles::PutXMP().
+    ///
+    /// @param rdfString [out] A string object in which to return the serialized RDF. Must not be null.
+    ///
+    /// @param options An options flag that controls how the serialization operation is performed.
+    /// The specified options must be logically consistent; an exception is thrown if they are not.
+    /// A logical OR of these bit-flag constants:
+    ///   \li \c kXMP_OmitPacketWrapper - Do not include an XML packet wrapper. This cannot be
+    ///   specified together with \c #kXMP_ReadOnlyPacket, \c #kXMP_IncludeThumbnailPad, or
+    ///   \c #kXMP_ExactPacketLength.
+    ///   \li \c kXMP_ReadOnlyPacket - Create a read-only XML packet wapper. Cannot be specified
+    ///   together with \c kXMP_OmitPacketWrapper.
+    ///   \li \c kXMP_UseCompactFormat - Use a highly compact RDF syntax and layout.
+    ///   \li \c kXMP_IncludeThumbnailPad - Include typical space for a JPEG thumbnail in the
+    ///   padding if no \c xmp:Thumbnails property is present. Cannot be specified together with
+    ///   \c kXMP_OmitPacketWrapper.
+    ///   \li \c kXMP_ExactPacketLength - The padding parameter provides the overall packet length.
+    ///   The actual amount of padding is computed. An exception is thrown if the packet exceeds
+    ///   this length with no padding.	Cannot be specified together with
+    ///   \c kXMP_OmitPacketWrapper.
+    ///
+    /// In addition to the above options, you can include one of the following encoding options:
+    ///   \li \c #kXMP_EncodeUTF8 - Encode as UTF-8, the default.
+    ///   \li \c #kXMP_EncodeUTF16Big - Encode as big-endian UTF-16.
+    ///   \li \c #kXMP_EncodeUTF16Little - Encode as little-endian UTF-16.
+    ///   \li \c #kXMP_EncodeUTF32Big - Encode as big-endian UTF-32.
+    ///   \li \c #kXMP_EncodeUTF32Little - Encode as little-endian UTF-32.
+    ///
+    /// @param padding The amount of padding to be added if a writeable XML packet is created. If
+    /// zero (the default) an appropriate amount of padding is computed.
+    ///
+    /// @param newline The string to be used as a line terminator. If empty, defaults to linefeed,
+    /// U+000A, the standard XML newline.
+    ///
+    /// @param indent The string to be used for each level of indentation in the serialized RDF. If
+    /// empty, defaults to two ASCII spaces, U+0020.
+    ///
+    /// @param baseIndent The number of levels of indentation to be used for the outermost XML
+    /// element in the serialized RDF. This is convenient when embedding the RDF in other text.
+
+    void SerializeToBuffer ( tStringObj *   rdfString,
+							 XMP_OptionBits options,
+							 XMP_StringLen  padding,
+							 XMP_StringPtr  newline,
+							 XMP_StringPtr  indent = "",
+							 XMP_Index      baseIndent = 0 ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SerializeToBuffer() serializes metadata in this XMP object into a string as RDF.
+    ///
+    /// This simpler form of the function uses default values for the \c newline, \c indent, and
+    /// \c baseIndent parameters.
+    ///
+    /// @param rdfString [out] A string object in which to return the serialized RDF. Must not be null.
+    ///
+    /// @param options An options flag that controls how the serialization operation is performed.
+    /// The specified options must be logically consistent; an exception is thrown if they are not.
+    /// A logical OR of these bit-flag constants:
+    ///   \li \c kXMP_OmitPacketWrapper - Do not include an XML packet wrapper. This cannot be
+    ///   specified together with \c #kXMP_ReadOnlyPacket, \c #kXMP_IncludeThumbnailPad, or
+    ///   \c #kXMP_ExactPacketLength.
+    ///   \li \c kXMP_ReadOnlyPacket - Create a read-only XML packet wapper. Cannot be specified
+    ///   together with \c kXMP_OmitPacketWrapper.
+    ///   \li \c kXMP_UseCompactFormat - Use a highly compact RDF syntax and layout.
+    ///   \li \c kXMP_IncludeThumbnailPad - Include typical space for a JPEG thumbnail in the
+    ///   padding if no \c xmp:Thumbnails property is present. Cannot be specified together with
+    ///   \c kXMP_OmitPacketWrapper.
+    ///   \li \c kXMP_ExactPacketLength - The padding parameter provides the overall packet length.
+    ///   The actual amount of padding is computed. An exception is thrown if the packet exceeds
+    ///   this length with no padding.	Cannot be specified together with
+    ///   \c kXMP_OmitPacketWrapper.
+    ///
+    /// In addition to the above options, you can include one of the following encoding options:
+    ///   \li \c #kXMP_EncodeUTF8 - Encode as UTF-8, the default.
+    ///   \li \c #kXMP_EncodeUTF16Big - Encode as big-endian UTF-16.
+    ///   \li \c #kXMP_EncodeUTF16Little - Encode as little-endian UTF-16.
+    ///   \li \c #kXMP_EncodeUTF32Big - Encode as big-endian UTF-32.
+    ///   \li \c #kXMP_EncodeUTF32Little - Encode as little-endian UTF-32.
+    ///
+    /// @param padding The amount of padding to be added if a writeable XML packet is created.
+    /// If zero (the default) an appropriate amount of padding is computed.
+
+    void SerializeToBuffer ( tStringObj *   rdfString,
+							 XMP_OptionBits options = 0,
+							 XMP_StringLen  padding = 0 ) const;
+
+    /// @}
+    // =============================================================================================
+    // Miscellaneous Member Functions
+    // ==============================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Helper functions.
+    /// @{
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Retrieves an internal reference that can be safely passed across DLL boundaries and
+    /// reconstructed.
+    ///
+    /// The \c TXMPMeta class is a normal C++ template, it is instantiated and local to each client
+    /// executable, as are the other \c TXMP* classes. Different clients might not use the same
+    /// string type to instantiate \c TXMPMeta.
+    ///
+    /// Because of this you should not pass \c SXMPMeta objects, or pointers to \c SXMPMeta objects,
+    /// across DLL boundaries. Use this function to obtain a safe internal reference that you can
+    /// pass, then construct a local object on the callee side. This construction does not create a
+    /// cloned XMP tree, it is the same underlying XMP object safely wrapped in each client's
+    /// \c SXMPMeta object.
+    ///
+    /// Use this function and the associated constructor like this:
+    ///   \li The callee's header contains:
+    /// <pre>
+    /// CalleeMethod ( XMPMetaRef xmpRef );
+    /// </pre>
+    ///
+    ///   \li The caller's code contains:
+    /// <pre>
+    /// SXMPMeta callerXMP;
+    /// CalleeMethod ( callerXMP.GetInternalRef() );
+    /// </pre>
+    ///
+    ///   \li The callee's code contains:
+    /// <pre>
+    /// SXMPMeta calleeXMP ( xmpRef );
+    /// </pre>
+    ///
+    /// @return The reference object.
+
+    XMPMetaRef GetInternalRef() const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c GetObjectName() retrieves the client-assigned name of this XMP object.
+    ///
+    /// Assign this name with \c SetObjectName().
+    ///
+    /// @param name [out] A string object in which to return the name.
+
+    void GetObjectName ( tStringObj * name ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetObjectName() assigns a name to this XMP object.
+    ///
+    /// Retrieve this client-assigned name with \c GetObjectName().
+    ///
+    /// @param name The name as a null-terminated UTF-8 string.
+
+    void SetObjectName ( XMP_StringPtr name );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetObjectName() assigns a name to this XMP object.
+    ///
+    /// Retrieve this client-assigned name with \c GetObjectName().
+    ///
+    /// @param name The name as a string object.
+
+    void SetObjectName ( tStringObj name );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c Sort() sorts the data model tree of an XMP object.
+    ///
+    /// Use this function to sort the data model of an XMP object into a canonical order. This can
+    /// be convenient when comparing data models, (e.g. by text comparison of DumpObject output).
+    ///
+    /// At the top level the namespaces are sorted by their prefixes. Within a namespace, the top
+    /// level properties are sorted by name. Within a struct, the fields are sorted by their
+    /// qualified name, i.e. their XML prefix:local form. Unordered arrays of simple items are
+    /// sorted by value. Language Alternative arrays are sorted by the xml:lang qualifiers, with
+    /// the "x-default" item placed first.
+    
+    void Sort();
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c Erase() restores the object to a "just constructed" state.
+    
+    void Erase();
+    
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c Clone() creates a deep copy of an XMP object.
+    ///
+    /// Use this function to copy an entire XMP metadata tree. Assignment and copy constructors only
+    /// increment a reference count, they do not do a deep copy. This function returns an object,
+    /// not a pointer. The following shows correct usage:
+    ///
+    /// <pre>
+    /// SXMPMeta * clone1 = new SXMPMeta ( sourceXMP.Clone() );  // This works.
+    /// SXMPMeta   clone2 ( sourceXMP.Clone );  	// This works also. (Not a pointer.)
+    /// </pre>
+    /// The \c clone2 example does not use an explicit pointer.
+    /// This is good for local usage, protecting against memory leaks.
+    ///
+    /// This is an example of incorrect usage:
+    /// <pre>
+    /// SXMPMeta * clone3 = &sourceXMP.Clone();		// ! This does not work!
+    /// </pre>
+    /// The assignment to \c clone3 creates a temporary object, initializes it with the clone,
+    /// assigns the address of the temporary to \c clone3, then deletes the temporary.
+    ///
+    /// @param options Option flags, not currently defined..
+    ///
+    /// @return An XMP object cloned from the original.
+
+    TXMPMeta Clone ( XMP_OptionBits options = 0 ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CountArrayItems() reports the number of items currently defined in an array.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @return The number of items.
+
+    XMP_Index CountArrayItems ( XMP_StringPtr schemaNS,
+                      			XMP_StringPtr arrayName ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DumpObject() outputs the content of an XMP object to a callback handler for debugging.
+    ///
+    /// Invokes a client-defined callback for each line of output.
+    ///
+    /// @param outProc The client-defined procedure to handle each line of output.
+    ///
+    /// @param clientData A pointer to client-defined data to pass to the handler.
+    ///
+    /// @return	A success-fail status value, returned from the handler. Zero is success, failure
+    /// values are client-defined.
+    ///
+    /// @see Static function \c DumpNamespaces()
+
+    XMP_Status DumpObject ( XMP_TextOutputProc outProc,
+                 			void *	           clientData ) const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief Not implemented
+    XMP_OptionBits GetObjectOptions() const;
+
+    // ---------------------------------------------------------------------------------------------
+    /// \brief Not implemented
+    void SetObjectOptions ( XMP_OptionBits options );
+
+    /// @}
+
+    // =============================================================================================
+    // Error notifications
+    // ===================
+
+    // ---------------------------------------------------------------------------------------------
+    /// \name Error notifications
+    /// @{
+	///
+	/// From the beginning through version 5.5, XMP Tookit errors result in throwing an \c XMP_Error
+	/// exception. For the most part exceptions were thrown early and thus API calls aborted as soon
+	/// as an error was detected. Starting in version 5.5, support has been added for notifications
+	/// of errors arising in calls to \c TXMPMeta functions.
+	///
+	/// A client can register an error notification callback function for a \c TXMPMeta object. This
+	/// can be done as a global default or individually to each object. The global default applies
+	/// to all objects created after it is registered. Within the object there is no difference
+	/// between the global default or explicitly registered callback. The callback function returns
+	/// a \c bool value indicating if recovery should be attempted (true) or an exception thrown
+	/// (false). If no callback is registered, a best effort at recovery and continuation will be
+	/// made with an exception thrown if recovery is not possible.
+	///
+	/// The number of notifications delivered for a given TXMPMeta object can be limited. This is
+	/// intended to reduce chatter from multiple or cascading errors. The limit is set when the
+	/// callback function is registered. This limits the number of notifications of the highest
+	/// severity delivered or less. If a higher severity error occurs, the counting starts again.
+	/// The limit and counting can be reset at any time, see \c ResetErrorCallbackLimit.
+	
+	//  --------------------------------------------------------------------------------------------
+	/// @brief SetDefaultErrorCallback() registers a global default error notification callback.
+	///
+	/// @param proc The client's callback function.
+	///
+	/// @param context Client-provided context for the callback.
+	///
+	/// @param limit A limit on the number of notifications to be delivered.
+	
+	static void SetDefaultErrorCallback ( XMPMeta_ErrorCallbackProc proc, void* context = 0, XMP_Uns32 limit = 1 );
+	
+	//  --------------------------------------------------------------------------------------------
+	/// @brief SetErrorCallback() registers an error notification callback.
+	///
+	/// @param proc The client's callback function.
+	///
+	/// @param context Client-provided context for the callback.
+	///
+	/// @param limit A limit on the number of notifications to be delivered.
+	
+	void SetErrorCallback ( XMPMeta_ErrorCallbackProc proc, void* context = 0, XMP_Uns32 limit = 1 );
+	
+	//  --------------------------------------------------------------------------------------------
+	/// @brief ResetErrorCallbackLimit() resets the error notification limit and counting. It has no
+	/// effect if an error notification callback function is not registered. 
+	///
+	/// @param limit A limit on the number of notifications to be delivered.
+	
+	void ResetErrorCallbackLimit ( XMP_Uns32 limit = 1 );
+
+    /// @}
+
+    // =============================================================================================
+
+    XMPMetaRef xmpRef;  // *** Should be private, see below.
+
+private:
+
+#if 0	// *** VS.Net and gcc seem to not handle the friend declarations properly.
+    friend class TXMPIterator <class tStringObj>;
+    friend class TXMPUtils <class tStringObj>;
+#endif
+
+	static void SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen );
+
+};  // class TXMPMeta
+
+#endif  // __TXMPMeta_hpp__
diff --git a/public/include/TXMPUtils.hpp b/public/include/TXMPUtils.hpp
new file mode 100644
index 0000000..79ade07
--- /dev/null
+++ b/public/include/TXMPUtils.hpp
@@ -0,0 +1,967 @@
+#ifndef __TXMPUtils_hpp__
+#define __TXMPUtils_hpp__ 1
+
+#if ( ! __XMP_hpp__ )
+    #error "Do not directly include, use XMP.hpp"
+#endif
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+// =================================================================================================
+/// \file TXMPUtils.hpp
+/// \brief API for access to the XMP Toolkit utility services.
+///
+/// \c TXMPUtils is the template class providing utility services for the XMP Toolkit. It must be
+/// instantiated with a string class such as \c std::string. See the instructions in XMP.hpp, and
+/// the Overview for a discussion of the overall architecture of the XMP API.
+// =================================================================================================
+
+// =================================================================================================
+/// \class TXMPUtils TXMPUtils.hpp
+/// @brief API for access to the XMP Toolkit utility services.
+///
+/// \c TXMPUtils is a template class which must be instantiated with a string class such as
+/// \c std::string. See the instructions in XMP.hpp, and the Overview for a discussion of the overall
+/// architecture of the XMP API.
+///
+/// This class defines helper functions that support the basic metadata manipulation provided by
+/// \c TXMPMeta. All of the functions are static; that is, you call them directly from the concrete
+/// class (\c SXMPUtils), which is never itself instantiated.
+///
+/// General categories of utilities include:
+///
+///   \li Composing complex path expressions, which you can then pass to the property access
+///   functions in \c TXMPMeta
+///   \li Converting between binary and string forms of property values
+///   \li Manipulating date/time values
+///   \li Encoding and decoding base-64 strings
+///   \li JPEG file handling
+///   \li Editing aids for creating a user interface for the XMP Toolkit
+// =================================================================================================
+
+template <class tStringObj> class TXMPUtils {
+
+public:
+
+    // =============================================================================================
+    // No constructors or destructor declared or needed
+    // ================================================
+
+    //  ============================================================================================
+    /// \name Path composition
+    /// @{
+    ///
+    /// These functions provide support for composing path expressions to deeply nested properties.
+    /// The functions in \c TXMPMeta such as \c TXMPMeta::GetProperty(),
+    /// \c TXMPMeta::GetArrayItem(), and \c TXMPMeta::GetStructField() provide easy access to top level
+    /// simple properties, items in top level arrays, and fields of top level structs.	They are
+    /// not as convenient for more complex things, such as fields several levels deep in a complex
+    /// struct, or fields within an array of structs, or items of an array that is a field of a
+    /// struct. You can use these utility functions to compose these paths, which you can then pass
+    /// to the property access functions. You can also compose	paths to top-level array items or
+	/// struct fields so that you can use the binary accessors such as
+	/// \c TXMPMeta::GetProperty_Int().
+    ///
+    /// You can use these functions is to compose a complete path expression, or all but the last
+    /// component. For example, suppose you have a property that is an array of integers within a
+    /// struct. You can access one of the array items like this:
+    ///
+    /// <pre>
+    ///   SXMPUtils::ComposeStructFieldPath ( schemaNS, "Struct", fieldNS, "Array", &path );
+    ///   SXMPUtils::ComposeArrayItemPath ( schemaNS, path, index, &path );
+    ///   exists = xmpObj.GetProperty_Int ( schemaNS, path, &value, &options );
+    /// </pre>
+    ///
+    /// You could also use this code if you want the string form of the integer:
+    ///
+    /// <pre>
+    ///   SXMPUtils::ComposeStructFieldPath ( schemaNS, "Struct", fieldNS, "Array", &path );
+    ///   xmpObj.GetArrayItem ( schemaNS, path, index, &value, &options );
+    /// </pre>
+    ///
+    /// \note It might look confusing that the \c schemaNS is passed in all of the calls above. This
+    /// is because the XMP Toolkit keeps the top-level "schema" namespace separate from the rest of
+    /// the path expression.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ComposeArrayItemPath() composes the path expression for an item in an array.
+    ///
+    /// The returned string is in the form <tt>ns:arrayName[i]</tt>, where "ns" is the prefix for
+    /// the specified namespace, and "i" is the decimal representation of specified item index.
+    /// If the last item was specified, the path is <tt>ns:arrayName[last()]</tt>.
+    ///
+    /// @param schemaNS The namespace URI for the array; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param itemIndex The 1-based index of the desired item. Use the macro
+    /// \c #kXMP_ArrayLastItem to specify the last existing array item.
+    ///
+    /// @param fullPath [out] A string in which to return the composed path.
+
+    static void ComposeArrayItemPath ( XMP_StringPtr schemaNS,
+									   XMP_StringPtr arrayName,
+									   XMP_Index     itemIndex,
+									   tStringObj *  fullPath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ComposeStructFieldPath() composes the path expression for a field in a struct.
+    ///
+    /// The returned string is in the form <tt>ns:structName/fNS:fieldName</tt>, where "ns" is the
+    /// prefix for the schema namespace, and "fNS" is the prefix for field namespace.
+    ///
+    /// @param schemaNS The namespace URI for the struct; see \c GetProperty().
+    ///
+    /// @param structName The name of the struct. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param fieldNS The namespace URI for the field. Same URI and prefix usage as the
+    /// \c schemaNS and \c structName parameters.
+    ///
+    /// @param fieldName The name of the field. Must be a single XML name, must not be null or the
+    /// empty string. Same URI and prefix usage as the \c schemaNS and \c structName parameters.
+    ///
+    /// @param fullPath [out] A string in which to return the composed path.
+
+    static void ComposeStructFieldPath ( XMP_StringPtr schemaNS,
+										 XMP_StringPtr structName,
+										 XMP_StringPtr fieldNS,
+										 XMP_StringPtr fieldName,
+										 tStringObj *  fullPath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ComposeQualifierPath() composes the path expression for a qualifier.
+    ///
+    /// The returned string is in the form <tt>ns:propName/?qNS:qualName</tt>, where "ns" is the
+    /// prefix for the schema namespace, and "qNS" is the prefix for the qualifier namespace.
+    ///
+    /// @param schemaNS The namespace URI; see \c GetProperty().
+    ///
+    /// @param propName The name of the property to which the qualifier is attached. Can be a
+    /// general path expression, must not be null or the empty string; see \c GetProperty() for
+    /// namespace prefix usage.
+    ///
+    /// @param qualNS The namespace URI for the qualifier. Same URI and prefix usage as the
+    /// \c schemaNS and \c propName parameters.
+    ///
+    /// @param qualName The name of the qualifier. Must be a single XML name, must not be null or the
+    /// empty string. Same URI and prefix usage as the \c schemaNS and \c propName parameters.
+    ///
+    /// @param fullPath [out] A string in which to return the composed path.
+
+    static void ComposeQualifierPath ( XMP_StringPtr schemaNS,
+									   XMP_StringPtr propName,
+									   XMP_StringPtr qualNS,
+									   XMP_StringPtr qualName,
+									   tStringObj *  fullPath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ComposeLangSelector() composes the path expression to select an alternate item by language.
+    ///
+    /// Path syntax allows two forms of "content addressing" to select an item in an array of
+    /// alternatives. The form used in this function lets you select an item in an alt-text array
+    /// based on the value of its \c xml:lang qualifier. The other form of content addressing is
+    /// shown in \c ComposeFieldSelector().
+    ///
+    /// The returned string is in the form <tt>ns:arrayName[\@xml:lang='langName']</tt>, where
+    /// "ns" is the prefix for the schema namespace
+    ///
+    /// This function provides a path expression that is explicitly and only for a specific
+    /// language. In most cases, \c TXMPMeta::SetLocalizedText() and \c TXMPMeta::GetLocalizedText()
+    /// are preferred, because they provide extra logic to choose the appropriate language and
+    /// maintain consistency with the 'x-default' value.
+    ///
+    /// @param schemaNS The namespace URI for the array; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param langName The RFC 3066 code for the desired language, as a null-terminated UTF-8 string.
+    ///
+    /// @param fullPath [out] A string in which to return the composed path.
+
+    static void ComposeLangSelector ( XMP_StringPtr schemaNS,
+									  XMP_StringPtr arrayName,
+									  XMP_StringPtr langName,
+									  tStringObj *  fullPath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ComposeLangSelector() composes a path expression to select an alternate item by language.
+    ///
+    /// Path syntax allows two forms of "content addressing" to select an item in an array of
+    /// alternatives. The form used in this function lets you select an item in an alt-text array
+    /// based on the value of its \c xml:lang qualifier. The other form of content addressing is
+    /// shown in \c ComposeFieldSelector().
+    ///
+    /// The returned string is in the form <tt>ns:arrayName[\@xml:lang='langName']</tt>, where
+    /// "ns" is the prefix for the schema namespace
+    ///
+    /// This function provides a path expression that is explicitly and only for a specific
+    /// language. In most cases, \c TXMPMeta::SetLocalizedText() and \c TXMPMeta::GetLocalizedText()
+    /// are preferred, because they provide extra logic to choose the appropriate language and
+    /// maintain consistency with the 'x-default' value.
+    ///
+    /// @param schemaNS The namespace URI for the array; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param langName The RFC 3066 code for the desired language, as a string object.
+    ///
+    /// @param fullPath [out] A string in which to return the composed path.
+
+    static void ComposeLangSelector ( XMP_StringPtr      schemaNS,
+									  XMP_StringPtr      arrayName,
+									  const tStringObj & langName,
+									  tStringObj *       fullPath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ComposeFieldSelector() composes a path expression to select an alternate item by a field's value.
+    ///
+    /// Path syntax allows two forms of "content addressing" to select an item in an array of
+    /// alternatives. The form used in this function lets you select an item in an array of structs
+    /// based on the value of one of the fields in the structs. The other form of content addressing
+    /// is shown in \c ComposeLangSelector().
+    ///
+    /// For example, consider a simple struct that has two fields, the name of a city and the URI of
+    /// an FTP site in that city. Use this to create an array of download alternatives. You can show
+    /// the user a popup built from the values of the city fields, then get the corresponding URI as
+    /// follows:
+    /// <pre>
+    ///   ComposeFieldSelector ( schemaNS, "Downloads", fieldNS, "City", chosenCity, &path );
+    ///   exists = GetStructField ( schemaNS, path, fieldNS, "URI", &uri );
+    /// </pre>
+    ///
+    /// The returned string is in the form <tt>ns:arrayName[fNS:fieldName='fieldValue']</tt>, where
+    /// "ns" is the prefix for the schema namespace and "fNS" is the prefix for the field namespace.
+    ///
+    /// @param schemaNS The namespace URI for the array; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param fieldNS The namespace URI for the field used as the selector. Same URI and prefix
+    /// usage as the \c schemaNS and \c arrayName parameters.
+    ///
+    /// @param fieldName The name of the field used as the selector. Must be a single XML name, must
+    /// not be null or the empty string. It must be the name of a field that is itself simple.
+    ///
+    /// @param fieldValue The desired value of the field, specified as a null-terminated UTF-8 string.
+    ///
+    /// @param fullPath [out] A string in which to return the composed path.
+
+    static void ComposeFieldSelector ( XMP_StringPtr schemaNS,
+									   XMP_StringPtr arrayName,
+									   XMP_StringPtr fieldNS,
+									   XMP_StringPtr fieldName,
+									   XMP_StringPtr fieldValue,
+									   tStringObj *  fullPath );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ComposeFieldSelector() composes a path expression to select an alternate item by a field's value.
+    ///
+    /// Path syntax allows two forms of "content addressing" to select an item in an array of
+    /// alternatives. The form used in this function lets you select an item in an array of structs
+    /// based on the value of one of the fields in the structs. The other form of content addressing
+    /// is shown in \c ComposeLangSelector().
+    ///
+    /// For example, consider a simple struct that has two fields, the name of a city and the URI of
+    /// an FTP site in that city. Use this to create an array of download alternatives. You can show
+    /// the user a popup built from the values of the city fields, then get the corresponding URI as
+    /// follows:
+    /// <pre>
+    ///   ComposeFieldSelector ( schemaNS, "Downloads", fieldNS, "City", chosenCity, &path );
+    ///   exists = GetStructField ( schemaNS, path, fieldNS, "URI", &uri );
+    /// </pre>
+    ///
+    /// The returned string is in the form <tt>ns:arrayName[fNS:fieldName='fieldValue']</tt>, where
+    /// "ns" is the prefix for the schema namespace and "fNS" is the prefix for the field namespace.
+    ///
+    /// @param schemaNS The namespace URI for the array; see \c GetProperty().
+    ///
+    /// @param arrayName The name of the array. Can be a general path expression, must not be null
+    /// or the empty string; see \c GetProperty() for namespace prefix usage.
+    ///
+    /// @param fieldNS The namespace URI for the field used as the selector. Same URI and prefix
+    /// usage as the \c schemaNS and \c arrayName parameters.
+    ///
+    /// @param fieldName The name of the field used as the selector. Must be a single XML name, must
+    /// not be null or the empty string. It must be the name of a field that is itself simple.
+    ///
+    /// @param fieldValue The desired value of the field, specified as a string object.
+    ///
+    /// @param fullPath [out] A string in which to return the composed path.
+
+    static void ComposeFieldSelector ( XMP_StringPtr      schemaNS,
+									   XMP_StringPtr      arrayName,
+									   XMP_StringPtr      fieldNS,
+									   XMP_StringPtr      fieldName,
+									   const tStringObj & fieldValue,
+									   tStringObj *       fullPath );
+
+    /// @}
+
+    // =============================================================================================
+    /// \name Conversion between binary types and strings
+    /// @{
+    ///
+	///	The main accessors in \c TXMPMeta set and retrieve property values as strings. additional
+	///	functions, such as \c TXMPMeta::SetPropertyInt(), set and retrieve property values as
+	///	explicit binary data types. Use these functions to convert between binary and string
+	///	values.
+	///
+	///	Strings can be specified as null-terminated UTF-8 (\c #XMP_StringPtr), or as string
+	///	objects (\c tStringObj) of the type declared when instantiating the XMP classes; see
+	///	\c XMP.hpp. Alternate forms of each conversion function allow either type of string.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertFromBool() converts a Boolean value to a string.
+    ///
+    /// The string values of Booleans are returned by the macros \c #kXMP_TrueStr and
+    /// \c #kXMP_FalseStr in \c XMP_Const.h.
+    ///
+    /// @param binValue The Boolean value to be converted.
+    ///
+    /// @param strValue [out] A buffer in which to return the string representation of the value.
+
+    static void ConvertFromBool ( bool	       binValue,
+								  tStringObj * strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertFromInt() converts a 32-bit integer value to a string.
+    ///
+    /// @param binValue The integer value to be converted.
+    ///
+    /// @param format Optional. A C \c sprintf format for the conversion. Default is "%d".
+    ///
+    /// @param strValue [out] A buffer in which to return the string representation of the value.
+
+    static void ConvertFromInt ( long	       binValue,
+								 XMP_StringPtr format,
+								 tStringObj *  strValue );
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertFromInt64() converts a 64-bit integer value to a string.
+    ///
+    /// @param binValue The integer value to be converted.
+    ///
+    /// @param format Optional. A C \c sprintf format for the conversion. Default is "%d".
+    ///
+    /// @param strValue [out] A buffer in which to return the string representation of the value.
+
+    static void ConvertFromInt64 ( long long	 binValue,
+								   XMP_StringPtr format,
+								   tStringObj *  strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertFromFloat() converts a floating-point value to a string.
+    ///
+    /// @param binValue The floating-point value to be converted.
+    ///
+    /// @param format Optional. A C \c sprintf format for the conversion. Default is "%d".
+    ///
+    /// @param strValue [out] A buffer in which to return the string representation of the value.
+
+    static void ConvertFromFloat ( double	     binValue,
+								   XMP_StringPtr format,
+								   tStringObj *	 strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertFromDate() converts a date/time value to a string.
+    ///
+    /// Formats a date according to the ISO 8601 profile in http://www.w3.org/TR/NOTE-datetime:
+    /// <pre>
+    ///   YYYY
+    ///   YYYY-MM
+    ///   YYYY-MM-DD
+    ///   YYYY-MM-DDThh:mmTZD
+    ///   YYYY-MM-DDThh:mm:ssTZD
+    ///   YYYY-MM-DDThh:mm:ss.sTZD
+    /// </pre>
+    ///
+    ///  \c YYYY = four-digit year, formatted as "%.4d" <br>
+    ///  \c MM	 = two-digit month (01=January)	<br>
+    ///  \c DD	 = two-digit day of month (01 through 31) <br>
+    ///  \c hh	 = two digits of hour (00 through 23) <br>
+    ///  \c mm	 = two digits of minute (00 through 59)	<br>
+    ///  \c ss	 = two digits of second (00 through 59)	<br>
+    ///  \c s	 = one or more digits representing a decimal fraction of a second <br>
+    ///  \c TZD	 = time zone designator (Z or +hh:mm or -hh:mm)
+    ///
+    /// Time-only input is allowed where the year, month, and day are all zero. This is output as
+    /// "0000-00-00...".
+    ///
+    /// @note ISO 8601 does not allow years less than 1000 or greater than 9999. This API allows
+    /// any year, even negative ones. The W3C profile also requires a time zone designator if a time
+    /// is present, this API treats the time zone designator as optional. The XMP_DateTime type has
+    /// an explicit notion of zone-less time.
+    ///
+    /// @param binValue The date/time value to be converted.
+    ///
+    /// @param strValue [out] A buffer in which to return the ISO 8601 string representation of the date/time.
+
+    static void ConvertFromDate ( const XMP_DateTime & binValue,
+								  tStringObj *	       strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToBool() converts a string to a Boolean value.
+    ///
+    /// The preferred strings are those returned by the macros \c #kXMP_TrueStr and \c #kXMP_FalseStr.
+    /// If these do not match, the function does a case insensitive comparison, then simply 't' or 'f',
+    /// and finally non-zero and zero integer representations.
+    ///
+    /// @param strValue The string representation of the value, specified as a null-terminated UTF-8 string.
+    ///
+    /// @return The appropriate C++ bool value for the string.
+
+    static bool ConvertToBool ( XMP_StringPtr strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToBool() converts a string to a Boolean value.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object,
+	/// rather than a <tt>const * char</tt>. It is otherwise identical; see details in the canonical form.
+    ///
+    /// @param strValue The string representation of the value, specified as a string object.
+    ///
+    /// @return The appropriate C++ bool value for the string.
+
+    static bool ConvertToBool ( const tStringObj & strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToInt() converts a string to a 32-bit integer value.
+    ///
+    /// @param strValue The string representation of the value, specified as a null-terminated UTF-8 string.
+    ///
+    /// @return The 32-bit integer value.
+
+    static long ConvertToInt ( XMP_StringPtr strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToInt() converts a string to a 32-bit integer value.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object,
+	/// rather than a <tt>const * char</tt>. It is otherwise identical.
+	///
+    /// @param strValue The string representation of the value, specified as a string object.
+    ///
+    /// @return The 32-bit integer value.
+
+    static long ConvertToInt ( const tStringObj & strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToInt64() converts a string to a 64-bit integer value.
+    ///
+    /// @param strValue The string representation of the value, specified as a null-terminated UTF-8 string.
+    ///
+    /// @return The 64-bit integer value.
+
+    static long long ConvertToInt64 ( XMP_StringPtr strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToInt64() converts a string to a 64-bit integer value.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object,
+	/// rather than a <tt>const * char</tt>. It is otherwise identical.
+	///
+    /// @param strValue The string representation of the value, specified as a string object.
+    ///
+    /// @return The 64-bit integer value.
+
+    static long long ConvertToInt64 ( const tStringObj & strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToFloat() converts a string to a floating-point value.
+    ///
+    /// @param strValue The string representation of the value, specified as a null-terminated UTF-8 string.
+    ///
+    /// @return The floating-point value.
+
+    static double ConvertToFloat ( XMP_StringPtr strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToFloat() converts a string to a floating-point value.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object,
+	/// rather than a <tt>const * char</tt>. It is otherwise identical.
+	///
+    /// @param strValue The string representation of the value, specified as a string object.
+    ///
+    /// @return The floating-point value.
+
+    static double ConvertToFloat ( const tStringObj & strValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToDate() converts a string to a date/time value.
+    ///
+    /// Parses a date according to the ISO 8601 profile in http://www.w3.org/TR/NOTE-datetime:
+    /// <pre>
+    ///   YYYY
+    ///   YYYY-MM
+    ///   YYYY-MM-DD
+    ///   YYYY-MM-DDThh:mmTZD
+    ///   YYYY-MM-DDThh:mm:ssTZD
+    ///   YYYY-MM-DDThh:mm:ss.sTZD
+    /// </pre>
+    ///
+    ///  \c YYYY = four-digit year, formatted as "%.4d" <br>
+    ///  \c MM	 = two-digit month (01=January)	<br>
+    ///  \c DD	 = two-digit day of month (01 through 31) <br>
+    ///  \c hh	 = two digits of hour (00 through 23) <br>
+    ///  \c mm	 = two digits of minute (00 through 59)	<br>
+    ///  \c ss	 = two digits of second (00 through 59)	<br>
+    ///  \c s	 = one or more digits representing a decimal fraction of a second <br>
+    ///  \c TZD	 = time zone designator (Z or +hh:mm or -hh:mm)
+    ///
+    /// A missing date portion or missing TZD are tolerated. A missing date value can begin with
+    /// "Thh:" or "hh:"; the year, month, and day are all set to zero in the \c #XMP_DateTime value.
+    /// A missing TZD is assumed to be UTC.
+    ///
+    /// @note ISO 8601 does not allow years less than 1000 or greater than 9999. This API allows
+    /// any year, even negative ones. The W3C profile also requires a time zone designator if a time
+    /// is present, this API treats the time zone designator as optional. The XMP_DateTime type has
+    /// an explicit notion of zone-less time.
+    ///
+    /// @param strValue The ISO 8601 string representation of the date/time, specified as a
+    /// null-terminated UTF-8 string.
+    ///
+    /// @param binValue [out] A buffer in which to return the binary date/time value.
+
+    static void ConvertToDate ( XMP_StringPtr  strValue,
+								XMP_DateTime * binValue );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToDate() converts a string to a date/time value.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object,
+	/// rather than a <tt>const * char</tt>. It is otherwise identical.
+	/// See details for the canonical form.
+	///
+    ///
+    /// @param strValue The ISO 8601 string representation of the date/time, specified as a string
+    /// object.
+    ///
+    /// @param binValue [out] A buffer in which to return the binary date/time value.
+
+    static void ConvertToDate ( const tStringObj & strValue,
+								XMP_DateTime *     binValue );
+
+    /// @}
+
+    // =============================================================================================
+    /// \name Date-time manipulation
+    /// @{
+    ///
+	///	In addition to the type-conversion functions that convert between strings and binary
+	///	date-time values, these functions create, manipulate, and compare date-time values.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CurrentDateTime() obtains the current date and time.
+    ///
+    /// Creates and returns a binary \c #XMP_DateTime value. The returned time is UTC, properly
+    /// adjusted for the local time zone. The resolution of the time is not guaranteed to be finer
+    /// than seconds.
+    ///
+    /// @param time	[out] A buffer in which to return the date/time value.
+
+    static void CurrentDateTime ( XMP_DateTime * time );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SetTimeZone() sets the time zone in a date/time value to the local time zone.
+    ///
+    /// Any existing time zone value is replaced. The other date/time fields are not adjusted in any way.
+    ///
+    /// @param time	A pointer to the date-time value, which is modified in place.
+
+    static void SetTimeZone ( XMP_DateTime * time );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToUTCTime() ensures that a time is UTC.
+    ///
+    /// If the time zone is not UTC, the time is adjusted and the time zone set to be UTC. The value
+    /// is not modified if the time zone is already UTC or if the value has no time zone.
+    ///
+    /// @param time	A pointer to the date-time value, which is modified in place.
+
+    static void ConvertToUTCTime ( XMP_DateTime * time );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c ConvertToLocalTime() ensures that a time is local.
+    ///
+    /// If the time zone is not the local zone, the time is adjusted and the time zone set to be local.
+    /// The value is not modified if the time zone is already the local zone or if the value has no
+    /// time zone.
+    ///
+    /// @param time	A pointer to the date-time value, which is modified in place.
+
+    static void ConvertToLocalTime ( XMP_DateTime * time );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CompareDateTime() compares the order of two date/time values.
+    ///
+    /// Both values are treated as in the same time zone if either has no time zone.
+    ///
+    /// @param left The left-side date/time value.
+    ///
+    /// @param right The right-side date/time value.
+    ///
+    /// @return An integer indicating the order:
+    ///   \li -1 if left is earlier than right
+    ///   \li 0 if left matches right
+    ///   \li +1 if left is later than right
+
+    static int CompareDateTime ( const XMP_DateTime & left,
+								 const XMP_DateTime & right );
+
+    /// @}
+
+    // =============================================================================================
+    /// \name Base64 encoding and decoding
+    /// @{
+    ///
+	/// These functions convert between raw data values and Base64-encoded strings.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c EncodeToBase64() converts a raw data value to a Base64-encoded string.
+    ///
+    /// @param rawStr An \c #XMP_StringPtr (char *) string containing the raw data to be converted.
+    ///
+    /// @param rawLen The number of characters of raw data to be converted.
+    ///
+    /// @param encodedStr [out] A string object in which to return the encoded string.
+
+    static void EncodeToBase64 ( XMP_StringPtr rawStr,
+								 XMP_StringLen rawLen,
+								 tStringObj *  encodedStr );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c EncodeToBase64() converts a raw data value passed in a string object to a Base64-encoded string.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object as input.
+	/// It is otherwise identical.
+ 	///
+    /// @param rawStr A string object containing the raw data to be converted.
+    ///
+    /// @param encodedStr [out] A string object in which to return the encoded string.
+
+    static void  EncodeToBase64 ( const tStringObj & rawStr,
+								  tStringObj *       encodedStr );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c  DecodeFromBase64() Decodes a Base64-encoded string to raw data.
+    ///
+    /// @param encodedStr An \c #XMP_StringPtr (char *) string containing the encoded data to be converted.
+    ///
+    /// @param encodedLen The number of characters of raw data to be converted.
+    ///
+    /// @param rawStr [out] A string object in which to return the decoded data.
+
+    static void DecodeFromBase64 ( XMP_StringPtr encodedStr,
+								   XMP_StringLen encodedLen,
+								   tStringObj *  rawStr );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c  DecodeFromBase64() Decodes a Base64-encoded string, passed as a string object, to raw data.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object as input.
+	/// It is otherwise identical.
+ 	///
+    /// @param encodedStr An string object containing the encoded data to be converted.
+    ///
+    /// @param rawStr [out] A string object in which to return the decoded data.
+
+    static void DecodeFromBase64 ( const tStringObj & encodedStr,
+								   tStringObj *       rawStr );
+
+    /// @}
+
+    // =============================================================================================
+    // =============================================================================================
+    /// \name JPEG file handling
+    /// @{
+    ///
+    /// These functions support the partitioning of XMP in JPEG files into standard and extended
+    /// portions in order to work around the 64KB size limit of JPEG marker segments.
+    ///
+	/// @note (Doc note) Add detail about how to write out and read back extended data
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c PackageForJPEG() creates XMP serializations appropriate for a JPEG file.
+    ///
+    /// The standard XMP in a JPEG file is limited to 64K bytes. This function serializes the XMP
+    /// metadata in an XMP object into a string of RDF (see \c TXMPMeta::SerializeToBuffer()). If
+    /// the data does not fit into the 64K byte limit, it creates a second packet string with the
+    /// extended data.
+    ///
+    /// @param xmpObj The XMP object containing the metadata.
+    ///
+    /// @param standardXMP [out] A string object in which to return the full standard XMP packet.
+    ///
+    /// @param extendedXMP [out] A string object in which to return the serialized extended XMP,
+    /// empty if not needed.
+    ///
+    /// @param extendedDigest [out] A string object in which to return an MD5 digest of the serialized
+    /// extended XMP, empty if not needed.
+    ///
+    /// @see \c MergeFromJPEG()
+
+    static void PackageForJPEG ( const TXMPMeta<tStringObj> & xmpObj,
+								 tStringObj *                 standardXMP,
+								 tStringObj *                 extendedXMP,
+								 tStringObj *                 extendedDigest );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c MergeFromJPEG() merges standard and extended XMP retrieved from a JPEG file.
+    ///
+    /// When an extended partition stores properties that do not fit into the JPEG file limitation
+    /// of 64K bytes, this function integrates those properties back into the same XMP object with
+    /// those from the standard XMP packet.
+    ///
+    /// @param fullXMP [in, out] An XMP object which the caller has initialized from the standard
+    /// XMP packet in a JPEG file. The extended XMP is added to this object.
+    ///
+    /// @param extendedXMP An XMP object which the caller has initialized from the extended XMP
+    /// packet in a JPEG file.
+    ///
+    /// @see \c PackageForJPEG()
+
+    static void MergeFromJPEG ( TXMPMeta<tStringObj> *       fullXMP,
+								const TXMPMeta<tStringObj> & extendedXMP );
+
+    /// @}
+
+    // =============================================================================================
+    /// \name Editing utilities
+    /// @{
+    ///
+    /// These functions are useful in implementing a user interface for editing XMP. They
+	/// convert sets of property values to and from displayable and manipulable strings, and perform
+	/// operations on sets of metadata, such as those available from the File Info dialog box.
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c CatenateArrayItems() creates a single edit string from a set of array item values.
+    ///
+    /// Collects the values of all items in an array into a single string, using a specified
+    /// separation string. Each item in the specified array must be a simple string value.
+    ///
+    /// @param xmpObj The XMP object containing the array to be catenated.
+    ///
+    /// @param schemaNS The schema namespace URI for the array. Must not be null or the empty string.
+    ///
+    /// @param arrayName The name of the array. May be a general path expression, must not be null
+    /// or the empty string.
+    ///
+    /// @param separator The string with which to separate the items in the catenated string.
+    /// Defaults to "; ", ASCII semicolon and space (U+003B, U+0020).
+    ///
+    /// @param quotes The character or characters to use as quotes around array items that contain a
+    /// separator. Defaults to the double-quote character ("), ASCII quote (U+0022).
+    ///
+    /// @param options Option flags to control the catenation. <<what options?>>
+    ///
+    /// @param catedStr [out] A string object in which to return the catenated array items.
+    ///
+    /// @see \c SeparateArrayItems()
+
+    static void CatenateArrayItems ( const TXMPMeta<tStringObj> & xmpObj,
+									 XMP_StringPtr                schemaNS,
+									 XMP_StringPtr                arrayName,
+									 XMP_StringPtr                separator,
+									 XMP_StringPtr                quotes,
+									 XMP_OptionBits               options,
+									 tStringObj *                 catedStr );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SeparateArrayItems() updates an array from a concatenated edit string of values.
+    ///
+    /// This reverses the action of \c CatenateArrayItems(), separating out individual array items
+    /// from the edit string and updating the array with the new values. Each item in the array must
+    /// be a simple string value.
+    ///
+    /// @param xmpObj The XMP object containing the array to be updated.
+    ///
+    /// @param schemaNS The schema namespace URI for the array. Must not be null or the empty string.
+    ///
+    /// @param arrayName The name of the array. May be a general path expression, must not be null
+    /// or the empty string.
+    ///
+    /// @param options Option flags to control the separation. <<what options?>>
+    ///
+    /// @param catedStr The concatenated array items, as created by \c CatenateArrayItems(),
+    /// specified as a null-terminated UTF-8 string.
+
+    static void SeparateArrayItems ( TXMPMeta<tStringObj> * xmpObj,
+									 XMP_StringPtr          schemaNS,
+									 XMP_StringPtr          arrayName,
+									 XMP_OptionBits         options,
+									 XMP_StringPtr          catedStr );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c SeparateArrayItems() updates an array from a concatenated edit string of values.
+    ///
+    /// Overloads the basic form of the function, allowing you to pass a string object in which
+    ///	to return the concatenated string. It is otherwise identical; see details for the canonical form.
+ 	///
+
+    static void SeparateArrayItems ( TXMPMeta<tStringObj> * xmpObj,
+									 XMP_StringPtr          schemaNS,
+									 XMP_StringPtr          arrayName,
+									 XMP_OptionBits         options,
+									 const tStringObj &     catedStr );
+
+    /// @brief \c ApplyTemplate() modifies a working XMP object according to a template object.
+    ///
+    /// The XMP template can be used to add, replace or delete properties from the working XMP object.
+	/// This function replaces the previous \c AppendProperties() function, which is no longer available.
+    ///	The actions that you specify determine how the template is applied. Each action can be applied
+    ///	individually or combined; if you do not specify any actions, the properties and values in the working
+    ///	XMP object do not change.
+    ///
+    /// These actions are available:
+    ///   \li Clear (\c #kXMPTemplate_ClearUnnamedProperties): Deletes top-level properties. 
+    ///	        Any top-level property that is present in the template (even with empty value)
+    ///	        is retained. All other top-level properties in the working object are deleted.
+    ///
+    ///   \li Add (\c #kXMPTemplate_AddNewProperties): Adds new properties to the working object if the
+    ///	        template properties have values. See additional detail below.
+    ///
+    ///   \li Replace (\c #kXMPTemplate_ReplaceExistingProperties): Replaces the values of existing top-level
+    ///		properties in the working XMP if the value forms match those in the template. Properties
+    ///		with empty values in the template are ignored. If combined with Clear or Add actions, 
+    ///		those take precedence; values are cleared or added, rather than replaced.
+    ///
+    ///   \li Replace/Delete empty (\c #kXMPTemplate_ReplaceWithDeleteEmpty): Replaces values in the same way
+    ///		as the simple Replace action, and also deletes properties if the value in the template is empty.
+    ///		If combined with Clear or Add actions, those take precedence; values are cleared or added,
+    ///		rather than replaced. 
+    ///
+    ///   \li Include internal (\c #kXMPTemplate_IncludeInternalProperties): Performs specified action  
+    ///		on internal properties as well as external properties. By default, internal properties 
+    ///	        are ignored for all actions.
+    ///
+    ///	The Add behavior depends on the type of property:
+    ///	<ul>
+    ///	<li> If a top-level property is not in the working XMP, and has a value in the template,
+	///      the property and value are added. Empty properties are not added. </li>
+    ///	<li> If a property is in both the working XMP and template, the value forms must match, otherwise 
+    ///	     the template is ignored for that property.</li>
+    ///	<li> If a struct is present in both the working XMP and template, the individual fields of the 
+    ///	     template struct are added as appropriate; that is, the logic is recursively applied to the fields.
+    ///	     Struct values are equivalent if they have the same fields with equivalent values. </li>
+    ///	<li> If an array is present in both the working XMP and template, items from the template are 
+    ///	     added if the value forms match. Array values match if they have sets of equivalent items, 
+    ///	     regardless of order.</li>
+    ///	<li> Alt-text arrays use the \c xml:lang qualifier as a key, adding languages that are missing. </li>
+    /// 	 </ul>
+    /// 	Array item checking is n-squared; this can be time-intensive if the Replace option is
+    /// 	not specified. Each source item is checked to see if it already exists in the destination,
+    /// 	without regard to order or duplicates. Simple items are compared by value and \c xml:lang
+    /// 	qualifier; other qualifiers are ignored. Structs are recursively compared by field names,
+    /// 	without regard to field order. Arrays are compared by recursively comparing all items. 
+
+    /// @param workingXMP The destination XMP object.
+    ///
+    /// @param templateXMP The template to apply to the destination XMP object.
+    ///
+    /// @param actions Option flags to control the copying. If none are specified, the properties and values 
+    ///		in the working XMP do not change. A logical OR of these bit-flag constants:
+    ///   \li \c #kXMPTemplate_ClearUnnamedProperties -- Delete anything that is not in the template 
+    ///   \li \c #kXMPTemplate_AddNewProperties -- Add properties; see detailed description.
+    ///   \li \c #kXMPTemplate_ReplaceExistingProperties -- Replace the values of existing properties.
+    ///   \li \c #kXMPTemplate_ReplaceWithDeleteEmpty -- Replace the values of existing properties 
+    ///	     and delete properties if the new value is empty.
+    ///   \li \c #kXMPTemplate_IncludeInternalProperties -- Operate on internal properties as well as
+    ///	     external properties.
+    ///
+
+    static void ApplyTemplate ( TXMPMeta<tStringObj> *       workingXMP,
+								const TXMPMeta<tStringObj> & templateXMP,
+                                XMP_OptionBits               actions );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c  RemoveProperties() removes multiple properties from an XMP object.
+    ///
+    /// The operation depends on how the namespace and property are specified:
+    ///
+    ///   \li Non-empty \c schemaNS and \c propName - The named property is removed if it is an
+    ///   external property, or if the \c #kXMPUtil_DoAllProperties option flag is set. It does not
+    ///   matter whether the named property is an actual property or an alias.
+    ///
+    ///   \li Non-empty \c schemaNS and empty \c propName - All external properties in the named
+    ///   schema are removed. Internal properties are also removed if the
+    ///   \c #kXMPUtil_DoAllProperties option flag is set. In addition, aliases from the named schema
+    ///   are removed if the \c #kXMPUtil_IncludeAliases option flag is set.
+    ///
+    ///   \li Empty \c schemaNS and empty \c propName - All external properties in all schemas are
+    ///   removed. Internal properties are also removed if the \c #kXMPUtil_DoAllProperties option
+    ///   flag is set. Aliases are handled implicitly, because the associated actuals are removed or
+    ///   not.
+    ///
+    ///   \li It is an error to pass an empty \c schemaNS and non-empty \c propName.
+    ///
+    /// @param xmpObj The XMP object containing the properties to be removed.
+    ///
+    /// @param schemaNS Optional schema namespace URI for the properties to be removed.
+    ///
+    /// @param propName Optional path expression for the property to be removed.
+    ///
+    /// @param options Option flags to control the deletion operation. A logical OR of these
+    /// bit-flag constants:
+    ///   \li \c #kXMPUtil_DoAllProperties - Delete internal properties in addition to external properties.
+    ///   \li \c #kXMPUtil_IncludeAliases - Include aliases if the schema is explicitly specified.
+
+    static void RemoveProperties ( TXMPMeta<tStringObj> * xmpObj,
+								   XMP_StringPtr          schemaNS = 0,
+								   XMP_StringPtr          propName = 0,
+								   XMP_OptionBits         options = 0 );
+
+    // ---------------------------------------------------------------------------------------------
+    /// @brief \c DuplicateSubtree() replicates a subtree from one XMP object into another.
+    ///
+    /// The destination can be a different namespace and root location in the same object, or the
+    /// same or a different location in another XMP object.
+    ///
+    /// @param source The source XMP object.
+    ///
+    /// @param dest The destination XMP object.
+    ///
+    /// @param sourceNS The schema namespace URI for the source subtree.
+    ///
+    /// @param sourceRoot The root location for the source subtree. Can be a general path expression,
+    /// must not be null or the empty string.
+    ///
+    /// @param destNS The schema namespace URI for the destination. Defaults to the source namespace.
+    ///
+    /// @param destRoot The root location for the destination. Can be a general path expression.
+    /// Defaults to the source location.
+    ///
+    /// @param options Option flags to control the operation. <<options?>>
+
+    static void DuplicateSubtree ( const TXMPMeta<tStringObj> & source,
+								   TXMPMeta<tStringObj> *       dest,
+								   XMP_StringPtr                sourceNS,
+								   XMP_StringPtr                sourceRoot,
+								   XMP_StringPtr                destNS = 0,
+								   XMP_StringPtr                destRoot = 0,
+								   XMP_OptionBits               options = 0 );
+
+    /// @}
+
+    // =============================================================================================
+
+private:
+
+	static void SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen );
+
+};  // class TXMPUtils
+
+// =================================================================================================
+
+#endif // __TXMPUtils_hpp__
diff --git a/public/include/XMP.hpp b/public/include/XMP.hpp
new file mode 100644
index 0000000..8ec39eb
--- /dev/null
+++ b/public/include/XMP.hpp
@@ -0,0 +1,98 @@
+#ifndef __XMP_hpp__
+#define __XMP_hpp__ 1
+
+// =================================================================================================
+// Copyright 2002 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.
+// =================================================================================================
+
+//  ================================================================================================
+/// \file XMP.hpp
+/// \brief Overall header file for the XMP Toolkit
+///
+/// This is an overall header file, the only one that C++ clients should include.
+///
+/// The full client API is in the \c TXMPMeta.hpp, \c TXMPIterator.hpp, \c TXMPUtils.hpp headers.
+/// Read these for information, but do not include them directly. The \c TXMP... classes are C++
+/// template classes that must be instantiated with a string class such as \c std::string. The
+/// string class is used to return text strings for property values, serialized XMP, and so on.
+/// Clients must also compile \c XMP.incl_cpp to ensure that all client-side glue code is generated.
+/// This should be done by including it in exactly one client source file.
+///
+/// There are two C preprocessor macros that simplify use of the templates:
+///
+/// \li \c TXMP_STRING_TYPE - Define this as the string class to use with the template. You will get
+/// the template headers included and typedefs (\c SXMPMeta, and so on) to use in your code.
+///
+/// \li \c TXMP_EXPAND_INLINE - Define this as 1 if you want to have the template functions expanded
+/// inline in your code. Leave it undefined, or defined as 0, to use out-of-line instantiations of
+/// the template functions. Compiling \c XMP.incl_cpp generates explicit out-of-line
+/// instantiations if \c TXMP_EXPAND_INLINE is off.
+///
+/// The template parameter, class \c tStringObj, must have the following member functions (which
+/// match those for \c std::string):
+///
+/// <pre>
+///  tStringObj& assign ( const char * str, size_t len )
+///  size_t size() const
+///  const char * c_str() const
+/// </pre>
+///
+/// The string class must be suitable for at least UTF-8. This is the encoding used for all general
+/// values, and is the default encoding for serialized XMP. The string type must also be suitable
+/// for UTF-16 or UTF-32 if those serialization encodings are used. This mainly means tolerating
+/// embedded 0 bytes, which \c std::string does.
+//  ================================================================================================
+
+/// /c XMP_Environment.h must be the first included header.
+#include "XMP_Environment.h"
+
+#include "XMP_Version.h"
+#include "XMP_Const.h"
+
+#if XMP_WinBuild
+    #if XMP_DebugBuild
+        #pragma warning ( push, 4 )
+    #else
+        #pragma warning ( push, 3 )
+    #endif
+    #pragma warning ( disable : 4702 ) // unreachable code
+    #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+#if defined ( TXMP_STRING_TYPE )
+
+    #include "TXMPMeta.hpp"
+    #include "TXMPIterator.hpp"
+    #include "TXMPUtils.hpp"
+    typedef class TXMPMeta <TXMP_STRING_TYPE>     SXMPMeta;       // For client convenience.
+    typedef class TXMPIterator <TXMP_STRING_TYPE> SXMPIterator;
+    typedef class TXMPUtils <TXMP_STRING_TYPE>    SXMPUtils;
+    #if TXMP_EXPAND_INLINE
+    	#error "TXMP_EXPAND_INLINE is not working at present. Please don't use it."
+        #include "client-glue/TXMPMeta.incl_cpp"
+        #include "client-glue/TXMPIterator.incl_cpp"
+        #include "client-glue/TXMPUtils.incl_cpp"
+        #include "client-glue/TXMPFiles.incl_cpp"
+    #endif
+
+	#if XMP_INCLUDE_XMPFILES
+		#include "TXMPFiles.hpp"	// ! Needs typedef for SXMPMeta.
+		typedef class TXMPFiles <TXMP_STRING_TYPE>    SXMPFiles;
+		#if TXMP_EXPAND_INLINE
+			#include "client-glue/TXMPFiles.incl_cpp"
+		#endif
+	#endif
+
+#endif  // TXMP_STRING_TYPE
+
+#if XMP_WinBuild
+    #pragma warning ( pop )
+#endif
+
+// =================================================================================================
+
+#endif  // __XMP_hpp__
diff --git a/public/include/XMP.incl_cpp b/public/include/XMP.incl_cpp
new file mode 100644
index 0000000..fe2a6fa
--- /dev/null
+++ b/public/include/XMP.incl_cpp
@@ -0,0 +1,69 @@
+#ifndef __XMP_incl_cpp__
+#define __XMP_incl_cpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+//  ================================================================================================
+/// \file XMP.incl_cpp
+/// \brief Overall client glue file for the XMP toolkit.
+///
+/// This is an overall client source file of XMP toolkit glue, the only XMP-specific one that
+/// clients should build in projects. This ensures that all of the client-side glue code for the
+/// XMP toolkit gets compiled.
+///
+/// You cannot compile this file directly, because the template's string type must be declared and 
+/// only the client can do that. Instead, include this in some other source file. For example, 
+/// to use <tt>std::string</tt> you only need these two lines:
+///
+/// \code
+///  #include <string>
+///  #include "XMP.incl_cpp"
+/// \endcode
+
+
+#include "XMP.hpp" // ! This must be the first include!
+
+#define XMP_ClientBuild 1
+
+#if XMP_WinBuild
+    #if XMP_DebugBuild
+        #pragma warning ( push, 4 )
+    #else
+        #pragma warning ( push, 3 )
+    #endif
+
+   	#pragma warning ( disable : 4127 ) // conditional expression is constant
+    #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+    #pragma warning ( disable : 4702 ) // unreachable code
+    #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+#if defined ( TXMP_STRING_TYPE ) && (! TXMP_EXPAND_INLINE)
+
+    // We're using a single out of line instantiation. Do it here.
+
+    #include "client-glue/TXMPMeta.incl_cpp"
+    #include "client-glue/TXMPIterator.incl_cpp"
+    #include "client-glue/TXMPUtils.incl_cpp"
+    template class TXMPMeta <TXMP_STRING_TYPE>;
+    template class TXMPIterator <TXMP_STRING_TYPE>;
+    template class TXMPUtils <TXMP_STRING_TYPE>;
+	#if XMP_INCLUDE_XMPFILES
+	    #include "client-glue/TXMPFiles.incl_cpp"
+	    template class TXMPFiles <TXMP_STRING_TYPE>;
+   #endif
+
+#endif
+
+#if XMP_WinBuild
+    #pragma warning ( pop )
+#endif
+
+#endif // __XMP_incl_cpp__
diff --git a/public/include/XMP_Const.h b/public/include/XMP_Const.h
new file mode 100644
index 0000000..aa05e89
--- /dev/null
+++ b/public/include/XMP_Const.h
@@ -0,0 +1,1582 @@
+#ifndef __XMP_Const_h__
+#define __XMP_Const_h__ 1
+
+// =================================================================================================
+// Copyright 2002 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 "XMP_Environment.h"
+
+   #include <stddef.h>
+   #include <string.h>
+   #include <stdlib.h>
+
+#if XMP_MacBuild | XMP_iOSBuild	// ! No stdint.h on Windows and some UNIXes.
+    #include <stdint.h>
+#endif
+#if XMP_UNIXBuild		// hopefully an inttypes.h on all UNIXes...
+		#include <inttypes.h>
+#endif
+
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+/// \file XMP_Const.h
+/// \brief Common C/C++ types and constants for the XMP toolkit.
+// =================================================================================================
+
+// =================================================================================================
+// Basic types and constants
+// =========================
+
+// The XMP_... types are used on the off chance that the ..._t types present a problem. In that
+// case only the declarations of the XMP_... types needs to change, not all of the uses. These
+// types are used where fixed sizes are required in order to have a known ABI for a DLL build.
+
+#if XMP_MacBuild || XMP_iOSBuild || defined(HAVE_STDINT_H)
+
+    typedef int8_t   XMP_Int8;
+    typedef int16_t  XMP_Int16;
+    typedef int32_t  XMP_Int32;
+    typedef int64_t  XMP_Int64;
+
+    typedef uint8_t  XMP_Uns8;
+    typedef uint16_t XMP_Uns16;
+    typedef uint32_t XMP_Uns32;
+    typedef uint64_t XMP_Uns64;
+
+#elif XMP_WinBuild
+
+    typedef signed char XMP_Int8;
+    typedef signed short XMP_Int16;
+    typedef signed long XMP_Int32;
+    typedef signed long long XMP_Int64;
+
+    typedef unsigned char XMP_Uns8;
+    typedef unsigned short XMP_Uns16;
+    typedef unsigned long XMP_Uns32;
+    typedef unsigned long long XMP_Uns64;
+
+#elif XMP_UNIXBuild
+
+	#if ! XMP_64
+
+		typedef signed char XMP_Int8;
+		typedef signed short XMP_Int16;
+		typedef signed long XMP_Int32;
+		typedef signed long long XMP_Int64;
+
+		typedef unsigned char XMP_Uns8;
+		typedef unsigned short XMP_Uns16;
+		typedef unsigned long XMP_Uns32;
+		typedef unsigned long long XMP_Uns64;
+
+	#else
+
+		typedef signed char XMP_Int8;
+		typedef signed short XMP_Int16;
+		typedef signed int XMP_Int32;
+		typedef signed long long XMP_Int64;
+
+		typedef unsigned char XMP_Uns8;
+		typedef unsigned short XMP_Uns16;
+		typedef unsigned int XMP_Uns32;
+		typedef unsigned long long XMP_Uns64;
+
+	#endif
+
+#else
+
+	#error "XMP environment error - must define one of XMP_MacBuild, XMP_WinBuild, XMP_UNIXBuild or XMP_iOSBuild"
+
+#endif
+
+typedef XMP_Uns8 XMP_Bool;
+
+const XMP_Uns8 kXMP_Bool_False = 0;
+
+#define ConvertXMP_BoolToBool(a) (a) != kXMP_Bool_False
+#define ConvertBoolToXMP_Bool(a) (a) ? !kXMP_Bool_False : kXMP_Bool_False
+
+static const XMP_Uns8 Min_XMP_Uns8		= ( (XMP_Uns8) 0x00 );
+static const XMP_Uns8 Max_XMP_Uns8		= ( (XMP_Uns8) 0xFF );
+static const XMP_Uns16 Min_XMP_Uns16	= ( (XMP_Uns16) 0x00 );
+static const XMP_Uns16 Max_XMP_Uns16	= ( (XMP_Uns16) 0xFFFF );
+static const XMP_Uns32 Min_XMP_Uns32	= ( (XMP_Uns32) 0x00 );
+static const XMP_Uns32 Max_XMP_Uns32	= ( (XMP_Uns32) 0xFFFFFFFF );
+static const XMP_Uns64 Min_XMP_Uns64	= ( (XMP_Uns64) 0x00 );
+static const XMP_Uns64 Max_XMP_Uns64	= ( (XMP_Uns64) 0xFFFFFFFFFFFFFFFFLL );
+
+static const XMP_Int8 Min_XMP_Int8		= ( (XMP_Int8) 0x80 );
+static const XMP_Int8 Max_XMP_Int8		= ( (XMP_Int8) 0x7F );
+static const XMP_Int16 Min_XMP_Int16	= ( (XMP_Int16) 0x8000 );
+static const XMP_Int16 Max_XMP_Int16	= ( (XMP_Int16) 0x7FFF );
+static const XMP_Int32 Min_XMP_Int32	= ( (XMP_Int32) 0x80000000 );
+static const XMP_Int32 Max_XMP_Int32	= ( (XMP_Int32) 0x7FFFFFFF );
+static const XMP_Int64 Min_XMP_Int64	= ( (XMP_Int64) 0x8000000000000000LL );
+static const XMP_Int64 Max_XMP_Int64	= ( (XMP_Int64) 0x7FFFFFFFFFFFFFFFLL );
+
+
+/// An "ABI safe" pointer to the internal part of an XMP object. Use to pass an XMP object across
+/// client DLL boundaries. See \c TXMPMeta::GetInternalRef().
+typedef struct __XMPMeta__ *        XMPMetaRef;
+
+/// An "ABI safe" pointer to the internal part of an XMP iteration object. Use to pass an XMP
+/// iteration object across client DLL boundaries. See \c TXMPIterator.
+typedef struct __XMPIterator__ *    XMPIteratorRef;
+
+/// An "ABI safe" pointer to the internal part of an XMP document operations object. Use to pass an
+/// XMP document operations object across client DLL boundaries. See \c TXMPDocOps.
+typedef struct __XMPDocOps__ *    XMPDocOpsRef;
+
+/// An "ABI safe" pointer to the internal part of an XMP file-handling object. Use to pass an XMP
+/// file-handling object across  client DLL boundaries. See \c TXMPFiles.
+typedef struct __XMPFiles__ *       XMPFilesRef;
+
+// =================================================================================================
+
+/// \name General scalar types and constants
+/// @{
+
+/// \typedef XMP_StringPtr
+/// \brief The type for input string parameters. A <tt>const char *</tt>, a null-terminated UTF-8
+/// string.
+
+/// \typedef XMP_StringLen
+/// \brief The type for string length parameters. A 32-bit unsigned integer, as big as will be
+/// practically needed.
+
+/// \typedef XMP_Index
+/// \brief The type for offsets and indices. A 32-bit signed integer. It is signed to allow -1 for
+/// loop termination.
+
+/// \typedef XMP_OptionBits
+/// \brief The type for a collection of 32 flag bits. Individual flags are defined as enum value bit
+/// masks; see \c #kXMP_PropValueIsURI and following. A number of macros provide common set or set
+/// operations, such as \c XMP_PropIsSimple. For other tests use an expression like <code>options &
+/// kXMP_<theOption></code>. When passing multiple option flags use the bitwise-OR operator. '|',
+/// not the arithmatic plus, '+'.
+
+typedef const char * XMP_StringPtr;  // Points to a null terminated UTF-8 string.
+typedef XMP_Uns32    XMP_StringLen;
+typedef XMP_Int32    XMP_Index;      // Signed, sometimes -1 is handy.
+typedef XMP_Uns32    XMP_OptionBits; // Used as 32 individual bits.
+
+/// \def kXMP_TrueStr
+/// \brief The canonical true string value for Booleans in serialized XMP.
+///
+/// Code that converts from string to bool should be case insensitive, and also allow "1".
+
+/// \def kXMP_FalseStr
+/// \brief The canonical false string value for Booleans in serialized XMP.
+///
+/// Code that converts	from string to bool should be case insensitive, and also allow "0".
+
+#define kXMP_TrueStr  "True"  // Serialized XMP spellings, not for the type bool.
+#define kXMP_FalseStr "False"
+
+/// Type for yes/no/maybe answers. The values are picked to allow Boolean-like usage. The yes and
+/// values are true (non-zero), the no value is false (zero).
+enum {
+	/// The part or parts have definitely changed.
+	kXMPTS_Yes = 1,
+	/// The part or parts have definitely not changed.
+	kXMPTS_No = 0,
+	/// The part or parts might, or might not, have changed.
+	kXMPTS_Maybe = -1
+};
+typedef XMP_Int8 XMP_TriState;
+
+/// @}
+
+// =================================================================================================
+
+/// \struct XMP_DateTime
+/// \brief The expanded type for a date and time.
+///
+/// Dates and time in the serialized XMP are ISO 8601 strings. The \c XMP_DateTime struct allows
+/// easy conversion with other formats.
+///
+/// All of the fields are 32 bit, even though most could be 8 bit. This avoids overflow when doing
+/// carries for arithmetic or normalization. All fields have signed values for the same reasons.
+///
+/// Date-time values are occasionally used with only a date or only a time component. A date without
+/// a time has zeros in the \c XMP_DateTime struct for all time fields. A time without a date has
+/// zeros for all date fields (year, month, and day).
+///
+/// \c TXMPUtils provides utility functions for manipulating date-time values.
+///
+/// @see \c TXMPUtils::ConvertToDate(), \c TXMPUtils::ConvertFromDate(),
+/// \c TXMPUtils::CompareDateTime(), \c TXMPUtils::ConvertToLocalTime(),
+/// \c TXMPUtils::ConvertToUTCTime(), \c TXMPUtils::CurrentDateTime(),
+/// \c TXMPUtils::SetTimeZone()
+
+struct XMP_DateTime {
+
+	/// The year, can be negative.
+    XMP_Int32 year;
+
+	/// The month in the range 1..12.
+    XMP_Int32 month;
+
+	/// The day of the month in the range 1..31.
+    XMP_Int32 day;
+
+	/// The hour in the range 0..23.
+    XMP_Int32 hour;
+
+	/// The minute in the range 0..59.
+    XMP_Int32 minute;
+
+	/// The second in the range 0..59.
+    XMP_Int32 second;
+
+    /// Is the date portion meaningful?
+    XMP_Bool hasDate;
+
+    /// Is the time portion meaningful?
+    XMP_Bool hasTime;
+
+    /// Is the time zone meaningful?
+    XMP_Bool hasTimeZone;
+
+	/// The "sign" of the time zone, \c #kXMP_TimeIsUTC (0) means UTC, \c #kXMP_TimeWestOfUTC (-1)
+	/// is west, \c #kXMP_TimeEastOfUTC (+1) is east.
+    XMP_Int8 tzSign;
+
+	/// The time zone hour in the range 0..23.
+    XMP_Int32 tzHour;
+
+	/// The time zone minute in the range 0..59.
+    XMP_Int32 tzMinute;
+
+	/// Nanoseconds within a second, often left as zero.
+    XMP_Int32 nanoSecond;
+
+	#if __cplusplus
+		XMP_DateTime() : year(0), month(0), day(0), hour(0), minute(0), second(0),
+		                 hasDate(false),hasTime(false), hasTimeZone(false), tzSign(0), tzHour(0), tzMinute(0), nanoSecond(0){};
+	#endif
+
+};
+
+/// Constant values for \c XMP_DateTime::tzSign field.
+enum {
+	/// Time zone is west of UTC.
+    kXMP_TimeWestOfUTC = -1,
+	/// UTC time.
+    kXMP_TimeIsUTC     =  0,
+	/// Time zone is east of UTC.
+    kXMP_TimeEastOfUTC = +1
+};
+
+#define XMPDateTime_IsDateOnly(dt) ((dt).hasDate & (! (dt).hasTime))
+#define XMPDateTime_IsTimeOnly(dt) ((dt).hasTime & (! (dt).hasDate))
+
+#define XMPDateTime_ClearTimeZone(dt) { (dt).hasTimeZone = (dt).tzSign = (dt).tzHour = (dt).tzMinute = 0; }
+
+// =================================================================================================
+// Standard namespace URI constants
+// ================================
+
+/// \name XML namespace constants for standard XMP schema.
+/// @{
+///
+/// \def kXMP_NS_XMP
+/// \brief The XML namespace for the XMP "basic" schema.
+///
+/// \def kXMP_NS_XMP_Rights
+/// \brief The XML namespace for the XMP copyright schema.
+///
+/// \def kXMP_NS_XMP_MM
+/// \brief The XML namespace for the XMP digital asset management schema.
+///
+/// \def kXMP_NS_XMP_BJ
+/// \brief The XML namespace for the job management schema.
+///
+/// \def kXMP_NS_XMP_T
+/// \brief The XML namespace for the XMP text document schema.
+///
+/// \def kXMP_NS_XMP_T_PG
+/// \brief The XML namespace for the XMP paged document schema.
+///
+/// \def kXMP_NS_PDF
+/// \brief The XML namespace for the PDF schema.
+///
+/// \def kXMP_NS_Photoshop
+/// \brief The XML namespace for the Photoshop custom schema.
+///
+/// \def kXMP_NS_EXIF
+/// \brief The XML namespace for Adobe's EXIF schema.
+///
+/// \def kXMP_NS_TIFF
+/// \brief The XML namespace for Adobe's TIFF schema.
+///
+/// @}
+
+#define kXMP_NS_XMP        "http://ns.adobe.com/xap/1.0/"
+
+#define kXMP_NS_XMP_Rights "http://ns.adobe.com/xap/1.0/rights/"
+#define kXMP_NS_XMP_MM     "http://ns.adobe.com/xap/1.0/mm/"
+#define kXMP_NS_XMP_BJ     "http://ns.adobe.com/xap/1.0/bj/"
+
+#define kXMP_NS_PDF        "http://ns.adobe.com/pdf/1.3/"
+#define kXMP_NS_Photoshop  "http://ns.adobe.com/photoshop/1.0/"
+#define kXMP_NS_PSAlbum    "http://ns.adobe.com/album/1.0/"
+#define kXMP_NS_EXIF       "http://ns.adobe.com/exif/1.0/"
+#define kXMP_NS_EXIF_Aux   "http://ns.adobe.com/exif/1.0/aux/"
+#define kXMP_NS_TIFF       "http://ns.adobe.com/tiff/1.0/"
+#define kXMP_NS_PNG        "http://ns.adobe.com/png/1.0/"
+#define kXMP_NS_SWF        "http://ns.adobe.com/swf/1.0/"
+#define kXMP_NS_JPEG       "http://ns.adobe.com/jpeg/1.0/"
+#define kXMP_NS_JP2K       "http://ns.adobe.com/jp2k/1.0/"
+#define kXMP_NS_CameraRaw  "http://ns.adobe.com/camera-raw-settings/1.0/"
+#define kXMP_NS_DM         "http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+#define kXMP_NS_Script     "http://ns.adobe.com/xmp/1.0/Script/"
+#define kXMP_NS_ASF        "http://ns.adobe.com/asf/1.0/"
+#define kXMP_NS_WAV        "http://ns.adobe.com/xmp/wav/1.0/"
+#define kXMP_NS_BWF        "http://ns.adobe.com/bwf/bext/1.0/"
+#define kXMP_NS_AEScart    "http://ns.adobe.com/aes/cart/"
+#define kXMP_NS_RIFFINFO   "http://ns.adobe.com/riff/info/"
+
+#define kXMP_NS_XMP_Note   "http://ns.adobe.com/xmp/note/"
+
+#define kXMP_NS_AdobeStockPhoto "http://ns.adobe.com/StockPhoto/1.0/"
+#define kXMP_NS_CreatorAtom "http://ns.adobe.com/creatorAtom/1.0/"
+
+#define kXMP_NS_ExifEX		"http://cipa.jp/exif/1.0/"
+
+/// \name XML namespace constants for qualifiers and structured property fields.
+/// @{
+///
+/// \def kXMP_NS_XMP_IdentifierQual
+/// \brief The XML namespace for qualifiers of the xmp:Identifier property.
+///
+/// \def kXMP_NS_XMP_Dimensions
+/// \brief The XML namespace for fields of the Dimensions type.
+///
+/// \def kXMP_NS_XMP_Image
+/// \brief The XML namespace for fields of a graphical image. Used for the Thumbnail type.
+///
+/// \def kXMP_NS_XMP_ResourceEvent
+/// \brief The XML namespace for fields of the ResourceEvent type.
+///
+/// \def kXMP_NS_XMP_ResourceRef
+/// \brief The XML namespace for fields of the ResourceRef type.
+///
+/// \def kXMP_NS_XMP_ST_Version
+/// \brief The XML namespace for fields of the Version type.
+///
+/// \def kXMP_NS_XMP_ST_Job
+/// \brief The XML namespace for fields of the JobRef type.
+///
+/// @}
+
+#define kXMP_NS_XMP_IdentifierQual "http://ns.adobe.com/xmp/Identifier/qual/1.0/"
+#define kXMP_NS_XMP_Dimensions     "http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+#define kXMP_NS_XMP_Text           "http://ns.adobe.com/xap/1.0/t/"
+#define kXMP_NS_XMP_PagedFile      "http://ns.adobe.com/xap/1.0/t/pg/"
+#define kXMP_NS_XMP_Graphics       "http://ns.adobe.com/xap/1.0/g/"
+#define kXMP_NS_XMP_Image          "http://ns.adobe.com/xap/1.0/g/img/"
+#define kXMP_NS_XMP_Font           "http://ns.adobe.com/xap/1.0/sType/Font#"
+#define kXMP_NS_XMP_ResourceEvent  "http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
+#define kXMP_NS_XMP_ResourceRef    "http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+#define kXMP_NS_XMP_ST_Version     "http://ns.adobe.com/xap/1.0/sType/Version#"
+#define kXMP_NS_XMP_ST_Job         "http://ns.adobe.com/xap/1.0/sType/Job#"
+#define kXMP_NS_XMP_ManifestItem   "http://ns.adobe.com/xap/1.0/sType/ManifestItem#"
+
+// Deprecated XML namespace constants
+#define kXMP_NS_XMP_T     "http://ns.adobe.com/xap/1.0/t/"
+#define kXMP_NS_XMP_T_PG  "http://ns.adobe.com/xap/1.0/t/pg/"
+#define kXMP_NS_XMP_G_IMG "http://ns.adobe.com/xap/1.0/g/img/"
+
+/// \name XML namespace constants from outside Adobe.
+/// @{
+///
+/// \def kXMP_NS_DC
+/// \brief The XML namespace for the Dublin Core schema.
+///
+/// \def kXMP_NS_IPTCCore
+/// \brief The XML namespace for the IPTC Core schema.
+///
+/// \def kXMP_NS_IPTCExt
+/// \brief The XML namespace for the IPTC Extension schema.
+///
+/// \def kXMP_NS_RDF
+/// \brief The XML namespace for RDF.
+///
+/// \def kXMP_NS_XML
+/// \brief The XML namespace for XML.
+///
+/// @}
+
+#define kXMP_NS_DC             "http://purl.org/dc/elements/1.1/"
+
+#define kXMP_NS_IPTCCore       "http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"
+#define kXMP_NS_IPTCExt        "http://iptc.org/std/Iptc4xmpExt/2008-02-29/"
+
+#define kXMP_NS_DICOM          "http://ns.adobe.com/DICOM/"
+
+#define kXMP_NS_PLUS           "http://ns.useplus.org/ldf/xmp/1.0/"
+
+#define kXMP_NS_PDFA_Schema    "http://www.aiim.org/pdfa/ns/schema#"
+#define kXMP_NS_PDFA_Property  "http://www.aiim.org/pdfa/ns/property#"
+#define kXMP_NS_PDFA_Type      "http://www.aiim.org/pdfa/ns/type#"
+#define kXMP_NS_PDFA_Field     "http://www.aiim.org/pdfa/ns/field#"
+#define kXMP_NS_PDFA_ID        "http://www.aiim.org/pdfa/ns/id/"
+#define kXMP_NS_PDFA_Extension "http://www.aiim.org/pdfa/ns/extension/"
+
+#define kXMP_NS_PDFX           "http://ns.adobe.com/pdfx/1.3/"
+#define	kXMP_NS_PDFX_ID        "http://www.npes.org/pdfx/ns/id/"
+
+#define kXMP_NS_RDF            "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+#define kXMP_NS_XML            "http://www.w3.org/XML/1998/namespace"
+
+// =================================================================================================
+// Enums and macros used for option bits
+// =====================================
+
+/// \name Macros for standard option selections.
+/// @{
+///
+/// \def kXMP_ArrayLastItem
+/// \brief Options macro accesses last array item.
+///
+/// \def kXMP_UseNullTermination
+/// \brief Options macro sets string style.
+///
+/// \def kXMP_NoOptions
+/// \brief Options macro clears all property-type bits.
+///
+/// @}
+
+#define kXMP_ArrayLastItem      ((XMP_Index)(-1L))
+#define kXMP_UseNullTermination ((XMP_StringLen)(~0UL))
+#define kXMP_NoOptions          ((XMP_OptionBits)0UL)
+
+/// \name Macros for setting and testing general option bits.
+/// @{
+///
+/// \def XMP_SetOption
+/// \brief Macro sets an option flag bit.
+///	\param var A variable storing an options flag.
+/// \param opt The bit-flag constant to set.
+///
+/// \def XMP_ClearOption
+/// \brief Macro clears an option flag bit.
+///	\param var A variable storing an options flag.
+/// \param opt The bit-flag constant to clear.
+///
+/// \def XMP_TestOption
+/// \brief Macro reports whether an option flag bit is set.
+///	\param var A variable storing an options flag.
+/// \param opt The bit-flag constant to test.
+/// \return True if the bit is set.
+///
+/// \def XMP_OptionIsSet
+/// \brief Macro reports whether an option flag bit is set.
+///	\param var A variable storing an options flag.
+/// \param opt The bit-flag constant to test.
+/// \return True if the bit is set.
+///
+/// \def XMP_OptionIsClear
+/// \brief Macro reports whether an option flag bit is clear.
+///	\param var A variable storing an options flag.
+/// \param opt The bit-flag constant to test.
+/// \return True if the bit is clear.
+///
+/// @}
+
+#define XMP_SetOption(var,opt)      var |= (opt)
+#define XMP_ClearOption(var,opt)    var &= ~(opt)
+#define XMP_TestOption(var,opt)     (((var) & (opt)) != 0)
+#define XMP_OptionIsSet(var,opt)    (((var) & (opt)) != 0)
+#define XMP_OptionIsClear(var,opt)  (((var) & (opt)) == 0)
+
+/// \name Macros for setting and testing specific option bits.
+/// @{
+///
+/// \def XMP_PropIsSimple
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_PropIsStruct
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_PropIsArray
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_ArrayIsUnordered
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_ArrayIsOrdered
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_ArrayIsAlternate
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_ArrayIsAltText
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_PropHasQualifiers
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_PropIsQualifier
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_PropHasLang
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_NodeIsSchema
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// \def XMP_PropIsAlias
+/// \brief Macro reports the property type specified by an options flag.
+/// \param opt The options flag to check.
+///
+/// @}
+
+#define XMP_PropIsSimple(opt)       (((opt) & kXMP_PropCompositeMask) == 0)
+#define XMP_PropIsStruct(opt)       (((opt) & kXMP_PropValueIsStruct) != 0)
+#define XMP_PropIsArray(opt)        (((opt) & kXMP_PropValueIsArray) != 0)
+
+#define XMP_ArrayIsUnordered(opt)   (((opt) & kXMP_PropArrayIsOrdered) == 0)
+#define XMP_ArrayIsOrdered(opt)     (((opt) & kXMP_PropArrayIsOrdered) != 0)
+#define XMP_ArrayIsAlternate(opt)   (((opt) & kXMP_PropArrayIsAlternate) != 0)
+#define XMP_ArrayIsAltText(opt)     (((opt) & kXMP_PropArrayIsAltText) != 0)
+
+#define XMP_PropHasQualifiers(opt)  (((opt) & kXMP_PropHasQualifiers) != 0)
+#define XMP_PropIsQualifier(opt)    (((opt) & kXMP_PropIsQualifier) != 0)
+#define XMP_PropHasLang(opt)        (((opt) & kXMP_PropHasLang) != 0)
+
+#define XMP_NodeIsSchema(opt)       (((opt) & kXMP_SchemaNode) != 0)
+#define XMP_PropIsAlias(opt)        (((opt) & kXMP_PropIsAlias) != 0)
+
+// -------------------------------------------------------------------------------------------------
+
+/// Option bit flags for the \c TXMPMeta property accessor functions.
+enum {
+
+	/// The XML string form of the property value is a URI, use rdf:resource attribute. DISCOURAGED
+    kXMP_PropValueIsURI       = 0x00000002UL,
+
+	// ------------------------------------------------------
+    // Options relating to qualifiers attached to a property.
+
+	/// The property has qualifiers, includes \c rdf:type and \c xml:lang.
+    kXMP_PropHasQualifiers    = 0x00000010UL,
+
+	/// This is a qualifier for some other property, includes \c rdf:type and \c xml:lang.
+	/// Qualifiers can have arbitrary structure, and can themselves have qualifiers. If the
+	/// qualifier itself has a structured value, this flag is only set for the top node of the
+	/// qualifier's subtree.
+    kXMP_PropIsQualifier      = 0x00000020UL,
+
+	/// Implies \c #kXMP_PropHasQualifiers, property has \c xml:lang.
+    kXMP_PropHasLang          = 0x00000040UL,
+
+	/// Implies \c #kXMP_PropHasQualifiers, property has \c rdf:type.
+    kXMP_PropHasType          = 0x00000080UL,
+
+	// --------------------------------------------
+    // Options relating to the data structure form.
+
+	/// The value is a structure with nested fields.
+    kXMP_PropValueIsStruct    = 0x00000100UL,
+
+	/// The value is an array (RDF alt/bag/seq). The "ArrayIs..." flags identify specific types
+	/// of array; default is a general unordered array, serialized using an \c rdf:Bag container.
+    kXMP_PropValueIsArray     = 0x00000200UL,
+
+	/// The item order does not matter.
+    kXMP_PropArrayIsUnordered = kXMP_PropValueIsArray,
+
+	/// Implies \c #kXMP_PropValueIsArray, item order matters. It is serialized using an \c rdf:Seq container.
+    kXMP_PropArrayIsOrdered   = 0x00000400UL,
+
+	/// Implies \c #kXMP_PropArrayIsOrdered, items are alternates. It is serialized using an \c rdf:Alt container.
+    kXMP_PropArrayIsAlternate = 0x00000800UL,
+
+	// ------------------------------------
+    // Additional struct and array options.
+
+	/// Implies \c #kXMP_PropArrayIsAlternate, items are localized text.  Each array element is a
+	/// simple property with an \c xml:lang attribute.
+    kXMP_PropArrayIsAltText   = 0x00001000UL,
+
+    // kXMP_InsertBeforeItem  = 0x00004000UL,  ! Used by SetXyz functions.
+    // kXMP_InsertAfterItem   = 0x00008000UL,  ! Used by SetXyz functions.
+
+	// ----------------------------
+    // Other miscellaneous options.
+
+	/// This property is an alias name for another property.  This is only returned by
+	/// \c TXMPMeta::GetProperty() and then only if the property name is simple, not an path expression.
+    kXMP_PropIsAlias          = 0x00010000UL,
+
+	/// This property is the base value (actual) for a set of aliases.This is only returned by
+	/// \c TXMPMeta::GetProperty() and then only if the property name is simple, not an path expression.
+    kXMP_PropHasAliases       = 0x00020000UL,
+
+	/// The value of this property is "owned" by the application, and should not generally be editable in a UI.
+    kXMP_PropIsInternal       = 0x00040000UL,
+
+	/// The value of this property is not derived from the document content.
+    kXMP_PropIsStable         = 0x00100000UL,
+
+	/// The value of this property is derived from the document content.
+    kXMP_PropIsDerived        = 0x00200000UL,
+
+    // kXMPUtil_AllowCommas   = 0x10000000UL,  ! Used by TXMPUtils::CatenateArrayItems and ::SeparateArrayItems.
+    // kXMP_DeleteExisting    = 0x20000000UL,  ! Used by TXMPMeta::SetXyz functions to delete any pre-existing property.
+    // kXMP_SchemaNode        = 0x80000000UL,  ! Returned by iterators - #define to avoid warnings
+
+	// ------------------------------
+    // Masks that are multiple flags.
+
+	/// Property type bit-flag mask for all array types
+    kXMP_PropArrayFormMask    = kXMP_PropValueIsArray | kXMP_PropArrayIsOrdered | kXMP_PropArrayIsAlternate | kXMP_PropArrayIsAltText,
+
+	/// Property type bit-flag mask for composite types (array and struct)
+    kXMP_PropCompositeMask    = kXMP_PropValueIsStruct | kXMP_PropArrayFormMask,
+
+	/// Mask for bits that are reserved for transient use by the implementation.
+    kXMP_ImplReservedMask     = 0x70000000L
+
+};
+
+#define kXMP_SchemaNode ((XMP_OptionBits)0x80000000UL)
+
+/// Option bit flags for the \c TXMPMeta property setting functions. These option bits are shared
+/// with the accessor functions:
+///   \li \c #kXMP_PropValueIsURI
+///   \li \c #kXMP_PropValueIsStruct
+///   \li \c #kXMP_PropValueIsArray
+///   \li \c #kXMP_PropArrayIsOrdered
+///   \li \c #kXMP_PropArrayIsAlternate
+///   \li \c #kXMP_PropArrayIsAltText
+enum {
+
+    /// Option for array item location: Insert a new item before the given index.
+    kXMP_InsertBeforeItem      = 0x00004000UL,
+
+    /// Option for array item location: Insert a new item after the given index.
+    kXMP_InsertAfterItem       = 0x00008000UL,
+
+    /// Delete any pre-existing property.
+    kXMP_DeleteExisting        = 0x20000000UL,
+
+	/// Bit-flag mask for property-value option bits
+    kXMP_PropValueOptionsMask  = kXMP_PropValueIsURI,
+
+	/// Bit-flag mask for array-item location bits
+    kXMP_PropArrayLocationMask = kXMP_InsertBeforeItem | kXMP_InsertAfterItem
+
+};
+
+// -------------------------------------------------------------------------------------------------
+
+/// Option bit flags for \c TXMPMeta::ParseFromBuffer().
+enum {
+
+	/// Require a surrounding \c x:xmpmeta element.
+    kXMP_RequireXMPMeta   = 0x0001UL,
+
+	/// This is the not last input buffer for this parse stream.
+    kXMP_ParseMoreBuffers = 0x0002UL,
+
+	/// Do not reconcile alias differences, throw an exception.
+    kXMP_StrictAliasing   = 0x0004UL
+
+};
+
+/// Option bit flags for \c TXMPMeta::SerializeToBuffer().
+enum {
+
+    // *** Option to remove empty struct/array, or leaf with empty value?
+
+	/// Omit the XML packet wrapper.
+    kXMP_OmitPacketWrapper   = 0x0010UL,
+
+	/// Default is a writeable packet.
+    kXMP_ReadOnlyPacket      = 0x0020UL,
+
+	/// Use a compact form of RDF.
+    kXMP_UseCompactFormat    = 0x0040UL,
+
+	/// Use a canonical form of RDF.
+    kXMP_UseCanonicalFormat    = 0x0080UL,
+
+	/// Include a padding allowance for a thumbnail image.
+    kXMP_IncludeThumbnailPad = 0x0100UL,
+
+	/// The padding parameter is the overall packet length.
+    kXMP_ExactPacketLength   = 0x0200UL,
+
+	/// Omit all formatting whitespace.
+    kXMP_OmitAllFormatting   = 0x0800UL,
+
+    /// Omit the x:xmpmeta element surrounding the rdf:RDF element.
+	kXMP_OmitXMPMetaElement  = 0x1000UL,    
+	
+	/// Include a rdf Hash and Merged flag in x:xmpmeta element.
+	kXMP_IncludeRDFHash      = 0x2000UL,
+
+    _XMP_LittleEndian_Bit    = 0x0001UL,  // ! Don't use directly, see the combined values below!
+    _XMP_UTF16_Bit           = 0x0002UL,
+    _XMP_UTF32_Bit           = 0x0004UL,
+
+	/// Bit-flag mask for encoding-type bits
+    kXMP_EncodingMask        = 0x0007UL,
+
+	/// Use UTF8 encoding
+    kXMP_EncodeUTF8          = 0UL,
+
+	/// Use UTF16 big-endian encoding
+    kXMP_EncodeUTF16Big      = _XMP_UTF16_Bit,
+
+	/// Use UTF16 little-endian encoding
+    kXMP_EncodeUTF16Little   = _XMP_UTF16_Bit | _XMP_LittleEndian_Bit,
+
+	/// Use UTF32 big-endian encoding
+    kXMP_EncodeUTF32Big      = _XMP_UTF32_Bit,
+
+	/// Use UTF13 little-endian encoding
+    kXMP_EncodeUTF32Little   = _XMP_UTF32_Bit | _XMP_LittleEndian_Bit
+
+};
+
+// -------------------------------------------------------------------------------------------------
+
+/// Option bit flags for \c TXMPIterator construction.
+enum {
+
+	/// The low 8 bits are an enum of what data structure to iterate.
+    kXMP_IterClassMask      = 0x00FFUL,
+
+    /// Iterate the property tree of a TXMPMeta object.
+    kXMP_IterProperties     = 0x0000UL,
+
+	/// Iterate the global alias table.
+    kXMP_IterAliases        = 0x0001UL,
+
+	/// Iterate the global namespace table.
+    kXMP_IterNamespaces     = 0x0002UL,
+
+	/// Just do the immediate children of the root, default is subtree.
+    kXMP_IterJustChildren   = 0x0100UL,
+
+	/// Just do the leaf nodes, default is all nodes in the subtree.
+    kXMP_IterJustLeafNodes  = 0x0200UL,
+
+	/// Return just the leaf part of the path, default is the full path.
+    kXMP_IterJustLeafName   = 0x0400UL,
+
+	 /// Omit all qualifiers.
+    kXMP_IterOmitQualifiers = 0x1000UL
+
+};
+
+/// Option bit flags for \c TXMPIterator::Skip().
+enum {
+
+	/// Skip the subtree below the current node.
+    kXMP_IterSkipSubtree    = 0x0001UL,
+
+	/// Skip the subtree below and remaining siblings of the current node.
+    kXMP_IterSkipSiblings   = 0x0002UL
+
+};
+
+// -------------------------------------------------------------------------------------------------
+
+/// Option bit flags for \c TXMPUtils::CatenateArrayItems() and \c TXMPUtils::SeparateArrayItems().
+/// These option bits are shared with the accessor functions:
+///   \li \c #kXMP_PropValueIsArray,
+///   \li \c #kXMP_PropArrayIsOrdered,
+///   \li \c #kXMP_PropArrayIsAlternate,
+///   \li \c #kXMP_PropArrayIsAltText
+enum {
+
+	/// Allow commas in item values, default is separator.
+    kXMPUtil_AllowCommas      = 0x10000000UL
+
+};
+
+/// Option bit flags for \c TXMPUtils::ApplyTemplate().
+enum {
+
+	 /// Do all properties, default is just external properties.
+    kXMPTemplate_IncludeInternalProperties = 0x0001UL,
+
+	/// Perform a Replace operation, add new properties and modify existing ones.
+    kXMPTemplate_ReplaceExistingProperties = 0x0002UL,
+
+	/// Similar to Replace, also delete if the template has an empty value.
+    kXMPTemplate_ReplaceWithDeleteEmpty = 0x0004UL,
+
+	/// Perform an Add operation, add properties if they don't already exist.
+    kXMPTemplate_AddNewProperties = 0x0008UL,
+
+    /// Perform a Clear operation, keep named properties and delete everything else.
+    kXMPTemplate_ClearUnnamedProperties = 0x0010UL
+
+};
+
+/// Option bit flags for \c TXMPUtils::RemoveProperties() and \c TXMPUtils::AppendProperties().
+enum {
+
+	 /// Do all properties, default is just external properties.
+    kXMPUtil_DoAllProperties   = 0x0001UL,
+
+	/// Replace existing values, default is to leave them.
+    kXMPUtil_ReplaceOldValues  = 0x0002UL,
+
+	/// Delete properties if the new value is empty.
+    kXMPUtil_DeleteEmptyValues = 0x0004UL,
+
+	/// Include aliases, default is just actual properties.
+    kXMPUtil_IncludeAliases    = 0x0800UL
+
+};
+
+// =================================================================================================
+// Types and Constants for XMPFiles
+// ================================
+
+/// Seek mode constants for use with XMP_IO and inside XMPFiles library code.
+enum SeekMode { kXMP_SeekFromStart, kXMP_SeekFromCurrent, kXMP_SeekFromEnd };
+
+/// File format constants for use with XMPFiles.
+enum {
+
+    // ! Hex used to avoid gcc warnings. Leave the constants so the text reads big endian. There
+    // ! seems to be no decent way on UNIX to determine the target endianness at compile time.
+    // ! Forcing it on the client isn't acceptable.
+
+	// --------------------
+    // Public file formats.
+
+	/// Public file format constant: 'PDF '
+    kXMP_PDFFile             = 0x50444620UL,
+	/// Public file format constant: 'PS  ', general PostScript following DSC conventions
+    kXMP_PostScriptFile      = 0x50532020UL,
+	/// Public file format constant: 'EPS ', encapsulated PostScript
+    kXMP_EPSFile             = 0x45505320UL,
+
+	/// Public file format constant: 'JPEG'
+    kXMP_JPEGFile            = 0x4A504547UL,
+	/// Public file format constant: 'JPX ', JPEG 2000, ISO 15444-1
+    kXMP_JPEG2KFile          = 0x4A505820UL,
+	/// Public file format constant: 'TIFF'
+    kXMP_TIFFFile            = 0x54494646UL,
+	/// Public file format constant: 'GIF '
+    kXMP_GIFFile             = 0x47494620UL,
+	/// Public file format constant: 'PNG '
+    kXMP_PNGFile             = 0x504E4720UL,
+    /// Public file format constant: 'WEBP '
+    kXMP_WEBPFile            = 0x57454250UL,
+
+	/// Public file format constant: 'SWF '
+    kXMP_SWFFile             = 0x53574620UL,
+	/// Public file format constant: 'FLA '
+    kXMP_FLAFile             = 0x464C4120UL,
+	/// Public file format constant: 'FLV '
+    kXMP_FLVFile             = 0x464C5620UL,
+
+	/// Public file format constant: 'MOV ', Quicktime
+    kXMP_MOVFile             = 0x4D4F5620UL,
+	/// Public file format constant: 'AVI '
+    kXMP_AVIFile             = 0x41564920UL,
+	/// Public file format constant: 'CIN ', Cineon
+    kXMP_CINFile             = 0x43494E20UL,
+ 	/// Public file format constant: 'WAV '
+    kXMP_WAVFile             = 0x57415620UL,
+	/// Public file format constant: 'MP3 '
+    kXMP_MP3File             = 0x4D503320UL,
+	/// Public file format constant: 'SES ', Audition session
+    kXMP_SESFile             = 0x53455320UL,
+	/// Public file format constant: 'CEL ', Audition loop
+    kXMP_CELFile             = 0x43454C20UL,
+	/// Public file format constant: 'MPEG'
+    kXMP_MPEGFile            = 0x4D504547UL,
+	/// Public file format constant: 'MP2 '
+    kXMP_MPEG2File           = 0x4D503220UL,
+	/// Public file format constant: 'MP4 ', ISO 14494-12 and -14
+    kXMP_MPEG4File           = 0x4D503420UL,
+	/// Public file format constant: 'MXF '
+    kXMP_MXFFile             = 0x4D584620UL,
+	/// Public file format constant: 'WMAV', Windows Media Audio and Video
+    kXMP_WMAVFile            = 0x574D4156UL,
+	/// Public file format constant:  'AIFF'
+    kXMP_AIFFFile            = 0x41494646UL,
+	/// Public file format constant:  'RED ', RED file format
+    kXMP_REDFile            = 0x52454420UL,
+	/// Public file format constant:  'P2  ', a collection not really a single file
+    kXMP_P2File              = 0x50322020UL,
+	/// Public file format constant:  'XDCF', a collection not really a single file
+    kXMP_XDCAM_FAMFile       = 0x58444346UL,
+	/// Public file format constant:  'XDCS', a collection not really a single file
+    kXMP_XDCAM_SAMFile       = 0x58444353UL,
+	/// Public file format constant:  'XDCX', a collection not really a single file
+    kXMP_XDCAM_EXFile        = 0x58444358UL,
+	/// Public file format constant:  'AVHD', a collection not really a single file
+    kXMP_AVCHDFile           = 0x41564844UL,
+	/// Public file format constant:  'SHDV', a collection not really a single file
+    kXMP_SonyHDVFile         = 0x53484456UL,
+	/// Public file format constant:  'CNXF', a collection not really a single file
+    kXMP_CanonXFFile         = 0x434E5846UL,
+
+	/// Public file format constant: 'HTML'
+    kXMP_HTMLFile            = 0x48544D4CUL,
+	/// Public file format constant: 'XML '
+    kXMP_XMLFile             = 0x584D4C20UL,
+	/// Public file format constant:  'text'
+    kXMP_TextFile            = 0x74657874UL,
+
+	// -------------------------------
+    // Adobe application file formats.
+
+	/// Adobe application file format constant: 'PSD '
+    kXMP_PhotoshopFile       = 0x50534420UL,
+	/// Adobe application file format constant: 'AI  '
+    kXMP_IllustratorFile     = 0x41492020UL,
+	/// Adobe application file format constant: 'INDD'
+    kXMP_InDesignFile        = 0x494E4444UL,
+	/// Adobe application file format constant: 'AEP '
+    kXMP_AEProjectFile       = 0x41455020UL,
+	/// Adobe application file format constant: 'AET ', After Effects Project Template
+    kXMP_AEProjTemplateFile  = 0x41455420UL,
+	/// Adobe application file format constant: 'FFX '
+    kXMP_AEFilterPresetFile  = 0x46465820UL,
+	/// Adobe application file format constant: 'NCOR'
+    kXMP_EncoreProjectFile   = 0x4E434F52UL,
+	/// Adobe application file format constant: 'PRPJ'
+    kXMP_PremiereProjectFile = 0x5052504AUL,
+	/// Adobe application file format constant: 'PRTL'
+    kXMP_PremiereTitleFile   = 0x5052544CUL,
+	/// Adobe application file format constant: 'UCF ', Universal Container Format
+	kXMP_UCFFile             = 0x55434620UL,
+
+	// -------
+    // Others.
+
+	/// Unknown file format constant: '    '
+    kXMP_UnknownFile         = 0x20202020UL
+
+};
+
+/// Type for file format identification constants. See \c #kXMP_PDFFile and following.
+typedef XMP_Uns32 XMP_FileFormat;
+
+// -------------------------------------------------------------------------------------------------
+
+/// Byte-order masks, do not use directly
+enum {
+    kXMP_CharLittleEndianMask = 1,
+    kXMP_Char16BitMask        = 2,
+    kXMP_Char32BitMask        = 4
+};
+
+/// Constants to allow easy testing for 16/32 bit and big/little endian.
+enum {
+	/// 8-bit
+    kXMP_Char8Bit        = 0,
+	/// 16-bit big-endian
+    kXMP_Char16BitBig    = kXMP_Char16BitMask,
+	/// 16-bit little-endian
+    kXMP_Char16BitLittle = kXMP_Char16BitMask | kXMP_CharLittleEndianMask,
+	/// 32-bit big-endian
+    kXMP_Char32BitBig    = kXMP_Char32BitMask,
+	/// 32-bit little-endian
+    kXMP_Char32BitLittle = kXMP_Char32BitMask | kXMP_CharLittleEndianMask,
+	/// Variable or not-yet-known cases
+    kXMP_CharUnknown     = 1
+};
+
+/// \name Macros to test components of the character form mask
+/// @{
+///
+/// \def XMP_CharFormIs16Bit
+/// \brief Macro reports the encoding of a character.
+/// \param f The character to check.
+///
+/// \def XMP_CharFormIs32Bit
+/// \brief Macro reports the encoding of a character.
+/// \param f The character to check.
+///
+/// \def XMP_CharFormIsBigEndian
+/// \brief Macro reports the byte-order of a character.
+/// \param f The character to check.
+///
+/// \def XMP_CharFormIsLittleEndian
+/// \brief Macro reports the byte-order of a character.
+/// \param f The character to check.
+///
+/// \def XMP_GetCharSize
+/// \brief Macro reports the byte-size of a character.
+/// \param f The character to check.
+///
+/// \def XMP_CharToSerializeForm
+/// \brief Macro converts \c XMP_Uns8 to \c XMP_OptionBits.
+/// \param cf The character to convert.
+///
+/// \def XMP_CharFromSerializeForm
+/// \brief Macro converts \c XMP_OptionBits to \c XMP_Uns8.
+/// \param sf The character to convert.
+///
+/// @}
+
+#define XMP_CharFormIs16Bit(f)         ( ((int)(f) & kXMP_Char16BitMask) != 0 )
+#define XMP_CharFormIs32Bit(f)         ( ((int)(f) & kXMP_Char32BitMask) != 0 )
+#define XMP_CharFormIsBigEndian(f)     ( ((int)(f) & kXMP_CharLittleEndianMask) == 0 )
+#define XMP_CharFormIsLittleEndian(f)  ( ((int)(f) & kXMP_CharLittleEndianMask) != 0 )
+#define XMP_GetCharSize(f)             ( ((int)(f)&6) == 0 ? 1 : (int)(f)&6 )
+#define XMP_CharToSerializeForm(cf)    ( (XMP_OptionBits)(cf) )
+#define XMP_CharFromSerializeForm(sf)  ( (XMP_Uns8)(sf) )
+
+/// \def kXMPFiles_UnknownOffset
+/// \brief Constant for an unknown packet offset within a file.
+#define kXMPFiles_UnknownOffset	((XMP_Int64)-1)
+
+/// \def kXMPFiles_UnknownLength
+/// \brief Constant for an unknown packet length within a file.
+#define kXMPFiles_UnknownLength	((XMP_Int32)-1)
+
+/// XMP packet description
+struct XMP_PacketInfo {
+
+	/// Packet offset in the file in bytes, -1 if unknown.
+    XMP_Int64 offset;
+	/// Packet length in the file in bytes, -1 if unknown.
+    XMP_Int32 length;
+	/// Packet padding size in bytes, zero if unknown.
+    XMP_Int32 padSize;   // Zero if unknown.
+
+	/// Character format using the values \c kXMP_Char8Bit, \c kXMP_Char16BitBig, etc.
+    XMP_Uns8  charForm;
+	/// True if there is a packet wrapper and the trailer says writeable by dumb packet scanners.
+    XMP_Bool  writeable;
+    /// True if there is a packet wrapper, the "<?xpacket...>" XML processing instructions.
+    XMP_Bool  hasWrapper;
+
+	/// Padding to make the struct's size be a multiple 4.
+    XMP_Uns8  pad;
+
+	/// Default constructor.
+	XMP_PacketInfo() : offset(kXMPFiles_UnknownOffset), length(kXMPFiles_UnknownLength),
+					   padSize(0), charForm(0), writeable(0), hasWrapper(0), pad(0) {};
+
+};
+
+/// Version of the XMP_PacketInfo type
+enum {
+	/// Version of the XMP_PacketInfo type
+	kXMP_PacketInfoVersion = 3
+};
+
+// -------------------------------------------------------------------------------------------------
+
+/// Option bit flags for \c TXMPFiles::Initialize().
+enum {
+    /// Ignore non-XMP text that uses an undefined "local" encoding.
+    kXMPFiles_IgnoreLocalText = 0x0002,
+    /// Combination of flags necessary for server products using XMPFiles.
+    kXMPFiles_ServerMode      = kXMPFiles_IgnoreLocalText
+};
+
+/// Option bit flags for \c TXMPFiles::GetFormatInfo().
+enum {
+
+	/// Can inject first-time XMP into an existing file.
+    kXMPFiles_CanInjectXMP        = 0x00000001,
+
+	/// Can expand XMP or other metadata in an existing file.
+    kXMPFiles_CanExpand           = 0x00000002,
+
+	/// Can copy one file to another, writing new metadata.
+    kXMPFiles_CanRewrite          = 0x00000004,
+
+	 /// Can expand, but prefers in-place update.
+    kXMPFiles_PrefersInPlace      = 0x00000008,
+
+	/// Supports reconciliation between XMP and other forms.
+    kXMPFiles_CanReconcile        = 0x00000010,
+
+	 /// Allows access to just the XMP, ignoring other forms.
+    kXMPFiles_AllowsOnlyXMP       = 0x00000020,
+
+	/// File handler returns raw XMP packet information.
+    kXMPFiles_ReturnsRawPacket    = 0x00000040,
+
+	/// The file handler does the file open and close.
+    kXMPFiles_HandlerOwnsFile     = 0x00000100,
+
+	/// The file handler allows crash-safe file updates.
+    kXMPFiles_AllowsSafeUpdate    = 0x00000200,
+
+	/// The file format needs the XMP packet to be read-only.
+    kXMPFiles_NeedsReadOnlyPacket = 0x00000400,
+
+	/// The file handler uses a "sidecar" file for the XMP.
+    kXMPFiles_UsesSidecarXMP      = 0x00000800,
+
+	/// The format is folder oriented, for example the P2 video format.
+    kXMPFiles_FolderBasedFormat   = 0x00001000,
+
+	/// The file Handler is capable of notifying progress notifications
+    kXMPFiles_CanNotifyProgress   = 0x00002000,
+
+	/// The plugin handler is not capable for delay loading
+	kXMPFiles_NeedsPreloading      = 0x00004000
+
+};
+
+/// Option bit flags for \c TXMPFiles::OpenFile().
+enum {
+
+	/// Open for read-only access.
+    kXMPFiles_OpenForRead           = 0x00000001,
+
+	/// Open for reading and writing.
+    kXMPFiles_OpenForUpdate         = 0x00000002,
+
+	/// Only the XMP is wanted, allows space/time optimizations.
+    kXMPFiles_OpenOnlyXMP           = 0x00000004,
+
+	/// Force use of the given handler (format), do not even verify the format.
+    kXMPFiles_ForceGivenHandler     = 0x00000008,
+	
+	/// Be strict about only attempting to use the designated file handler, no fallback to other handlers.
+    kXMPFiles_OpenStrictly          = 0x00000010,
+
+	/// Require the use of a smart handler.
+    kXMPFiles_OpenUseSmartHandler   = 0x00000020,
+
+	/// Force packet scanning, do not use a smart handler.
+    kXMPFiles_OpenUsePacketScanning = 0x00000040,
+
+	/// Only packet scan files "known" to need scanning.
+    kXMPFiles_OpenLimitedScanning   = 0x00000080,
+
+    /// Attempt to repair a file opened for update, default is to not open (throw an exception).
+    kXMPFiles_OpenRepairFile        = 0x00000100,
+
+	/// When updating a file, spend the effort necessary to optimize file layout.
+	kXMPFiles_OptimizeFileLayout    = 0x00000200
+
+};
+
+/// Option bit flags for \c TXMPFiles::CloseFile().
+enum {
+	/// Write into a temporary file and swap for crash safety.
+    kXMPFiles_UpdateSafely = 0x0001
+};
+
+// =================================================================================================
+// Error notification and Exceptions
+// =================================
+
+/// \name Error notification and Exceptions
+/// @{
+///
+/// From the beginning through version 5.5, XMP Tookit errors result in throwing an \c XMP_Error
+/// exception. For the most part exceptions were thrown early and thus API calls aborted as soon as
+/// an error was detected. Starting in version 5.5, support has been added for notifications of
+/// errors arising in calls to \c TXMPMeta and \c TXMPFiles functions.
+///
+/// A client can register an error notification callback function for a \c TXMPMeta or \c TXMPFiles
+/// object. This can be done as a global default or individually to each object. The global default
+/// applies to all objects created after it is registered. Within the object there is no difference
+/// between the global default or explicitly registered callback. The callback function returns a
+/// \c bool value indicating if recovery should be attempted (true) or an exception thrown (false).
+/// If no callback is registered, a best effort at recovery and continuation will be made with an
+/// exception thrown if recovery is not possible. More details can be found in the \c TXMPMeta and
+/// \c TXMPFiles documentation.
+///
+/// The \c XMP_Error class contains a numeric code and an English explanation. New numeric codes may
+/// be added at any time. There are typically many possible explanations for each numeric code. The
+/// explanations try to be precise about the specific circumstances causing the error.
+///
+/// \note The explanation string is for debugging use only. It must not be shown to users in a
+/// final product. It is written for developers not users, and never localized.
+
+typedef XMP_Uns8 XMP_ErrorSeverity;
+
+/// Severity codes for error notifications
+enum {
+    /// Partial recovery and continuation is possible.
+    kXMPErrSev_Recoverable    = 0,
+    /// Recovery is not possible, an exception will be thrown aborting the API call.
+    kXMPErrSev_OperationFatal = 1,
+    /// Recovery is not possible, an exception will be thrown, the file is corrupt and possibly unusable.
+    kXMPErrSev_FileFatal      = 2,
+    /// Recovery is not possible, an exception will be thrown, the entire process should be aborted.
+    kXMPErrSev_ProcessFatal   = 3
+};
+
+// -------------------------------------------------------------------------------------------------
+/// The signature of a client-defined callback for TXMPMeta error notifications.
+///
+/// @param context A pointer used to carry client-private context.
+///
+/// @param severity The severity of the error, see the \c XMP_ErrorSeverity values.
+///
+/// @param cause A numeric code for the cause of the error, from the XMP_Error exception codes.
+/// Codes used with TXMPMeta error notifications:
+/// \li \c kXMPErr_BadXML - An XML syntax error found during parsing.
+/// \li \c kXMPErr_BadRDF - A syntax or semantic parsing error in the XMP subset of RDF.
+/// \li \c kXMPErr_BadXMP - A semantic XMP data model error.
+/// \li \c kXMPErr_BadValue - An XMP value error, wrong type, out of range, etc.
+/// \li \c kXMPErr_NoMemory - A heap allocation failure.
+///
+/// @param message An explanation of the error, for debugging use only. This should not be displayed
+/// to users in a final product.
+///
+/// @return True if the operation should continue with a best effort attempt at recovery, false if
+/// it should be aborted with an exception thrown from the library back to the original caller.
+/// Recovery is possible only if the severity is kXMPErrSev_Recoverable, an exception will be
+/// thrown on return from the callback in all other cases.
+///
+/// @see \c TXMPMeta::SetDefaultErrorCallback() and \c TXMPMeta::SetErrorCallback()
+
+typedef bool (* XMPMeta_ErrorCallbackProc) ( void* context, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr message );
+
+// -------------------------------------------------------------------------------------------------
+/// The signature of a client-defined callback for TXMPFiles error notifications.
+///
+/// @param context A pointer used to carry client-private context.
+///
+/// @param filePath The path for the file involved in the error.
+///
+/// @param severity The severity of the error, see the \c XMP_ErrorSeverity values.
+///
+/// @param cause A numeric code for the cause of the error, from the XMP_Error exception codes.
+/// Codes used with TXMPFiles error notifications:
+/// \li \c kXMPErr_NoFile - A file does not exist
+/// \li \c kXMPErr_FilePermission - A file exists but cannot be opened
+/// \li \c kXMPErr_FilePathNotAFile - A path exists which is not a file
+/// \li \c dXMPErr_RejectedFileExtension - Any Operation called on rejected file extension
+/// \li \c KXMPErr_NoFileHandler - No suitable handler is found for the file
+/// \li \c kXMPErr_DiskSpace - A file write fails due to lack of disk space
+/// \li \c kXMPErr_ReadError - A file read fails
+/// \li \c kXMPErr_WriteError - A file write fails for some other reason than space
+/// \li \c kXMPErr_BadFileFormat - A file is corrupt or ill-formed
+/// \li \c kXMPErr_BadBlockFormat - A portion of a file is corrupt or ill-formed
+/// \li \c kXMPErr_BadValue - An XMP or non-XMP metadata item has an invalid value
+/// \li \c kXMPErr_NoMemory - A heap allocation failure
+///
+/// @param message An explanation of the error, for debugging use only. This should not be displayed
+/// to users in a final product.
+///
+/// @return True if the operation should continue with a best effort attempt at recovery, false if
+/// it should be aborted with an exception thrown from the library back to the original caller.
+/// Recovery is possible only if the severity is kXMPErrSev_Recoverable, an exception will be
+/// thrown on return from the callback in all other cases.
+///
+/// @see \c TXMPFiles::SetDefaultErrorCallback() and \c TXMPFiles::SetErrorCallback()
+
+typedef bool (* XMPFiles_ErrorCallbackProc) ( void* context, XMP_StringPtr filePath, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr message );
+
+// -------------------------------------------------------------------------------------------------
+/// Internal: The signatures of client-side wrappers for the error notification callbacks.
+
+typedef XMP_Bool (* XMPMeta_ErrorCallbackWrapper) ( XMPMeta_ErrorCallbackProc clientProc, void* context,
+                                    	        XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr message );
+
+typedef XMP_Bool (* XMPFiles_ErrorCallbackWrapper) ( XMPFiles_ErrorCallbackProc clientProc, void* context,
+                                     	         XMP_StringPtr filePath, XMP_ErrorSeverity severity,
+                                    	         XMP_Int32 cause, XMP_StringPtr message );
+
+/// XMP Toolkit error, associates an error code with a descriptive error string.
+class XMP_Error {
+public:
+
+	/// @brief Constructor for an XMP_Error.
+	///
+	/// @param _id The numeric code.
+	///
+	/// @param _errMsg The descriptive string, for debugging use only. It must not be shown to users
+	/// in a final product. It is written for developers, not users, and never localized.
+	XMP_Error ( XMP_Int32 _id, XMP_StringPtr _errMsg ) : id(_id), errMsg(NULL), notified(false) {
+		if (_errMsg) {
+			errMsg = strdup(_errMsg);
+		}
+	};
+	/// @brief Copy constructor for an XMP_Error.
+	///
+	/// Because we rethrow it.
+	XMP_Error (const XMP_Error& e)
+		: id(e.id), errMsg(NULL), notified(e.notified) {
+		if (e.errMsg) {
+			errMsg = strdup(e.errMsg);
+		}
+	};
+	~XMP_Error() {
+		if (errMsg) {
+			free(errMsg);
+		}
+	};
+
+	/// Retrieves the numeric code from an XMP_Error.
+	inline XMP_Int32     GetID() const     { return id; };
+
+	/// Retrieves the descriptive string from an XMP_Error.
+	inline XMP_StringPtr GetErrMsg() const { return errMsg; };
+
+	/// Retrieves the information whether particular error is notified or not
+	inline XMP_Bool      IsNotified() const { return notified; }
+
+	/// Sets the notification status for an error
+	inline void          SetNotified() { notified = true; };
+
+private:
+	/// Exception code. See constants \c #kXMPErr_Unknown and following.
+	XMP_Int32     id;
+	/// Descriptive string, for debugging use only. It must not be shown to users in a final
+	/// product. It is written for developers, not users, and never localized.
+	char* errMsg;
+	/// Variable to store whether this particular error is notified to user or not
+	XMP_Bool notified;
+};
+
+/// XMP_Error exception code constants
+enum {
+
+	//  --------------------
+    /// Generic error codes.
+
+	/// No error
+	kXMPErr_NoError          =  -1,
+
+	/// Generic unknown error
+    kXMPErr_Unknown          =   0,
+	/// Generic undefined error
+    kXMPErr_TBD              =   1,
+	/// Generic unavailable error
+    kXMPErr_Unavailable      =   2,
+	/// Generic bad object error
+    kXMPErr_BadObject        =   3,
+	/// Generic bad parameter error
+    kXMPErr_BadParam         =   4,
+	/// Generic bad value error
+    kXMPErr_BadValue         =   5,
+	/// Generic assertion failure
+    kXMPErr_AssertFailure    =   6,
+	/// Generic enforcement failure
+    kXMPErr_EnforceFailure   =   7,
+	/// Generic unimplemented error
+    kXMPErr_Unimplemented    =   8,
+	/// Generic internal failure
+    kXMPErr_InternalFailure  =   9,
+	/// Generic deprecated error
+    kXMPErr_Deprecated       =  10,
+	/// Generic external failure
+    kXMPErr_ExternalFailure  =  11,
+	/// Generic user abort error
+    kXMPErr_UserAbort        =  12,
+	/// Generic standard exception
+    kXMPErr_StdException     =  13,
+	/// Generic unknown exception
+    kXMPErr_UnknownException =  14,
+	/// Generic out-of-memory error
+    kXMPErr_NoMemory         =  15,
+	/// Progress reporting callback requested abort
+    kXMPErr_ProgressAbort    =  16,
+
+	// ------------------------------------
+    // More specific parameter error codes.
+
+	/// Bad schema parameter
+    kXMPErr_BadSchema        = 101,
+	/// Bad XPath parameter
+    kXMPErr_BadXPath         = 102,
+	/// Bad options parameter
+    kXMPErr_BadOptions       = 103,
+	/// Bad index parameter
+    kXMPErr_BadIndex         = 104,
+	/// Bad iteration position
+    kXMPErr_BadIterPosition  = 105,
+	/// XML parsing error (deprecated)
+    kXMPErr_BadParse         = 106,
+	/// Serialization error
+    kXMPErr_BadSerialize     = 107,
+	/// File format error
+    kXMPErr_BadFileFormat    = 108,
+	/// No file handler found for format
+    kXMPErr_NoFileHandler    = 109,
+	/// Data too large for JPEG file format
+    kXMPErr_TooLargeForJPEG  = 110,
+    /// A file does not exist
+    kXMPErr_NoFile           = 111,
+    /// A file exists but cannot be opened
+    kXMPErr_FilePermission   = 112,
+    /// A file write failed due to lack of disk space
+    kXMPErr_DiskSpace        = 113,
+    /// A file read failed
+    kXMPErr_ReadError        = 114,
+    /// A file write failed for a reason other than lack of disk space
+    kXMPErr_WriteError       = 115,
+    /// A block of a file is ill-formed, e.g. invalid IPTC-IIM in a photo
+    kXMPErr_BadBlockFormat   = 116,
+    /// File Path is not a file
+    kXMPErr_FilePathNotAFile = 117,
+    /// Rejected File extension
+    kXMPErr_RejectedFileExtension = 118,
+
+	// -----------------------------------------------
+    // File format and internal structure error codes.
+
+	/// XML format error
+    kXMPErr_BadXML           = 201,
+	/// RDF format error
+    kXMPErr_BadRDF           = 202,
+	/// XMP format error
+    kXMPErr_BadXMP           = 203,
+	/// Empty iterator
+    kXMPErr_EmptyIterator    = 204,
+	/// Unicode error
+    kXMPErr_BadUnicode       = 205,
+	/// TIFF format error
+    kXMPErr_BadTIFF          = 206,
+	/// JPEG format error
+    kXMPErr_BadJPEG          = 207,
+	/// PSD format error
+    kXMPErr_BadPSD           = 208,
+	/// PSIR format error
+    kXMPErr_BadPSIR          = 209,
+	/// IPTC format error
+    kXMPErr_BadIPTC          = 210,
+	/// MPEG format error
+    kXMPErr_BadMPEG          = 211
+
+};
+
+/// @}
+
+// =================================================================================================
+// Client callbacks
+// ================
+
+// -------------------------------------------------------------------------------------------------
+/// \name Special purpose callback functions
+/// @{
+
+/// A signed 32-bit integer used as a status result for the output callback routine,
+/// \c XMP_TextOutputProc. Zero means no error, all other values except -1 are private to the callback.
+/// The callback is wrapped to prevent exceptions being thrown across DLL boundaries. Any exceptions
+/// thrown out of the callback cause a return status of -1.
+
+typedef XMP_Int32 XMP_Status;
+
+// -------------------------------------------------------------------------------------------------
+/// The signature of a client-defined callback for text output from XMP Toolkit debugging
+/// operations. The callback is invoked one or more times for each line of output. The end of a line
+/// is signaled by a '\\n' character at the end of the buffer. Formatting newlines are never present
+/// in the middle of a buffer, but values of properties might contain any UTF-8 characters.
+///
+/// @param refCon A pointer to client-defined data passed to the TextOutputProc.
+///
+/// @param buffer  A string containing one line of output.
+///
+/// @param bufferSize The number of characters in the output buffer.
+///
+/// @return A success/fail status value. Any failure result aborts the output.
+///
+/// @see \c TXMPMeta::DumpObject()
+
+typedef XMP_Status (* XMP_TextOutputProc) ( void *        refCon,
+                                            XMP_StringPtr buffer,
+                                            XMP_StringLen bufferSize );
+
+// -------------------------------------------------------------------------------------------------
+/// The signature of a client-defined callback to check for a user request to abort a time-consuming
+/// operation within XMPFiles.
+///
+/// @param arg A pointer to caller-defined data passed from the registration call.
+///
+/// @return True to abort the current operation, which results in an exception being thrown.
+///
+/// @see \c TXMPFiles::SetAbortProc()
+
+typedef bool (* XMP_AbortProc) ( void * arg );
+
+// -------------------------------------------------------------------------------------------------
+/// The signature of a client-defined callback for progress report notifications.
+///
+/// @param context A pointer used to carry client-private context.
+///
+/// @param elapsedTime The time in seconds since the progress reporting started.
+///
+/// @param fractionDone A float value estimating the amount of work already done, in the range of
+/// 0.0 to 1.0. A value of 0.0 is given if the amount is not known, this happens if there is no
+/// estimate total for the total work. The units of work are not defined, but should usually be
+/// related to the number of bytes of I/O. This will go backwards if total work estimate changes.
+///
+/// @param secondsToGo A float value estimating the number of seconds left to complete the file
+/// operation. A value of 0.0 is given if the amount is not known, this happens if the amount of
+/// total work is unknown. This can go backwards according to throughput or if work estimate changes.
+///
+/// @return True if the file operation should continue, false if it should be aborted with an
+/// exception being thrown from the XMPFiles library back to the original caller.
+///
+/// @see \c TXMPFiles::SetDefaultProgressCallback() and \c TXMPFiles::SetProgressCallback()
+
+typedef bool (* XMP_ProgressReportProc) ( void * context, float elapsedTime, float fractionDone, float secondsToGo );
+
+// -------------------------------------------------------------------------------------------------
+/// Internal: The signature of a client-side wrapper for the progress report callback.
+
+typedef XMP_Bool (* XMP_ProgressReportWrapper) ( XMP_ProgressReportProc proc, void * context,
+											 float elapsedTime, float fractionDone, float secondsToGo );
+
+/// @}
+
+// =================================================================================================
+// Stuff with no better place to be
+// ================================
+
+/// XMP Toolkit version information
+typedef struct XMP_VersionInfo {
+	/// The primary release number, the "1" in version "1.2.3".
+    XMP_Uns8      major;
+	/// The secondary release number, the "2" in version "1.2.3".
+    XMP_Uns8      minor;
+	/// The tertiary release number, the "3" in version "1.2.3".
+    XMP_Uns8      micro;
+	 /// A 0/1 boolean value, true if this is a debug build.
+    XMP_Bool      isDebug;
+	 /// A rolling build number, monotonically increasing in a release.
+    XMP_Uns32     build;
+	 /// Individual feature implementation flags.
+    XMP_Uns32     flags;
+	 /// A comprehensive version information string.
+    XMP_StringPtr message;
+} XMP_VersionInfo;
+
+// =================================================================================================
+
+#if __cplusplus
+} // extern "C"
+#endif
+
+#include <vector>
+
+#endif  // __XMP_Const_h__
diff --git a/public/include/XMP_Environment.h b/public/include/XMP_Environment.h
new file mode 100644
index 0000000..d8bab98
--- /dev/null
+++ b/public/include/XMP_Environment.h
@@ -0,0 +1,188 @@
+#ifndef __XMP_Environment_h__
+#define __XMP_Environment_h__ 1
+
+// =================================================================================================
+// XMP_Environment.h - Build environment flags for the XMP toolkit.
+// ================================================================
+//
+// This header is just C preprocessor macro definitions to set up the XMP toolkit build environment.
+// It must be the first #include in any chain since it might affect things in other #includes.
+//
+// =================================================================================================
+
+// =================================================================================================
+// Copyright 2002 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.
+// =================================================================================================
+
+// =================================================================================================
+// Determine the Platform
+// ======================
+
+// One of MAC_ENV, WIN_ENV, UNIX_ENV or IOS_ENV must be defined by the client. Since some other code
+// requires these to be defined without values, they are only used here to define XMP-specific
+// macros with 0 or 1 values.
+
+// ! Tempting though it might be to have a standard macro for big or little endian, there seems to
+// ! be no decent way to do that on our own in UNIX. Forcing it on the client isn't acceptable.
+
+#if defined ( MAC_ENV )
+
+	#if 0	// ! maybe someday - ! MAC_ENV
+		#error "MAC_ENV must be defined so that \"#if MAC_ENV\" is true"
+	#endif
+	
+    #if defined ( WIN_ENV ) || defined ( UNIX_ENV ) || defined ( IOS_ENV )
+        #error "XMP environment error - must define only one of MAC_ENV, WIN_ENV, UNIX_ENV or IOS_ENV"
+    #endif
+
+    #define XMP_MacBuild  1
+    #define XMP_WinBuild  0
+    #define XMP_UNIXBuild 0
+	#define XMP_iOSBuild  0
+
+#elif defined ( WIN_ENV )
+
+	#if 0	// ! maybe someday - ! WIN_ENV
+		#error "WIN_ENV must be defined so that \"#if WIN_ENV\" is true"
+	#endif
+	
+    #if defined ( MAC_ENV ) || defined ( UNIX_ENV ) || defined ( IOS_ENV )
+		#error "XMP environment error - must define only one of MAC_ENV, WIN_ENV, UNIX_ENV or IOS_ENV"
+    #endif
+
+    #define XMP_MacBuild  0
+    #define XMP_WinBuild  1
+    #define XMP_UNIXBuild 0
+	#define XMP_iOSBuild  0
+
+#elif defined ( UNIX_ENV )
+
+	#if 0	// ! maybe someday - ! UNIX_ENV
+		#error "UNIX_ENV must be defined so that \"#if UNIX_ENV\" is true"
+	#endif
+	
+	#if defined ( MAC_ENV ) || defined ( WIN_ENV ) || defined ( IOS_ENV )
+		#error "XMP environment error - must define only one of MAC_ENV, WIN_ENV, UNIX_ENV or IOS_ENV"
+	#endif
+
+    #define XMP_MacBuild  0
+    #define XMP_WinBuild  0
+    #define XMP_UNIXBuild 1
+	#define XMP_iOSBuild  0
+
+#elif defined ( IOS_ENV )
+
+	#if 0	// ! maybe someday - ! IOS_ENV
+		#error "IOS_ENV must be defined so that \"#if IOS_ENV\" is true"
+	#endif
+
+	#if defined ( MAC_ENV ) || defined ( WIN_ENV ) || defined ( UNIX_ENV )
+		#error "XMP environment error - must define only one of MAC_ENV, WIN_ENV, UNIX_ENV or IOS_ENV"
+	#endif
+
+	#define XMP_MacBuild  0
+	#define XMP_WinBuild  0
+	#define XMP_UNIXBuild 0
+	#define XMP_iOSBuild  1
+
+#else
+
+    #error "XMP environment error - must define one of MAC_ENV, WIN_ENV, UNIX_ENV or IOS_ENV"
+
+#endif
+
+// =================================================================================================
+// Common Macros
+// =============
+
+#if defined ( DEBUG )
+    #if defined ( NDEBUG )
+        #error "XMP environment error - both DEBUG and NDEBUG are defined"
+    #endif
+    #define XMP_DebugBuild 1
+#endif
+
+#if defined ( NDEBUG )
+    #define XMP_DebugBuild 0
+#endif
+
+#ifndef XMP_DebugBuild
+    #define XMP_DebugBuild 0
+#endif
+
+#if XMP_DebugBuild
+    #include <stdio.h>  // The assert macro needs printf.
+#endif
+
+#ifndef DISABLE_SERIALIZED_IMPORT_EXPORT 
+	#define DISABLE_SERIALIZED_IMPORT_EXPORT 0
+#endif
+
+#ifndef XMP_64
+	#if _WIN64 || defined(_LP64)
+		#define XMP_64 1
+	#else
+		#define XMP_64 0
+	#endif
+#endif
+
+// =================================================================================================
+// Macintosh Specific Settings
+// ===========================
+#if (XMP_MacBuild)
+	#define XMP_HELPER_DLL_IMPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_EXPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_PRIVATE __attribute__((visibility("hidden")))
+#endif
+
+// =================================================================================================
+// Windows Specific Settings
+// =========================
+#if (XMP_WinBuild)
+	#define XMP_HELPER_DLL_IMPORT
+	#define XMP_HELPER_DLL_EXPORT
+	#define XMP_HELPER_DLL_PRIVATE
+#endif
+
+// =================================================================================================
+// UNIX Specific Settings
+// ======================
+#if (XMP_UNIXBuild)
+	#define XMP_HELPER_DLL_IMPORT
+	#define XMP_HELPER_DLL_EXPORT
+	#define XMP_HELPER_DLL_PRIVATE
+#endif
+
+// =================================================================================================
+// IOS Specific Settings
+// ===========================
+#if (XMP_iOSBuild)
+	#include <TargetConditionals.h>
+	#if (TARGET_CPU_ARM)
+		#define XMP_IOS_ARM 1
+	#else
+		#define XMP_IOS_ARM 0
+	#endif
+	#define XMP_HELPER_DLL_IMPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_EXPORT __attribute__((visibility("default")))
+	#define XMP_HELPER_DLL_PRIVATE __attribute__((visibility("hidden")))
+#endif
+
+// =================================================================================================
+
+#if (XMP_DynamicBuild)
+	#define XMP_PUBLIC XMP_HELPER_DLL_EXPORT
+	#define XMP_PRIVATE XMP_HELPER_DLL_PRIVATE
+#elif (XMP_StaticBuild)
+	#define XMP_PUBLIC
+	#define XMP_PRIVATE
+#else
+	#define XMP_PUBLIC XMP_HELPER_DLL_IMPORT
+	#define XMP_PRIVATE XMP_HELPER_DLL_PRIVATE
+#endif
+
+#endif  // __XMP_Environment_h__
diff --git a/public/include/XMP_IO.hpp b/public/include/XMP_IO.hpp
new file mode 100644
index 0000000..3664e3b
--- /dev/null
+++ b/public/include/XMP_IO.hpp
@@ -0,0 +1,171 @@
+#ifndef __XMP_IO_hpp__
+#define __XMP_IO_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "XMP_Const.h"
+
+// =================================================================================================
+/// \class XMP_IO XMP_IO.hpp
+/// \brief Abstract base class for client-managed I/O with \c TXMPFiles.
+///
+/// \c XMP_IO is an abstract base class for client-managed I/O with \c TXMPFiles. This allows a
+/// client to use the embedded metadata processing logic of \c TXMPFiles in cases where a string
+/// file path cannot be provided, or where it is impractical to allow \c TXMPFiles to separately
+/// open the file and do its own I/O. Although described in terms of files, any form of storage may
+/// be used as long as the functions operate as defined.
+///
+/// This is not a general purpose I/O class. It contains only the necessary functions needed by the
+/// internals of \c TXMPFiles. It is intended to be used as an adaptor for an existing I/O mechanism
+/// that the client wants \c TXMPFiles to use.
+///
+/// To use \c XMP_IO, a client creates a derived class then uses the form of \c TCMPFiles::OpenFile
+/// that takes an \c XMP_IO parameter instead of a string file path. The derived \c XMP_IO object
+/// must be ready for use when \c TCMPFiles::OpenFile is called.
+///
+/// There are no Open or Close functions in \c XMP_IO, they are specific to each implementation. The
+/// derived \c XMP_IO object must be open and ready for use before being passed to \c
+/// TXMP_Files::OpenFile, and remain open and ready for use until \c TXMP_Files::CloseFile returns,
+/// or some other fatal error occurs. The client has final responsibility for closing and
+/// terminating the derived \c XMP_IO object.
+// =================================================================================================
+
+class XMP_IO {
+public:
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Read into a buffer, returning the number of bytes read.
+	///
+	/// Read into a buffer, returning the number of bytes read. Returns the actual number of bytes
+	/// read. Throws an exception if requireSuccess is true and not enough data is available.
+	/// Throwing \c XMPError is recommended. The buffer content and I/O position after a throw are
+	/// undefined.
+	///
+	/// @param buffer A pointer to the buffer.
+	/// @param count The length of the buffer in bytes.
+	/// @param readAll True if reading less than the requested amount is a failure.
+	///
+	/// @return Returns the number of bytes read.
+
+	enum { kReadAll = true };
+
+	virtual XMP_Uns32 Read ( void* buffer, XMP_Uns32 count, bool readAll = false ) = 0;
+
+	inline XMP_Uns32 ReadAll ( void* buffer, XMP_Uns32 bytes )
+		{ return this->Read ( buffer, bytes, kReadAll ); };
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Write from a buffer.
+	///
+	/// Write from a buffer, overwriting existing data and extending the file as necesary. All data
+	/// must be written or an exception thrown. Throwing \c XMPError is recommended.
+	///
+	/// @param buffer A pointer to the buffer.
+	/// @param count The length of the buffer in bytes.
+
+	virtual void Write ( const void* buffer, XMP_Uns32 count ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Set the I/O position, returning the new absolute offset in bytes.
+	///
+	/// Set the I/O position, returning the new absolute offset in bytes. The offset parameter may
+	/// be positive or negative. A seek beyond EOF is allowed when writing and extends the file, it
+	/// is equivalent to seeking to EOF then writing the needed amount of undefined data. A
+	/// read-only seek beyond EOF throws an exception. Throwing \c XMPError is recommended.
+	///
+	/// @param offset The offset relative to the mode.
+	/// @param mode The mode, or origin, of the seek.
+	///
+	/// @return The new absolute offset in bytes.
+
+	virtual XMP_Int64 Seek ( XMP_Int64 offset, SeekMode mode ) = 0;
+
+	inline XMP_Int64 Offset() { return this->Seek ( 0, kXMP_SeekFromCurrent ); };
+	inline XMP_Int64 Rewind() { return this->Seek ( 0, kXMP_SeekFromStart ); };	// Always returns 0.
+	inline XMP_Int64 ToEOF()  { return this->Seek ( 0, kXMP_SeekFromEnd ); };
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Return the length of the file in bytes.
+	///
+	/// Return the length of the file in bytes. The I/O position is unchanged.
+	///
+	/// @return The length of the file in bytes.
+
+	virtual XMP_Int64 Length() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Truncate the file to the given length.
+	///
+	/// Truncate the file to the given length. The I/O position after truncation is unchanged if
+	/// still valid, otherwise it is set to the new EOF. Throws an exception if the new length is
+	/// longer than the file's current length. Throwing \c XMPError is recommended.
+	///
+	/// @param length The new length for the file, must be less than or equal to the current length.
+
+	virtual void Truncate ( XMP_Int64 length ) = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Create an associated temp file for use in a safe-save style operation.
+	///
+	/// Create an associated temp file, for example in the same directory and with a related name.
+	/// Returns an already existing temp with no other action. The temp must be opened for
+	/// read-write access. It will be used in a safe-save style operation, using some of the
+	/// original file plus new portions to write the temp, then replacing the original from the temp
+	/// when done. Throws an exception if the owning object is opened for read-only access, or if
+	/// the temp file cannot be created. Throwing \c XMPError is recommended.
+	///
+	/// The temp file is normally closed and deleted, and the temporary \c XMP_IO object deleted, by
+	/// a call to \c AbsorbTemp or \c DeleteTemp. It must be closed and deleted by the derived \c
+	/// XMP_IO object's destructor if necessary.
+	///
+	/// \c DeriveTemp may be called on a temporary \c XMP_IO object.
+	///
+	/// @return A pointer to the associated temporary \c XMP_IO object.
+
+	virtual XMP_IO* DeriveTemp() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Replace the owning file's content with that of the temp.
+	///
+	/// Used at the end of a safe-save style operation to replace the original content with that
+	/// from the associated temp file. The temp file must be closed and deleted after the content
+	/// swap. The temporary \c XMP_IO object is deleted. Throws an exception if the temp file cannot
+	/// be absorbed. Throwing \c XMPError is recommended.
+
+	virtual void AbsorbTemp() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+	/// @brief Delete a temp file, leaving the original alone.
+	///
+	/// Used for a failed safe-save style operation. The temp file is closed and deleted without
+	/// being absorbed, and the temporary \c XMP_IO object is deleted. Does nothing if no temp
+	/// exists.
+
+	virtual void DeleteTemp() = 0;
+
+	// ---------------------------------------------------------------------------------------------
+
+	XMP_IO() {};
+	virtual ~XMP_IO() {};
+
+private:
+
+	// ---------------------------------------------------------------------------------------------
+	/// Copy construction and assignment are not public. That would require the implementation to
+	/// share state across multiple XMP_IO objects.
+
+	XMP_IO ( const XMP_IO & original );
+	XMP_IO& operator= ( const XMP_IO& in );
+
+};
+
+#endif	// __XMP_IO_hpp__
diff --git a/public/include/XMP_UnixEndian.h b/public/include/XMP_UnixEndian.h
new file mode 100644
index 0000000..ff1699e
--- /dev/null
+++ b/public/include/XMP_UnixEndian.h
@@ -0,0 +1,32 @@
+// Endian check for Unix, refactored because examples needs it.
+//
+
+#ifdef CHECKED_ENDIANNESS
+
+# if defined(WORDS_BIGENDIAN)
+#   define kBigEndianHost 1
+# else
+#   define kBigEndianHost 0
+# endif
+
+#else
+
+# if __sun
+#  include <sys/isa_defs.h>
+#  ifdef _LITTLE_ENDIAN
+#    define kBigEndianHost 0
+#  else
+#    define kBigEndianHost 1
+#  endif
+# else
+#  include <endian.h>
+#  if BYTE_ORDER == BIG_ENDIAN
+#   define kBigEndianHost 1
+#  elif BYTE_ORDER == LITTLE_ENDIAN
+#   define kBigEndianHost 0
+#  else
+#   error "Neither BIG_ENDIAN nor LITTLE_ENDIAN is set"
+#  endif
+# endif
+
+#endif // CHECKED_ENDIANNESS
diff --git a/public/include/XMP_Version.h b/public/include/XMP_Version.h
new file mode 100644
index 0000000..53707b1
--- /dev/null
+++ b/public/include/XMP_Version.h
@@ -0,0 +1,52 @@
+#ifndef __XMP_Version_h__
+#define __XMP_Version_h__ 1
+
+/* --------------------------------------------------------------------------------------------- */
+/* ** IMPORTANT ** This file must be usable by strict ANSI C compilers. No "//" comments, etc.   */
+/* --------------------------------------------------------------------------------------------- */
+
+/*
+// =================================================================================================
+// Copyright 2002 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.
+// =================================================================================================
+*/
+
+/* ============================================================================================= */
+/**
+XMP Toolkit Version Information
+
+Version information for the XMP toolkit is stored in the executable and available through a runtime
+call, <tt>SXMPMeta::GetVersionInfo</tt>. In addition a static version number is defined in this
+header. The information in the executable or returned by <tt>SXMPMeta::GetVersionInfo</tt> is about
+the implementation internals, it is runtime version information. The values defined in this header
+describe the version of the API used at client compile time. They do not necessarily relate to the
+runtime version.
+
+Important: Do not display the static values defined here to users as the version of XMP in use. Do
+not base runtime decisions on just this static version. It is OK to compare the static and runtime
+versions.
+
+*/
+/* ============================================================================================= */
+
+#define XMPCORE_API_VERSION_MAJOR  5
+#define XMPCORE_API_VERSION_MINOR  5
+#define XMPCORE_API_VERSION_MICRO  0
+
+#define XMPCORE_API_VERSION 5.5.0
+#define XMPCORE_API_VERSION_STRING "5.5.0"
+
+#define XMPFILES_API_VERSION_MAJOR  5
+#define XMPFILES_API_VERSION_MINOR  6
+#define XMPFILES_API_VERSION_MICRO  0
+
+#define XMPFILES_API_VERSION 5.6.0
+#define XMPFILES_API_VERSION_STRING "5.6.0"
+
+/* ============================================================================================= */
+
+#endif /* __XMP_Version_h__ */
diff --git a/public/include/client-glue/Makefile.am b/public/include/client-glue/Makefile.am
new file mode 100644
index 0000000..30e58b2
--- /dev/null
+++ b/public/include/client-glue/Makefile.am
@@ -0,0 +1,40 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+noinst_HEADERS=TXMPFiles.incl_cpp     TXMPMeta.incl_cpp   WXMP_Common.hpp  \
+	WXMPIterator.hpp  WXMPUtils.hpp\
+	TXMPIterator.incl_cpp  TXMPUtils.incl_cpp  WXMPFiles.hpp    WXMPMeta.hpp
\ No newline at end of file
diff --git a/public/include/client-glue/Makefile.in b/public/include/client-glue/Makefile.in
new file mode 100644
index 0000000..49ee9c3
--- /dev/null
+++ b/public/include/client-glue/Makefile.in
@@ -0,0 +1,569 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = public/include/client-glue
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_HEADERS = TXMPFiles.incl_cpp     TXMPMeta.incl_cpp   WXMP_Common.hpp  \
+	WXMPIterator.hpp  WXMPUtils.hpp\
+	TXMPIterator.incl_cpp  TXMPUtils.incl_cpp  WXMPFiles.hpp    WXMPMeta.hpp
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign public/include/client-glue/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign public/include/client-glue/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/public/include/client-glue/TXMPFiles.incl_cpp b/public/include/client-glue/TXMPFiles.incl_cpp
new file mode 100644
index 0000000..eb19887
--- /dev/null
+++ b/public/include/client-glue/TXMPFiles.incl_cpp
@@ -0,0 +1,484 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+//  ================================================================================================
+/// \file TXMPFiles.incl_cpp
+/// \brief The implementation of the TXMPFiles template class.
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4003 )	// not enough actual parameters for macro
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+#include "client-glue/WXMP_Common.hpp"
+
+#include "client-glue/WXMPFiles.hpp"
+
+// =================================================================================================
+// Implementation Guidelines
+// =========================
+//
+// The implementations of the template functions are very stylized. The jobs done in this code are:
+//
+//	1. ...
+//
+// =================================================================================================
+
+#ifndef XMPFiles_TraceCTorDTor
+	#define XMPFiles_TraceCTorDTor 0
+#endif
+
+#if XMPFiles_TraceCTorDTor
+	class XFPeek {	// Hack to peek at the client ref count in the internal object.
+	public:
+		XFPeek();
+		virtual ~XFPeek();
+		XMP_Int32 clientRefs;
+	};
+#endif
+
+// =================================================================================================
+
+XMP_MethodIntro(TXMPFiles,void)::
+SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen )
+{
+	tStringObj * clientStr = (tStringObj*) clientPtr;
+	clientStr->assign ( valuePtr, valueLen );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+SetClientStringVector ( void * clientPtr, XMP_StringPtr * arrayPtr, XMP_Uns32 stringCount )
+{
+	std::vector<tStringObj>* clientVec = (std::vector<tStringObj>*) clientPtr;
+	clientVec->clear();
+	for ( XMP_Uns32 i = 0; i < stringCount; ++i ) {
+		tStringObj nextValue ( arrayPtr[i] );
+		clientVec->push_back ( nextValue );
+	}
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+GetVersionInfo ( XMP_VersionInfo * versionInfo )
+{
+	WrapNoCheckVoid ( zXMPFiles_GetVersionInfo_1 ( versionInfo ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+Initialize()
+{
+	WrapCheckBool ( ok, zXMPFiles_Initialize_1 ( 0 ) );
+	return ok;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+Initialize( const char* pluginFolder, const char* plugins )
+{
+	WrapCheckBool ( ok, zXMPFiles_Initialize_2 ( 0, pluginFolder, plugins ) );
+	return ok;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+Initialize ( XMP_OptionBits options )
+{
+	WrapCheckBool ( ok, zXMPFiles_Initialize_1 ( options ) );
+	return ok;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+Initialize ( XMP_OptionBits options, const char* pluginFolder, const char* plugins )
+{
+	WrapCheckBool ( ok, zXMPFiles_Initialize_2 ( options, pluginFolder, plugins ) );
+	return ok;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+Terminate()
+{
+	WrapNoCheckVoid ( zXMPFiles_Terminate_1() );
+}
+
+// =================================================================================================
+
+static XMPFilesRef Default_CTor()
+{
+	WrapCheckXMPFilesRef ( newRef, zXMPFiles_CTor_1() );
+	return newRef;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPFiles)::
+TXMPFiles() : xmpFilesRef(Default_CTor())
+{
+	#if XMPFiles_TraceCTorDTor
+		XFPeek* xfPtr = (XFPeek*)this->xmpFilesRef;
+		printf ( "Default construct TXMPFiles @ %.8X, ref = %.8X, count = %d\n", this, xfPtr, xfPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPFiles)::
+TXMPFiles ( const TXMPFiles<tStringObj> & original ) : xmpFilesRef(original.xmpFilesRef)
+{
+	WXMPFiles_IncrementRefCount_1 ( this->xmpFilesRef );
+	#if XMPFiles_TraceCTorDTor
+		XFPeek* xfPtr = (XFPeek*)this->xmpFilesRef;
+		printf ( "Copy construct TXMPFiles @ %.8X, ref = %.8X, count = %d\n", this, xfPtr, xfPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+operator= ( const TXMPFiles<tStringObj> & rhs )
+{
+	#if XMPFiles_TraceCTorDTor
+		XFPeek* xfLHS = (XFPeek*)this->xmpFilesRef;
+		XFPeek* xfRHS = (XFPeek*)rhs.xmpFilesRef;
+		printf ( "Assign TXMPFiles, lhs @ %.8X, rhs @ %.8X\n", this, &rhs );
+		printf ( "   original lhs ref = %.8X, count = %d\n", xfLHS, xfLHS->clientRefs );
+		printf ( "   original rhs ref = %.8X, count = %d\n", xfRHS, xfRHS->clientRefs );
+	#endif
+	XMPFilesRef oldRef = this->xmpFilesRef;					// ! Decrement last so errors leave client object OK.
+	this->xmpFilesRef = rhs.xmpFilesRef;
+	WXMPFiles_IncrementRefCount_1 ( this->xmpFilesRef );	// Increment the count on the new ref.
+	WXMPFiles_DecrementRefCount_1 ( oldRef );				// Decrement the count on the old ref.
+	#if XMPFiles_TraceCTorDTor
+		printf ( "   result   lhs ref = %.8X, count = %d\n", xfLHS, xfLHS->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPFiles)::
+TXMPFiles ( XMPFilesRef _xmpFilesRef ) : xmpFilesRef(_xmpFilesRef)
+{
+	WXMPFiles_IncrementRefCount_1 ( this->xmpFilesRef );
+	#if XMPFiles_TraceCTorDTor
+		XFPeek* xfPtr = (XFPeek*)this->xmpFilesRef;
+		printf ( "Ref construct TXMPFiles @ %.8X, ref = %.8X, count = %d\n", this, xfPtr, xfPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPFiles)::
+TXMPFiles ( XMP_StringPtr  filePath,
+	        XMP_FileFormat format /* = kXMP_UnknownFile */,
+			XMP_OptionBits openFlags /* = 0 */ ) : xmpFilesRef(Default_CTor())
+{
+	#if XMPFiles_TraceCTorDTor
+		XFPeek* xfPtr = (XFPeek*)this->xmpFilesRef;
+		printf ( "File construct TXMPFiles @ %.8X, ref = %.8X, count = %d\n", this, xfPtr, xfPtr->clientRefs );
+	#endif
+	bool ok = this->OpenFile ( filePath, format, openFlags );
+	if ( ! ok ) throw XMP_Error ( kXMPErr_NoFileHandler, "OpenFile returned false" );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPFiles)::
+TXMPFiles ( const tStringObj & filePath,
+	        XMP_FileFormat     format /* = kXMP_UnknownFile */,
+			XMP_OptionBits     openFlags /* = 0 */ ) : xmpFilesRef(Default_CTor())
+{
+	#if XMPFiles_TraceCTorDTor
+		XFPeek* xfPtr = (XFPeek*)this->xmpFilesRef;
+		printf ( "File construct TXMPFiles @ %.8X, ref = %.8X, count = %d\n", this, xfPtr, xfPtr->clientRefs );
+	#endif
+	bool ok = this->OpenFile ( filePath.c_str(), format, openFlags );
+	if ( ! ok ) throw XMP_Error ( kXMPErr_NoFileHandler, "OpenFile returned false" );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPFiles)::
+~TXMPFiles () throw()
+{
+	#if XMPFiles_TraceCTorDTor
+		XFPeek* xfPtr = (XFPeek*)this->xmpFilesRef;
+		printf ( "Destruct TXMPFiles @ %.8X, ref= %.8X, count = %d\n", this, xfPtr, xfPtr->clientRefs );
+	#endif
+	WXMPFiles_DecrementRefCount_1 ( this->xmpFilesRef );
+	this->xmpFilesRef = 0;
+}
+
+// =================================================================================================
+
+XMP_MethodIntro(TXMPFiles,bool)::
+GetFormatInfo ( XMP_FileFormat   format,
+    			XMP_OptionBits * flags )
+{
+	WrapCheckBool ( found, zXMPFiles_GetFormatInfo_1 ( format, flags ) );
+	return found;
+}
+
+// =================================================================================================
+
+XMP_MethodIntro(TXMPFiles,XMPFilesRef)::
+GetInternalRef()
+{
+	return this->xmpFilesRef;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,XMP_FileFormat)::
+CheckFileFormat ( XMP_StringPtr filePath )
+{
+	WrapCheckFormat ( format, zXMPFiles_CheckFileFormat_1 ( filePath ) );
+	return format;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,XMP_FileFormat)::
+CheckPackageFormat ( XMP_StringPtr folderPath )
+{
+	WrapCheckFormat ( format, zXMPFiles_CheckPackageFormat_1 ( folderPath ) );
+	return format;
+}
+
+// -------------------------------------------------------------------------------------------------
+	
+XMP_MethodIntro(TXMPFiles,bool)::
+GetFileModDate ( XMP_StringPtr filePath, XMP_DateTime * modDate, XMP_FileFormat * format, XMP_OptionBits options )
+{
+	WrapCheckBool ( ok, zXMPFiles_GetFileModDate_1 ( filePath, modDate, format, options ) );
+	return ok;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+GetAssociatedResources ( XMP_StringPtr            filePath,
+                         std::vector<tStringObj>* resourceList,
+                         XMP_FileFormat           format /* = kXMP_UnknownFile */, 
+                         XMP_OptionBits           options /* = 0 */)
+{
+	WrapCheckBool ( ok, zXMPFiles_GetAssociatedResources_1 ( filePath, resourceList, format, options, SetClientStringVector ) );
+	return ok;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+IsMetadataWritable ( XMP_StringPtr  filePath,
+                     bool *         writable,    
+                     XMP_FileFormat format /* = kXMP_UnknownFile */,
+                     XMP_OptionBits options /* = 0 */)
+{
+	if ( writable)
+	{
+		XMP_Bool internalWritable = ConvertBoolToXMP_Bool( *writable );
+		WrapCheckBool ( ok, zXMPFiles_IsMetadataWritable_1 ( filePath, &internalWritable, format, options ) );
+		*writable = ConvertXMP_BoolToBool( internalWritable );
+		return ok;
+	}
+	else
+	{
+		WrapCheckBool ( ok, zXMPFiles_IsMetadataWritable_1 ( filePath, NULL, format, options ) );
+		return ok;
+	}
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+OpenFile ( XMP_StringPtr  filePath,
+		   XMP_FileFormat format /* = kXMP_UnknownFile */,
+		   XMP_OptionBits openFlags /* = 0 */ )
+{
+	WrapCheckBool ( ok, zXMPFiles_OpenFile_1 ( filePath, format, openFlags ) );
+	return ok;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+OpenFile ( const tStringObj & filePath,
+		   XMP_FileFormat     format /* = kXMP_UnknownFile */,
+		   XMP_OptionBits     openFlags /* = 0 */ )
+{
+	return this->OpenFile ( filePath.c_str(), format, openFlags );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+#if XMP_StaticBuild	// ! Client XMP_IO objects can only be used in static builds.
+XMP_MethodIntro(TXMPFiles,bool)::
+OpenFile ( XMP_IO *       clientIO,
+		   XMP_FileFormat format /* = kXMP_UnknownFile */,
+		   XMP_OptionBits openFlags /* = 0 */ )
+{
+	WrapCheckBool ( ok, zXMPFiles_OpenFile_2 ( clientIO, format, openFlags ) );
+	return ok;
+}
+#endif
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+CloseFile ( XMP_OptionBits closeFlags /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPFiles_CloseFile_1 ( closeFlags ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+GetFileInfo ( tStringObj *     filePath /* = 0 */,
+		      XMP_OptionBits * openFlags /* = 0 */,
+		      XMP_FileFormat * format /* = 0 */,
+		      XMP_OptionBits * handlerFlags /* = 0 */ )
+{
+	WrapCheckBool ( isOpen, zXMPFiles_GetFileInfo_1 ( filePath, openFlags, format, handlerFlags, SetClientString ) );
+	return isOpen;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+SetAbortProc ( XMP_AbortProc abortProc,
+			   void *        abortArg )
+{
+	WrapCheckVoid ( zXMPFiles_SetAbortProc_1 ( abortProc, abortArg ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+GetXMP ( SXMPMeta *       xmpObj /* = 0 */,
+    	 tStringObj *     xmpPacket /* = 0 */,
+    	 XMP_PacketInfo * packetInfo /* = 0 */ )
+{
+	XMPMetaRef xmpRef = 0;
+	if ( xmpObj != 0 ) {
+		SXMPUtils::RemoveProperties ( xmpObj, 0, 0, kXMPUtil_DoAllProperties );	// *** Need an SXMPMeta::Clear method:
+		xmpRef = xmpObj->GetInternalRef();
+	}
+
+	WrapCheckBool ( hasXMP, zXMPFiles_GetXMP_1 ( xmpRef, xmpPacket, packetInfo, SetClientString ) );
+	return hasXMP;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+PutXMP ( const SXMPMeta & xmpObj )
+{
+	WrapCheckVoid ( zXMPFiles_PutXMP_1 ( xmpObj.GetInternalRef(), 0, 0 ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+PutXMP ( XMP_StringPtr xmpPacket,
+         XMP_StringLen xmpLength /* = kXMP_UseNullTermination */ )
+{
+	WrapCheckVoid ( zXMPFiles_PutXMP_1 ( 0, xmpPacket, xmpLength ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+PutXMP ( const tStringObj & xmpPacket )
+{
+	this->PutXMP ( xmpPacket.c_str(), (XMP_StringLen)xmpPacket.size() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+CanPutXMP ( const SXMPMeta & xmpObj )
+{
+	WrapCheckBool ( canPut, zXMPFiles_CanPutXMP_1 ( xmpObj.GetInternalRef(), 0, 0 ) );
+	return canPut;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+CanPutXMP ( XMP_StringPtr xmpPacket,
+            XMP_StringLen xmpLength /* = kXMP_UseNullTermination */ )
+{
+	WrapCheckBool ( canPut, zXMPFiles_CanPutXMP_1 ( 0, xmpPacket, xmpLength ) );
+	return canPut;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,bool)::
+CanPutXMP ( const tStringObj & xmpPacket )
+{
+	return this->CanPutXMP ( xmpPacket.c_str(), (XMP_StringLen)xmpPacket.size() );
+}
+
+// =================================================================================================
+
+XMP_MethodIntro(TXMPFiles,void)::
+SetDefaultProgressCallback ( XMP_ProgressReportProc proc, void * context /* = 0 */,
+	                         float interval /* = 1.0 */, bool sendStartStop /* = false */ )
+{
+	XMP_Bool internalsendStartStop = ConvertBoolToXMP_Bool( sendStartStop );
+	WrapCheckVoid ( zXMPFiles_SetDefaultProgressCallback_1 ( proc, context, interval, internalsendStartStop ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+SetProgressCallback ( XMP_ProgressReportProc proc, void * context /* = 0 */,
+	                  float interval /* = 1.0 */, bool sendStartStop /* = false */ )
+{
+	XMP_Bool internalsendStartStop = ConvertBoolToXMP_Bool( sendStartStop );
+	WrapCheckVoid ( zXMPFiles_SetProgressCallback_1 ( proc, context, interval, internalsendStartStop ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+SetDefaultErrorCallback ( XMPFiles_ErrorCallbackProc proc,
+	                      void * context /* = 0 */, XMP_Uns32 limit /*= 1 */ )
+{
+	WrapCheckVoid ( zXMPFiles_SetDefaultErrorCallback_1 ( proc, context, limit ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+SetErrorCallback ( XMPFiles_ErrorCallbackProc proc,
+	               void * context /* = 0 */, XMP_Uns32 limit /*= 1 */ )
+{
+	WrapCheckVoid ( zXMPFiles_SetErrorCallback_1 ( proc, context, limit ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPFiles,void)::
+ResetErrorCallbackLimit ( XMP_Uns32 limit /* = 1 */ )
+{
+	WrapCheckVoid ( zXMPFiles_ResetErrorCallbackLimit_1 ( limit ) );
+}
+
+// =================================================================================================
diff --git a/public/include/client-glue/TXMPIterator.incl_cpp b/public/include/client-glue/TXMPIterator.incl_cpp
new file mode 100644
index 0000000..0b39d01
--- /dev/null
+++ b/public/include/client-glue/TXMPIterator.incl_cpp
@@ -0,0 +1,223 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+//	================================================================================================
+/// \file TXMPIterator.incl_cpp
+/// \brief The implementation of the TXMPIterator template class.
+
+#include "XMP.hpp"
+#include "client-glue/WXMP_Common.hpp"
+#include "client-glue/WXMPIterator.hpp"
+
+// =================================================================================================
+// Implementation Guidelines
+// =========================
+//
+// The implementations of the template functions are very stylized. The jobs done in this code are:
+//
+//	1. Set up the xmpIter template data member in the constructors.
+//	2. Call through to the appropriate WXMPIterator function.
+//	3. Copy returned strings and release the threading lock.
+//
+// The various kinds of functions follow similar patterns, first assuming no returned string:
+//
+// Constructors - Use an initializer for the xmpIter data member to call the WXMPIterator constructor.
+// Destructor - Let the WXMPIterator destructor be implicitly called for the xmpIter data member.
+// Static function - Simply call the corresponding WXMPIterator static function.
+// Non-static function - Simply call the corresponding WXMPIterator function using xmpIter.
+//
+// If a member function has returned strings the code looks roughly like this:
+//
+//	<<<callthrough>>>
+//	<<<checkfailure>>>
+//	if ( <<<appropriate>>> ) {
+//		if ( outStr != 0 ) outStr->assign ( outPtr, outLen );
+//		<<<unlock>>>
+//	}
+//	return result;
+//
+// The <<<callthrough>>> is the call to the wrapper, and <<<checkfailure>>> is the check and throw
+// if the wrapper reports failure. The <<<appropriate>>> check is used to determine if the string
+// should actually be assigned. For example, GetProperty can't assign the value if the property
+// does not exist. There is no <<<appropriate>>> check if it isn't, well, appropriate. Outputs are
+// always passed as explicit pointers, and null can be passed if the string is not wanted. The
+// inner implementation holds the threading lock if an output string is returned, regardless of
+// whether the client wants it or not (which the implementation does not know).
+//
+// =================================================================================================
+
+#ifndef XMP_TraceCTorDTor
+	#define XMP_TraceCTorDTor 0
+#endif
+
+#if XMP_TraceCTorDTor
+	class XIPeek {	// Hack to peek at the client ref count in the internal object.
+	public:
+		XIPeek();
+		virtual ~XIPeek();
+		XMP_Int32 clientRefs;
+	};
+#endif
+
+// -------------------------------------------------------------------------------------------------
+
+#define PropIterCTor(xmpRef,schemaNS,propName,options)												\
+	WrapCheckIterRef ( newRef, zXMPIterator_PropCTor_1 ( xmpRef, schemaNS, propName, options ) );	\
+	this->iterRef = newRef
+
+// -------------------------------------------------------------------------------------------------
+
+#define TableIterCTor(schemaNS,propName,options)													\
+	WrapCheckIterRef ( newRef, zXMPIterator_TableCTor_1 ( schemaNS, propName, options ) );	\
+	this->iterRef = newRef
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPIterator,void)::
+SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen )
+{
+	tStringObj * clientStr = (tStringObj*) clientPtr;
+	clientStr->assign ( valuePtr, valueLen );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPIterator)::
+TXMPIterator ( const TXMPIterator<tStringObj> & original ) : iterRef(original.iterRef)
+{
+	WXMPIterator_IncrementRefCount_1 ( this->iterRef );
+	#if XMP_TraceCTorDTor
+		XIPeek* xiPtr = (XIPeek*)this->iterRef;
+		printf ( "Copy construct TXMPIterator @ %.8X, ref = %.8X, count = %d\n", this, xiPtr, xiPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPIterator,void)::
+operator= ( const TXMPIterator<tStringObj> & rhs )
+{
+	#if XMP_TraceCTorDTor
+		XIPeek* xiLHS = (XIPeek*)this->iterRef;
+		XIPeek* xiRHS = (XIPeek*)rhs.iterRef;
+		printf ( "Assign TXMPIterator, lhs @ %.8X, rhs @ %.8X\n", this, &rhs );
+		printf ( "   original lhs ref = %.8X, count = %d\n", xiLHS, xiLHS->clientRefs );
+		printf ( "   original rhs ref = %.8X, count = %d\n", xiRHS, xiRHS->clientRefs );
+	#endif
+	XMPIteratorRef oldRef = this->iterRef;	// ! Decrement last so errors leave client object OK.
+	this->iterRef = rhs.iterRef;
+	WXMPIterator_IncrementRefCount_1 ( this->iterRef );
+	WXMPIterator_DecrementRefCount_1 ( oldRef );
+	#if XMP_TraceCTorDTor
+		printf ( "   result   lhs ref = %.8X, count = %d\n", xiLHS, xiLHS->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPIterator)::
+TXMPIterator() : iterRef(0)
+{
+	throw XMP_Error ( kXMPErr_Unavailable, "No default construction for XMP iterators" );
+	#if XMP_TraceCTorDTor
+		XIPeek* xiPtr = (XIPeek*)this->iterRef;
+		printf ( "Default construct TXMPIterator @ %.8X, ref = %.8X, count = %d\n", this, xiPtr, xiPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPIterator)::
+TXMPIterator ( const TXMPMeta<tStringObj> & xmpObj,
+			   XMP_StringPtr  schemaNS,
+			   XMP_StringPtr  propName,
+			   XMP_OptionBits options /* = 0 */ ) : iterRef(0)
+{
+	PropIterCTor ( xmpObj.GetInternalRef(), schemaNS, propName, options );
+	#if XMP_TraceCTorDTor
+		XIPeek* xiPtr = (XIPeek*)this->iterRef;
+		printf ( "Construct property TXMPIterator @ %.8X, ref = %.8X, count = %d\n", this, xiPtr, xiPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPIterator)::
+TXMPIterator ( const TXMPMeta<tStringObj> & xmpObj,
+			   XMP_StringPtr  schemaNS,
+			   XMP_OptionBits options /* = 0 */ ) : iterRef(0)
+{
+	PropIterCTor ( xmpObj.GetInternalRef(), schemaNS, "", options );
+	#if XMP_TraceCTorDTor
+		XIPeek* xiPtr = (XIPeek*)this->iterRef;
+		printf ( "Construct schema TXMPIterator @ %.8X, ref = %.8X, count = %d\n", this, xiPtr, xiPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPIterator)::
+TXMPIterator ( const TXMPMeta<tStringObj> & xmpObj,
+			   XMP_OptionBits options /* = 0 */ ) : iterRef(0)
+{
+	PropIterCTor ( xmpObj.GetInternalRef(), "", "", options );
+	#if XMP_TraceCTorDTor
+		XIPeek* xiPtr = (XIPeek*)this->iterRef;
+		printf ( "Construct tree TXMPIterator @ %.8X, ref = %.8X, count = %d\n", this, xiPtr, xiPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPIterator)::
+TXMPIterator ( XMP_StringPtr  schemaNS,
+			   XMP_StringPtr  propName,
+			   XMP_OptionBits options ) : iterRef(0)
+{
+	TableIterCTor ( schemaNS, propName, options );
+	#if XMP_TraceCTorDTor
+		XIPeek* xiPtr = (XIPeek*)this->iterRef;
+		printf ( "Construct table TXMPIterator @ %.8X, ref = %.8X, count = %d\n", this, xiPtr, xiPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPIterator)::
+~TXMPIterator () throw()
+{
+	#if XMP_TraceCTorDTor
+		XIPeek* xiPtr = (XIPeek*)this->iterRef;
+		printf ( "Destruct TXMPIterator @ %.8X, ref = %.8X, count = %d\n", this, xiPtr, xiPtr->clientRefs );
+	#endif
+	WXMPIterator_DecrementRefCount_1 ( this->iterRef );
+	this->iterRef = 0;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPIterator,bool)::
+Next ( tStringObj *		schemaNS /* = 0 */,
+	   tStringObj *		propPath /* = 0 */,
+	   tStringObj *		propValue /* = 0 */,
+	   XMP_OptionBits * options /* = 0 */ )
+{
+	WrapCheckBool ( found, zXMPIterator_Next_1 ( schemaNS, propPath, propValue, options, SetClientString ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPIterator,void)::
+Skip ( XMP_OptionBits options )
+{
+	WrapCheckVoid ( zXMPIterator_Skip_1 ( options ) );
+}
+
+// =================================================================================================
diff --git a/public/include/client-glue/TXMPMeta.incl_cpp b/public/include/client-glue/TXMPMeta.incl_cpp
new file mode 100644
index 0000000..aa5f4b8
--- /dev/null
+++ b/public/include/client-glue/TXMPMeta.incl_cpp
@@ -0,0 +1,914 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+//	================================================================================================
+/// \file TXMPMeta.incl_cpp
+/// \brief The implementation of the TXMPMeta template class.
+
+#include "XMP.hpp"
+
+#include "client-glue/WXMP_Common.hpp"
+
+#include "client-glue/WXMPMeta.hpp"
+
+#if INCLUDE_XMP_NEW_DOM_MODEL
+	#include "XMPCore/XMPCore_Defines.h"
+
+	#if ENABLE_NEW_DOM_MODEL
+		#include "XMPCore/XMPCore_Defines.h"
+		#include "XMPCore/Interfaces/IXMPDOMFactory.h"
+	#endif
+#endif
+
+// =================================================================================================
+// Implementation Guidelines
+// =========================
+//
+// The implementations of the template functions are very stylized. ...
+//
+// =================================================================================================
+	
+#ifndef XMP_TraceCTorDTor
+	#define XMP_TraceCTorDTor 0
+#endif
+
+#if XMP_TraceCTorDTor
+	class XMPeek {	// Hack to peek at the client ref count in the internal object.
+	public:
+		XMPeek();
+		virtual ~XMPeek();
+		XMP_Int32 clientRefs;
+	};
+#endif
+
+// =================================================================================================
+// Local utilities
+// ===============
+
+class TOPW_Info {
+public:
+	XMP_TextOutputProc clientProc;
+	void *			   clientRefCon;
+	TOPW_Info ( XMP_TextOutputProc proc, void * refCon ) : clientProc(proc), clientRefCon(refCon) {};
+private:
+	TOPW_Info() {}; // ! Hide default constructor.
+};
+
+static XMP_Status TextOutputProcWrapper ( void *        refCon,
+                                          XMP_StringPtr buffer,
+                                          XMP_StringLen bufferSize )
+{
+	try {	// Don't let client callback exceptions propagate across DLL boundaries.
+		TOPW_Info * info = (TOPW_Info*)refCon;
+		return info->clientProc ( info->clientRefCon, buffer, bufferSize );
+	} catch ( ... ) {
+		return -1;
+	}
+}
+
+// =================================================================================================
+// Initialization and termination
+// ==============================
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen )
+{
+	tStringObj * clientStr = (tStringObj*) clientPtr;
+	clientStr->assign ( valuePtr, valueLen );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+GetVersionInfo ( XMP_VersionInfo * info )
+{
+	WrapNoCheckVoid ( zXMPMeta_GetVersionInfo_1 ( info ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+#if XMP_TraceClientCalls
+	FILE * xmpClientLog = stderr;
+#endif
+
+#ifndef XMP_TypeCheck
+	#if ! XMP_DebugBuild
+		#define XMP_TypeCheck(e,msg) /* nothing */
+	#else
+		#define XMP_TypeCheck(e,msg) if ( ! (e) ) throw XMP_Error ( kXMPErr_AssertFailure, msg );
+	#endif
+#endif
+
+XMP_MethodIntro(TXMPMeta,bool)::
+Initialize()
+{
+	// Verify critical type sizes.
+	XMP_TypeCheck ( (sizeof(XMP_Int8)  == 1), "Size wrong for critical type XMP_Int8" );
+	XMP_TypeCheck ( (sizeof(XMP_Int16) == 2), "Size wrong for critical type XMP_Int16" );
+	XMP_TypeCheck ( (sizeof(XMP_Int32) == 4), "Size wrong for critical type XMP_Int32" );
+	XMP_TypeCheck ( (sizeof(XMP_Int64) == 8), "Size wrong for critical type XMP_Int64" );
+	XMP_TypeCheck ( (sizeof(XMP_Uns8)  == 1), "Size wrong for critical type XMP_Uns8" );
+	XMP_TypeCheck ( (sizeof(XMP_Uns16) == 2), "Size wrong for critical type XMP_Uns16" );
+	XMP_TypeCheck ( (sizeof(XMP_Uns32) == 4), "Size wrong for critical type XMP_Uns32" );
+	XMP_TypeCheck ( (sizeof(XMP_Uns64) == 8), "Size wrong for critical type XMP_Uns64" );
+	XMP_TypeCheck ( (sizeof(XMP_Bool)  == 1), "Size wrong for critical type XMP_Bool" );
+
+	#if XMP_TraceClientCallsToFile
+		xmpClientLog = fopen ( "XMPClientLog.txt", "w" );
+		if ( xmpClientLog == 0 ) xmpClientLog = stderr;
+	#endif
+
+	WrapCheckBool ( ok, zXMPMeta_Initialize_1() );
+
+	#if ENABLE_NEW_DOM_MODEL
+		NS_XMPCOMMON::IXMPDOMFactory_latest::CreateInstance();
+	#endif
+
+	return ok;
+
+}
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+Terminate()
+{
+	WrapNoCheckVoid ( zXMPMeta_Terminate_1() );
+
+	#if XMP_TraceClientCallsToFile
+		if ( xmpClientLog != stderr ) fclose ( xmpClientLog );
+		xmpClientLog = stderr;
+	#endif
+}
+
+// =================================================================================================
+// Constuctors, destructor, operators
+// ==================================
+
+static XMPMetaRef DefaultCTor()
+{
+	WrapCheckMetaRef ( newRef, zXMPMeta_CTor_1() );
+	return newRef;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPMeta)::
+TXMPMeta() : xmpRef(DefaultCTor())
+{
+	#if XMP_TraceCTorDTor
+		XMPeek* xmPtr = (XMPeek*)this->xmpRef;
+		printf ( "Default construct TXMPMeta @ %.8X, ref = %.8X, count = %d\n", this, xmPtr, xmPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPMeta)::
+TXMPMeta ( const TXMPMeta<tStringObj> & original ) : xmpRef(original.xmpRef)
+{
+	WXMPMeta_IncrementRefCount_1 ( this->xmpRef );
+	#if XMP_TraceCTorDTor
+		XMPeek* xmPtr = (XMPeek*)this->xmpRef;
+		printf ( "Copy construct TXMPMeta @ %.8X, ref = %.8X, count = %d\n", this, xmPtr, xmPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+operator= ( const TXMPMeta<tStringObj> & rhs )
+{
+	#if XMP_TraceCTorDTor
+		XMPeek* xmLHS = (XMPeek*)this->xmpRef;
+		XMPeek* xmRHS = (XMPeek*)rhs.xmpRef;
+		printf ( "Assign TXMPMeta, lhs @ %.8X, rhs @ %.8X\n", this, &rhs );
+		printf ( "   original lhs ref = %.8X, count = %d\n", xmLHS, xmLHS->clientRefs );
+		printf ( "   original rhs ref = %.8X, count = %d\n", xmRHS, xmRHS->clientRefs );
+	#endif
+	XMPMetaRef oldRef = this->xmpRef;	// ! Decrement last so errors leave client object OK.
+	this->xmpRef = rhs.xmpRef;
+	WXMPMeta_IncrementRefCount_1 ( this->xmpRef );	// Increment the count on the new ref.
+	WXMPMeta_DecrementRefCount_1 ( oldRef );		// Decrement the count on the old ref.
+	#if XMP_TraceCTorDTor
+		printf ( "   result   lhs ref = %.8X, count = %d\n", xmLHS, xmLHS->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPMeta)::
+TXMPMeta ( XMPMetaRef _xmpRef ) : xmpRef(_xmpRef)
+{
+	WXMPMeta_IncrementRefCount_1 ( this->xmpRef );
+	#if XMP_TraceCTorDTor
+		XMPeek* xmPtr = (XMPeek*)this->xmpRef;
+		printf ( "Ref construct TXMPMeta @ %.8X, ref = %.8X, count = %d\n", this, xmPtr, xmPtr->clientRefs );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPMeta)::
+TXMPMeta ( XMP_StringPtr buffer,
+           XMP_StringLen xmpSize ) : xmpRef(DefaultCTor())
+{
+	#if XMP_TraceCTorDTor
+		XMPeek* xmPtr = (XMPeek*)this->xmpRef;
+		printf ( "Parse construct TXMPMeta @ %.8X, ref = %.8X, count = %d\n", this, xmPtr, xmPtr->clientRefs );
+	#endif
+	try {
+		this->ParseFromBuffer ( buffer, xmpSize );
+	} catch ( ... ) {
+		WXMPMeta_DecrementRefCount_1 ( this->xmpRef );
+		this->xmpRef = 0;
+		throw;
+	}
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_CTorDTorIntro(TXMPMeta)::
+~TXMPMeta() throw()
+{
+	#if XMP_TraceCTorDTor
+		XMPeek* xmPtr = (XMPeek*)this->xmpRef;
+		printf ( "Destruct TXMPMeta @ %.8X, ref = %.8X, count = %d\n", this, xmPtr, xmPtr->clientRefs );
+	#endif
+	WXMPMeta_DecrementRefCount_1 ( this->xmpRef );
+	this->xmpRef = 0;
+
+}	// ~TXMPMeta ()
+
+// =================================================================================================
+// Global state functions
+// ======================
+
+XMP_MethodIntro(TXMPMeta,XMP_OptionBits)::
+GetGlobalOptions()
+{
+	WrapCheckOptions ( options, zXMPMeta_GetGlobalOptions_1() );
+	return options;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetGlobalOptions ( XMP_OptionBits options )
+{
+	WrapCheckVoid ( zXMPMeta_SetGlobalOptions_1 ( options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,XMP_Status)::
+DumpNamespaces ( XMP_TextOutputProc outProc,
+                 void *             refCon )
+{
+	TOPW_Info info ( outProc, refCon );
+	WrapCheckStatus ( status, zXMPMeta_DumpNamespaces_1 ( TextOutputProcWrapper, &info ) );
+	return status;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+RegisterNamespace ( XMP_StringPtr namespaceURI,
+                    XMP_StringPtr suggestedPrefix,
+                    tStringObj *  registeredPrefix )
+{
+	WrapCheckBool ( prefixMatch, zXMPMeta_RegisterNamespace_1 ( namespaceURI, suggestedPrefix, registeredPrefix, SetClientString ) );
+	return prefixMatch;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetNamespacePrefix ( XMP_StringPtr namespaceURI,
+                     tStringObj *  namespacePrefix )
+{
+	WrapCheckBool ( found, zXMPMeta_GetNamespacePrefix_1 ( namespaceURI, namespacePrefix, SetClientString ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetNamespaceURI ( XMP_StringPtr namespacePrefix,
+                  tStringObj *  namespaceURI )
+{
+	WrapCheckBool ( found, zXMPMeta_GetNamespaceURI_1 ( namespacePrefix, namespaceURI, SetClientString ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+DeleteNamespace ( XMP_StringPtr namespaceURI )
+{
+	WrapCheckVoid ( zXMPMeta_DeleteNamespace_1 ( namespaceURI ) );
+}
+
+// =================================================================================================
+// Basic property manipulation functions
+// =====================================
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetProperty ( XMP_StringPtr    schemaNS,
+              XMP_StringPtr    propName,
+			  tStringObj *     propValue,
+			  XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetProperty_1 ( schemaNS, propName, propValue, options, SetClientString ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetArrayItem ( XMP_StringPtr    schemaNS,
+               XMP_StringPtr    arrayName,
+               XMP_Index        itemIndex,
+			   tStringObj *     itemValue,
+			   XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetArrayItem_1 ( schemaNS, arrayName, itemIndex, itemValue, options, SetClientString ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetStructField ( XMP_StringPtr    schemaNS,
+                 XMP_StringPtr    structName,
+				 XMP_StringPtr    fieldNS,
+				 XMP_StringPtr    fieldName,
+				 tStringObj *     fieldValue,
+				 XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetStructField_1 ( schemaNS, structName, fieldNS, fieldName, fieldValue, options, SetClientString ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetQualifier ( XMP_StringPtr    schemaNS,
+               XMP_StringPtr    propName,
+			   XMP_StringPtr    qualNS,
+			   XMP_StringPtr    qualName,
+			   tStringObj *     qualValue,
+			   XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetQualifier_1 ( schemaNS, propName, qualNS, qualName, qualValue, options, SetClientString ) );
+	return found;
+}	//GetQualifier ()
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetProperty ( XMP_StringPtr  schemaNS,
+              XMP_StringPtr  propName,
+			  XMP_StringPtr  propValue,
+			  XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetProperty_1 ( schemaNS, propName, propValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetProperty ( XMP_StringPtr      schemaNS,
+              XMP_StringPtr      propName,
+			  const tStringObj & propValue,
+			  XMP_OptionBits     options /* = 0 */ )
+{
+	this->SetProperty ( schemaNS, propName, propValue.c_str(), options );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetArrayItem ( XMP_StringPtr  schemaNS,
+               XMP_StringPtr  arrayName,
+               XMP_Index      itemIndex,
+			   XMP_StringPtr  itemValue,
+			   XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetArrayItem_1 ( schemaNS, arrayName, itemIndex, itemValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetArrayItem ( XMP_StringPtr      schemaNS,
+               XMP_StringPtr      arrayName,
+               XMP_Index          itemIndex,
+			   const tStringObj & itemValue,
+			   XMP_OptionBits     options /* = 0 */ )
+{
+	this->SetArrayItem ( schemaNS, arrayName, itemIndex, itemValue.c_str(), options );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+AppendArrayItem ( XMP_StringPtr  schemaNS,
+                  XMP_StringPtr  arrayName,
+                  XMP_OptionBits arrayOptions,
+				  XMP_StringPtr  itemValue,
+				  XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_AppendArrayItem_1 ( schemaNS, arrayName, arrayOptions, itemValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+AppendArrayItem ( XMP_StringPtr      schemaNS,
+                  XMP_StringPtr      arrayName,
+                  XMP_OptionBits     arrayOptions,
+				  const tStringObj & itemValue,
+				  XMP_OptionBits     options /* = 0 */ )
+{
+	this->AppendArrayItem ( schemaNS, arrayName, arrayOptions, itemValue.c_str(), options );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetStructField ( XMP_StringPtr  schemaNS,
+                 XMP_StringPtr  structName,
+				 XMP_StringPtr  fieldNS,
+				 XMP_StringPtr  fieldName,
+				 XMP_StringPtr  fieldValue,
+				 XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetStructField_1 ( schemaNS, structName, fieldNS, fieldName, fieldValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetStructField ( XMP_StringPtr      schemaNS,
+                 XMP_StringPtr      structName,
+				 XMP_StringPtr      fieldNS,
+				 XMP_StringPtr      fieldName,
+				 const tStringObj & fieldValue,
+				 XMP_OptionBits     options /* = 0 */ )
+{
+	this->SetStructField ( schemaNS, structName, fieldNS, fieldName, fieldValue.c_str(), options );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetQualifier ( XMP_StringPtr  schemaNS,
+               XMP_StringPtr  propName,
+			   XMP_StringPtr  qualNS,
+			   XMP_StringPtr  qualName,
+			   XMP_StringPtr  qualValue,
+			   XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetQualifier_1 ( schemaNS, propName, qualNS, qualName, qualValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetQualifier ( XMP_StringPtr      schemaNS,
+               XMP_StringPtr      propName,
+			   XMP_StringPtr      qualNS,
+			   XMP_StringPtr      qualName,
+			   const tStringObj & qualValue,
+			   XMP_OptionBits     options /* = 0 */ )
+{
+	this->SetQualifier ( schemaNS, propName, qualNS, qualName, qualValue.c_str(), options );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+DeleteProperty ( XMP_StringPtr schemaNS,
+                 XMP_StringPtr propName )
+{
+	WrapCheckVoid ( zXMPMeta_DeleteProperty_1 ( schemaNS, propName ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+DeleteArrayItem ( XMP_StringPtr schemaNS,
+                  XMP_StringPtr arrayName,
+                  XMP_Index     itemIndex )
+{
+	WrapCheckVoid ( zXMPMeta_DeleteArrayItem_1 ( schemaNS, arrayName, itemIndex ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+DeleteStructField ( XMP_StringPtr schemaNS,
+                    XMP_StringPtr structName,
+					XMP_StringPtr fieldNS,
+					XMP_StringPtr fieldName )
+{
+	WrapCheckVoid ( zXMPMeta_DeleteStructField_1 ( schemaNS, structName, fieldNS, fieldName ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+DeleteQualifier ( XMP_StringPtr schemaNS,
+                  XMP_StringPtr propName,
+				  XMP_StringPtr qualNS,
+				  XMP_StringPtr qualName )
+{
+	WrapCheckVoid ( zXMPMeta_DeleteQualifier_1 ( schemaNS, propName, qualNS, qualName ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+DoesPropertyExist ( XMP_StringPtr schemaNS,
+                    XMP_StringPtr propName ) const
+{
+	WrapCheckBool ( exists, zXMPMeta_DoesPropertyExist_1 ( schemaNS, propName ) );
+	return exists;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+DoesArrayItemExist ( XMP_StringPtr schemaNS,
+                     XMP_StringPtr arrayName,
+                     XMP_Index itemIndex ) const
+{
+	WrapCheckBool ( exists, zXMPMeta_DoesArrayItemExist_1 ( schemaNS, arrayName, itemIndex ) );
+	return exists;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+DoesStructFieldExist ( XMP_StringPtr schemaNS,
+                       XMP_StringPtr structName,
+					   XMP_StringPtr fieldNS,
+					   XMP_StringPtr fieldName ) const
+{
+	WrapCheckBool ( exists, zXMPMeta_DoesStructFieldExist_1 ( schemaNS, structName, fieldNS, fieldName ) );
+	return exists;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+DoesQualifierExist ( XMP_StringPtr schemaNS,
+                     XMP_StringPtr propName,
+					 XMP_StringPtr qualNS,
+					 XMP_StringPtr qualName ) const
+{
+	WrapCheckBool ( exists, zXMPMeta_DoesQualifierExist_1 ( schemaNS, propName, qualNS, qualName ) );
+	return exists;
+}
+
+// =================================================================================================
+// Specialized Get and Set functions
+// =================================
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetLocalizedText ( XMP_StringPtr    schemaNS,
+                   XMP_StringPtr    altTextName,
+				   XMP_StringPtr    genericLang,
+				   XMP_StringPtr    specificLang,
+				   tStringObj *     actualLang,
+				   tStringObj *     itemValue,
+				   XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetLocalizedText_1 ( schemaNS, altTextName, genericLang, specificLang,
+														 actualLang, itemValue, options, SetClientString ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetLocalizedText ( XMP_StringPtr  schemaNS,
+                   XMP_StringPtr  altTextName,
+				   XMP_StringPtr  genericLang,
+				   XMP_StringPtr  specificLang,
+				   XMP_StringPtr  itemValue,
+				   XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetLocalizedText_1 ( schemaNS, altTextName, genericLang, specificLang, itemValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetLocalizedText ( XMP_StringPtr      schemaNS,
+                   XMP_StringPtr      altTextName,
+				   XMP_StringPtr      genericLang,
+				   XMP_StringPtr      specificLang,
+				   const tStringObj & itemValue,
+				   XMP_OptionBits     options /* = 0 */ )
+{
+	this->SetLocalizedText ( schemaNS, altTextName, genericLang, specificLang, itemValue.c_str(), options );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+DeleteLocalizedText ( XMP_StringPtr    schemaNS,
+		XMP_StringPtr    altTextName,
+		XMP_StringPtr    genericLang,
+		XMP_StringPtr    specificLang )
+{
+	WrapCheckVoid ( zXMPMeta_DeleteLocalizedText_1 ( schemaNS, altTextName, genericLang, specificLang ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetProperty_Bool ( XMP_StringPtr    schemaNS,
+                   XMP_StringPtr    propName,
+				   bool *           propValue,
+				   XMP_OptionBits * options ) const
+{
+	XMP_Bool binValue;
+	WrapCheckBool ( found, zXMPMeta_GetProperty_Bool_1 ( schemaNS, propName, &binValue, options ) );
+	if ( found && (propValue != 0) ) *propValue = binValue;
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetProperty_Int ( XMP_StringPtr    schemaNS,
+                  XMP_StringPtr    propName,
+				  XMP_Int32 *      propValue,
+				  XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetProperty_Int_1 ( schemaNS, propName, propValue, options ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetProperty_Int64 ( XMP_StringPtr    schemaNS,
+                    XMP_StringPtr    propName,
+				    XMP_Int64 *      propValue,
+				    XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetProperty_Int64_1 ( schemaNS, propName, propValue, options ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetProperty_Float ( XMP_StringPtr    schemaNS,
+                    XMP_StringPtr    propName,
+					double *         propValue,
+					XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetProperty_Float_1 ( schemaNS, propName, propValue, options ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,bool)::
+GetProperty_Date ( XMP_StringPtr    schemaNS,
+                   XMP_StringPtr    propName,
+				   XMP_DateTime *   propValue,
+				   XMP_OptionBits * options ) const
+{
+	WrapCheckBool ( found, zXMPMeta_GetProperty_Date_1 ( schemaNS, propName, propValue, options ) );
+	return found;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetProperty_Bool ( XMP_StringPtr  schemaNS,
+                   XMP_StringPtr  propName,
+				   bool           propValue,
+				   XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetProperty_Bool_1 ( schemaNS, propName, propValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetProperty_Int ( XMP_StringPtr  schemaNS,
+                  XMP_StringPtr  propName,
+				  XMP_Int32      propValue,
+				  XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetProperty_Int_1 ( schemaNS, propName, propValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetProperty_Int64 ( XMP_StringPtr  schemaNS,
+                    XMP_StringPtr  propName,
+				    XMP_Int64      propValue,
+				    XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetProperty_Int64_1 ( schemaNS, propName, propValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetProperty_Float ( XMP_StringPtr  schemaNS,
+                    XMP_StringPtr  propName,
+					double         propValue,
+					XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetProperty_Float_1 ( schemaNS, propName, propValue, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetProperty_Date ( XMP_StringPtr        schemaNS,
+                   XMP_StringPtr        propName,
+				   const XMP_DateTime &	propValue,
+				   XMP_OptionBits       options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetProperty_Date_1 ( schemaNS, propName, propValue, options ) );
+}
+
+// =================================================================================================
+// Miscellaneous Member Functions
+// ==============================
+
+XMP_MethodIntro(TXMPMeta,XMPMetaRef)::
+GetInternalRef() const
+{
+	return this->xmpRef;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+GetObjectName ( tStringObj * nameStr ) const
+{
+	WrapCheckVoid ( zXMPMeta_GetObjectName_1 ( nameStr, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetObjectName ( XMP_StringPtr name )
+{
+	WrapCheckVoid ( zXMPMeta_SetObjectName_1 ( name ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetObjectName ( tStringObj name )
+{
+	this->SetObjectName ( name.c_str() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,XMP_OptionBits)::
+GetObjectOptions() const
+{
+	WrapCheckOptions ( options, zXMPMeta_GetObjectOptions_1() );
+	return options;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetObjectOptions ( XMP_OptionBits options )
+{
+	WrapCheckVoid ( zXMPMeta_SetObjectOptions_1 ( options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+Sort()
+{
+	WrapCheckVoid ( zXMPMeta_Sort_1() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+Erase()
+{
+	WrapCheckVoid ( zXMPMeta_Erase_1() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,TXMPMeta<tStringObj>)::
+Clone ( XMP_OptionBits options ) const
+{
+	WrapCheckMetaRef ( cloneRef, zXMPMeta_Clone_1 ( options ) );
+	return TXMPMeta<tStringObj> ( cloneRef );	// Ref construct will increment the clientRefs.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,XMP_Index)::
+CountArrayItems ( XMP_StringPtr schemaNS,
+                  XMP_StringPtr arrayName ) const
+{
+	WrapCheckIndex ( count, zXMPMeta_CountArrayItems_1 ( schemaNS, arrayName ) );
+	return count;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,XMP_Status)::
+DumpObject ( XMP_TextOutputProc outProc,
+             void *             refCon ) const
+{
+	TOPW_Info info ( outProc, refCon );
+	WrapCheckStatus ( status, zXMPMeta_DumpObject_1 ( TextOutputProcWrapper, &info ) );
+	return status;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+ParseFromBuffer ( XMP_StringPtr  buffer,
+                  XMP_StringLen  bufferSize,
+                  XMP_OptionBits options /* = 0 */ )
+{
+	WrapCheckVoid ( zXMPMeta_ParseFromBuffer_1 ( buffer, bufferSize, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SerializeToBuffer ( tStringObj *   pktString,
+                    XMP_OptionBits options,
+                    XMP_StringLen  padding,
+					XMP_StringPtr  newline,
+					XMP_StringPtr  indent,
+					XMP_Index      baseIndent /* = 0 */ ) const
+{
+	WrapCheckVoid ( zXMPMeta_SerializeToBuffer_1 ( pktString, options, padding, newline, indent, baseIndent, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SerializeToBuffer ( tStringObj *   pktString,
+					XMP_OptionBits options /* = 0 */,
+					XMP_StringLen  padding /* = 0 */ ) const
+{
+	this->SerializeToBuffer ( pktString, options, padding, "", "", 0 );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetDefaultErrorCallback ( XMPMeta_ErrorCallbackProc proc,
+						  void *    context /* = 0 */,
+						  XMP_Uns32 limit /* = 1 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetDefaultErrorCallback_1 ( proc, context, limit ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+SetErrorCallback ( XMPMeta_ErrorCallbackProc proc,
+				   void *    context /* = 0 */,
+				   XMP_Uns32 limit /* = 1 */ )
+{
+	WrapCheckVoid ( zXMPMeta_SetErrorCallback_1 ( proc, context, limit ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPMeta,void)::
+ResetErrorCallbackLimit ( XMP_Uns32 limit /* = 1 */ )
+{
+	WrapCheckVoid ( zXMPMeta_ResetErrorCallbackLimit_1 ( limit ) );
+}
+
+// =================================================================================================
diff --git a/public/include/client-glue/TXMPUtils.incl_cpp b/public/include/client-glue/TXMPUtils.incl_cpp
new file mode 100644
index 0000000..2cd5bae
--- /dev/null
+++ b/public/include/client-glue/TXMPUtils.incl_cpp
@@ -0,0 +1,445 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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.
+// =================================================================================================
+
+//	================================================================================================
+/// \file TXMPUtils.incl_cpp
+/// \brief The implementation of the TXMPUtils template class.
+
+#include "XMP.hpp"
+#include "client-glue/WXMP_Common.hpp"
+#include "client-glue/WXMPUtils.hpp"
+
+// =================================================================================================
+// Implementation Guidelines
+// =========================
+//
+// The implementations of the template functions are very stylized. ...
+//
+// =================================================================================================
+
+XMP_MethodIntro(TXMPUtils,void)::
+SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen )
+{
+	tStringObj * clientStr = (tStringObj*) clientPtr;
+	clientStr->assign ( valuePtr, valueLen );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ComposeArrayItemPath ( XMP_StringPtr schemaNS,
+					   XMP_StringPtr arrayName,
+					   XMP_Index	 itemIndex,
+					   tStringObj *  fullPath )
+{
+	WrapCheckVoid ( zXMPUtils_ComposeArrayItemPath_1 ( schemaNS, arrayName, itemIndex, fullPath, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ComposeStructFieldPath ( XMP_StringPtr schemaNS,
+						 XMP_StringPtr structName,
+						 XMP_StringPtr fieldNS,
+						 XMP_StringPtr fieldName,
+						 tStringObj *  fullPath )
+{
+	WrapCheckVoid ( zXMPUtils_ComposeStructFieldPath_1 ( schemaNS, structName, fieldNS, fieldName, fullPath, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ComposeQualifierPath ( XMP_StringPtr schemaNS,
+					   XMP_StringPtr propName,
+					   XMP_StringPtr qualNS,
+					   XMP_StringPtr qualName,
+					   tStringObj *	 fullPath )
+{
+	WrapCheckVoid ( zXMPUtils_ComposeQualifierPath_1 ( schemaNS, propName, qualNS, qualName, fullPath, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ComposeLangSelector ( XMP_StringPtr schemaNS,
+					  XMP_StringPtr arrayName,
+					  XMP_StringPtr langName,
+					  tStringObj *	fullPath )
+{
+	WrapCheckVoid ( zXMPUtils_ComposeLangSelector_1 ( schemaNS, arrayName, langName, fullPath, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ComposeLangSelector ( XMP_StringPtr		 schemaNS,
+					  XMP_StringPtr		 arrayName,
+					  const tStringObj & langName,
+					  tStringObj *		 fullPath )
+{
+	TXMPUtils::ComposeLangSelector ( schemaNS, arrayName, langName.c_str(), fullPath );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ComposeFieldSelector ( XMP_StringPtr schemaNS,
+					   XMP_StringPtr arrayName,
+					   XMP_StringPtr fieldNS,
+					   XMP_StringPtr fieldName,
+					   XMP_StringPtr fieldValue,
+					   tStringObj *	 fullPath )
+{
+	WrapCheckVoid ( zXMPUtils_ComposeFieldSelector_1 ( schemaNS, arrayName, fieldNS, fieldName, fieldValue, fullPath, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ComposeFieldSelector ( XMP_StringPtr	  schemaNS,
+					   XMP_StringPtr	  arrayName,
+					   XMP_StringPtr	  fieldNS,
+					   XMP_StringPtr	  fieldName,
+					   const tStringObj & fieldValue,
+					   tStringObj *		  fullPath )
+{
+	TXMPUtils::ComposeFieldSelector ( schemaNS, arrayName, fieldNS, fieldName, fieldValue.c_str(), fullPath );
+}
+
+// -------------------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertFromBool ( bool		   binValue,
+				  tStringObj * strValue )
+{
+	WrapCheckVoid ( zXMPUtils_ConvertFromBool_1 ( binValue, strValue, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertFromInt ( long		   binValue,
+				 XMP_StringPtr format,
+				 tStringObj *  strValue )
+{
+	#if XMP_MacBuild & XMP_64	// This is checked because on Mac 64 bit environment, long is of 64 bit and hence gives a warning during implicit
+								// typecasting to XMP_Int32. Now doing it explicitly in that case.
+		WrapCheckVoid ( zXMPUtils_ConvertFromInt_1 ( (XMP_Int32)binValue, format, strValue, SetClientString ) );
+	#else
+		WrapCheckVoid ( zXMPUtils_ConvertFromInt_1 ( binValue, format, strValue, SetClientString ) );
+	#endif
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertFromInt64 ( long long 	 binValue,
+				   XMP_StringPtr format,
+				   tStringObj *  strValue )
+{
+	WrapCheckVoid ( zXMPUtils_ConvertFromInt64_1 ( binValue, format, strValue, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertFromFloat ( double		 binValue,
+				   XMP_StringPtr format,
+				   tStringObj *	 strValue )
+{
+	WrapCheckVoid ( zXMPUtils_ConvertFromFloat_1 ( binValue, format, strValue, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertFromDate ( const XMP_DateTime & binValue,
+				  tStringObj *		   strValue )
+{
+	WrapCheckVoid ( zXMPUtils_ConvertFromDate_1 ( binValue, strValue, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,bool)::
+ConvertToBool ( XMP_StringPtr strValue )
+{
+	WrapCheckBool ( value, zXMPUtils_ConvertToBool_1 ( strValue ) );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,bool)::
+ConvertToBool ( const tStringObj & strValue )
+{
+	return TXMPUtils::ConvertToBool ( strValue.c_str() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,long)::
+ConvertToInt ( XMP_StringPtr strValue )
+{
+	WrapCheckInt32 ( value, zXMPUtils_ConvertToInt_1 ( strValue ) );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,long)::
+ConvertToInt ( const tStringObj & strValue )
+{
+	return TXMPUtils::ConvertToInt ( strValue.c_str() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,long long)::
+ConvertToInt64 ( XMP_StringPtr strValue )
+{
+	WrapCheckInt64 ( value, zXMPUtils_ConvertToInt64_1 ( strValue ) );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,long long)::
+ConvertToInt64 ( const tStringObj & strValue )
+{
+	return TXMPUtils::ConvertToInt64 ( strValue.c_str() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,double)::
+ConvertToFloat ( XMP_StringPtr strValue )
+{
+	WrapCheckFloat ( value, zXMPUtils_ConvertToFloat_1 ( strValue ) );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,double)::
+ConvertToFloat ( const tStringObj & strValue )
+{
+	return TXMPUtils::ConvertToFloat ( strValue.c_str() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertToDate ( XMP_StringPtr  strValue,
+				XMP_DateTime * binValue )
+{
+	WrapCheckVoid ( zXMPUtils_ConvertToDate_1 ( strValue, binValue ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertToDate ( const tStringObj & strValue,
+				XMP_DateTime *	   binValue )
+{
+	TXMPUtils::ConvertToDate ( strValue.c_str(), binValue );
+}
+
+// -------------------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+CurrentDateTime ( XMP_DateTime * time )
+{
+	WrapCheckVoid ( zXMPUtils_CurrentDateTime_1 ( time ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+SetTimeZone ( XMP_DateTime * time )
+{
+	WrapCheckVoid ( zXMPUtils_SetTimeZone_1 ( time ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertToUTCTime ( XMP_DateTime * time )
+{
+	WrapCheckVoid ( zXMPUtils_ConvertToUTCTime_1 ( time ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ConvertToLocalTime ( XMP_DateTime * time )
+{
+	WrapCheckVoid ( zXMPUtils_ConvertToLocalTime_1 ( time ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,int)::
+CompareDateTime ( const XMP_DateTime & left,
+				  const XMP_DateTime & right )
+{
+	WrapCheckInt32 ( result, zXMPUtils_CompareDateTime_1 ( left, right ) );
+	return result;
+}
+
+// -------------------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+EncodeToBase64 ( XMP_StringPtr rawStr,
+				 XMP_StringLen rawLen,
+				 tStringObj *  encodedStr )
+{
+	WrapCheckVoid ( zXMPUtils_EncodeToBase64_1 ( rawStr, rawLen, encodedStr, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+EncodeToBase64 ( const tStringObj & rawStr,
+				 tStringObj *		encodedStr )
+{
+	TXMPUtils::EncodeToBase64 ( rawStr.c_str(), (XMP_StringLen)rawStr.size(), encodedStr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+DecodeFromBase64 ( XMP_StringPtr encodedStr,
+				   XMP_StringLen encodedLen,
+				   tStringObj *	 rawStr )
+{
+	WrapCheckVoid ( zXMPUtils_DecodeFromBase64_1 ( encodedStr, encodedLen, rawStr, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+DecodeFromBase64 ( const tStringObj & encodedStr,
+				   tStringObj *		  rawStr )
+{
+	TXMPUtils::DecodeFromBase64 ( encodedStr.c_str(), (XMP_StringLen)encodedStr.size(), rawStr );
+}
+
+// -------------------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+PackageForJPEG ( const TXMPMeta<tStringObj> & xmpObj,
+                 tStringObj * standardXMP,
+                 tStringObj * extendedXMP,
+                 tStringObj * extendedDigest )
+{
+	WrapCheckVoid ( zXMPUtils_PackageForJPEG_1 ( xmpObj.GetInternalRef(), standardXMP, extendedXMP, extendedDigest, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+MergeFromJPEG ( TXMPMeta<tStringObj> * fullXMP,
+                const TXMPMeta<tStringObj> & extendedXMP )
+{
+	WrapCheckVoid ( zXMPUtils_MergeFromJPEG_1 ( fullXMP->GetInternalRef(), extendedXMP.GetInternalRef() ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+CatenateArrayItems ( const TXMPMeta<tStringObj> & xmpObj,
+					 XMP_StringPtr	schemaNS,
+					 XMP_StringPtr	arrayName,
+					 XMP_StringPtr	separator,
+					 XMP_StringPtr	quotes,
+					 XMP_OptionBits options,
+					 tStringObj *	catedStr )
+{
+	WrapCheckVoid ( zXMPUtils_CatenateArrayItems_1 ( xmpObj.GetInternalRef(), schemaNS, arrayName, 
+													 separator, quotes, options, catedStr, SetClientString ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+SeparateArrayItems ( TXMPMeta<tStringObj> * xmpObj,
+					 XMP_StringPtr	schemaNS,
+					 XMP_StringPtr	arrayName,
+					 XMP_OptionBits options,
+					 XMP_StringPtr	catedStr )
+{
+	if ( xmpObj == 0 ) throw XMP_Error ( kXMPErr_BadParam, "Null output SXMPMeta pointer" );
+	WrapCheckVoid ( zXMPUtils_SeparateArrayItems_1 ( xmpObj->GetInternalRef(), schemaNS, arrayName, options, catedStr ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+SeparateArrayItems ( TXMPMeta<tStringObj> * xmpObj,
+					 XMP_StringPtr		schemaNS,
+					 XMP_StringPtr		arrayName,
+					 XMP_OptionBits		options,
+					 const tStringObj & catedStr )
+{
+	TXMPUtils::SeparateArrayItems ( xmpObj, schemaNS, arrayName, options, catedStr.c_str() );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+ApplyTemplate ( TXMPMeta<tStringObj> *       workingXMP,
+				const TXMPMeta<tStringObj> & templateXMP,
+				XMP_OptionBits               actions )
+{
+	if ( workingXMP == 0 ) throw XMP_Error ( kXMPErr_BadParam, "Null working SXMPMeta pointer" );
+	WrapCheckVoid ( zXMPUtils_ApplyTemplate_1 ( workingXMP->GetInternalRef(), templateXMP.GetInternalRef(), actions ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+RemoveProperties ( TXMPMeta<tStringObj> * xmpObj,
+				   XMP_StringPtr  schemaNS /* = 0 */,
+				   XMP_StringPtr  propName /* = 0 */,
+				   XMP_OptionBits options /* = 0 */ )
+{
+	if ( xmpObj == 0 ) throw XMP_Error ( kXMPErr_BadParam, "Null output SXMPMeta pointer" );
+	WrapCheckVoid ( zXMPUtils_RemoveProperties_1 ( xmpObj->GetInternalRef(), schemaNS, propName, options ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------------------------------
+
+XMP_MethodIntro(TXMPUtils,void)::
+DuplicateSubtree ( const TXMPMeta<tStringObj> & source,
+				   TXMPMeta<tStringObj> *		dest,
+				   XMP_StringPtr  sourceNS,
+				   XMP_StringPtr  sourceRoot,
+				   XMP_StringPtr  destNS /*= 0 */,
+				   XMP_StringPtr  destRoot /* = 0 */,
+				   XMP_OptionBits options /* = 0 */ )
+{
+	if ( dest == 0 ) throw XMP_Error ( kXMPErr_BadParam, "Null output SXMPMeta pointer" );
+	WrapCheckVoid ( zXMPUtils_DuplicateSubtree_1 ( source.GetInternalRef(), dest->GetInternalRef(),
+												   sourceNS, sourceRoot, destNS, destRoot, options ) );
+}
+
+// =================================================================================================
+
+// =================================================================================================
diff --git a/public/include/client-glue/WXMPFiles.hpp b/public/include/client-glue/WXMPFiles.hpp
new file mode 100644
index 0000000..6393e58
--- /dev/null
+++ b/public/include/client-glue/WXMPFiles.hpp
@@ -0,0 +1,281 @@
+#ifndef __WXMPFiles_hpp__
+#define __WXMPFiles_hpp__	1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2002 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 "client-glue/WXMP_Common.hpp"
+
+#if XMP_StaticBuild	// ! Client XMP_IO objects can only be used in static builds.
+	#include "XMP_IO.hpp"
+#endif
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+/// \file WXMPFiles.h
+/// \brief High level support to access metadata in files of interest to Adobe applications.
+///
+/// This header ...
+///
+// =================================================================================================
+
+// =================================================================================================
+
+#define WrapCheckXMPFilesRef(result,WCallProto) \
+    WXMP_Result wResult;                        \
+    WCallProto;                                 \
+    PropagateException ( wResult );             \
+    XMPFilesRef result = XMPFilesRef(wResult.ptrResult)
+
+inline XMP_Bool WrapProgressReport ( XMP_ProgressReportProc proc, void * context,
+								 float elapsedTime, float fractionDone, float secondsToGo )
+{
+	bool ok;
+	try {
+		ok = (*proc) ( context, elapsedTime, fractionDone, secondsToGo );
+	} catch ( ... ) {
+		ok = false;
+	}
+	return ConvertBoolToXMP_Bool( ok );
+}
+
+// =================================================================================================
+
+inline XMP_Bool WrapFilesErrorNotify ( XMPFiles_ErrorCallbackProc proc, void * context,
+	XMP_StringPtr filePath, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr message )
+{
+	bool ok;
+	try {
+		ok = (*proc) ( context, filePath, severity, cause, message );
+	} catch ( ... ) {
+		ok = false;
+	}
+	return ConvertBoolToXMP_Bool( ok );
+}
+
+// =================================================================================================
+
+#define zXMPFiles_GetVersionInfo_1(versionInfo) \
+	WXMPFiles_GetVersionInfo_1 ( versionInfo /* no wResult */ )
+
+#define zXMPFiles_Initialize_1(options) \
+	WXMPFiles_Initialize_1 ( options, &wResult )
+
+#define zXMPFiles_Initialize_2(options,pluginFolder,plugins) \
+	WXMPFiles_Initialize_2 ( options, pluginFolder, plugins, &wResult )
+
+#define zXMPFiles_Terminate_1() \
+	WXMPFiles_Terminate_1 ( /* no wResult */ )
+
+#define zXMPFiles_CTor_1() \
+	WXMPFiles_CTor_1 ( &wResult )
+
+#define zXMPFiles_GetFormatInfo_1(format,flags) \
+	WXMPFiles_GetFormatInfo_1 ( format, flags, &wResult )
+
+#define zXMPFiles_CheckFileFormat_1(filePath) \
+	WXMPFiles_CheckFileFormat_1 ( filePath, &wResult )
+
+#define zXMPFiles_CheckPackageFormat_1(folderPath) \
+	WXMPFiles_CheckPackageFormat_1 ( folderPath, &wResult )
+
+#define zXMPFiles_GetFileModDate_1(filePath,modDate,format,options) \
+	WXMPFiles_GetFileModDate_1 ( filePath, modDate, format, options, &wResult )
+
+#define zXMPFiles_GetAssociatedResources_1( filePath, resourceList, format, options, SetClientStringVector ) \
+	WXMPFiles_GetAssociatedResources_1 ( filePath, resourceList, format, options, SetClientStringVector, &wResult )
+
+#define zXMPFiles_IsMetadataWritable_1( filePath, writable, format, options ) \
+	WXMPFiles_IsMetadataWritable_1 ( filePath, writable, format, options, &wResult )
+
+#define zXMPFiles_OpenFile_1(filePath,format,openFlags) \
+	WXMPFiles_OpenFile_1 ( this->xmpFilesRef, filePath, format, openFlags, &wResult )
+
+#if XMP_StaticBuild	// ! Client XMP_IO objects can only be used in static builds.
+#define zXMPFiles_OpenFile_2(clientIO,format,openFlags) \
+	WXMPFiles_OpenFile_2 ( this->xmpFilesRef, clientIO, format, openFlags, &wResult )
+#endif
+
+#define zXMPFiles_CloseFile_1(closeFlags) \
+	WXMPFiles_CloseFile_1 ( this->xmpFilesRef, closeFlags, &wResult )
+
+#define zXMPFiles_GetFileInfo_1(clientPath,openFlags,format,handlerFlags,SetClientString) \
+	WXMPFiles_GetFileInfo_1 ( this->xmpFilesRef, clientPath, openFlags, format, handlerFlags, SetClientString, &wResult )
+
+#define zXMPFiles_SetAbortProc_1(abortProc,abortArg) \
+	WXMPFiles_SetAbortProc_1 ( this->xmpFilesRef, abortProc, abortArg, &wResult )
+
+#define zXMPFiles_GetXMP_1(xmpRef,clientPacket,packetInfo,SetClientString) \
+	WXMPFiles_GetXMP_1 ( this->xmpFilesRef, xmpRef, clientPacket, packetInfo, SetClientString, &wResult )
+
+#define zXMPFiles_PutXMP_1(xmpRef,xmpPacket,xmpPacketLen) \
+	WXMPFiles_PutXMP_1 ( this->xmpFilesRef, xmpRef, xmpPacket, xmpPacketLen, &wResult )
+
+#define zXMPFiles_CanPutXMP_1(xmpRef,xmpPacket,xmpPacketLen) \
+	WXMPFiles_CanPutXMP_1 ( this->xmpFilesRef, xmpRef, xmpPacket, xmpPacketLen, &wResult )
+
+#define zXMPFiles_SetDefaultProgressCallback_1(proc,context,interval,sendStartStop) \
+	WXMPFiles_SetDefaultProgressCallback_1 ( WrapProgressReport, proc, context, interval, sendStartStop, &wResult )
+
+#define zXMPFiles_SetProgressCallback_1(proc,context,interval,sendStartStop) \
+	WXMPFiles_SetProgressCallback_1 ( this->xmpFilesRef, WrapProgressReport, proc, context, interval, sendStartStop, &wResult )
+
+#define zXMPFiles_SetDefaultErrorCallback_1(proc,context,limit) \
+	WXMPFiles_SetDefaultErrorCallback_1 ( WrapFilesErrorNotify, proc, context, limit, &wResult )
+
+#define zXMPFiles_SetErrorCallback_1(proc,context,limit) \
+	WXMPFiles_SetErrorCallback_1 ( this->xmpFilesRef, WrapFilesErrorNotify, proc, context, limit, &wResult )
+
+#define zXMPFiles_ResetErrorCallbackLimit_1(limit) \
+	WXMPFiles_ResetErrorCallbackLimit_1 ( this->xmpFilesRef, limit, &wResult )
+
+// =================================================================================================
+
+extern void WXMPFiles_GetVersionInfo_1 ( XMP_VersionInfo * versionInfo );
+
+extern void WXMPFiles_Initialize_1 ( XMP_OptionBits      options,
+                                     WXMP_Result *       result );
+
+extern void WXMPFiles_Initialize_2 ( XMP_OptionBits      options,
+									 const char*         pluginFolder,
+									 const char*         plugins,
+									 WXMP_Result *       result );
+
+extern void WXMPFiles_Terminate_1();
+
+extern void WXMPFiles_CTor_1 ( WXMP_Result * result );
+
+extern void WXMPFiles_IncrementRefCount_1 ( XMPFilesRef xmpFilesRef );
+
+extern void WXMPFiles_DecrementRefCount_1 ( XMPFilesRef xmpFilesRef );
+
+extern void WXMPFiles_GetFormatInfo_1 ( XMP_FileFormat   format,
+                                        XMP_OptionBits * flags,	// ! Can be null.
+                                        WXMP_Result *    result );
+
+extern void WXMPFiles_CheckFileFormat_1 ( XMP_StringPtr filePath,
+                               			  WXMP_Result * result );
+
+extern void WXMPFiles_CheckPackageFormat_1 ( XMP_StringPtr folderPath,
+                      						 WXMP_Result * result );
+
+extern void WXMPFiles_GetFileModDate_1 ( XMP_StringPtr    filePath,
+                                         XMP_DateTime *   modDate,
+					                     XMP_FileFormat * format,	// ! Can be null.
+					                     XMP_OptionBits   options,
+                      					 WXMP_Result *    result );
+
+
+extern void WXMPFiles_GetAssociatedResources_1 ( XMP_StringPtr             filePath,
+												 void *                    resourceList,
+												 XMP_FileFormat            format, 
+												 XMP_OptionBits            options, 
+					                             SetClientStringVectorProc SetClientStringVector,
+												 WXMP_Result *             result );
+
+extern void WXMPFiles_IsMetadataWritable_1 ( XMP_StringPtr    filePath,
+									         XMP_Bool *       writable, 
+									         XMP_FileFormat   format,
+									         XMP_OptionBits   options, 
+									         WXMP_Result *    result );
+
+extern void WXMPFiles_OpenFile_1 ( XMPFilesRef    xmpFilesRef,
+                                   XMP_StringPtr  filePath,
+					               XMP_FileFormat format,
+					               XMP_OptionBits openFlags,
+                                   WXMP_Result *  result );
+
+#if XMP_StaticBuild	// ! Client XMP_IO objects can only be used in static builds.
+extern void WXMPFiles_OpenFile_2 ( XMPFilesRef    xmpFilesRef,
+                                   XMP_IO *       clientIO,
+					               XMP_FileFormat format,
+					               XMP_OptionBits openFlags,
+                                   WXMP_Result *  result );
+#endif
+
+extern void WXMPFiles_CloseFile_1 ( XMPFilesRef    xmpFilesRef,
+                                    XMP_OptionBits closeFlags,
+                                    WXMP_Result *  result );
+
+extern void WXMPFiles_GetFileInfo_1 ( XMPFilesRef      xmpFilesRef,
+                                      void *           clientPath,
+					                  XMP_OptionBits * openFlags,		// ! Can be null.
+					                  XMP_FileFormat * format,		// ! Can be null.
+					                  XMP_OptionBits * handlerFlags,	// ! Can be null.
+					                  SetClientStringProc SetClientString,
+                                      WXMP_Result *    result );
+
+extern void WXMPFiles_SetAbortProc_1 ( XMPFilesRef   xmpFilesRef,
+                                       XMP_AbortProc abortProc,
+									   void *        abortArg,
+                                       WXMP_Result * result );
+
+extern void WXMPFiles_GetXMP_1 ( XMPFilesRef      xmpFilesRef,
+                                 XMPMetaRef       xmpRef,		// ! Can be null.
+    			                 void *           clientPacket,
+    			                 XMP_PacketInfo * packetInfo,	// ! Can be null.
+    			                 SetClientStringProc SetClientString,
+                                 WXMP_Result *    result );
+
+extern void WXMPFiles_PutXMP_1 ( XMPFilesRef   xmpFilesRef,
+                                 XMPMetaRef    xmpRef,		// ! Only one of the XMP object or packet are passed.
+                                 XMP_StringPtr xmpPacket,
+                                 XMP_StringLen xmpPacketLen,
+                                 WXMP_Result * result );
+
+extern void WXMPFiles_CanPutXMP_1 ( XMPFilesRef   xmpFilesRef,
+                                    XMPMetaRef	  xmpRef,		// ! Only one of the XMP object or packet are passed.
+                                    XMP_StringPtr xmpPacket,
+                                    XMP_StringLen xmpPacketLen,
+                                    WXMP_Result * result );
+
+extern void WXMPFiles_SetDefaultProgressCallback_1 ( XMP_ProgressReportWrapper wrapperproc,
+													 XMP_ProgressReportProc    clientProc,
+													 void *        context,
+													 float         interval,
+													 XMP_Bool      sendStartStop,
+													 WXMP_Result * result );
+
+extern void WXMPFiles_SetProgressCallback_1 ( XMPFilesRef   xmpFilesRef,
+											  XMP_ProgressReportWrapper wrapperproc,
+											  XMP_ProgressReportProc    clientProc,
+											  void *        context,
+											  float         interval,
+											  XMP_Bool      sendStartStop,
+											  WXMP_Result * result );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void WXMPFiles_SetDefaultErrorCallback_1 ( XMPFiles_ErrorCallbackWrapper	wrapperProc,
+												  XMPFiles_ErrorCallbackProc	clientProc,
+												  void *						context,
+												  XMP_Uns32						limit,
+												  WXMP_Result *					wResult );
+
+extern void WXMPFiles_SetErrorCallback_1 ( XMPFilesRef						xmpRef,
+										   XMPFiles_ErrorCallbackWrapper	wrapperProc,
+										   XMPFiles_ErrorCallbackProc		clientProc,
+										   void *							context,
+										   XMP_Uns32						limit,
+										   WXMP_Result *					wResult );
+
+extern void WXMPFiles_ResetErrorCallbackLimit_1 ( XMPFilesRef				xmpRef,
+												  XMP_Uns32					limit,
+												  WXMP_Result *				wResult );
+
+// =================================================================================================
+
+#if __cplusplus
+}
+#endif
+
+#endif // __WXMPFiles_hpp__
diff --git a/public/include/client-glue/WXMPIterator.hpp b/public/include/client-glue/WXMPIterator.hpp
new file mode 100644
index 0000000..e40a1d4
--- /dev/null
+++ b/public/include/client-glue/WXMPIterator.hpp
@@ -0,0 +1,74 @@
+#if ! __WXMPIterator_hpp__
+#define __WXMPIterator_hpp__ 1
+
+// =================================================================================================
+// Copyright 2002 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 "client-glue/WXMP_Common.hpp"
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+
+#define zXMPIterator_PropCTor_1(xmpRef,schemaNS,propName,options) \
+    WXMPIterator_PropCTor_1 ( xmpRef, schemaNS, propName, options, &wResult );
+
+#define zXMPIterator_TableCTor_1(schemaNS,propName,options) \
+    WXMPIterator_TableCTor_1 ( schemaNS, propName, options, &wResult );
+    
+
+#define zXMPIterator_Next_1(schemaNS,propPath,propValue,options,SetClientString) \
+    WXMPIterator_Next_1 ( this->iterRef, schemaNS, propPath, propValue, options, SetClientString, &wResult );
+
+#define zXMPIterator_Skip_1(options) \
+    WXMPIterator_Skip_1 ( this->iterRef, options, &wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPIterator_PropCTor_1 ( XMPMetaRef     xmpRef,
+                          XMP_StringPtr  schemaNS,
+                          XMP_StringPtr  propName,
+                          XMP_OptionBits options,
+                          WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPIterator_TableCTor_1 ( XMP_StringPtr  schemaNS,
+                           XMP_StringPtr  propName,
+                           XMP_OptionBits options,
+                           WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPIterator_IncrementRefCount_1 ( XMPIteratorRef iterRef );
+
+extern void
+XMP_PUBLIC WXMPIterator_DecrementRefCount_1 ( XMPIteratorRef iterRef );
+
+extern void
+XMP_PUBLIC WXMPIterator_Next_1 ( XMPIteratorRef   iterRef,
+                      void *           schemaNS,
+                      void *           propPath,
+                      void *           propValue,
+                      XMP_OptionBits * options,
+                      SetClientStringProc SetClientString,
+                      WXMP_Result *    wResult );
+
+extern void
+XMP_PUBLIC WXMPIterator_Skip_1 ( XMPIteratorRef iterRef,
+                      XMP_OptionBits options,
+                      WXMP_Result *  wResult );
+
+// =================================================================================================
+
+#if __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  // __WXMPIterator_hpp__
diff --git a/public/include/client-glue/WXMPMeta.hpp b/public/include/client-glue/WXMPMeta.hpp
new file mode 100644
index 0000000..6991c12
--- /dev/null
+++ b/public/include/client-glue/WXMPMeta.hpp
@@ -0,0 +1,621 @@
+#if ! __WXMPMeta_hpp__
+#define __WXMPMeta_hpp__ 1
+
+// =================================================================================================
+// Copyright 2002 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 "client-glue/WXMP_Common.hpp"
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+
+inline XMP_Bool WrapErrorNotify ( XMPMeta_ErrorCallbackProc proc, void * context,
+							  XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr message )
+{
+	bool ok;
+	try {
+		ok = (*proc) ( context, severity, cause, message );
+	} catch ( ... ) {
+		ok = false;
+	}
+	return ConvertBoolToXMP_Bool( ok );
+}
+
+// =================================================================================================
+
+#define zXMPMeta_GetVersionInfo_1(info) \
+    WXMPMeta_GetVersionInfo_1 ( info /* no wResult */ )
+
+#define zXMPMeta_Initialize_1() \
+    WXMPMeta_Initialize_1 ( &wResult )
+#define zXMPMeta_Terminate_1() \
+    WXMPMeta_Terminate_1 ( /* no wResult */ )
+
+#define zXMPMeta_CTor_1() \
+    WXMPMeta_CTor_1 ( &wResult )
+
+#define zXMPMeta_GetGlobalOptions_1() \
+    WXMPMeta_GetGlobalOptions_1 ( &wResult )
+
+#define zXMPMeta_SetGlobalOptions_1(options) \
+    WXMPMeta_SetGlobalOptions_1 ( options, &wResult )
+
+#define zXMPMeta_DumpNamespaces_1(outProc,refCon) \
+    WXMPMeta_DumpNamespaces_1 ( outProc, refCon, &wResult )
+
+#define zXMPMeta_RegisterNamespace_1(namespaceURI,suggestedPrefix,actualPrefix,SetClientString) \
+    WXMPMeta_RegisterNamespace_1 ( namespaceURI, suggestedPrefix, actualPrefix, SetClientString, &wResult )
+
+#define zXMPMeta_GetNamespacePrefix_1(namespaceURI,namespacePrefix,SetClientString) \
+    WXMPMeta_GetNamespacePrefix_1 ( namespaceURI, namespacePrefix, SetClientString, &wResult )
+
+#define zXMPMeta_GetNamespaceURI_1(namespacePrefix,namespaceURI,SetClientString) \
+    WXMPMeta_GetNamespaceURI_1 ( namespacePrefix, namespaceURI, SetClientString, &wResult )
+
+#define zXMPMeta_DeleteNamespace_1(namespaceURI) \
+    WXMPMeta_DeleteNamespace_1 ( namespaceURI, &wResult )
+
+#define zXMPMeta_GetProperty_1(schemaNS,propName,propValue,options,SetClientString) \
+    WXMPMeta_GetProperty_1 ( this->xmpRef, schemaNS, propName, propValue, options, SetClientString, &wResult )
+
+#define zXMPMeta_GetArrayItem_1(schemaNS,arrayName,itemIndex,itemValue,options,SetClientString) \
+    WXMPMeta_GetArrayItem_1 ( this->xmpRef, schemaNS, arrayName, itemIndex, itemValue, options, SetClientString, &wResult )
+
+#define zXMPMeta_GetStructField_1(schemaNS,structName,fieldNS,fieldName,fieldValue,options,SetClientString) \
+    WXMPMeta_GetStructField_1 ( this->xmpRef, schemaNS, structName, fieldNS, fieldName, fieldValue, options, SetClientString, &wResult )
+
+#define zXMPMeta_GetQualifier_1(schemaNS,propName,qualNS,qualName,qualValue,options,SetClientString) \
+    WXMPMeta_GetQualifier_1 ( this->xmpRef, schemaNS, propName, qualNS, qualName, qualValue, options, SetClientString, &wResult )
+
+#define zXMPMeta_SetProperty_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_SetProperty_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_SetArrayItem_1(schemaNS,arrayName,itemIndex,itemValue,options) \
+    WXMPMeta_SetArrayItem_1 ( this->xmpRef, schemaNS, arrayName, itemIndex, itemValue, options, &wResult )
+
+#define zXMPMeta_AppendArrayItem_1(schemaNS,arrayName,arrayOptions,itemValue,options) \
+    WXMPMeta_AppendArrayItem_1 ( this->xmpRef, schemaNS, arrayName, arrayOptions, itemValue, options, &wResult )
+
+#define zXMPMeta_SetStructField_1(schemaNS,structName,fieldNS,fieldName,fieldValue,options) \
+    WXMPMeta_SetStructField_1 ( this->xmpRef, schemaNS, structName, fieldNS, fieldName, fieldValue, options, &wResult )
+
+#define zXMPMeta_SetQualifier_1(schemaNS,propName,qualNS,qualName,qualValue,options) \
+    WXMPMeta_SetQualifier_1 ( this->xmpRef, schemaNS, propName, qualNS, qualName, qualValue, options, &wResult )
+
+#define zXMPMeta_DeleteProperty_1(schemaNS,propName) \
+    WXMPMeta_DeleteProperty_1 ( this->xmpRef, schemaNS, propName, &wResult )
+
+#define zXMPMeta_DeleteArrayItem_1(schemaNS,arrayName,itemIndex) \
+    WXMPMeta_DeleteArrayItem_1 ( this->xmpRef, schemaNS, arrayName, itemIndex, &wResult )
+
+#define zXMPMeta_DeleteStructField_1(schemaNS,structName,fieldNS,fieldName) \
+    WXMPMeta_DeleteStructField_1 ( this->xmpRef, schemaNS, structName, fieldNS, fieldName, &wResult )
+
+#define zXMPMeta_DeleteQualifier_1(schemaNS,propName,qualNS,qualName) \
+    WXMPMeta_DeleteQualifier_1 ( this->xmpRef, schemaNS, propName, qualNS, qualName, &wResult )
+
+#define zXMPMeta_DoesPropertyExist_1(schemaNS,propName) \
+    WXMPMeta_DoesPropertyExist_1 ( this->xmpRef, schemaNS, propName, &wResult )
+
+#define zXMPMeta_DoesArrayItemExist_1(schemaNS,arrayName,itemIndex) \
+    WXMPMeta_DoesArrayItemExist_1 ( this->xmpRef, schemaNS, arrayName, itemIndex, &wResult )
+
+#define zXMPMeta_DoesStructFieldExist_1(schemaNS,structName,fieldNS,fieldName) \
+    WXMPMeta_DoesStructFieldExist_1 ( this->xmpRef, schemaNS, structName, fieldNS, fieldName, &wResult )
+
+#define zXMPMeta_DoesQualifierExist_1(schemaNS,propName,qualNS,qualName) \
+    WXMPMeta_DoesQualifierExist_1 ( this->xmpRef, schemaNS, propName, qualNS, qualName, &wResult )
+
+#define zXMPMeta_GetLocalizedText_1(schemaNS,altTextName,genericLang,specificLang,clientLang,clientValue,options,SetClientString) \
+    WXMPMeta_GetLocalizedText_1 ( this->xmpRef, schemaNS, altTextName, genericLang, specificLang, clientLang, clientValue, options, SetClientString, &wResult )
+
+#define zXMPMeta_SetLocalizedText_1(schemaNS,altTextName,genericLang,specificLang,itemValue,options) \
+    WXMPMeta_SetLocalizedText_1 ( this->xmpRef, schemaNS, altTextName, genericLang, specificLang, itemValue, options, &wResult )
+
+#define zXMPMeta_DeleteLocalizedText_1(schemaNS,altTextName,genericLang,specificLang) \
+    WXMPMeta_DeleteLocalizedText_1 ( this->xmpRef, schemaNS, altTextName, genericLang, specificLang, &wResult )
+#define zXMPMeta_GetProperty_Bool_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_GetProperty_Bool_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_GetProperty_Int_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_GetProperty_Int_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_GetProperty_Int64_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_GetProperty_Int64_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_GetProperty_Float_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_GetProperty_Float_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_GetProperty_Date_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_GetProperty_Date_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_SetProperty_Bool_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_SetProperty_Bool_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_SetProperty_Int_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_SetProperty_Int_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_SetProperty_Int64_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_SetProperty_Int64_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_SetProperty_Float_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_SetProperty_Float_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_SetProperty_Date_1(schemaNS,propName,propValue,options) \
+    WXMPMeta_SetProperty_Date_1 ( this->xmpRef, schemaNS, propName, propValue, options, &wResult )
+
+#define zXMPMeta_GetObjectName_1(objName,SetClientString) \
+    WXMPMeta_GetObjectName_1 ( this->xmpRef, objName, SetClientString, &wResult )
+
+#define zXMPMeta_SetObjectName_1(name) \
+    WXMPMeta_SetObjectName_1 ( this->xmpRef, name, &wResult )
+
+#define zXMPMeta_GetObjectOptions_1() \
+    WXMPMeta_GetObjectOptions_1 ( this->xmpRef, &wResult )
+
+#define zXMPMeta_SetObjectOptions_1(options) \
+    WXMPMeta_SetObjectOptions_1 ( this->xmpRef, options, &wResult )
+
+#define zXMPMeta_Sort_1() \
+    WXMPMeta_Sort_1 ( this->xmpRef, &wResult )
+
+#define zXMPMeta_Erase_1() \
+    WXMPMeta_Erase_1 ( this->xmpRef, &wResult )
+
+#define zXMPMeta_Clone_1(options) \
+    WXMPMeta_Clone_1 ( this->xmpRef, options, &wResult )
+
+#define zXMPMeta_CountArrayItems_1(schemaNS,arrayName) \
+    WXMPMeta_CountArrayItems_1 ( this->xmpRef, schemaNS, arrayName, &wResult )
+
+#define zXMPMeta_DumpObject_1(outProc,refCon) \
+    WXMPMeta_DumpObject_1 ( this->xmpRef, outProc, refCon, &wResult )
+
+#define zXMPMeta_ParseFromBuffer_1(buffer,bufferSize,options) \
+    WXMPMeta_ParseFromBuffer_1 ( this->xmpRef, buffer, bufferSize, options, &wResult )
+
+#define zXMPMeta_SerializeToBuffer_1(pktString,options,padding,newline,indent,baseIndent,SetClientString) \
+    WXMPMeta_SerializeToBuffer_1 ( this->xmpRef, pktString, options, padding, newline, indent, baseIndent, SetClientString, &wResult )
+
+#define zXMPMeta_SetDefaultErrorCallback_1(proc,context,limit) \
+	WXMPMeta_SetDefaultErrorCallback_1 ( WrapErrorNotify, proc, context, limit, &wResult )
+	
+#define zXMPMeta_SetErrorCallback_1(proc,context,limit) \
+	WXMPMeta_SetErrorCallback_1 ( this->xmpRef, WrapErrorNotify, proc, context, limit, &wResult )
+
+#define zXMPMeta_ResetErrorCallbackLimit_1(limit) \
+	WXMPMeta_ResetErrorCallbackLimit_1 ( this->xmpRef, limit, &wResult )
+
+// =================================================================================================
+
+extern void
+XMP_PUBLIC WXMPMeta_GetVersionInfo_1 ( XMP_VersionInfo * info );
+
+extern void
+XMP_PUBLIC WXMPMeta_Initialize_1 ( WXMP_Result * wResult );
+extern void
+XMP_PUBLIC WXMPMeta_Terminate_1();
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_CTor_1 ( WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_IncrementRefCount_1 ( XMPMetaRef xmpRef );
+
+extern void
+XMP_PUBLIC WXMPMeta_DecrementRefCount_1 ( XMPMetaRef xmpRef );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_GetGlobalOptions_1 ( WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetGlobalOptions_1 ( XMP_OptionBits options,
+                              WXMP_Result *  wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_DumpNamespaces_1 ( XMP_TextOutputProc outProc,
+                            void *             refCon,
+                            WXMP_Result *      wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_RegisterNamespace_1 ( XMP_StringPtr namespaceURI,
+                               XMP_StringPtr suggestedPrefix,
+                               void *        actualPrefix,
+                               SetClientStringProc SetClientString,
+                               WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_GetNamespacePrefix_1 ( XMP_StringPtr namespaceURI,
+                                void *        namespacePrefix,
+                                SetClientStringProc SetClientString,
+                                WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_GetNamespaceURI_1 ( XMP_StringPtr namespacePrefix,
+                             void *        namespaceURI,
+                             SetClientStringProc SetClientString,
+                             WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_DeleteNamespace_1 ( XMP_StringPtr namespaceURI,
+                             WXMP_Result * wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_GetProperty_1 ( XMPMetaRef       xmpRef,
+                         XMP_StringPtr    schemaNS,
+                         XMP_StringPtr    propName,
+                         void *           propValue,
+                         XMP_OptionBits * options,
+                         SetClientStringProc SetClientString,
+                         WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_GetArrayItem_1 ( XMPMetaRef       xmpRef,
+                          XMP_StringPtr    schemaNS,
+                          XMP_StringPtr    arrayName,
+                          XMP_Index        itemIndex,
+                          void *           itemValue,
+                          XMP_OptionBits * options,
+                          SetClientStringProc SetClientString,
+                          WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_GetStructField_1 ( XMPMetaRef       xmpRef,
+                            XMP_StringPtr    schemaNS,
+                            XMP_StringPtr    structName,
+                            XMP_StringPtr    fieldNS,
+                            XMP_StringPtr    fieldName,
+                            void *           fieldValue,
+                            XMP_OptionBits * options,
+                            SetClientStringProc SetClientString,
+                            WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_GetQualifier_1 ( XMPMetaRef       xmpRef,
+                          XMP_StringPtr    schemaNS,
+                          XMP_StringPtr    propName,
+                          XMP_StringPtr    qualNS,
+                          XMP_StringPtr    qualName,
+                          void *           qualValue,
+                          XMP_OptionBits * options,
+                          SetClientStringProc SetClientString,
+                          WXMP_Result *    wResult ) /* const */ ;
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_SetProperty_1 ( XMPMetaRef     xmpRef,
+                         XMP_StringPtr  schemaNS,
+                         XMP_StringPtr  propName,
+                         XMP_StringPtr  propValue,
+                         XMP_OptionBits options,
+                         WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetArrayItem_1 ( XMPMetaRef     xmpRef,
+                          XMP_StringPtr  schemaNS,
+                          XMP_StringPtr  arrayName,
+                          XMP_Index      itemIndex,
+                          XMP_StringPtr  itemValue,
+                          XMP_OptionBits options,
+                          WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_AppendArrayItem_1 ( XMPMetaRef     xmpRef,
+                             XMP_StringPtr  schemaNS,
+                             XMP_StringPtr  arrayName,
+                             XMP_OptionBits arrayOptions,
+                             XMP_StringPtr  itemValue,
+                             XMP_OptionBits options,
+                             WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetStructField_1 ( XMPMetaRef     xmpRef,
+                            XMP_StringPtr  schemaNS,
+                            XMP_StringPtr  structName,
+                            XMP_StringPtr  fieldNS,
+                            XMP_StringPtr  fieldName,
+                            XMP_StringPtr  fieldValue,
+                            XMP_OptionBits options,
+                            WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetQualifier_1 ( XMPMetaRef     xmpRef,
+                          XMP_StringPtr  schemaNS,
+                          XMP_StringPtr  propName,
+                          XMP_StringPtr  qualNS,
+                          XMP_StringPtr  qualName,
+                          XMP_StringPtr  qualValue,
+                          XMP_OptionBits options,
+                          WXMP_Result *  wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_DeleteProperty_1 ( XMPMetaRef    xmpRef,
+                            XMP_StringPtr schemaNS,
+                            XMP_StringPtr propName,
+                            WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_DeleteArrayItem_1 ( XMPMetaRef    xmpRef,
+                             XMP_StringPtr schemaNS,
+                             XMP_StringPtr arrayName,
+                             XMP_Index     itemIndex,
+                             WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_DeleteStructField_1 ( XMPMetaRef    xmpRef,
+                               XMP_StringPtr schemaNS,
+                               XMP_StringPtr structName,
+                               XMP_StringPtr fieldNS,
+                               XMP_StringPtr fieldName,
+                               WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_DeleteQualifier_1 ( XMPMetaRef    xmpRef,
+                             XMP_StringPtr schemaNS,
+                             XMP_StringPtr propName,
+                             XMP_StringPtr qualNS,
+                             XMP_StringPtr qualName,
+                             WXMP_Result * wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_DoesPropertyExist_1 ( XMPMetaRef    xmpRef,
+                               XMP_StringPtr schemaNS,
+                               XMP_StringPtr propName,
+                               WXMP_Result * wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_DoesArrayItemExist_1 ( XMPMetaRef    xmpRef,
+                                XMP_StringPtr schemaNS,
+                                XMP_StringPtr arrayName,
+                                XMP_Index     itemIndex,
+                                WXMP_Result * wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_DoesStructFieldExist_1 ( XMPMetaRef    xmpRef,
+                                  XMP_StringPtr schemaNS,
+                                  XMP_StringPtr structName,
+                                  XMP_StringPtr fieldNS,
+                                  XMP_StringPtr fieldName,
+                                  WXMP_Result * wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_DoesQualifierExist_1 ( XMPMetaRef    xmpRef,
+                                XMP_StringPtr schemaNS,
+                                XMP_StringPtr propName,
+                                XMP_StringPtr qualNS,
+                                XMP_StringPtr qualName,
+                                WXMP_Result * wResult ) /* const */ ;
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_GetLocalizedText_1 ( XMPMetaRef       xmpRef,
+                              XMP_StringPtr    schemaNS,
+                              XMP_StringPtr    altTextName,
+                              XMP_StringPtr    genericLang,
+                              XMP_StringPtr    specificLang,
+                              void *           clientLang,
+                              void *           clientValue,
+                              XMP_OptionBits * options,
+                              SetClientStringProc SetClientString,
+                              WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_SetLocalizedText_1 ( XMPMetaRef     xmpRef,
+                              XMP_StringPtr  schemaNS,
+                              XMP_StringPtr  altTextName,
+                              XMP_StringPtr  genericLang,
+                              XMP_StringPtr  specificLang,
+                              XMP_StringPtr  itemValue,
+                              XMP_OptionBits options,
+                              WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_DeleteLocalizedText_1 ( XMPMetaRef       xmpRef,
+                              XMP_StringPtr    schemaNS,
+                              XMP_StringPtr    altTextName,
+                              XMP_StringPtr    genericLang,
+                              XMP_StringPtr    specificLang,
+                              WXMP_Result *    wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_GetProperty_Bool_1 ( XMPMetaRef       xmpRef,
+                              XMP_StringPtr    schemaNS,
+                              XMP_StringPtr    propName,
+                              XMP_Bool *       propValue,
+                              XMP_OptionBits * options,
+                              WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_GetProperty_Int_1 ( XMPMetaRef       xmpRef,
+                             XMP_StringPtr    schemaNS,
+                             XMP_StringPtr    propName,
+                             XMP_Int32 *      propValue,
+                             XMP_OptionBits * options,
+                             WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_GetProperty_Int64_1 ( XMPMetaRef       xmpRef,
+                               XMP_StringPtr    schemaNS,
+                               XMP_StringPtr    propName,
+                               XMP_Int64 *      propValue,
+                               XMP_OptionBits * options,
+                               WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_GetProperty_Float_1 ( XMPMetaRef       xmpRef,
+                               XMP_StringPtr    schemaNS,
+                               XMP_StringPtr    propName,
+                               double *         propValue,
+                               XMP_OptionBits * options,
+                               WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_GetProperty_Date_1 ( XMPMetaRef       xmpRef,
+                              XMP_StringPtr    schemaNS,
+                              XMP_StringPtr    propName,
+                              XMP_DateTime *   propValue,
+                              XMP_OptionBits * options,
+                              WXMP_Result *    wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_SetProperty_Bool_1 ( XMPMetaRef     xmpRef,
+                              XMP_StringPtr  schemaNS,
+                              XMP_StringPtr  propName,
+                              XMP_Bool       propValue,
+                              XMP_OptionBits options,
+                              WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetProperty_Int_1 ( XMPMetaRef     xmpRef,
+                             XMP_StringPtr  schemaNS,
+                             XMP_StringPtr  propName,
+                             XMP_Int32      propValue,
+                             XMP_OptionBits options,
+                             WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetProperty_Int64_1 ( XMPMetaRef     xmpRef,
+                               XMP_StringPtr  schemaNS,
+                               XMP_StringPtr  propName,
+                               XMP_Int64      propValue,
+                               XMP_OptionBits options,
+                               WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetProperty_Float_1 ( XMPMetaRef     xmpRef,
+                               XMP_StringPtr  schemaNS,
+                               XMP_StringPtr  propName,
+                               double         propValue,
+                               XMP_OptionBits options,
+                               WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetProperty_Date_1 ( XMPMetaRef           xmpRef,
+                              XMP_StringPtr        schemaNS,
+                              XMP_StringPtr        propName,
+                              const XMP_DateTime & propValue,
+                              XMP_OptionBits       options,
+                              WXMP_Result *        wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_GetObjectName_1 ( XMPMetaRef    xmpRef,
+                           void *        objName,
+                           SetClientStringProc SetClientString,
+                           WXMP_Result * wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_SetObjectName_1 ( XMPMetaRef    xmpRef,
+                           XMP_StringPtr name,
+                           WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_GetObjectOptions_1 ( XMPMetaRef    xmpRef,
+                              WXMP_Result * wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_SetObjectOptions_1 ( XMPMetaRef     xmpRef,
+                              XMP_OptionBits options,
+                              WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_Sort_1 ( XMPMetaRef    xmpRef,
+                  WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_Erase_1 ( XMPMetaRef    xmpRef,
+                   WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_Clone_1 ( XMPMetaRef     xmpRef,
+                   XMP_OptionBits options,
+                   WXMP_Result *  wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_CountArrayItems_1 ( XMPMetaRef    xmpRef,
+                             XMP_StringPtr schemaNS,
+                             XMP_StringPtr arrayName,
+                             WXMP_Result * wResult ) /* const */ ;
+
+extern void
+XMP_PUBLIC WXMPMeta_DumpObject_1 ( XMPMetaRef         xmpRef,
+                        XMP_TextOutputProc outProc,
+                        void *             refCon,
+                        WXMP_Result *      wResult ) /* const */ ;
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_ParseFromBuffer_1 ( XMPMetaRef     xmpRef,
+                             XMP_StringPtr  buffer,
+                             XMP_StringLen  bufferSize,
+                             XMP_OptionBits options,
+                             WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SerializeToBuffer_1 ( XMPMetaRef     xmpRef,
+                               void *         pktString,
+                               XMP_OptionBits options,
+                               XMP_StringLen  padding,
+                               XMP_StringPtr  newline,
+                               XMP_StringPtr  indent,
+                               XMP_Index      baseIndent,
+                               SetClientStringProc SetClientString,
+                               WXMP_Result *  wResult ) /* const */ ;
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPMeta_SetDefaultErrorCallback_1 ( XMPMeta_ErrorCallbackWrapper wrapperProc,
+									 XMPMeta_ErrorCallbackProc    clientProc,
+									 void *        context,
+									 XMP_Uns32     limit,
+                   					 WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_SetErrorCallback_1 ( XMPMetaRef    xmpRef,
+                              XMPMeta_ErrorCallbackWrapper wrapperProc,
+							  XMPMeta_ErrorCallbackProc    clientProc,
+							  void *        context,
+							  XMP_Uns32     limit,
+							  WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPMeta_ResetErrorCallbackLimit_1 ( XMPMetaRef    xmpRef,
+							  		 XMP_Uns32     limit,
+							  		 WXMP_Result * wResult );
+
+// =================================================================================================
+
+#if __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  // __WXMPMeta_hpp__
diff --git a/public/include/client-glue/WXMPUtils.hpp b/public/include/client-glue/WXMPUtils.hpp
new file mode 100644
index 0000000..3c96b83
--- /dev/null
+++ b/public/include/client-glue/WXMPUtils.hpp
@@ -0,0 +1,315 @@
+#if ! __WXMPUtils_hpp__
+#define __WXMPUtils_hpp__ 1
+
+// =================================================================================================
+// Copyright 2002 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 "client-glue/WXMP_Common.hpp"
+
+#if __cplusplus
+extern "C" {
+#endif
+
+// =================================================================================================
+
+#define zXMPUtils_ComposeArrayItemPath_1(schemaNS,arrayName,itemIndex,itemPath,SetClientString) \
+    WXMPUtils_ComposeArrayItemPath_1 ( schemaNS, arrayName, itemIndex, itemPath, SetClientString, &wResult );
+
+#define zXMPUtils_ComposeStructFieldPath_1(schemaNS,structName,fieldNS,fieldName,fieldPath,SetClientString) \
+    WXMPUtils_ComposeStructFieldPath_1 ( schemaNS, structName, fieldNS, fieldName, fieldPath, SetClientString, &wResult );
+
+#define zXMPUtils_ComposeQualifierPath_1(schemaNS,propName,qualNS,qualName,qualPath,SetClientString) \
+    WXMPUtils_ComposeQualifierPath_1 ( schemaNS, propName, qualNS, qualName, qualPath, SetClientString, &wResult );
+
+#define zXMPUtils_ComposeLangSelector_1(schemaNS,arrayName,langName,selPath,SetClientString) \
+    WXMPUtils_ComposeLangSelector_1 ( schemaNS, arrayName, langName, selPath, SetClientString, &wResult );
+
+#define zXMPUtils_ComposeFieldSelector_1(schemaNS,arrayName,fieldNS,fieldName,fieldValue,selPath,SetClientString) \
+    WXMPUtils_ComposeFieldSelector_1 ( schemaNS, arrayName, fieldNS, fieldName, fieldValue, selPath, SetClientString, &wResult );
+
+#define zXMPUtils_ConvertFromBool_1(binValue,strValue,SetClientString) \
+    WXMPUtils_ConvertFromBool_1 ( binValue, strValue, SetClientString, &wResult );
+
+#define zXMPUtils_ConvertFromInt_1(binValue,format,strValue,SetClientString) \
+    WXMPUtils_ConvertFromInt_1 ( binValue, format, strValue, SetClientString, &wResult );
+
+#define zXMPUtils_ConvertFromInt64_1(binValue,format,strValue,SetClientString) \
+    WXMPUtils_ConvertFromInt64_1 ( binValue, format, strValue, SetClientString, &wResult );
+
+#define zXMPUtils_ConvertFromFloat_1(binValue,format,strValue,SetClientString) \
+    WXMPUtils_ConvertFromFloat_1 ( binValue, format, strValue, SetClientString, &wResult );
+
+#define zXMPUtils_ConvertFromDate_1(binValue,strValue,SetClientString) \
+    WXMPUtils_ConvertFromDate_1 ( binValue, strValue, SetClientString, &wResult );
+
+#define zXMPUtils_ConvertToBool_1(strValue) \
+    WXMPUtils_ConvertToBool_1 ( strValue, &wResult );
+
+#define zXMPUtils_ConvertToInt_1(strValue) \
+    WXMPUtils_ConvertToInt_1 ( strValue, &wResult );
+
+#define zXMPUtils_ConvertToInt64_1(strValue) \
+    WXMPUtils_ConvertToInt64_1 ( strValue, &wResult );
+
+#define zXMPUtils_ConvertToFloat_1(strValue) \
+    WXMPUtils_ConvertToFloat_1 ( strValue, &wResult );
+
+#define zXMPUtils_ConvertToDate_1(strValue,binValue) \
+    WXMPUtils_ConvertToDate_1 ( strValue, binValue, &wResult );
+
+#define zXMPUtils_CurrentDateTime_1(time) \
+    WXMPUtils_CurrentDateTime_1 ( time, &wResult );
+
+#define zXMPUtils_SetTimeZone_1(time) \
+    WXMPUtils_SetTimeZone_1 ( time, &wResult );
+
+#define zXMPUtils_ConvertToUTCTime_1(time) \
+    WXMPUtils_ConvertToUTCTime_1 ( time, &wResult );
+
+#define zXMPUtils_ConvertToLocalTime_1(time) \
+    WXMPUtils_ConvertToLocalTime_1 ( time, &wResult );
+
+#define zXMPUtils_CompareDateTime_1(left,right) \
+    WXMPUtils_CompareDateTime_1 ( left, right, &wResult );
+
+#define zXMPUtils_EncodeToBase64_1(rawStr,rawLen,encodedStr,SetClientString) \
+    WXMPUtils_EncodeToBase64_1 ( rawStr, rawLen, encodedStr, SetClientString, &wResult );
+
+#define zXMPUtils_DecodeFromBase64_1(encodedStr,encodedLen,rawStr,SetClientString) \
+    WXMPUtils_DecodeFromBase64_1 ( encodedStr, encodedLen, rawStr, SetClientString, &wResult );
+
+#define zXMPUtils_PackageForJPEG_1(xmpObj,stdStr,extStr,digestStr,SetClientString) \
+    WXMPUtils_PackageForJPEG_1 ( xmpObj, stdStr, extStr, digestStr, SetClientString, &wResult );
+
+#define zXMPUtils_MergeFromJPEG_1(fullXMP,extendedXMP) \
+    WXMPUtils_MergeFromJPEG_1 ( fullXMP, extendedXMP, &wResult );
+
+#define zXMPUtils_CatenateArrayItems_1(xmpObj,schemaNS,arrayName,separator,quotes,options,catedStr,SetClientString) \
+    WXMPUtils_CatenateArrayItems_1 ( xmpObj, schemaNS, arrayName, separator, quotes, options, catedStr, SetClientString, &wResult );
+
+#define zXMPUtils_SeparateArrayItems_1(xmpObj,schemaNS,arrayName,options,catedStr) \
+    WXMPUtils_SeparateArrayItems_1 ( xmpObj, schemaNS, arrayName, options, catedStr, &wResult );
+
+#define zXMPUtils_ApplyTemplate_1(workingXMP,templateXMP,actions) \
+    WXMPUtils_ApplyTemplate_1 ( workingXMP, templateXMP, actions, &wResult );
+
+#define zXMPUtils_RemoveProperties_1(xmpObj,schemaNS,propName,options) \
+    WXMPUtils_RemoveProperties_1 ( xmpObj, schemaNS, propName, options, &wResult );
+
+#define zXMPUtils_DuplicateSubtree_1(source,dest,sourceNS,sourceRoot,destNS,destRoot,options) \
+    WXMPUtils_DuplicateSubtree_1 ( source, dest, sourceNS, sourceRoot, destNS, destRoot, options, &wResult );
+
+// =================================================================================================
+
+extern void
+XMP_PUBLIC WXMPUtils_ComposeArrayItemPath_1 ( XMP_StringPtr   schemaNS,
+                                   XMP_StringPtr   arrayName,
+                                   XMP_Index       itemIndex,
+                                   void *          itemPath,
+                                   SetClientStringProc SetClientString,
+                                   WXMP_Result *   wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ComposeStructFieldPath_1 ( XMP_StringPtr   schemaNS,
+                                     XMP_StringPtr   structName,
+                                     XMP_StringPtr   fieldNS,
+                                     XMP_StringPtr   fieldName,
+                                     void *          fieldPath,
+                                     SetClientStringProc SetClientString,
+                                     WXMP_Result *   wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ComposeQualifierPath_1 ( XMP_StringPtr   schemaNS,
+                                   XMP_StringPtr   propName,
+                                   XMP_StringPtr   qualNS,
+                                   XMP_StringPtr   qualName,
+                                   void *          qualPath,
+                                   SetClientStringProc SetClientString,
+                                   WXMP_Result *   wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ComposeLangSelector_1 ( XMP_StringPtr   schemaNS,
+                                  XMP_StringPtr   arrayName,
+                                  XMP_StringPtr   langName,
+                                  void *          selPath,
+                                  SetClientStringProc SetClientString,
+                                  WXMP_Result *   wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ComposeFieldSelector_1 ( XMP_StringPtr   schemaNS,
+                                   XMP_StringPtr   arrayName,
+                                   XMP_StringPtr   fieldNS,
+                                   XMP_StringPtr   fieldName,
+                                   XMP_StringPtr   fieldValue,
+                                   void *          selPath,
+                                   SetClientStringProc SetClientString,
+                                   WXMP_Result *   wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertFromBool_1 ( XMP_Bool      binValue,
+                              void *        strValue,
+                              SetClientStringProc SetClientString,
+                              WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertFromInt_1 ( XMP_Int32     binValue,
+                             XMP_StringPtr format,
+                             void *        strValue,
+                             SetClientStringProc SetClientString,
+                             WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertFromInt64_1 ( XMP_Int64     binValue,
+                               XMP_StringPtr format,
+                               void *        strValue,
+                               SetClientStringProc SetClientString,
+                               WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertFromFloat_1 ( double        binValue,
+                               XMP_StringPtr format,
+                               void *        strValue,
+                               SetClientStringProc SetClientString,
+                               WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertFromDate_1 ( const XMP_DateTime & binValue,
+                              void *               strValue,
+                              SetClientStringProc SetClientString,
+                              WXMP_Result *        wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertToBool_1 ( XMP_StringPtr strValue,
+                            WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertToInt_1 ( XMP_StringPtr strValue,
+                           WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertToInt64_1 ( XMP_StringPtr strValue,
+                             WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertToFloat_1 ( XMP_StringPtr strValue,
+                             WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertToDate_1 ( XMP_StringPtr  strValue,
+                            XMP_DateTime * binValue,
+                            WXMP_Result *  wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPUtils_CurrentDateTime_1 ( XMP_DateTime * time,
+                              WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_SetTimeZone_1 ( XMP_DateTime * time,
+                          WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertToUTCTime_1 ( XMP_DateTime * time,
+                               WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ConvertToLocalTime_1 ( XMP_DateTime * time,
+                                 WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_CompareDateTime_1 ( const XMP_DateTime & left,
+                              const XMP_DateTime & right,
+                              WXMP_Result *        wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPUtils_EncodeToBase64_1 ( XMP_StringPtr rawStr,
+                             XMP_StringLen rawLen,
+                             void *        encodedStr,
+                             SetClientStringProc SetClientString,
+                             WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_DecodeFromBase64_1 ( XMP_StringPtr encodedStr,
+                               XMP_StringLen encodedLen,
+                               void *        rawStr,
+                               SetClientStringProc SetClientString,
+                               WXMP_Result * wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPUtils_PackageForJPEG_1 ( XMPMetaRef    xmpObj,
+                             void *        stdStr,
+                             void *        extStr,
+                             void *        digestStr,
+                             SetClientStringProc SetClientString,
+                             WXMP_Result * wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_MergeFromJPEG_1 ( XMPMetaRef    fullXMP,
+                            XMPMetaRef    extendedXMP,
+                            WXMP_Result * wResult );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void
+XMP_PUBLIC WXMPUtils_CatenateArrayItems_1 ( XMPMetaRef     xmpObj,
+                                 XMP_StringPtr  schemaNS,
+                                 XMP_StringPtr  arrayName,
+                                 XMP_StringPtr  separator,
+                                 XMP_StringPtr  quotes,
+                                 XMP_OptionBits options,
+                                 void *         catedStr,
+                                 SetClientStringProc SetClientString,
+                                 WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_SeparateArrayItems_1 ( XMPMetaRef     xmpObj,
+                                 XMP_StringPtr  schemaNS,
+                                 XMP_StringPtr  arrayName,
+                                 XMP_OptionBits options,
+                                 XMP_StringPtr  catedStr,
+                                 WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_ApplyTemplate_1 ( XMPMetaRef     workingXMP,
+							XMPMetaRef     templateXMP,
+							XMP_OptionBits options,
+							WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_RemoveProperties_1 ( XMPMetaRef     xmpObj,
+                               XMP_StringPtr  schemaNS,
+                               XMP_StringPtr  propName,
+                               XMP_OptionBits options,
+                               WXMP_Result *  wResult );
+
+extern void
+XMP_PUBLIC WXMPUtils_DuplicateSubtree_1 ( XMPMetaRef     source,
+                               XMPMetaRef     dest,
+                               XMP_StringPtr  sourceNS,
+                               XMP_StringPtr  sourceRoot,
+                               XMP_StringPtr  destNS,
+                               XMP_StringPtr  destRoot,
+                               XMP_OptionBits options,
+                               WXMP_Result *  wResult );
+
+// =================================================================================================
+
+#if __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  // __WXMPUtils_hpp__
diff --git a/public/include/client-glue/WXMP_Common.hpp b/public/include/client-glue/WXMP_Common.hpp
new file mode 100644
index 0000000..0aef5ba
--- /dev/null
+++ b/public/include/client-glue/WXMP_Common.hpp
@@ -0,0 +1,157 @@
+#if ! __WXMP_Common_hpp__
+#define __WXMP_Common_hpp__ 1
+
+// =================================================================================================
+// Copyright 2002 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 <stdlib.h>
+#include <string.h>
+
+#ifndef XMP_Inline
+	#if TXMP_EXPAND_INLINE
+		#define XMP_Inline inline
+	#else
+		#define XMP_Inline /* not inline */
+	#endif
+#endif
+
+#define XMP_CTorDTorIntro(Class) template <class tStringObj> XMP_Inline Class<tStringObj>
+#define XMP_MethodIntro(Class,ResultType) template <class tStringObj> XMP_Inline ResultType Class<tStringObj>
+
+typedef void (* SetClientStringProc) ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen );
+typedef void (* SetClientStringVectorProc) ( void * clientPtr, XMP_StringPtr * arrayPtr, XMP_Uns32 stringCount );
+
+struct WXMP_Result {
+private:
+    char*         errMessage;
+public:
+    void *        ptrResult;
+    double        floatResult;
+    XMP_Uns64     int64Result;
+    XMP_Uns32     int32Result;
+	WXMP_Result() : errMessage(NULL),ptrResult(NULL),floatResult(0),int64Result(0),int32Result(0){};
+	~WXMP_Result()
+	{
+		if (errMessage) {
+			free(errMessage);
+		}
+	}
+	void SetErrMessage(const char* msg)
+		{
+			if (errMessage) {
+				free(errMessage);
+				errMessage = NULL;
+			}
+			if (msg) {
+				errMessage = strdup(msg);
+			}
+		}
+	const char* GetErrMessage() const
+		{
+			return errMessage;
+		}
+private:
+	// We should avoid automatic copy.
+	WXMP_Result(const WXMP_Result&);
+	WXMP_Result& operator=(const WXMP_Result&);
+};
+
+#if __cplusplus
+extern "C" {
+#endif
+
+#define PropagateException(res)	\
+	if ( res.GetErrMessage() != 0 ) throw XMP_Error ( res.int32Result, res.GetErrMessage() );
+
+#ifndef XMP_TraceClientCalls
+	#define XMP_TraceClientCalls		0
+	#define XMP_TraceClientCallsToFile	0
+#endif
+
+#if ! XMP_TraceClientCalls
+	#define InvokeCheck(WCallProto) \
+    	WXMP_Result wResult;        \
+		WCallProto;                 \
+		PropagateException ( wResult )
+#else
+	extern FILE * xmpClientLog;
+	#define InvokeCheck(WCallProto)                                                                          \
+    	WXMP_Result wResult;                                                                                 \
+    	fprintf ( xmpClientLog, "WXMP calling: %s\n", #WCallProto ); fflush ( xmpClientLog );                \
+    	WCallProto;                                                                                          \
+	if ( wResult.GetErrMessage() == 0 ) {				\
+			fprintf ( xmpClientLog, "WXMP back, no error\n" ); fflush ( xmpClientLog );                      \
+    	} else {                                                                                             \
+			fprintf ( xmpClientLog, "WXMP back, error: %s\n", wResult.GetErrMessage() ); fflush ( xmpClientLog ); \
+    	}                                                                                                    \
+		PropagateException ( wResult )
+#endif
+
+// =================================================================================================
+
+#define WrapNoCheckVoid(WCallProto) \
+	WCallProto;
+
+#define WrapCheckVoid(WCallProto) \
+    InvokeCheck(WCallProto);
+
+#define WrapCheckMetaRef(result,WCallProto) \
+    InvokeCheck(WCallProto);                \
+    XMPMetaRef result = XMPMetaRef(wResult.ptrResult)
+
+#define WrapCheckIterRef(result,WCallProto) \
+    InvokeCheck(WCallProto);                \
+    XMPIteratorRef result = XMPIteratorRef(wResult.ptrResult)
+
+#define WrapCheckDocOpsRef(result,WCallProto) \
+    InvokeCheck(WCallProto);                  \
+    XMPDocOpsRef result = XMPDocOpsRef(wResult.ptrResult)
+
+#define WrapCheckBool(result,WCallProto) \
+    InvokeCheck(WCallProto);             \
+    bool result = bool(wResult.int32Result)
+
+#define WrapCheckTriState(result,WCallProto) \
+    InvokeCheck(WCallProto);                 \
+    XMP_TriState result = XMP_TriState(wResult.int32Result)
+
+#define WrapCheckOptions(result,WCallProto) \
+    InvokeCheck(WCallProto);                \
+    XMP_OptionBits result = XMP_OptionBits(wResult.int32Result)
+
+#define WrapCheckStatus(result,WCallProto) \
+    InvokeCheck(WCallProto);               \
+    XMP_Status result = XMP_Status(wResult.int32Result)
+
+#define WrapCheckIndex(result,WCallProto) \
+    InvokeCheck(WCallProto);              \
+    XMP_Index result = XMP_Index(wResult.int32Result)
+
+#define WrapCheckInt32(result,WCallProto) \
+    InvokeCheck(WCallProto);              \
+    XMP_Int32 result = wResult.int32Result
+
+#define WrapCheckInt64(result,WCallProto) \
+    InvokeCheck(WCallProto);              \
+    XMP_Int64 result = wResult.int64Result
+
+#define WrapCheckFloat(result,WCallProto) \
+    InvokeCheck(WCallProto);              \
+    double result = wResult.floatResult
+
+#define WrapCheckFormat(result,WCallProto) \
+    InvokeCheck(WCallProto);               \
+    XMP_FileFormat result = wResult.int32Result
+
+// =================================================================================================
+
+#if __cplusplus
+}	// extern "C"
+#endif
+
+#endif  // __WXMP_Common_hpp__
diff --git a/samples/Makefile.am b/samples/Makefile.am
new file mode 100644
index 0000000..5f583f5
--- /dev/null
+++ b/samples/Makefile.am
@@ -0,0 +1,39 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+SUBDIRS = source
+DIST_SUBDIRS = source testfiles
diff --git a/samples/Makefile.in b/samples/Makefile.in
new file mode 100644
index 0000000..3ad9b7d
--- /dev/null
+++ b/samples/Makefile.in
@@ -0,0 +1,678 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = samples
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = source
+DIST_SUBDIRS = source testfiles
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign samples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign samples/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/samples/source/CustomSchema.cpp b/samples/source/CustomSchema.cpp
new file mode 100644
index 0000000..1cf0566
--- /dev/null
+++ b/samples/source/CustomSchema.cpp
@@ -0,0 +1,240 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+/**
+* 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+
+// Must be defined to instantiate template classes
+#define TXMP_STRING_TYPE std::string
+
+// Ensure XMP templates are instantiated
+#include "public/include/XMP.incl_cpp"
+
+// Provide access to the API
+#include "public/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
new file mode 100644
index 0000000..313665b
--- /dev/null
+++ b/samples/source/DumpMainXMP.cpp
@@ -0,0 +1,131 @@
+// =================================================================================================
+// Copyright 2002 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <ctime>
+
+#include <cstdlib>
+#include <stdexcept>
+#include <cerrno>
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4127 )	// conditional expression is constant
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+#define TXMP_STRING_TYPE	std::string
+#define XMP_INCLUDE_XMPFILES 1
+#include "public/include/XMP.hpp"
+#include "public/include/XMP.incl_cpp"
+
+using namespace std;
+
+static FILE * sLogFile = stdout;
+
+// =================================================================================================
+
+static void WriteMinorLabel ( FILE * log, const char * title )
+{
+
+	fprintf ( log, "\n// " );
+	for ( size_t i = 0; i < strlen(title); ++i ) fprintf ( log, "-" );
+	fprintf ( log, "--\n// %s :\n\n", title );
+	fflush ( log );
+
+}	// WriteMinorLabel
+
+// =================================================================================================
+
+static XMP_Status DumpCallback ( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen )
+{
+	XMP_Status	status	= 0; 
+	size_t		count;
+	FILE *		outFile	= static_cast < FILE * > ( refCon );
+	
+	count = fwrite ( outStr, 1, outLen, outFile );
+	if ( count != outLen ) status = errno;
+	return status;
+	
+}	// DumpCallback
+
+// =================================================================================================
+
+static void
+ProcessFile ( const char * fileName  )
+{
+	bool ok;
+	char buffer [1000];
+
+	SXMPMeta  xmpMeta;	
+	SXMPFiles xmpFile;
+	XMP_FileFormat format;
+	XMP_OptionBits openFlags, handlerFlags;
+	XMP_PacketInfo xmpPacket;
+	
+	sprintf ( buffer, "Dumping main XMP for %s", fileName );
+	WriteMinorLabel ( sLogFile, buffer );
+	
+	xmpFile.OpenFile ( fileName, kXMP_UnknownFile, kXMPFiles_OpenForRead );
+	ok = xmpFile.GetFileInfo ( 0, &openFlags, &format, &handlerFlags );
+	if ( ! ok ) return;
+
+	fprintf ( sLogFile, "File info : format = \"%.4s\", handler flags = %.8X\n", &format, handlerFlags );
+	fflush ( sLogFile );
+
+	ok = xmpFile.GetXMP ( &xmpMeta, 0, &xmpPacket );
+	if ( ! ok ) return;
+
+	XMP_Int32 offset = (XMP_Int32)xmpPacket.offset;
+	XMP_Int32 length = xmpPacket.length;
+	fprintf ( sLogFile, "Packet info : offset = %d, length = %d\n", offset, length );
+	fflush ( sLogFile );
+
+	fprintf ( sLogFile, "\nInitial XMP from %s\n", fileName );
+	xmpMeta.DumpObject ( DumpCallback, sLogFile );
+	
+	xmpFile.CloseFile();
+
+}	// ProcessFile
+
+// =================================================================================================
+
+int
+main ( int argc, const char * argv [] )
+{
+
+	if ( ! SXMPMeta::Initialize() ) {
+		printf ( "## SXMPMeta::Initialize failed!\n" );
+		return -1;
+	}	
+	
+	XMP_OptionBits options = 0;
+	#if UNIX_ENV
+		options |= kXMPFiles_ServerMode;
+	#endif
+		
+	if ( ! SXMPFiles::Initialize ( options ) ) {
+	
+		printf ( "## SXMPFiles::Initialize failed!\n" );
+		return -1;
+	}
+
+	for ( int i = 1; i < argc; ++i ) ProcessFile ( argv[i] );
+		
+	SXMPFiles::Terminate();
+	SXMPMeta::Terminate();
+	
+	return 0;
+}
diff --git a/samples/source/DumpScannedXMP.cpp b/samples/source/DumpScannedXMP.cpp
new file mode 100644
index 0000000..1acbc82
--- /dev/null
+++ b/samples/source/DumpScannedXMP.cpp
@@ -0,0 +1,163 @@
+// =================================================================================================
+// Copyright 2002 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <ctime>
+
+#include <cstdlib>
+#include <stdexcept>
+#include <cerrno>
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4127 )	// conditional expression is constant
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+#define TXMP_STRING_TYPE	std::string
+
+#include "public/include/XMP.hpp"
+#include "public/include/XMP.incl_cpp"
+
+#include "samples/source/common/XMPScanner.hpp"
+using namespace std;
+
+// =================================================================================================
+
+static XMP_Status DumpCallback ( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen )
+{
+	XMP_Status	status	= 0; 
+	size_t		count;
+	FILE *		outFile	= static_cast < FILE * > ( refCon );
+	
+	count = fwrite ( outStr, 1, outLen, outFile );
+	if ( count != outLen ) status = errno;
+	return status;
+	
+}	// DumpCallback
+
+// =================================================================================================
+
+static void
+ProcessPacket ( const char * fileName,
+				FILE *       inFile,
+			    size_t		 offset,
+			    size_t       length )
+{
+	std::string xmlString;
+	xmlString.append ( length, ' ' );
+	fseek ( inFile, offset, SEEK_SET );
+	fread ( (void*)xmlString.data(), 1, length, inFile );
+	
+	char title [1000];
+	
+	sprintf ( title, "// Dumping raw input for \"%s\" (%lu..%lu)", fileName, offset, (offset + length - 1) );
+	printf ( "// " );
+	for ( size_t i = 3; i < strlen(title); ++i ) printf ( "=" );
+	printf ( "\n\n%s\n\n%.*s\n\n", title, (int)length, xmlString.c_str() );
+	fflush ( stdout );
+	
+	SXMPMeta xmpObj;
+	try {
+		xmpObj.ParseFromBuffer ( xmlString.c_str(), length );
+	} catch ( ... ) {
+		printf ( "## Parse failed\n\n" );
+		return;
+	}
+	
+	xmpObj.DumpObject ( DumpCallback, stdout );
+	fflush ( stdout );
+	
+	string xmpString;
+	xmpObj.SerializeToBuffer ( &xmpString, kXMP_OmitPacketWrapper );
+	printf ( "\nPretty serialization, %lu bytes :\n\n%s\n", xmpString.size(), xmpString.c_str() );
+	fflush ( stdout );
+
+	xmpObj.SerializeToBuffer ( &xmpString, (kXMP_OmitPacketWrapper | kXMP_UseCompactFormat) );
+	printf ( "Compact serialization, %lu bytes :\n\n%s\n", xmpString.size(), xmpString.c_str() );
+	fflush ( stdout );
+
+}	// ProcessPacket
+
+// =================================================================================================
+
+static void
+ProcessFile ( const char * fileName  )
+{
+	FILE * inFile;
+	size_t fileLen, readCount;
+	size_t snipCount;
+	char buffer [64*1024];
+
+	// ---------------------------------------------------------------------
+	// Use the scanner to find all of the packets then process each of them.
+	
+	inFile = fopen ( fileName, "rb" );
+	if ( inFile == 0 ) {
+		printf ( "Can't open \"%s\"\n", fileName );
+		return;
+	}
+	
+	fseek ( inFile, 0, SEEK_END );
+	fileLen = ftell ( inFile );	// ! Only handles up to 2GB files.
+	fseek ( inFile, 0, SEEK_SET );
+
+	XMPScanner scanner ( fileLen );
+	
+	for ( size_t filePos = 0; true; filePos += readCount ) {
+		readCount = fread ( buffer, 1, sizeof(buffer), inFile );
+		if ( readCount == 0 ) break;
+		scanner.Scan ( buffer, filePos, readCount );
+	}
+	
+	snipCount = scanner.GetSnipCount();
+	
+	XMPScanner::SnipInfoVector snips (snipCount);
+	scanner.Report ( snips );
+
+	size_t packetCount = 0;
+	for ( size_t s = 0; s < snipCount; ++s ) {
+		if ( snips[s].fState == XMPScanner::eValidPacketSnip ) {
+			++packetCount;
+			ProcessPacket ( fileName, inFile, (size_t)snips[s].fOffset, (size_t)snips[s].fLength );
+		}
+	}
+	if ( packetCount == 0 ) printf ( "   No packets found\n" );
+
+}	// ProcessFile
+
+// =================================================================================================
+
+extern "C" int
+main ( int argc, const char * argv [] )
+{
+
+	if ( ! SXMPMeta::Initialize() ) {
+		printf ( "## SXMPMeta::Initialize failed!\n" );
+		return -1;
+	}	
+
+	if ( argc != 2 ) // 2 := command and 1 parameter
+	{
+		printf ("usage: DumpScannedXMP (filename)\n");
+		return 0;
+	}
+
+	for ( int i = 1; i < argc; ++i ) ProcessFile ( argv[i] );
+		
+	SXMPMeta::Terminate();
+	return 0;
+
+}
diff --git a/samples/source/Makefile.am b/samples/source/Makefile.am
new file mode 100644
index 0000000..5ebc13d
--- /dev/null
+++ b/samples/source/Makefile.am
@@ -0,0 +1,94 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+noinst_PROGRAMS = xmpcoverage xmpfilescoverage dumpxmp dumpmainxmp\
+	customschema \
+	modifyingxmp \
+	readingxmp \
+	xmpcommandtool \
+	$(NULL)
+
+AM_CXXFLAGS = -fexceptions -funsigned-char -fPIC \
+	-Wno-multichar -Wno-ctor-dtor-privacy
+AM_CPPFLAGS = -I$(top_srcdir)/public/include -I$(top_srcdir) \
+	-D@EXEMPI_PLATFORM_DEF@=1 -D_FILE_OFFSET_BITS=64
+
+XMPLIBS = $(top_builddir)/XMPCore/source/libXMPCore.la \
+	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
+	$(top_builddir)/source/libxmpcommon.la -lexpat -lz \
+	$(top_builddir)/third-party/zuid/interfaces/libmd5.la \
+	-ldl
+
+if UNIX_ENV
+XMPLIBS += -lrt
+endif
+
+noinst_LTLIBRARIES = libsamplescommon.la
+libsamplescommon_la_SOURCES = common/DumpFile.cpp common/DumpFile.h \
+	common/Log.cpp common/Log.h \
+	common/TagTree.cpp common/TagTree.h \
+	common/LargeFileAccess.hpp \
+	common/XMPScanner.hpp \
+	common/globals.h \
+	$(NULL)
+
+customschema_SOURCES = CustomSchema.cpp
+customschema_LDADD = $(XMPLIBS)
+
+modifyingxmp_SOURCES = ModifyingXMP.cpp
+modifyingxmp_LDADD = $(XMPLIBS)
+
+readingxmp_SOURCES = ReadingXMP.cpp
+readingxmp_LDADD = $(XMPLIBS)
+
+xmpcoverage_SOURCES = XMPCoreCoverage.cpp
+xmpcoverage_LDADD = $(XMPLIBS)
+
+xmpfilescoverage_SOURCES = XMPFilesCoverage.cpp
+xmpfilescoverage_LDADD = $(XMPLIBS)
+
+dumpxmp_SOURCES = DumpScannedXMP.cpp
+dumpxmp_LDADD = $(XMPLIBS)
+
+dumpmainxmp_SOURCES = DumpMainXMP.cpp
+dumpmainxmp_LDADD = $(XMPLIBS)
+
+xmpcommandtool_SOURCES = xmpcommand/Actions.cpp xmpcommand/Actions.h \
+	xmpcommand/PrintUsage.cpp xmpcommand/PrintUsage.h \
+	xmpcommand/XMPCommand.cpp \
+	$(NULL)
+xmpcommandtool_LDADD = $(XMPLIBS) libsamplescommon.la
diff --git a/samples/source/Makefile.in b/samples/source/Makefile.in
new file mode 100644
index 0000000..21e0b3b
--- /dev/null
+++ b/samples/source/Makefile.in
@@ -0,0 +1,838 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = xmpcoverage$(EXEEXT) xmpfilescoverage$(EXEEXT) \
+	dumpxmp$(EXEEXT) dumpmainxmp$(EXEEXT) customschema$(EXEEXT) \
+	modifyingxmp$(EXEEXT) readingxmp$(EXEEXT) \
+	xmpcommandtool$(EXEEXT)
+@UNIX_ENV_TRUE@am__append_1 = -lrt
+subdir = samples/source
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libsamplescommon_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libsamplescommon_la_OBJECTS = common/DumpFile.lo common/Log.lo \
+	common/TagTree.lo
+libsamplescommon_la_OBJECTS = $(am_libsamplescommon_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+PROGRAMS = $(noinst_PROGRAMS)
+am_customschema_OBJECTS = CustomSchema.$(OBJEXT)
+customschema_OBJECTS = $(am_customschema_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/XMPCore/source/libXMPCore.la \
+	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
+	$(top_builddir)/source/libxmpcommon.la \
+	$(top_builddir)/third-party/zuid/interfaces/libmd5.la \
+	$(am__DEPENDENCIES_1)
+customschema_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_dumpmainxmp_OBJECTS = DumpMainXMP.$(OBJEXT)
+dumpmainxmp_OBJECTS = $(am_dumpmainxmp_OBJECTS)
+dumpmainxmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_dumpxmp_OBJECTS = DumpScannedXMP.$(OBJEXT)
+dumpxmp_OBJECTS = $(am_dumpxmp_OBJECTS)
+dumpxmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_modifyingxmp_OBJECTS = ModifyingXMP.$(OBJEXT)
+modifyingxmp_OBJECTS = $(am_modifyingxmp_OBJECTS)
+modifyingxmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_readingxmp_OBJECTS = ReadingXMP.$(OBJEXT)
+readingxmp_OBJECTS = $(am_readingxmp_OBJECTS)
+readingxmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_xmpcommandtool_OBJECTS = xmpcommand/Actions.$(OBJEXT) \
+	xmpcommand/PrintUsage.$(OBJEXT) \
+	xmpcommand/XMPCommand.$(OBJEXT)
+xmpcommandtool_OBJECTS = $(am_xmpcommandtool_OBJECTS)
+xmpcommandtool_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	libsamplescommon.la
+am_xmpcoverage_OBJECTS = XMPCoreCoverage.$(OBJEXT)
+xmpcoverage_OBJECTS = $(am_xmpcoverage_OBJECTS)
+xmpcoverage_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_xmpfilescoverage_OBJECTS = XMPFilesCoverage.$(OBJEXT)
+xmpfilescoverage_OBJECTS = $(am_xmpfilescoverage_OBJECTS)
+xmpfilescoverage_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libsamplescommon_la_SOURCES) $(customschema_SOURCES) \
+	$(dumpmainxmp_SOURCES) $(dumpxmp_SOURCES) \
+	$(modifyingxmp_SOURCES) $(readingxmp_SOURCES) \
+	$(xmpcommandtool_SOURCES) $(xmpcoverage_SOURCES) \
+	$(xmpfilescoverage_SOURCES)
+DIST_SOURCES = $(libsamplescommon_la_SOURCES) $(customschema_SOURCES) \
+	$(dumpmainxmp_SOURCES) $(dumpxmp_SOURCES) \
+	$(modifyingxmp_SOURCES) $(readingxmp_SOURCES) \
+	$(xmpcommandtool_SOURCES) $(xmpcoverage_SOURCES) \
+	$(xmpfilescoverage_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CXXFLAGS = -fexceptions -funsigned-char -fPIC \
+	-Wno-multichar -Wno-ctor-dtor-privacy
+
+AM_CPPFLAGS = -I$(top_srcdir)/public/include -I$(top_srcdir) \
+	-D@EXEMPI_PLATFORM_DEF@=1 -D_FILE_OFFSET_BITS=64
+
+XMPLIBS = $(top_builddir)/XMPCore/source/libXMPCore.la \
+	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
+	$(top_builddir)/source/libxmpcommon.la -lexpat -lz \
+	$(top_builddir)/third-party/zuid/interfaces/libmd5.la -ldl \
+	$(am__append_1)
+noinst_LTLIBRARIES = libsamplescommon.la
+libsamplescommon_la_SOURCES = common/DumpFile.cpp common/DumpFile.h \
+	common/Log.cpp common/Log.h \
+	common/TagTree.cpp common/TagTree.h \
+	common/LargeFileAccess.hpp \
+	common/XMPScanner.hpp \
+	common/globals.h \
+	$(NULL)
+
+customschema_SOURCES = CustomSchema.cpp
+customschema_LDADD = $(XMPLIBS)
+modifyingxmp_SOURCES = ModifyingXMP.cpp
+modifyingxmp_LDADD = $(XMPLIBS)
+readingxmp_SOURCES = ReadingXMP.cpp
+readingxmp_LDADD = $(XMPLIBS)
+xmpcoverage_SOURCES = XMPCoreCoverage.cpp
+xmpcoverage_LDADD = $(XMPLIBS)
+xmpfilescoverage_SOURCES = XMPFilesCoverage.cpp
+xmpfilescoverage_LDADD = $(XMPLIBS)
+dumpxmp_SOURCES = DumpScannedXMP.cpp
+dumpxmp_LDADD = $(XMPLIBS)
+dumpmainxmp_SOURCES = DumpMainXMP.cpp
+dumpmainxmp_LDADD = $(XMPLIBS)
+xmpcommandtool_SOURCES = xmpcommand/Actions.cpp xmpcommand/Actions.h \
+	xmpcommand/PrintUsage.cpp xmpcommand/PrintUsage.h \
+	xmpcommand/XMPCommand.cpp \
+	$(NULL)
+
+xmpcommandtool_LDADD = $(XMPLIBS) libsamplescommon.la
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign samples/source/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign samples/source/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+common/$(am__dirstamp):
+	@$(MKDIR_P) common
+	@: > common/$(am__dirstamp)
+common/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) common/$(DEPDIR)
+	@: > common/$(DEPDIR)/$(am__dirstamp)
+common/DumpFile.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+common/Log.lo: common/$(am__dirstamp) common/$(DEPDIR)/$(am__dirstamp)
+common/TagTree.lo: common/$(am__dirstamp) \
+	common/$(DEPDIR)/$(am__dirstamp)
+
+libsamplescommon.la: $(libsamplescommon_la_OBJECTS) $(libsamplescommon_la_DEPENDENCIES) $(EXTRA_libsamplescommon_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libsamplescommon_la_OBJECTS) $(libsamplescommon_la_LIBADD) $(LIBS)
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+customschema$(EXEEXT): $(customschema_OBJECTS) $(customschema_DEPENDENCIES) $(EXTRA_customschema_DEPENDENCIES) 
+	@rm -f customschema$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(customschema_OBJECTS) $(customschema_LDADD) $(LIBS)
+
+dumpmainxmp$(EXEEXT): $(dumpmainxmp_OBJECTS) $(dumpmainxmp_DEPENDENCIES) $(EXTRA_dumpmainxmp_DEPENDENCIES) 
+	@rm -f dumpmainxmp$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dumpmainxmp_OBJECTS) $(dumpmainxmp_LDADD) $(LIBS)
+
+dumpxmp$(EXEEXT): $(dumpxmp_OBJECTS) $(dumpxmp_DEPENDENCIES) $(EXTRA_dumpxmp_DEPENDENCIES) 
+	@rm -f dumpxmp$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(dumpxmp_OBJECTS) $(dumpxmp_LDADD) $(LIBS)
+
+modifyingxmp$(EXEEXT): $(modifyingxmp_OBJECTS) $(modifyingxmp_DEPENDENCIES) $(EXTRA_modifyingxmp_DEPENDENCIES) 
+	@rm -f modifyingxmp$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(modifyingxmp_OBJECTS) $(modifyingxmp_LDADD) $(LIBS)
+
+readingxmp$(EXEEXT): $(readingxmp_OBJECTS) $(readingxmp_DEPENDENCIES) $(EXTRA_readingxmp_DEPENDENCIES) 
+	@rm -f readingxmp$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(readingxmp_OBJECTS) $(readingxmp_LDADD) $(LIBS)
+xmpcommand/$(am__dirstamp):
+	@$(MKDIR_P) xmpcommand
+	@: > xmpcommand/$(am__dirstamp)
+xmpcommand/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) xmpcommand/$(DEPDIR)
+	@: > xmpcommand/$(DEPDIR)/$(am__dirstamp)
+xmpcommand/Actions.$(OBJEXT): xmpcommand/$(am__dirstamp) \
+	xmpcommand/$(DEPDIR)/$(am__dirstamp)
+xmpcommand/PrintUsage.$(OBJEXT): xmpcommand/$(am__dirstamp) \
+	xmpcommand/$(DEPDIR)/$(am__dirstamp)
+xmpcommand/XMPCommand.$(OBJEXT): xmpcommand/$(am__dirstamp) \
+	xmpcommand/$(DEPDIR)/$(am__dirstamp)
+
+xmpcommandtool$(EXEEXT): $(xmpcommandtool_OBJECTS) $(xmpcommandtool_DEPENDENCIES) $(EXTRA_xmpcommandtool_DEPENDENCIES) 
+	@rm -f xmpcommandtool$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(xmpcommandtool_OBJECTS) $(xmpcommandtool_LDADD) $(LIBS)
+
+xmpcoverage$(EXEEXT): $(xmpcoverage_OBJECTS) $(xmpcoverage_DEPENDENCIES) $(EXTRA_xmpcoverage_DEPENDENCIES) 
+	@rm -f xmpcoverage$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(xmpcoverage_OBJECTS) $(xmpcoverage_LDADD) $(LIBS)
+
+xmpfilescoverage$(EXEEXT): $(xmpfilescoverage_OBJECTS) $(xmpfilescoverage_DEPENDENCIES) $(EXTRA_xmpfilescoverage_DEPENDENCIES) 
+	@rm -f xmpfilescoverage$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(xmpfilescoverage_OBJECTS) $(xmpfilescoverage_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f common/*.$(OBJEXT)
+	-rm -f common/*.lo
+	-rm -f xmpcommand/*.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CustomSchema.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DumpMainXMP.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DumpScannedXMP.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ModifyingXMP.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReadingXMP.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPCoreCoverage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPFilesCoverage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/DumpFile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/Log.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/TagTree.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xmpcommand/$(DEPDIR)/Actions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xmpcommand/$(DEPDIR)/PrintUsage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xmpcommand/$(DEPDIR)/XMPCommand.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf common/.libs common/_libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f common/$(DEPDIR)/$(am__dirstamp)
+	-rm -f common/$(am__dirstamp)
+	-rm -f xmpcommand/$(DEPDIR)/$(am__dirstamp)
+	-rm -f xmpcommand/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR) common/$(DEPDIR) xmpcommand/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR) common/$(DEPDIR) xmpcommand/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/samples/source/ModifyingXMP.cpp b/samples/source/ModifyingXMP.cpp
new file mode 100644
index 0000000..856bb80
--- /dev/null
+++ b/samples/source/ModifyingXMP.cpp
@@ -0,0 +1,306 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+/**
+* 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+
+// 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 "public/include/XMP.incl_cpp"
+
+// Provide access to the API
+#include "public/include/XMP.hpp"
+
+#include <iostream>
+#include <fstream>
+#include <string.h>
+
+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;
+	}
+	
+	XMP_OptionBits options = 0;
+	#if UNIX_ENV
+		options |= kXMPFiles_ServerMode;
+	#endif
+		
+	// Must initialize SXMPFiles before we use it
+	if(SXMPFiles::Initialize(options))
+	{
+		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::ApplyTemplate(&meta, rdfMeta, kXMPTemplate_AddNewProperties | kXMPTemplate_ReplaceExistingProperties | kXMPTemplate_IncludeInternalProperties);
+
+				// 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..bfcf56c
--- /dev/null
+++ b/samples/source/ReadingXMP.cpp
@@ -0,0 +1,210 @@
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+/**
+* 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+
+// 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 "public/include/XMP.incl_cpp"
+
+// Provide access to the API
+#include "public/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;
+	}
+	XMP_OptionBits options = 0;
+	#if UNIX_ENV
+		options |= kXMPFiles_ServerMode;
+	#endif
+	// Must initialize SXMPFiles before we use it
+	if ( ! SXMPFiles::Initialize ( options ) )
+	{
+		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
new file mode 100644
index 0000000..fd1e65a
--- /dev/null
+++ b/samples/source/XMPCoreCoverage.cpp
@@ -0,0 +1,1872 @@
+// =================================================================================================
+// Copyright 2002 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
+
+#include <cstdlib>
+#include <cerrno>
+#include <ctime>
+
+#define TXMP_STRING_TYPE	std::string
+
+#include "public/include/XMP.hpp"
+#include "public/include/XMP.incl_cpp"
+
+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
+
+// =================================================================================================
+
+static const char * kNS1 = "ns:test1/";
+static const char * kNS2 = "ns:test2/";
+
+static const char * kRDFCoverage =
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kRDFCoverage' xmlns:ns1='ns:test1/' xmlns:ns2='ns:test2/'>"
+	""
+	"    <ns1:SimpleProp1>Simple1 value</ns1:SimpleProp1>"
+	"    <ns1:SimpleProp2 xml:lang='x-default'>Simple2 value</ns1:SimpleProp2>"
+	""
+	"    <ns1:ArrayProp1>"
+	"      <rdf:Bag>"
+	"        <rdf:li>Item1.1 value</rdf:li>"
+	"        <rdf:li>Item1.2 value</rdf:li>"
+	"      </rdf:Bag>"
+	"    </ns1:ArrayProp1>"
+	""
+	"    <ns1:ArrayProp2>"
+	"      <rdf:Alt>"
+	"        <rdf:li xml:lang='x-one'>Item2.1 value</rdf:li>"
+	"        <rdf:li xml:lang='x-two'>Item2.2 value</rdf:li>"
+	"      </rdf:Alt>"
+	"    </ns1:ArrayProp2>"
+	""
+	"    <ns1:ArrayProp3>"
+	"      <rdf:Alt>"
+	"        <rdf:li xml:lang='x-one'>Item3.1 value</rdf:li>"
+	"        <rdf:li>Item3.2 value</rdf:li>"
+	"      </rdf:Alt>"
+	"    </ns1:ArrayProp3>"
+	""
+	"    <ns1:ArrayProp4>"
+	"      <rdf:Alt>"
+	"        <rdf:li>Item4.1 value</rdf:li>"
+	"        <rdf:li xml:lang='x-two'>Item4.2 value</rdf:li>"
+	"      </rdf:Alt>"
+	"    </ns1:ArrayProp4>"
+	""
+	"    <ns1:ArrayProp5>"
+	"      <rdf:Alt>"
+	"        <rdf:li xml:lang='x-xxx'>Item5.1 value</rdf:li>"
+	"        <rdf:li xml:lang='x-xxx'>Item5.2 value</rdf:li>"
+	"      </rdf:Alt>"
+	"    </ns1:ArrayProp5>"
+	""
+	"    <ns1:StructProp rdf:parseType='Resource'>"
+	"      <ns2:Field1>Field1 value</ns2:Field1>"
+	"      <ns2:Field2>Field2 value</ns2:Field2>"
+	"    </ns1:StructProp>"
+	""
+	"    <ns1:QualProp1 rdf:parseType='Resource'>"
+	"      <rdf:value>Prop value</rdf:value>"
+	"      <ns2:Qual>Qual value</ns2:Qual>"
+	"    </ns1:QualProp1>"
+	""
+	"    <ns1:QualProp2 rdf:parseType='Resource'>"
+	"      <rdf:value xml:lang='x-default'>Prop value</rdf:value>"
+	"      <ns2:Qual>Qual value</ns2:Qual>"
+	"    </ns1:QualProp2>"
+	""
+	"    <!-- NOTE: QualProp3 is not quite kosher. Normally a qualifier on a struct is attached to the -->"
+	"    <!-- struct node in the XMP tree, and the same for an array. See QualProp4 and QualProp5. But -->"
+	"    <!-- for the pseudo-struct of a qualified simple property there is no final struct node that  -->"
+	"    <!-- can own the qualifier. Instead the qualifier is attached to the value. The alternative   -->"
+	"    <!-- of attaching the qualifier to the value and all other qualifiers is not compelling. This -->"
+	"    <!-- issue only arises for xml:lang, it is the only qualifier that RDF has as an attribute.   -->"
+	""
+	"    <ns1:QualProp3 xml:lang='x-default' rdf:parseType='Resource'>"
+	"      <rdf:value>Prop value</rdf:value>"
+	"      <ns2:Qual>Qual value</ns2:Qual>"
+	"    </ns1:QualProp3>"
+	""
+	"    <ns1:QualProp4 xml:lang='x-default' rdf:parseType='Resource'>"
+	"      <ns2:Field1>Field1 value</ns2:Field1>"
+	"      <ns2:Field2>Field2 value</ns2:Field2>"
+	"    </ns1:QualProp4>"
+	""
+	"    <ns1:QualProp5 xml:lang='x-default'>"
+	"      <rdf:Bag>"
+	"        <rdf:li>Item1.1 value</rdf:li>"
+	"        <rdf:li>Item1.2 value</rdf:li>"
+	"      </rdf:Bag>"
+	"    </ns1:QualProp5>"
+	""
+	"    <ns2:NestedStructProp rdf:parseType='Resource'>"
+	"      <ns1:Outer rdf:parseType='Resource'>"
+	"        <ns1:Middle rdf:parseType='Resource'>"
+	"          <ns1:Inner rdf:parseType='Resource'>"
+	"            <ns1:Field1>Field1 value</ns1:Field1>"
+	"            <ns2:Field2>Field2 value</ns2:Field2>"
+	"          </ns1:Inner>"
+	"        </ns1:Middle>"
+	"      </ns1:Outer>"
+	"    </ns2:NestedStructProp>"
+	""
+	"  </rdf:Description>"
+	"</rdf:RDF>";
+
+static const char * kSimpleRDF =
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kSimpleRDF' xmlns:ns1='ns:test1/' xmlns:ns2='ns:test2/'>"
+	""
+	"    <ns1:SimpleProp>Simple value</ns1:SimpleProp>"
+	""
+	"    <ns1:ArrayProp>"
+	"      <rdf:Bag>"
+	"        <rdf:li>Item1 value</rdf:li>"
+	"        <rdf:li>Item2 value</rdf:li>"
+	"      </rdf:Bag>"
+	"    </ns1:ArrayProp>"
+	""
+	"    <ns1:StructProp rdf:parseType='Resource'>"
+	"      <ns2:Field1>Field1 value</ns2:Field1>"
+	"      <ns2:Field2>Field2 value</ns2:Field2>"
+	"    </ns1:StructProp>"
+	""
+	"    <ns1:QualProp rdf:parseType='Resource'>"
+	"      <rdf:value>Prop value</rdf:value>"
+	"      <ns2:Qual>Qual value</ns2:Qual>"
+	"    </ns1:QualProp>"
+	""
+	"    <ns1:AltTextProp>"
+	"      <rdf:Alt>"
+	"        <rdf:li xml:lang='x-one'>x-one value</rdf:li>"
+	"        <rdf:li xml:lang='x-two'>x-two value</rdf:li>"
+	"      </rdf:Alt>"
+	"    </ns1:AltTextProp>"
+	""
+	"    <ns1:ArrayOfStructProp>"
+	"      <rdf:Bag>"
+	"        <rdf:li rdf:parseType='Resource'>"
+	"          <ns2:Field1>Item-1</ns2:Field1>"
+	"          <ns2:Field2>Field 1.2 value</ns2:Field2>"
+	"        </rdf:li>"
+	"        <rdf:li rdf:parseType='Resource'>"
+	"          <ns2:Field1>Item-2</ns2:Field1>"
+	"          <ns2:Field2>Field 2.2 value</ns2:Field2>"
+	"        </rdf:li>"
+	"      </rdf:Bag>"
+	"    </ns1:ArrayOfStructProp>"
+	""
+	"  </rdf:Description>"
+	"</rdf:RDF>";
+
+static const char * kNamespaceRDF =
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kNamespaceRDF' xmlns:ns1='ns:test1/'>"
+	""
+	"    <ns1:NestedStructProp rdf:parseType='Resource'>"
+	"      <ns2:Outer rdf:parseType='Resource' xmlns:ns2='ns:test2/' xmlns:ns3='ns:test3/'>"
+	"        <ns3:Middle rdf:parseType='Resource' xmlns:ns4='ns:test4/'>"
+	"          <ns4:Inner rdf:parseType='Resource' xmlns:ns5='ns:test5/' xmlns:ns6='ns:test6/'>"
+	"            <ns5:Field1>Field1 value</ns5:Field1>"
+	"            <ns6:Field2>Field2 value</ns6:Field2>"
+	"          </ns4:Inner>"
+	"        </ns3:Middle>"
+	"      </ns2:Outer>"
+	"    </ns1:NestedStructProp>"
+	""
+	"  </rdf:Description>"
+	"</rdf:RDF>";
+
+static const char * kXMPMetaRDF =
+	"<x:Outermost xmlns:x='adobe:ns:meta/'>"
+	""
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kBogusLeadingRDF' xmlns:ns1='ns:test1/'>"
+	"    <ns1:BogusLeadingProp>bogus packet</ns1:BogusLeadingProp>"
+	"  </rdf:Description>"
+	"</rdf:RDF>"
+	""
+	"<x:xmpmeta>"
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kXMPMetaRDF' xmlns:ns1='ns:test1/'>"
+	"    <ns1:XMPMetaProp>xmpmeta packet</ns1:XMPMetaProp>"
+	"  </rdf:Description>"
+	"</rdf:RDF>"
+	"</x:xmpmeta>"
+	""
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kBogusTrailingRDF' xmlns:ns1='ns:test1/'>"
+	"    <ns1:BogusTrailingProp>bogus packet</ns1:BogusTrailingProp>"
+	"  </rdf:Description>"
+	"</rdf:RDF>"
+	""
+	"</x:Outermost>";
+
+static const char * kNewlineRDF =
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kNewlineRDF' xmlns:ns1='ns:test1/'>"
+	""
+	"    <ns1:HasCR>ASCII &#xD; CR</ns1:HasCR>"
+	"    <ns1:HasLF>ASCII &#xA; LF</ns1:HasLF>"
+	"    <ns1:HasCRLF>ASCII &#xD;&#xA; CRLF</ns1:HasCRLF>"
+	""
+	"  </rdf:Description>"
+	"</rdf:RDF>";
+
+static const char * kInconsistentRDF =
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kInconsistentRDF'"
+	"                   xmlns:pdf='http://ns.adobe.com/pdf/1.3/'"
+	"                   xmlns:xmp='http://ns.adobe.com/xap/1.0/'"
+	"                   xmlns:dc='http://purl.org/dc/elements/1.1/'>"
+	""
+	"    <pdf:Author>PDF Author</pdf:Author>"
+	"    <xmp:Author>XMP Author</xmp:Author>"
+	""
+	"    <xmp:Authors>"
+	"      <rdf:Seq>"
+	"        <rdf:li>XMP Authors [1]</rdf:li>"
+	"      </rdf:Seq>"
+	"    </xmp:Authors>"
+	""
+	"    <dc:creator>"
+	"      <rdf:Seq>"
+	"        <rdf:li>DC Creator [1]</rdf:li>"
+	"      </rdf:Seq>"
+	"    </dc:creator>"
+	""
+	"  </rdf:Description>"
+	"</rdf:RDF>";
+
+static const char * kDateTimeRDF =
+	"<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"
+	"  <rdf:Description rdf:about='Test:XMPCoreCoverage/kDateTimeRDF' xmlns:ns1='ns:test1/'>"
+	""
+	"    <ns1:Date1>2003</ns1:Date1>"
+	"    <ns1:Date2>2003-12</ns1:Date2>"
+	"    <ns1:Date3>2003-12-31</ns1:Date3>"
+	""
+	"    <ns1:Date4>2003-12-31T12:34Z</ns1:Date4>"
+	"    <ns1:Date5>2003-12-31T12:34:56Z</ns1:Date5>"
+	""
+	"    <ns1:Date6>2003-12-31T12:34:56.001Z</ns1:Date6>"
+	"    <ns1:Date7>2003-12-31T12:34:56.000000001Z</ns1:Date7>"
+	""
+	"    <ns1:Date8>2003-12-31T10:04:56-02:30</ns1:Date8>"
+	"    <ns1:Date9>2003-12-31T15:49:56+03:15</ns1:Date9>"
+	""
+	"  </rdf:Description>"
+	"</rdf:RDF>";
+
+// =================================================================================================
+
+#define FoundOrNot(b)	((b) ? "found" : "not found")
+#define YesOrNo(b)		((b) ? "yes" : "no")
+
+// -------------------------------------------------------------------------------------------------
+
+static void FillDateTime ( XMP_DateTime * dateTime, XMP_Int32 year, XMP_Int32 month, XMP_Int32 day,
+						   XMP_Int32 hour, XMP_Int32 minute, XMP_Int32 second,
+						   XMP_Bool hasDate, XMP_Bool hasTime, XMP_Bool hasTimeZone,
+						   XMP_Int8 tzSign, XMP_Int32 tzHour, XMP_Int32 tzMinute, XMP_Int32 nanoSecond )
+{
+
+	dateTime->year = year;
+	dateTime->month = month;
+	dateTime->day = day;
+	dateTime->hour = hour;
+	dateTime->minute = minute;
+	dateTime->second = second;
+	dateTime->hasDate = hasDate;
+	dateTime->hasTime = hasTime;
+	dateTime->hasTimeZone = hasTimeZone;
+	dateTime->tzSign = tzSign;
+	dateTime->tzHour = tzHour;
+	dateTime->tzMinute = tzMinute;
+	dateTime->nanoSecond = nanoSecond;
+
+}	// FillDateTime
+
+// -------------------------------------------------------------------------------------------------
+
+static void WriteMajorLabel ( FILE * log, const char * title )
+{
+
+	fprintf ( log, "\n" );
+	fprintf ( log, "// =============================================================================\n" );
+	fprintf ( log, "// %s.\n", title );
+	fprintf ( log, "// =============================================================================\n" );
+	fflush ( log );
+
+}	// WriteMajorLabel
+
+// -------------------------------------------------------------------------------------------------
+
+static void WriteMinorLabel ( FILE * log, const char * title )
+{
+
+	fprintf ( log, "\n// " );
+	for ( size_t i = 0; i < strlen(title); ++i ) fprintf ( log, "-" );
+	fprintf ( log, "--\n// %s :\n\n", title );
+	fflush ( log );
+
+}	// WriteMinorLabel
+
+// -------------------------------------------------------------------------------------------------
+
+static XMP_Status DumpToString ( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen )
+{
+	XMP_Status	status	= 0;
+	std::string * dumpString = (std::string*)refCon; 
+	
+	try {
+		dumpString->append ( outStr, outLen );
+	} catch ( ... ) {
+		status = -1;
+	}
+	return status;
+	
+}	// DumpToString
+
+// -------------------------------------------------------------------------------------------------
+
+static XMP_Status DumpToFile ( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen )
+{
+	XMP_Status	status	= 0; 
+	size_t		count;
+	FILE *		outFile	= static_cast < FILE * > ( refCon );
+	
+	count = fwrite ( outStr, 1, outLen, outFile );
+	if ( count != outLen ) status = errno;
+	fflush ( outFile );
+	return status;
+	
+}	// DumpToFile
+
+// -------------------------------------------------------------------------------------------------
+
+static void DumpXMPObj ( FILE * log, SXMPMeta & meta, const char * title )
+{
+
+	WriteMinorLabel ( log, title );
+	meta.DumpObject ( DumpToFile, log );
+
+}	// DumpXMPObj
+
+// -------------------------------------------------------------------------------------------------
+
+static void VerifyNewlines ( FILE * log, std::string xmp, const char * newline )
+{
+	for ( size_t i = 0; i < xmp.size(); ++i ) {
+		if ( (xmp[i] == '\x0A') || (xmp[i] == '\x0D') ) {
+			if ( strncmp ( &xmp[i], newline, strlen(newline) ) != 0 ) {
+				fprintf ( log, "** Wrong newline at offset %d\n", i );
+			}
+			if ( strlen(newline) == 2 ) ++i;
+		}
+	}
+}
+
+// =================================================================================================
+
+static void DoXMPCoreCoverage ( FILE * log )
+{
+
+	int				i;
+	bool			ok;
+	std::string 	tmpStr1, tmpStr2, tmpStr3, tmpStr4;
+	XMP_OptionBits	options;
+
+	#if 0
+	{	// Use this to be able to move the app window away from debugger windows.
+		string junk;
+		cout << "Move window, type anything to continue";
+		cin >> junk;
+	}
+	#endif
+
+	// --------------------------------------------------------------------------------------------
+
+	#if 0
+
+		WriteMajorLabel ( log, "Test global XMP toolkit options" );
+
+		fprintf ( log, "Initial global options 0x%X\n", SXMPMeta::GetGlobalOptions() );
+		SXMPMeta::SetGlobalOptions ( 0 );
+		fprintf ( log, "Final global options 0x%X\n", SXMPMeta::GetGlobalOptions() );
+
+	#endif
+
+	// --------------------------------------------------------------------------------------------
+
+	WriteMajorLabel ( log, "Dump predefined namespaces" );
+
+	SXMPMeta::DumpNamespaces ( DumpToFile, log );
+
+	// --------------------------------------------------------------------------------------------
+
+	{
+		WriteMajorLabel ( log, "Test simple constructors and parsing, setting the instance ID" );
+
+		SXMPMeta meta1;
+		DumpXMPObj ( log, meta1, "Empty XMP object" );
+		meta1.GetObjectName ( &tmpStr1 );
+		fprintf ( log, "\nEmpty object name = \"%s\"\n", tmpStr1.c_str() );
+		meta1.SetObjectName ( "New object name" );
+		DumpXMPObj ( log, meta1, "Set object name" );
+
+		SXMPMeta meta2 ( kRDFCoverage, strlen ( kRDFCoverage ) );
+		DumpXMPObj ( log, meta2, "Construct and parse from buffer" );
+		meta2.GetObjectName ( &tmpStr1 );
+		fprintf ( log, "\nRDFCoverage object name = \"%s\"\n", tmpStr1.c_str() );
+
+		meta2.SetProperty ( kXMP_NS_XMP_MM, "InstanceID", "meta2:Original" );
+		DumpXMPObj ( log, meta2, "Add instance ID" );
+
+		SXMPMeta meta4;
+		meta4 = meta2.Clone();
+		meta4.SetProperty ( kXMP_NS_XMP_MM, "InstanceID", "meta4:Clone" );
+		DumpXMPObj ( log, meta4, "Clone and add instance ID" );
+
+	#if 0
+
+		WriteMajorLabel ( log, "Test XMPMeta object options" );
+
+		fprintf ( log, "Initial object options 0x%X\n", meta2.GetObjectOptions() );
+		meta2.SetObjectOptions ( <TBD> );
+		fprintf ( log, "Final object options 0x%X\n", meta2.GetObjectOptions() );
+
+	#endif
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Static namespace functions
+	// --------------------------
+
+	WriteMajorLabel ( log, "Test static namespace functions" );
+	fprintf ( log, "\n" );
+
+	tmpStr1.erase();
+	ok = SXMPMeta::RegisterNamespace ( kNS2, "ns2", &tmpStr1 );
+	fprintf ( log, "RegisterNamespace ns2 : %s, %s\n", YesOrNo ( ok ), tmpStr1.c_str() );
+
+	tmpStr1.erase();
+	ok = SXMPMeta::RegisterNamespace ( kNS2, "nsx:", &tmpStr1 );
+	fprintf ( log, "RegisterNamespace nsx : %s, %s\n", YesOrNo ( ok ), tmpStr1.c_str() );
+
+	tmpStr1.erase();
+	ok = SXMPMeta::GetNamespacePrefix ( kNS1, &tmpStr1 );
+	fprintf ( log, "GetNamespacePrefix ns1 : %s, %s\n", FoundOrNot ( ok ), tmpStr1.c_str() );
+
+	tmpStr1.erase();
+	ok = SXMPMeta::GetNamespaceURI ( "ns1", &tmpStr1 );
+	fprintf ( log, "GetNamespaceURI ns1 : %s, %s\n", FoundOrNot ( ok ), tmpStr1.c_str() );
+
+	tmpStr1.erase();
+	ok = SXMPMeta::GetNamespacePrefix ( "bogus", &tmpStr1 );
+	fprintf ( log, "GetNamespacePrefix bogus : %s\n", FoundOrNot ( ok ) );
+
+	tmpStr1.erase();
+	ok = SXMPMeta::GetNamespaceURI ( "bogus", &tmpStr1 );
+	fprintf ( log, "GetNamespaceURI bogus : %s\n", FoundOrNot ( ok ) );
+
+	SXMPMeta::DumpNamespaces ( DumpToFile, log );
+
+	#if 0
+		SXMPMeta::DeleteNamespace ( kNS2 );
+		SXMPMeta::DumpNamespaces ( DumpToFile, log );
+		(void) SXMPMeta::RegisterNamespace ( kNS2, "ns2", 0 );
+	#endif
+
+	// --------------------------------------------------------------------------------------------
+	// Basic set/get methods
+	// ---------------------
+
+	{
+		SXMPMeta meta;
+
+		WriteMajorLabel ( log, "Test SetProperty and related methods" );
+
+		tmpStr1 = "Prop value";
+		meta.SetProperty ( kNS1, "Prop", tmpStr1 );
+		meta.SetProperty ( kNS1, "ns1:XMLProp", "<PropValue/>" );
+		meta.SetProperty ( kNS1, "ns1:URIProp", "URI:value/", kXMP_PropValueIsURI );
+
+		tmpStr1 = "BagItem value";
+		meta.AppendArrayItem ( kNS1, "Bag", kXMP_PropValueIsArray, tmpStr1 );
+		meta.AppendArrayItem ( kNS1, "ns1:Seq", kXMP_PropArrayIsOrdered, "SeqItem value" );
+		meta.AppendArrayItem ( kNS1, "ns1:Alt", kXMP_PropArrayIsAlternate, "AltItem value" );
+
+		tmpStr1 = "Field1 value";
+		meta.SetStructField ( kNS1, "Struct", kNS2, "Field1", tmpStr1 );
+		meta.SetStructField ( kNS1, "ns1:Struct", kNS2, "Field2", "Field2 value" );
+		meta.SetStructField ( kNS1, "ns1:Struct", kNS2, "Field3", "Field3 value" );
+
+		tmpStr1 = "BagItem 3";
+		meta.SetArrayItem ( kNS1, "Bag", 1, tmpStr1 );
+		meta.SetArrayItem ( kNS1, "ns1:Bag", 1, "BagItem 1", kXMP_InsertBeforeItem );
+		meta.SetArrayItem ( kNS1, "ns1:Bag", 1, "BagItem 2", kXMP_InsertAfterItem );
+		meta.AppendArrayItem ( kNS1, "Bag", 0, "BagItem 4" );
+
+		DumpXMPObj ( log, meta, "A few basic Set... calls" );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper );
+		fprintf ( log, "\n%s\n", tmpStr1.c_str() );
+
+		fprintf ( log, "CountArrayItems Bag = %d\n", meta.CountArrayItems ( kNS1, "Bag" ) );
+
+		meta.SetProperty ( kNS1, "QualProp1", "Prop value" );
+		meta.SetQualifier ( kNS1, "QualProp1", kNS2, "Qual1", "Qual1 value" );
+		// *** meta.SetProperty ( kNS1, "QualProp1/Qual2", "Qual2 value", kXMP_PropIsQualifier );	invalid
+		meta.SetProperty ( kNS1, "QualProp1/?ns2:Qual3", "Qual3 value" );
+		meta.SetProperty ( kNS1, "QualProp1/?xml:lang", "x-qual" );
+
+		meta.SetProperty ( kNS1, "QualProp2", "Prop value" );
+		meta.SetQualifier ( kNS1, "QualProp2", kXMP_NS_XML, "lang", "en-us" );
+		// *** meta.SetProperty ( kNS1, "QualProp2/xml:lang", "x-field", kXMP_PropIsQualifier );	invalid
+		meta.SetProperty ( kNS1, "QualProp2/@xml:lang", "x-attr" );
+
+		meta.SetProperty ( kNS1, "QualProp3", "Prop value" );
+		meta.SetQualifier ( kNS1, "ns1:QualProp3", kXMP_NS_XML, "xml:lang", "en-us" );
+		meta.SetQualifier ( kNS1, "ns1:QualProp3", kNS2, "ns2:Qual", "Qual value" );
+
+		meta.SetProperty ( kNS1, "QualProp4", "Prop value" );
+		tmpStr1 = "Qual value";
+		meta.SetQualifier ( kNS1, "QualProp4", kNS2, "Qual", tmpStr1 );
+		meta.SetQualifier ( kNS1, "QualProp4", kXMP_NS_XML, "lang", "en-us" );
+
+		DumpXMPObj ( log, meta, "Add some qualifiers" );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper );
+		fprintf ( log, "\n%s\n", tmpStr1.c_str() );
+		
+		meta.SetProperty ( kNS1, "QualProp1", "new value" );
+		meta.SetProperty ( kNS1, "QualProp2", "new value" );
+		meta.SetProperty ( kNS1, "QualProp3", "new value" );
+		meta.SetProperty ( kNS1, "QualProp4", "new value" );
+		DumpXMPObj ( log, meta, "Change values and keep qualifiers" );
+
+		// ----------------------------------------------------------------------------------------
+
+		WriteMajorLabel ( log, "Test GetProperty and related methods" );
+
+		meta.DeleteProperty ( kNS1, "QualProp1" );	// ! Start with fresh qualifiers.
+		meta.DeleteProperty ( kNS1, "ns1:QualProp2" );
+		meta.DeleteProperty ( kNS1, "ns1:QualProp3" );
+		meta.DeleteProperty ( kNS1, "QualProp4" );
+
+		meta.SetProperty ( kNS1, "QualProp1", "Prop value" );
+		meta.SetQualifier ( kNS1, "QualProp1", kNS2, "Qual1", "Qual1 value" );
+
+		meta.SetProperty ( kNS1, "QualProp2", "Prop value" );
+		meta.SetQualifier ( kNS1, "QualProp2", kXMP_NS_XML, "lang", "en-us" );
+
+		meta.SetProperty ( kNS1, "QualProp3", "Prop value" );
+		meta.SetQualifier ( kNS1, "QualProp3", kXMP_NS_XML, "lang", "en-us" );
+		meta.SetQualifier ( kNS1, "QualProp3", kNS2, "Qual", "Qual value" );
+
+		meta.SetProperty ( kNS1, "QualProp4", "Prop value" );
+		meta.SetQualifier ( kNS1, "QualProp4", kNS2, "Qual", "Qual value" );
+		meta.SetQualifier ( kNS1, "QualProp4", kXMP_NS_XML, "lang", "en-us" );
+
+		DumpXMPObj ( log, meta, "XMP object" );
+		fprintf ( log, "\n" );
+
+		tmpStr1.erase();
+		ok = meta.GetProperty ( kNS1, "Prop", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:Prop : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		try {
+			tmpStr1.erase();
+			ok = meta.GetProperty ( 0, "ns1:Prop", &tmpStr1, &options );
+			fprintf ( log, "#ERROR: No exception for GetProperty with no schema URI : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "GetProperty with no schema URI - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "GetProperty with no schema URI - threw unknown exception\n" );
+		}
+
+		tmpStr1.erase();
+		ok = meta.GetProperty ( kNS1, "ns1:XMLProp", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:XMLProp : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1.erase();
+		ok = meta.GetProperty ( kNS1, "ns1:URIProp", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:URIProp : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		fprintf ( log, "\n" );
+
+		tmpStr1.erase();
+		ok = meta.GetArrayItem ( kNS1, "Bag", 2, &tmpStr1, &options );
+		fprintf ( log, "GetArrayItem ns1:Bag[2] : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		try {
+			tmpStr1.erase();
+			ok = meta.GetArrayItem ( 0, "ns1:Bag", 1, &tmpStr1, &options );
+			fprintf ( log, "#ERROR: No exception for GetArrayItem with no schema URI : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "GetArrayItem with no schema URI - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "GetArrayItem with no schema URI - threw unknown exception\n" );
+		}
+
+		tmpStr1.erase();
+		ok = meta.GetArrayItem ( kNS1, "ns1:Seq", 1, &tmpStr1, &options );
+		fprintf ( log, "GetArrayItem ns1:Seq[1] : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1.erase();
+		ok = meta.GetArrayItem ( kNS1, "ns1:Alt", kXMP_ArrayLastItem, &tmpStr1, &options );
+		fprintf ( log, "GetArrayItem ns1:Alt[1] : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		fprintf ( log, "\n" );
+
+		tmpStr1.erase();
+		ok = meta.GetStructField ( kNS1, "Struct", kNS2, "Field1", &tmpStr1, &options );
+		fprintf ( log, "GetStructField ns1:Struct/ns2:Field1 : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1.erase();
+		ok = meta.GetStructField ( kNS1, "ns1:Struct", kNS2, "ns2:Field2", &tmpStr1, &options );
+		fprintf ( log, "GetStructField ns1:Struct/ns2:Field2 : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1.erase();
+		ok = meta.GetStructField ( kNS1, "ns1:Struct", kNS2, "ns2:Field3", &tmpStr1, &options );
+		fprintf ( log, "GetStructField ns1:Struct/ns2:Field3 : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1.erase();
+		ok = meta.GetQualifier ( kNS1, "QualProp1", kNS2, "Qual1", &tmpStr1, &options );
+		fprintf ( log, "GetQualifier ns1:QualProp1/?ns2:Qual1 : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		try {
+			tmpStr1.erase();
+			ok = meta.GetQualifier ( 0, "ns1:QualProp1", kNS2, "Qual1", &tmpStr1, &options );
+			fprintf ( log, "#ERROR: No exception for GetQualifier with no schema URI : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "GetQualifier with no schema URI - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "GetQualifier with no schema URI - threw unknown exception\n" );
+		}
+
+		tmpStr1.erase();
+		ok = meta.GetQualifier ( kNS1, "ns1:QualProp3", kXMP_NS_XML, "xml:lang", &tmpStr1, &options );
+		fprintf ( log, "GetQualifier ns1:QualProp3 : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1.erase();
+		ok = meta.GetQualifier ( kNS1, "ns1:QualProp3", kNS2, "ns2:Qual", &tmpStr1, &options );
+		fprintf ( log, "GetQualifier ns1:QualProp3/?ns2:Qual : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		fprintf ( log, "\n" );
+
+		tmpStr1 = "junk";
+		ok = meta.GetProperty ( kNS1, "Bag", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:Bag : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1 = "junk";
+		ok = meta.GetProperty ( kNS1, "Seq", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:Seq : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1 = "junk";
+		ok = meta.GetProperty ( kNS1, "Alt", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:Alt : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		tmpStr1 = "junk";
+		ok = meta.GetProperty ( kNS1, "Struct", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:Struct : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+		fprintf ( log, "\n" );
+
+		try {
+			tmpStr1 = "junk";
+			ok = meta.GetProperty ( "ns:bogus/", "Bogus", &tmpStr1, &options );
+			fprintf ( log, "#ERROR: No exception for GetProperty with bogus schema URI: %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "GetProperty with bogus schema URI - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "GetProperty with bogus schema URI - threw unknown exception\n" );
+		}
+
+		tmpStr1 = "junk";
+		ok = meta.GetProperty ( kNS1, "Bogus", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:Bogus : %s\n", FoundOrNot ( ok ) );
+
+		tmpStr1 = "junk";
+		ok = meta.GetArrayItem ( kNS1, "Bag", 99, &tmpStr1, &options );
+		fprintf ( log, "GetArrayItem ns1:Bag[99] : %s\n", FoundOrNot ( ok ) );
+
+		tmpStr1 = "junk";
+		ok = meta.GetStructField ( kNS1, "Struct", kNS2, "Bogus", &tmpStr1, &options );
+		fprintf ( log, "GetStructField ns1:Struct/ns2:Bogus : %s\n", FoundOrNot ( ok ) );
+
+		tmpStr1 = "junk";
+		ok = meta.GetQualifier ( kNS1, "Prop", kNS2, "Bogus", &tmpStr1, &options );
+		fprintf ( log, "GetQualifier ns1:Prop/?ns2:Bogus : %s\n", FoundOrNot ( ok ) );
+
+		// ----------------------------------------------------------------------------------------
+
+		WriteMajorLabel ( log, "Test DoesPropertyExist, DeleteProperty, and related methods" );
+
+		DumpXMPObj ( log, meta, "XMP object" );
+		fprintf ( log, "\n" );
+
+		ok = meta.DoesPropertyExist ( kNS1, "Prop" );
+		fprintf ( log, "DoesPropertyExist ns1:Prop : %s\n", YesOrNo ( ok ) );
+
+		try {
+			ok = meta.DoesPropertyExist ( 0, "ns1:Bag" );
+			fprintf ( log, "#ERROR: No exception for DoesPropertyExist with no schema URI: %s\n", YesOrNo ( ok ) );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "DoesPropertyExist with no schema URI - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "DoesPropertyExist with no schema URI - threw unknown exception\n" );
+		}
+
+		ok = meta.DoesPropertyExist ( kNS1, "ns1:Struct" );
+		fprintf ( log, "DoesPropertyExist ns1:Struct : %s\n", YesOrNo ( ok ) );
+
+		fprintf ( log, "\n" );
+
+		ok = meta.DoesArrayItemExist ( kNS1, "Bag", 2 );
+		fprintf ( log, "DoesArrayItemExist ns1:Bag[2] : %s\n", YesOrNo ( ok ) );
+
+		ok = meta.DoesArrayItemExist ( kNS1, "ns1:Seq", kXMP_ArrayLastItem );
+		fprintf ( log, "DoesArrayItemExist ns1:Seq[last] : %s\n", YesOrNo ( ok ) );
+
+		ok = meta.DoesStructFieldExist ( kNS1, "Struct", kNS2, "Field1" );
+		fprintf ( log, "DoesStructFieldExist ns1:Struct/ns2:Field1 : %s\n", YesOrNo ( ok ) );
+
+		ok = meta.DoesQualifierExist ( kNS1, "QualProp1", kNS2, "Qual1" );
+		fprintf ( log, "DoesQualifierExist ns1:QualProp1/?ns2:Qual1 : %s\n", YesOrNo ( ok ) );
+
+		ok = meta.DoesQualifierExist ( kNS1, "QualProp2", kXMP_NS_XML, "lang" );
+		fprintf ( log, "DoesQualifierExist ns1:QualProp2/?xml:lang : %s\n", YesOrNo ( ok ) );
+
+		fprintf ( log, "\n" );
+
+		try {
+			ok = meta.DoesPropertyExist ( "ns:bogus/", "Bogus" );
+			fprintf ( log, "#ERROR: No exception for DoesPropertyExist with bogus schema URI: %s\n", YesOrNo ( ok ) );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "DoesPropertyExist with bogus schema URI - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "DoesPropertyExist with bogus schema URI - threw unknown exception\n" );
+		}
+
+		ok = meta.DoesPropertyExist ( kNS1, "Bogus" );
+		fprintf ( log, "DoesPropertyExist ns1:Bogus : %s\n", YesOrNo ( ok ) );
+
+		ok = meta.DoesArrayItemExist ( kNS1, "Bag", 99 );
+		fprintf ( log, "DoesArrayItemExist ns1:Bag[99] : %s\n", YesOrNo ( ok ) );
+
+		try {
+			ok = meta.DoesArrayItemExist ( 0, "ns1:Bag", kXMP_ArrayLastItem );
+			fprintf ( log, "#ERROR: No exception for DoesArrayItemExist with no schema URI: %s\n", YesOrNo ( ok ) );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "DoesArrayItemExist with no schema URI - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "DoesArrayItemExist with no schema URI - threw unknown exception\n" );
+		}
+
+		ok = meta.DoesStructFieldExist ( kNS1, "Struct", kNS2, "Bogus" );
+		fprintf ( log, "DoesStructFieldExist ns1:Struct/ns2:Bogus : %s\n", YesOrNo ( ok ) );
+
+		ok = meta.DoesQualifierExist ( kNS1, "Prop", kNS2, "Bogus" );
+		fprintf ( log, "DoesQualifierExist ns1:Prop/?ns2:Bogus : %s\n", YesOrNo ( ok ) );
+
+		meta.DeleteProperty ( kNS1, "Prop" );
+		meta.DeleteArrayItem ( kNS1, "Bag", 2 );
+		meta.DeleteStructField ( kNS1, "Struct", kNS2, "Field1" );
+
+		DumpXMPObj ( log, meta, "Delete Prop, Bag[2], and Struct1/Field1" );
+
+		meta.DeleteQualifier ( kNS1, "QualProp1", kNS2, "Qual1" );
+		meta.DeleteQualifier ( kNS1, "QualProp2", kXMP_NS_XML, "lang" );
+		meta.DeleteQualifier ( kNS1, "QualProp3", kNS2, "Qual" );
+		meta.DeleteQualifier ( kNS1, "QualProp4", kXMP_NS_XML, "lang" );
+
+		DumpXMPObj ( log, meta, "Delete QualProp1/?ns2:Qual1, QualProp2/?xml:lang, QualProp3:/ns2:Qual, and QualProp4/?xml:lang" );
+
+		meta.DeleteProperty ( kNS1, "Bag" );
+		meta.DeleteProperty ( kNS1, "Struct" );
+
+		DumpXMPObj ( log, meta, "Delete all of Bag and Struct" );
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Localized text set/get methods
+	// ------------------------------
+
+	{
+		SXMPMeta meta;
+
+		WriteMajorLabel ( log, "Test SetLocalizedText and GetLocalizedText" );
+
+		tmpStr1 = "default value";
+		meta.SetLocalizedText ( kNS1, "AltText", "", "x-default", tmpStr1 );
+		DumpXMPObj ( log, meta, "Set x-default value" );
+
+		meta.SetLocalizedText ( kNS1, "AltText", "en", "en-us", "en-us value" );
+		DumpXMPObj ( log, meta, "Set en/en-us value" );
+
+		meta.SetLocalizedText ( kNS1, "AltText", "en", "en-uk", "en-uk value" );
+		DumpXMPObj ( log, meta, "Set en/en-uk value" );
+
+		fprintf ( log, "\n" );
+
+		tmpStr1.erase();  tmpStr2.erase();
+		ok = meta.GetLocalizedText ( kNS1, "AltText", "en", "en-ca", &tmpStr1, &tmpStr2, &options );
+		fprintf ( log, "GetLocalizedText en/en-ca : %s, \'%s\' \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), tmpStr2.c_str(), options );
+
+		tmpStr1 = "junk";
+		ok = meta.GetProperty ( kNS1, "AltText", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ns1:AltText : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options );
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Binary value set/get methods
+	// ----------------------------
+
+	{
+		SXMPMeta meta ( kDateTimeRDF, strlen(kDateTimeRDF) );
+		XMP_DateTime dateValue;
+		bool		boolValue;
+		XMP_Int32	intValue;
+		double		floatValue;
+		char		dateName [8];
+
+		WriteMajorLabel ( log, "Test SetProperty... and GetProperty... methods (set/get with binary values)" );
+		
+		FillDateTime ( &dateValue, 2000, 1, 2, 3, 4, 5, true, true, false, 0, 0, 0, 0 );
+
+		meta.SetProperty_Bool ( kNS1, "Bool0", false );
+		meta.SetProperty_Bool ( kNS1, "Bool1", true );
+		meta.SetProperty_Int ( kNS1, "Int", 42 );
+		meta.SetProperty_Float ( kNS1, "Float", 4.2 );
+
+		meta.SetProperty_Date ( kNS1, "Date10", dateValue );
+		dateValue.tzSign = 1; dateValue.tzHour = 6; dateValue.tzMinute = 7;
+		meta.SetProperty_Date ( kNS1, "Date11", dateValue );
+		dateValue.tzSign = -1;
+		meta.SetProperty_Date ( kNS1, "Date12", dateValue );
+		dateValue.nanoSecond = 9;
+		meta.SetProperty_Date ( kNS1, "Date13", dateValue );
+
+		DumpXMPObj ( log, meta, "A few basic binary Set... calls" );
+
+		fprintf ( log, "\n" );
+
+		ok = meta.GetProperty_Bool ( kNS1, "Bool0", &boolValue, &options );
+		fprintf ( log, "GetProperty_Bool Bool0 : %s, %d, 0x%X\n", FoundOrNot ( ok ), boolValue, options );
+
+		ok = meta.GetProperty_Bool ( kNS1, "Bool1", &boolValue, &options );
+		fprintf ( log, "GetProperty_Bool Bool1 : %s, %d, 0x%X\n", FoundOrNot ( ok ), boolValue, options );
+
+		ok = meta.GetProperty_Int ( kNS1, "Int", &intValue, &options );
+		fprintf ( log, "GetProperty_Int : %s, %d, 0x%X\n", FoundOrNot ( ok ), intValue, options );
+
+		ok = meta.GetProperty_Float ( kNS1, "Float", &floatValue, &options );
+		fprintf ( log, "GetProperty_Float : %s, %f, 0x%X\n", FoundOrNot ( ok ), floatValue, options );
+
+		fprintf ( log, "\n" );
+
+		for ( i = 1; i < 14; ++i ) {
+			sprintf ( dateName, "Date%d", i );
+			ok = meta.GetProperty_Date ( kNS1, dateName, &dateValue, &options );
+			fprintf ( log, "GetProperty_Date (%s) : %s, %d-%02d-%02d %02d:%02d:%02d %d*%02d:%02d %d, 0x%X\n",  dateName, FoundOrNot ( ok ),
+					  dateValue.year, dateValue.month, dateValue.day, dateValue.hour, dateValue.minute, dateValue.second,
+					  dateValue.tzSign, dateValue.tzHour, dateValue.tzMinute, dateValue.nanoSecond, options );
+			meta.SetProperty_Date ( kNS2, dateName, dateValue );
+		}
+
+		DumpXMPObj ( log, meta, "Get and re-set the dates" );
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Parse and serialize methods
+	// ---------------------------
+
+	WriteMajorLabel ( log, "Test parsing with multiple buffers and various options" );
+
+	{
+		SXMPMeta meta;
+		for ( i = 0; i < (long)strlen(kSimpleRDF) - 10; i += 10 ) {
+			meta.ParseFromBuffer ( &kSimpleRDF[i], 10, kXMP_ParseMoreBuffers );
+		}
+		meta.ParseFromBuffer ( &kSimpleRDF[i], strlen(kSimpleRDF) - i );
+		DumpXMPObj ( log, meta, "Multiple buffer parse" );
+	}
+
+	{
+		SXMPMeta meta;
+		for ( i = 0; i < (long)strlen(kSimpleRDF) - 10; i += 10 ) {
+			meta.ParseFromBuffer ( &kSimpleRDF[i], 10, kXMP_ParseMoreBuffers );
+		}
+		meta.ParseFromBuffer ( &kSimpleRDF[i], (strlen(kSimpleRDF) - i), kXMP_ParseMoreBuffers );
+		meta.ParseFromBuffer ( kSimpleRDF, 0 );
+		DumpXMPObj ( log, meta, "Multiple buffer parse, empty last buffer" );
+	}
+
+	{
+		SXMPMeta meta;
+		for ( i = 0; i < (long)strlen(kSimpleRDF) - 10; i += 10 ) {
+			meta.ParseFromBuffer ( &kSimpleRDF[i], 10, kXMP_ParseMoreBuffers );
+		}
+		meta.ParseFromBuffer ( &kSimpleRDF[i], (strlen(kSimpleRDF) - i), kXMP_ParseMoreBuffers );
+		meta.ParseFromBuffer ( 0, 0 );
+		DumpXMPObj ( log, meta, "Multiple buffer parse, null last buffer" );
+	}
+	
+	{
+		SXMPMeta meta;
+		meta.ParseFromBuffer ( kSimpleRDF, strlen(kSimpleRDF), kXMP_RequireXMPMeta );
+		DumpXMPObj ( log, meta, "Parse and require xmpmeta element, which is missing" );
+	}
+	
+	{
+		SXMPMeta meta;
+		meta.ParseFromBuffer ( kNamespaceRDF, strlen(kNamespaceRDF) );
+		DumpXMPObj ( log, meta, "Parse RDF with multiple nested namespaces" );
+	}
+	
+	{
+		SXMPMeta meta;
+		meta.ParseFromBuffer ( kXMPMetaRDF, strlen(kXMPMetaRDF), kXMP_RequireXMPMeta );
+		DumpXMPObj ( log, meta, "Parse and require xmpmeta element, which is present" );
+	}
+	
+	{
+		SXMPMeta meta;
+		meta.ParseFromBuffer ( kInconsistentRDF, strlen(kInconsistentRDF) );
+		DumpXMPObj ( log, meta, "Parse and reconcile inconsistent aliases" );
+	}
+
+	try {
+		SXMPMeta meta;
+		meta.ParseFromBuffer ( kInconsistentRDF, strlen(kInconsistentRDF), kXMP_StrictAliasing );
+		DumpXMPObj ( log, meta, "ERROR: Parse and do not reconcile inconsistent aliases - should have thrown an exception" );
+	} catch ( XMP_Error & excep ) {
+		fprintf ( log, "\nParse and do not reconcile inconsistent aliases - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+	} catch ( ... ) {
+		fprintf ( log, "\nParse and do not reconcile inconsistent aliases - threw unknown exception\n" );
+	}
+
+	{
+		WriteMajorLabel ( log, "Test CR and LF in values" );
+		
+		const char *	kValueWithCR	= "ASCII \x0D CR";
+		const char *	kValueWithLF	= "ASCII \x0A LF";
+		const char *	kValueWithCRLF	= "ASCII \x0D\x0A CRLF";
+
+		SXMPMeta meta ( kNewlineRDF, kXMP_UseNullTermination );
+
+		meta.SetProperty ( kNS2, "HasCR", kValueWithCR );
+		meta.SetProperty ( kNS2, "HasLF", kValueWithLF );
+		meta.SetProperty ( kNS2, "HasCRLF", kValueWithCRLF );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper );
+		fprintf ( log, "\n%s\n", tmpStr1.c_str() );
+		
+		tmpStr1.erase();  tmpStr2.erase();
+		ok = meta.GetProperty ( kNS1, "HasCR", &tmpStr1, 0 );
+		ok = meta.GetProperty ( kNS2, "HasCR", &tmpStr2, 0 );
+		if ( (tmpStr1 != kValueWithCR) || (tmpStr2 != kValueWithCR) ) fprintf ( log, "\n ## HasCR values are bad\n" );
+		
+		tmpStr1.erase();  tmpStr2.erase();
+		ok = meta.GetProperty ( kNS1, "HasLF", &tmpStr1, 0 );
+		ok = meta.GetProperty ( kNS2, "HasLF", &tmpStr2, 0 );
+		if ( (tmpStr1 != kValueWithLF) || (tmpStr2 != kValueWithLF) ) fprintf ( log, "\n ## HasLF values are bad\n" );
+		
+		tmpStr1.erase();  tmpStr2.erase();
+		ok = meta.GetProperty ( kNS1, "HasCRLF", &tmpStr1, 0 );
+		ok = meta.GetProperty ( kNS2, "HasCRLF", &tmpStr2, 0 );
+		if ( (tmpStr1 != kValueWithCRLF) || (tmpStr2 != kValueWithCRLF) ) fprintf ( log, "\n ## HasCRLF values are bad\n" );
+	}
+	
+	{
+		WriteMajorLabel ( log, "Test serialization with various options" );
+
+		SXMPMeta meta ( kSimpleRDF, strlen(kSimpleRDF) );
+		meta.SetProperty ( kNS2, "Another", "Something in another schema" );
+		meta.SetProperty ( kNS2, "Yet/pdf:More", "Yet more in another schema" );
+
+		DumpXMPObj ( log, meta, "Parse simple RDF, serialize with various options" );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1 );
+		WriteMinorLabel ( log, "Default serialize" );
+		fprintf ( log, "%s\n", tmpStr1.c_str() );  fflush ( log );
+		VerifyNewlines ( log, tmpStr1, "\x0A" );
+		
+		SXMPMeta meta2 ( tmpStr1.c_str(), tmpStr1.size() );
+		DumpXMPObj ( log, meta2, "Reparse default serialization" );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper | kXMP_UseCompactFormat );
+		WriteMinorLabel ( log, "Compact RDF, no packet serialize" );
+		fprintf ( log, "%s\n", tmpStr1.c_str() );
+		
+		SXMPMeta meta3 ( tmpStr1.c_str(), tmpStr1.size() );
+		DumpXMPObj ( log, meta3, "Reparse compact serialization" );
+
+		{
+			SXMPMeta meta2;
+
+			meta2.SetProperty ( kXMP_NS_PDF, "Author", "PDF Author" );
+			
+			tmpStr1.erase();
+			meta2.SerializeToBuffer ( &tmpStr1, kXMP_ReadOnlyPacket );
+			WriteMinorLabel ( log, "Read-only serialize with alias comments" );
+			fprintf ( log, "%s\n", tmpStr1.c_str() );
+
+			meta2.SetProperty ( kXMP_NS_PDF, "Actual", "PDF Actual" );
+			meta2.SetProperty ( kXMP_NS_XMP, "Actual", "XMP Actual" );
+			
+			tmpStr1.erase();
+			meta2.SerializeToBuffer ( &tmpStr1, kXMP_ReadOnlyPacket );
+			WriteMinorLabel ( log, "Read-only serialize with alias comments (more actuals)" );
+			fprintf ( log, "%s\n", tmpStr1.c_str() );
+		}
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper, 0, "\x0D" );
+		WriteMinorLabel ( log, "CR newline serialize" );
+		fprintf ( log, "%s\n", tmpStr1.c_str() );
+		VerifyNewlines ( log, tmpStr1, "\x0D" );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper, 0, "\x0D\x0A" );
+		WriteMinorLabel ( log, "CRLF newline serialize" );
+		fprintf ( log, "%s\n", tmpStr1.c_str() );
+		VerifyNewlines ( log, tmpStr1, "\x0D\x0A" );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper, 0, "<->" );
+		WriteMinorLabel ( log, "Alternate newline serialize" );
+		fprintf ( log, "%s\n", tmpStr1.c_str() );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_OmitPacketWrapper, 0, "", "#", 3 );
+		WriteMinorLabel ( log, "Alternate indent serialize" );
+		fprintf ( log, "%s\n", tmpStr1.c_str() );
+
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, 0, 10 );
+		WriteMinorLabel ( log, "Small padding serialize" );
+		fprintf ( log, "%s\n", tmpStr1.c_str() );
+
+		tmpStr1.erase();
+		tmpStr2.erase();
+		meta.SerializeToBuffer ( &tmpStr1 );
+		meta.SerializeToBuffer ( &tmpStr2, kXMP_IncludeThumbnailPad );
+		fprintf ( log, "Thumbnailpad adds %d bytes\n", tmpStr2.size()-tmpStr1.size() );
+		
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_ReadOnlyPacket );
+		size_t minSize = tmpStr1.size();
+		fprintf ( log, "Minimum packet size is %d bytes\n", minSize );
+		
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_ExactPacketLength, minSize+1234 );
+		fprintf ( log, "Minimum+1234 packet size is %d bytes\n", tmpStr1.size() );
+		if ( tmpStr1.size() != (minSize + 1234) ) fprintf ( log, "** Bad packet length **\n" );
+		
+		tmpStr1.erase();
+		meta.SerializeToBuffer ( &tmpStr1, kXMP_ExactPacketLength, minSize );
+		fprintf ( log, "Minimum+0 packet size is %d bytes\n", tmpStr1.size() );
+		if ( tmpStr1.size() != minSize ) fprintf ( log, "** Bad packet length **\n" );
+
+		try {
+			tmpStr1.erase();
+			meta.SerializeToBuffer ( &tmpStr1, kXMP_ExactPacketLength, minSize-1 );
+			fprintf ( log, "#ERROR: No exception for minimum-1, size is %d bytes **\n", tmpStr1.size() );
+		} catch ( XMP_Error & excep ) {
+			fprintf ( log, "Serialize in minimum-1 - threw XMP_Error #%d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		} catch ( ... ) {
+			fprintf ( log, "Serialize in minimum-1 - threw unknown exception\n" );
+		}
+		
+		// *** UTF-16 and UTF-32 encodings
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Iteration methods
+	// -----------------
+
+	{
+		WriteMajorLabel ( log, "Test iteration methods" );
+
+		SXMPMeta meta ( kRDFCoverage, strlen ( kRDFCoverage ) );
+		XMP_OptionBits opt2;
+
+		meta.SetProperty ( kNS2, "Prop", "Prop value" );
+
+		meta.SetProperty ( kNS2, "Bag", 0, kXMP_PropValueIsArray );
+		meta.SetArrayItem ( kNS2, "Bag", 1, "BagItem 2" );
+		meta.SetArrayItem ( kNS2, "Bag", 1, "BagItem 1", kXMP_InsertBeforeItem );
+		meta.SetArrayItem ( kNS2, "Bag", 2, "BagItem 3", kXMP_InsertAfterItem );
+
+		DumpXMPObj ( log, meta, "Parse \"coverage\" RDF, add Bag items out of order" );
+
+		{
+			SXMPIterator iter ( meta );
+			WriteMinorLabel ( log, "Default iteration" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kXMP_IterOmitQualifiers );
+			WriteMinorLabel ( log, "Iterate omitting qualifiers" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kXMP_IterJustLeafName );
+			WriteMinorLabel ( log, "Iterate with just leaf names" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kXMP_IterJustLeafNodes );
+			WriteMinorLabel ( log, "Iterate just the leaf nodes" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kXMP_IterJustChildren );
+			WriteMinorLabel ( log, "Iterate just the schema nodes" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2 );
+			WriteMinorLabel ( log, "Iterate the ns2: namespace" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2, "Bag" );
+			WriteMinorLabel ( log, "Start at ns2:Bag" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2, "NestedStructProp/ns1:Outer" );
+			WriteMinorLabel ( log, "Start at ns2:NestedStructProp/ns1:Outer" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, "ns:empty/" );
+			WriteMinorLabel ( log, "Iterate an empty namespace" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2, "", kXMP_IterJustChildren | kXMP_IterJustLeafName );
+			WriteMinorLabel ( log, "Iterate the top of the ns2: namespace with just leaf names" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2, "", kXMP_IterJustChildren | kXMP_IterJustLeafNodes );
+			WriteMinorLabel ( log, "Iterate the top of the ns2: namespace visiting just leaf nodes" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2, "Bag", kXMP_IterJustChildren );
+			WriteMinorLabel ( log, "Iterate just the children of ns2:Bag" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2, "Bag", kXMP_IterJustChildren | kXMP_IterJustLeafName );
+			WriteMinorLabel ( log, "Iterate just the children of ns2:Bag with just leaf names" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta, kNS2, "NestedStructProp/ns1:Outer/ns1:Middle", kXMP_IterJustChildren );
+			WriteMinorLabel ( log, "Iterate just the children of ns2:NestedStructProp/ns1:Outer/ns1:Middle" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+		{
+			SXMPIterator iter ( meta );
+			WriteMinorLabel ( log, "Skip children of ArrayProp2, and siblings after StructProp" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+				if ( tmpStr2 == "ns1:ArrayProp2" ) iter.Skip ( kXMP_IterSkipSubtree );
+				if ( tmpStr2 == "ns1:StructProp" ) iter.Skip ( kXMP_IterSkipSiblings );
+			}
+		}
+		
+		{
+			SXMPMeta meta;
+			
+			meta.SetProperty ( kXMP_NS_PDF, "Author", "PDF Author" );
+			meta.SetProperty ( kXMP_NS_PDF, "PDFProp", "PDF Prop" );
+			meta.SetProperty ( kXMP_NS_XMP, "XMPProp", "XMP Prop" );
+			meta.SetProperty ( kXMP_NS_DC, "DCProp", "DC Prop" );
+
+			SXMPIterator iter1 ( meta );
+			WriteMinorLabel ( log, "Iterate without showing aliases" );
+			while ( true ) {
+				tmpStr1.erase();  tmpStr2.erase();  tmpStr3.erase();
+				if ( ! iter1.Next ( &tmpStr1, &tmpStr2, &tmpStr3, &options ) ) break;
+				fprintf ( log, "  %s %s = \"%s\", 0x%X\n", tmpStr1.c_str(), tmpStr2.c_str(), tmpStr3.c_str(), options );
+				if ( ! (options & kXMP_SchemaNode) ) {
+					tmpStr4.erase();
+					options &= kXMP_PropHasAliases;	// So the comparison below works.
+					ok = meta.GetProperty ( tmpStr1.c_str(), tmpStr2.c_str(), &tmpStr4, &opt2 );
+					if ( (! ok) || (tmpStr4 != tmpStr3) || (opt2 != options) ) {
+						fprintf ( log, "    ** GetProperty failed: %s, \"%s\", 0x%X\n", FoundOrNot(ok), tmpStr4.c_str(), opt2 );
+					}
+				}
+			}
+		}
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// XPath composition utilities
+	// ---------------------------
+
+	{
+		WriteMajorLabel ( log, "Test XPath composition utilities" );
+
+		SXMPMeta meta ( kSimpleRDF, strlen(kSimpleRDF) );
+		DumpXMPObj ( log, meta, "Parse simple RDF" );
+		fprintf ( log, "\n" );
+	
+		tmpStr1.erase();
+		SXMPUtils::ComposeArrayItemPath ( kNS1, "ArrayProp", 2, &tmpStr1 );
+		fprintf ( log, "ComposeArrayItemPath ns1:ArrayProp[2] : %s\n", tmpStr1.c_str() );
+		meta.SetProperty ( kNS1, tmpStr1.c_str(), "new ns1:ArrayProp[2] value" );
+
+		fprintf ( log, "\n" );
+
+		tmpStr1.erase();
+		SXMPUtils::ComposeStructFieldPath ( kNS1, "StructProp", kNS2, "Field3", &tmpStr1 );
+		fprintf ( log, "ComposeStructFieldPath ns1:StructProp/ns2:Field3 : %s\n", tmpStr1.c_str() );
+		meta.SetProperty ( kNS1, tmpStr1.c_str(), "new ns1:StructProp/ns2:Field3 value" );
+
+		tmpStr1.erase();
+		SXMPUtils::ComposeQualifierPath ( kNS1, "QualProp", kNS2, "Qual", &tmpStr1 );
+		fprintf ( log, "ComposeQualifierPath ns1:QualProp/?ns2:Qual : %s\n", tmpStr1.c_str() );
+		meta.SetProperty ( kNS1, tmpStr1.c_str(), "new ns1:QualProp/?ns2:Qual value" );
+
+		fprintf ( log, "\n" );
+
+		tmpStr1.erase();
+		SXMPUtils::ComposeQualifierPath ( kNS1, "AltTextProp", kXMP_NS_XML, "lang", &tmpStr1 );
+		fprintf ( log, "ComposeQualifierPath ns1:AltTextProp/?xml:lang : %s\n", tmpStr1.c_str() );
+		meta.SetProperty ( kNS1, tmpStr1.c_str(), "new ns1:AltTextProp/?xml:lang value" );
+
+		tmpStr1.erase();
+		tmpStr2 = "x-two";
+		SXMPUtils::ComposeLangSelector ( kNS1, "AltTextProp", tmpStr2, &tmpStr1 );
+		fprintf ( log, "ComposeLangSelector ns1:AltTextProp['x-two'] : %s\n", tmpStr1.c_str() );
+		meta.SetProperty ( kNS1, tmpStr1.c_str(), "new ns1:AltTextProp['x-two'] value" );
+
+		fprintf ( log, "\n" );
+		
+		fprintf ( log, "Check field selector usage\n" ); fflush ( log );
+
+		tmpStr1.erase();
+		ok = meta.GetProperty ( kNS1, "ArrayOfStructProp[ns2:Field1='Item-2']", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ArrayOfStructProp[ns2:Field1='Item-2'] : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options ); fflush ( log );
+
+		tmpStr1.erase();
+		ok = meta.GetProperty ( kNS1, "ArrayOfStructProp[ns2:Field1='Item-2']/ns2:Field2", &tmpStr1, &options );
+		fprintf ( log, "GetProperty ArrayOfStructProp[ns2:Field1='Item-2']/ns2:Field2 : %s, \"%s\", 0x%X\n", FoundOrNot ( ok ), tmpStr1.c_str(), options ); fflush ( log );
+
+		tmpStr1.erase();
+		tmpStr2 = "Item-2";
+		SXMPUtils::ComposeFieldSelector ( kNS1, "ArrayOfStructProp", kNS2, "Field1", tmpStr2, &tmpStr1 );
+		fprintf ( log, "ComposeFieldSelector ns1:ArrayOfStructProp[ns2:Field1=Item-2] : %s\n", tmpStr1.c_str() );
+
+		tmpStr2.erase();
+		SXMPUtils::ComposeStructFieldPath ( kNS1, tmpStr1.c_str(), kNS2, "Field2", &tmpStr2 );
+		fprintf ( log, "ComposeStructFieldPath ns1:ArrayOfStructProp[ns2:Field1=Item-2]/ns2:Field2 : %s\n", tmpStr2.c_str() );
+		meta.SetProperty ( kNS1, tmpStr2.c_str(), "new ns1:ArrayOfStructProp[ns2:Field1=Item-2]/ns2:Field2 value" );
+
+		DumpXMPObj ( log, meta, "Modified simple RDF" );
+	
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Value conversion utilities
+	// --------------------------
+
+	WriteMajorLabel ( log, "Test value conversion utilities" );
+	fprintf ( log, "\n" );
+
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromBool ( true, &tmpStr1 );
+	fprintf ( log, "ConverFromBool true : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromBool ( false, &tmpStr1 );
+	fprintf ( log, "ConverFromBool false : %s\n", tmpStr1.c_str() );
+
+	fprintf ( log, "\n" );
+
+	ok = SXMPUtils::ConvertToBool ( kXMP_TrueStr );
+	fprintf ( log, "ConverToBool kXMP_TrueStr : %d\n", (int)ok );
+	ok = SXMPUtils::ConvertToBool ( kXMP_FalseStr );
+	fprintf ( log, "ConverToBool kXMP_FalseStr : %d\n", (int)ok );
+
+	fprintf ( log, "\n" );
+
+	tmpStr1 = "true";
+	ok = SXMPUtils::ConvertToBool ( tmpStr1 );
+	fprintf ( log, "ConverToBool true : %d\n", (int)ok );
+	ok = SXMPUtils::ConvertToBool ( "TRUE" );
+	fprintf ( log, "ConverToBool TRUE : %d\n", (int)ok );
+	ok = SXMPUtils::ConvertToBool ( "t" );
+	fprintf ( log, "ConverToBool t : %d\n", (int)ok );
+	ok = SXMPUtils::ConvertToBool ( "1" );
+	fprintf ( log, "ConverToBool 1 : %d\n", (int)ok );
+
+	fprintf ( log, "\n" );
+
+	ok = SXMPUtils::ConvertToBool ( "false" );
+	fprintf ( log, "ConverToBool false : %d\n", (int)ok );
+	ok = SXMPUtils::ConvertToBool ( "FALSE" );
+	fprintf ( log, "ConverToBool FALSE : %d\n", (int)ok );
+	ok = SXMPUtils::ConvertToBool ( "f" );
+	fprintf ( log, "ConverToBool f : %d\n", (int)ok );
+	ok = SXMPUtils::ConvertToBool ( "0" );
+	fprintf ( log, "ConverToBool 0 : %d\n", (int)ok );
+
+	fprintf ( log, "\n" );
+
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromInt ( 0, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromInt 0 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromInt ( 42, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromInt 42 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromInt ( -42, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromInt -42 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromInt ( 0x7FFFFFFF, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromInt 0x7FFFFFFF : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromInt ( 0x80000000, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromInt 0x80000000 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromInt ( 0x7FFFFFFF, "%X", &tmpStr1 );
+	fprintf ( log, "ConverFromInt 0x7FFFFFFF as hex : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromInt ( 0x80000000, "%X", &tmpStr1 );
+	fprintf ( log, "ConverFromInt 0x80000000 as hex : %s\n", tmpStr1.c_str() );
+
+	fprintf ( log, "\n" );
+
+	long	int1;
+
+	tmpStr1 = "0";
+	int1 = SXMPUtils::ConvertToInt ( tmpStr1 );
+	fprintf ( log, "ConvertToInt 0 : %d\n", int1 );
+	int1 = SXMPUtils::ConvertToInt ( "42" );
+	fprintf ( log, "ConvertToInt 42 : %d\n", int1 );
+	int1 = SXMPUtils::ConvertToInt ( "-42" );
+	fprintf ( log, "ConvertToInt -42 : %d\n", int1 );
+	int1 = SXMPUtils::ConvertToInt ( "0x7FFFFFFF" );
+	fprintf ( log, "ConvertToInt 0x7FFFFFFF : %d\n", int1 );
+	int1 = SXMPUtils::ConvertToInt ( "0x80000000" );
+	fprintf ( log, "ConvertToInt 0x80000000 : %d\n", int1 );
+	int1 = SXMPUtils::ConvertToInt ( "0x7FFFFFFF" );
+	fprintf ( log, "ConvertToInt 0x7FFFFFFF as hex : %X\n", int1 );
+	int1 = SXMPUtils::ConvertToInt ( "0x80000000" );
+	fprintf ( log, "ConvertToInt 0x80000000 as hex : %X\n", int1 );
+
+	fprintf ( log, "\n" );
+
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromFloat ( 0, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromFloat 0 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromFloat ( 4.2, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromFloat 4.2 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromFloat ( -4.2, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromFloat -4.2 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromFloat ( (int)0x7FFFFFFF, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromFloat 0x7FFFFFFF : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromFloat ( (int)0x80000000, 0, &tmpStr1 );
+	fprintf ( log, "ConverFromFloat 0x80000000 : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromFloat ( (int)0x7FFFFFFF, "%f", &tmpStr1 );
+	fprintf ( log, "ConverFromFloat 0x7FFFFFFF as f : %s\n", tmpStr1.c_str() );
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromFloat ( (int)0x80000000, "%f", &tmpStr1 );
+	fprintf ( log, "ConverFromFloat 0x80000000 as f : %s\n", tmpStr1.c_str() );
+
+	fprintf ( log, "\n" );
+
+	double	float1;
+
+	tmpStr1 = "0";
+	float1 = SXMPUtils::ConvertToFloat ( tmpStr1 );
+	fprintf ( log, "ConvertToFloat 0 : %f\n", float1 );
+	float1 = SXMPUtils::ConvertToFloat ( "4.2" );
+	fprintf ( log, "ConvertToFloat 4.2 : %f\n", float1 );
+	float1 = SXMPUtils::ConvertToFloat ( "-4.2" );
+	fprintf ( log, "ConvertToFloat -4.2 : %f\n", float1 );
+
+	fprintf ( log, "\n" );
+
+	XMP_DateTime date1, date2;
+	FillDateTime ( &date1, 2000, 1, 31, 12, 34, 56, true, true, true, -1, 8, 0, 0 );
+
+
+	tmpStr1.erase();
+	SXMPUtils::ConvertFromDate ( date1, &tmpStr1 );
+	fprintf ( log, "ConvertFromDate 2000 Jan 31 12:34:56 PST : %s\n", tmpStr1.c_str() );
+
+	SXMPUtils::ConvertToDate ( tmpStr1, &date2 );
+	fprintf ( log, "ConvertToDate : %d-%02d-%02d %02d:%02d:%02d %d*%02d:%02d %d\n",
+			  date2.year, date2.month, date2.day, date2.hour, date2.minute, date2.second,
+			  date2.tzSign, date2.tzHour, date2.tzMinute, date2.nanoSecond );
+
+	// --------------------------------------------------------------------------------------------
+	// Date/Time utilities
+	// -------------------
+
+	{
+		WriteMajorLabel ( log, "Test date/time utilities and special values" );
+		fprintf ( log, "\n" );
+		
+		XMP_DateTime utcNow, localNow;
+		
+		SXMPUtils::SetTimeZone ( &utcNow );
+		fprintf ( log, "SetTimeZone : %d-%02d-%02d %02d:%02d:%02d %d*%02d:%02d %d\n",
+				  utcNow.year, utcNow.month, utcNow.day, utcNow.hour, utcNow.minute, utcNow.second,
+				  utcNow.tzSign, utcNow.tzHour, utcNow.tzMinute, utcNow.nanoSecond );
+		
+		SXMPUtils::CurrentDateTime ( &utcNow );
+		fprintf ( log, "CurrentDateTime : %d-%02d-%02d %02d:%02d:%02d %d*%02d:%02d %d\n",
+				  utcNow.year, utcNow.month, utcNow.day, utcNow.hour, utcNow.minute, utcNow.second,
+				  utcNow.tzSign, utcNow.tzHour, utcNow.tzMinute, utcNow.nanoSecond );
+		
+		localNow = utcNow;
+		SXMPUtils::ConvertToLocalTime ( &localNow );
+		fprintf ( log, "ConvertToLocalTime : %d-%02d-%02d %02d:%02d:%02d %d*%02d:%02d %d\n",
+				  localNow.year, localNow.month, localNow.day, localNow.hour, localNow.minute, localNow.second,
+				  localNow.tzSign, localNow.tzHour, localNow.tzMinute, localNow.nanoSecond );
+		
+		utcNow = localNow;
+		SXMPUtils::ConvertToUTCTime ( &utcNow );
+		fprintf ( log, "ConvertToUTCTime : %d-%02d-%02d %02d:%02d:%02d %d*%02d:%02d %d\n",
+				  utcNow.year, utcNow.month, utcNow.day, utcNow.hour, utcNow.minute, utcNow.second,
+				  utcNow.tzSign, utcNow.tzHour, utcNow.tzMinute, utcNow.nanoSecond );
+
+		fprintf ( log, "\n" );
+
+		i = SXMPUtils::CompareDateTime ( utcNow, localNow );
+		fprintf ( log, "CompareDateTime with a == b : %d\n", i );
+
+		utcNow.second = 0;
+		localNow.second = 30;
+		i = SXMPUtils::CompareDateTime ( utcNow, localNow );
+		fprintf ( log, "CompareDateTime with a < b : %d\n", i );
+
+		utcNow.second = 59;
+		i = SXMPUtils::CompareDateTime ( utcNow, localNow );
+		fprintf ( log, "CompareDateTime with a > b : %d\n", i );
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Miscellaneous utilities
+	// -----------------------
+
+	{
+		WriteMajorLabel ( log, "Test CatenateArrayItems and SeparateArrayItems" );
+		fprintf ( log, "\n" );
+
+		SXMPMeta meta;
+		
+		meta.AppendArrayItem ( kNS1, "Array1", kXMP_PropValueIsArray, "one" );
+		meta.AppendArrayItem ( kNS1, "Array1", 0, "two" );
+		meta.AppendArrayItem ( kNS1, "Array1", kXMP_PropValueIsArray, "3, three" );
+		meta.AppendArrayItem ( kNS1, "Array1", 0, "4; four" );
+
+		DumpXMPObj ( log, meta, "Initial array" );
+		fprintf ( log, "\n" );
+		
+		tmpStr1.erase();
+		SXMPUtils::CatenateArrayItems ( meta, kNS1, "Array1", "; ", "\"", kXMP_NoOptions, &tmpStr1 );
+		fprintf ( log, "CatenateArrayItems, no commas : %s\n", tmpStr1.c_str() );
+		
+		tmpStr2.erase();
+		SXMPUtils::CatenateArrayItems ( meta, kNS1, "Array1", " ; ", "\"", kXMPUtil_AllowCommas, &tmpStr2 );
+		fprintf ( log, "CatenateArrayItems, allow commas : %s\n", tmpStr2.c_str() );
+
+		SXMPUtils::SeparateArrayItems ( &meta, kNS1, "Array2-1", kXMP_NoOptions, tmpStr1.c_str() );
+		SXMPUtils::SeparateArrayItems ( &meta, kNS1, "Array2-2", kXMPUtil_AllowCommas, tmpStr1.c_str() );
+		
+		SXMPUtils::SeparateArrayItems ( &meta, kNS1, "Array3-1", kXMP_PropArrayIsOrdered, tmpStr2 );
+		SXMPUtils::SeparateArrayItems ( &meta, kNS1, "Array3-2", (kXMP_PropArrayIsOrdered | kXMPUtil_AllowCommas), tmpStr2 );
+
+		DumpXMPObj ( log, meta, "Set Array1, cat and split into others" );
+
+		SXMPUtils::SeparateArrayItems ( &meta, kNS1, "Array2-2", kXMP_NoOptions, tmpStr1.c_str() );	// Repeat into existing arrays.
+		SXMPUtils::SeparateArrayItems ( &meta, kNS1, "Array3-2", kXMP_PropArrayIsOrdered, tmpStr2.c_str() );
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	
+	{
+		WriteMajorLabel ( log, "Test RemoveProperties and AppendProperties" );
+
+		SXMPMeta meta1 ( kSimpleRDF, strlen(kSimpleRDF) );
+
+		meta1.SetProperty ( kNS2, "Prop", "value" );
+		DumpXMPObj ( log, meta1, "Parse simple RDF, add ns2:Prop" );
+		
+		SXMPUtils::RemoveProperties ( &meta1, kNS1, "ArrayOfStructProp" );
+		DumpXMPObj ( log, meta1, "Remove ns1:ArrayOfStructProp" );
+		
+		SXMPUtils::RemoveProperties ( &meta1, kNS1 );
+		DumpXMPObj ( log, meta1, "Remove all of ns1:" );
+		
+		meta1.SetProperty ( kXMP_NS_XMP, "CreatorTool", "XMPCoverage" );
+		meta1.SetProperty ( kXMP_NS_XMP, "Nickname", "TXMP test" );
+		DumpXMPObj ( log, meta1, "Set xmp:CreatorTool (internal) and xmp:Nickname (external)" );
+		
+		SXMPUtils::RemoveProperties ( &meta1 );
+		DumpXMPObj ( log, meta1, "Remove all external properties" );
+		
+		SXMPUtils::RemoveProperties ( &meta1, 0, 0, kXMPUtil_DoAllProperties );
+		DumpXMPObj ( log, meta1, "Remove all properties, including internal" );
+		
+		meta1.SetProperty ( kXMP_NS_XMP, "CreatorTool", "XMPCoverage" );
+		meta1.SetProperty ( kXMP_NS_XMP, "Nickname", "TXMP test" );
+		DumpXMPObj ( log, meta1, "Set xmp:CreatorTool and xmp:Nickname again" );
+		
+		SXMPMeta meta2 ( kSimpleRDF, strlen(kSimpleRDF) );
+		
+		meta2.SetProperty ( kXMP_NS_XMP, "CreatorTool", "new CreatorTool" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Nickname", "new Nickname" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Format", "new Format" );
+		DumpXMPObj ( log, meta2, "Create 2nd XMP object with new values" );
+		
+		SXMPUtils::ApplyTemplate ( &meta1, meta2, kXMPTemplate_AddNewProperties );
+		DumpXMPObj ( log, meta1, "Append 2nd to 1st, keeping old values, external only" );
+		
+		meta2.SetProperty ( kXMP_NS_XMP, "CreatorTool", "newer CreatorTool" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Nickname", "newer Nickname" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Format", "newer Format" );
+		SXMPUtils::ApplyTemplate ( &meta1, meta2, kXMPTemplate_AddNewProperties | kXMPTemplate_IncludeInternalProperties );
+		DumpXMPObj ( log, meta1, "Append 2nd to 1st, keeping old values, internal also" );
+
+		meta2.SetProperty ( kXMP_NS_XMP, "CreatorTool", "newest CreatorTool" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Nickname", "newest Nickname" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Format", "newest Format" );
+		SXMPUtils::ApplyTemplate ( &meta1, meta2, kXMPTemplate_AddNewProperties | kXMPTemplate_ReplaceExistingProperties );
+		DumpXMPObj ( log, meta1, "Append 2nd to 1st, replacing old values, external only" );
+		
+		meta2.SetProperty ( kXMP_NS_XMP, "CreatorTool", "final CreatorTool" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Nickname", "final Nickname" );
+		meta2.SetProperty ( kXMP_NS_XMP, "Format", "final Format" );
+		SXMPUtils::ApplyTemplate ( &meta1, meta2, kXMPTemplate_AddNewProperties | kXMPTemplate_ReplaceExistingProperties | kXMPTemplate_IncludeInternalProperties );
+		DumpXMPObj ( log, meta1, "Append 2nd to 1st, replacing old values, internal also" );
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	
+	{		
+		WriteMajorLabel ( log, "Test DuplicateSubtree" );
+
+		SXMPMeta meta1 ( kSimpleRDF, strlen(kSimpleRDF) );
+		SXMPMeta meta2;
+		
+		SXMPUtils::DuplicateSubtree ( meta1, &meta2, kNS1, "ArrayOfStructProp" );
+		DumpXMPObj ( log, meta2, "DuplicateSubtree to default destination" );
+
+		#if 1	// The underlying old toolkit does not support changing the schema namespace.
+				
+			SXMPUtils::DuplicateSubtree ( meta1, &meta2, kNS1, "ArrayOfStructProp", kNS2, "NewAoS" );
+			DumpXMPObj ( log, meta2, "DuplicateSubtree to different destination" );
+			
+			SXMPUtils::DuplicateSubtree ( meta1, &meta1, kNS1, "ArrayOfStructProp", kNS2, "NewAoS" );
+			DumpXMPObj ( log, meta1, "DuplicateSubtree to different destination in same object" );
+		
+		#else
+				
+			SXMPUtils::DuplicateSubtree ( meta1, &meta2, kNS1, "ArrayOfStructProp", kNS1, "NewAoS" );
+			DumpXMPObj ( log, meta2, "DuplicateSubtree to different destination" );
+			
+			SXMPUtils::DuplicateSubtree ( meta1, &meta1, kNS1, "ArrayOfStructProp", kNS1, "NewAoS" );
+			DumpXMPObj ( log, meta1, "DuplicateSubtree to different destination in same object" );
+		
+		#endif
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+	
+	{
+		WriteMajorLabel ( log, "Test EncodeToBase64 and DecodeFromBase64" );
+		fprintf ( log, "\n" );
+		
+		unsigned long m;
+
+		#if UseStringPushBack
+			#define PushBack(s,c)	s.push_back ( c )
+		#else
+			#define PushBack(s,c)	s.insert ( s.end(), c );
+		#endif
+	
+		tmpStr1.erase();
+		for ( i = 0; i < 64; i += 4 ) {
+			m = (i << 18) + ((i+1) << 12) + ((i+2) << 6) + (i+3);
+			PushBack ( tmpStr1, ((char) (m >> 16)) );
+			PushBack ( tmpStr1, ((char) ((m >> 8) & 0xFF)) );
+			PushBack ( tmpStr1, ((char) (m & 0xFF)) );
+		}
+
+		tmpStr2.erase();
+		SXMPUtils::EncodeToBase64 ( tmpStr1, &tmpStr2 );
+		fprintf ( log, "Encoded sequence (should be A-Za-z0-9+/) : %s\n", tmpStr2.c_str() );
+
+		tmpStr3.erase();
+		SXMPUtils::DecodeFromBase64 ( tmpStr2, &tmpStr3 );
+		if ( tmpStr1 != tmpStr3 ) fprintf ( log, "** Error in base 64 round trip\n" );
+
+	}
+
+	// --------------------------------------------------------------------------------------------
+
+	WriteMajorLabel ( log, "XMPCoreCoverage done" );
+	fprintf ( log, "\n" );
+
+}	// DoXMPCoreCoverage
+
+// =================================================================================================
+
+extern "C" int main ( int /*argc*/, const char * argv [] )
+{
+	int result = 0;
+
+	char   logName[256];
+	int    nameLen = 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.
+	FILE * log = fopen ( logName, "wb" );
+
+	time_t now = time(0);
+	fprintf ( log, "XMPCoreCoverage starting %s", ctime(&now) );
+
+	XMP_VersionInfo version;
+	SXMPMeta::GetVersionInfo ( &version );
+	fprintf ( log, "Version : %s\n" , version.message );
+
+	try {
+
+// *** Add memory leak checking for both DLL and static builds ***
+
+		if ( ! SXMPMeta::Initialize() ) {
+			fprintf ( log, "## XMPMeta::Initialize failed!\n" );
+			return -1;
+		}
+		DoXMPCoreCoverage ( log );
+
+	} catch ( XMP_Error & excep ) {
+
+		fprintf ( log, "\nCaught XMP_Error %d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		result = -2;
+
+	} catch ( ... ) {
+
+		fprintf ( log, "## Caught unknown exception\n" );
+		result = -3;
+
+	}
+
+	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
new file mode 100644
index 0000000..326b19a
--- /dev/null
+++ b/samples/source/XMPFilesCoverage.cpp
@@ -0,0 +1,339 @@
+// =================================================================================================
+// Copyright 2002 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <stdexcept>
+#include <cerrno>
+#include <ctime>
+
+#define TXMP_STRING_TYPE std::string
+#define XMP_INCLUDE_XMPFILES 1
+#include "public/include/XMP.hpp"
+#include "public/include/XMP.incl_cpp"
+
+using namespace std;
+
+#if WIN_ENV
+	#pragma warning ( disable : 4100 )	// ignore unused variable
+	#pragma warning ( disable : 4127 )	// conditional expression is constant
+	#pragma warning ( disable : 4505 )	// unreferenced local function has been removed
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+// -------------------------------------------------------------------------------------------------
+
+FILE * sLogFile = 0;
+
+// -------------------------------------------------------------------------------------------------
+
+static void WriteMinorLabel ( FILE * log, const char * title )
+{
+
+	fprintf ( log, "\n// " );
+	for ( size_t i = 0; i < strlen(title); ++i ) fprintf ( log, "-" );
+	fprintf ( log, "--\n// %s :\n\n", title );
+
+}	// WriteMinorLabel
+
+// -------------------------------------------------------------------------------------------------
+
+static XMP_Status DumpToFile ( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen )
+{
+	XMP_Status	status	= 0; 
+	size_t		count;
+	FILE *		outFile	= static_cast < FILE * > ( refCon );
+	
+	count = fwrite ( outStr, 1, outLen, outFile );
+	if ( count != outLen ) status = errno;
+	return status;
+	
+}	// DumpToFile
+
+// -------------------------------------------------------------------------------------------------
+
+static XMP_Status DumpToString ( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen )
+{
+	std::string * fullStr = static_cast < std::string * > ( refCon );
+	
+	fullStr->append ( outStr, outLen );
+	return 0;
+	
+}	// DumpToString
+
+// -------------------------------------------------------------------------------------------------
+
+#define DumpOneFormat(fmt)													\
+	format = kXMP_ ## fmt ## File;											\
+	flags = 0;																\
+	ok = SXMPFiles::GetFormatInfo ( format, &flags );						\
+	fprintf ( sLogFile, "kXMP_" #fmt "File = \"%.4s\", %s, flags = 0x%X\n",	\
+			  &format, (ok ? "smart" : "dumb"), flags );
+
+static void DumpHandlerInfo()
+{
+
+	WriteMinorLabel ( sLogFile, "Dump file format constants and handler flags" );
+
+	bool ok;
+	XMP_FileFormat format;
+	XMP_OptionBits flags;
+
+	DumpOneFormat ( PDF );
+	DumpOneFormat ( PostScript );
+	DumpOneFormat ( EPS );
+
+	DumpOneFormat ( JPEG );
+	DumpOneFormat ( JPEG2K );
+	DumpOneFormat ( TIFF );
+	DumpOneFormat ( GIF );
+	DumpOneFormat ( PNG );
+
+	DumpOneFormat ( MOV );
+	DumpOneFormat ( AVI );
+	DumpOneFormat ( CIN );
+	DumpOneFormat ( WAV );
+	DumpOneFormat ( MP3 );
+	DumpOneFormat ( SES );
+	DumpOneFormat ( CEL );
+	DumpOneFormat ( MPEG );
+	DumpOneFormat ( MPEG2 );
+	DumpOneFormat ( WMAV );
+
+	DumpOneFormat ( HTML );
+	DumpOneFormat ( XML );
+	DumpOneFormat ( Text );
+
+	DumpOneFormat ( Photoshop );
+	DumpOneFormat ( Illustrator );
+	DumpOneFormat ( InDesign );
+	DumpOneFormat ( AEProject );
+	DumpOneFormat ( AEFilterPreset );
+	DumpOneFormat ( EncoreProject );
+	DumpOneFormat ( PremiereProject );
+	DumpOneFormat ( PremiereTitle );
+
+	DumpOneFormat ( Unknown );
+
+}	// DumpHandlerInfo
+
+// -------------------------------------------------------------------------------------------------
+
+static void OpenTestFile ( const char * fileName, XMP_OptionBits rwMode, SXMPMeta* xmpMeta, SXMPFiles* xmpFile )
+{
+	bool ok;
+
+	XMP_FileFormat format;
+	XMP_OptionBits openFlags, handlerFlags;
+	XMP_PacketInfo xmpPacket;
+	
+	bool isUpdate = ((rwMode & kXMPFiles_OpenForUpdate) != 0);
+	
+	static const char * charForms[] = { "UTF-8", "unknown char form", "UTF-16BE", "UTF-16LE", "UTF-32BE", "UTF-32LE" };
+
+	XMP_OptionBits smartFlags = rwMode | kXMPFiles_OpenUseSmartHandler;
+	XMP_OptionBits scanFlags  = rwMode | kXMPFiles_OpenUsePacketScanning;
+	
+	ok = xmpFile->OpenFile ( fileName, kXMP_UnknownFile, smartFlags );
+	if ( ! ok ) {
+		fprintf ( sLogFile, "Failed to get a smart handler\n" );
+		ok = xmpFile->OpenFile ( fileName, kXMP_UnknownFile, scanFlags );
+		if ( ! ok ) return;
+	}
+
+	ok = xmpFile->GetFileInfo ( 0, &openFlags, &format, &handlerFlags );
+	if ( ! ok ) return;
+
+	fprintf ( sLogFile, "File info : format = \"%.4s\", handler flags = 0x%X, open flags = 0x%X (%s)\n",
+			  &format, handlerFlags, openFlags, (isUpdate ? "update" : "read-only") );
+
+	ok = xmpFile->GetXMP ( xmpMeta, 0, &xmpPacket );
+	if ( ! ok ) {
+		fprintf ( sLogFile, "No XMP\n" );
+		return;
+	}
+
+	fprintf ( sLogFile, "XMP packet info : file offset = %lld, length = %d, pad = %d",
+			  xmpPacket.offset, xmpPacket.length, xmpPacket.padSize );
+	fprintf ( sLogFile, ", %s", ((xmpPacket.charForm > 5) ? "bad char form" : charForms[xmpPacket.charForm]) );
+	fprintf ( sLogFile, ", %s\n", (xmpPacket.writeable ? "writeable" : "read-only") );
+	
+	fprintf ( sLogFile, "\n" );
+
+	// Remove extaneous properties to make the dump smaller.
+	SXMPUtils::RemoveProperties ( xmpMeta, kXMP_NS_XMP, "Thumbnails", true );
+	SXMPUtils::RemoveProperties ( xmpMeta, kXMP_NS_XMP, "PageInfo", true );
+	SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/xap/1.0/t/pg/", 0, true );
+	SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/xap/1.0/mm/", 0, true );
+	#if 1
+		SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/camera-raw-settings/1.0/", 0, true );
+		SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/tiff/1.0/", 0, true );
+		SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/exif/1.0/", 0, true );
+		SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/exif/1.0/aux/", 0, true );
+		SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/photoshop/1.0/", 0, true );
+		SXMPUtils::RemoveProperties ( xmpMeta, "http://ns.adobe.com/pdf/1.3/", 0, true );
+	#endif
+
+}	// OpenTestFile
+
+// -------------------------------------------------------------------------------------------------
+
+#ifndef OnlyReadOnly
+	#define OnlyReadOnly 0
+#endif
+
+static void TestOneFile ( const char * fileName )
+{
+	char buffer [1000];
+	SXMPMeta  xmpMeta;	
+	SXMPFiles xmpFile;
+	XMP_PacketInfo xmpPacket;
+	std::string    roDump, rwDump;
+	
+	sprintf ( buffer, "Testing %s", fileName );
+	WriteMinorLabel ( sLogFile, buffer );
+	
+	OpenTestFile ( fileName, kXMPFiles_OpenForRead, &xmpMeta, &xmpFile );
+	xmpMeta.DumpObject ( DumpToString, &roDump );
+	xmpFile.CloseFile();
+
+	if ( OnlyReadOnly ) {
+		fprintf ( sLogFile, "Initial XMP from %s\n", fileName );
+		xmpMeta.DumpObject ( DumpToFile, sLogFile );
+		return;
+	}
+	
+	OpenTestFile ( fileName, kXMPFiles_OpenForUpdate, &xmpMeta, &xmpFile );
+	xmpMeta.DumpObject ( DumpToString, &rwDump );
+	if ( roDump != rwDump ) {
+		fprintf ( sLogFile, "** Initial read-only and update XMP don't match! **\n\n" );
+		fprintf ( sLogFile, "Read-only XMP\n%s\nUpdate XMP\n%s\n", roDump.c_str(), rwDump.c_str() );
+	}
+
+	fprintf ( sLogFile, "Initial XMP from %s\n", fileName );
+	xmpMeta.DumpObject ( DumpToFile, sLogFile );
+	
+	XMP_DateTime now;
+	SXMPUtils::CurrentDateTime ( &now );
+	std::string nowStr;
+	SXMPUtils::ConvertFromDate ( now, &nowStr );
+	if ( xmpMeta.CountArrayItems ( kXMP_NS_XMP, "XMPFileStamps" ) >= 9 ) {
+		xmpMeta.DeleteProperty ( kXMP_NS_XMP, "XMPFileStamps" );
+	}
+	xmpMeta.AppendArrayItem ( kXMP_NS_XMP, "XMPFileStamps", kXMP_PropArrayIsOrdered, "" );
+	xmpMeta.SetProperty ( kXMP_NS_XMP, "XMPFileStamps[last()]", nowStr.c_str() );
+	
+	nowStr.insert ( 0, "Updating dc:description at " );
+	xmpMeta.SetLocalizedText ( kXMP_NS_DC, "description", "", "x-default", nowStr.c_str() );
+
+	xmpFile.PutXMP ( xmpMeta );
+	XMP_OptionBits closeOptions = 0;
+	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" );
+	OpenTestFile ( fileName, kXMPFiles_OpenForRead, &xmpMeta, &xmpFile );
+	fprintf ( sLogFile, "Modified XMP from %s\n", fileName );
+	xmpMeta.DumpObject ( DumpToFile, sLogFile );
+	xmpFile.CloseFile();
+
+	fprintf ( sLogFile, "\nDone testing %s\n", fileName );
+
+}	// TestOneFile
+
+// -------------------------------------------------------------------------------------------------
+
+extern "C" int main ( int argc, const char * argv[] )
+{
+	int result = 0;
+
+	char   logName[256];
+	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.
+	sLogFile = fopen ( logName, "wb" );
+
+	time_t now = time(0);
+	fprintf ( sLogFile, "XMPFilesCoverage starting %s", ctime(&now) );
+
+	XMP_VersionInfo coreVersion, filesVersion;
+	SXMPMeta::GetVersionInfo ( &coreVersion );
+	SXMPFiles::GetVersionInfo ( &filesVersion );
+	fprintf ( sLogFile, "Version :\n   %s\n   %s\n", coreVersion.message, filesVersion.message );
+
+	try {
+
+		if ( ! SXMPMeta::Initialize() ) {
+			fprintf ( sLogFile, "## XMPMeta::Initialize failed!\n" );
+			return -1;
+		}
+		XMP_OptionBits options = 0;
+		#if UNIX_ENV
+			options |= kXMPFiles_ServerMode;
+		#endif
+		if ( ! SXMPFiles::Initialize ( options ) ) {
+			fprintf ( sLogFile, "## SXMPFiles::Initialize failed!\n" );
+			return -1;
+		}
+		
+		DumpHandlerInfo();
+	
+		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 ) {
+
+		fprintf ( sLogFile, "\nCaught XMP_Error %d : %s\n", excep.GetID(), excep.GetErrMsg() );
+		result = -2;
+
+	} catch ( ... ) {
+
+		fprintf ( sLogFile, "## Caught unknown exception\n" );
+		result = -3;
+
+	}
+
+	SXMPFiles::Terminate();
+	SXMPMeta::Terminate();
+
+	now = time(0);
+	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/common/DumpFile.cpp b/samples/source/common/DumpFile.cpp
new file mode 100644
index 0000000..32dd253
--- /dev/null
+++ b/samples/source/common/DumpFile.cpp
@@ -0,0 +1,5353 @@
+// =================================================================================================
+// 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.
+//
+// =================================================================================================
+//
+// 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)
+//     - IFF/RIFF (AVI/WAV/RF64/AIFF/AIFF-C)
+//     - PNG
+//     - InDesign
+//     - MP3
+//     - MOV (Quicktime)
+//     - UCF (done, including commented zips and zip64 (>4GB))
+//     - SWF
+//     - FLV
+//     - MPEG-4
+//
+// DumpFile does depend on XMPCore and the packetscanner from XMPFiles. 
+
+#include <stdarg.h>
+#include "samples/source/common/globals.h"
+#include "samples/source/common/DumpFile.h"
+#include "samples/source/common/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 "public/include/XMP.hpp"
+#include "public/include/XMP_Const.h"
+
+#include "samples/source/common/XMPScanner.hpp"
+#include "samples/source/common/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;
+
+// specifc 'state machine' for QT/MPEG4 dumping
+// * false by default (set in DumpISO() stub)
+static bool TimeCodeTrack;
+
+// =================================================================================================
+
+long kOne = 1;
+char firstByte = *((char*)&kOne);
+
+const bool sBigEndianHost = (firstByte == 0);
+const bool sLittleEndianHost = (firstByte == 1);
+static bool beTIFF;
+
+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
+struct JpegMarker {
+	XMP_Uns8 * jpegMarkerPtr;
+	XMP_Uns16 jpegMarkerLen;
+};
+typedef std::vector<JpegMarker> JpegMarkers;
+
+static void DumpTIFF ( XMP_Uns8 * tiffContent, XMP_Uns32 tiffLen, XMP_Uns32 fileOffset, const char * label, std::string path );
+static void DumpTIFF ( const JpegMarkers& psirMarkers, XMP_Uns8 * dataStart, const char * label, std::string path );
+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 DumpImageResources ( const JpegMarkers& psirMarkers, XMP_Uns8 * dataStart, const char * label );
+static void DumpIFDChain ( XMP_Uns8 * startPtr, XMP_Uns8 * endPtr, XMP_Uns8 * tiffContent, XMP_Uns32 fileOffset, const char * label, std::string path  );
+
+// =================================================================================================
+
+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_DigitalCreationDate  = 62 ,
+	kIPTC_DigitalCreationTime  = 63,
+	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_DigitalCreationDate, "Digital Creation Date" },
+{ kIPTC_DigitalCreationTime, "Digital Creation Time" },
+{ 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, bool bigEndian = false )
+{
+	XMP_Uns32 value = tree->digest32u(file, "", bigEndian );
+	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, bool stopOnNUL = true )
+{
+	//wrapping to QEBuginese
+	// - NB: remainder (zero termination earlier then length) is catered for...
+
+	tree->addComment ( convert8Bit ( strPtr, stopOnNUL, strLen ) );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+// this wrap and the LE counterpart can only be inferior, since
+// its always added as a comment, even if value was more appropriate.
+// ==> callers should make use of convert16Bit directly.
+static void PrintOnlyASCII_16BE ( XMP_Uns16 * u16Ptr, XMP_Uns32 u16Bytes, bool stopOnNUL = true )
+{
+	tree->addComment ( convert16Bit( true, (XMP_Uns8*) u16Ptr, stopOnNUL, u16Bytes ) );
+}	// PrintOnlyASCII_16BE
+
+// -------------------------------------------------------------------------------------------------
+
+static void PrintOnlyASCII_16LE ( XMP_Uns16 * u16Ptr, XMP_Uns32 u16Bytes, bool stopOnNUL = true )
+{
+	tree->addComment ( convert16Bit( false, (XMP_Uns8*) u16Ptr, stopOnNUL, u16Bytes ) );
+}	// 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 kPostScriptMinSize = 49;
+
+
+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 kISOBrand_mp41 = 0x6D703431UL;
+static const XMP_Uns32 kISOBrand_mp42 = 0x6D703432UL;
+static const XMP_Uns32 kISOBrand_avc1 = 0x61766331UL;
+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 const XMP_Uns8  kPostScriptStart[] = { 0xC5, 0xD0, 0xD3, 0xC6 };
+
+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 >= kRIFFMinSize) && CheckBytes ( fileContent, "RF64", 4 ) ) {
+		if ( CheckBytes ( fileContent+8, "WAVE", 4 ) ) return kXMP_WAVFile;
+	}
+
+	if ( (fileSize >= kRIFFMinSize) && CheckBytes ( fileContent, "FORM", 4 ) ) {
+		if ( CheckBytes ( fileContent+8, "AIFF ", 4 ) ) return kXMP_AIFFFile;
+		if ( CheckBytes ( fileContent+8, "AIFC", 4 ) ) return kXMP_AIFFFile;
+	}
+
+	if ( (fileSize >= kPostScriptMinSize) && CheckBytes (fileContent, kPostScriptStart, 4) ) {
+		return kXMP_PostScriptFile;
+	}
+
+	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);
+			switch ( compatBrand ) {
+			case kISOBrand_mp41:
+			case kISOBrand_mp42:
+			case kISOBrand_avc1:
+				return kXMP_MPEG4File;
+				break;
+
+			default:
+				break;
+
+			}
+
+		}
+
+	}
+
+	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 <= 0xFFFFFFFFL) {
+		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 ( const JpegMarkers& psirMarkers, XMP_Uns8 * dataStart, const char * label )
+{
+	
+	XMP_Uns32 i = 0, size = psirMarkers.size();
+	std::string combinedPSIRData;
+	for ( i = 0; i < size; i++ ) {
+		combinedPSIRData.append( (const char *) psirMarkers[i].jpegMarkerPtr, psirMarkers[i].jpegMarkerLen );
+	}
+
+
+	XMP_Uns8 * psirPtr = (XMP_Uns8 *) combinedPSIRData.data();
+	XMP_Uns8 * psirEnd = psirPtr + combinedPSIRData.size();
+	
+	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;
+	XMP_Int32 lastIndexUsed = -1;
+	while (psirPtr < psirEnd) {
+		// calculate fileOffset and psirOrigin
+		size_t currentOffset = (const char *) psirPtr - combinedPSIRData.data();
+		XMP_Uns32 length = 0;
+		for (i = 0; i < size; i++ ) {
+			length += psirMarkers[i].jpegMarkerLen;
+			if ( currentOffset <= length )
+				break;
+		}
+		if ( lastIndexUsed != i ) {
+			if ( lastIndexUsed != -1 )
+				tree->popNode();
+			// time to push a new node
+			tree->pushNode("Photoshop Image Resources %d", i + 1 );
+			XMP_Uns32 fileOffset = psirMarkers[i].jpegMarkerPtr - dataStart;
+			tree->addComment("from %s, offset %d (0x%X), size %d",
+				label, fileOffset, fileOffset, psirMarkers[i].jpegMarkerLen);
+			lastIndexUsed = i;
+		}
+		XMP_Uns32 fileOffset = psirMarkers[i].jpegMarkerPtr - dataStart;
+		XMP_Uns8 * psirOrigin =  psirMarkers[i].jpegMarkerPtr;
+
+		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 - (XMP_Uns8 *) combinedPSIRData.data()) - ( length - psirMarkers[i].jpegMarkerLen ) );
+
+		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)  {
+				XMP_Uns32 offset = fileOffset + ((iptcPtr - (XMP_Uns8 *) combinedPSIRData.data()) - ( length - psirMarkers[i].jpegMarkerLen ) );
+				DumpIPTC (iptcPtr, iptcLen, offset, "PSIR #1028");
+			}
+		} else if (irID == kPSIR_XMP) {				//****************
+			tree->setKeyValue("PSIR:XMP","");
+			xmpPtr = irPtr;
+			xmpLen = irLen;
+			if (xmpPtr != 0) {
+				XMP_Uns32 offset = fileOffset + ((xmpPtr - (XMP_Uns8 *) combinedPSIRData.data()) - ( length - psirMarkers[i].jpegMarkerLen ) );
+				DumpXMP (xmpPtr, xmpLen, offset, "PSIR #1060");
+			}
+		} else if (irID == kPSIR_Exif_1) {			//****************
+			tree->setKeyValue("PSIR:Exif-1","");
+			exif1Ptr = irPtr;
+			exif1Len = irLen;
+			XMP_Uns32 offset = fileOffset + ((exif1Ptr - (XMP_Uns8 *) combinedPSIRData.data()) - ( length - psirMarkers[i].jpegMarkerLen ) );
+			DumpTIFF (exif1Ptr, exif1Len, offset, "PSIR #1058 (Exif 1)", "PSIR:Exif-1");
+		} else if (irID == kPSIR_Exif_3) {			//****************
+			tree->setKeyValue("PSIR:Exif-3","");
+			exif3Ptr = irPtr;
+			exif3Len = irLen;
+			XMP_Uns32 offset = fileOffset + ((exif3Ptr - (XMP_Uns8 *) combinedPSIRData.data()) - ( length - psirMarkers[i].jpegMarkerLen ) );
+			if (exif3Ptr != 0) DumpTIFF (exif3Ptr, exif3Len, offset, "PSIR #1059 (Exif 3)", "PSIR: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),
+				""
+				);	
+		}
+		if ( irOffset + irLen > (psirMarkers[i].jpegMarkerPtr - dataStart) + psirMarkers[i].jpegMarkerLen ) {
+			//merged from two markers
+			tree->addComment("offset %d (0x%X), size %d - split in multiple markers", irOffset, irOffset, irLen);	
+		} else {
+			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
+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)", "PSIR: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)", "PSIR: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, std::string path)
+{
+	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;
+	
+	if (!path.empty()) 
+		path.append("/");
+	
+	path.append(fromArgs("IFD%d", ifdIndex));	
+
+	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("%s/TIFF:%d",path.c_str(), 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 j = 0; sTIFF_TagNames[j].tag != 0; ++j) {
+				if (sTIFF_TagNames[j].tag == fieldTag) {
+					tree->addComment("%s", sTIFF_TagNames[j].name);
+					break;
+				}
+			}
+		}
+
+		XMP_Uns8 value8;
+		XMP_Uns16 value16;
+		XMP_Uns32 value32;
+		XMP_Uns32 denom;
+		std::string tempStr;
+		char cs[31];
+		
+		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 :
+				for( unsigned int j = 0; j < valueCount ; j++) {
+					value32 = TIFF_GetUns32 (valuePtr+(j*8));
+					denom = TIFF_GetUns32 (valuePtr+(j*8)+4);
+					snprintf(cs,30,"%u",value32);
+					tempStr += cs;
+					tempStr += "/";
+					snprintf(cs,30,"%u",denom);
+					tempStr += cs;
+					if(j < valueCount-1)
+						tempStr += ";";
+				}
+				if(tempStr.length() > 0)
+					tree->changeValue( tempStr );
+				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 );
+				} else if ( fieldTag == 36864 ) {	// ExifVersion
+					tree->changeValue( "%.*s", valueCount, valuePtr );
+				} else if ( fieldTag == 37510 ) {	// UserComment
+					XMP_Uns8 * encPtr = valuePtr;
+					valuePtr += 8;
+					valueCount -= 8;
+					sprintf(cs,"encoding = %.8s", encPtr  );
+					tempStr += cs;
+					if ( ! CheckBytes ( encPtr, "UNICODE\0", 8 ) ) {
+						tree->changeValue( convert8Bit ( valuePtr, false, valueCount ) );
+					} else {
+						bool doBE = beTIFF;
+						if ( CheckBytes ( valuePtr, "\xFE\xFF", 2 ) ) {
+							doBE = true;
+							valuePtr += 2;
+							valueCount -= 2;
+							tempStr += ", BE BOM";
+						}
+						if ( CheckBytes ( valuePtr, "\xFF\xFE", 2 ) ) {
+							doBE = false;
+							valuePtr += 2;
+							valueCount -= 2;
+							tempStr += ", LE BOM";
+						}
+						if ( doBE ) {
+							tree->changeValue( convert16Bit( true, (XMP_Uns8*) valuePtr, false, valueCount ) );
+							//PrintOnlyASCII_16BE ( (XMP_Uns16*)valuePtr, valueCount, ", value =", false /* ! stopOnNUL */ );
+						} else {
+							tree->changeValue( convert16Bit( false, (XMP_Uns8*) valuePtr, false, valueCount ) );
+							//PrintOnlyASCII_16LE ( (XMP_Uns16*)valuePtr, valueCount, ", value =", false /* ! stopOnNUL */ );
+						}
+					}
+				}
+				
+				if(tempStr.length() > 0)
+					tree->addComment( tempStr );
+				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);
+					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)", path+"/TIFF:34665");
+	}
+
+	if (gpsPtr != 0) {
+		DumpIFDChain (gpsPtr, endPtr, tiffContent,
+			(fileOffset + (gpsPtr - tiffContent)), "TIFF tag #34853 (GPS Info IFD)", path+"/TIFF:34853");
+	}
+
+	if (interopPtr != 0) {
+		DumpIFDChain (interopPtr, endPtr, tiffContent,
+			(fileOffset + (interopPtr - tiffContent)), "TIFF tag #40965 (Interoperability IFD)", path+"/TIFF:40965");
+	}
+
+	if (makerNotePtr != 0) {
+		DumpIFDChain (makerNotePtr, endPtr, tiffContent,
+			(fileOffset + (makerNotePtr - tiffContent)), "TIFF tag #37500 (Maker Note)", path+"/TIFF:37500");
+	}
+
+	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, std::string path)
+{
+	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, path);
+		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, std::string path)
+{
+	tree->pushNode("TIFF content from %s", 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)) {
+		beTIFF = false;
+		TIFF_GetUns16 = GetUns16LE;
+		TIFF_GetUns32 = GetUns32LE;
+		TIFF_GetUns64 = GetUns64LE;
+		tree->addComment("Little endian ");
+	} else if (CheckBytes(tiffContent,"MM\x00\x2A",4)) {
+		beTIFF = true;
+		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, path);
+
+	TIFF_GetUns16 = save_GetUns16;
+	TIFF_GetUns32 = save_GetUns32;
+	TIFF_GetUns64 = save_GetUns64;
+
+	tree->popNode();
+}	// DumpTIFF
+
+
+// =================================================================================================
+
+static void DumpTIFF ( const JpegMarkers& exifMarkers, XMP_Uns8 * dataStart, const char * label, std::string path )
+{
+	XMP_Uns32 i = 0, size = exifMarkers.size();
+	std::string combinedExifData;
+	tree->pushNode( "Combined EXIF Markers from %s", path.c_str() );
+	for ( i = 0; i < size; i++ ) {
+		tree->pushNode( "EXIF Marker %d", i + 1 );
+		tree->addComment("offset %d (0x%X), size %d", exifMarkers[i].jpegMarkerPtr - dataStart,
+			exifMarkers[i].jpegMarkerPtr - dataStart, exifMarkers[i].jpegMarkerLen );
+		combinedExifData.append( (const char *) exifMarkers[i].jpegMarkerPtr, exifMarkers[i].jpegMarkerLen );
+		tree->popNode();
+	}
+
+	DumpTIFF( (XMP_Uns8 *) combinedExifData.data(), combinedExifData.length(), exifMarkers[0].jpegMarkerPtr - dataStart, label, path );
+
+	tree->popNode();
+}	// 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_Uns16 xmpLen = 0;
+
+	JpegMarkers psirMarkers, exifMarkers;
+
+	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");
+					tree->changeValue("EXIF");
+					JpegMarker exifMarker;
+					exifMarker.jpegMarkerPtr = segPtr + 4 + 6;
+					exifMarker.jpegMarkerLen = segLen - 2 - 6;
+					exifMarkers.push_back(exifMarker);
+			} else if ((minorKind == 13) && (strcmp(segName,"Photoshop 3.0") == 0)) {
+				tree->addComment("PSIR");
+				tree->changeValue("PSIR");
+				JpegMarker psirMarker;
+				psirMarker.jpegMarkerPtr = segPtr + 4 + strlen(segName) + 1;
+				psirMarker.jpegMarkerLen = (XMP_Uns16)(segLen - 2 - strlen(segName) - 1);
+				psirMarkers.push_back(psirMarker);
+			} else if ((minorKind == 1) && (strcmp(segName,"http://ns.adobe.com/xap/1.0/") == 0)) {
+				tree->addComment("XMP");
+				tree->changeValue("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 (exifMarkers.size() > 0) DumpTIFF (exifMarkers, jpegContent, "JPEG Exif APP1", "JPEG:APP1");
+	if (psirMarkers.size() > 0) DumpImageResources (psirMarkers, jpegContent, "JPEG Photoshop APP13");
+	if (xmpPtr != 0) DumpXMP (xmpPtr, xmpLen, (xmpPtr - jpegContent), "JPEG XMP APP1");
+
+}	// DumpJPEG
+
+// =================================================================================================
+//#if !IOS_ENV
+static const XMP_Uns8 kUUID_XMP[16]  =
+{ 0xBE, 0x7A, 0xCF, 0xCB, 0x97, 0xA9, 0x42, 0xE8, 0x9C, 0x71, 0x99, 0x94, 0x91, 0xE3, 0xAF, 0xAC };
+/*#else
+static const XMP_Uns8 kUUID_XMP[16]  =
+{ 0xFFFFFFBE, 0x0000007A, 0xFFFFFFCF, 0xFFFFFFCB, 0xFFFFFF97, 0xFFFFFFA9, 0x00000042, 0xFFFFFFE8, 0xFFFFFF9C, 0x00000071, 0xFFFFFF99, 0xFFFFFF94, 0xFFFFFF91, 0xFFFFFFE3, 0xFFFFFFAF, 0xFFFFFFAC };
+#endif */
+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 };
+
+// -------------------------------------------------------------------------------------------------
+
+/**
+ * helper routine to get past the version and flags field...
+ */
+static void
+digestISOFullBoxExtension ( LFA_FileRef file, std::string isoPath, XMP_Int64& remainingSize, XMP_Uns8& version, XMP_Uns32& flags )
+{
+	version = LFA_ReadUns8( file );
+	flags = 0;
+
+	LFA_Read( file, &flags, 3, true ); // read only 3 byte!
+	flags = flags >> 8; // (move to bit 0-23)
+	remainingSize -= 4;		
+
+	tree->setKeyValue( isoPath + "version", fromArgs( "%d", version) );
+	tree->setKeyValue( isoPath + "flags", fromArgs( "0x%.8X", flags) );
+}
+
+static void
+digestInternationalTextSequence ( LFA_FileRef file, std::string isoPath, XMP_Int64* remainingSize )
+{
+	XMP_Int64 miniBoxStringSize = tree->digest16u(file,isoPath+"size",true,true);
+	tree->digest16u(file,isoPath+"language code",true,true);
+	(*remainingSize) -= 4;
+	if ( (*remainingSize) != miniBoxStringSize )
+		tree->addComment("WARNING: boxSize and miniBoxSize differ!");
+	tree->digestString( file, isoPath+"value", miniBoxStringSize, false );
+}
+
+/**
+* dumps one *or several* (ohter while loop) ISO Boxes within the indicated space:
+*
+* maxBoxLen is :== fileLen on top-level, otherwise available length of outer box (exluding header size naturally)
+*
+* (NB: reading (and displaying) box types, compat brands and other 4-letter stuff 
+*  as LE is somehow easier (might need adjustment for PPC though)
+*
+* practices:
+* compensate endianess using MakeUns32BE() prior to use as string, NOT for numeric compare
+*/
+static void
+DumpISOBoxes ( LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath )
+{	
+	XMP_Int64 endOfThisLevel = LFA_Tell(file) + maxBoxLen;
+	std::string origIsoPath( _isoPath );
+	std::string isoPath( _isoPath );
+	
+	while ( LFA_Tell(file) < endOfThisLevel )
+	{
+		XMP_Int64 boxHeaderSize = 8;
+
+		//assertMsg("No space for ISO box header", boxHeaderSize <= maxBoxLen ); 
+
+		//// certainly not enough room for another box?
+		// could be a 32bit zero trailing a udta
+		// or, uhm, something garbage-ish...
+		if ( LFA_Tell(file) + boxHeaderSize > endOfThisLevel )
+		{
+			XMP_Int64 numUnusedBytes = (LFA_Tell(file) + boxHeaderSize - endOfThisLevel);
+			tree->digestString( file, isoPath+"unused", numUnusedBytes, false );
+			tree->addComment( "'free' since too small for a box" );
+
+			bool ok;
+			LFA_Seek( file, maxBoxLen, SEEK_CUR, &ok );
+			assertMsg("skippind to-small space failed (truncated file?)", ok ); 
+			continue; // could just as well: return
+		}
+
+		XMP_Int64 boxPos= LFA_Tell( file ); // store here, output below
+		XMP_Int64 boxSize = tree->digest32u( file, "", true ); // NB: 32bit <- 64bit
+		XMP_Uns32 boxType = tree->digest32u( file, "", false );
+
+		switch (boxSize)
+		{
+		case 0:
+			// A value of zero says that the box extends to the end of the file.
+			boxSize = ( maxBoxLen - boxPos ); // *** could be errorneous below top-level
+			break;
+		case 1:
+			// A value of 1 says that a 64-bit big endian size is written after the box type field, the data follows.
+			boxSize = LFA_ReadUns64_BE( file );
+			boxHeaderSize += 8;
+			break;
+		default:
+			break;
+		}
+
+                XMP_Uns32 tempBoxType = GetUns32LE(&boxType);
+                std::string boxString( fromArgs( "%.4s" , &tempBoxType) );
+
+		// substitute mac-copyright signs with an easier-to-handle "(c)"
+#if !IOS_ENV
+		if ( boxString.at(0) == 0xa9 )
+#else
+        if ( boxString.at(0) == 0xffffffa9 )
+#endif
+            boxString = std::string("(c)") + boxString.substr(1);
+		isoPath = origIsoPath + boxString + "/";
+
+		// TEMP
+		// Log::info("pushing %s, endOfThisLevel: 0x%X", isoPath.c_str(), endOfThisLevel );
+       // printf ("%s \n", isoPath.c_str());
+		tree->pushNode(	isoPath );
+		tree->addComment("offset 0x%I64X, size 0x%I64X", boxPos , boxSize);
+
+		// endOfBoxPos saves the hassle of keeping the remainingSize up-to-date
+		// (which is only needed and only done, if usefull for the specific box)
+		XMP_Int64 remainingSize = boxSize - boxHeaderSize;
+		XMP_Int64 endOfBoxPos = LFA_Tell(file) + remainingSize;
+
+		// ---------------------------------------------
+		// for FullBoxes:
+		XMP_Uns8 version = 255;
+		XMP_Uns32 flags = 0xFFFFFF;
+
+		switch ( boxType )
+		{
+			// container boxes (FULL), that contain (relevant) boxes:
+			case 0x6174656D: // meta, FULLBOX
+				if ( isoPath != "moov/udta/meta/" )
+					break; //no area of interest (and navigate around some malformed files)
+
+				digestISOFullBoxExtension( file, isoPath, remainingSize, version, flags );
+				// intentionally: no break.
+
+			// container boxes (all non-FULL), that contain (relevant) boxes:
+			case 0x666E696D: // minf - "simple container, no direct content"
+				if ( boxString == "minf" && isoPath != "moov/trak/mdia/minf/" )
+					break;
+			case 0x6C627473: // stbl is a simple container, no direct content
+				{
+					TimeCodeTrack = false; // assume until we known better by a relevant
+										   // moov/trak/mdia/minf/stbl/stsd/ of format tmcd
+					if ( boxString == "stbl" && isoPath != "moov/trak/mdia/minf/stbl/")
+						break;
+				}
+			case 0x766F6F6D: // moov
+			case 0x6169646D: // mdia
+			case 0x61746475: // udta - user data
+			case 0x6B617274: // trak - track
+			case 0x74736C69: // ilst (contains cprt box)
+				{
+					// store and restore current position to not depend
+					// on sub-level mischief...
+					bool ok;
+					XMP_Int64 keep = LFA_Tell( file );
+					DumpISOBoxes( file, remainingSize, isoPath );
+					LFA_Seek( file, keep, SEEK_SET, &ok );
+					assertMsg( "seek failed", ok );
+				}
+				break;
+
+			// known boxes, that need content extraction
+			case 0x70797466: // ftyp - file type
+				{
+					XMP_Uns32 majorBrand = LFA_ReadUns32_LE( file );
+					XMP_Uns32 minorVersion = LFA_ReadUns32_LE( file );
+
+                    //data has been read in LE make it in BE
+                    majorBrand = GetUns32LE(&majorBrand);
+                    minorVersion = GetUns32LE(&minorVersion);
+
+					//Log::info( fromArgs( "major Brand:   '%.4s' (0x%.8X)" , &majorBrand, MakeUns32BE(majorBrand) ));
+					//Log::info( fromArgs( "minor Version: 0x%.8X" , MakeUns32BE(minorVersion) ) );
+					tree->setKeyValue( isoPath + "majorBrand",
+										fromArgs( "%.4s", &majorBrand ),
+										fromArgs( "0x%.8X" , MakeUns32BE(majorBrand) )  );
+					tree->setKeyValue( isoPath + "minorVersion",
+										fromArgs( "0x%.8X", MakeUns32BE(minorVersion) ) );
+					
+					remainingSize -= 4 + 4;
+					//Log::info( fromArgs( "remaining Size: %d" , remainingSize ) );
+
+					while ( remainingSize >= 4 )
+					{
+						LFA_ReadUns32_LE( file );
+						// TODO: Concatenate for KeyValue...
+						//XMP_Uns32 compatVersion = LFA_ReadUns32_LE( file );
+						//Log::info( fromArgs( "compatible brand: '%.4s' (0x%.8X)" , &compatVersion, MakeUns32BE(compatVersion) ));
+						remainingSize -= 4;
+					}
+
+					// odd bytes left?
+					if ( remainingSize > 0 )
+						tree->addComment( "WARNING: %d bytes left, considering FREE", remainingSize );
+
+				}
+				break;
+			case 0x61746164: // data (within itunes Metadata)
+					// all data atoms start with two common fields: a type indicator, and a locale indicator.
+					// each of these fields is four bytes long:
+					tree->digest32u(file, isoPath+ "type", true, true);
+					tree->digest32u(file, isoPath+ "locale", true, true);
+					remainingSize -= 8;
+					// rest is actual contents:
+					tree->digestString( file, isoPath + "value", remainingSize, false );
+				break;
+			case 0x64697575: // uuid
+				XMP_Uns8 uid[16];
+				tree->digest( file, isoPath + "uuidValue" , uid , 16 );
+				if ( ! strncmp( (const char*) kUUID_XMP, (const char*) uid, 16 ))
+					tree->addComment(" - the XMP UUID !");
+
+				break;
+
+			case 0x65657266: // free
+				tree->addComment( "free space" );
+				break;
+
+			// FULL BOXES (w/o container boxes, above) **********************************
+			case 0x6468766D: // mvhd, FULLBOX, movie-header-box
+				{
+					digestISOFullBoxExtension( file, isoPath, remainingSize, version, flags );
+					if ( version == 1 )
+					{
+						tree->digest64u(file,isoPath+ "creation_time",true,true);
+						tree->digest64u(file,isoPath+ "modification_time",true,true);
+						tree->digest32u(file,isoPath+ "timescale",true,true);
+						tree->digest64u(file,isoPath+ "duration",true,true);
+					} 
+					else if ( version == 0 )
+					{
+						tree->digest32u(file,isoPath+ "creation_time",true,true);
+						tree->digest32u(file,isoPath+ "modification_time",true,true);
+						tree->digest32u(file,isoPath+ "timescale",true,true);
+						tree->digest32u(file,isoPath+ "duration",true,true);					
+					} else
+					{
+						tree->addComment("WARNING: unknown mvhd version!");
+					}
+				// COULDDO more fields, but not needed right now.
+				}
+				break;
+			case 0x726C6468: // hdlr - handler reference
+			{
+				if ( isoPath != "moov/trak/mdia/hdlr/")
+					break;
+				if ( remainingSize < 4*4 )
+					break; // box too small...
+
+				digestISOFullBoxExtension( file, isoPath, remainingSize, version, flags );
+
+				tree->digestString( file, isoPath+"quickTimeType", 4, false );	// expecting: 'mhlr' - media handler
+				tree->digestString( file, isoPath+"subType", 4, false );		// expecting: 'tmcd' - timecode
+				tree->digestString( file, isoPath+"manufacturer", 4, false );		// e.g. 'appl'
+
+				break; // rest doesn't bother us...
+			}
+			case 0x64737473: // stsd - timecode sample description table
+			{
+				if ( isoPath != "moov/trak/mdia/minf/stbl/stsd/")
+					break;
+
+				// version (1 byte), flags (3 byte) - must be 0
+				assertMsg("stbl: version and flags must be zero", 0 == tree->digest32u( file, "", true ) ); 
+				// entryCount - must be 0
+				assertMsg("stbl: at least one entry needed", 1 <= tree->digest32u( file, "", true ) ); 			
+				remainingSize -= 8;
+
+				// only dump first occurence 
+				// ensure there's enough bytes for at least on stbl:
+				if ( remainingSize < 29 )
+					break;	// MPEG4/al_sbr_twi_22_1_fsaac22.mv4 has a box that is smaller than this...
+							// hence can only break, not throw
+				XMP_Int64 entrySize = (XMP_Int64) tree->digest32u( file, "", true, true );
+				std::string format = tree->digestString( file, "", 4, false ); // must be 'tmcd'
+				tree->pushNode( isoPath + format + "/" );
+				if ( format != "tmcd" )
+				{
+					tree->addComment("irrelevant node");
+					tree->popNode();
+					break; // different party...
+				}
+				
+				TimeCodeTrack = true; // we're in the right track
+
+				Skip( file, 6 ); // [6] reserved bytes
+				tree->digest16u( file, isoPath+"dataReferenceIndex", true, true ); // (ignored)
+				tree->addOffset( file );
+				Skip( file, 4 ); // uint32 reserved
+				tree->digest32u( file, isoPath+"flags", true, true );
+				tree->digest32u( file, isoPath+"timeScale", true, true );
+				tree->digest32u( file, isoPath+"frameDuration", true, true );
+				Skip( file, 2 ); // skip ignored frame count, reserved
+				
+				// ////////////////////////////// dig out 'trailing boxes'
+				// comparing "atom remains" vs. "entry" (probably must be '>='
+				
+				// deduct the already digested...
+				entrySize -= 34; // ( 4+4+6+2+4+4+4+4+1+1 )
+				remainingSize -= 34; // (the atom-level value)
+
+				assertMsg( "entry Size must be 0 or positive", entrySize >= 0 );
+				assertMsg( "must not overreach atom", entrySize <= remainingSize );
+
+				XMP_Int64 endOfTrailingBoxes = LFA_Tell(file) + remainingSize;
+				while ( LFA_Tell(file) < endOfTrailingBoxes )
+				{
+					LFA_Tell( file );
+					DumpISOBoxes( file, entrySize, isoPath );						
+					LFA_Tell( file );
+				}
+
+				assertMsg( "did not boil down to zero", LFA_Tell(file) == endOfTrailingBoxes );
+
+				tree->popNode();
+				break;
+			}
+
+			case 0x63737473: // stsc - timecode sample description table
+			{
+				if ( isoPath != "moov/trak/mdia/minf/stbl/stsc/")
+					break;
+				if ( !TimeCodeTrack )
+				{
+					tree->addComment("not tcmd -> not of interest");
+					break; // not of interest
+				}
+
+				// version (1 byte), flags (3 byte) - must be 0
+				assertMsg("stbl: version and flags must be zero", 0 == tree->digest32u( file, "", true ) ); 
+				// entryCount - must be 0
+				assertMsg("stbl: at least one entry needed", 1 <= tree->digest32u( file, "", true ) ); 			
+				remainingSize -= 8;
+
+				LFA_Tell( file );
+
+				tree->digest32u( file, isoPath+"firstChunkNo", true, true );
+				tree->digest32u( file, isoPath+"numSamplesPerChunk", true, true );
+				tree->digest32u( file, isoPath+"sampleDescriptionID", true, true );
+				
+				break;
+			}
+
+			case 0x6F637473: // stco - timecode sample description table
+			{
+				if ( isoPath != "moov/trak/mdia/minf/stbl/stco/")
+					break;
+				if ( !TimeCodeTrack )
+					break; // not of interest
+
+				// version (1 byte), flags (3 byte) - must be 0
+				assertMsg("stbl: version and flags must be zero", 0 == tree->digest32u( file, "", true ) ); 
+				// entryCount - must be 0
+				assertMsg("stbl: at least one entry needed", 1 <= tree->digest32u( file, "", true ) ); 			
+				remainingSize -= 8;
+
+				XMP_Int64 absOffset = tree->digest32u( file, isoPath+"absFileOffset32", true, true );
+				
+				// recklessly navigate to that timecode media sample, grab value, return to old position...
+				XMP_Int64 oldPos = LFA_Tell( file );
+				LFA_Seek( file, absOffset, SEEK_SET, 0 );
+				tree->digest32u( file, isoPath+"timecodeMediaSample", true, true );
+				LFA_Seek( file, oldPos, SEEK_SET, 0 );
+
+			}
+			case 0x34366F63: // co64 - timecode sample description table -> 64 bit offset
+			{
+				if ( isoPath != "moov/trak/mdia/minf/stbl/co64/")
+					break;
+
+				tree->digest64u( file, isoPath+"absFileOffset64", true, true );
+				break;
+			}
+
+			case 0x74727063: // cprt, FULLBOX
+				if ( isoPath == "moov/udta/cprt/")
+				{
+
+					digestISOFullBoxExtension( file, isoPath, remainingSize, version, flags );
+
+					// 1/8 byte ISO language padding = 1-bit value set to 0
+					// 1 7/8 bytes content language = 3 * 5-bits ISO 639-2 language code less 0x60
+					// - example code for english = 0x15C7
+					tree->digest16u(file,isoPath+"content language",true,true);
+					tree->addComment("(0x15C7 == english)");
+					// zero-terminated, actual string:
+					tree->digestString( file, isoPath+"value", 0 );
+				} else
+				{
+					// ISO - copyright (?)					
+					// a container box, hunt for 'data' atom by recursion:
+					bool ok;
+					XMP_Int64 keep = LFA_Tell( file );
+					DumpISOBoxes( file, remainingSize, isoPath );
+					LFA_Seek( file, keep, SEEK_SET, &ok );
+					assertMsg( "seek failed", ok );					
+				}
+				break;
+			case 0x64686B74: // tkhd, FULLBOX
+			case 0x6E61656D: // mean, FULLBOX
+			case 0x656D616E: // name, FULLBOX
+				{
+					if ( isoPath == "moov/trak/mdia/minf/stbl/stsd/name/" ) // this regrettably is a diffrent animal (international text sequence)
+						digestInternationalTextSequence( file, isoPath, &remainingSize );
+					else	
+						digestISOFullBoxExtension( file, isoPath, remainingSize, version, flags );
+				}
+				break;
+
+			// (c)-style quicktime boxes and boxes of no interest:
+			default:
+				break;
+		}
+
+		bool ok;
+		LFA_Seek( file, endOfBoxPos, SEEK_SET, &ok );
+		assertMsg("End-of-Box Seek failed (truncated file?)", ok ); 
+
+		tree->popNode();
+
+	} // while
+
+} // DumpISOBoxes()
+
+// attempt to combine dumping of mpeg-4 and quicktime (mov) into one routine...
+static void
+DumpISO ( LFA_FileRef file, XMP_Uns32 fileLen )
+{
+	TimeCodeTrack = false;
+
+	// see specificition at https://zerowing.corp.adobe.com/display/XMP/Embedding+Spec+MPEG4
+	DumpISOBoxes(file, fileLen, "" );
+	assertMsg("truncated file/last box reached beyond end?", LFA_Tell(file) == fileLen ); 
+}
+
+// =================================================================================================
+
+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);
+
+	LFA_Read ( file, &fieldSize, 4, true);
+	fieldSize = GetUns32LE (&fieldSize);
+	CaptureFileData (file, 0, fieldSize);
+	PrintOnlyASCII_8 (sDataPtr, fieldSize);
+
+}	// 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
+
+// =================================================================================================
+
+// 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
+
+// reads maxSize bytes from file (not "up to", exactly fullSize)
+// puts it into a string, sets respective tree property
+static void setFixedBEXTField ( LFA_FileRef file, std::string propName, XMP_Int64 fullSize )
+{
+		char* descriptionBuffer = new char[ fullSize + 2 ];
+		LFA_Read( file, descriptionBuffer, fullSize, true );
+		descriptionBuffer[fullSize]='\0'; // tack on, in case not contained
+		// parse till first \0
+		std::string description( descriptionBuffer );
+		tree->setKeyValue( propName, description) ;
+		delete[] descriptionBuffer;
+}
+
+struct ChunkSize64 // declare ChunkSize64 structure
+{
+	XMP_Uns32 chunkId; // chunk ID (i.e. "big1" - this chunk is a big one)
+	XMP_Uns64 chunkSize; //
+};
+
+struct DataSize64Chunk // declare DataSize64Chunk structure
+{
+	XMP_Uns32 chunkId; // ds64
+	XMP_Uns32 chunkSize; // 4 byte size of the ds64 chunk
+	XMP_Uns64 riffSize; // size of RF64 block
+	XMP_Uns64 dataSize; // size of data chunk
+	XMP_Uns64 sampleCount; // sample count of fact chunk	
+	XMP_Uns32 tableLength; // number of valid entries in array "table"
+	std::vector< ChunkSize64 > table;
+};
+
+
+
+static XMP_Uns64 parseRF64( LFA_FileRef file, DataSize64Chunk* rf64Sizes )
+{
+	XMP_Int64 chunkPos= LFA_Tell( file );
+	rf64Sizes->chunkId = tree->digest32u( file, "", false );
+	std::string ds64ChunkID_ST( fromArgs( "%.4s" , &rf64Sizes->chunkId) );
+	assertMsg("Not a valid RF64 file!", ds64ChunkID_ST == "ds64");
+
+	rf64Sizes->chunkSize = tree->digest32u( file, "", false );
+
+	XMP_Uns32 bitCnt = 0;
+	rf64Sizes->riffSize = tree->digest64u( file, "", false );
+	rf64Sizes->dataSize = tree->digest64u( file, "", false );
+	rf64Sizes->sampleCount = tree->digest64u( file, "", false );
+
+	rf64Sizes->tableLength = tree->digest32u( file, "", false );
+
+	bitCnt = 28;
+	
+	for ( XMP_Uns32 i = 0; i < rf64Sizes->tableLength ; i++ )
+	{
+		ChunkSize64 tmp;
+		tmp.chunkId = tree->digest32u( file, "", false );
+		tmp.chunkSize = tree->digest64u( file, "", false );
+		rf64Sizes->table.push_back( tmp );
+		
+		bitCnt += 12;
+	}
+
+	// is there a rest to skip?
+	XMP_Uns32 rest = rf64Sizes->chunkSize - bitCnt;
+	if ( rest != 0 )
+	{
+		Skip( file, rest );
+	}
+	// return correct RIFF size
+	return rf64Sizes->riffSize;
+
+}
+
+static XMP_Uns64 getRealSize( bool isOutermost, std::string chunkID, LFA_FileRef file, DataSize64Chunk* sizeChunk)
+{
+	if ( isOutermost )
+	{
+		return parseRF64( file, sizeChunk );
+	}
+	else
+	{
+		if (chunkID == "data")
+		{
+			return sizeChunk->dataSize;
+		} else
+		{
+			// search table
+			for ( XMP_Uns32 i = 0; i < sizeChunk->tableLength ; i++ )
+			{
+				std::string idString( fromArgs( "%.4s" , &sizeChunk->table[i].chunkId ) );
+				if ( idString == chunkID )
+				{
+					return sizeChunk->table[i].chunkSize;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+static void
+DumpRIFFChunk ( LFA_FileRef file, XMP_Int64 parentEnd, std::string origChunkPath, bool bigEndian=false, DataSize64Chunk* rf64Sizes = NULL )
+{
+
+	while ( LFA_Tell(file) < parentEnd )
+	{
+		bool isOutermost = origChunkPath.empty();
+
+		XMP_Int64 chunkPos= LFA_Tell( file );
+		XMP_Int64 fileSize= LFA_Measure( file );
+		XMP_Int64 fileTail = fileSize - chunkPos;
+
+		if ( fileTail < 8 )
+		{
+			tree->pushNode("** unknown bytes **");
+			tree->addOffset( file );			
+			tree->addComment("size: 0x%llX", fileTail );
+			Skip( file, fileTail );	// Already read the 8 byte header.
+			tree->popNode();
+		}
+		else
+		{
+			XMP_Uns32 tmp = tree->digest32u( file, "", true );
+			XMP_Uns32 chunkID = GetUns32BE(&tmp); // flip if necessary for LE systems
+
+			std::string idString( fromArgs( "%.4s" , &chunkID ) );
+
+			XMP_Int64 chunkSizeWOHeader = tree->digest32u( file, "", bigEndian );
+			XMP_Uns32 chunkType = 0;
+			std::string typeString = "";
+			// only RIFF and LIST contain subchunks...
+			bool hasSubChunks = (idString == "RIFF") || (idString == "RF64") ||(idString == "FORM") || (idString == "LIST")  || (idString == "APPL");
+
+			if (hasSubChunks)
+			{	
+				XMP_Uns32 tmp = tree->digest32u( file, "", true  );
+				chunkType = GetUns32BE(&tmp); // flip if necessary for LE systems
+				typeString =  fromArgs( "%.4s" , &chunkType ) ;
+			}
+			//get inner ID 'type' as in 'listType', 'fileType', ...
+			//XMP_Uns32 chunkType = tree->digest32u( file );
+
+			if ( chunkSizeWOHeader == 0xFFFFFFFF )  //RF64 size for children
+			{
+				chunkSizeWOHeader = getRealSize( isOutermost, idString, file, rf64Sizes );
+			}
+
+			XMP_Int64 chunkSize =  chunkSizeWOHeader + 8;// NB: XMPInt64 <- XMPUns32
+			//adding size of id and length field itself
+
+			// calculate size if size field seems broken
+			if (chunkSize > parentEnd)
+				chunkSize = parentEnd - chunkPos;			
+			
+
+			std::string chunkPath = isOutermost ? ( idString ) : (origChunkPath + "/" + idString);
+			
+			
+			// check special case of trailing bytes not in a valid RIFF structure
+			if ( isOutermost && idString != "RIFF"&& idString != "FORM" && idString != "RF64")
+			{
+				//dump undefined bytes till the end of the file
+				tree->pushNode("** unknown bytes **");
+				chunkSize = parentEnd - chunkPos; // get size through calculation (and not from size bytes) 
+				tree->addComment("offset 0x%llX, size: 0x%llX",chunkPos,  chunkSize );
+				Skip( file, chunkSize-8 );	// Already read the 8 byte header.
+				tree->popNode();
+			} 
+			else
+			{
+				
+				bool skipper=false;
+				if (hasSubChunks)
+				{	
+					if ( isOutermost )
+					{
+						assertMsg("level-0 chunk must be AVI, AVIX, WAVE, AIFF, AIFC", 
+							( typeString == "AVI " ) || ( typeString == "AVIX" ) || ( typeString == "WAVE" )
+							||( typeString == "AIFF" ) || ( typeString == "AIFC"));					
+					}
+
+					chunkPath = chunkPath + ":" + typeString;
+
+					tree->pushNode(	chunkPath );
+					tree->addComment("offset 0x%llX, size 0x%llX, size(w/o header) 0x%llX", chunkPos , chunkSize, chunkSizeWOHeader);
+
+					if ( isOutermost && idString == "RF64" )
+					{
+						tree->pushNode(	"RF64/ds64" );
+						tree->addComment("offset 0x%llX, size 0x%X, size(w/o header) 0x%X", chunkPos + 12, rf64Sizes->chunkSize + 8, rf64Sizes->chunkSize);
+						tree->setKeyValue( "riffSize", fromArgs( "0x%llX" , rf64Sizes->riffSize )) ;
+						tree->setKeyValue( "dataSize", fromArgs( "0x%llX" , rf64Sizes->dataSize )) ;
+						tree->setKeyValue( "sampleCount", fromArgs( "0x%llX" , rf64Sizes->sampleCount )) ;
+						tree->setKeyValue( "tableLength", fromArgs( "0x%X" , rf64Sizes->tableLength )) ;
+						tree->popNode();
+
+						DumpRIFFChunk( file, LFA_Tell(file) + chunkSize - 12 - rf64Sizes->chunkSize - 8 /* filesize + riff chunk size - riff header(12) - rf64 header(8) */, chunkPath, bigEndian, rf64Sizes );	// recurse!
+					}
+					if ( ( idString + ":" + typeString == "LIST:INFO" ) ||
+						 ( idString + ":" + typeString == "LIST:Tdat" ) ||
+						 ( idString + ":" + typeString == "RIFF:AVI " ) ||
+						 ( idString + ":" + typeString == "RIFF:AVIX" ) ||
+						 ( idString + ":" + typeString == "RIFF:WAVE" ) ||
+						 ( idString + ":" + typeString == "FORM:AIFF" ) ||
+						 ( idString + ":" + typeString == "FORM:AIFC" ) ||
+						 ( idString + ":" + typeString == "LIST:hdrl" ) ||
+						 ( idString + ":" + typeString == "LIST:strl" ) ||
+						 ( idString + ":" + typeString == "LIST:movi" ) 
+						 )
+					{						
+						DumpRIFFChunk( file, LFA_Tell(file) + chunkSize - 12, chunkPath, bigEndian, rf64Sizes );	// recurse!
+					}
+					else
+					{
+						Skip( file, chunkSize - 12 ); // skip it !
+					}
+					tree->popNode();
+				}
+				else if (idString.length() == 4) // check that we got a valid idString
+				{					
+
+					// now that LIST:movi gets dumped,
+					// skip some very frequent, irrelevant chunks, 
+					// otherwise the dump becomes unusably long...
+					std::string firstTwo = idString.substr(0,2);
+					std::string secondTwo = idString.substr(2,2);
+					if ( secondTwo == "db" || secondTwo == "dc" || secondTwo == "wb" ) // nb: _could_ colidde, requiring additional numeric test
+					{
+						 skipper = true;
+					}
+					
+					if ( ! skipper )
+					{
+						tree->pushNode(	chunkPath );
+						//Log::info( chunkPath );
+						tree->addComment("offset 0x%llX, size 0x%llX, size(w/o header) 0x%llX", chunkPos , chunkSize, chunkSizeWOHeader);
+					}
+
+					// tackle chunks of interest //////////////////////////////////////////////
+					bool isListInfo =
+						( (origChunkPath == "RIFF:WAVE/LIST:INFO" || origChunkPath == "RIFF:AVI /LIST:INFO" )
+						&& idString.at(0) == 'I' ); // so far all mapping relevant props begin with "I"
+
+					bool isListTdat = (origChunkPath == "RIFF:WAVE/LIST:Tdat" || origChunkPath == "RIFF:AVI /LIST:Tdat")
+								&& idString.at(0) != 'J' ; // just exclude JUNK/Q
+
+					bool isDispChunk = 
+						( ( origChunkPath == "RIFF:WAVE" || origChunkPath == "RIFF:AVI ")
+							&& idString == "DISP" );
+
+					bool isBextChunk = 
+						( ( origChunkPath == "RIFF:WAVE" || origChunkPath == "RIFF:AVI ")
+							&& idString == "bext" );
+
+					bool isIXMLChunk = 
+						( ( origChunkPath == "RIFF:WAVE" )
+						&& idString == "iXML" );
+
+					bool isXMPchunk = false; //assume beforehand
+					if ( idString == "_PMX" ) 
+					{	// detour first, to detect xmp in wrong places
+						assertMsg( "XMP packet found in wrong place!", 
+							( origChunkPath == "RIFF:WAVE" || "RIFF:AVI" || "RIFF:AVIX" ) ); //be very linient here.
+						isXMPchunk = true;
+					}
+
+					// deal with chunks of interest /////////////////////////////////////////////
+					// a little prelude for disp chunk
+					if ( isDispChunk )
+					{	
+						XMP_Uns32 dispChunkType = LFA_ReadUns32_LE(file);
+						// only dispChunks starting with a 0x0001 are of interest to us.
+						// others do exist and are not an error
+
+						if ( dispChunkType != 0x0001 )
+							isDispChunk = false;
+
+						chunkSize -= 4;
+					}
+
+					if ( isListInfo || isListTdat || isDispChunk )
+					{
+						// dump that string:
+						std::string value;
+
+						if ( chunkSize > 8 ) // aka skip for empty chunks
+						{
+							// first check if the string is zero terminated
+							LFA_Seek( file , chunkSize - 8 - 1, SEEK_CUR ); // jump to last char
+							bool zeroTerm =  (LFA_ReadUns8( file ) == 0);
+							LFA_Seek( file , -(chunkSize - 8 ), SEEK_CUR ); //jump back
+							// some strings are zero-terminated (so despite initial length they are "c-strings"
+							// others are not ( "pascal strings" if you will.
+							// must cater to both: zero-terminated-ness should not affect resulting value.
+							if (zeroTerm)
+							{
+								// read string without zero (last char)
+								value = tree->digestString( file, "" , chunkSize - 8 - 1, false );						
+								tree->addComment(" zero terminated");
+								LFA_ReadUns8( file ); // skip the zero
+							} 					
+							else
+							{
+								// read string including last char
+								value = tree->digestString( file, "" , chunkSize - 8 , false );						
+								tree->addComment(" not zero terminated");						
+							}
+							tree->changeValue( value );
+						}
+
+						tree->changeValue( value );
+					}
+					else if ( isXMPchunk )
+					{
+						tree->pushNode("XMP packet");
+
+						tree->addOffset( file );
+						tree->addComment("packet size: 0x%llX", chunkSize - 8 );
+						Skip( file, chunkSize - 8 );
+						tree->addComment("packet end: 0x%llX", LFA_Tell( file ) );
+						
+						tree->popNode();
+					}
+					else if ( isBextChunk )
+					{
+						tree->pushNode("bext chunk");
+						tree->addOffset( file );
+						tree->addComment("packet size: 0x%llX", chunkSize - 8 );
+
+						// I assume that the minimum BEXT chunk size is 602:
+						// > 8 + ( 256+32+32+10+8+4+4+2+64+190+0 )
+						// ans = 610
+						const XMP_Int64 MIN_BEXT_SIZE = 610;
+						assertMsg("minimum Berx Chunk Size", chunkSize >= MIN_BEXT_SIZE );
+						XMP_Int64 BEXT_CodingHistorySize = chunkSize - MIN_BEXT_SIZE;
+
+						setFixedBEXTField ( file, chunkPath+".Description"          , 256 );
+						setFixedBEXTField ( file, chunkPath+".Originator"           , 32  );
+						setFixedBEXTField ( file, chunkPath+".OriginatorReference"  , 32  );
+						setFixedBEXTField ( file, chunkPath+".OriginationDate"      , 10  );
+						setFixedBEXTField ( file, chunkPath+".OriginationTime"      , 8   );
+				
+						tree->digest32u( file, chunkPath+".TimeReferenceLow", false, true );  // DWORD == 32 Bit
+						tree->digest32u( file, chunkPath+".TimeReferenceHigh", false, true ); // DWORD == 32 Bit
+
+						tree->digest16u( file, chunkPath+".Version", false, true );
+						
+						// UMID has 64 bytes:
+						tree->digestString(file, chunkPath+".UMID",64);
+						//tree->digest32u( file, chunkPath+".UMID_0-4", false, true );
+						//tree->setKeyValue( "UMID_5-59" );
+						//Skip( file, 64 - 4 - 4 );
+						//tree->digest32u( file, chunkPath+".UMID_60-63", false, true );
+
+						tree->setKeyValue( chunkPath+".Reserved" );
+						Skip( file, 190 );
+						
+						if ( BEXT_CodingHistorySize )
+						{
+							setFixedBEXTField ( file, chunkPath+".CodingHistory"          , BEXT_CodingHistorySize );
+							
+							//tree->setKeyValue( chunkPath+".CodingHistory" ); // not bothering details.
+							tree->addComment( "( 0x%llx bytes ) ", BEXT_CodingHistorySize );
+							//Skip( file, BEXT_CodingHistorySize );
+						}
+
+						tree->addComment("packet end: 0x%llX", LFA_Tell( file ) );				
+						tree->popNode();
+					} else if ( isIXMLChunk ) {
+						tree->pushNode("iXML packet");
+
+						tree->addOffset( file );
+						tree->addComment("packet size: 0x%llX", chunkSize - 8 );
+						//Skip( file, chunkSize - 8 );
+
+						size_t sizeofIXMLValue = chunkSize-8;
+						char* descriptionBuffer = new char[ sizeofIXMLValue + 2 ];
+						LFA_Read( file, descriptionBuffer, sizeofIXMLValue, true );
+						descriptionBuffer[sizeofIXMLValue]='\0'; // tack on, in case not contained
+						// parse till first \0
+						std::string description( descriptionBuffer );
+
+						delete[] descriptionBuffer;
+						tree->addComment("packet end: 0x%llX", LFA_Tell( file ) );
+
+						tree->popNode();
+						
+					}
+					else
+					{
+						Skip( file, chunkSize - 8 ); // skip remainder of chunk ( id, length already digested )
+						assertMsg(  fromArgs( "inner chunk size too big, curPos:0x%llx, parentEnd:0x%llx", 
+											LFA_Tell(file), 
+											parentEnd ), 
+									LFA_Tell(file) <= parentEnd );				
+					}			
+			
+					if ( ! skipper )
+						tree->popNode();
+				}
+				else
+				{
+					//dump undefined bytes in LIST
+					tree->pushNode("** unknown bytes **");
+					tree->addOffset( file );
+					tree->addComment("size: 0x%llX", chunkSize );
+					Skip( file, chunkSize - 8 );
+					tree->popNode();
+				}
+
+				if ( LFA_Tell(file) % 2 == 1 ) // if odd file position, add pad byte.
+				{
+					if (LFA_Tell(file) == parentEnd)
+					{
+						// last pad byte is missing
+						tree->addComment(" (pad byte missing [bug 1521093])");
+					} 
+					else
+					{
+						XMP_Uns8 padByte = LFA_ReadUns8( file );
+						if (!skipper)
+						{
+							if ( 0 != padByte ) 
+								tree->addComment(" (non-zero pad byte!)");
+							else 
+								tree->addComment(" (pad byte)");
+						}
+					}
+				}
+			}
+		}
+	} // while
+
+	
+}	// DumpRIFFChunk
+
+// =================================================================================================
+
+static void
+DumpRIFF ( LFA_FileRef file, XMP_Int64 fileLen )
+{
+	DataSize64Chunk rf64Sizes;
+	DumpRIFFChunk ( file, fileLen, "",false, &rf64Sizes );
+}
+
+static void
+DumpAIFF ( LFA_FileRef file, XMP_Int64 fileLen )
+{
+	DumpRIFFChunk ( file, fileLen, "", true );
+}
+// =================================================================================================
+
+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
+DumpPS ( LFA_FileRef file, XMP_Uns32 fileLen )
+{
+	XMP_Int32 psOffset;
+	size_t psLength;
+
+	LFA_Seek ( file, 4, SEEK_SET ); // skip fileheader bytes
+	LFA_Read ( file,  &psOffset, 4, true );
+	LFA_Read ( file,  &psLength, 4, true );
+
+	tree->addComment(" psOffset: %d, psLength: %d", psOffset, psLength);
+
+	// jump to psOffset
+	Skip(file, (psOffset - 12));
+	
+	// get the header (everything till first %
+	
+	XMP_Int64 offset =  LFA_Tell(file);
+	std::string key, value;
+	char byte = LFA_GetChar(file);
+	bool eof = false;
+	while ( !eof )
+	{
+		key.clear();
+		key += byte; // add the first %
+		byte = LFA_GetChar(file);
+
+		while (byte != ' ' && byte != '\r') // get everthing until next space or LF
+		{
+			key += byte;
+			byte = LFA_GetChar(file);
+
+		}
+
+		//if (CheckBytes( key.c_str(), "%%EOF", 5))
+		if (key == "%%EOF")
+		{
+			eof = true;
+		}
+		else
+		{
+			byte = LFA_GetChar(file);
+			value.clear();
+			while (byte != '%') // get everthing until next %
+			{
+				value += byte;
+				byte = LFA_GetChar(file);
+			}
+		}
+		tree->pushNode(key);
+		tree->addOffset( file );
+	
+		//for now only store value for header 
+		if ( key =="%!PS-Adobe-3.0" )
+		{
+			tree->changeValue(value);
+		}
+	
+		tree->addComment("offset: %d", offset );
+		tree->addComment("size: 0x%llX", LFA_Tell(file)-offset );
+		tree->popNode();
+		
+		offset =  LFA_Tell(file);		
+	}
+	// Now just get everything else and store all keys that start with %
+
+
+	// get the key 
+	// start of the PostScript DSC header comment
+	
+	/*XMP_Uns8 buffer [11];
+	LFA_Read ( file,  &buffer, sizeof(buffer), true );
+
+	if (!CheckBytes( buffer, "%!PS-Adobe-", 11))
+	{
+		tree->comment ( "** Invalid PS, unknown PS file tag." );
+		return;
+	}
+
+	// Check the PostScript DSC major version number.
+	XMP_Uns8 byte;
+	LFA_Read ( file,  &byte, sizeof(byte), true );
+
+	psMajorVer = 0;
+	while ( IsNumeric( byte ) ) 
+	{
+		psMajorVer = (psMajorVer * 10) + (byte - '0');
+		if ( psMajorVer > 1000 ) {
+			tree->comment ( "** Invalid PS, Overflow." );
+			return;
+		};	// Overflow.
+		LFA_Read ( file,  &byte, sizeof(byte), true );
+	}
+	if ( psMajorVer < 3 ){
+		tree->comment ( "** Invalid PS, The version must be at least 3.0." );
+		return;
+	};	// The version must be at least 3.0.
+
+	if ( byte != '.' ){
+		tree->comment ( "** Invalid PS, No minor number" );
+		return;
+	};	// No minor number.
+	LFA_Read ( file,  &byte, sizeof(byte), true );
+
+	// Check the PostScript DSC minor version number.
+
+	psMinorVer = 0;
+	while ( IsNumeric( byte ) ) 
+	{
+		psMinorVer = (psMinorVer * 10) + (byte - '0');
+		if ( psMinorVer > 1000 ) {
+			tree->comment ( "** Invalid PS, Overflow." );
+			return;
+		};	// Overflow.
+		LFA_Read ( file,  &byte, sizeof(byte), true );
+	}
+
+	tree->addComment(" psMajor Version: %d, psMinor Version: %d", psMajorVer, psMinorVer);*/
+}
+
+// =================================================================================================
+
+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), false);
+	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)) / 8) + 1;
+	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->pushNode(	"File Header" );
+	tree->addComment ( "%scompressed, version %d, full length %d, frame rate %d, frame count %d",
+					(isCompressed ? "" : "un"), fileVersion, fullLength, frameRate, frameCount );
+	tree->popNode();
+	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), false);
+
+		
+		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 < 4 ) {
+				tree->comment ( "** Invalid SWF, FileAttributes tag is too short at offset %u (0x%X).", tagOffset, tagOffset );
+				continue;
+			}
+			
+			XMP_Uns32 xmpFlag = GetUns32LE(&(buffer[headerLength])) & 0x10;
+			if ( xmpFlag != 0 ) {
+				hasMetadata = true;
+			}
+			
+			tree->pushNode(	"FileAttributes tag" );
+			tree->addComment ( "Offset %d (0x%X), %s XMP", tagOffset, tagOffset, (hasMetadata ? "has" : "no") );
+			tree->popNode( );
+
+		} 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->pushNode(	"Metadata tag" );
+			tree->addComment ( "Offset %d (0x%X)", tagOffset, tagOffset );
+			tree->popNode( );
+
+			if ( sXMPPtr != 0 ) {
+				tree->comment ( "  ** Redundant Metadata tag" );
+			} else {
+				CaptureXMPF ( file, (tagOffset + headerLength), dataLength );
+			}
+
+			//if ( sXMPPtr != 0 ) DumpXMP ( "SWF Metadata tag (#77) XMP" );
+
+		} else {
+			tree->pushNode(	"tag #%d", tagType );
+			tree->addComment ( "Offset %d (0x%X)", tagOffset, tagOffset );
+			tree->popNode( );
+		}
+		
+	}	
+	
+}	// 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 );
+			if (int(u16) < 4096 )
+			{
+				tree->addComment ( "string (%d) = \"%.*s\"", u16, u16, buffer );
+			} else {
+				tree->addComment ( "string (%d) ", u16 );
+			}
+			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 ( label );
+		tree->addComment ( 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;
+
+	switch ( encoding ) {
+		case 0 :
+			tree->addComment ( "Latin1" );
+			break;
+		case 1 :
+			if ( *strPtr == 0xFF ) bigEndian = false;
+			tree->addComment ( "UTF-16 with BOM, %s)", (bigEndian ? "BE" : "LE") );
+			break;
+		case 2 :
+			tree->addComment ( "UTF-16 BE" );
+			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 splitSize[4];
+};
+
+struct ID3_v22_FrameHeader {
+	char id[3];
+	XMP_Uns8 sizeHigh;
+	XMP_Uns16 sizeLow;
+};
+
+struct ID3_v23_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 DumpID3v22Frames ( LFA_FileRef file, XMP_Uns8 vMajor, XMP_Uns32 framePos, XMP_Uns32 frameEnd ) {
+
+	// Dump the frames in an ID3 v2.2 tag.
+
+	while ( (framePos < frameEnd) && ((frameEnd - framePos) >= 6) ) {
+
+		ID3_v22_FrameHeader frameHead;
+		LFA_Seek ( file, framePos, SEEK_SET );
+		LFA_Read ( file, &frameHead, sizeof(frameHead), true );
+
+		if ( CheckBytes ( frameHead.id, "\x0", 1 ) ) break;	// Assume into padding.
+		// FIXED: there could be just 1 or 2 or 3 bytes of padding total !!
+
+		XMP_Uns32 frameSize = ((XMP_Uns32)frameHead.sizeHigh << 16) + GetUns16BE(&frameHead.sizeLow);
+
+		tree->setKeyValue (
+				fromArgs ( "ID3v2:%.3s", frameHead.id ), "",	//no value yet, tree->changeValue() below
+				fromArgs ( "offset %d (0x%X), size %d", framePos, framePos, frameSize ) );
+
+		if ( frameSize == 0 ) {
+
+			// NOTHING TO DO HERE.
+			// i.e. on 0-byte frames, including known ones...
+			// ( i.e. the testcase of a (errorneous) TCON 0 byte frame )
+
+		} else if ( (frameHead.id[0] == 'T') ||(frameHead.id[0] == 'W')) { // Text and URL fields
+
+			CaptureFileData (file, 0, frameSize);
+			XMP_Uns8 encoding = 0;
+			XMP_Uns8 skip = 0;
+			if ( frameHead.id[0] == 'T' ) {	// URL field has no encoding byte
+				encoding = sDataPtr[0];
+				skip = 1;
+			}
+
+			bool bigEndian = PrintID3Encoding (encoding, (sDataPtr + skip));
+			if ( encoding == 0 ) {
+				tree->changeValue ( convert8Bit ( sDataPtr + skip, false, frameSize-skip ) );
+			} else {
+				tree->changeValue( convert16Bit( bigEndian, sDataPtr + skip, false, (frameSize - skip) ) );
+			}
+
+		} else if (CheckBytes (frameHead.id, "PRV", 3) && (frameSize >= 4)) {
+
+			// checking on the XMP packet
+			CaptureFileData ( file, 0, frameSize ); //NB: has side effect: sDataLen, sDataMax, sDataPtr
+			tree->changeValue ( convert8Bit ( sDataPtr, false, strlen((char*)sDataPtr) ) );
+			if ( CheckBytes ( sDataPtr, "XMP\x0", 4 ) ) {
+				CaptureXMPF ( file, (framePos + sizeof(frameHead) + 4), (frameSize - 4) );
+			}
+
+		} else if ( CheckBytes ( frameHead.id, "COM", 3 ) || CheckBytes ( frameHead.id, "ULT", 3 ) ) {
+
+			const char * descrLabel = "ID3v2:COM-descr";
+			if ( CheckBytes ( frameHead.id, "ULT", 3 ) ) descrLabel = "ID3v2:ULT-descr";
+
+			CaptureFileData ( file, 0, frameSize );
+			XMP_Uns8 * frameEnd2 = sDataPtr + frameSize;
+
+			XMP_Uns8   encoding = sDataPtr[0];
+			char *     lang     = (char*) (sDataPtr + 1);
+
+			tree->addComment ( "lang '%.3s'", lang );
+			bool bigEndian = PrintID3Encoding ( encoding, (sDataPtr + 4) );
+
+			if ( encoding == 0 ) {
+
+				XMP_Uns8 * descrPtr = sDataPtr + 4;
+				XMP_Uns8 * valuePtr = descrPtr;
+
+				while ( *valuePtr != 0 ) ++valuePtr;
+				++valuePtr;
+
+				size_t descrBytes = valuePtr - descrPtr - 1;
+				tree->changeValue ( convert8Bit ( valuePtr, false, frameEnd2 - valuePtr ) );
+				tree->setKeyValue ( descrLabel, convert8Bit ( descrPtr, false, descrBytes ).c_str() );
+
+			} else {
+
+				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*)frameEnd2 - valuePtr);
+
+				tree->changeValue (  convert16Bit ( bigEndian, (XMP_Uns8*) valuePtr, false, valueBytes ) );
+				tree->setKeyValue ( descrLabel, convert16Bit ( bigEndian, (XMP_Uns8*) descrPtr, false, descrBytes ).c_str() );
+
+			}
+
+		}
+
+		framePos += (sizeof(frameHead) + frameSize);
+
+	}
+
+	if ( framePos < frameEnd ) {
+		tree->setKeyValue ( "", "",
+			fromArgs ( "Padding assumed, offset %d (0x%X), size %d", framePos, framePos, (frameEnd - framePos) ) );
+	}
+
+}	// DumpID3v22Frames
+
+// =================================================================================================
+
+static void DumpID3v23Frames ( LFA_FileRef file, XMP_Uns8 vMajor, XMP_Uns32 framePos, XMP_Uns32 frameEnd ) {
+
+	// Dump the frames in an ID3 v2.3 or v2.4 tag.
+
+	while ( (framePos < frameEnd) && ((frameEnd - framePos) >= 10) ) {
+
+		ID3_v23_FrameHeader frameHead;
+		LFA_Seek ( file, framePos, SEEK_SET );
+		LFA_Read ( file, &frameHead, sizeof(frameHead), true );
+
+		if ( CheckBytes ( frameHead.id, "\x0", 1 ) ) break;	// Assume into padding.
+		// FIXED: there could be just 1 or 2 or 3 bytes of padding total !!
+
+		frameHead.size = GetID3Size ( vMajor, &frameHead.size );
+		frameHead.flags = GetUns16BE ( &frameHead.flags );
+
+		tree->setKeyValue (
+				fromArgs ( "ID3v2:%.4s", frameHead.id ), "",	//no value yet, tree->changeValue() below
+				fromArgs ( "offset %d (0x%X), size %d, flags 0x%.2X", framePos, framePos, frameHead.size, frameHead.flags ) );
+
+		if ( frameHead.size == 0 ) {
+
+			// NOTHING TO DO HERE.
+			// i.e. on 0-byte frames, including known ones...
+			// ( i.e. the testcase of a (errorneous) TCON 0 byte frame )
+
+		} else if ( (frameHead.id[0] == 'T') ||(frameHead.id[0] == 'W')) { // Text and URL fields
+
+			CaptureFileData (file, 0, frameHead.size);
+			XMP_Uns8 encoding = 0;
+			XMP_Uns8 skip = 0;
+			if ( frameHead.id[0] == 'T' ) {	// URL field has no encoding byte
+				encoding = sDataPtr[0];
+				skip = 1;
+			}
+
+			bool bigEndian = PrintID3Encoding (encoding, (sDataPtr + skip));
+			if ( (encoding == 0) || (encoding == 3) ) {
+				tree->changeValue ( convert8Bit( sDataPtr + skip, false, frameHead.size-skip ) );
+			} else if ((encoding == 1) || (encoding == 2)) {
+				tree->changeValue( convert16Bit( bigEndian, sDataPtr + skip, false, (frameHead.size - skip) ) );
+			}
+
+		} else if (CheckBytes (frameHead.id, "PRIV", 4) && (frameHead.size >= 4)) {
+
+			// checking on the XMP packet
+			CaptureFileData ( file, 0, frameHead.size ); //NB: has side effect: sDataLen, sDataMax, sDataPtr
+			tree->changeValue ( convert8Bit ( sDataPtr, false, strlen((char*)sDataPtr) ) );
+			if ( CheckBytes ( sDataPtr, "XMP\x0", 4 ) ) {
+				CaptureXMPF ( file, (framePos + sizeof(frameHead) + 4), (frameHead.size - 4) );
+			}
+
+		} else if ( CheckBytes ( frameHead.id, "COMM", 4 ) || CheckBytes ( frameHead.id, "USLT", 4 ) ) {
+
+			const char * descrLabel = "ID3v2:COMM-descr";
+			if ( CheckBytes ( frameHead.id, "USLT", 4 ) ) descrLabel = "ID3v2:USLT-descr";
+
+			CaptureFileData ( file, 0, frameHead.size );
+			XMP_Uns8 * frameEnd2 = 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;
+
+				size_t descrBytes = valuePtr - descrPtr - 1;
+				tree->changeValue ( convert8Bit ( valuePtr, false, frameEnd2 - valuePtr ) );
+				tree->setKeyValue ( descrLabel, convert8Bit ( descrPtr, false, descrBytes ).c_str() );
+
+			} 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*)frameEnd2 - valuePtr);
+
+				tree->changeValue (  convert16Bit ( bigEndian, (XMP_Uns8*) valuePtr, false, valueBytes ) );
+				tree->setKeyValue ( descrLabel, convert16Bit ( bigEndian, (XMP_Uns8*) descrPtr, false, descrBytes ).c_str() );
+
+			}
+
+		}
+
+		framePos += (sizeof(frameHead) + frameHead.size);
+
+	}
+
+	if ( framePos < frameEnd ) {
+		tree->setKeyValue ( "", "",
+			fromArgs ( "Padding assumed, offset %d (0x%X), size %d", framePos, framePos, (frameEnd - framePos) ) );
+	}
+
+}	// DumpID3v23Frames
+
+// =================================================================================================
+
+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_v23_FrameHeader) == 10);
+
+	// Detect ID3v1 header:
+	if ( LFA_Measure( file ) > 128 )
+	{
+		LFA_Seek( file, -128, SEEK_END );
+		XMP_Uns32 tagID = 0xFFFFFF00 & LFA_ReadUns32_BE( file );
+		if ( tagID == 0x54414700 ) // must be "TAG"
+		{
+			// Dump ID3v1 header:
+			tree->pushNode("ID3v1");
+			Rewind( file, 1 ); // read one byte too many...
+
+			tree->digestString( file, "ID3v1:title", 30, false, true ); 
+			tree->digestString( file, "ID3v1:artist", 30, false, true ); 
+			tree->digestString( file, "ID3v1:album", 30, false, true ); 
+			tree->digestString( file, "ID3v1:year", 4, false, true ); 
+			tree->digestString( file, "ID3v1:comment", 30, false, true ); 
+			tree->digest( file, "ID3v1:genreNo", 0, 1 ); 
+
+			// ID3v1.1 trackNo byte dance:
+			Rewind( file, 3);
+			LFA_Tell( file );
+			if ( LFA_ReadUns8( file ) == 0 )
+				tree->digest( file, "ID3v1:trackNo", 0, 1 ); 
+
+			tree->popNode();
+		}
+	}
+
+	// Dump ID3v2 header:
+	ID3_Header id3Head;
+	LFA_Seek (file, 0, SEEK_SET);
+	LFA_Read ( file, &id3Head, sizeof(id3Head), true);
+
+	if (! CheckBytes (id3Head.id3, "ID3", 3)) {
+		tree->setKeyValue("No ID3v2 tag");
+		return;
+	}
+
+	XMP_Uns32 id3Len = GetSyncSafe32 (id3Head.splitSize);
+	XMP_Uns32 framePos = sizeof(id3Head);	// The offset of the next (first) ID3 frame.
+	XMP_Uns32 frameEnd = framePos + id3Len;
+
+	tree->pushNode("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 < 2) || (id3Head.vMajor > 4) ) {
+		tree->addComment("   ** Unrecognized major version tree.");
+		tree->popNode();
+		return;
+	}
+
+	bool hasExtHeader = ((id3Head.flags & 0x40) != 0);
+
+	// Dump the extended header if present.
+	if (hasExtHeader) {
+		XMP_Uns32 extHeaderLen;
+
+		extHeaderLen = tree->digest32u(file);
+		extHeaderLen = GetID3Size (id3Head.vMajor, &extHeaderLen);
+		framePos += (4 + extHeaderLen);
+
+		switch ( id3Head.vMajor ) {
+		
+			case 2: {
+				// #error "implement"
+				break;
+			}
+				
+			case 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->pushNode("Extended header MajorV3 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->setKeyValue( "CRC" , fromArgs("0x%.8X", crc) );
+				}
+				tree->popNode();
+				break;
+			}
+				
+			case 4: {
+				XMP_Uns8 flagCount;
+				LFA_Read ( file, &flagCount, 1, true );
+	
+				tree->pushNode("Extended header MajorV4 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->setKeyValue( fromArgs( "Flag %.2d", flag ) , fromArgs( "0x%.2X", flag ) );
+				}
+				tree->popNode();
+				break;
+			}
+			
+			default:
+				tree->addComment ( "unknown major version !" );
+				break;
+		
+		}
+
+	}
+
+	////////////////////////////////////////////////////
+	// Dump the ID3 frames
+	
+	if ( id3Head.vMajor == 2 ) {
+		DumpID3v22Frames ( file, id3Head.vMajor, framePos, frameEnd );
+	} else {
+		DumpID3v23Frames ( file, id3Head.vMajor, framePos, frameEnd );
+	}
+
+	if (sXMPPtr != 0) DumpXMP ("ID3 'PRIV' \"XMP\" frame");
+
+	tree->popNode();
+}	// DumpMP3
+
+// =================================================================================================
+
+static void
+PacketScan (LFA_FileRef file, XMP_Int64 fileLen)
+{
+	try {
+
+		XMPScanner 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();
+		XMPScanner::SnipInfoVector snips (snipCount);
+		scanner.Report (snips);
+
+		size_t packetCount = 0;
+
+		for (size_t s = 0; s < snipCount; ++s) {
+			if (snips[s].fState == XMPScanner::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, bool resetTree)
+{
+	DumpFile_NS::selfTest(); //calls selftest (will happen only once per runtime, optimization done)
+
+	if( resetTree )
+	{
+		tagTree.reset();
+	}
+
+	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 %lld (0x%llx)", 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 %lld (0x%llx)", 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 %lld (0x%llx)", 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_WMAVFile ) {
+
+		tagTree.pushNode ( "Dumping ASF (WMA/WMV) file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpASF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_AVIFile ) {
+
+		tagTree.pushNode ( "Dumping AVI file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpRIFF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_WAVFile ) {
+
+		tagTree.pushNode ( "Dumping WAV file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpRIFF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_AIFFFile ) {
+
+		tagTree.pushNode ( "Dumping AIFF file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpAIFF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_MPEG4File || format == kXMP_MOVFile || format == kXMP_JPEG2KFile ) {
+		// all ISO formats ( MPEG4, MOV, JPEG2000) handled jointly,
+		// - no longer relying on any advance "isQT" flagging
+		tagTree.pushNode ( "ISO file" );
+		Log::info("size: %d", fileLen );
+		tagTree.addComment ( "size %I64d (0x%I64X)", fileLen, fileLen );	
+		DumpISO( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_PNGFile ) {
+
+		tagTree.pushNode ( "Dumping PNG file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpPNG ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_InDesignFile ) {
+
+		tagTree.pushNode ( "Dumping InDesign file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpInDesign ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_SWFFile ) {
+
+		tagTree.pushNode ( "Dumping SWF file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpSWF ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_FLVFile ) {
+
+		tagTree.pushNode ( "Dumping FLV file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpFLV ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_MP3File ) {
+
+		tagTree.pushNode ( "Dumping MP3 file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpMP3 ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} else if ( format == kXMP_UCFFile ) {
+
+		tagTree.pushNode ( "Dumping UCF (Universal Container Format) file" );
+		tagTree.addComment ( "size %lld (0x%llx)", 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_PostScriptFile ) {
+
+		tagTree.pushNode ( "Dumping PostScript file" );
+		tagTree.addComment ( "size %lld (0x%llx)", fileLen, fileLen );	
+		DumpPS ( fileRef, fileLen );
+		tagTree.popNode();
+
+	} 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
+
+
+void DumpFile::dumpFile( std::string filename )
+{
+	TagTree localTree;
+	DumpFile::Scan( filename , localTree ); // (important test in itself for validity)
+	localTree.dumpTree();
+}
+
diff --git a/samples/source/common/DumpFile.h b/samples/source/common/DumpFile.h
new file mode 100644
index 0000000..3324dc5
--- /dev/null
+++ b/samples/source/common/DumpFile.h
@@ -0,0 +1,25 @@
+// =================================================================================================
+// 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 "samples/source/common/TagTree.h"
+#define IsNumeric( ch ) (ch >='0' && ch<='9' )
+
+class DumpFile {
+public:
+	static void Scan( std::string filename, TagTree &tagTree, bool resetTree = true );
+
+	/* dumps file to output, no strings attached Log::info() */
+	static void dumpFile( std::string filename );
+};
+
+#endif
+
diff --git a/samples/source/common/LargeFileAccess.hpp b/samples/source/common/LargeFileAccess.hpp
new file mode 100644
index 0000000..157d263
--- /dev/null
+++ b/samples/source/common/LargeFileAccess.hpp
@@ -0,0 +1,291 @@
+#ifndef __LargeFileAccess_hpp__
+#define __LargeFileAccess_hpp__	1
+
+// =================================================================================================
+// 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include <stdio.h>  // The assert macro needs printf.
+#include <string>
+
+#if XMP_WinBuild
+	#include <Windows.h>
+	#define snprintf _snprintf
+#else
+	#if XMP_MacBuild
+		#include <CoreServices/CoreServices.h>
+	#endif
+	// POSIX headers for both Mac and generic UNIX.
+	#include <pthread.h>
+	#include <fcntl.h>
+	#include <unistd.h>
+	#include <dirent.h>
+	#include <sys/stat.h>
+	#include <sys/types.h>
+#endif
+
+#include "public/include/XMP_Const.h"
+#include "source/EndianUtils.hpp"
+
+using namespace std;
+
+// =================================================================================================
+
+enum { // Used by LFA_Throw, re-route to whatever you need.
+	kLFAErr_InternalFailure = 1,
+	kLFAErr_ExternalFailure = 2,
+	kLFAErr_UserAbort = 3
+};
+
+void LFA_Throw ( const char* msg, int id );	
+
+
+#if ! XMP_UNIXBuild
+	typedef void * LFA_FileRef;
+#else
+	typedef XMP_Int32 LFA_FileRef;
+#endif
+
+// *** Change the model of the LFA functions to not throw for "normal" open/create errors.
+// *** Make sure the semantics of open/create/rename are consistent, e.g. about create of existing.
+
+extern LFA_FileRef	LFA_Open     ( const char* fileName, char openMode ); // Mode is 'r' or 'w'.
+extern LFA_FileRef	LFA_Create   ( const char* fileName );
+extern void			LFA_Delete   ( const char* fileName );
+extern void			LFA_Rename   ( const char* oldName, const char * newName );
+extern void			LFA_Close    ( LFA_FileRef file );
+
+#if XMP_MacBuild
+	extern LFA_FileRef LFA_OpenRsrc ( const char * filePath, char mode );
+#endif
+
+// NOTE: unlike the fseek() 'original' LFA_Seek returns the new file position,
+//       *NOT* 0 to indicate everything's fine
+extern XMP_Int64	LFA_Seek     ( LFA_FileRef file, XMP_Int64 offset, int seekMode, bool* okPtr = 0 );
+extern XMP_Int32	LFA_Read     ( LFA_FileRef file, void* buffer, XMP_Int32 bytes, bool requireAll = false );
+extern void			LFA_Write    ( LFA_FileRef file, const void* buffer, XMP_Int32 bytes );
+extern void			LFA_Flush    ( LFA_FileRef file );
+extern XMP_Int64	LFA_Tell     ( LFA_FileRef file );
+extern XMP_Int64	LFA_Rewind   ( LFA_FileRef file );
+extern XMP_Int64	LFA_Measure  ( LFA_FileRef file );
+extern void			LFA_Extend   ( LFA_FileRef file, XMP_Int64 length );
+extern void			LFA_Truncate ( LFA_FileRef file, XMP_Int64 length );
+
+extern void			LFA_Copy     ( LFA_FileRef sourceFile, LFA_FileRef destFile, XMP_Int64 length,	// Not a primitive.
+					               XMP_AbortProc abortProc = 0, void * abortArg = 0 );
+
+/* move stuff within a file (both upward and downward */
+extern void			LFA_Move     ( LFA_FileRef srcFile, XMP_Int64 srcOffset, LFA_FileRef dstFile, XMP_Int64 dstOffset,
+					               XMP_Int64 length, XMP_AbortProc abortProc = 0, void * abortArg = 0 );
+
+extern bool			LFA_isEof	( LFA_FileRef file );
+extern char			LFA_GetChar ( LFA_FileRef file );
+
+enum { kLFA_RequireAll = true };	// Used for requireAll to LFA_Read.
+
+// =================================================================================================
+// Read and convert endianess in one go:
+static inline XMP_Uns8 LFA_ReadUns8 ( LFA_FileRef file )
+{
+	XMP_Uns8 value;
+	LFA_Read ( file, &value, 1, kLFA_RequireAll );
+	return value;
+}
+
+static inline XMP_Uns16 LFA_ReadUns16_BE ( LFA_FileRef file )
+{
+	XMP_Uns16 value;
+	LFA_Read ( file, &value, 2, kLFA_RequireAll );
+	return MakeUns16BE ( value );
+}
+
+static inline XMP_Uns16 LFA_ReadUns16_LE ( LFA_FileRef file )
+{
+	XMP_Uns16 value;
+	LFA_Read ( file, &value, 2, kLFA_RequireAll );
+	return MakeUns16LE ( value );
+}
+
+static inline XMP_Uns32 LFA_ReadUns32_BE ( LFA_FileRef file )
+{
+	XMP_Uns32 value;
+	LFA_Read ( file, &value, 4, kLFA_RequireAll );
+	return MakeUns32BE ( value );
+}
+
+static inline XMP_Uns32 LFA_ReadUns32_LE ( LFA_FileRef file )
+{
+	XMP_Uns32 value;
+	LFA_Read ( file, &value, 4, kLFA_RequireAll );
+	return MakeUns32LE ( value );
+}
+
+// new:
+static inline XMP_Uns64 LFA_ReadUns64_BE ( LFA_FileRef file )
+{
+	XMP_Uns64 value;
+	LFA_Read ( file, &value, 8, kLFA_RequireAll );
+	return MakeUns64BE ( value );
+}
+
+static inline XMP_Uns64 LFA_ReadUns64_LE ( LFA_FileRef file )
+{
+	XMP_Uns64 value;
+	LFA_Read ( file, &value, 8, kLFA_RequireAll );
+	return MakeUns64LE ( value );
+}
+
+#define LFA_ReadInt16_BE(file) ((XMP_Int16) LFA_ReadUns16_BE ( file ))
+#define LFA_ReadInt16_LE(file) ((XMP_Int16) LFA_ReadUns16_LE ( file ))
+#define LFA_ReadInt32_BE(file) ((XMP_Int32) LFA_ReadUns32_BE ( file ))
+#define LFA_ReadInt32_LE(file) ((XMP_Int32) LFA_ReadUns32_LE ( file ))
+#define LFA_ReadInt64_BE(file) ((XMP_Int64) LFA_ReadUns64_BE ( file ))
+#define LFA_ReadInt64_LE(file) ((XMP_Int64) LFA_ReadUns64_LE ( file ))
+
+// peek functions /////////////////////////////////////////////
+// peek functions, to see what's next:
+static inline XMP_Uns8 LFA_PeekUns8(LFA_FileRef file)
+{
+	XMP_Uns8 value = LFA_ReadUns8( file );
+	LFA_Seek( file, -1, SEEK_CUR );
+	return value;
+}
+
+static inline XMP_Uns16 LFA_PeekUns16_BE(LFA_FileRef file)
+{
+	XMP_Uns16 value = LFA_ReadUns16_BE( file );
+	LFA_Seek( file, -2, SEEK_CUR );
+	return value;
+}
+
+static inline XMP_Uns16 LFA_PeekUns16_LE(LFA_FileRef file)
+{
+	XMP_Uns16 value = LFA_ReadUns16_LE( file );
+	LFA_Seek( file, -2, SEEK_CUR );
+	return value;
+}
+
+static inline XMP_Uns32 LFA_PeekUns32_BE(LFA_FileRef file)
+{
+	XMP_Uns32 value = LFA_ReadUns32_BE( file );
+	LFA_Seek( file, -4, SEEK_CUR );
+	return value;
+}
+
+static inline XMP_Uns32 LFA_PeekUns32_LE(LFA_FileRef file)
+{
+	XMP_Uns32 value = LFA_ReadUns32_LE( file );
+	LFA_Seek( file, -4, SEEK_CUR );
+	return value;
+}
+
+static inline XMP_Uns64 LFA_PeekUns64_BE(LFA_FileRef file)
+{
+	XMP_Uns64 value = LFA_ReadUns64_BE( file );
+	LFA_Seek( file, -8, SEEK_CUR );
+	return value;
+}
+
+static inline XMP_Uns64 LFA_PeekUns64_LE(LFA_FileRef file)
+{
+	XMP_Uns64 value = LFA_ReadUns64_LE( file );
+	LFA_Seek( file, -8, SEEK_CUR );
+	return value;
+}
+
+
+#define LFA_PeekInt16_BE(file) ((XMP_Int16) LFA_PeekUns16_BE ( file ))
+#define LFA_PeekInt16_LE(file) ((XMP_Int16) LFA_PeekUns16_LE ( file ))
+#define LFA_PeekInt32_BE(file) ((XMP_Int32) LFA_PeekUns32_BE ( file ))
+#define LFA_PeekInt32_LE(file) ((XMP_Int32) LFA_PeekUns32_LE ( file ))
+#define LFA_PeekInt64_BE(file) ((XMP_Int64) LFA_PeekUns64_BE ( file ))
+#define LFA_PeekInt64_LE(file) ((XMP_Int64) LFA_PeekUns64_LE ( file ))
+
+// write functions /////////////////////////////////////////////
+static inline void LFA_WriteUns8 ( LFA_FileRef file, XMP_Uns8 value )
+{
+	LFA_Write ( file, &value, 1 );
+}
+
+static inline void LFA_WriteUns16_LE ( LFA_FileRef file, XMP_Uns16 value )
+{
+	XMP_Uns16 v = MakeUns16LE(value);
+	LFA_Write ( file, &v, 2 );
+}
+
+static inline void LFA_WriteUns16_BE ( LFA_FileRef file, XMP_Uns16 value )
+{
+	XMP_Uns16 v = MakeUns16BE(value);
+	LFA_Write ( file, &v, 2 );
+}
+
+static inline void LFA_WriteUns32_LE ( LFA_FileRef file, XMP_Uns32 value )
+{
+	XMP_Uns32 v = MakeUns32LE(value);
+	LFA_Write ( file, &v, 4 );
+}
+
+static inline void LFA_WriteUns32_BE ( LFA_FileRef file, XMP_Uns32 value )
+{
+	XMP_Uns32 v = MakeUns32BE(value);
+	LFA_Write ( file, &v, 4 );
+}
+
+static inline void LFA_WriteUns64_LE ( LFA_FileRef file, XMP_Uns64 value )
+{
+	XMP_Uns64 v = MakeUns64LE(value);
+	LFA_Write ( file, &v, 8 );
+}
+
+static inline void LFA_WriteUns64_BE ( LFA_FileRef file, XMP_Uns64 value )
+{
+	XMP_Uns64 v = MakeUns64BE(value);
+	LFA_Write ( file, &v, 8 );
+}
+
+////////////////////////////////////////
+
+static inline void LFA_WriteInt16_LE ( LFA_FileRef file, XMP_Int16 value )
+{
+	XMP_Uns16 v = MakeUns16LE((XMP_Uns16)value);
+	LFA_Write ( file, &v, 2 );
+}
+
+static inline void LFA_WriteInt16_BE ( LFA_FileRef file, XMP_Int16 value )
+{
+	XMP_Uns16 v = MakeUns16BE((XMP_Uns16)value);
+	LFA_Write ( file, &v, 2 );
+}
+
+static inline void LFA_WriteInt32_LE ( LFA_FileRef file, XMP_Int32 value )
+{
+	XMP_Uns32 v = MakeUns32LE((XMP_Uns32)value);
+	LFA_Write ( file, &v, 4 );
+}
+
+static inline void LFA_WriteInt32_BE ( LFA_FileRef file, XMP_Int32 value )
+{
+	XMP_Uns32 v = MakeUns32BE((XMP_Uns32)value);
+	LFA_Write ( file, &v, 4 );
+}
+
+static inline void LFA_WriteInt64_LE ( LFA_FileRef file, XMP_Int64 value )
+{
+	XMP_Uns64 v = MakeUns64LE((XMP_Uns64)value);
+	LFA_Write ( file, &v, 8 );
+}
+
+static inline void LFA_WriteInt64_BE ( LFA_FileRef file, XMP_Int64 value )
+{
+	XMP_Uns64 v = MakeUns64BE((XMP_Uns64)value);
+	LFA_Write ( file, &v, 8 );
+}
+
+
+#endif	// __LargeFileAccess_hpp__
diff --git a/samples/source/common/Log.cpp b/samples/source/common/Log.cpp
new file mode 100644
index 0000000..b39ecd1
--- /dev/null
+++ b/samples/source/common/Log.cpp
@@ -0,0 +1,252 @@
+// =================================================================================================
+// 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.
+//
+// =================================================================================================
+
+/*
+*
+* 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 "samples/source/common/globals.h"
+#include "samples/source/common/Log.h"
+using namespace std;
+
+//static variables ////////////////////////////////////////////////////////////////////
+FILE* Log::logfile=NULL;
+bool Log::noErrorsOrWarnings=true;
+bool Log::mute=false;
+bool Log::muteWarnings=false;
+
+// strings for skipped test information
+std::string Log::skippedTestsAll;
+std::string Log::skippedTestsWin;
+std::string Log::skippedTestsMac;
+std::string Log::skippedTestsUnix;
+//////////////////////////////////////////////////////////////////////////////////////
+
+/* 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());
+}
+
+void Log::error( std::string s1 )
+{
+	error( s1.c_str() );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// skipped tests
+void Log::printSkippedTest(const char* filename)
+{
+	std::string completeString = "<html><head><title>Skipped Tests:</title><head><body>";
+	if (!skippedTestsAll.empty())
+		completeString.append("<br><br><table border=\"1\"><caption>all Plattforms:</caption><tr><th>Path to Test</th><th>comment</th></tr>"+skippedTestsAll + "</table>");
+	if (!skippedTestsWin.empty())
+		completeString.append("<br><br><table border=\"1\"><caption>Windows:</caption><tr><th>Path to Test</th><th>comment</th></tr>"+skippedTestsWin+ "</table>");
+	if (!skippedTestsMac.empty())
+		completeString.append("<br><br><table border=\"1\"><caption>Macintosh:</caption><tr><th>Path to Test</th><th>comment</th></tr>"+skippedTestsMac+ "</table>");
+	if (!skippedTestsUnix.empty())
+		completeString.append("<br><br><table border=\"1\"><caption>UNIX:</caption><tr><th>Path to Test</th><th>comment</th></tr>"+skippedTestsUnix+ "</table>");
+
+	completeString.append("</body></html>");
+	// print to console if mute is off
+	/*if (!Log::mute)
+		printf(completeString.c_str());*/
+
+	//print result to file
+	FILE* outputFile=fopen(filename,"wt");
+	if (!outputFile) {
+		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");
+	}
+	fprintf( outputFile, "%s", completeString.c_str());
+	if(outputFile) {
+		fclose(outputFile);
+	}
+
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+// 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..e6e0a49
--- /dev/null
+++ b/samples/source/common/Log.h
@@ -0,0 +1,97 @@
+// =================================================================================================
+// 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.
+//
+// =================================================================================================
+
+#ifndef __Log_h__
+#define __Log_h__ 1
+
+#include "public/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);
+		static void error( 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)
+
+		// strings to store the skipped test for different plattforms
+		static std::string skippedTestsAll;
+		static std::string skippedTestsWin;
+		static std::string skippedTestsMac;
+		static std::string skippedTestsUnix;
+
+		// function to print the skipped tests on console and into a log file
+		static void printSkippedTest(const char* filename);
+
+	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/TagTree.cpp b/samples/source/common/TagTree.cpp
new file mode 100644
index 0000000..7dfe369
--- /dev/null
+++ b/samples/source/common/TagTree.cpp
@@ -0,0 +1,737 @@
+// =================================================================================================
+// 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.
+//
+// =================================================================================================
+
+/*
+* 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 "samples/source/common/TagTree.h"
+#include <stdarg.h>
+
+// silent by default
+bool TagTree::verbose = false;
+
+#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";
+	reset();
+}
+
+TagTree::~TagTree()
+{
+
+}
+
+void TagTree::reset()
+{
+	tagMap.clear();
+	nodeStack.clear();
+	rootNode.children.clear();
+	nodeStack.push_back(&rootNode);
+	lastNode = NULL;
+}
+
+
+// verbosity control:
+void TagTree::setMute()
+{
+	TagTree::verbose = false;
+}
+
+void TagTree::setVerbose()
+{
+	TagTree::verbose = true;
+}
+
+
+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;
+
+	if ( verbose )
+		Log::info( "    setKeyValue( %s |-> %s) [%s]", key.c_str(), value.c_str(), _comment.c_str() );
+}
+
+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];
+
+										// require all == false => leave the throwing to this routine
+	if (numOfBytes != LFA_Read ( file, value, numOfBytes, false))	// 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);
+#if !IOS_ENV
+	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,"%c",'\0'); // *) using i one more time (needed while bug 1613297 regarding snprintf not fixed)
+		setKeyValue(key,out);
+	}
+#else
+    char* out=new char[2 + numOfBytes*9 + 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*9],10,"%.8X ",value[i]); //always must allow that extra 0-byte on mac (overwritten again and again)
+		snprintf(&out[2+i*9],1,"%c",'\0'); // *) using i one more time (needed while bug 1613297 regarding snprintf not fixed)
+		setKeyValue(key,out);
+	}
+
+#endif
+    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, false)) // require all == false => leave the throwing to this routine
+		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,"%lld",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, false)) // require all == false => leave the throwing to this routine
+		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 , "%llu" , r);
+			#endif
+		}
+		else
+		{	
+			//not working, upper 32 bit empty:  			
+			#if WIN_ENV
+				snprintf( out , 24 , "0x%.16I64X" , r );
+			#else
+				snprintf( out , 24 , "0x%.16llX" , 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, false)) // require all == false => leave the throwing to this routine
+		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, false)) // require all == false => leave the throwing to this routine
+		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, false)) // require all == false => leave the throwing to this routine
+		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, false)) // require all == false => leave the throwing to this routine
+		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 */, bool allowEarlyZeroTerm /* =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);
+
+		// allow early zero termination (useful for fixed length field that may or may not end prematurely)
+		if ( allowEarlyZeroTerm && ( ch == 0 ) && ( length != 0 ) )
+		{
+			i++;
+			LFA_Seek( file, length - i, SEEK_CUR ); // compensate for skipped bytes
+			break;
+		}
+
+		if ( (0x20 <= ch) && (ch <= 0x7E) ) 
+		{	//outside-case
+			if ( outside )
+				r.push_back('>');
+			r.push_back(ch);
+			outside = false;
+		} else {
+			if ( (length==0) && (ch == '\0' ) )
+				break; // lenght zero => watch for zero termination...
+			if ( !outside ) 
+				r.push_back('<');	//first inside
+			else if (!((length==0) && (ch =='\0')))
+				r.push_back(' ');	//further inside (except very last)
+			outside = true;
+			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() );
+
+	if ( verbose )
+		Log::info( "pushing %d: %s",nodeStack.size(), key.c_str() );
+}
+
+//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()
+{
+	// FOR DEBUGGING Log::info( "pop %d",nodeStack.size() );
+
+	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;
+
+	if ( verbose )
+		Log::info( "    addComment: %s", _comment.c_str() );
+}
+
+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%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 ) ? " ":"",
+						// standalong comments don't need extra indentation:
+						pNode->comment.size() && ( pNode->key.size() || pNode->value.size() )?
+							((std::string("\n    ")+indent).c_str()) : "",
+						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;
+}
+
+unsigned int TagTree::getSubNodePos( const std::string nodeKey, const std::string parentKey, int skip )
+{
+	Node* parent = NULL;
+
+	if( parentKey.empty() )
+	{
+		parent = &rootNode.children.front();
+	}
+	else
+	{
+		if ( ! hasNode( parentKey ) )
+			Log::error( "parent key %s does not exist", parentKey.c_str() );
+
+		parent = tagMap[parentKey];
+	}
+
+	unsigned int pos = 1;
+	NodeListIter iter;
+	for( iter = parent->children.begin(); 
+		iter != parent->children.end() && ( !( (iter->key == (parentKey.empty() ? nodeKey : parentKey + nodeKey)) && skip--<=0 )) ;
+		iter++, pos++ );
+
+	if( iter == parent->children.end() ) 
+		pos = 0;
+
+	return pos;
+}
+
+
+XMP_Int64 TagTree::getNodeSize( const std::string nodeKey )
+{
+	string tmp = tagMap[nodeKey]->comment;
+	size_t startpos = tmp.find( "size" ) + 5;
+	if( startpos == string::npos )
+		return 0;
+	tmp = tmp.substr( startpos, tmp.find_first_of( ",", startpos ) );
+	
+	return strtol( tmp.c_str(), NULL, 0 );
+}
+
+
+bool TagTree::hasNode(const std::string key)
+{
+	if ( tagMap.count(key)==0 )
+		return false; //no such node
+	return true;
+}
+
+XMP_Int32 TagTree::getNodeCount(const std::string key)
+{
+	int count=1;
+	std::string extkey=key;
+	while( tagMap.count(extkey) )
+	{
+		count++;
+		extkey = key + "-" + itos(count);
+	}
+	return count-1;
+}
diff --git a/samples/source/common/TagTree.h b/samples/source/common/TagTree.h
new file mode 100644
index 0000000..857b141
--- /dev/null
+++ b/samples/source/common/TagTree.h
@@ -0,0 +1,200 @@
+// =================================================================================================
+// 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.
+//
+// =================================================================================================
+
+#ifndef TagTree_H
+#define TagTree_H
+
+#include <map>
+#include <list>
+#include <string>
+
+#include "source/EndianUtils.hpp"
+#include "public/include/XMP_Const.h" //needed for setKV convenience functions
+
+#include "samples/source/common/globals.h"
+#include "samples/source/common/Log.h"
+#include "samples/source/common/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;
+	typedef std::list<Node>::iterator NodeListIter;
+
+	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","");
+
+	// control verbosity to ease debugging:
+	static bool verbose;
+
+public:
+	TagTree();
+	~TagTree();
+
+	void reset();
+
+	// verbosity control (mute by default ) ===================================
+	void setMute();
+	void setVerbose();
+
+	//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 (otherwise things go up to the 0 anyway)
+	//  - 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, bool allowEarlyZeroTerm=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);
+	unsigned int getSubNodePos( const std::string nodeKey, const std::string parentKey = "", int skip = 0 );
+	XMP_Int64 getNodeSize( const std::string nodeKey );
+
+	//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);
+	XMP_Int32 getNodeCount(const std::string key);
+};
+
+#endif
diff --git a/samples/source/common/XMPScanner.hpp b/samples/source/common/XMPScanner.hpp
new file mode 100644
index 0000000..2d2d166
--- /dev/null
+++ b/samples/source/common/XMPScanner.hpp
@@ -0,0 +1,329 @@
+#ifndef __XMPScanner_hpp__
+#define __XMPScanner_hpp__
+
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+
+#include <list>
+#include <vector>
+#include <string>
+#include <memory>
+#include <stdexcept>
+
+// =================================================================================================
+// The XMPScanner 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 XMPScanner object.
+// =================================================================================================
+
+class XMPScanner {
+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 XMPScanner 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.
+
+	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 XMP_Uns8	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 XMP_Uns8	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) & XMPScanner::eChar16BitMask) != 0 )
+	#define CharFormIs32Bit(f)			( ((int)(f) & XMPScanner::eChar32BitMask) != 0 )
+
+	#define CharFormIsBigEndian(f)		( ((int)(f) & XMPScanner::eCharLittleEndianMask) == 0 )
+	#define CharFormIsLittleEndian(f)	( ((int)(f) & XMPScanner::eCharLittleEndianMask) != 0 )
+
+	struct SnipInfo {
+
+		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.
+		XMP_Int64		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, XMP_Int64 offset, XMP_Int64 length ) :
+			fOffset ( offset ),
+			fLength ( length ),
+			fState ( state ),
+			fOutOfOrder ( false ),
+			fAccess ( ' ' ),
+			fCharForm ( eChar8Bit ),
+			fEncodingAttr ( "" ),
+			fBytesAttr( -1 )
+		{ }
+
+	};
+
+	typedef std::vector<SnipInfo>	SnipInfoVector;
+
+	XMPScanner ( XMP_Int64 streamLength );
+	// Constructs a new XMPScanner object for a stream with the given length.
+
+	~XMPScanner();
+
+	long 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, 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.
+
+	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:	// XMPScanner
+
+	class PacketMachine;
+
+	class InternalSnip {
+	public:
+
+		SnipInfo	fInfo;							// The public info about this snip.
+		std::unique_ptr<PacketMachine>	fMachine;	// The state machine for "active" snips.
+
+		InternalSnip ( XMP_Int64 offset, XMP_Int64 length );
+		InternalSnip ( const InternalSnip & );
+		~InternalSnip ();
+
+	};	// InternalSnip
+
+	typedef std::list<InternalSnip>		InternalSnipList;
+	typedef InternalSnipList::iterator	InternalSnipIterator;
+
+	class PacketMachine {
+	public:
+
+		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.
+		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 ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 bufferLength );
+
+		PacketMachine ( XMP_Int64 bufferOffset, const void * bufferOrigin, XMP_Int64 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
+
+		};
+
+		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.
+
+		RecognizerKind	fRecognizer;	// Which recognizer is currently active.
+		signed long		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
+
+	XMP_Int64			fStreamLength;
+	InternalSnipList	fInternalSnips;
+
+	void
+	SplitInternalSnip ( InternalSnipIterator snipPos, XMP_Int64 relOffset, XMP_Int64 newLength );
+
+	InternalSnipIterator
+	MergeInternalSnips ( InternalSnipIterator firstPos, InternalSnipIterator secondPos );
+
+	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/common/globals.h b/samples/source/common/globals.h
new file mode 100644
index 0000000..1fb7cea
--- /dev/null
+++ b/samples/source/common/globals.h
@@ -0,0 +1,102 @@
+// =================================================================================================
+// Copyright 2007 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>
+
+	#include <cstdlib>	// Various libraries needed for gcc 4.x builds.
+	#include <cstring>
+	#include <cstdio>
+
+	//sanity check platform/endianess
+	#if !defined(WIN_ENV) && !defined(MAC_ENV) && !defined(UNIX_ENV) && !defined(IOS_ENV)
+		#error "XMP environment error - must define one of MAC_ENV, WIN_ENV, UNIX_ENV or IOS_ENV"
+	#endif
+
+	#ifdef WIN_ENV
+		#define XMPQE_LITTLE_ENDIAN 1
+	#elif (defined(MAC_ENV) || defined(IOS_ENV))
+		#if __BIG_ENDIAN__
+			#define XMPQE_BIG_ENDIAN 1
+		#elif __LITTLE_ENDIAN__
+			#define XMPQE_LITTLE_ENDIAN 1
+		#else
+			#error "Neither __BIG_ENDIAN__ nor __LITTLE_ENDIAN__ is set"
+		#endif
+	#elif defined(UNIX_ENV)
+		#include "XMP_UnixEndian.h"
+		#if kBigEndianHost
+			#define XMPQE_BIG_ENDIAN 1
+		#else
+			#define XMPQE_BIG_ENDIAN 0
+		#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");
+	// if utf16LE
+	const std::string OMNI_BUGINESE_16LE("A<00 4E>B<8C 4E>C<D6 00>D<00 D8 51 DC>E");
+	// if utf16 BE
+	const std::string OMNI_BUGINESE_16BE("A<4E 00>B<4E 8C>C<00 D6>D<D8 00 DC 51>E");
+
+	// degraded version of omni-strings
+	// (sometimes useful for asserts after roundtrips, for setting values see OMNI_STRING in TestCase.h)
+	// ==> filed bug 2302354 on this issue.
+	#if WIN_ENV
+		// a *wrongly* degraded omni-string (non-BMP-char to ??)
+		const std::string DEG_OMNI_BUGINESE("A?B?C<C3 96>D??E");
+		// ditto albeit MacRoman encoding
+		const std::string MAC_OMNI_BUGINESE("A?B?C<85>D??E");
+	#else
+		// a *correctly* degraded omni-string (non-BMP-char to ?)
+		const std::string DEG_OMNI_BUGINESE("A?B?C<C3 96>D?E");
+		// ditto albeit MacRoman encoding
+		const std::string MAC_OMNI_BUGINESE("A?B?C<85>D?E");
+	#endif
+	//  -> #issue# the non-BMP character in OMNI_STRING between D and E gets converted
+	//      into two question marks (wrong) , not into one (correct)
+
+	const char AEOEUE_WIN_LOCAL_CSTRING[]={0xC4,0xD6,0xDC,'\0'};
+	const char AEOEUE_MAC_LOCAL_CSTRING[]={0x80,0x85,0x86,'\0'};
+	const char AEOEUE_UTF8_CSTRING[]={0xC3, 0x84, 0xC3, 0x96, 0xC3, 0x9C,'\0'};
+	const std::string AEOEUE_UTF8(AEOEUE_UTF8_CSTRING);
+	const std::string AEOEUE_UTF8_BUGINESE("<C3 84 C3 96 C3 9C>");
+
+	const std::string AEOEUE_WIN_LOCAL_BUGINESE("<C4 D6 DC>");
+	const std::string AEOEUE_MAC_LOCAL_BUGINESE("<80 85 86>");
+
+	const std::string AEOEUE_WIN_MOJIBAKE_BUGINESE("<E2 82 AC E2 80 A6 E2 80 A0>");
+	const std::string AEOEUE_MAC_MOJIBAKE_BUGINESE("<C6 92 C3 B7 E2 80 B9>");
+	const std::string AEOEUE_LATIN1_MOJIBAKE_BUGINESE("<C2 80 C2 85 C2 86>");
+
+	#if MAC_ENV || IOS_ENV
+		const std::string AEOEUE_LOCAL = std::string(AEOEUE_MAC_LOCAL_CSTRING);
+		const std::string AEOEUE_WIN_LOCAL_TO_UTF8 = AEOEUE_MAC_MOJIBAKE_BUGINESE;
+		const std::string AEOEUE_MAC_LOCAL_TO_UTF8 = AEOEUE_UTF8_BUGINESE;
+	#elif WIN_ENV
+		const std::string AEOEUE_LOCAL = std::string(AEOEUE_WIN_LOCAL_CSTRING);
+		const std::string AEOEUE_WIN_LOCAL_TO_UTF8 = AEOEUE_UTF8_BUGINESE;
+		const std::string AEOEUE_MAC_LOCAL_TO_UTF8 = AEOEUE_WIN_MOJIBAKE_BUGINESE;
+	#else
+		// windows local encoding will work for UNIX (Latin1), but mac will result MOJIBAKE
+		const std::string AEOEUE_WIN_LOCAL_TO_UTF8 = AEOEUE_UTF8_BUGINESE;
+		const std::string AEOEUE_MAC_LOCAL_TO_UTF8 = AEOEUE_LATIN1_MOJIBAKE_BUGINESE;
+	#endif
+
+#endif // XMPQE_GLOBALS_H
+
diff --git a/samples/source/xmpcommand/Actions.cpp b/samples/source/xmpcommand/Actions.cpp
new file mode 100644
index 0000000..c738930
--- /dev/null
+++ b/samples/source/xmpcommand/Actions.cpp
@@ -0,0 +1,439 @@
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+// 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 <cstdarg>
+#include <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+
+//XMP related
+#define TXMP_STRING_TYPE std::string
+#define XMP_INCLUDE_XMPFILES 1
+#include "public/include/XMP.hpp"			//NB: no XMP.incl_cpp here on purpose, gets compiled in main...
+#include "public/include/XMP_Const.h"
+
+#include "samples/source/common/globals.h"
+#include "samples/source/common/Log.h"
+#include "samples/source/xmpcommand/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;
+	}
+
+	/* 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;
+		case kXMP_UnknownFile:
+			fileFormatName = "    ";fileFormatDesc = "Unkown file format";break;
+		default:
+			fileFormatName = "    ";fileFormatDesc = "no known format constant";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_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_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;
+	}
+
+	//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);
+		return status;
+	}
+
+// ********************************************************************************
+
+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);
+
+#if XMP_WinBuild
+	Log::info("compiled on Windows on %s, %s",__DATE__,__TIME__);
+#endif
+#if XMP_MacBuild
+	Log::info("compiled on Mac on %s, %s",__DATE__,__TIME__);
+#endif
+#if NDEBUG
+	Log::info("Configuration: debug");
+#else
+	Log::info("Configuration: release");
+#endif
+	Log::info("Edition: Public SDK");
+#if XMPQE_BIG_ENDIAN
+	Log::info("Big endian machine");
+#elif 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=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;
+	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=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 {
+		std::string dump;
+		xmpMeta.DumpObject(DumpToString, &dump);
+		Log::info( dump );
+	}
+	
+	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;
+		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::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..471daba
--- /dev/null
+++ b/samples/source/xmpcommand/Actions.h
@@ -0,0 +1,53 @@
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#ifndef __ACTIONS_h__
+#define __ACTIONS_h__ 1
+
+// Hack because of the defines.
+#ifdef VERSION
+#undef VERSION
+#endif
+
+class Actions {
+	public:
+		enum ACTION_TYPE { NONE, VERSION, INFO, PUT, GET, DUMP };
+
+		//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 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..8f0fee1
--- /dev/null
+++ b/samples/source/xmpcommand/PrintUsage.cpp
@@ -0,0 +1,82 @@
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#include "samples/source/common/globals.h"
+#include "samples/source/common/Log.h"
+#include "samples/source/xmpcommand/PrintUsage.h"
+
+using namespace std;
+
+namespace XMPQE {
+
+	void PrintUsageShort(const 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(const 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("  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..b8d467b
--- /dev/null
+++ b/samples/source/xmpcommand/PrintUsage.h
@@ -0,0 +1,17 @@
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#ifndef __XMPQE_PRINT_USAGE_h__
+#define __XMPQE_PRINT_USAGE_h__ 1
+
+namespace XMPQE {
+	void PrintUsageShort(const char* exename);
+	void PrintUsageLong(const char* exename);
+}
+
+#endif
diff --git a/samples/source/xmpcommand/XMPCommand.cpp b/samples/source/xmpcommand/XMPCommand.cpp
new file mode 100644
index 0000000..670fc1b
--- /dev/null
+++ b/samples/source/xmpcommand/XMPCommand.cpp
@@ -0,0 +1,216 @@
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+/**
+* 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 <cstdio>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <sstream>
+
+#include "samples/source/common/globals.h"
+#include "samples/source/common/Log.h"
+#include "samples/source/common/LargeFileAccess.hpp"
+//some global constants / sanity checking
+
+
+#define EXENAME "xmpcommand"
+
+//XMP related
+#define TXMP_STRING_TYPE std::string
+#define XMP_INCLUDE_XMPFILES 1
+#include "public/include/XMP.hpp"
+#include "public/include/XMP.incl_cpp"		//include in EXACTLY one source file (i.e. main, in Action gets you trouble...)
+
+//QE related
+#include "samples/source/xmpcommand/Actions.h"
+// -help output
+#include "samples/source/xmpcommand/PrintUsage.h"
+
+
+namespace XMPQE {
+	void InitDependencies()
+	{
+		if ( ! SXMPMeta::Initialize() )
+			Log::error( "XMPMeta::Initialize failed!" );
+
+		XMP_OptionBits options = 0;
+		#if UNIX_ENV
+			options |= kXMPFiles_ServerMode;
+		#endif
+		
+		if ( ! SXMPFiles::Initialize ( options ) )
+			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("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/testfiles/BlueSquare.ai b/samples/testfiles/BlueSquare.ai
new file mode 100755
index 0000000..2391f02
Binary files /dev/null and b/samples/testfiles/BlueSquare.ai differ
diff --git a/samples/testfiles/BlueSquare.avi b/samples/testfiles/BlueSquare.avi
new file mode 100755
index 0000000..f29de6d
Binary files /dev/null and b/samples/testfiles/BlueSquare.avi differ
diff --git a/samples/testfiles/BlueSquare.eps b/samples/testfiles/BlueSquare.eps
new file mode 100755
index 0000000..ea4f79c
--- /dev/null
+++ b/samples/testfiles/BlueSquare.eps
@@ -0,0 +1,87 @@
+%!PS-Adobe-3.1 EPSF-3.0
%ADO_DSC_Encoding: MacOS Roman
%%Title: BlueSquare.eps
%%Creator: Adobe Illustrator(R) 12
%%AI8_CreatorVersion: 12.0.0
%AI9_PrintingDataBegin
%%For: Alan Lillich
%%CreationDate: 9/7/05
%%BoundingBox: 0 0 289 361
%%HiResBoundingBox: 0 0 288.9996 361
%%CropBox: 0 0 288.9996 361
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Pages: 1
%%DocumentNeededResources: 
%%DocumentSuppliedResources: procset Adobe_AGM_Image 1.0 0
%%+ procset Adobe_CoolType_Utility_T42 1.0 0
%%+ procset Adobe_CoolType_Utility_MAKEOCF 1.19 0
%%+ procset Adobe_CoolType_Core 2.23 0
%%+ procset Adobe_AGM_Core 2.0 0
%%+ procset Adobe_AGM_Utils 1.0 0
%%DocumentFonts: 
%%DocumentNeededFonts: 
%%DocumentNeededFeatures: 
%%DocumentSuppliedFeatures: 
%%DocumentProcessColors:  Cyan Magenta Black
%%DocumentCustomColors: 
%%CMYKCustomColor: 
%%RGBCustomColor: 
%ADO_BuildNumber: Adobe Illustrator(R) 12.0.0 x5199 R agm 4.3861 ct 5.530
%ADO_ContainsXMP: MainFirst
%AI7_Thumbnail: 104 128 8
%%BeginData: 29100 Hex Bytes
%0000330000660000990000CC0033000033330033660033990033CC0033FF
%0066000066330066660066990066CC0066FF009900009933009966009999
%0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66
%00FF9900FFCC3300003300333300663300993300CC3300FF333300333333
%3333663333993333CC3333FF3366003366333366663366993366CC3366FF
%3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99
%33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033
%6600666600996600CC6600FF6633006633336633666633996633CC6633FF
%6666006666336666666666996666CC6666FF669900669933669966669999
%6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33
%66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF
%9933009933339933669933999933CC9933FF996600996633996666996699
%9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33
%99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF
%CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399
%CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933
%CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF
%CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC
%FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699
%FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33
%FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100
%000011111111220000002200000022222222440000004400000044444444
%550000005500000055555555770000007700000077777777880000008800
%000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB
%DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF
%00FF0000FFFFFF0000FF00FFFFFF00FFFFFF
%522853285328532853285328532853285328532853285328532853285328
%532853285328532853285328532853285328532853285328532853285328
%532853285328532853285328532853285328532853285328532853285328
%5328532853285328532853287DFF28290629062906290629062906290629
%062906290629062906290629062906290629062906290629062906290629
%062906290629062906290629062906290629062906290629062906290629
%062906290629062906290629062906290629062906290629062953FF5307
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929287DFF282906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%06292929062929290629292906292929062929290629062953FF53072F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F287EFF2829282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%2929282929292829292928292929282929292829292953FF532929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F287DFF28292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062953FF53292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F297DFF282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%28292929282929292829292928292929062959FF53072F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29287DFF2829062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%0629292906292929062929290629062953FF53072F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F28
%7EFF28292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292953FF532929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F287DFF
%282929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%29290629292906292929062953FF53292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F297DFF2829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%2829292928292929062959FF53072F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929287DFF28290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629062953FF53072F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F287EFF282928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%29292829292953FF532929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F287DFF2829292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%2929062953FF53292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F297DFF28292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%062959FF53072F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929287DFF282906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906290629
%53FF53072F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F287EFF2829282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%2829292928292929282929292829292928292929282929292829292953FF
%532929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F287DFF28292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062953FF5329
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F297DFF282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%29292829292928292929282929292829292928292929062959FF53072F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929287DFF2829062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%2929062929290629292906292929062929290629062953FF53072F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F287EFF28292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292953FF532929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F287DFF282929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%06292929062929290629292906292929062953FF53292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F297DFF2829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%2929282929292829292928292929062959FF53072F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292928
%7DFF28290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629062953FF53072F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F287EFF
%282928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%28292929282929292829292953FF532929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F287DFF2829
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%0629292906292929062953FF53292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F297DFF28292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929062959FF53072F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929287DFF282906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%29290629062953FF53072F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F287EFF2829282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%2829292953FF532929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F287DFF28292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062953FF53292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F297DFF282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929290629
%59FF53072F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929287DFF2829062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%0629292906292929062929290629292906292929062929290629062953FF
%53072F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F287EFF28292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292953FF5329
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F287DFF282929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%29290629292906292929062929290629292906292929062953FF53292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F297DFF2829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%2829292928292929282929292829292928292929062959FF53072F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929287DFF28290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629062953FF53072F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F287EFF282928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%29292829292928292929282929292829292953FF532929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F287DFF2829292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%2929062929290629292906292929062953FF53292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%7DFF28292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929062959FF53072F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929287DFF
%282906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%06292929062929290629062953FF53072F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F287EFF2829
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%2929282929292829292953FF532929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F287DFF28292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062953FF53292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F297DFF282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%28292929062959FF53072F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929287DFF2829062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%0629062953FF53072F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F287EFF28292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292953FF532929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F287DFF282929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%53FF53292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F297DFF2829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%2929282929292829292928292929282929292829292928292929062959FF
%53072F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929287DFF28290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629062953FF5307
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F287EFF282928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%28292929282929292829292928292929282929292829292953FF53292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F287DFF2829292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%0629292906292929062929290629292906292929062953FF53292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F297DFF28292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929062959FF53072F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929287DFF282906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%29290629292906292929062929290629062953FF53072F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F287EFF2829282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%2829292928292929282929292829292953FF532929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F28
%7DFF28292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062953FF53292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F297DFF
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%29292829292928292929062959FF53072F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929287DFF2829
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%2929062929290629062953FF53072F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F287EFF28292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292953FF532929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F287DFF282929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%06292929062953FF53292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F297DFF2829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%2929062959FF53072F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929287DFF28290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%062953FF53072F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F287EFF282928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%53FF532929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F287DFF2829292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%2929062929290629292906292929062929290629292906292929062953FF
%53292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F297DFF28292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929062959FF5307
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929292F2929292F2929292F2929292F2929292F292929
%2F2929292F2929292F2929292F2929292F2929292F2929292F2929292F29
%29292F2929292F2929287DFF282906292929062929290629292906292929
%062929290629292906292929062929290629292906292929062929290629
%292906292929062929290629292906292929062929290629292906292929
%06292929062929290629292906292929062929290629062953FF53072F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F292F292F292F292F292F292F292F292F292F292F292F29
%2F292F292F292F287EFF2829282929292829292928292929282929292829
%292928292929282929292829292928292929282929292829292928292929
%282929292829292928292929282929292829292928292929282929292829
%2929282929292829292928292929282929292829292953FF530729072929
%290729292907292929072929290729292907292929072929290729292907
%292929072929290729292907292929072929290729292907292929072929
%290729292907292929072929290729292907292929072929290729292907
%2929290729297DFF27532828285228282852282828522828285228282852
%282828522828285228282852282828522828285228282852282828522828
%285228282852282828522828285228282852282828522828285228282852
%282828522828285228282852282828522828282853FF
%%EndData
%%EndComments
%%BeginDefaults
%%ViewingOrientation: 1 0 0 1
%%EndDefaults
%%BeginProlog
%%BeginResource: procset Adobe_AGM_Utils 1.0 0
%%Version: 1.0 0
%%Copyright: Copyright (C) 2000-2003 Adobe Systems, Inc.  All Rights Reserved.
systemdict /setpacking known
{
	currentpacking
	true setpacking
} if
userdict /Adobe_AGM_Utils 70 dict dup begin put
/bdf
{
	bind def
} bind def
/nd{
	null def
}bdf
/xdf
{
	exch def
}bdf
/ldf 
{
	load def
}bdf
/ddf
{
	put
}bdf	
/xddf
{
	3 -1 roll put
}bdf	
/xpt
{
	exch put
}bdf
/ndf
{ 
	exch dup where{
		pop pop pop
	}{
		xdf
	}ifelse
}def
/cdndf
{
	exch dup currentdict exch known{
		pop pop
	}{
		exch def
	}ifelse
}def
/ps_level
	/languagelevel where{
		pop systemdict /languagelevel get exec
	}{
		1
	}ifelse
def
/level2 
	ps_level 2 ge
def
/level3 
	ps_level 3 ge
def
/ps_version
	{version cvr} stopped {
		-1
	}if
def
/set_gvm
{
	currentglobal exch setglobal
}bdf
/reset_gvm
{
	setglobal
}bdf
/makereadonlyarray
{
	/packedarray where{
		pop packedarray
	}{
		array astore readonly
	}ifelse
}bdf
/map_reserved_ink_name
{
	dup type /stringtype eq{
		dup /Red eq{
			pop (_Red_)
		}{
			dup /Green eq{
				pop (_Green_)
			}{
				dup /Blue eq{
					pop (_Blue_)
				}{
					dup () cvn eq{
						pop (Process)
					}if
				}ifelse
			}ifelse
		}ifelse
	}if
}bdf
/AGMUTIL_GSTATE 22 dict def
/get_gstate
{
	AGMUTIL_GSTATE begin
	/AGMUTIL_GSTATE_clr_spc currentcolorspace def
	/AGMUTIL_GSTATE_clr_indx 0 def
	/AGMUTIL_GSTATE_clr_comps 12 array def
	mark currentcolor counttomark
		{AGMUTIL_GSTATE_clr_comps AGMUTIL_GSTATE_clr_indx 3 -1 roll put
		/AGMUTIL_GSTATE_clr_indx AGMUTIL_GSTATE_clr_indx 1 add def} repeat pop
	/AGMUTIL_GSTATE_fnt rootfont def
	/AGMUTIL_GSTATE_lw currentlinewidth def
	/AGMUTIL_GSTATE_lc currentlinecap def
	/AGMUTIL_GSTATE_lj currentlinejoin def
	/AGMUTIL_GSTATE_ml currentmiterlimit def
	currentdash /AGMUTIL_GSTATE_do xdf /AGMUTIL_GSTATE_da xdf
	/AGMUTIL_GSTATE_sa currentstrokeadjust def
	/AGMUTIL_GSTATE_clr_rnd currentcolorrendering def
	/AGMUTIL_GSTATE_op currentoverprint def
	/AGMUTIL_GSTATE_bg currentblackgeneration cvlit def
	/AGMUTIL_GSTATE_ucr currentundercolorremoval cvlit def
	currentcolortransfer cvlit /AGMUTIL_GSTATE_gy_xfer xdf cvlit /AGMUTIL_GSTATE_b_xfer xdf
		cvlit /AGMUTIL_GSTATE_g_xfer xdf cvlit /AGMUTIL_GSTATE_r_xfer xdf
	/AGMUTIL_GSTATE_ht currenthalftone def
	/AGMUTIL_GSTATE_flt currentflat def
	end
}def
/set_gstate
{
	AGMUTIL_GSTATE begin
	AGMUTIL_GSTATE_clr_spc setcolorspace
	AGMUTIL_GSTATE_clr_indx {AGMUTIL_GSTATE_clr_comps AGMUTIL_GSTATE_clr_indx 1 sub get
	/AGMUTIL_GSTATE_clr_indx AGMUTIL_GSTATE_clr_indx 1 sub def} repeat setcolor
	AGMUTIL_GSTATE_fnt setfont
	AGMUTIL_GSTATE_lw setlinewidth
	AGMUTIL_GSTATE_lc setlinecap
	AGMUTIL_GSTATE_lj setlinejoin
	AGMUTIL_GSTATE_ml setmiterlimit
	AGMUTIL_GSTATE_da AGMUTIL_GSTATE_do setdash
	AGMUTIL_GSTATE_sa setstrokeadjust
	AGMUTIL_GSTATE_clr_rnd setcolorrendering
	AGMUTIL_GSTATE_op setoverprint
	AGMUTIL_GSTATE_bg cvx setblackgeneration
	AGMUTIL_GSTATE_ucr cvx setundercolorremoval
	AGMUTIL_GSTATE_r_xfer cvx AGMUTIL_GSTATE_g_xfer cvx AGMUTIL_GSTATE_b_xfer cvx
		AGMUTIL_GSTATE_gy_xfer cvx setcolortransfer
	AGMUTIL_GSTATE_ht /HalftoneType get dup 9 eq exch 100 eq or
		{
		currenthalftone /HalftoneType get AGMUTIL_GSTATE_ht /HalftoneType get ne
			{
			  mark AGMUTIL_GSTATE_ht {sethalftone} stopped cleartomark
			} if
		}{
		AGMUTIL_GSTATE_ht sethalftone
		} ifelse
	AGMUTIL_GSTATE_flt setflat
	end
}def
/get_gstate_and_matrix
{
	AGMUTIL_GSTATE begin
	/AGMUTIL_GSTATE_ctm matrix currentmatrix def
	end
	get_gstate
}def
/set_gstate_and_matrix
{
	set_gstate
	AGMUTIL_GSTATE begin
	AGMUTIL_GSTATE_ctm setmatrix
	end
}def
/AGMUTIL_str256 256 string def
/AGMUTIL_src256 256 string def
/AGMUTIL_dst64 64 string def
/AGMUTIL_srcLen nd
/AGMUTIL_ndx nd
/thold_halftone
{ 
	level3
		{sethalftone currenthalftone}
		{
			dup /HalftoneType get 3 eq
			{
				sethalftone currenthalftone
			}
			{
				begin
				Width Height mul {
					Thresholds read {pop} if
				} repeat
				end
				currenthalftone
			} ifelse
		}ifelse
} def 
/rdcmntline
{
	currentfile AGMUTIL_str256 readline pop
	(%) anchorsearch {pop} if
} bdf
/filter_cmyk
{	
	dup type /filetype ne{
		exch () /SubFileDecode filter
	}
	{
		exch pop
	}
	ifelse
	[
	exch
	{
		AGMUTIL_src256 readstring pop
		dup length /AGMUTIL_srcLen exch def
		/AGMUTIL_ndx 0 def
		AGMCORE_plate_ndx 4 AGMUTIL_srcLen 1 sub{
			1 index exch get
			AGMUTIL_dst64 AGMUTIL_ndx 3 -1 roll put
			/AGMUTIL_ndx AGMUTIL_ndx 1 add def
		}for
		pop
		AGMUTIL_dst64 0 AGMUTIL_ndx getinterval
	}
	bind
	/exec cvx
	] cvx
} bdf
/filter_indexed_devn
{
	cvi Names length mul names_index add Lookup exch get
} bdf
/filter_devn
{	
	4 dict begin
	/srcStr xdf
	/dstStr xdf
	dup type /filetype ne{
		0 () /SubFileDecode filter
	}if
	[
	exch
		[
			/devicen_colorspace_dict /AGMCORE_gget cvx /begin cvx
			currentdict /srcStr get /readstring cvx /pop cvx
			/dup cvx /length cvx 0 /gt cvx [
				Adobe_AGM_Utils /AGMUTIL_ndx 0 /ddf cvx
				names_index Names length currentdict /srcStr get length 1 sub {
					1 /index cvx /exch cvx /get cvx
					currentdict /dstStr get /AGMUTIL_ndx /load cvx 3 -1 /roll cvx /put cvx
					Adobe_AGM_Utils /AGMUTIL_ndx /AGMUTIL_ndx /load cvx 1 /add cvx /ddf cvx
				} for
				currentdict /dstStr get 0 /AGMUTIL_ndx /load cvx /getinterval cvx
			] cvx /if cvx
			/end cvx
		] cvx
		bind
		/exec cvx
	] cvx
	end
} bdf
/AGMUTIL_imagefile nd
/read_image_file
{
	AGMUTIL_imagefile 0 setfileposition
	10 dict begin
	/imageDict xdf
	/imbufLen Width BitsPerComponent mul 7 add 8 idiv def
	/imbufIdx 0 def
	/origDataSource imageDict /DataSource get def
	/origMultipleDataSources imageDict /MultipleDataSources get def
	/origDecode imageDict /Decode get def
	/dstDataStr imageDict /Width get colorSpaceElemCnt mul string def
	imageDict /MultipleDataSources known {MultipleDataSources}{false} ifelse
	{
		/imbufCnt imageDict /DataSource get length def
		/imbufs imbufCnt array def
		0 1 imbufCnt 1 sub {
			/imbufIdx xdf
			imbufs imbufIdx imbufLen string put
			imageDict /DataSource get imbufIdx [ AGMUTIL_imagefile imbufs imbufIdx get /readstring cvx /pop cvx ] cvx put
		} for
		DeviceN_PS2 {
			imageDict begin
		 	/DataSource [ DataSource /devn_sep_datasource cvx ] cvx def
			/MultipleDataSources false def
			/Decode [0 1] def
			end
		} if
	}{
		/imbuf imbufLen string def
		Indexed_DeviceN level3 not and DeviceN_NoneName or {
			/srcDataStrs [ imageDict begin
				currentdict /MultipleDataSources known {MultipleDataSources {DataSource length}{1}ifelse}{1} ifelse
				{
					Width Decode length 2 div mul cvi string
				} repeat
				end ] def		
			imageDict begin
		 	/DataSource [AGMUTIL_imagefile Decode BitsPerComponent false 1 /filter_indexed_devn load dstDataStr srcDataStrs devn_alt_datasource /exec cvx] cvx def
			/Decode [0 1] def
			end
		}{
			imageDict /DataSource [1 string dup 0 AGMUTIL_imagefile Decode length 2 idiv string/readstring cvx /pop cvx names_index /get cvx /put cvx] cvx put
			imageDict /Decode [0 1] put
		} ifelse
	} ifelse
	imageDict exch
	load exec
	imageDict /DataSource origDataSource put
	imageDict /MultipleDataSources origMultipleDataSources put
	imageDict /Decode origDecode put	
	end
} bdf
/write_image_file
{
	begin
	{ (AGMUTIL_imagefile) (w+) file } stopped{
		false
	}{
		Adobe_AGM_Utils/AGMUTIL_imagefile xddf 
		2 dict begin
		/imbufLen Width BitsPerComponent mul 7 add 8 idiv def
		MultipleDataSources {DataSource 0 get}{DataSource}ifelse type /filetype eq {
			/imbuf imbufLen string def
		}if
		1 1 Height MultipleDataSources not{Decode length 2 idiv mul}if{ 
			pop
			MultipleDataSources {
			 	0 1 DataSource length 1 sub {
					DataSource type dup
					/arraytype eq {
						pop DataSource exch get exec
					}{
						/filetype eq {
							DataSource exch get imbuf readstring pop
						}{
							DataSource exch get
						} ifelse
					} ifelse
					AGMUTIL_imagefile exch writestring
				} for
			}{
				DataSource type dup
				/arraytype eq {
					pop DataSource exec
				}{
					/filetype eq {
						DataSource imbuf readstring pop
					}{
						DataSource
					} ifelse
				} ifelse
				AGMUTIL_imagefile exch writestring
			} ifelse
		}for
		end
		true
	}ifelse
	end
} bdf
/close_image_file
{
	AGMUTIL_imagefile closefile (AGMUTIL_imagefile) deletefile
}def
statusdict /product known userdict /AGMP_current_show known not and{
	/pstr statusdict /product get def
	pstr (HP LaserJet 2200) eq 	
	pstr (HP LaserJet 4000 Series) eq or
	pstr (HP LaserJet 4050 Series ) eq or
	pstr (HP LaserJet 8000 Series) eq or
	pstr (HP LaserJet 8100 Series) eq or
	pstr (HP LaserJet 8150 Series) eq or
	pstr (HP LaserJet 5000 Series) eq or
	pstr (HP LaserJet 5100 Series) eq or
	pstr (HP Color LaserJet 4500) eq or
	pstr (HP Color LaserJet 4600) eq or
	pstr (HP LaserJet 5Si) eq or
	pstr (HP LaserJet 1200 Series) eq or
	pstr (HP LaserJet 1300 Series) eq or
	pstr (HP LaserJet 4100 Series) eq or 
	{
 		userdict /AGMP_current_show /show load put
		userdict /show {
		  currentcolorspace 0 get
		  /Pattern eq
		  {false charpath f}
		  {AGMP_current_show} ifelse
		} put
	}if
	currentdict /pstr undef
} if
/consumeimagedata
{
	begin
	currentdict /MultipleDataSources known not
		{/MultipleDataSources false def} if
	MultipleDataSources
		{
		DataSource 0 get type
		dup /filetype eq
			{
			1 dict begin
			/flushbuffer Width cvi string def
			1 1 Height cvi
				{
				pop
				0 1 DataSource length 1 sub
					{
					DataSource exch get
					flushbuffer readstring pop pop
					}for
				}for
			end
			}if
		dup /arraytype eq exch /packedarraytype eq or DataSource 0 get xcheck and
			{
			Width Height mul cvi
				{
				0 1 DataSource length 1 sub
					{dup DataSource exch get exec length exch 0 ne {pop}if}for
				dup 0 eq
					{pop exit}if
				sub dup 0 le
					{exit}if
				}loop
			pop
			}if		
		}
		{
		/DataSource load type 
		dup /filetype eq
			{
			1 dict begin
			/flushbuffer Width Decode length 2 idiv mul cvi string def
			1 1 Height { pop DataSource flushbuffer readstring pop pop} for
			end
			}if
		dup /arraytype eq exch /packedarraytype eq or /DataSource load xcheck and
			{
				Height Width BitsPerComponent mul 8 BitsPerComponent sub add 8 idiv Decode length 2 idiv mul mul
					{
					DataSource length dup 0 eq
						{pop exit}if
					sub dup 0 le
						{exit}if
					}loop
				pop
			}if
		}ifelse
	end
}bdf
/addprocs
{
	  2{/exec load}repeat
	  3 1 roll
	  [ 5 1 roll ] bind cvx
}def
/modify_halftone_xfer
{
	currenthalftone dup length dict copy begin
	 currentdict 2 index known{
	 	1 index load dup length dict copy begin
		currentdict/TransferFunction known{
			/TransferFunction load
		}{
			currenttransfer
		}ifelse
		 addprocs /TransferFunction xdf 
		 currentdict end def
		currentdict end sethalftone
	}{ 
		currentdict/TransferFunction known{
			/TransferFunction load 
		}{
			currenttransfer
		}ifelse
		addprocs /TransferFunction xdf
		currentdict end sethalftone		
		pop
	}ifelse
}def
/clonearray
{
	dup xcheck exch
	dup length array exch
	Adobe_AGM_Core/AGMCORE_tmp -1 ddf 
	{
	Adobe_AGM_Core/AGMCORE_tmp 2 copy get 1 add ddf 
	dup type /dicttype eq
		{
			Adobe_AGM_Core/AGMCORE_tmp get
			exch
			clonedict
			Adobe_AGM_Core/AGMCORE_tmp 4 -1 roll ddf 
		} if
	dup type /arraytype eq
		{
			Adobe_AGM_Core/AGMCORE_tmp get exch
			clonearray
			Adobe_AGM_Core/AGMCORE_tmp 4 -1 roll ddf 
		} if
	exch dup
	Adobe_AGM_Core/AGMCORE_tmp get 4 -1 roll put
	}forall
	exch {cvx} if
}bdf
/clonedict
{
	dup length dict
	begin
		{
		dup type /dicttype eq
			{
				clonedict
			} if
		dup type /arraytype eq
			{
				clonearray
			} if
		def
		}forall
	currentdict
	end
}bdf
/DeviceN_PS2
{
	/currentcolorspace AGMCORE_gget 0 get /DeviceN eq level3 not and
} bdf
/Indexed_DeviceN
{ 
	/indexed_colorspace_dict AGMCORE_gget dup null ne {
		dup /CSDBase known {
			/CSDBase get /CSD get_res /Names known 
		}{
			pop false
		}ifelse
	}{
		pop false
	} ifelse
} bdf
/DeviceN_NoneName
{	
	/Names where {
		pop
		false Names
		{
			(None) eq or
		} forall
	}{
		false
	}ifelse
} bdf
/DeviceN_PS2_inRip_seps
{
	/AGMCORE_in_rip_sep where
	{
		pop dup type dup /arraytype eq exch /packedarraytype eq or
		{
			dup 0 get /DeviceN eq level3 not and AGMCORE_in_rip_sep and
			{
				/currentcolorspace exch AGMCORE_gput
				false
			}
			{
				true
			}ifelse
		}
		{
			true
		} ifelse
	}
	{
		true
	} ifelse
} bdf
/base_colorspace_type
{
	dup type /arraytype eq {0 get} if
} bdf
/currentdistillerparams where { pop currentdistillerparams /CoreDistVersion get 5000 lt}{true}ifelse
{
	/pdfmark_5 {cleartomark} bind def
}{
	/pdfmark_5 {pdfmark} bind def
}ifelse
/ReadBypdfmark_5
{
	2 dict begin
	/makerString exch def string /tmpString exch def
	{
		currentfile tmpString readline pop
		makerString anchorsearch
		{
		pop pop cleartomark exit
		}{
			3 copy /PUT pdfmark_5 pop 2 copy (\n) /PUT pdfmark_5
		} ifelse
	}loop
	end
} bdf
/doc_setup{
	Adobe_AGM_Utils begin
}bdf
/doc_trailer{
	currentdict Adobe_AGM_Utils eq{
		end
	}if
}bdf
systemdict /setpacking known
{
	setpacking
} if
%%EndResource
%%BeginResource: procset Adobe_AGM_Core 2.0 0
%%Version: 2.0 0
%%Copyright: Copyright (C) 1997-2005 Adobe Systems, Inc.  All Rights Reserved.
%% Note: This procset assumes Adobe_AGM_Utils is opened on the stack below it, for
%% definitions of some fundamental procedures.
systemdict /setpacking known
{
	currentpacking
	true setpacking
} if
userdict /Adobe_AGM_Core 201 dict dup begin put
/Adobe_AGM_Core_Id /Adobe_AGM_Core_2.0_0 def
/AGMCORE_str256 256 string def
/AGMCORE_save nd
/AGMCORE_graphicsave nd
/AGMCORE_c 0 def
/AGMCORE_m 0 def
/AGMCORE_y 0 def
/AGMCORE_k 0 def
/AGMCORE_cmykbuf 4 array def
/AGMCORE_screen [currentscreen] cvx def
/AGMCORE_tmp 0 def
/AGMCORE_&setgray nd
/AGMCORE_&setcolor nd
/AGMCORE_&setcolorspace nd
/AGMCORE_&setcmykcolor nd
/AGMCORE_cyan_plate nd
/AGMCORE_magenta_plate nd
/AGMCORE_yellow_plate nd
/AGMCORE_black_plate nd
/AGMCORE_plate_ndx nd
/AGMCORE_get_ink_data nd
/AGMCORE_is_cmyk_sep nd
/AGMCORE_host_sep nd
/AGMCORE_avoid_L2_sep_space nd
/AGMCORE_distilling nd
/AGMCORE_composite_job nd
/AGMCORE_producing_seps nd
/AGMCORE_ps_level -1 def
/AGMCORE_ps_version -1 def
/AGMCORE_environ_ok nd
/AGMCORE_CSD_cache 0 dict def
/AGMCORE_currentoverprint false def
/AGMCORE_deltaX nd
/AGMCORE_deltaY nd
/AGMCORE_name nd
/AGMCORE_sep_special nd
/AGMCORE_err_strings 4 dict def
/AGMCORE_cur_err nd
/AGMCORE_current_spot_alias false def
/AGMCORE_inverting false def
/AGMCORE_feature_dictCount nd
/AGMCORE_feature_opCount nd
/AGMCORE_feature_ctm nd
/AGMCORE_ConvertToProcess false def
/AGMCORE_Default_CTM matrix def
/AGMCORE_Default_PageSize nd
/AGMCORE_currentbg nd
/AGMCORE_currentucr nd
/AGMCORE_in_pattern false def
/AGMCORE_currentpagedevice nd
/knockout_unitsq nd
currentglobal true setglobal
[/CSA /Gradient /Procedure]
{
	/Generic /Category findresource dup length dict copy /Category defineresource pop
} forall
setglobal
/AGMCORE_key_known
{
	where{
		/Adobe_AGM_Core_Id known
	}{
		false
	}ifelse
}ndf
/flushinput
{
	save
	2 dict begin
	/CompareBuffer 3 -1 roll def
	/readbuffer 256 string def
	mark
	{
	currentfile readbuffer {readline} stopped
		{cleartomark mark}
		{
		not
			{pop exit}
		if
		CompareBuffer eq
			{exit}
		if
		}ifelse
	}loop
	cleartomark
	end
	restore
}bdf
/getspotfunction
{
	AGMCORE_screen exch pop exch pop
	dup type /dicttype eq{
		dup /HalftoneType get 1 eq{
			/SpotFunction get
		}{
			dup /HalftoneType get 2 eq{
				/GraySpotFunction get
			}{ 
				pop
				{
					abs exch abs 2 copy add 1 gt{
						1 sub dup mul exch 1 sub dup mul add 1 sub
					}{
						dup mul exch dup mul add 1 exch sub
					}ifelse
				}bind
			}ifelse
		}ifelse
	}if
} def
/clp_npth
{
	clip newpath
} def
/eoclp_npth
{
	eoclip newpath
} def
/npth_clp
{
	newpath clip
} def
/graphic_setup
{
	/AGMCORE_graphicsave save def
	concat
	0 setgray
	0 setlinecap
	0 setlinejoin
	1 setlinewidth
	[] 0 setdash
	10 setmiterlimit
	newpath
	false setoverprint
	false setstrokeadjust
	//Adobe_AGM_Core/spot_alias get exec
	/Adobe_AGM_Image where {
		pop
		Adobe_AGM_Image/spot_alias 2 copy known{
			get exec
		}{
			pop pop
		}ifelse
	} if
	100 dict begin
	/dictstackcount countdictstack def
	/showpage {} def
	mark
} def
/graphic_cleanup
{
	cleartomark
	dictstackcount 1 countdictstack 1 sub {end}for
	end
	AGMCORE_graphicsave restore
} def
/compose_error_msg
{
	grestoreall initgraphics	
	/Helvetica findfont 10 scalefont setfont
	/AGMCORE_deltaY 100 def
	/AGMCORE_deltaX 310 def
	clippath pathbbox newpath pop pop 36 add exch 36 add exch moveto
	0 AGMCORE_deltaY rlineto AGMCORE_deltaX 0 rlineto
	0 AGMCORE_deltaY neg rlineto AGMCORE_deltaX neg 0 rlineto closepath
	0 AGMCORE_&setgray
	gsave 1 AGMCORE_&setgray fill grestore 
	1 setlinewidth gsave stroke grestore
	currentpoint AGMCORE_deltaY 15 sub add exch 8 add exch moveto
	/AGMCORE_deltaY 12 def
	/AGMCORE_tmp 0 def
	AGMCORE_err_strings exch get
		{
		dup 32 eq
			{
			pop
			AGMCORE_str256 0 AGMCORE_tmp getinterval
			stringwidth pop currentpoint pop add AGMCORE_deltaX 28 add gt
				{
				currentpoint AGMCORE_deltaY sub exch pop
				clippath pathbbox pop pop pop 44 add exch moveto
				} if
			AGMCORE_str256 0 AGMCORE_tmp getinterval show ( ) show
			0 1 AGMCORE_str256 length 1 sub
				{
				AGMCORE_str256 exch 0 put
				}for
			/AGMCORE_tmp 0 def
			}
			{
				AGMCORE_str256 exch AGMCORE_tmp xpt
				/AGMCORE_tmp AGMCORE_tmp 1 add def
			} ifelse
		} forall
} bdf
/doc_setup{
	Adobe_AGM_Core begin
	/AGMCORE_ps_version xdf
	/AGMCORE_ps_level xdf
	errordict /AGM_handleerror known not{
		errordict /AGM_handleerror errordict /handleerror get put
		errordict /handleerror {
			Adobe_AGM_Core begin
			$error /newerror get AGMCORE_cur_err null ne and{
				$error /newerror false put
				AGMCORE_cur_err compose_error_msg
			}if
			$error /newerror true put
			end
			errordict /AGM_handleerror get exec
			} bind put
		}if
	/AGMCORE_environ_ok 
		ps_level AGMCORE_ps_level ge
		ps_version AGMCORE_ps_version ge and 
		AGMCORE_ps_level -1 eq or
	def
	AGMCORE_environ_ok not
		{/AGMCORE_cur_err /AGMCORE_bad_environ def} if
	/AGMCORE_&setgray systemdict/setgray get def
	level2{
		/AGMCORE_&setcolor systemdict/setcolor get def
		/AGMCORE_&setcolorspace systemdict/setcolorspace get def
	}if
	/AGMCORE_currentbg currentblackgeneration def
	/AGMCORE_currentucr currentundercolorremoval def
	/AGMCORE_distilling
		/product where{
			pop systemdict/setdistillerparams known product (Adobe PostScript Parser) ne and
		}{
			false
		}ifelse
	def
	/AGMCORE_GSTATE AGMCORE_key_known not{
		/AGMCORE_GSTATE 21 dict def
		/AGMCORE_tmpmatrix matrix def
		/AGMCORE_gstack 32 array def
		/AGMCORE_gstackptr 0 def
		/AGMCORE_gstacksaveptr 0 def
		/AGMCORE_gstackframekeys 10 def
		/AGMCORE_&gsave /gsave ldf
		/AGMCORE_&grestore /grestore ldf
		/AGMCORE_&grestoreall /grestoreall ldf
		/AGMCORE_&save /save ldf
		/AGMCORE_&setoverprint /setoverprint ldf
		/AGMCORE_gdictcopy {
			begin
			{ def } forall
			end
		}def
		/AGMCORE_gput {
			AGMCORE_gstack AGMCORE_gstackptr get
			3 1 roll
			put
		}def
		/AGMCORE_gget {
			AGMCORE_gstack AGMCORE_gstackptr get
			exch
			get
		}def
		/gsave {
			AGMCORE_&gsave
			AGMCORE_gstack AGMCORE_gstackptr get
			AGMCORE_gstackptr 1 add
			dup 32 ge {limitcheck} if
			/AGMCORE_gstackptr exch store
			AGMCORE_gstack AGMCORE_gstackptr get
			AGMCORE_gdictcopy
		}def
		/grestore {
			AGMCORE_&grestore
			AGMCORE_gstackptr 1 sub
			dup AGMCORE_gstacksaveptr lt {1 add} if
			dup AGMCORE_gstack exch get dup /AGMCORE_currentoverprint known
				{/AGMCORE_currentoverprint get setoverprint}{pop}ifelse
			/AGMCORE_gstackptr exch store
		}def
		/grestoreall {
			AGMCORE_&grestoreall
			/AGMCORE_gstackptr AGMCORE_gstacksaveptr store 
		}def
		/save {
			AGMCORE_&save
			AGMCORE_gstack AGMCORE_gstackptr get
			AGMCORE_gstackptr 1 add
			dup 32 ge {limitcheck} if
			/AGMCORE_gstackptr exch store
			/AGMCORE_gstacksaveptr AGMCORE_gstackptr store
			AGMCORE_gstack AGMCORE_gstackptr get
			AGMCORE_gdictcopy
		}def
		/setoverprint{
			dup /AGMCORE_currentoverprint exch AGMCORE_gput AGMCORE_&setoverprint
		}def	
		0 1 AGMCORE_gstack length 1 sub {
				AGMCORE_gstack exch AGMCORE_gstackframekeys dict put
		} for
	}if
	level3 /AGMCORE_&sysshfill AGMCORE_key_known not and
	{
		/AGMCORE_&sysshfill systemdict/shfill get def
		/AGMCORE_&sysmakepattern systemdict/makepattern get def
		/AGMCORE_&usrmakepattern /makepattern load def
	}if
	/currentcmykcolor [0 0 0 0] AGMCORE_gput
	/currentstrokeadjust false AGMCORE_gput
	/currentcolorspace [/DeviceGray] AGMCORE_gput
	/sep_tint 0 AGMCORE_gput
	/devicen_tints [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] AGMCORE_gput
	/sep_colorspace_dict null AGMCORE_gput
	/devicen_colorspace_dict null AGMCORE_gput
	/indexed_colorspace_dict null AGMCORE_gput
	/currentcolor_intent () AGMCORE_gput
	/customcolor_tint 1 AGMCORE_gput
	<<
	/MaxPatternItem currentsystemparams /MaxPatternCache get
	>>
	setuserparams
	end
}def
/page_setup
{
	/setcmykcolor where{
		pop
		Adobe_AGM_Core/AGMCORE_&setcmykcolor /setcmykcolor load put
	}if
	Adobe_AGM_Core begin
	/setcmykcolor
	{
		4 copy AGMCORE_cmykbuf astore /currentcmykcolor exch AGMCORE_gput
		1 sub 4 1 roll
		3 {
			3 index add neg dup 0 lt {
				pop 0
			} if
			3 1 roll
		} repeat
		setrgbcolor pop
	}ndf
	/currentcmykcolor
	{
		/currentcmykcolor AGMCORE_gget aload pop
	}ndf
	/setoverprint
	{
		pop
	}ndf
	/currentoverprint
	{
		false
	}ndf
	/AGMCORE_cyan_plate 1 0 0 0 test_cmyk_color_plate def
	/AGMCORE_magenta_plate 0 1 0 0 test_cmyk_color_plate def
	/AGMCORE_yellow_plate 0 0 1 0 test_cmyk_color_plate def
	/AGMCORE_black_plate 0 0 0 1 test_cmyk_color_plate def
	/AGMCORE_plate_ndx 
		AGMCORE_cyan_plate{ 
			0
		}{
			AGMCORE_magenta_plate{
				1
			}{
				AGMCORE_yellow_plate{
					2
				}{
					AGMCORE_black_plate{
						3
					}{
						4
					}ifelse
				}ifelse
			}ifelse
		}ifelse
		def
	/AGMCORE_have_reported_unsupported_color_space false def
	/AGMCORE_report_unsupported_color_space
	{
		AGMCORE_have_reported_unsupported_color_space false eq
		{
			(Warning: Job contains content that cannot be separated with on-host methods. This content appears on the black plate, and knocks out all other plates.) ==
			Adobe_AGM_Core /AGMCORE_have_reported_unsupported_color_space true ddf
		} if
	}def
	/AGMCORE_composite_job
		AGMCORE_cyan_plate AGMCORE_magenta_plate and AGMCORE_yellow_plate and AGMCORE_black_plate and def
	/AGMCORE_in_rip_sep
		/AGMCORE_in_rip_sep where{
			pop AGMCORE_in_rip_sep
		}{
			AGMCORE_distilling 
			{
				false
			}{
				userdict/Adobe_AGM_OnHost_Seps known{
					false
				}{
					level2{
						currentpagedevice/Separations 2 copy known{
							get
						}{
							pop pop false
						}ifelse
					}{
						false
					}ifelse
				}ifelse
			}ifelse
		}ifelse
	def
	/AGMCORE_producing_seps AGMCORE_composite_job not AGMCORE_in_rip_sep or def
	/AGMCORE_host_sep AGMCORE_producing_seps AGMCORE_in_rip_sep not and def
	/AGM_preserve_spots 
		/AGM_preserve_spots where{
			pop AGM_preserve_spots
		}{
			AGMCORE_distilling AGMCORE_producing_seps or
		}ifelse
	def
	/AGM_is_distiller_preserving_spotimages
	{
		currentdistillerparams/PreserveOverprintSettings known
		{
			currentdistillerparams/PreserveOverprintSettings get
				{
					currentdistillerparams/ColorConversionStrategy known
					{
						currentdistillerparams/ColorConversionStrategy get
						/sRGB ne
					}{
						true
					}ifelse
				}{
					false
				}ifelse
		}{
			false
		}ifelse
	}def
	/convert_spot_to_process where {pop}{
		/convert_spot_to_process
		{
			//Adobe_AGM_Core begin
			dup map_alias {
				/Name get exch pop
			} if
			dup dup (None) eq exch (All) eq or
				{
				pop false
				}{
				AGMCORE_host_sep
				{ 
					gsave
					1 0 0 0 setcmykcolor currentgray 1 exch sub
					0 1 0 0 setcmykcolor currentgray 1 exch sub
					0 0 1 0 setcmykcolor currentgray 1 exch sub
					0 0 0 1 setcmykcolor currentgray 1 exch sub
					add add add 0 eq
					{
						pop false
					}{
						false setoverprint
						current_spot_alias false set_spot_alias
						1 1 1 1 6 -1 roll findcmykcustomcolor 1 setcustomcolor
						set_spot_alias
						currentgray 1 ne
					}ifelse
					grestore
				}{
					AGMCORE_distilling
					{
						pop AGM_is_distiller_preserving_spotimages not
					}{
						//Adobe_AGM_Core/AGMCORE_name xddf
						false
						//Adobe_AGM_Core/AGMCORE_in_pattern known {//Adobe_AGM_Core/AGMCORE_in_pattern get}{false} ifelse
						not AGMCORE_currentpagedevice/OverrideSeparations known and
						{
							AGMCORE_currentpagedevice/OverrideSeparations get
							{
								/HqnSpots /ProcSet resourcestatus
								{
									pop pop pop true
								}if
							}if
						}if					
						{
							AGMCORE_name /HqnSpots /ProcSet findresource /TestSpot get exec not
						}{
							gsave
							[/Separation AGMCORE_name /DeviceGray {}]AGMCORE_&setcolorspace
							false
							AGMCORE_currentpagedevice/SeparationColorNames 2 copy known
							{
								get
								{ AGMCORE_name eq or}forall
								not
							}{
								pop pop pop true
							}ifelse
							grestore
						}ifelse
					}ifelse
				}ifelse
			}ifelse
			end
		}def
	}ifelse
	/convert_to_process where {pop}{
		/convert_to_process
		{
			dup length 0 eq
				{
				pop false
				}{
				AGMCORE_host_sep
				{ 
				dup true exch
					{
					dup (Cyan) eq exch
					dup (Magenta) eq 3 -1 roll or exch
					dup (Yellow) eq 3 -1 roll or exch
					dup (Black) eq 3 -1 roll or
						{pop}
						{convert_spot_to_process and}ifelse
					}
				forall
					{
					true exch
						{
						dup (Cyan) eq exch
						dup (Magenta) eq 3 -1 roll or exch
						dup (Yellow) eq 3 -1 roll or exch
						(Black) eq or and
						}forall
						not
					}{pop false}ifelse
				}{
				false exch
					{
					dup (Cyan) eq exch
					dup (Magenta) eq 3 -1 roll or exch
					dup (Yellow) eq 3 -1 roll or exch
					dup (Black) eq 3 -1 roll or
					{pop}
					{convert_spot_to_process or}ifelse
					}
				forall
				}ifelse
			}ifelse
		}def
	}ifelse	
	/AGMCORE_avoid_L2_sep_space  
		version cvr 2012 lt 
		level2 and 
		AGMCORE_producing_seps not and
	def
	/AGMCORE_is_cmyk_sep
		AGMCORE_cyan_plate AGMCORE_magenta_plate or AGMCORE_yellow_plate or AGMCORE_black_plate or
	def
	/AGM_avoid_0_cmyk where{
		pop AGM_avoid_0_cmyk
	}{
		AGM_preserve_spots 
		userdict/Adobe_AGM_OnHost_Seps known 
		userdict/Adobe_AGM_InRip_Seps known or
		not and
	}ifelse
	{
		/setcmykcolor[
			{
				4 copy add add add 0 eq currentoverprint and{
					pop 0.0005
				}if
			}/exec cvx
			/AGMCORE_&setcmykcolor load dup type/operatortype ne{
				/exec cvx
			}if
		]cvx def
	}if
	/AGMCORE_IsSeparationAProcessColor
		{
		dup (Cyan) eq exch dup (Magenta) eq exch dup (Yellow) eq exch (Black) eq or or or
		}def
	AGMCORE_host_sep{
		/setcolortransfer
		{ 
			AGMCORE_cyan_plate{
				pop pop pop
			}{
			  	AGMCORE_magenta_plate{
			  		4 3 roll pop pop pop
			  	}{
			  		AGMCORE_yellow_plate{
			  			4 2 roll pop pop pop
			  		}{
			  			4 1 roll pop pop pop
			  		}ifelse
			  	}ifelse
			}ifelse
			settransfer  
		}	
		def
		/AGMCORE_get_ink_data
			AGMCORE_cyan_plate{
				{pop pop pop}
			}{
			  	AGMCORE_magenta_plate{
			  		{4 3 roll pop pop pop}
			  	}{
			  		AGMCORE_yellow_plate{
			  			{4 2 roll pop pop pop}
			  		}{
			  			{4 1 roll pop pop pop}
			  		}ifelse
			  	}ifelse
			}ifelse
		def
		/AGMCORE_RemoveProcessColorNames
			{
			1 dict begin
			/filtername
				{
				dup /Cyan eq 1 index (Cyan) eq or
					{pop (_cyan_)}if
				dup /Magenta eq 1 index (Magenta) eq or
					{pop (_magenta_)}if
				dup /Yellow eq 1 index (Yellow) eq or
					{pop (_yellow_)}if
				dup /Black eq 1 index (Black) eq or
					{pop (_black_)}if
				}def
			dup type /arraytype eq
				{[exch {filtername}forall]}
				{filtername}ifelse
			end
			}def
		level3 {
			/AGMCORE_IsCurrentColor
				{
				dup AGMCORE_IsSeparationAProcessColor
					{
					AGMCORE_plate_ndx 0 eq
						{dup (Cyan) eq exch /Cyan eq or}if
					AGMCORE_plate_ndx 1 eq
						{dup (Magenta) eq exch /Magenta eq or}if
					AGMCORE_plate_ndx 2 eq
						{dup (Yellow) eq exch /Yellow eq or}if
					AGMCORE_plate_ndx 3 eq
						{dup (Black) eq exch /Black eq or}if
					AGMCORE_plate_ndx 4 eq
						{pop false}if
					}{
					gsave
					false setoverprint
					current_spot_alias false set_spot_alias
					1 1 1 1 6 -1 roll findcmykcustomcolor 1 setcustomcolor
					set_spot_alias
					currentgray 1 ne
					grestore
					}ifelse
				}def
			/AGMCORE_filter_functiondatasource
				{	
				5 dict begin
				/data_in xdf
				data_in type /stringtype eq
					{
					/ncomp xdf
					/comp xdf
					/string_out data_in length ncomp idiv string def
					0 ncomp data_in length 1 sub
						{
						string_out exch dup ncomp idiv exch data_in exch ncomp getinterval comp get 255 exch sub put
						}for
					string_out
					}{
					string /string_in xdf
					/string_out 1 string def
					/component xdf
					[
					data_in string_in /readstring cvx
						[component /get cvx 255 /exch cvx /sub cvx string_out /exch cvx 0 /exch cvx /put cvx string_out]cvx
						[/pop cvx ()]cvx /ifelse cvx
					]cvx /ReusableStreamDecode filter
				}ifelse
				end
				}def
			/AGMCORE_separateShadingFunction
				{
				2 dict begin
				/paint? xdf
				/channel xdf
				dup type /dicttype eq
					{
					begin
					FunctionType 0 eq
						{
						/DataSource channel Range length 2 idiv DataSource AGMCORE_filter_functiondatasource def
						currentdict /Decode known
							{/Decode Decode channel 2 mul 2 getinterval def}if
						paint? not
							{/Decode [1 1]def}if
						}if
					FunctionType 2 eq
						{
						paint?
							{
							/C0 [C0 channel get 1 exch sub] def
							/C1 [C1 channel get 1 exch sub] def
							}{
							/C0 [1] def
							/C1 [1] def
							}ifelse			
						}if
					FunctionType 3 eq
						{
						/Functions [Functions {channel paint? AGMCORE_separateShadingFunction} forall] def			
						}if
					currentdict /Range known
						{/Range [0 1] def}if
					currentdict
					end}{
					channel get 0 paint? AGMCORE_separateShadingFunction
					}ifelse
				end
				}def
			/AGMCORE_separateShading
				{
				3 -1 roll begin
				currentdict /Function known
					{
					currentdict /Background known
						{[1 index{Background 3 index get 1 exch sub}{1}ifelse]/Background xdf}if
					Function 3 1 roll AGMCORE_separateShadingFunction /Function xdf
					/ColorSpace [/DeviceGray] def
					}{
					ColorSpace dup type /arraytype eq {0 get}if /DeviceCMYK eq
						{
						/ColorSpace [/DeviceN [/_cyan_ /_magenta_ /_yellow_ /_black_] /DeviceCMYK {}] def
						}{
						ColorSpace dup 1 get AGMCORE_RemoveProcessColorNames 1 exch put
						}ifelse
					ColorSpace 0 get /Separation eq
						{
							{
								[1 /exch cvx /sub cvx]cvx
							}{
								[/pop cvx 1]cvx
							}ifelse
							ColorSpace 3 3 -1 roll put
							pop
						}{
							{
								[exch ColorSpace 1 get length 1 sub exch sub /index cvx 1 /exch cvx /sub cvx ColorSpace 1 get length 1 add 1 /roll cvx ColorSpace 1 get length{/pop cvx} repeat]cvx
							}{
								pop [ColorSpace 1 get length {/pop cvx} repeat cvx 1]cvx
							}ifelse
							ColorSpace 3 3 -1 roll bind put
						}ifelse
					ColorSpace 2 /DeviceGray put																		
					}ifelse
				end
				}def
			/AGMCORE_separateShadingDict
				{
				dup /ColorSpace get
				dup type /arraytype ne
					{[exch]}if
				dup 0 get /DeviceCMYK eq
					{
					exch begin 
					currentdict
					AGMCORE_cyan_plate
						{0 true}if
					AGMCORE_magenta_plate
						{1 true}if
					AGMCORE_yellow_plate
						{2 true}if
					AGMCORE_black_plate
						{3 true}if
					AGMCORE_plate_ndx 4 eq
						{0 false}if		
					dup not currentoverprint and
						{/AGMCORE_ignoreshade true def}if
					AGMCORE_separateShading
					currentdict
					end exch
					}if
				dup 0 get /Separation eq
					{
					exch begin
					ColorSpace 1 get dup /None ne exch /All ne and
						{
						ColorSpace 1 get AGMCORE_IsCurrentColor AGMCORE_plate_ndx 4 lt and ColorSpace 1 get AGMCORE_IsSeparationAProcessColor not and
							{
							ColorSpace 2 get dup type /arraytype eq {0 get}if /DeviceCMYK eq 
								{
								/ColorSpace
									[
									/Separation
									ColorSpace 1 get
									/DeviceGray
										[
										ColorSpace 3 get /exec cvx
										4 AGMCORE_plate_ndx sub -1 /roll cvx
										4 1 /roll cvx
										3 [/pop cvx]cvx /repeat cvx
										1 /exch cvx /sub cvx
										]cvx									
									]def
								}{
								AGMCORE_report_unsupported_color_space
								AGMCORE_black_plate not
									{
									currentdict 0 false AGMCORE_separateShading
									}if
								}ifelse
							}{
							currentdict ColorSpace 1 get AGMCORE_IsCurrentColor
							0 exch 
							dup not currentoverprint and
								{/AGMCORE_ignoreshade true def}if
							AGMCORE_separateShading
							}ifelse	
						}if			
					currentdict
					end exch
					}if
				dup 0 get /DeviceN eq
					{
					exch begin
					ColorSpace 1 get convert_to_process
						{
						ColorSpace 2 get dup type /arraytype eq {0 get}if /DeviceCMYK eq 
							{
							/ColorSpace
								[
								/DeviceN
								ColorSpace 1 get
								/DeviceGray
									[
									ColorSpace 3 get /exec cvx
									4 AGMCORE_plate_ndx sub -1 /roll cvx
									4 1 /roll cvx
									3 [/pop cvx]cvx /repeat cvx
									1 /exch cvx /sub cvx
									]cvx									
								]def
							}{
							AGMCORE_report_unsupported_color_space
							AGMCORE_black_plate not
								{
								currentdict 0 false AGMCORE_separateShading
								/ColorSpace [/DeviceGray] def
								}if
							}ifelse
						}{
						currentdict
						false -1 ColorSpace 1 get
							{
							AGMCORE_IsCurrentColor
								{
								1 add
								exch pop true exch exit
								}if
							1 add
							}forall
						exch 
						dup not currentoverprint and
							{/AGMCORE_ignoreshade true def}if
						AGMCORE_separateShading
						}ifelse
					currentdict
					end exch
					}if
				dup 0 get dup /DeviceCMYK eq exch dup /Separation eq exch /DeviceN eq or or not
					{
					exch begin
					ColorSpace dup type /arraytype eq
						{0 get}if
					/DeviceGray ne
						{
						AGMCORE_report_unsupported_color_space
						AGMCORE_black_plate not
							{
							ColorSpace 0 get /CIEBasedA eq
								{
								/ColorSpace [/Separation /_ciebaseda_ /DeviceGray {}] def
								}if
							ColorSpace 0 get dup /CIEBasedABC eq exch dup /CIEBasedDEF eq exch /DeviceRGB eq or or
								{
								/ColorSpace [/DeviceN [/_red_ /_green_ /_blue_] /DeviceRGB {}] def
								}if
							ColorSpace 0 get /CIEBasedDEFG eq
								{
								/ColorSpace [/DeviceN [/_cyan_ /_magenta_ /_yellow_ /_black_] /DeviceCMYK {}] def
								}if
							currentdict 0 false AGMCORE_separateShading
							}if
						}if
					currentdict
					end exch
					}if
				pop
				dup /AGMCORE_ignoreshade known
					{
					begin
					/ColorSpace [/Separation (None) /DeviceGray {}] def
					currentdict end
					}if
				}def
			/shfill
				{
				AGMCORE_separateShadingDict 
				dup /AGMCORE_ignoreshade known
					{pop}
					{AGMCORE_&sysshfill}ifelse
				}def
			/makepattern
				{
				exch
				dup /PatternType get 2 eq
					{
					clonedict
					begin
					/Shading Shading AGMCORE_separateShadingDict def
					Shading /AGMCORE_ignoreshade known
					currentdict end exch
					{pop <</PatternType 1/PaintProc{pop}/BBox[0 0 1 1]/XStep 1/YStep 1/PaintType 1/TilingType 3>>}if
					exch AGMCORE_&sysmakepattern
					}{
					exch AGMCORE_&usrmakepattern
					}ifelse
				}def
		}if
	}if
	AGMCORE_in_rip_sep{
		/setcustomcolor
		{
			exch aload pop
			dup 7 1 roll inRip_spot_has_ink not	{ 
				4 {4 index mul 4 1 roll}
				repeat
				/DeviceCMYK setcolorspace
				6 -2 roll pop pop
			}{ 
				//Adobe_AGM_Core begin
					/AGMCORE_k xdf /AGMCORE_y xdf /AGMCORE_m xdf /AGMCORE_c xdf
				end
				[/Separation 4 -1 roll /DeviceCMYK
				{dup AGMCORE_c mul exch dup AGMCORE_m mul exch dup AGMCORE_y mul exch AGMCORE_k mul}
				]
				setcolorspace
			}ifelse
			setcolor
		}ndf
		/setseparationgray
		{
			[/Separation (All) /DeviceGray {}] setcolorspace_opt
			1 exch sub setcolor
		}ndf
	}{
		/setseparationgray
		{
			AGMCORE_&setgray
		}ndf
	}ifelse
	/findcmykcustomcolor
	{
		5 makereadonlyarray
	}ndf
	/setcustomcolor
	{
		exch aload pop pop
		4 {4 index mul 4 1 roll} repeat
		setcmykcolor pop
	}ndf
	/has_color
		/colorimage where{
			AGMCORE_producing_seps{
				pop true
			}{
				systemdict eq
			}ifelse
		}{
			false
		}ifelse
	def
	/map_index
	{
		1 index mul exch getinterval {255 div} forall
	} bdf
	/map_indexed_devn
	{
		Lookup Names length 3 -1 roll cvi map_index
	} bdf
	/n_color_components
	{
		base_colorspace_type
		dup /DeviceGray eq{
			pop 1
		}{
			/DeviceCMYK eq{
				4
			}{
				3
			}ifelse
		}ifelse
	}bdf
	level2{
		/mo /moveto ldf
		/li /lineto ldf
		/cv /curveto ldf
		/knockout_unitsq
		{
			1 setgray
			0 0 1 1 rectfill
		}def
		level2 /setcolorspace AGMCORE_key_known not and{
			/AGMCORE_&&&setcolorspace /setcolorspace ldf
			/AGMCORE_ReplaceMappedColor
			{
				dup type dup /arraytype eq exch /packedarraytype eq or
				{
					/AGMCORE_SpotAliasAry2 where {
						begin
						dup 0 get dup /Separation eq
						{
							pop
							dup length array copy
							dup dup 1 get
							current_spot_alias
							{
								dup map_alias
								{
									false set_spot_alias
									dup 1 exch setsepcolorspace
									true set_spot_alias
									begin
									/sep_colorspace_dict currentdict AGMCORE_gput
									pop pop	pop
									[ 
										/Separation Name 
										CSA map_csa
										MappedCSA 
										/sep_colorspace_proc load
									]
									dup Name
									end
								}if
							}if
							map_reserved_ink_name 1 xpt
						}{
							/DeviceN eq 
							{
								dup length array copy
								dup dup 1 get [ 
									exch {
										current_spot_alias{
											dup map_alias{
												/Name get exch pop
											}if
										}if
										map_reserved_ink_name
									} forall 
								] 1 xpt
							}if
						}ifelse
						end
					} if
				}if
			}def
			/setcolorspace
			{
				dup type dup /arraytype eq exch /packedarraytype eq or
				{
					dup 0 get /Indexed eq
					{
						AGMCORE_distilling
						{
							/PhotoshopDuotoneList where
							{
								pop false
							}{
								true
							}ifelse
						}{
							true
						}ifelse
						{
							aload pop 3 -1 roll
							AGMCORE_ReplaceMappedColor
							3 1 roll 4 array astore
						}if
					}{
						AGMCORE_ReplaceMappedColor
					}ifelse
				}if
				DeviceN_PS2_inRip_seps {AGMCORE_&&&setcolorspace} if
			}def
		}if	
	}{
		/adj
		{
			currentstrokeadjust{
				transform
				0.25 sub round 0.25 add exch
				0.25 sub round 0.25 add exch
				itransform
			}if
		}def
		/mo{
			adj moveto
		}def
		/li{
			adj lineto
		}def
		/cv{
			6 2 roll adj
			6 2 roll adj
			6 2 roll adj curveto
		}def
		/knockout_unitsq
		{
			1 setgray
			8 8 1 [8 0 0 8 0 0] {<ffffffffffffffff>} image
		}def
		/currentstrokeadjust{
			/currentstrokeadjust AGMCORE_gget
		}def
		/setstrokeadjust{
			/currentstrokeadjust exch AGMCORE_gput
		}def
		/setcolorspace
		{
			/currentcolorspace exch AGMCORE_gput
		} def
		/currentcolorspace
		{
			/currentcolorspace AGMCORE_gget
		} def
		/setcolor_devicecolor
		{
			base_colorspace_type
			dup /DeviceGray eq{
				pop setgray
			}{
				/DeviceCMYK eq{
					setcmykcolor
				}{
					setrgbcolor
				}ifelse
			}ifelse
		}def
		/setcolor
		{
			currentcolorspace 0 get
			dup /DeviceGray ne{
				dup /DeviceCMYK ne{
					dup /DeviceRGB ne{
						dup /Separation eq{
							pop
							currentcolorspace 3 get exec
							currentcolorspace 2 get
						}{
							dup /Indexed eq{
								pop
								currentcolorspace 3 get dup type /stringtype eq{
									currentcolorspace 1 get n_color_components
									3 -1 roll map_index
								}{
									exec
								}ifelse
								currentcolorspace 1 get
							}{
								/AGMCORE_cur_err /AGMCORE_invalid_color_space def
								AGMCORE_invalid_color_space
							}ifelse
						}ifelse
					}if
				}if
			}if
			setcolor_devicecolor
		} def
	}ifelse
	/sop /setoverprint ldf
	/lw /setlinewidth ldf
	/lc /setlinecap ldf
	/lj /setlinejoin ldf
	/ml /setmiterlimit ldf
	/dsh /setdash ldf
	/sadj /setstrokeadjust ldf
	/gry /setgray ldf
	/rgb /setrgbcolor ldf
	/cmyk /setcmykcolor ldf
	/sep /setsepcolor ldf
	/devn /setdevicencolor ldf
	/idx /setindexedcolor ldf
	/colr /setcolor ldf
	/csacrd /set_csa_crd ldf
	/sepcs /setsepcolorspace ldf
	/devncs /setdevicencolorspace ldf
	/idxcs /setindexedcolorspace ldf
	/cp /closepath ldf
	/clp /clp_npth ldf
	/eclp /eoclp_npth ldf
	/f /fill ldf
	/ef /eofill ldf
	/@ /stroke ldf
	/nclp /npth_clp ldf
	/gset /graphic_setup ldf
	/gcln /graphic_cleanup ldf
	/AGMCORE_def_ht currenthalftone def
	/clonedict Adobe_AGM_Utils begin /clonedict load end def
	/clonearray Adobe_AGM_Utils begin /clonearray load end def
	currentdict{
		dup xcheck 1 index type dup /arraytype eq exch /packedarraytype eq or and {
			bind
		}if
		def
	}forall
	/getrampcolor
	{ 
		/indx exch def
		0 1 NumComp 1 sub
		{
			dup
			Samples exch get
			dup type /stringtype eq {indx get} if
			exch
			Scaling exch get aload pop
			3 1 roll
			mul add
		} for
		ColorSpaceFamily /Separation eq 
		{sep}
		{
			ColorSpaceFamily /DeviceN eq
			{devn} {setcolor}ifelse
		}ifelse
	} bdf
	/sssetbackground {aload pop setcolor} bdf
	/RadialShade
	{
		40 dict begin
		/ColorSpaceFamily xdf
		/background xdf
		/ext1 xdf
		/ext0 xdf
		/BBox xdf
		/r2 xdf
		/c2y xdf
		/c2x xdf
		/r1 xdf
		/c1y xdf
		/c1x xdf
		/rampdict xdf
		/setinkoverprint where {pop /setinkoverprint{pop}def}if
		gsave
		BBox length 0 gt
		{
			newpath
			BBox 0 get BBox 1 get moveto
			BBox 2 get BBox 0 get sub 0 rlineto
			0 BBox 3 get BBox 1 get sub rlineto
			BBox 2 get BBox 0 get sub neg 0 rlineto
			closepath
			clip
			newpath
		} if
		c1x c2x eq
		{
			c1y c2y lt {/theta 90 def}{/theta 270 def} ifelse
		}
		{
			/slope c2y c1y sub c2x c1x sub div def
			/theta slope 1 atan def
			c2x c1x lt c2y c1y ge and { /theta theta 180 sub def} if
			c2x c1x lt c2y c1y lt and { /theta theta 180 add def} if
		} ifelse
		gsave
		clippath
		c1x c1y translate
		theta rotate
		-90 rotate
		{ pathbbox } stopped
		{ 0 0 0 0 } if
		/yMax xdf
		/xMax xdf
		/yMin xdf
		/xMin xdf
		grestore
		xMax xMin eq yMax yMin eq or
		{
			grestore
			end
		}
		{
			/max { 2 copy gt { pop } {exch pop} ifelse } bdf
			/min { 2 copy lt { pop } {exch pop} ifelse } bdf
			rampdict begin
			40 dict begin
			background length 0 gt { background sssetbackground gsave clippath fill grestore } if
			gsave
			c1x c1y translate
			theta rotate
			-90 rotate
			/c2y c1x c2x sub dup mul c1y c2y sub dup mul add sqrt def
			/c1y 0 def
			/c1x 0 def
			/c2x 0 def
			ext0
			{
				0 getrampcolor
				c2y r2 add r1 sub 0.0001 lt
				{
					c1x c1y r1 360 0 arcn
					pathbbox
					/aymax exch def
					/axmax exch def
					/aymin exch def
					/axmin exch def
					/bxMin xMin axmin min def
					/byMin yMin aymin min def
					/bxMax xMax axmax max def
					/byMax yMax aymax max def
					bxMin byMin moveto
					bxMax byMin lineto
					bxMax byMax lineto
					bxMin byMax lineto
					bxMin byMin lineto
					eofill
				}
				{
					c2y r1 add r2 le
					{
						c1x c1y r1 0 360 arc
						fill
					}
					{
						c2x c2y r2 0 360 arc fill
						r1 r2 eq
						{
							/p1x r1 neg def
							/p1y c1y def
							/p2x r1 def
							/p2y c1y def
							p1x p1y moveto p2x p2y lineto p2x yMin lineto p1x yMin lineto
							fill
						}
						{
							/AA r2 r1 sub c2y div def
							AA -1 eq
							{ /theta 89.99 def}
							{ /theta AA 1 AA dup mul sub sqrt div 1 atan def}
							ifelse
							/SS1 90 theta add dup sin exch cos div def
							/p1x r1 SS1 SS1 mul SS1 SS1 mul 1 add div sqrt mul neg def
							/p1y p1x SS1 div neg def
							/SS2 90 theta sub dup sin exch cos div def
							/p2x r1 SS2 SS2 mul SS2 SS2 mul 1 add div sqrt mul def
							/p2y p2x SS2 div neg def
							r1 r2 gt
							{
								/L1maxX p1x yMin p1y sub SS1 div add def
								/L2maxX p2x yMin p2y sub SS2 div add def
							}
							{
								/L1maxX 0 def
								/L2maxX 0 def
							} ifelse
							p1x p1y moveto p2x p2y lineto L2maxX L2maxX p2x sub SS2 mul p2y add lineto
							L1maxX L1maxX p1x sub SS1 mul p1y add lineto
							fill
						} ifelse
					} ifelse
				} ifelse
			} if
		c1x c2x sub dup mul
		c1y c2y sub dup mul
		add 0.5 exp
		0 dtransform
		dup mul exch dup mul add 0.5 exp 72 div
		0 72 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt
		72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt
		1 index 1 index lt { exch } if pop
		/hires xdf
		hires mul
		/numpix xdf
		/numsteps NumSamples def
		/rampIndxInc 1 def
		/subsampling false def
		numpix 0 ne
		{
			NumSamples numpix div 0.5 gt
			{
				/numsteps numpix 2 div round cvi dup 1 le { pop 2 } if def
				/rampIndxInc NumSamples 1 sub numsteps div def
				/subsampling true def
			} if
		} if
		/xInc c2x c1x sub numsteps div def
		/yInc c2y c1y sub numsteps div def
		/rInc r2 r1 sub numsteps div def
		/cx c1x def
		/cy c1y def
		/radius r1 def
		newpath
		xInc 0 eq yInc 0 eq rInc 0 eq and and
		{
			0 getrampcolor
			cx cy radius 0 360 arc
			stroke
			NumSamples 1 sub getrampcolor
			cx cy radius 72 hires div add 0 360 arc
			0 setlinewidth
			stroke
		}
		{
			0
			numsteps
			{
				dup
				subsampling { round cvi } if
				getrampcolor
				cx cy radius 0 360 arc
				/cx cx xInc add def
				/cy cy yInc add def
				/radius radius rInc add def
				cx cy radius 360 0 arcn
				eofill
				rampIndxInc add
			} repeat
			pop
		} ifelse
		ext1
		{
			c2y r2 add r1 lt
			{
				c2x c2y r2 0 360 arc
				fill
			}
			{
				c2y r1 add r2 sub 0.0001 le
				{
					c2x c2y r2 360 0 arcn
					pathbbox
					/aymax exch def
					/axmax exch def
					/aymin exch def
					/axmin exch def
					/bxMin xMin axmin min def
					/byMin yMin aymin min def
					/bxMax xMax axmax max def
					/byMax yMax aymax max def
					bxMin byMin moveto
					bxMax byMin lineto
					bxMax byMax lineto
					bxMin byMax lineto
					bxMin byMin lineto
					eofill
				}
				{
					c2x c2y r2 0 360 arc fill
					r1 r2 eq
					{
						/p1x r2 neg def
						/p1y c2y def
						/p2x r2 def
						/p2y c2y def
						p1x p1y moveto p2x p2y lineto p2x yMax lineto p1x yMax lineto
						fill
					}
					{
						/AA r2 r1 sub c2y div def
						AA -1 eq
						{ /theta 89.99 def}
						{ /theta AA 1 AA dup mul sub sqrt div 1 atan def}
						ifelse
						/SS1 90 theta add dup sin exch cos div def
						/p1x r2 SS1 SS1 mul SS1 SS1 mul 1 add div sqrt mul neg def
						/p1y c2y p1x SS1 div sub def
						/SS2 90 theta sub dup sin exch cos div def
						/p2x r2 SS2 SS2 mul SS2 SS2 mul 1 add div sqrt mul def
						/p2y c2y p2x SS2 div sub def
						r1 r2 lt
						{
							/L1maxX p1x yMax p1y sub SS1 div add def
							/L2maxX p2x yMax p2y sub SS2 div add def
						}
						{
							/L1maxX 0 def
							/L2maxX 0 def
						}ifelse
						p1x p1y moveto p2x p2y lineto L2maxX L2maxX p2x sub SS2 mul p2y add lineto
						L1maxX L1maxX p1x sub SS1 mul p1y add lineto
						fill
					} ifelse
				} ifelse
			} ifelse
		} if
		grestore
		grestore
		end
		end
		end
		} ifelse
	} bdf
	/GenStrips
	{
		40 dict begin
		/ColorSpaceFamily xdf
		/background xdf
		/ext1 xdf
		/ext0 xdf
		/BBox xdf
		/y2 xdf
		/x2 xdf
		/y1 xdf
		/x1 xdf
		/rampdict xdf
		/setinkoverprint where {pop /setinkoverprint{pop}def}if
		gsave
		BBox length 0 gt
		{
			newpath
			BBox 0 get BBox 1 get moveto
			BBox 2 get BBox 0 get sub 0 rlineto
			0 BBox 3 get BBox 1 get sub rlineto
			BBox 2 get BBox 0 get sub neg 0 rlineto
			closepath
			clip
			newpath
		} if
		x1 x2 eq
		{
			y1 y2 lt {/theta 90 def}{/theta 270 def} ifelse
		}
		{
			/slope y2 y1 sub x2 x1 sub div def
			/theta slope 1 atan def
			x2 x1 lt y2 y1 ge and { /theta theta 180 sub def} if
			x2 x1 lt y2 y1 lt and { /theta theta 180 add def} if
		}
		ifelse
		gsave
		clippath
		x1 y1 translate
		theta rotate
		{ pathbbox } stopped
		{ 0 0 0 0 } if
		/yMax exch def
		/xMax exch def
		/yMin exch def
		/xMin exch def
		grestore
		xMax xMin eq yMax yMin eq or
		{
			grestore
			end
		}
		{
			rampdict begin
			20 dict begin
			background length 0 gt { background sssetbackground gsave clippath fill grestore } if
			gsave
			x1 y1 translate
			theta rotate
			/xStart 0 def
			/xEnd x2 x1 sub dup mul y2 y1 sub dup mul add 0.5 exp def
			/ySpan yMax yMin sub def
			/numsteps NumSamples def
			/rampIndxInc 1 def
			/subsampling false def
			xStart 0 transform
			xEnd 0 transform
			3 -1 roll
			sub dup mul
			3 1 roll
			sub dup mul
			add 0.5 exp 72 div
			0 72 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt
			72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt
			1 index 1 index lt { exch } if pop
			mul
			/numpix xdf
			numpix 0 ne
			{
				NumSamples numpix div 0.5 gt
				{
					/numsteps numpix 2 div round cvi dup 1 le { pop 2 } if def
					/rampIndxInc NumSamples 1 sub numsteps div def
					/subsampling true def
				} if
			} if
			ext0
			{
				0 getrampcolor
				xMin xStart lt
				{
					xMin yMin xMin neg ySpan rectfill
				} if
			} if
			/xInc xEnd xStart sub numsteps div def
			/x xStart def
			0
			numsteps
			{
				dup
				subsampling { round cvi } if
				getrampcolor
				x yMin xInc ySpan rectfill
				/x x xInc add def
				rampIndxInc add
			} repeat
			pop
			ext1 {
				xMax xEnd gt
				{
					xEnd yMin xMax xEnd sub ySpan rectfill
				} if
			} if
			grestore
			grestore
			end
			end
			end
		} ifelse
	} bdf
}def
/page_trailer
{
	end
}def
/doc_trailer{
}def
/capture_currentpagedevice {
	//Adobe_AGM_Core/AGMCORE_currentpagedevice currentpagedevice ddf
} def
systemdict /findcolorrendering known{
	/findcolorrendering systemdict /findcolorrendering get def
}if
systemdict /setcolorrendering known{
	/setcolorrendering systemdict /setcolorrendering get def
}if
/test_cmyk_color_plate
{
	gsave
	setcmykcolor currentgray 1 ne
	grestore
}def
/inRip_spot_has_ink
{
	dup //Adobe_AGM_Core/AGMCORE_name xddf
	convert_spot_to_process not
}def
/map255_to_range
{
	1 index sub
	3 -1 roll 255 div mul add
}def
/set_csa_crd
{
	/sep_colorspace_dict null AGMCORE_gput
	begin
		CSA get_csa_by_name setcolorspace_opt
		set_crd
	end
}
def
/map_csa
{
	currentdict/MappedCSA known{MappedCSA null ne}{false}ifelse
	{pop}{get_csa_by_name /MappedCSA xdf}ifelse
} def
/setsepcolor
{ 
	/sep_colorspace_dict AGMCORE_gget begin
		dup /sep_tint exch AGMCORE_gput
		TintProc
	end
} def
/setdevicencolor
{ 
	/devicen_colorspace_dict AGMCORE_gget begin
		Names length copy
		Names length 1 sub -1 0
		{
			/devicen_tints AGMCORE_gget 3 1 roll xpt
		} for
		TintProc
	end
} def
/sep_colorspace_proc
{
	/AGMCORE_tmp exch store
	/sep_colorspace_dict AGMCORE_gget begin
	currentdict/Components known{
		Components aload pop 
		TintMethod/Lab eq{
			2 {AGMCORE_tmp mul NComponents 1 roll} repeat
			LMax sub AGMCORE_tmp mul LMax add  NComponents 1 roll
		}{
			TintMethod/Subtractive eq{
				NComponents{
					AGMCORE_tmp mul NComponents 1 roll
				}repeat
			}{
				NComponents{
					1 sub AGMCORE_tmp mul 1 add  NComponents 1 roll
				} repeat
			}ifelse
		}ifelse
	}{
		ColorLookup AGMCORE_tmp ColorLookup length 1 sub mul round cvi get
		aload pop
	}ifelse
	end
} def
/sep_colorspace_gray_proc
{
	/AGMCORE_tmp exch store
	/sep_colorspace_dict AGMCORE_gget begin
	GrayLookup AGMCORE_tmp GrayLookup length 1 sub mul round cvi get
	end
} def
/sep_proc_name
{
	dup 0 get 
	dup /DeviceRGB eq exch /DeviceCMYK eq or level2 not and has_color not and{
		pop [/DeviceGray]
		/sep_colorspace_gray_proc
	}{
		/sep_colorspace_proc
	}ifelse
} def
/setsepcolorspace
{ 
	current_spot_alias{
		dup begin
			Name map_alias{
				exch pop
			}if
		end
	}if
	dup /sep_colorspace_dict exch AGMCORE_gput
	begin
	CSA map_csa
	/AGMCORE_sep_special Name dup () eq exch (All) eq or store
	AGMCORE_avoid_L2_sep_space{
		[/Indexed MappedCSA sep_proc_name 255 exch 
			{ 255 div } /exec cvx 3 -1 roll [ 4 1 roll load /exec cvx ] cvx 
		] setcolorspace_opt
		/TintProc {
			255 mul round cvi setcolor
		}bdf
	}{
		MappedCSA 0 get /DeviceCMYK eq 
		currentdict/Components known and 
		AGMCORE_sep_special not and{
			/TintProc [
				Components aload pop Name findcmykcustomcolor 
				/exch cvx /setcustomcolor cvx
			] cvx bdf
		}{
 			AGMCORE_host_sep Name (All) eq and{
 				/TintProc { 
					1 exch sub setseparationgray 
				}bdf
 			}{
				AGMCORE_in_rip_sep MappedCSA 0 get /DeviceCMYK eq and 
				AGMCORE_host_sep or
				Name () eq and{
					/TintProc [
						MappedCSA sep_proc_name exch 0 get /DeviceCMYK eq{
							cvx /setcmykcolor cvx
						}{
							cvx /setgray cvx
						}ifelse
					] cvx bdf
				}{
					AGMCORE_producing_seps MappedCSA 0 get dup /DeviceCMYK eq exch /DeviceGray eq or and AGMCORE_sep_special not and{
	 					/TintProc [
							/dup cvx
							MappedCSA sep_proc_name cvx exch
							0 get /DeviceGray eq{
								1 /exch cvx /sub cvx 0 0 0 4 -1 /roll cvx
							}if
							/Name cvx /findcmykcustomcolor cvx /exch cvx
							AGMCORE_host_sep{
								AGMCORE_is_cmyk_sep
								/Name cvx 
								/AGMCORE_IsSeparationAProcessColor load /exec cvx
								/not cvx /and cvx 
							}{
								Name inRip_spot_has_ink not
							}ifelse
							[
		 						/pop cvx 1
							] cvx /if cvx
							/setcustomcolor cvx
						] cvx bdf
 					}{ 
						/TintProc {setcolor} bdf
						[/Separation Name MappedCSA sep_proc_name load ] setcolorspace_opt
					}ifelse
				}ifelse
			}ifelse
		}ifelse
	}ifelse
	set_crd
	setsepcolor
	end
} def
/additive_blend
{
  	3 dict begin
  	/numarrays xdf
  	/numcolors xdf
  	0 1 numcolors 1 sub
  		{
  		/c1 xdf
  		1
  		0 1 numarrays 1 sub
  			{
			1 exch add /index cvx
  			c1 /get cvx /mul cvx
  			}for
 		numarrays 1 add 1 /roll cvx 
  		}for
 	numarrays [/pop cvx] cvx /repeat cvx
  	end
}def
/subtractive_blend
{
	3 dict begin
	/numarrays xdf
	/numcolors xdf
	0 1 numcolors 1 sub
		{
		/c1 xdf
		1 1
		0 1 numarrays 1 sub
			{
			1 3 3 -1 roll add /index cvx  
			c1 /get cvx /sub cvx /mul cvx
			}for
		/sub cvx
		numarrays 1 add 1 /roll cvx
		}for
	numarrays [/pop cvx] cvx /repeat cvx
	end
}def
/exec_tint_transform
{
	/TintProc [
		/TintTransform cvx /setcolor cvx
	] cvx bdf
	MappedCSA setcolorspace_opt
} bdf
/devn_makecustomcolor
{
	2 dict begin
	/names_index xdf
	/Names xdf
	1 1 1 1 Names names_index get findcmykcustomcolor
	/devicen_tints AGMCORE_gget names_index get setcustomcolor
	Names length {pop} repeat
	end
} bdf
/setdevicencolorspace
{ 
	dup /AliasedColorants known {false}{true}ifelse 
	current_spot_alias and {
		7 dict begin
		/names_index 0 def
		dup /names_len exch /Names get length def
		/new_names names_len array def
		/new_LookupTables names_len array def
		/alias_cnt 0 def
		dup /Names get
		{
			dup map_alias {
				exch pop
				dup /ColorLookup known {
					dup begin
					new_LookupTables names_index ColorLookup put
					end
				}{
					dup /Components known {
						dup begin
						new_LookupTables names_index Components put
						end
					}{
						dup begin
						new_LookupTables names_index [null null null null] put
						end
					} ifelse
				} ifelse
				new_names names_index 3 -1 roll /Name get put
				/alias_cnt alias_cnt 1 add def 
			}{
				/name xdf				
				new_names names_index name put
				dup /LookupTables known {
					dup begin
					new_LookupTables names_index LookupTables names_index get put
					end
				}{
					dup begin
					new_LookupTables names_index [null null null null] put
					end
				} ifelse
			} ifelse
			/names_index names_index 1 add def 
		} forall
		alias_cnt 0 gt {
			/AliasedColorants true def
			/lut_entry_len new_LookupTables 0 get dup length 256 ge {0 get length}{length}ifelse def
			0 1 names_len 1 sub {
				/names_index xdf
				new_LookupTables names_index get dup length 256 ge {0 get length}{length}ifelse lut_entry_len ne {
					/AliasedColorants false def
					exit
				}
				{
					new_LookupTables names_index get 0 get null eq {
						dup /Names get names_index get /name xdf
						name (Cyan) eq name (Magenta) eq name (Yellow) eq name (Black) eq
						or or or not {
							/AliasedColorants false def
							exit
						} if
					} if
				} ifelse
			} for
			lut_entry_len 1 eq {
				/AliasedColorants false def
			} if
			AliasedColorants {
				dup begin
				/Names new_names def
				/LookupTables new_LookupTables def
				/AliasedColorants true def
				/NComponents lut_entry_len def
				/TintMethod NComponents 4 eq {/Subtractive}{/Additive}ifelse def
				/MappedCSA TintMethod /Additive eq {/DeviceRGB}{/DeviceCMYK}ifelse def
				currentdict /TTTablesIdx known not {
					/TTTablesIdx -1 def
				} if
				end
			} if
		}if
		end
	} if
	dup /devicen_colorspace_dict exch AGMCORE_gput
	begin
	currentdict /AliasedColorants known {
		AliasedColorants
	}{
		false
	} ifelse
	dup not {
		CSA map_csa
	} if
	/TintTransform load type /nulltype eq or {
		/TintTransform [
			0 1 Names length 1 sub
				{
				/TTTablesIdx TTTablesIdx 1 add def
				dup LookupTables exch get dup 0 get null eq
					{
					1 index
					Names exch get
					dup (Cyan) eq
						{
						pop exch
						LookupTables length exch sub
						/index cvx
						0 0 0
						}
						{
						dup (Magenta) eq
							{
							pop exch
							LookupTables length exch sub
							/index cvx
							0 /exch cvx 0 0
							}
							{
							(Yellow) eq
								{
								exch
								LookupTables length exch sub
								/index cvx
								0 0 3 -1 /roll cvx 0
								}
								{
								exch
								LookupTables length exch sub
								/index cvx
								0 0 0 4 -1 /roll cvx
								} ifelse
							} ifelse
						} ifelse
					5 -1 /roll cvx /astore cvx
					}
					{
					dup length 1 sub
					LookupTables length 4 -1 roll sub 1 add
					/index cvx /mul cvx /round cvx /cvi cvx /get cvx
					} ifelse
					Names length TTTablesIdx add 1 add 1 /roll cvx
				} for
			Names length [/pop cvx] cvx /repeat cvx
			NComponents Names length
  			TintMethod /Subtractive eq
  				{
  				subtractive_blend
  				}
  				{
  				additive_blend
  				} ifelse
		] cvx bdf
	} if
	AGMCORE_host_sep {
		Names convert_to_process {
			exec_tint_transform
		}
		{	
			currentdict /AliasedColorants known {
				AliasedColorants not
			}{
				false
			} ifelse
			5 dict begin
			/AvoidAliasedColorants xdf
			/painted? false def
			/names_index 0 def
			/names_len Names length def
			AvoidAliasedColorants {
				/currentspotalias current_spot_alias def
				false set_spot_alias
			} if
			Names {
				AGMCORE_is_cmyk_sep {
					dup (Cyan) eq AGMCORE_cyan_plate and exch
					dup (Magenta) eq AGMCORE_magenta_plate and exch
					dup (Yellow) eq AGMCORE_yellow_plate and exch
					(Black) eq AGMCORE_black_plate and or or or {
						/devicen_colorspace_dict AGMCORE_gget /TintProc [
							Names names_index /devn_makecustomcolor cvx
						] cvx ddf
						/painted? true def
					} if
					painted? {exit} if
				}{
					0 0 0 0 5 -1 roll findcmykcustomcolor 1 setcustomcolor currentgray 0 eq {
					/devicen_colorspace_dict AGMCORE_gget /TintProc [
						Names names_index /devn_makecustomcolor cvx
					] cvx ddf
					/painted? true def
					exit
					} if
				} ifelse
				/names_index names_index 1 add def
			} forall
			AvoidAliasedColorants {
				currentspotalias set_spot_alias
			} if
			painted? {
				/devicen_colorspace_dict AGMCORE_gget /names_index names_index put
			}{
				/devicen_colorspace_dict AGMCORE_gget /TintProc [
					names_len [/pop cvx] cvx /repeat cvx 1 /setseparationgray cvx
 					0 0 0 0 /setcmykcolor cvx
				] cvx ddf
			} ifelse
			end
		} ifelse
	}
	{
		AGMCORE_in_rip_sep {
			Names convert_to_process not
		}{
			level3
		} ifelse
		{
			[/DeviceN Names MappedCSA /TintTransform load] setcolorspace_opt
			/TintProc level3 not AGMCORE_in_rip_sep and {
				[
					Names /length cvx [/pop cvx] cvx /repeat cvx
				] cvx bdf
			}{
				{setcolor} bdf
			} ifelse
		}{
			exec_tint_transform
		} ifelse
	} ifelse
	set_crd
	/AliasedColorants false def
	end
} def
/setindexedcolorspace
{
	dup /indexed_colorspace_dict exch AGMCORE_gput
	begin
		currentdict /CSDBase known {
			CSDBase /CSD get_res begin
			currentdict /Names known {
				currentdict devncs
			}{
				1 currentdict sepcs
			} ifelse
			AGMCORE_host_sep{
				4 dict begin
				/compCnt /Names where {pop Names length}{1}ifelse def
				/NewLookup HiVal 1 add string def
				0 1 HiVal {
					/tableIndex xdf
					Lookup dup type /stringtype eq {
						compCnt tableIndex map_index
					}{
						exec
					} ifelse
					/Names where {
						pop setdevicencolor
					}{
						setsepcolor
					} ifelse
					currentgray
					tableIndex exch
					HiVal mul cvi 
					NewLookup 3 1 roll put
				} for
				[/Indexed currentcolorspace HiVal NewLookup] setcolorspace_opt
				end
			}{
				level3
				{
					currentdict /Names known {
						[/Indexed [/DeviceN Names MappedCSA /TintTransform load] HiVal Lookup] setcolorspace_opt
					}{
						[/Indexed [/Separation Name MappedCSA sep_proc_name load] HiVal Lookup] setcolorspace_opt
					} ifelse
				}{
				[/Indexed MappedCSA HiVal
					[
					currentdict /Names known {
						Lookup dup type /stringtype eq
							{/exch cvx CSDBase /CSD get_res /Names get length dup /mul cvx exch /getinterval cvx {255 div} /forall cvx}
							{/exec cvx}ifelse
							/TintTransform load /exec cvx
					}{
						Lookup dup type /stringtype eq
							{/exch cvx /get cvx 255 /div cvx}
							{/exec cvx}ifelse
							CSDBase /CSD get_res /MappedCSA get sep_proc_name exch pop /load cvx /exec cvx
					} ifelse
					]cvx
				]setcolorspace_opt
				}ifelse
			} ifelse
			end
			set_crd
		}
		{
			CSA map_csa
			AGMCORE_host_sep level2 not and{
				0 0 0 0 setcmykcolor
			}{
				[/Indexed MappedCSA 
				level2 not has_color not and{
					dup 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or{
						pop [/DeviceGray]
					}if
					HiVal GrayLookup
				}{
					HiVal 
					currentdict/RangeArray known{
						{ 
							/indexed_colorspace_dict AGMCORE_gget begin
							Lookup exch 
							dup HiVal gt{
								pop HiVal
							}if
							NComponents mul NComponents getinterval {} forall
							NComponents 1 sub -1 0{
								RangeArray exch 2 mul 2 getinterval aload pop map255_to_range
								NComponents 1 roll
							}for
							end
						} bind
					}{
						Lookup
					}ifelse
				}ifelse
				] setcolorspace_opt
				set_crd
			}ifelse
		}ifelse
	end
}def
/setindexedcolor
{
	AGMCORE_host_sep {
		/indexed_colorspace_dict AGMCORE_gget dup /CSDBase known { 
			begin
			CSDBase /CSD get_res begin
			currentdict /Names known{
				map_indexed_devn
				devn
			}
			{
				Lookup 1 3 -1 roll map_index
				sep
			}ifelse
			end
			end
		}{
			/Lookup get 4 3 -1 roll map_index setcmykcolor
		} ifelse
	}{
		level3 not AGMCORE_in_rip_sep and /indexed_colorspace_dict AGMCORE_gget /CSDBase known and {
			/indexed_colorspace_dict AGMCORE_gget /CSDBase get /CSD get_res begin
			map_indexed_devn
			devn
			end
		}
		{
			setcolor
		} ifelse
	}ifelse
} def
/ignoreimagedata
{
	currentoverprint not{
		gsave
		dup clonedict begin
		1 setgray
		/Decode [0 1] def
		/DataSource <FF> def
		/MultipleDataSources false def
		/BitsPerComponent 8 def
		currentdict end
		systemdict /image get exec
		grestore
		}if
	consumeimagedata
}def
/add_res
{
	dup /CSD eq {
		pop 
		//Adobe_AGM_Core begin
		/AGMCORE_CSD_cache load 3 1 roll put
		end
	}{
		defineresource pop
	} ifelse
}def
/del_res
{
	{
		aload pop exch
		dup /CSD eq {
			pop 
			{
				//Adobe_AGM_Core/AGMCORE_CSD_cache get exch undef
			}forall
		}{
			exch
			{
				1 index undefineresource
			}forall
			pop
		} ifelse
	} forall
}def
/get_res
{
	dup /CSD eq {
		pop
		dup type dup /nametype eq exch /stringtype eq or {
			AGMCORE_CSD_cache exch get
		} if
	}{
		findresource
	} ifelse
}def
/get_csa_by_name
{
	dup type dup /nametype eq exch /stringtype eq or{
		/CSA get_res
	} if
}def
/pattern_buf_init
{
	/count get 0 0 put
} def
/pattern_buf_next
{
	dup /count get dup 0 get
	dup 3 1 roll
	1 add 0 xpt
	get				
} def
/cachepattern_compress
{
	5 dict begin
	currentfile exch 0 exch /SubFileDecode filter /ReadFilter exch def
	/patarray 20 dict def
	/string_size 16000 def
	/readbuffer string_size string def
	currentglobal true setglobal 
	patarray 1 array dup 0 1 put /count xpt
	setglobal
	/LZWFilter 
	{
		exch
		dup length 0 eq {
			pop
		}{
			patarray dup length 1 sub 3 -1 roll put
		} ifelse
		{string_size}{0}ifelse string
	} /LZWEncode filter def
	{ 		
		ReadFilter readbuffer readstring
		exch LZWFilter exch writestring
		not {exit} if
	} loop
	LZWFilter closefile
	patarray				
	end
}def
/cachepattern
{
	2 dict begin
	currentfile exch 0 exch /SubFileDecode filter /ReadFilter exch def
	/patarray 20 dict def
	currentglobal true setglobal 
	patarray 1 array dup 0 1 put /count xpt
	setglobal
	{
		ReadFilter 16000 string readstring exch
		patarray dup length 1 sub 3 -1 roll put
		not {exit} if
	} loop
	patarray dup dup length 1 sub () put					
	end	
}def
/wrap_paintproc
{ 
  statusdict /currentfilenameextend known{
	clonedict
	begin
	/OldPaintProc /PaintProc load def
	/PaintProc
	{
		mark exch
		dup /OldPaintProc get stopped
		{closefile restore end} if
		cleartomark
	}  def
	end
  } {pop} ifelse
} def
/make_pattern
{
	exch clonedict exch
	dup matrix currentmatrix matrix concatmatrix 0 0 3 2 roll itransform
	exch 3 index /XStep get 1 index exch 2 copy div cvi mul sub sub
	exch 3 index /YStep get 1 index exch 2 copy div cvi mul sub sub
	matrix translate exch matrix concatmatrix
			  1 index begin
		BBox 0 get XStep div cvi XStep mul /xshift exch neg def
		BBox 1 get YStep div cvi YStep mul /yshift exch neg def
		BBox 0 get xshift add
		BBox 1 get yshift add
		BBox 2 get xshift add
		BBox 3 get yshift add
		4 array astore
		/BBox exch def
		[ xshift yshift /translate load null /exec load ] dup
		3 /PaintProc load put cvx /PaintProc exch def
		end
	1 index dup /ID get exch /Pattern add_res
	gsave 0 setgray
	makepattern
	grestore
}def
/set_pattern
{
	dup /PatternType get 1 eq{
		dup /PaintType get 1 eq{
			currentoverprint sop [/DeviceGray] setcolorspace 0 setgray
		}if
	}if
	setpattern
}def
/setcolorspace_opt
{
	dup currentcolorspace eq{
		pop
	}{
		setcolorspace
	}ifelse
}def
/updatecolorrendering
{
	currentcolorrendering/RenderingIntent known{
		currentcolorrendering/RenderingIntent get
	}{null}ifelse
	Intent ne {
		Intent /ColorRendering {findresource} stopped
		{
			pop pop systemdict /findcolorrendering known
			{
				Intent findcolorrendering pop
				/ColorRendering findresource 
				true
			}
			{false} ifelse
		}
		{true} ifelse
		{
			dup begin
			currentdict /TransformPQR known {
				currentdict /TransformPQR get aload pop
				3 {{} eq 3 1 roll} repeat or or
			}
			{true} ifelse
			currentdict /MatrixPQR known {
				currentdict /MatrixPQR get aload pop
				1.0 eq 9 1 roll 0.0 eq 9 1 roll 0.0 eq 9 1 roll
				0.0 eq 9 1 roll 1.0 eq 9 1 roll 0.0 eq 9 1 roll
				0.0 eq 9 1 roll 0.0 eq 9 1 roll 1.0 eq
				and and and and and and and and
			}
			{true} ifelse
			end
			or
			{
				clonedict begin
				/TransformPQR [
					{4 -1 roll 3 get dup 3 1 roll sub 5 -1 roll 3 get 3 -1 roll sub div
					3 -1 roll 3 get 3 -1 roll 3 get dup 4 1 roll sub mul add} bind
					{4 -1 roll 4 get dup 3 1 roll sub 5 -1 roll 4 get 3 -1 roll sub div
					3 -1 roll 4 get 3 -1 roll 4 get dup 4 1 roll sub mul add} bind
					{4 -1 roll 5 get dup 3 1 roll sub 5 -1 roll 5 get 3 -1 roll sub div
					3 -1 roll 5 get 3 -1 roll 5 get dup 4 1 roll sub mul add} bind
				] def
				/MatrixPQR [ 0.8951 -0.7502 0.0389 0.2664 1.7135 -0.0685 -0.1614 0.0367 1.0296 ] def
				/RangePQR [-0.3227950745 2.3229645538 -1.5003771057 3.5003465881 -0.1369979095 2.136967392] def
				currentdict end
			} if
			setcolorrendering_opt
		} if		
	}if
} def
/set_crd
{
	AGMCORE_host_sep not level2 and{
		currentdict /ColorRendering known{
			ColorRendering /ColorRendering {findresource} stopped not {setcolorrendering_opt} if
		}{
			currentdict/Intent known{
				updatecolorrendering
			}if
		}ifelse
		currentcolorspace dup type /arraytype eq
			{0 get}if
		/DeviceRGB eq
			{
			currentdict/UCR known
				{/UCR}{/AGMCORE_currentucr}ifelse
			load setundercolorremoval
			currentdict/BG known 
				{/BG}{/AGMCORE_currentbg}ifelse
			load setblackgeneration
			}if
	}if
}def
/setcolorrendering_opt
{
	dup currentcolorrendering eq{
		pop
	}{
		clonedict
		begin
			/Intent Intent def
			currentdict
		end
		setcolorrendering
	}ifelse
}def
/cpaint_gcomp
{
	convert_to_process //Adobe_AGM_Core/AGMCORE_ConvertToProcess xddf
	//Adobe_AGM_Core/AGMCORE_ConvertToProcess get not
	{
		(%end_cpaint_gcomp) flushinput
	}if
}def
/cpaint_gsep
{
	//Adobe_AGM_Core/AGMCORE_ConvertToProcess get
	{	
		(%end_cpaint_gsep) flushinput
	}if
}def
/cpaint_gend
{
	newpath
}def
/set_spot_alias_ary
{
	dup inherit_aliases
	//Adobe_AGM_Core/AGMCORE_SpotAliasAry xddf
}def
/set_spot_normalization_ary
{
	dup inherit_aliases
	dup length
	/AGMCORE_SpotAliasAry where{pop AGMCORE_SpotAliasAry length add} if
	array
	//Adobe_AGM_Core/AGMCORE_SpotAliasAry2 xddf
	/AGMCORE_SpotAliasAry where{
		pop
		AGMCORE_SpotAliasAry2 0 AGMCORE_SpotAliasAry putinterval
		AGMCORE_SpotAliasAry length
	}{0} ifelse
	AGMCORE_SpotAliasAry2 3 1 roll exch putinterval
	true set_spot_alias
}def
/inherit_aliases
{
	{dup /Name get map_alias {/CSD put}{pop} ifelse} forall
}def
/set_spot_alias
{
	/AGMCORE_SpotAliasAry2 where{
		/AGMCORE_current_spot_alias 3 -1 roll put
	}{
		pop
	}ifelse
}def
/current_spot_alias
{
	/AGMCORE_SpotAliasAry2 where{
		/AGMCORE_current_spot_alias get
	}{
		false
	}ifelse
}def
/map_alias
{
	/AGMCORE_SpotAliasAry2 where{
		begin
			/AGMCORE_name xdf
			false	
			AGMCORE_SpotAliasAry2{
				dup/Name get AGMCORE_name eq{
					/CSD get /CSD get_res
					exch pop true
					exit
				}{
					pop
				}ifelse
			}forall
		end
	}{
		pop false
	}ifelse
}bdf
/spot_alias
{
	true set_spot_alias
	/AGMCORE_&setcustomcolor AGMCORE_key_known not {
		//Adobe_AGM_Core/AGMCORE_&setcustomcolor /setcustomcolor load put
	} if
	/customcolor_tint 1 AGMCORE_gput
	//Adobe_AGM_Core begin
	/setcustomcolor
	{
		currentdict/TintProc known currentdict/CSA known and 3 1 roll
		//Adobe_AGM_Core begin
		dup /customcolor_tint exch AGMCORE_gput
		1 index aload pop pop 1 eq exch 1 eq and exch 1 eq and exch 1 eq and not
		current_spot_alias and{1 index 4 get map_alias}{false}ifelse
		{
			false set_spot_alias
			4 -1 roll{
				exch pop /sep_tint AGMCORE_gget exch
			}if
			mark 3 1 roll
			setsepcolorspace
			counttomark 0 ne{
				setsepcolor
			}if
			pop
			pop
			true set_spot_alias
		}{
			AGMCORE_&setcustomcolor
			pop
		}ifelse
		end
	}bdf
	end
}def
/begin_feature
{
	Adobe_AGM_Core/AGMCORE_feature_dictCount countdictstack put
	count Adobe_AGM_Core/AGMCORE_feature_opCount 3 -1 roll put
	{Adobe_AGM_Core/AGMCORE_feature_ctm matrix currentmatrix put}if
}def
/end_feature
{
	2 dict begin
	/spd /setpagedevice load def
	/setpagedevice { get_gstate spd set_gstate } def
	stopped{$error/newerror false put}if
	end
	count Adobe_AGM_Core/AGMCORE_feature_opCount get sub dup 0 gt{{pop}repeat}{pop}ifelse
	countdictstack Adobe_AGM_Core/AGMCORE_feature_dictCount get sub dup 0 gt{{end}repeat}{pop}ifelse
	{Adobe_AGM_Core/AGMCORE_feature_ctm get setmatrix}if
}def
/set_negative
{
	//Adobe_AGM_Core begin
	/AGMCORE_inverting exch def
	level2{
		currentpagedevice/NegativePrint known{
			currentpagedevice/NegativePrint get //Adobe_AGM_Core/AGMCORE_inverting get ne{
				true begin_feature true{
						<< /NegativePrint //Adobe_AGM_Core/AGMCORE_inverting get >> setpagedevice
				}end_feature
			}if
			/AGMCORE_inverting false def
		}if
	}if
	AGMCORE_inverting{
		[{1 exch sub}/exec load dup currenttransfer exch]cvx bind settransfer
		gsave newpath clippath 1 /setseparationgray where{pop setseparationgray}{setgray}ifelse 
		/AGMIRS_&fill where {pop AGMIRS_&fill}{fill} ifelse grestore
	}if
	end
}def
/lw_save_restore_override {
	/md where {
		pop
		md begin
		initializepage
		/initializepage{}def
		/pmSVsetup{} def
		/endp{}def
		/pse{}def
		/psb{}def
		/orig_showpage where
			{pop}
			{/orig_showpage /showpage load def}
		ifelse
		/showpage {orig_showpage gR} def
		end
	}if
}def
/pscript_showpage_override {
	/NTPSOct95 where
	{
		begin
		showpage
		save
		/showpage /restore load def
		/restore {exch pop}def
		end
	}if
}def
/driver_media_override
{
	/md where {
		pop
		md /initializepage known {
			md /initializepage {} put
		} if
		md /rC known {
			md /rC {4{pop}repeat} put
		} if
	}if
	/mysetup where {
		/mysetup [1 0 0 1 0 0] put
	}if
	Adobe_AGM_Core /AGMCORE_Default_CTM matrix currentmatrix put
	level2
		{Adobe_AGM_Core /AGMCORE_Default_PageSize currentpagedevice/PageSize get put}if
}def
/driver_check_media_override
{
	/PrepsDict where
		{pop}
		{
		Adobe_AGM_Core /AGMCORE_Default_CTM get matrix currentmatrix ne
		Adobe_AGM_Core /AGMCORE_Default_PageSize get type /arraytype eq
			{
			Adobe_AGM_Core /AGMCORE_Default_PageSize get 0 get currentpagedevice/PageSize get 0 get eq and
			Adobe_AGM_Core /AGMCORE_Default_PageSize get 1 get currentpagedevice/PageSize get 1 get eq and
			}if
			{
			Adobe_AGM_Core /AGMCORE_Default_CTM get setmatrix
			}if
		}ifelse
}def
AGMCORE_err_strings begin
	/AGMCORE_bad_environ (Environment not satisfactory for this job. Ensure that the PPD is correct or that the PostScript level requested is supported by this printer. ) def
	/AGMCORE_color_space_onhost_seps (This job contains colors that will not separate with on-host methods. ) def
	/AGMCORE_invalid_color_space (This job contains an invalid color space. ) def
end
/set_def_ht
{
	AGMCORE_def_ht sethalftone
} def
end
systemdict /setpacking known
{
	setpacking
} if
%%EndResource
%%BeginResource: procset Adobe_CoolType_Core 2.25 0
%%Copyright: Copyright 1997-2005 Adobe Systems Incorporated.  All Rights Reserved.
%%Version: 2.25 0
10 dict begin
/Adobe_CoolType_Passthru currentdict def
/Adobe_CoolType_Core_Defined userdict /Adobe_CoolType_Core known def
Adobe_CoolType_Core_Defined
	{ /Adobe_CoolType_Core userdict /Adobe_CoolType_Core get def }
if
userdict /Adobe_CoolType_Core 60 dict dup begin put
/Adobe_CoolType_Version 2.25 def
/Level2?
	systemdict /languagelevel known dup
		{ pop systemdict /languagelevel get 2 ge }
	if def
Level2? not
	{
	/currentglobal false def
	/setglobal /pop load def
	/gcheck { pop false } bind def
	/currentpacking false def
	/setpacking /pop load def
	/SharedFontDirectory 0 dict def
	}
if
currentpacking
true setpacking
currentglobal false setglobal
userdict /Adobe_CoolType_Data 2 copy known not
	 { 2 copy 10 dict put }
if
get
	 begin
	 /@opStackCountByLevel 32 dict def
	 /@opStackLevel 0 def
	 /@dictStackCountByLevel 32 dict def
	 /@dictStackLevel 0 def
	 end
setglobal
/@_SaveStackLevels
	{
	Adobe_CoolType_Data
		begin
		/@vmState currentglobal def false setglobal
		@opStackCountByLevel
		@opStackLevel
		2 copy known not
			{
			2 copy
			3 dict dup /args
			7 index
			5 add array put
			put get
			}
			{
			get dup /args get dup length 3 index lt
				{
				dup length 5 add array exch
				1 index exch 0 exch putinterval
				1 index exch /args exch put
				}
				{ pop }
			ifelse
			}
		ifelse
			begin
			count 1 sub
			1 index lt
				{ pop count }
			if
			dup /argCount exch def
			dup 0 gt
				{
				args exch 0 exch getinterval 
			astore pop
				}
				{ pop }
			ifelse
			count
			/restCount exch def
			end
		/@opStackLevel @opStackLevel 1 add def
		countdictstack 1 sub
		@dictStackCountByLevel exch @dictStackLevel exch put
		/@dictStackLevel @dictStackLevel 1 add def
		@vmState setglobal
		end
	} bind def
/@_RestoreStackLevels
	{
	Adobe_CoolType_Data
		begin
		/@opStackLevel @opStackLevel 1 sub def
		@opStackCountByLevel @opStackLevel get
			begin
			count restCount sub dup 0 gt
				{ { pop } repeat }
				{ pop }
			ifelse
			args 0 argCount getinterval {} forall
			end
		/@dictStackLevel @dictStackLevel 1 sub def
		@dictStackCountByLevel @dictStackLevel get
		end
	countdictstack exch sub dup 0 gt
		{ { end } repeat }
		{ pop }
	ifelse
	} bind def
/@_PopStackLevels
	{
	Adobe_CoolType_Data
		begin
		/@opStackLevel @opStackLevel 1 sub def
		/@dictStackLevel @dictStackLevel 1 sub def
		end
	} bind def
/@Raise
	{
	exch cvx exch errordict exch get exec
	stop
	} bind def
/@ReRaise
	{
	cvx $error /errorname get errordict exch get exec
	stop
	} bind def
/@Stopped
	{
	0 @#Stopped
	} bind def
/@#Stopped
	{
	@_SaveStackLevels
	stopped
		{ @_RestoreStackLevels true }
		{ @_PopStackLevels false }
	ifelse
	} bind def
/@Arg
	{
	Adobe_CoolType_Data
		begin
		@opStackCountByLevel @opStackLevel 1 sub get
		begin
		args exch
		argCount 1 sub exch sub get
		end
		end
	} bind def
currentglobal true setglobal
/CTHasResourceForAllBug
	Level2?
		{
		1 dict dup
				/@shouldNotDisappearDictValue true def
				Adobe_CoolType_Data exch /@shouldNotDisappearDict exch put
				begin
				count @_SaveStackLevels
					 { (*) { pop stop } 128 string /Category resourceforall }
				stopped pop
				@_RestoreStackLevels
				currentdict Adobe_CoolType_Data /@shouldNotDisappearDict get ne dup
					 {
						  /@shouldNotDisappearDictValue known
								{
										  {
												end
												currentdict 1 index eq
													 { pop exit }
												if
										  }
									 loop
								}
						  if
					 }
				if
				end
		}
		{ false }
	ifelse
	def
true setglobal
/CTHasResourceStatusBug
	Level2?
		{
		mark
			{ /steveamerige /Category resourcestatus }
		stopped
			{ cleartomark true }
			{ cleartomark currentglobal not }
		ifelse
		}
		{ false }
	ifelse
	def
setglobal
/CTResourceStatus
		{
		mark 3 1 roll
		/Category findresource
			begin
			({ResourceStatus} stopped) 0 () /SubFileDecode filter cvx exec
				{ cleartomark false }
				{ { 3 2 roll pop true } { cleartomark false } ifelse }
			ifelse
			end
		} bind def
/CTWorkAroundBugs
	{
	Level2?
		{
		/cid_PreLoad /ProcSet resourcestatus
			{
			pop pop
			currentglobal
			mark
				{
				(*)
					{
					dup /CMap CTHasResourceStatusBug
						{ CTResourceStatus }
						{ resourcestatus }
					ifelse
						{
						pop dup 0 eq exch 1 eq or
							{
							dup /CMap findresource gcheck setglobal
							/CMap undefineresource
							}
							{
							pop CTHasResourceForAllBug
								{ exit }
								{ stop }
							ifelse
							}
						ifelse
						}
						{ pop }
					ifelse
					}
				128 string /CMap resourceforall
				}
			stopped
				{ cleartomark }
			stopped pop
			setglobal
			}
		if
		}
	if
	} bind def
/doc_setup
	{
	Adobe_CoolType_Core
		begin
		CTWorkAroundBugs
		/mov /moveto load def
		/nfnt /newencodedfont load def
		/mfnt /makefont load def
		/sfnt /setfont load def
		/ufnt /undefinefont load def
		/chp /charpath load def
		/awsh /awidthshow load def
		/wsh /widthshow load def
		/ash /ashow load def
		/sh /show load def
		end
		currentglobal false setglobal
	  userdict /Adobe_CoolType_Data 2 copy known not
		  { 2 copy 10 dict put }
		if
		get
		begin
		/AddWidths? false def
		/CC 0 def
		/charcode 2 string def
		/@opStackCountByLevel 32 dict def
		/@opStackLevel 0 def
		/@dictStackCountByLevel 32 dict def
		/@dictStackLevel 0 def
		/InVMFontsByCMap 10 dict def
		/InVMDeepCopiedFonts 10 dict def
		end
		setglobal
	} bind def
/doc_trailer
	{
	currentdict Adobe_CoolType_Core eq
		{ end }
	if
	} bind def
/page_setup
	{
	Adobe_CoolType_Core begin
	} bind def
/page_trailer
	{
	end
	} bind def
/unload
	{
	systemdict /languagelevel known
		{
		systemdict/languagelevel get 2 ge
			{
			userdict/Adobe_CoolType_Core 2 copy known
				{ undef }
				{ pop pop }
			ifelse
			}
		if
		}
	if
	} bind def
/ndf
	{
	1 index where
		{ pop pop pop }
		{ dup xcheck { bind } if def }
	ifelse
	} def
/findfont systemdict
	begin
	userdict
		begin
		/globaldict where { /globaldict get begin } if
			dup where pop exch get
		/globaldict where { pop end } if
		end
	end
Adobe_CoolType_Core_Defined
	{ /systemfindfont exch def }
	{
	/findfont 1 index def
	/systemfindfont exch def
	}
ifelse
/undefinefont
	{ pop } ndf
/copyfont
	{
	currentglobal 3 1 roll
	1 index gcheck setglobal
	dup null eq { 0 } { dup length } ifelse
	2 index length add 1 add dict
		begin
		exch
			{
			1 index /FID eq
				{ pop pop }
				{ def }
			ifelse
			}
		forall
		dup null eq
			{ pop }
			{ { def } forall }
		ifelse
		currentdict
		end
	exch setglobal
	} bind def
/copyarray
	{
	currentglobal exch
	dup gcheck setglobal
	dup length array copy
	exch setglobal
	} bind def
/newencodedfont
	{
	currentglobal
		{
		SharedFontDirectory 3 index  known
			{ SharedFontDirectory 3 index get /FontReferenced known }
			{ false }
		ifelse
		}
		{
		FontDirectory 3 index known
			{ FontDirectory 3 index get /FontReferenced known }
			{
			SharedFontDirectory 3 index known
				{ SharedFontDirectory 3 index get /FontReferenced known }
				{ false }
			ifelse
			}
		ifelse
		}
	ifelse
	dup
		{
		3 index findfont /FontReferenced get
		2 index dup type /nametype eq
			{findfont}
		if ne
			{ pop false }
		if
		}
	if
		{
		pop
		1 index findfont
		/Encoding get exch
		0 1 255
			{ 2 copy get 3 index 3 1 roll put }
		for
		pop pop pop
		}
		{
		dup type /nametype eq
		  { findfont }
	  if
		dup dup maxlength 2 add dict
			begin
			exch
				{
				1 index /FID ne
					{def}
					{pop pop}
				ifelse
				}
			forall
			/FontReferenced exch def
			/Encoding exch dup length array copy def
			/FontName 1 index dup type /stringtype eq { cvn } if def dup
			currentdict
			end
		definefont def
		}
	ifelse
	} bind def
/SetSubstituteStrategy
	{
	$SubstituteFont
		begin
		dup type /dicttype ne
			{ 0 dict }
		if
		currentdict /$Strategies known
			{
			exch $Strategies exch 
			2 copy known
				{
				get
				2 copy maxlength exch maxlength add dict
					begin
					{ def } forall
					{ def } forall
					currentdict
					dup /$Init known
						{ dup /$Init get exec }
					if
					end
				/$Strategy exch def
				}
				{ pop pop pop }
			ifelse
			}
			{ pop pop }
		ifelse
		end
	} bind def
/scff
	{
	$SubstituteFont
		begin
		dup type /stringtype eq
			{ dup length exch }
			{ null }
		ifelse
		/$sname exch def
		/$slen exch def
		/$inVMIndex
			$sname null eq
				{
				1 index $str cvs
				dup length $slen sub $slen getinterval cvn
				}
				{ $sname }
			ifelse def
		end
		{ findfont }
	@Stopped
		{
		dup length 8 add string exch
		1 index 0 (BadFont:) putinterval
		1 index exch 8 exch dup length string cvs putinterval cvn
			{ findfont }
		@Stopped
			{ pop /Courier findfont }
		if
		}
	if
	$SubstituteFont
		begin
		/$sname null def
		/$slen 0 def
		/$inVMIndex null def
		end
	} bind def
/isWidthsOnlyFont
	{
	dup /WidthsOnly known
		{ pop pop true }
		{
		dup /FDepVector known
			{ /FDepVector get { isWidthsOnlyFont dup { exit } if } forall }
			{
			dup /FDArray known
				{ /FDArray get { isWidthsOnlyFont dup { exit } if } forall }
				{ pop }
			ifelse
			}
		ifelse
		}
	ifelse
	} bind def
/?str1 256 string def
/?set
	{
	$SubstituteFont
		begin
		/$substituteFound false def
		/$fontname 4 index def
		/$doSmartSub false def
		end
	3 index
	currentglobal false setglobal exch
	/CompatibleFonts /ProcSet resourcestatus
		{
		pop pop
		/CompatibleFonts /ProcSet findresource
			begin
			dup /CompatibleFont currentexception
			1 index /CompatibleFont true setexception
			1 index /Font resourcestatus
				{
				pop pop
				3 2 roll setglobal
				end
				exch
				dup findfont
				/CompatibleFonts /ProcSet findresource
					begin
					3 1 roll exch /CompatibleFont exch setexception
					end
				}
				{
				3 2 roll setglobal
				1 index exch /CompatibleFont exch setexception
				end
				findfont
				$SubstituteFont /$substituteFound true put
				}
			ifelse
		}
		{ exch setglobal findfont }
	ifelse
	$SubstituteFont
		begin
		$substituteFound
			{
		 false
		 (%%[Using embedded font ) print
		 5 index ?str1 cvs print
		 ( to avoid the font substitution problem noted earlier.]%%\n) print
		 }
			{
			dup /FontName known
				{
				dup /FontName get $fontname eq
				1 index /DistillerFauxFont known not and
				/currentdistillerparams where
					{ pop false 2 index isWidthsOnlyFont not and }
				if
				}
				{ false }
			ifelse
			}
		ifelse
		exch pop
		/$doSmartSub true def
		end
		{
		exch pop exch pop exch
		2 dict dup /Found 3 index put
		exch findfont exch
		}
		{
		exch exec
		exch dup findfont
		dup /FontType get 3 eq
	  {
		  exch ?str1 cvs
		  dup length 1 sub
		  -1 0
		{
			  exch dup 2 index get 42 eq
			{
				 exch 0 exch getinterval cvn 4 1 roll 3 2 roll pop
				 exit
			  }
			  {exch pop} ifelse
		  }for
		}
		{
		 exch pop
	  } ifelse
		2 dict dup /Downloaded 6 5 roll put
		}
	ifelse
	dup /FontName 4 index put copyfont definefont pop
	} bind def
/?str2 256 string def
/?add
	{
	1 index type /integertype eq
		{ exch true 4 2 }
		{ false 3 1 }
	ifelse
	roll
	1 index findfont
	dup /Widths known
		{
		Adobe_CoolType_Data /AddWidths? true put
		gsave dup 1000 scalefont setfont
		}
	if
	/Downloaded known
		{
		exec
		exch
			{
			exch ?str2 cvs exch
			findfont /Downloaded get 1 dict begin /Downloaded 1 index def ?str1 cvs length
			?str1 1 index 1 add 3 index putinterval
			exch length 1 add 1 index add
			?str1 2 index (*) putinterval
			?str1 0 2 index getinterval cvn findfont 
			?str1 3 index (+) putinterval
			2 dict dup /FontName ?str1 0 6 index getinterval cvn put
			dup /Downloaded Downloaded put end copyfont
			dup /FontName get exch definefont pop pop pop
			}
			{
			pop
			}
		ifelse
		}
		{
		pop
		exch
			{
			findfont
			dup /Found get
			dup length exch ?str1 cvs pop
			?str1 1 index (+) putinterval
			?str1 1 index 1 add 4 index ?str2 cvs putinterval
			?str1 exch 0 exch 5 4 roll ?str2 cvs length 1 add add getinterval cvn
			1 dict exch 1 index exch /FontName exch put copyfont
			dup /FontName get exch definefont pop
			}
			{
			pop
			}
		ifelse
		}
	ifelse
	Adobe_CoolType_Data /AddWidths? get
		{ grestore Adobe_CoolType_Data /AddWidths? false put }
	if
	} bind def
/?sh
	{
	currentfont /Downloaded known { exch } if pop
	} bind def
/?chp
	{
	currentfont /Downloaded known { pop } { false chp } ifelse
	} bind def
/?mv 
	{
	currentfont /Downloaded known { moveto pop pop } { pop pop moveto } ifelse
	} bind def
setpacking
userdict /$SubstituteFont 25 dict put
1 dict
	begin
	/SubstituteFont
		dup $error exch 2 copy known
			{ get }
			{ pop pop { pop /Courier } bind }
		ifelse def
	/currentdistillerparams where dup
		{
		pop pop
		currentdistillerparams /CannotEmbedFontPolicy 2 copy known
			{ get /Error eq }
			{ pop pop false }
		ifelse
		}
	if not
		{
		countdictstack array dictstack 0 get
			begin
			userdict
				begin
				$SubstituteFont
					begin
					/$str 128 string def
					/$fontpat 128 string def
					/$slen 0 def
					/$sname null def
					/$match false def
					/$fontname null def
					/$substituteFound false def
					/$inVMIndex null def
					/$doSmartSub true def
					/$depth 0 def
					/$fontname null def
					/$italicangle 26.5 def
					/$dstack null def
					/$Strategies 10 dict dup
						begin
						/$Type3Underprint
							{
							currentglobal exch false setglobal
							11 dict
								begin
								/UseFont exch
									$WMode 0 ne
										{
										dup length dict copy
										dup /WMode $WMode put
										/UseFont exch definefont
										}
									if def
								/FontName $fontname dup type /stringtype eq { cvn } if def
								/FontType 3 def
								/FontMatrix [ .001 0 0 .001 0 0 ] def
								/Encoding 256 array dup 0 1 255 { /.notdef put dup } for pop def
								/FontBBox [ 0 0 0 0 ] def
								/CCInfo 7 dict dup
									begin
									/cc null def
									/x 0 def
									/y 0 def
									end def
								/BuildChar
									{
									exch
										begin
										CCInfo
											begin
											1 string dup 0 3 index put exch pop
											/cc exch def
											UseFont 1000 scalefont setfont
											cc stringwidth /y exch def /x exch def
											x y setcharwidth
											$SubstituteFont /$Strategy get /$Underprint get exec
											0 0 moveto cc show
											x y moveto
											end
										end
									} bind def
								currentdict
								end
							exch setglobal
							} bind def
						/$GetaTint
							2 dict dup
								begin
								/$BuildFont
									{
									dup /WMode known
										{ dup /WMode get }
										{ 0 }
									ifelse
									/$WMode exch def
									$fontname exch
									dup /FontName known
										{
										dup /FontName get
										dup type /stringtype eq { cvn } if
										}
										{ /unnamedfont }
									ifelse
									exch
									Adobe_CoolType_Data /InVMDeepCopiedFonts get
									1 index /FontName get known
										{
										pop
										Adobe_CoolType_Data /InVMDeepCopiedFonts get
										1 index get
										null copyfont
										}
										{ $deepcopyfont }
									ifelse
									exch 1 index exch /FontBasedOn exch put
									dup /FontName $fontname dup type /stringtype eq { cvn } if put
									definefont
									Adobe_CoolType_Data /InVMDeepCopiedFonts get
										begin
										dup /FontBasedOn get 1 index def
										end
									} bind def
								/$Underprint
									{
									gsave
									x abs y abs gt
										{ /y 1000 def }
										{ /x -1000 def 500 120 translate }
									ifelse
									Level2?
										{
										[ /Separation (All) /DeviceCMYK { 0 0 0 1 pop } ]
										setcolorspace
										}
										{ 0 setgray }
									ifelse
									10 setlinewidth
									x .8 mul
									[ 7 3 ]
										{
										y mul 8 div 120 sub x 10 div exch moveto
										0 y 4 div neg rlineto
										dup 0 rlineto
										0 y 4 div rlineto
										closepath
										gsave
										Level2?
											{ .2 setcolor }
											{ .8 setgray }
										ifelse
										fill grestore
										stroke
										}
									forall
									pop
									grestore
									} bind def
								end def
						/$Oblique
							1 dict dup
								begin
								/$BuildFont
									{
									currentglobal exch dup gcheck setglobal
									null copyfont
										begin
										/FontBasedOn
										currentdict /FontName known
											{
											FontName
											dup type /stringtype eq { cvn } if
											}
											{ /unnamedfont }
										ifelse
										def
										/FontName $fontname dup type /stringtype eq { cvn } if def
										/currentdistillerparams where
											{ pop }
											{
											/FontInfo currentdict /FontInfo known
												{ FontInfo null copyfont }
												{ 2 dict }
											ifelse
											dup
												begin
												/ItalicAngle $italicangle def
												/FontMatrix FontMatrix
												[ 1 0 ItalicAngle dup sin exch cos div 1 0 0 ]
												matrix concatmatrix readonly
												end
											4 2 roll def
											def
											}
										ifelse
										FontName currentdict
										end
									definefont
									exch setglobal
									} bind def
								end def
						/$None
							1 dict dup
								begin
								/$BuildFont {} bind def
								end def
						end def
					/$Oblique SetSubstituteStrategy
					/$findfontByEnum
						{
						dup type /stringtype eq { cvn } if
						dup /$fontname exch def
						$sname null eq
							{ $str cvs dup length $slen sub $slen getinterval }
							{ pop $sname }
						ifelse
						$fontpat dup 0 (fonts/*) putinterval exch 7 exch putinterval
						/$match false def
						$SubstituteFont /$dstack countdictstack array dictstack put
						mark
							{
							$fontpat 0 $slen 7 add getinterval
								{ /$match exch def exit }
							$str filenameforall
							}
						stopped
							{
							cleardictstack
							currentdict
							true
							$SubstituteFont /$dstack get
								{
								exch
									{
									1 index eq
										{ pop false }
										{ true }
									ifelse
									}
									{ begin false }
								ifelse
								}
							forall
							pop
							}
						if
						cleartomark
						/$slen 0 def
						$match false ne
							{ $match (fonts/) anchorsearch pop pop cvn }
							{ /Courier }
						ifelse
						} bind def
					/$ROS 1 dict dup
						begin
						/Adobe 4 dict dup
							begin
							/Japan1  [ /Ryumin-Light /HeiseiMin-W3
										  /GothicBBB-Medium /HeiseiKakuGo-W5
										  /HeiseiMaruGo-W4 /Jun101-Light ] def
							/Korea1  [ /HYSMyeongJo-Medium /HYGoThic-Medium ] def
							/GB1	  [ /STSong-Light /STHeiti-Regular ] def
							/CNS1	 [ /MKai-Medium /MHei-Medium ] def
							end def
						end def
					/$cmapname null def
					/$deepcopyfont
						{
						dup /FontType get 0 eq
							{
							1 dict dup /FontName /copied put copyfont
								begin
								/FDepVector FDepVector copyarray
								0 1 2 index length 1 sub
									{
									2 copy get $deepcopyfont
									dup /FontName /copied put
									/copied exch definefont
									3 copy put pop pop
									}
								for
								def
								currentdict
								end
							}
							{ $Strategies /$Type3Underprint get exec }
						ifelse
						} bind def
					/$buildfontname
						{
						dup /CIDFont findresource /CIDSystemInfo get
							begin
							Registry length Ordering length Supplement 8 string cvs
							3 copy length 2 add add add string
							dup 5 1 roll dup 0 Registry putinterval
							dup 4 index (-) putinterval
							dup 4 index 1 add Ordering putinterval
							4 2 roll add 1 add 2 copy (-) putinterval
							end
						1 add 2 copy 0 exch getinterval $cmapname $fontpat cvs exch
						anchorsearch
							{ pop pop 3 2 roll putinterval cvn /$cmapname exch def }
							{ pop pop pop pop pop }
						ifelse
						length
						$str 1 index (-) putinterval 1 add
						$str 1 index $cmapname $fontpat cvs putinterval
						$cmapname length add
						$str exch 0 exch getinterval cvn
						} bind def
					/$findfontByROS
						{
						/$fontname exch def
						$ROS Registry 2 copy known
							{
							get Ordering 2 copy known
								{ get }
								{ pop pop [] }
							ifelse
							}
							{ pop pop [] }
						ifelse
						false exch
							{
							dup /CIDFont resourcestatus
								{
								pop pop
								save
								1 index /CIDFont findresource
								dup /WidthsOnly known
									{ dup /WidthsOnly get }
									{ false }
								ifelse
								exch pop
								exch restore
									{ pop }
									{ exch pop true exit }
								ifelse
								}
								{ pop }
							ifelse
							}
						forall
							{ $str cvs $buildfontname }
							{
							false (*)
								{
								save exch
								dup /CIDFont findresource
								dup /WidthsOnly known
									{ dup /WidthsOnly get not }
									{ true }
								ifelse
								exch /CIDSystemInfo get
								dup /Registry get Registry eq
								exch /Ordering get Ordering eq and and
									{ exch restore exch pop true exit }
									{ pop restore }
								ifelse
								}
							$str /CIDFont resourceforall
								{ $buildfontname }
								{ $fontname $findfontByEnum }
							ifelse
							}
						ifelse
						} bind def
					end
				end
				currentdict /$error known currentdict /languagelevel known and dup
					{ pop $error /SubstituteFont known }
				if
				dup
					{ $error }
					{ Adobe_CoolType_Core }
				ifelse
				begin
					{
					/SubstituteFont
					/CMap /Category resourcestatus
						{
						pop pop
						{
						$SubstituteFont
							begin
							/$substituteFound true def
							dup length $slen gt
							$sname null ne or
							$slen 0 gt and
								{
								$sname null eq
									{ dup $str cvs dup length $slen sub $slen getinterval cvn }
									{ $sname }
								ifelse
								Adobe_CoolType_Data /InVMFontsByCMap get
								1 index 2 copy known
									{
									get
									false exch
										{
										pop
										currentglobal
											{
											GlobalFontDirectory 1 index known
												{ exch pop true exit }
												{ pop }
											ifelse
											}
											{
											FontDirectory 1 index known
												{ exch pop true exit }
												{
												GlobalFontDirectory 1 index known
													{ exch pop true exit }
													{ pop }
												ifelse
												}
											ifelse
											}
										ifelse
										}
									forall
									}
									{ pop pop false }
								ifelse
									{
									exch pop exch pop
									}
									{
									dup /CMap resourcestatus
										{
										pop pop
										dup /$cmapname exch def
										/CMap findresource /CIDSystemInfo get { def } forall
										$findfontByROS
										}
										{
										128 string cvs
										dup (-) search
											{
											3 1 roll search
												{
												3 1 roll pop
													{ dup cvi }
												stopped
													{ pop pop pop pop pop $findfontByEnum }
													{
													4 2 roll pop pop
													exch length
													exch
													2 index length
													2 index
													sub
													exch 1 sub -1 0
														{
														$str cvs dup length
														4 index
														0
														4 index
														4 3 roll add
														getinterval
														exch 1 index exch 3 index exch
														putinterval
														dup /CMap resourcestatus
															{
															pop pop
															4 1 roll pop pop pop
															dup /$cmapname exch def
															/CMap findresource /CIDSystemInfo get { def } forall
															$findfontByROS
															true exit
															}
															{ pop }
														ifelse
														}
													for
													dup type /booleantype eq
														{ pop }
														{ pop pop pop $findfontByEnum }
													ifelse
													}
												ifelse
												}
												{ pop pop pop $findfontByEnum }
											ifelse
											}
											{ pop pop $findfontByEnum }
										ifelse
										}
									ifelse
									}
								ifelse
								}
								{ //SubstituteFont exec }
							ifelse
							/$slen 0 def
							end
						}
						}
						{
						{
						$SubstituteFont
							begin
							/$substituteFound true def
							dup length $slen gt
							$sname null ne or
							$slen 0 gt and
								{ $findfontByEnum }
								{ //SubstituteFont exec }
							ifelse
							end
						}
						}
					ifelse
					bind readonly def
					Adobe_CoolType_Core /scfindfont /systemfindfont load put
					}
					{
					/scfindfont
						{
						$SubstituteFont
							begin
							dup systemfindfont
							dup /FontName known
								{ dup /FontName get dup 3 index ne }
								{ /noname true }
							ifelse
							dup
								{
								/$origfontnamefound 2 index def
								/$origfontname 4 index def /$substituteFound true def
								}
							if
							exch pop
								{
								$slen 0 gt
								$sname null ne
								3 index length $slen gt or and
									{
									pop dup $findfontByEnum findfont
									dup maxlength 1 add dict
										begin
											{ 1 index /FID eq { pop pop } { def } ifelse }
										forall
										currentdict
										end
									definefont
									dup /FontName known { dup /FontName get } { null } ifelse
									$origfontnamefound ne
										{
										$origfontname $str cvs print
										( substitution revised, using ) print
										dup /FontName known
											{ dup /FontName get } { (unspecified font) }
										ifelse
										$str cvs print (.\n) print
										}
									if
									}
									{ exch pop }
								ifelse
								}
								{ exch pop }
							ifelse
							end
						} bind def
					}
				ifelse
				end
			end
		Adobe_CoolType_Core_Defined not
			{
			Adobe_CoolType_Core /findfont
				{
				$SubstituteFont
					begin
					$depth 0 eq
						{
						/$fontname 1 index dup type /stringtype ne { $str cvs } if def
						/$substituteFound false def
						}
					if
					/$depth $depth 1 add def
					end
				scfindfont
				$SubstituteFont
					begin
					/$depth $depth 1 sub def
					$substituteFound $depth 0 eq and
						{
						$inVMIndex null ne
							{ dup $inVMIndex $AddInVMFont }
						if
						$doSmartSub
							{
							currentdict /$Strategy known
								{ $Strategy /$BuildFont get exec }
							if
							}
						if
						}
					if
					end
				} bind put
			}
		if
		}
	if
	end
/$AddInVMFont
	{
	exch /FontName 2 copy known
		{
		get
		1 dict dup begin exch 1 index gcheck def end exch
		Adobe_CoolType_Data /InVMFontsByCMap get exch
		$DictAdd
		}
		{ pop pop pop }
	ifelse
	} bind def
/$DictAdd
	{
	2 copy known not
		{ 2 copy 4 index length dict put }
	if
	Level2? not
		{
		2 copy get dup maxlength exch length 4 index length add lt
		2 copy get dup length 4 index length add exch maxlength 1 index lt
			{
			2 mul dict
				begin
				2 copy get { forall } def
				2 copy currentdict put
				end
			}
			{ pop }
		ifelse
		}
	if
	get
		begin
			{ def }
		forall
		end
	} bind def
end
end
%%EndResource
%%BeginResource: procset Adobe_CoolType_Utility_MAKEOCF 1.21 0
%%Copyright: Copyright 1987-2005 Adobe Systems Incorporated.
%%Version: 1.21 0
systemdict /languagelevel known dup
	{ currentglobal false setglobal }
	{ false }
ifelse
exch
userdict /Adobe_CoolType_Utility 2 copy known
	{ 2 copy get dup maxlength 27 add dict copy }
	{ 27 dict }
ifelse put
Adobe_CoolType_Utility
	begin
	/@eexecStartData
		  <BAB431EA07F209EB8C4348311481D9D3F76E3D15246555577D87BC510ED54E
		 118C39697FA9F6DB58128E60EB8A12FA24D7CDD2FA94D221FA9EC8DA3E5E6A1C
		 4ACECC8C2D39C54E7C946031DD156C3A6B4A09AD29E1867A> def
	/@recognizeCIDFont null def
	/ct_Level2? exch def
	/ct_Clone? 1183615869 internaldict dup
			/CCRun known not
			exch /eCCRun known not
			ct_Level2? and or def
ct_Level2?
	{ globaldict begin currentglobal true setglobal }
if
	/ct_AddStdCIDMap
		ct_Level2?
			{ {
				mark
				Adobe_CoolType_Utility /@recognizeCIDFont currentdict put
					 {
					 ((Hex) 57 StartData
					 0615 1e27 2c39 1c60 d8a8 cc31 fe2b f6e0
					 7aa3 e541 e21c 60d8 a8c9 c3d0 6d9e 1c60
					 d8a8 c9c2 02d7 9a1c 60d8 a849 1c60 d8a8
					 cc36 74f4 1144 b13b 77) 0 () /SubFileDecode filter cvx exec
					 }
				stopped
					 {
					 cleartomark
					 Adobe_CoolType_Utility /@recognizeCIDFont get
					 countdictstack dup array dictstack
					 exch 1 sub -1 0
						  {
						  2 copy get 3 index eq
								{ 1 index length exch sub 1 sub { end } repeat exit }
								{ pop }
						  ifelse
						  }
					 for
					 pop pop
					 Adobe_CoolType_Utility /@eexecStartData get eexec
					 }
					 { cleartomark }
				ifelse
			} }
			{ {
				Adobe_CoolType_Utility /@eexecStartData get eexec
			} }
		ifelse bind def
userdict /cid_extensions known
dup { cid_extensions /cid_UpdateDB known and } if
	 {
	 cid_extensions
	 begin
	 /cid_GetCIDSystemInfo
		 {
		 1 index type /stringtype eq
			 { exch cvn exch }
		 if
		 cid_extensions
			 begin
			 dup load 2 index known
				 {
				 2 copy
				 cid_GetStatusInfo
				 dup null ne
					 {
					 1 index load
					 3 index get
					 dup null eq
						  { pop pop cid_UpdateDB }
						  {
						  exch
						  1 index /Created get eq
							  { exch pop exch pop }
							  { pop cid_UpdateDB }
						  ifelse
						  }
					 ifelse
					 }
					 { pop cid_UpdateDB }
				 ifelse
				 }
				 { cid_UpdateDB }
			 ifelse
			 end
		 } bind def
	 end
	 }
if
ct_Level2?
	{ end setglobal }
if
	/ct_UseNativeCapability?  systemdict /composefont known def
	/ct_MakeOCF 35 dict def
	/ct_Vars 25 dict def
	/ct_GlyphDirProcs 6 dict def
	/ct_BuildCharDict 15 dict dup
		begin
		/charcode 2 string def
		/dst_string 1500 string def
		/nullstring () def
		/usewidths? true def
		end def
	ct_Level2? { setglobal } { pop } ifelse
	ct_GlyphDirProcs
		begin
		/GetGlyphDirectory
			{
			systemdict /languagelevel known
				{ pop /CIDFont findresource /GlyphDirectory get }
				{
				1 index /CIDFont findresource /GlyphDirectory
				get dup type /dicttype eq
					{
					dup dup maxlength exch length sub 2 index lt
						{
						dup length 2 index add dict copy 2 index
						/CIDFont findresource/GlyphDirectory 2 index put
						}
					if
					}
				if
				exch pop exch pop
				}
			ifelse
			+
			} def
		/+
			{
			systemdict /languagelevel known
				{
				currentglobal false setglobal
				3 dict begin
					/vm exch def
				}
				{ 1 dict begin }
			ifelse
			/$ exch def
			systemdict /languagelevel known
				{
				vm setglobal
				/gvm currentglobal def
				$ gcheck setglobal
				}
			if
			? { $ begin } if
			} def
		/? { $ type /dicttype eq } def
		/| {
			userdict /Adobe_CoolType_Data known
				{
			Adobe_CoolType_Data /AddWidths? known
				{
				 currentdict Adobe_CoolType_Data
					begin
					  begin
						AddWidths?
								{
								Adobe_CoolType_Data /CC 3 index put
								? { def } { $ 3 1 roll put } ifelse
								CC charcode exch 1 index 0 2 index 256 idiv put
								1 index exch 1 exch 256 mod put
								stringwidth 2 array astore
								currentfont /Widths get exch CC exch put
								}
								{ ? { def } { $ 3 1 roll put } ifelse }
							ifelse
					end
				end
				}
				{ ? { def } { $ 3 1 roll put } ifelse }	ifelse
				}
				{ ? { def } { $ 3 1 roll put } ifelse }
			ifelse
			} def
		/!
			{
			? { end } if
			systemdict /languagelevel known
				{ gvm setglobal }
			if
			end
			} def
		/: { string currentfile exch readstring pop } executeonly def
		end
	ct_MakeOCF
		begin
		/ct_cHexEncoding
		[/c00/c01/c02/c03/c04/c05/c06/c07/c08/c09/c0A/c0B/c0C/c0D/c0E/c0F/c10/c11/c12
		 /c13/c14/c15/c16/c17/c18/c19/c1A/c1B/c1C/c1D/c1E/c1F/c20/c21/c22/c23/c24/c25
		 /c26/c27/c28/c29/c2A/c2B/c2C/c2D/c2E/c2F/c30/c31/c32/c33/c34/c35/c36/c37/c38
		 /c39/c3A/c3B/c3C/c3D/c3E/c3F/c40/c41/c42/c43/c44/c45/c46/c47/c48/c49/c4A/c4B
		 /c4C/c4D/c4E/c4F/c50/c51/c52/c53/c54/c55/c56/c57/c58/c59/c5A/c5B/c5C/c5D/c5E
		 /c5F/c60/c61/c62/c63/c64/c65/c66/c67/c68/c69/c6A/c6B/c6C/c6D/c6E/c6F/c70/c71
		 /c72/c73/c74/c75/c76/c77/c78/c79/c7A/c7B/c7C/c7D/c7E/c7F/c80/c81/c82/c83/c84
		 /c85/c86/c87/c88/c89/c8A/c8B/c8C/c8D/c8E/c8F/c90/c91/c92/c93/c94/c95/c96/c97
		 /c98/c99/c9A/c9B/c9C/c9D/c9E/c9F/cA0/cA1/cA2/cA3/cA4/cA5/cA6/cA7/cA8/cA9/cAA
		 /cAB/cAC/cAD/cAE/cAF/cB0/cB1/cB2/cB3/cB4/cB5/cB6/cB7/cB8/cB9/cBA/cBB/cBC/cBD
		 /cBE/cBF/cC0/cC1/cC2/cC3/cC4/cC5/cC6/cC7/cC8/cC9/cCA/cCB/cCC/cCD/cCE/cCF/cD0
		 /cD1/cD2/cD3/cD4/cD5/cD6/cD7/cD8/cD9/cDA/cDB/cDC/cDD/cDE/cDF/cE0/cE1/cE2/cE3
		 /cE4/cE5/cE6/cE7/cE8/cE9/cEA/cEB/cEC/cED/cEE/cEF/cF0/cF1/cF2/cF3/cF4/cF5/cF6
		 /cF7/cF8/cF9/cFA/cFB/cFC/cFD/cFE/cFF] def
		/ct_CID_STR_SIZE 8000 def
		/ct_mkocfStr100 100 string def
		/ct_defaultFontMtx [.001 0 0 .001 0 0] def
		/ct_1000Mtx [1000 0 0 1000 0 0] def
		/ct_raise {exch cvx exch errordict exch get exec stop} bind def
		/ct_reraise
			{ cvx $error /errorname get (Error: ) print dup (						  ) cvs print
					errordict exch get exec stop
			} bind def
		/ct_cvnsi
			{
			1 index add 1 sub 1 exch 0 4 1 roll
				{
				2 index exch get
				exch 8 bitshift
				add
				}
			for
			exch pop
			} bind def
		/ct_GetInterval
			{
			Adobe_CoolType_Utility /ct_BuildCharDict get
				begin
				/dst_index 0 def
				dup dst_string length gt
					{ dup string /dst_string exch def }
				if
				1 index ct_CID_STR_SIZE idiv
				/arrayIndex exch def
				2 index arrayIndex  get
				2 index
				arrayIndex ct_CID_STR_SIZE mul
				sub
					{
					dup 3 index add 2 index length le
						{
						2 index getinterval
						dst_string  dst_index 2 index putinterval
						length dst_index add /dst_index exch def
						exit
						}
						{
						1 index length 1 index sub
						dup 4 1 roll
						getinterval
						dst_string  dst_index 2 index putinterval
						pop dup dst_index add /dst_index exch def
						sub
						/arrayIndex arrayIndex 1 add def
						2 index dup length arrayIndex gt
							  { arrayIndex get }
							  {
							  pop
							  exit
							  }
						ifelse
						0
						}
					ifelse
					}
				loop
				pop pop pop
				dst_string 0 dst_index getinterval
				end
			} bind def
		ct_Level2?
			{
			/ct_resourcestatus
			currentglobal mark true setglobal
				{ /unknowninstancename /Category resourcestatus }
			stopped
				{ cleartomark setglobal true }
				{ cleartomark currentglobal not exch setglobal }
			ifelse
				{
					{
					mark 3 1 roll /Category findresource
						begin
						ct_Vars /vm currentglobal put
						({ResourceStatus} stopped) 0 () /SubFileDecode filter cvx exec
							{ cleartomark false }
							{ { 3 2 roll pop true } { cleartomark false } ifelse }
						ifelse
						ct_Vars /vm get setglobal
						end
					}
				}
				{ { resourcestatus } }
			ifelse bind def
			/CIDFont /Category ct_resourcestatus
				{ pop pop }
				{
				currentglobal  true setglobal
				/Generic /Category findresource
				dup length dict copy
				dup /InstanceType /dicttype put
				/CIDFont exch /Category defineresource pop
				setglobal
				}
			ifelse
			ct_UseNativeCapability?
				{
				/CIDInit /ProcSet findresource begin
				12 dict begin
				begincmap
				/CIDSystemInfo 3 dict dup begin
				  /Registry (Adobe) def
				  /Ordering (Identity) def
				  /Supplement 0 def
				end def
				/CMapName /Identity-H def
				/CMapVersion 1.000 def
				/CMapType 1 def
				1 begincodespacerange
				<0000> <FFFF>
				endcodespacerange
				1 begincidrange
				<0000> <FFFF> 0
				endcidrange
				endcmap
				CMapName currentdict /CMap defineresource pop
				end
				end
				}
			if
			}
			{
			/ct_Category 2 dict begin
			/CIDFont  10 dict def
			/ProcSet	2 dict def
			currentdict
			end
			def
			/defineresource
				{
				ct_Category 1 index 2 copy known
					{
					get
					dup dup maxlength exch length eq
						{
						dup length 10 add dict copy
						ct_Category 2 index 2 index put
						}
					if
					3 index 3 index put
					pop exch pop
					}
					{ pop pop /defineresource /undefined ct_raise }
				ifelse
				} bind def
			/findresource
				{
				ct_Category 1 index 2 copy known
					{
					get
					2 index 2 copy known
						{ get 3 1 roll pop pop}
						{ pop pop /findresource /undefinedresource ct_raise }
					ifelse
					}
					{ pop pop /findresource /undefined ct_raise }
				ifelse
				} bind def
			/resourcestatus
				{
				ct_Category 1 index 2 copy known
					{
					get
					2 index known
					exch pop exch pop
						{
						0 -1 true
						}
						{
						false
						}
					ifelse
					}
					{ pop pop /findresource /undefined ct_raise }
				ifelse
				} bind def
			/ct_resourcestatus /resourcestatus load def
			}
		ifelse
		/ct_CIDInit 2 dict
			begin
			/ct_cidfont_stream_init
				{
					{
					dup (Binary) eq
						{
						pop
						null
						currentfile
						ct_Level2?
							{
								{ cid_BYTE_COUNT () /SubFileDecode filter }
							stopped
								{ pop pop pop }
							if
							}
						if
						/readstring load
						exit
						}
					if
					dup (Hex) eq
						{
						pop
						currentfile
						ct_Level2?
							{
								{ null exch /ASCIIHexDecode filter /readstring }
							stopped
								{ pop exch pop (>) exch /readhexstring }
							if
							}
							{ (>) exch /readhexstring }
						ifelse
						load
						exit
						}
					if
					/StartData /typecheck ct_raise
					}
				loop
				cid_BYTE_COUNT ct_CID_STR_SIZE le
					{
					2 copy cid_BYTE_COUNT string exch exec
					pop
					1 array dup
					3 -1 roll
					0 exch put
					}
					{
					cid_BYTE_COUNT ct_CID_STR_SIZE div ceiling cvi
					dup array exch 2 sub 0 exch 1 exch
						{
						2 copy
						5 index
						ct_CID_STR_SIZE
						string
						6 index exec
						pop
						put
						pop
						}
					for
					2 index
					cid_BYTE_COUNT ct_CID_STR_SIZE mod string
					3 index exec
					pop
					1 index exch
					1 index length 1 sub
					exch put
					}
				ifelse
				cid_CIDFONT exch /GlyphData exch put
				2 index null eq
					{
					pop pop pop
					}
					{
					pop /readstring load
					1 string exch
						{
						3 copy exec
						pop
						dup length 0 eq
							{
							pop pop pop pop pop
							true exit
							}
						if
						4 index
						eq
							{
							pop pop pop pop
							false exit
							}
						if
						}
					loop
					pop
					}
				ifelse
				} bind def
			/StartData
				{
				mark
					{
					currentdict
					dup /FDArray get 0 get /FontMatrix get
					0 get 0.001 eq
						{
						dup /CDevProc known not
							{
							/CDevProc 1183615869 internaldict /stdCDevProc 2 copy known
								{ get }
								{
								pop pop
								{ pop pop pop pop pop 0 -1000 7 index 2 div 880 }
								}
							ifelse
							def
							}
						if
						}
						{
						 /CDevProc
							 {
							 pop pop pop pop pop
							 0
							 1 cid_temp /cid_CIDFONT get
							 /FDArray get 0 get
							 /FontMatrix get 0 get div
							 7 index 2 div
							 1 index 0.88 mul
							 } def
						}
					ifelse
					/cid_temp 15 dict def
					cid_temp
						begin
						/cid_CIDFONT exch def
						3 copy pop
						dup /cid_BYTE_COUNT exch def 0 gt
							{
							ct_cidfont_stream_init
							FDArray
								{
								/Private get
								dup /SubrMapOffset known
									{
									begin
									/Subrs SubrCount array def
									Subrs
									SubrMapOffset
									SubrCount
									SDBytes
									ct_Level2?
										{
										currentdict dup /SubrMapOffset undef
										dup /SubrCount undef
										/SDBytes undef
										}
									if
									end
									/cid_SD_BYTES exch def
									/cid_SUBR_COUNT exch def
									/cid_SUBR_MAP_OFFSET exch def
									/cid_SUBRS exch def
									cid_SUBR_COUNT 0 gt
										{
										GlyphData cid_SUBR_MAP_OFFSET cid_SD_BYTES ct_GetInterval
										0 cid_SD_BYTES ct_cvnsi
										0 1 cid_SUBR_COUNT 1 sub
											{
											exch 1 index
											1 add
											cid_SD_BYTES mul cid_SUBR_MAP_OFFSET add
											GlyphData exch cid_SD_BYTES ct_GetInterval
											0 cid_SD_BYTES ct_cvnsi
											cid_SUBRS 4 2 roll
											GlyphData exch
											4 index
											1 index
											sub
											ct_GetInterval
											dup length string copy put
											}
										for
										pop
										}
									if
									}
									{ pop }
								ifelse
								}
							forall
							}
						if
						cleartomark pop pop
						end
					CIDFontName currentdict /CIDFont defineresource pop
					end end
					}
				stopped
					{ cleartomark /StartData ct_reraise }
				if
				} bind def
			currentdict
			end def
		/ct_saveCIDInit
			{
			/CIDInit /ProcSet ct_resourcestatus
				{ true }
				{ /CIDInitC /ProcSet ct_resourcestatus }
			ifelse
				{
				pop pop
				/CIDInit /ProcSet findresource
				ct_UseNativeCapability?
					{ pop null }
					{ /CIDInit ct_CIDInit /ProcSet defineresource pop }
				ifelse
				}
				{ /CIDInit ct_CIDInit /ProcSet defineresource pop null }
			ifelse
			ct_Vars exch /ct_oldCIDInit exch put
			} bind def
		/ct_restoreCIDInit
			{
			ct_Vars /ct_oldCIDInit get dup null ne
				{ /CIDInit exch /ProcSet defineresource pop }
				{ pop }
			ifelse
			} bind def
		/ct_BuildCharSetUp
			{
			1 index
				begin
				CIDFont
					begin
					Adobe_CoolType_Utility /ct_BuildCharDict get
						begin
						/ct_dfCharCode exch def
						/ct_dfDict exch def
						CIDFirstByte ct_dfCharCode add
						dup CIDCount ge
							{ pop 0 }
						if
						/cid exch def
							{
							GlyphDirectory cid 2 copy known
								{ get }
								{ pop pop nullstring }
							ifelse
							dup length FDBytes sub 0 gt
								{
								dup
								FDBytes 0 ne
									{ 0 FDBytes ct_cvnsi }
									{ pop 0 }
								ifelse
								/fdIndex exch def
								dup length FDBytes sub FDBytes exch getinterval
								/charstring exch def
								exit
								}
								{
								pop
								cid 0 eq
									{ /charstring nullstring def exit }
								if
								/cid 0 def
								}
							ifelse
							}
						loop
			} def
		/ct_SetCacheDevice
			{
			0 0 moveto
			dup stringwidth
			3 -1 roll
			true charpath
			pathbbox
			0 -1000
			7 index 2 div 880
			setcachedevice2
			0 0 moveto
			} def
		/ct_CloneSetCacheProc
			{
			1 eq
				{
				stringwidth
				pop -2 div -880
				0 -1000 setcharwidth
				moveto
				}
				{
				usewidths?
					{
					currentfont /Widths get cid
					2 copy known
						{ get exch pop aload pop }
						{ pop pop stringwidth }
					ifelse
					}
					{ stringwidth }
				ifelse
				setcharwidth
				0 0 moveto
				}
			ifelse
			} def
		/ct_Type3ShowCharString
			{
			ct_FDDict fdIndex 2 copy known
				{ get }
				{
				currentglobal 3 1 roll
				1 index gcheck setglobal
				ct_Type1FontTemplate dup maxlength dict copy
					begin
					FDArray fdIndex get
					dup /FontMatrix 2 copy known
						{ get }
						{ pop pop ct_defaultFontMtx }
					ifelse
					/FontMatrix exch dup length array copy def
					/Private get
					/Private exch def
					/Widths rootfont /Widths get def
					/CharStrings 1 dict dup /.notdef
						<d841272cf18f54fc13> dup length string copy put def
					currentdict
					end
				/ct_Type1Font exch definefont
				dup 5 1 roll put
				setglobal
				}
			ifelse
			dup /CharStrings get 1 index /Encoding get
			ct_dfCharCode get charstring put
			rootfont /WMode 2 copy known
				{ get }
				{ pop pop 0 }
			ifelse
			exch
			1000 scalefont setfont
			ct_str1 0 ct_dfCharCode put
			ct_str1 exch ct_dfSetCacheProc
			ct_SyntheticBold
				{
				currentpoint
				ct_str1 show
				newpath
				moveto
				ct_str1 true charpath
				ct_StrokeWidth setlinewidth
				stroke
				}
				{ ct_str1 show }
			ifelse
			} def
		/ct_Type4ShowCharString
			{
			ct_dfDict ct_dfCharCode charstring
			FDArray fdIndex get
			dup /FontMatrix get dup ct_defaultFontMtx ct_matrixeq not
				{ ct_1000Mtx matrix concatmatrix concat }
				{ pop }
			ifelse
			/Private get
			Adobe_CoolType_Utility /ct_Level2? get not
				{
				ct_dfDict /Private
				3 -1 roll
					{ put }
				1183615869 internaldict /superexec get exec
				}
			if
			1183615869 internaldict
			Adobe_CoolType_Utility /ct_Level2? get
				{ 1 index }
				{ 3 index /Private get mark 6 1 roll }
			ifelse
			dup /RunInt known
				{ /RunInt get }
				{ pop /CCRun }
			ifelse
			get exec
			Adobe_CoolType_Utility /ct_Level2? get not
				{ cleartomark }
			if
			} bind def
		/ct_BuildCharIncremental
			{
				{
				Adobe_CoolType_Utility /ct_MakeOCF get begin
				ct_BuildCharSetUp
				ct_ShowCharString
				}
			stopped
				{ stop }
			if
			end
			end
			end
			end
			} bind def
		/BaseFontNameStr (BF00) def
		/ct_Type1FontTemplate 14 dict
			begin
			/FontType 1 def
			/FontMatrix  [0.001 0 0 0.001 0 0] def
			/FontBBox  [-250 -250 1250 1250] def
			/Encoding ct_cHexEncoding def
			/PaintType 0 def
			currentdict
			end def
		/BaseFontTemplate 11 dict
			begin
			/FontMatrix  [0.001 0 0 0.001 0 0] def
			/FontBBox  [-250 -250 1250 1250] def
			/Encoding ct_cHexEncoding def
			/BuildChar /ct_BuildCharIncremental load def
			ct_Clone?
				{
				/FontType 3 def
				/ct_ShowCharString /ct_Type3ShowCharString load def
				/ct_dfSetCacheProc /ct_CloneSetCacheProc load def
				/ct_SyntheticBold false def
				/ct_StrokeWidth 1 def
				}
				{
				/FontType 4 def
				/Private 1 dict dup /lenIV 4 put def
				/CharStrings 1 dict dup /.notdef <d841272cf18f54fc13> put def
				/PaintType 0 def
				/ct_ShowCharString /ct_Type4ShowCharString load def
				}
			ifelse
			/ct_str1 1 string def
			currentdict
			end def
		/BaseFontDictSize BaseFontTemplate length 5 add def
		/ct_matrixeq
			{
			true 0 1 5
				{
				dup 4 index exch get exch 3 index exch get eq and
				dup not
					{ exit }
				if
				}
			for
			exch pop exch pop
			} bind def
		/ct_makeocf
			{
			15 dict
				begin
				exch /WMode exch def
				exch /FontName exch def
				/FontType 0 def
				/FMapType 2 def
			dup /FontMatrix known
				{ dup /FontMatrix get /FontMatrix exch def }
				{ /FontMatrix matrix def }
			ifelse
				/bfCount 1 index /CIDCount get 256 idiv 1 add
					dup 256 gt { pop 256} if def
				/Encoding
					256 array 0 1 bfCount 1 sub { 2 copy dup put pop } for
					bfCount 1 255 { 2 copy bfCount put pop } for
					def
				/FDepVector bfCount dup 256 lt { 1 add } if array def
				BaseFontTemplate BaseFontDictSize dict copy
					begin
					/CIDFont exch def
					CIDFont /FontBBox known
						{ CIDFont /FontBBox get /FontBBox exch def }
					if
					CIDFont /CDevProc known
						{ CIDFont /CDevProc get /CDevProc exch def }
					if
					currentdict
					end
				BaseFontNameStr 3 (0) putinterval
				0 1 bfCount dup 256 eq { 1 sub } if
					{
					FDepVector exch
					2 index BaseFontDictSize dict copy
						begin
						dup /CIDFirstByte exch 256 mul def
						FontType 3 eq
							{ /ct_FDDict 2 dict def }
						if
						currentdict
						end
					1 index  16
					BaseFontNameStr  2 2 getinterval cvrs pop
					BaseFontNameStr exch definefont
					put
					}
				for
				ct_Clone?
					{ /Widths 1 index /CIDFont get /GlyphDirectory get length dict def }
				if
				FontName
				currentdict
				end
			definefont
			ct_Clone?
				{
				gsave
				dup 1000 scalefont setfont
				ct_BuildCharDict
					begin
					/usewidths? false def
					currentfont /Widths get
						begin
						exch /CIDFont get /GlyphDirectory get
							{
							pop
							dup charcode exch 1 index 0 2 index 256 idiv put
							1 index exch 1 exch 256 mod put
							stringwidth 2 array astore def
							}
						forall
						end
					/usewidths? true def
					end
				grestore
				}
				{ exch pop }
			ifelse
			} bind def
		/ct_ComposeFont
			{
			ct_UseNativeCapability?
				{
				2 index /CMap ct_resourcestatus
					{ pop pop exch pop }
					{
					/CIDInit /ProcSet findresource
						begin
						12 dict
							begin
							begincmap
							/CMapName 3 index def
							/CMapVersion 1.000 def
							/CMapType 1 def
							exch /WMode exch def
							/CIDSystemInfo 3 dict dup
								begin
								/Registry (Adobe) def
								/Ordering
								CMapName ct_mkocfStr100 cvs
								(Adobe-) search
									{
									pop pop
									(-) search
										{
										dup length string copy
										exch pop exch pop
										}
										{ pop (Identity)}
									ifelse
									}
									{ pop  (Identity)  }
								ifelse
								def
								/Supplement 0 def
								end def
							1 begincodespacerange
							<0000> <FFFF>
							endcodespacerange
							1 begincidrange
							<0000> <FFFF> 0
							endcidrange
							endcmap
							CMapName currentdict /CMap defineresource pop
							end
						end
					}
				ifelse
				composefont
				}
				{
				3 2 roll pop
				0 get /CIDFont findresource
				ct_makeocf
				}
			ifelse
			} bind def
		/ct_MakeIdentity
			{
			ct_UseNativeCapability?
				{
				1 index /CMap ct_resourcestatus
					{ pop pop }
					{
					/CIDInit /ProcSet findresource begin
					12 dict begin
					begincmap
					/CMapName 2 index def
					/CMapVersion 1.000 def
					/CMapType 1 def
					/CIDSystemInfo 3 dict dup
						begin
						/Registry (Adobe) def
						/Ordering
						CMapName ct_mkocfStr100 cvs
						(Adobe-) search
							{
							pop pop
							(-) search
								{ dup length string copy exch pop exch pop }
								{ pop (Identity) }
							ifelse
							}
							{ pop (Identity) }
						ifelse
						def
						/Supplement 0 def
						end def
					1 begincodespacerange
					<0000> <FFFF>
					endcodespacerange
					1 begincidrange
					<0000> <FFFF> 0
					endcidrange
					endcmap
					CMapName currentdict /CMap defineresource pop
					end
					end
					}
				ifelse
				composefont
				}
				{
				exch pop
				0 get /CIDFont findresource
				ct_makeocf
				}
			ifelse
			} bind def
		currentdict readonly pop
		end
	end
%%EndResource
%%BeginResource: procset Adobe_CoolType_Utility_T42 1.0 0
%%Copyright: Copyright 1987-2004 Adobe Systems Incorporated.
%%Version: 1.0 0
userdict /ct_T42Dict 15 dict put
ct_T42Dict begin
/Is2015?
{
  version
  cvi
  2015
  ge
} bind def
/AllocGlyphStorage
{
  Is2015?
  {	
		pop
  } 
  { 
		{string} forall
  } ifelse
} bind def
/Type42DictBegin
{
	25 dict begin
  /FontName exch def
  /CharStrings 256 dict 
	begin
		  /.notdef 0 def
		  currentdict 
	end def
  /Encoding exch def
  /PaintType 0 def
  /FontType 42 def
  /FontMatrix [1 0 0 1 0 0] def
  4 array  astore cvx /FontBBox exch def
  /sfnts
} bind def
/Type42DictEnd  
{
	 currentdict dup /FontName get exch definefont end
	ct_T42Dict exch
	dup /FontName get exch put
} bind def
/RD {string currentfile exch readstring pop} executeonly def
/PrepFor2015
{
	Is2015?
	{		  
		 /GlyphDirectory 
		 16
		 dict def
		 sfnts 0 get
		 dup
		 2 index
		 (glyx)
		 putinterval
		 2 index  
		 (locx)
		 putinterval
		 pop
		 pop
	}
	{
		 pop
		 pop
	} ifelse			
} bind def
/AddT42Char
{
	Is2015?
	{
		/GlyphDirectory get 
		begin
		def
		end
		pop
		pop
	}
	{
		/sfnts get
		4 index
		get
		3 index
	  2 index
		putinterval
		pop
		pop
		pop
		pop
	} ifelse
} bind def
/T0AddT42Mtx2
{
	/CIDFont findresource /Metrics2 get begin def end
}bind def
end
%%EndResource
Adobe_CoolType_Core begin /$Oblique SetSubstituteStrategy end
%%BeginResource: procset Adobe_AGM_Image 1.0 0
%%Version: 1.0 0
%%Copyright: Copyright (C) 2000-2003 Adobe Systems, Inc.  All Rights Reserved.
systemdict /setpacking known
{
	currentpacking
	true setpacking
} if
userdict /Adobe_AGM_Image 75 dict dup begin put
/Adobe_AGM_Image_Id /Adobe_AGM_Image_1.0_0 def
/nd{
	null def
}bind def
/AGMIMG_&image nd
/AGMIMG_&colorimage nd
/AGMIMG_&imagemask nd
/AGMIMG_mbuf () def
/AGMIMG_ybuf () def
/AGMIMG_kbuf () def
/AGMIMG_c 0 def
/AGMIMG_m 0 def
/AGMIMG_y 0 def
/AGMIMG_k 0 def
/AGMIMG_tmp nd
/AGMIMG_imagestring0 nd
/AGMIMG_imagestring1 nd
/AGMIMG_imagestring2 nd
/AGMIMG_imagestring3 nd
/AGMIMG_imagestring4 nd
/AGMIMG_imagestring5 nd
/AGMIMG_cnt nd
/AGMIMG_fsave nd
/AGMIMG_colorAry nd
/AGMIMG_override nd
/AGMIMG_name nd
/AGMIMG_maskSource nd
/AGMIMG_flushfilters nd
/invert_image_samples nd
/knockout_image_samples	nd
/img nd
/sepimg nd
/devnimg nd
/idximg nd
/doc_setup
{ 
	Adobe_AGM_Core begin
	Adobe_AGM_Image begin
	/AGMIMG_&image systemdict/image get def
	/AGMIMG_&imagemask systemdict/imagemask get def
	/colorimage where{
		pop
		/AGMIMG_&colorimage /colorimage ldf
	}if
	end
	end
}def
/page_setup
{
	Adobe_AGM_Image begin
	/AGMIMG_ccimage_exists {/customcolorimage where 
		{
			pop
			/Adobe_AGM_OnHost_Seps where
			{
			pop false
			}{
			/Adobe_AGM_InRip_Seps where
				{
				pop false
				}{
					true
				 }ifelse
			 }ifelse
			}{
			false
		}ifelse 
	}bdf
	level2{
		/invert_image_samples
		{
			Adobe_AGM_Image/AGMIMG_tmp Decode length ddf
			/Decode [ Decode 1 get Decode 0 get] def
		}def
		/knockout_image_samples
		{
			Operator/imagemask ne{
				/Decode [1 1] def
			}if
		}def
	}{	
		/invert_image_samples
		{
			{1 exch sub} currenttransfer addprocs settransfer
		}def
		/knockout_image_samples
		{
			{ pop 1 } currenttransfer addprocs settransfer
		}def
	}ifelse
	/img /imageormask ldf
	/sepimg /sep_imageormask ldf
	/devnimg /devn_imageormask ldf
	/idximg /indexed_imageormask ldf
	/_ctype 7 def
	currentdict{
		dup xcheck 1 index type dup /arraytype eq exch /packedarraytype eq or and{
			bind
		}if
		def
	}forall
}def
/page_trailer
{
	end
}def
/doc_trailer
{
}def
/AGMIMG_flushfilters
{
	dup type /arraytype ne
		{1 array astore}if
	aload length
		{
		dup type /filetype eq
			{
			dup status 1 index currentfile ne and
				{dup flushfile closefile}
				{pop}
			ifelse
			}{pop}ifelse
		} repeat
}def
/imageormask_sys
{
	begin
		save mark
		level2{
			currentdict
			Operator /imagemask eq{
				AGMIMG_&imagemask
			}{
				use_mask {
					level3 {process_mask_L3 AGMIMG_&image}{masked_image_simulation}ifelse
				}{
					AGMIMG_&image
				}ifelse
			}ifelse
		}{
			Width Height
			Operator /imagemask eq{
				Decode 0 get 1 eq Decode 1 get 0 eq	and
				ImageMatrix /DataSource load
				AGMIMG_&imagemask
			}{
				BitsPerComponent ImageMatrix /DataSource load
				AGMIMG_&image
			}ifelse
		}ifelse
		currentdict /_Filters known {_Filters AGMIMG_flushfilters} if
		cleartomark restore
	end
}def
/overprint_plate
{
	currentoverprint {
		0 get dup type /nametype eq {
			dup /DeviceGray eq{
				pop AGMCORE_black_plate not
			}{
				/DeviceCMYK eq{
					AGMCORE_is_cmyk_sep not
				}if
			}ifelse
		}{
			false exch
			{
				 AGMOHS_sepink eq or
			} forall
			not
		} ifelse
	}{
		pop false
	}ifelse
}def
/process_mask_L3
{
	dup begin
	/ImageType 1 def
	end
	4 dict begin
		/DataDict exch def
		/ImageType 3 def
		/InterleaveType 3 def
		/MaskDict 9 dict begin
			/ImageType 1 def
			/Width DataDict dup /MaskWidth known {/MaskWidth}{/Width} ifelse get def
			/Height DataDict dup /MaskHeight known {/MaskHeight}{/Height} ifelse get def
			/ImageMatrix [Width 0 0 Height neg 0 Height] def
			/NComponents 1 def
			/BitsPerComponent 1 def
			/Decode [0 1] def
			/DataSource AGMIMG_maskSource def
		currentdict end def
	currentdict end
}def
/use_mask
{
	dup type /dicttype eq
	{
		dup /Mask known	{
			dup /Mask get {
				level3
				{true}
				{
					dup /MaskWidth known {dup /MaskWidth get 1 index /Width get eq}{true}ifelse exch
					dup /MaskHeight known {dup /MaskHeight get 1 index /Height get eq}{true}ifelse
					3 -1 roll and
				} ifelse
			}
			{false} ifelse
		}
		{false} ifelse
	}
	{false} ifelse
}def
/make_line_source
{
	begin
	MultipleDataSources {
		[
		Decode length 2 div cvi {Width string} repeat
		]
	}{
		Width Decode length 2 div mul cvi string
	}ifelse
	end
}def
/datasource_to_str
{
	exch dup type
	dup /filetype eq {
		pop exch readstring
	}{
		/arraytype eq {
			exec exch copy
		}{
			pop
		}ifelse
	}ifelse
	pop
}def
/masked_image_simulation
{
	3 dict begin
	dup make_line_source /line_source xdf
	/mask_source AGMIMG_maskSource /LZWDecode filter def
	dup /Width get 8 div ceiling cvi string /mask_str xdf
	begin
	gsave
	0 1 translate 1 -1 Height div scale
	1 1 Height {
		pop
		gsave
		MultipleDataSources {
			0 1 DataSource length 1 sub {
				dup DataSource exch get
				exch line_source exch get
				datasource_to_str
			} for
		}{
			DataSource line_source datasource_to_str
		} ifelse
		<<
			/PatternType 1
			/PaintProc [
				/pop cvx
				<<
					/ImageType 1
					/Width Width
					/Height 1
					/ImageMatrix Width 1.0 sub 1 matrix scale 0.5 0 matrix translate matrix concatmatrix
					/MultipleDataSources MultipleDataSources
					/DataSource line_source
					/BitsPerComponent BitsPerComponent
					/Decode Decode
				>>
				/image cvx
			] cvx
			/BBox [0 0 Width 1]
			/XStep Width
			/YStep 1
			/PaintType 1
			/TilingType 2
		>>
		matrix makepattern set_pattern
		<<
			/ImageType 1
			/Width Width
			/Height 1
			/ImageMatrix Width 1 matrix scale
			/MultipleDataSources false
			/DataSource mask_source mask_str readstring pop
			/BitsPerComponent 1
			/Decode [0 1]
		>>
		imagemask
		grestore
		0 1 translate
	} for
	grestore
	end
	end
}def
/imageormask
{
	begin
		SkipImageProc {
			currentdict consumeimagedata
		}
		{
			save mark
			level2 AGMCORE_host_sep not and{
				currentdict
				Operator /imagemask eq DeviceN_PS2 not and {
					imagemask
				}{
					AGMCORE_in_rip_sep currentoverprint and currentcolorspace 0 get /DeviceGray eq and{
						[/Separation /Black /DeviceGray {}] setcolorspace
						/Decode [ Decode 1 get Decode 0 get ] def
					}if
					use_mask {
						level3 {process_mask_L3 image}{masked_image_simulation}ifelse
					}{
						DeviceN_NoneName DeviceN_PS2 Indexed_DeviceN level3 not and or or AGMCORE_in_rip_sep and 
						{
							Names convert_to_process not {
								2 dict begin
								/imageDict xdf
								/names_index 0 def
								gsave
								imageDict write_image_file {
									Names {
										dup (None) ne {
											[/Separation 3 -1 roll /DeviceGray {1 exch sub}] setcolorspace
											Operator imageDict read_image_file
											names_index 0 eq {true setoverprint} if
											/names_index names_index 1 add def
										}{
											pop
										} ifelse
									} forall
									close_image_file
								} if
								grestore
								end
							}{
								Operator /imagemask eq {
									imagemask
								}{
									image
								} ifelse
							} ifelse
						}{
							Operator /imagemask eq {
								imagemask
							}{
								image
							} ifelse
						} ifelse
					}ifelse
				}ifelse
			}{
				Width Height
				Operator /imagemask eq{
					Decode 0 get 1 eq Decode 1 get 0 eq	and
					ImageMatrix /DataSource load
					/Adobe_AGM_OnHost_Seps where {
						pop imagemask
					}{
						currentgray 1 ne{
							currentdict imageormask_sys
						}{
							currentoverprint not{
								1 AGMCORE_&setgray
								currentdict imageormask_sys
							}{
								currentdict ignoreimagedata
							}ifelse				 		
						}ifelse
					}ifelse
				}{
					BitsPerComponent ImageMatrix 
					MultipleDataSources{
						0 1 NComponents 1 sub{
							DataSource exch get
						}for
					}{
						/DataSource load
					}ifelse
					Operator /colorimage eq{
						AGMCORE_host_sep{
							MultipleDataSources level2 or NComponents 4 eq and{
								AGMCORE_is_cmyk_sep{
									MultipleDataSources{
										/DataSource [
											DataSource 0 get /exec cvx
											DataSource 1 get /exec cvx
											DataSource 2 get /exec cvx
											DataSource 3 get /exec cvx
											/AGMCORE_get_ink_data cvx
										] cvx def
									}{
										/DataSource 
										Width BitsPerComponent mul 7 add 8 idiv Height mul 4 mul 
										/DataSource load
										filter_cmyk 0 () /SubFileDecode filter def
									}ifelse
									/Decode [ Decode 0 get Decode 1 get ] def
									/MultipleDataSources false def
									/NComponents 1 def
									/Operator /image def
									invert_image_samples
						 			1 AGMCORE_&setgray
									currentdict imageormask_sys
								}{
									currentoverprint not Operator/imagemask eq and{
  			 							1 AGMCORE_&setgray
  			 							currentdict imageormask_sys
  			 						}{
  			 							currentdict ignoreimagedata
  			 						}ifelse
								}ifelse
							}{	
								MultipleDataSources NComponents AGMIMG_&colorimage						
							}ifelse
						}{
							true NComponents colorimage
						}ifelse
					}{
						Operator /image eq{
							AGMCORE_host_sep{
								/DoImage true def
								HostSepColorImage{
									invert_image_samples
								}{
									AGMCORE_black_plate not Operator/imagemask ne and{
										/DoImage false def
										currentdict ignoreimagedata
					 				}if
								}ifelse
						 		1 AGMCORE_&setgray
								DoImage
									{currentdict imageormask_sys} if
							}{
								use_mask {
									level3 {process_mask_L3 image}{masked_image_simulation}ifelse
								}{
									image
								}ifelse
							}ifelse
						}{
							Operator/knockout eq{
								pop pop pop pop pop
								currentcolorspace overprint_plate not{
									knockout_unitsq
								}if
							}if
						}ifelse
					}ifelse
				}ifelse
			}ifelse
			cleartomark restore
		}ifelse
		currentdict /_Filters known {_Filters AGMIMG_flushfilters} if
	end
}def
/sep_imageormask
{
 	/sep_colorspace_dict AGMCORE_gget begin
	CSA map_csa
	begin
	SkipImageProc {
		currentdict consumeimagedata
	}
	{
		save mark 
		AGMCORE_avoid_L2_sep_space{
			/Decode [ Decode 0 get 255 mul Decode 1 get 255 mul ] def
		}if
 		AGMIMG_ccimage_exists 
		MappedCSA 0 get /DeviceCMYK eq and
		currentdict/Components known and 
		Name () ne and 
		Name (All) ne and 
		Operator /image eq and
		AGMCORE_producing_seps not and
		level2 not and
		{
			Width Height BitsPerComponent ImageMatrix 
			[
			/DataSource load /exec cvx
			{
				0 1 2 index length 1 sub{
					1 index exch
					2 copy get 255 xor put
				}for
			} /exec cvx
			] cvx bind
			MappedCSA 0 get /DeviceCMYK eq{
				Components aload pop
			}{
				0 0 0 Components aload pop 1 exch sub
			}ifelse
			Name findcmykcustomcolor
			customcolorimage
		}{
			AGMCORE_producing_seps not{
				level2{
					AGMCORE_avoid_L2_sep_space not currentcolorspace 0 get /Separation ne and{
						[/Separation Name MappedCSA sep_proc_name exch 0 get exch load ] setcolorspace_opt
						/sep_tint AGMCORE_gget setcolor
					}if
					currentdict imageormask
				}{ 
					currentdict
					Operator /imagemask eq{
						imageormask
					}{
						sep_imageormask_lev1
					}ifelse
				}ifelse
 			}{
				AGMCORE_host_sep{
					Operator/knockout eq{
						currentdict/ImageMatrix get concat
						knockout_unitsq
					}{
						currentgray 1 ne{
 							AGMCORE_is_cmyk_sep Name (All) ne and{
 								level2{
 									Name AGMCORE_IsSeparationAProcessColor 
 									{
 										Operator /imagemask eq{
 											/sep_tint AGMCORE_gget 1 exch sub AGMCORE_&setcolor
 										}{
											invert_image_samples
 										}ifelse
	 								}{
	 									[ /Separation Name [/DeviceGray]
	 									{ 
	 										sep_colorspace_proc AGMCORE_get_ink_data
											1 exch sub
	 									} bind
										] AGMCORE_&setcolorspace
										/sep_tint AGMCORE_gget AGMCORE_&setcolor
 									}ifelse
 									currentdict imageormask_sys
	 							}{
	 								currentdict
									Operator /imagemask eq{
										imageormask_sys
									}{
										sep_image_lev1_sep
									}ifelse
	 							}ifelse
 							}{
 								Operator/imagemask ne{
									invert_image_samples
 								}if
		 						currentdict imageormask_sys
 							}ifelse
 						}{
 							currentoverprint not Name (All) eq or Operator/imagemask eq and{
								currentdict imageormask_sys 
								}{
								currentoverprint not
									{
 									gsave 
 									knockout_unitsq
 									grestore
									}if
								currentdict consumeimagedata 
		 					}ifelse
 						}ifelse
		 			}ifelse
 				}{
					currentcolorspace 0 get /Separation ne{
						[/Separation Name MappedCSA sep_proc_name exch 0 get exch load ] setcolorspace_opt
						/sep_tint AGMCORE_gget setcolor
					}if
					currentoverprint 
					MappedCSA 0 get /DeviceCMYK eq and 
					Name AGMCORE_IsSeparationAProcessColor not and
					Name inRip_spot_has_ink not and 
					Name (All) ne and {
						imageormask_l2_overprint
					}{
						currentdict imageormask
 					}ifelse
				}ifelse
			}ifelse
		}ifelse
		cleartomark restore
	}ifelse
	currentdict /_Filters known {_Filters AGMIMG_flushfilters} if
	end
	end
}def
/decode_image_sample
{
	4 1 roll exch dup 5 1 roll
	sub 2 4 -1 roll exp 1 sub div mul add
} bdf
/colorSpaceElemCnt
{
	mark currentcolor counttomark dup 2 add 1 roll cleartomark
} bdf
/devn_sep_datasource
{
	1 dict begin
	/dataSource xdf
	[
		0 1 dataSource length 1 sub {
			dup currentdict /dataSource get /exch cvx /get cvx /exec cvx
			/exch cvx names_index /ne cvx [ /pop cvx ] cvx /if cvx
		} for
	] cvx bind
	end
} bdf		
/devn_alt_datasource
{
	11 dict begin
	/convProc xdf
	/origcolorSpaceElemCnt xdf
	/origMultipleDataSources xdf
	/origBitsPerComponent xdf
	/origDecode xdf
	/origDataSource xdf
	/dsCnt origMultipleDataSources {origDataSource length}{1}ifelse def
	/DataSource origMultipleDataSources
		{
			[
			BitsPerComponent 8 idiv origDecode length 2 idiv mul string
			0 1 origDecode length 2 idiv 1 sub
				{
				dup 7 mul 1 add index exch dup BitsPerComponent 8 idiv mul exch
				origDataSource exch get 0 () /SubFileDecode filter
				BitsPerComponent 8 idiv string /readstring cvx /pop cvx /putinterval cvx
				}for 
			]bind cvx
		}{origDataSource}ifelse 0 () /SubFileDecode filter def		
	[
		origcolorSpaceElemCnt string
		0 2 origDecode length 2 sub
			{
			dup origDecode exch get dup 3 -1 roll 1 add origDecode exch get exch sub 2 BitsPerComponent exp 1 sub div
			1 BitsPerComponent 8 idiv {DataSource /read cvx /not cvx{0}/if cvx /mul cvx}repeat /mul cvx /add cvx
			}for
		/convProc load /exec cvx
		origcolorSpaceElemCnt 1 sub -1 0
			{
			/dup cvx 2 /add cvx /index cvx
			3 1 /roll cvx /exch cvx 255 /mul cvx /cvi cvx /put cvx
			}for
	]bind cvx 0 () /SubFileDecode filter
	end
} bdf
/devn_imageormask
{
 	/devicen_colorspace_dict AGMCORE_gget begin
	CSA map_csa
	2 dict begin
	dup
	/srcDataStrs [ 3 -1 roll begin
		currentdict /MultipleDataSources known {MultipleDataSources {DataSource length}{1}ifelse}{1} ifelse
		{
			Width Decode length 2 div mul cvi
			{
				dup 65535 gt {1 add 2 div cvi}{exit}ifelse
			} loop
			string
		} repeat
		end ] def
	/dstDataStr srcDataStrs 0 get length string def
	begin
	SkipImageProc {
		currentdict consumeimagedata
	}
	{
		save mark 
		AGMCORE_producing_seps not {
			level3 not {
				Operator /imagemask ne {
					/DataSource [ [
						DataSource Decode BitsPerComponent currentdict /MultipleDataSources known {MultipleDataSources}{false} ifelse
						colorSpaceElemCnt /devicen_colorspace_dict AGMCORE_gget /TintTransform get 
						devn_alt_datasource 1 /string cvx /readstring cvx /pop cvx] cvx colorSpaceElemCnt 1 sub{dup}repeat] def				
					/MultipleDataSources true def
					/Decode colorSpaceElemCnt [ exch {0 1} repeat ] def
				} if
			}if
			currentdict imageormask
 		}{
			AGMCORE_host_sep{
				Names convert_to_process {
					CSA get_csa_by_name 0 get /DeviceCMYK eq {
						/DataSource
							Width BitsPerComponent mul 7 add 8 idiv Height mul 4 mul 
							DataSource Decode BitsPerComponent currentdict /MultipleDataSources known {MultipleDataSources}{false} ifelse
							4 /devicen_colorspace_dict AGMCORE_gget /TintTransform get 
							devn_alt_datasource
						filter_cmyk 0 () /SubFileDecode filter def
						/MultipleDataSources false def
						/Decode [1 0] def
						/DeviceGray setcolorspace
			 			currentdict imageormask_sys
 					}{
						AGMCORE_report_unsupported_color_space
						AGMCORE_black_plate {
							/DataSource
								DataSource Decode BitsPerComponent currentdict /MultipleDataSources known {MultipleDataSources}{false} ifelse
								CSA get_csa_by_name 0 get /DeviceRGB eq{3}{1}ifelse /devicen_colorspace_dict AGMCORE_gget /TintTransform get
								devn_alt_datasource
							/MultipleDataSources false def
							/Decode colorSpaceElemCnt [ exch {0 1} repeat ] def
				 			currentdict imageormask_sys
				 		}
						{
	 						gsave 
	 						knockout_unitsq
	 						grestore
							currentdict consumeimagedata 
						} ifelse
 					} ifelse
				}
				{	
					/devicen_colorspace_dict AGMCORE_gget /names_index known {
	 					Operator/imagemask ne{
	 						MultipleDataSources {
		 						/DataSource [ DataSource devn_sep_datasource /exec cvx ] cvx def
								/MultipleDataSources false def
	 						}{
								/DataSource /DataSource load dstDataStr srcDataStrs 0 get filter_devn def
	 						} ifelse
							invert_image_samples
	 					} if
			 			currentdict imageormask_sys
	 				}{
	 					currentoverprint not Operator/imagemask eq and{
							currentdict imageormask_sys 
							}{
							currentoverprint not
								{
	 							gsave 
	 							knockout_unitsq
	 							grestore
								}if
							currentdict consumeimagedata 
			 			}ifelse
	 				}ifelse
	 			}ifelse
 			}{
				currentdict imageormask
			}ifelse
		}ifelse
		cleartomark restore
	}ifelse
	currentdict /_Filters known {_Filters AGMIMG_flushfilters} if
	end
	end
	end
}def
/imageormask_l2_overprint
{
	currentdict
	currentcmykcolor add add add 0 eq{
		currentdict consumeimagedata
	}{
		level3{ 			
			currentcmykcolor 
			/AGMIMG_k xdf 
			/AGMIMG_y xdf 
			/AGMIMG_m xdf 
			/AGMIMG_c xdf
			Operator/imagemask eq{
				[/DeviceN [
				AGMIMG_c 0 ne {/Cyan} if
				AGMIMG_m 0 ne {/Magenta} if
				AGMIMG_y 0 ne {/Yellow} if
				AGMIMG_k 0 ne {/Black} if
				] /DeviceCMYK {}] setcolorspace
				AGMIMG_c 0 ne {AGMIMG_c} if
				AGMIMG_m 0 ne {AGMIMG_m} if
				AGMIMG_y 0 ne {AGMIMG_y} if
				AGMIMG_k 0 ne {AGMIMG_k} if
				setcolor			
			}{	
				/Decode [ Decode 0 get 255 mul Decode 1 get 255 mul ] def
				[/Indexed 				
					[
						/DeviceN [
							AGMIMG_c 0 ne {/Cyan} if
							AGMIMG_m 0 ne {/Magenta} if
							AGMIMG_y 0 ne {/Yellow} if
							AGMIMG_k 0 ne {/Black} if
						] 
						/DeviceCMYK {
							AGMIMG_k 0 eq {0} if
							AGMIMG_y 0 eq {0 exch} if
							AGMIMG_m 0 eq {0 3 1 roll} if
							AGMIMG_c 0 eq {0 4 1 roll} if						
						}
					]
					255
					{
						255 div 
						mark exch
						dup	dup dup
						AGMIMG_k 0 ne{
							/sep_tint AGMCORE_gget mul MappedCSA sep_proc_name exch pop load exec 4 1 roll pop pop pop		
							counttomark 1 roll
						}{
							pop
						}ifelse
						AGMIMG_y 0 ne{
							/sep_tint AGMCORE_gget mul MappedCSA sep_proc_name exch pop load exec 4 2 roll pop pop pop		
							counttomark 1 roll
						}{
							pop
						}ifelse
						AGMIMG_m 0 ne{
							/sep_tint AGMCORE_gget mul MappedCSA sep_proc_name exch pop load exec 4 3 roll pop pop pop		
							counttomark 1 roll
						}{
							pop
						}ifelse
						AGMIMG_c 0 ne{
							/sep_tint AGMCORE_gget mul MappedCSA sep_proc_name exch pop load exec pop pop pop		
							counttomark 1 roll
						}{
							pop
						}ifelse
						counttomark 1 add -1 roll pop
					}
				] setcolorspace
			}ifelse
			imageormask_sys
		}{
	write_image_file{
		currentcmykcolor
		0 ne{
			[/Separation /Black /DeviceGray {}] setcolorspace
			gsave
			/Black
			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 1 roll pop pop pop 1 exch sub} /exec cvx]
			cvx modify_halftone_xfer
			Operator currentdict read_image_file
			grestore
		}if
		0 ne{
			[/Separation /Yellow /DeviceGray {}] setcolorspace
			gsave
			/Yellow
			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 2 roll pop pop pop 1 exch sub} /exec cvx]
			cvx modify_halftone_xfer
			Operator currentdict read_image_file
			grestore
		}if
		0 ne{
			[/Separation /Magenta /DeviceGray {}] setcolorspace
			gsave
			/Magenta
			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {4 3 roll pop pop pop 1 exch sub} /exec cvx]
			cvx modify_halftone_xfer
			Operator currentdict read_image_file
			grestore
		}if
		0 ne{
			[/Separation /Cyan /DeviceGray {}] setcolorspace
			gsave
			/Cyan 
			[{1 exch sub /sep_tint AGMCORE_gget mul} /exec cvx MappedCSA sep_proc_name cvx exch pop {pop pop pop 1 exch sub} /exec cvx]
			cvx modify_halftone_xfer
			Operator currentdict read_image_file
			grestore
		} if
				close_image_file
			}{
				imageormask
			}ifelse
		}ifelse
	}ifelse
} def
/indexed_imageormask
{
	begin
		save mark 
 		currentdict
 		AGMCORE_host_sep{
			Operator/knockout eq{
				/indexed_colorspace_dict AGMCORE_gget dup /CSA known {
					/CSA get get_csa_by_name
				}{
					/Names get
				} ifelse
				overprint_plate not{
					knockout_unitsq
				}if
			}{
				Indexed_DeviceN {
					/devicen_colorspace_dict AGMCORE_gget /names_index known {
			 			indexed_image_lev2_sep
					}{
						currentoverprint not{
							knockout_unitsq
			 			}if
			 			currentdict consumeimagedata
					} ifelse
				}{
		 			AGMCORE_is_cmyk_sep{
						Operator /imagemask eq{
							imageormask_sys
						}{
							level2{
								indexed_image_lev2_sep
							}{
								indexed_image_lev1_sep
							}ifelse
						}ifelse
					}{
						currentoverprint not{
							knockout_unitsq
			 			}if
			 			currentdict consumeimagedata
					}ifelse
				}ifelse
			}ifelse
 		}{
			level2{
				Indexed_DeviceN {
					/indexed_colorspace_dict AGMCORE_gget begin
				}{
					/indexed_colorspace_dict AGMCORE_gget begin
					CSA get_csa_by_name 0 get /DeviceCMYK eq ps_level 3 ge and ps_version 3015.007 lt and {
						[/Indexed [/DeviceN [/Cyan /Magenta /Yellow /Black] /DeviceCMYK {}] HiVal Lookup]
						setcolorspace
					} if
					end
				} ifelse
				imageormask
				Indexed_DeviceN {
					end
				} if
			}{ 
				Operator /imagemask eq{
					imageormask
				}{
					indexed_imageormask_lev1
				}ifelse
			}ifelse
 		}ifelse
		cleartomark restore
	currentdict /_Filters known {_Filters AGMIMG_flushfilters} if
	end
}def
/indexed_image_lev2_sep
{
	/indexed_colorspace_dict AGMCORE_gget begin
	begin
		Indexed_DeviceN not {
			currentcolorspace 
			dup 1 /DeviceGray put
			dup 3
			currentcolorspace 2 get 1 add string
			0 1 2 3 AGMCORE_get_ink_data 4 currentcolorspace 3 get length 1 sub
			{
			dup 4 idiv exch currentcolorspace 3 get exch get 255 exch sub 2 index 3 1 roll put
			}for 
			put	setcolorspace
		} if
		currentdict 
		Operator /imagemask eq{
			AGMIMG_&imagemask
		}{
			use_mask {
				level3 {process_mask_L3 AGMIMG_&image}{masked_image_simulation}ifelse
			}{
				AGMIMG_&image
			}ifelse
		}ifelse
	end end
}def
  /OPIimage
  {
  	dup type /dicttype ne{
  		10 dict begin
  			/DataSource xdf
  			/ImageMatrix xdf
  			/BitsPerComponent xdf
  			/Height xdf
  			/Width xdf
  			/ImageType 1 def
  			/Decode [0 1 def]
  			currentdict
  		end
  	}if
  	dup begin
  		/NComponents 1 cdndf
  		/MultipleDataSources false cdndf
  		/SkipImageProc {false} cdndf
  		/HostSepColorImage false cdndf
  		/Decode [
  				0 
  				currentcolorspace 0 get /Indexed eq{
  					2 BitsPerComponent exp 1 sub
  				}{
  					1
  				}ifelse
  		] cdndf
  		/Operator /image cdndf
  	end
  	/sep_colorspace_dict AGMCORE_gget null eq{
  		imageormask
  	}{
  		gsave
  		dup begin invert_image_samples end
  		sep_imageormask
  		grestore
  	}ifelse
  }def
/cachemask_level2
{
	3 dict begin
	/LZWEncode filter /WriteFilter xdf
	/readBuffer 256 string def
	/ReadFilter
		currentfile
		0 (%EndMask) /SubFileDecode filter
		/ASCII85Decode filter
		/RunLengthDecode filter
	def
	{
		ReadFilter readBuffer readstring exch
		WriteFilter exch writestring
		not {exit} if
	}loop
	WriteFilter closefile
	end
}def
/cachemask_level3
{
	currentfile
	<<
		/Filter [ /SubFileDecode /ASCII85Decode /RunLengthDecode ]
		/DecodeParms [ << /EODCount 0 /EODString (%EndMask) >> null null ]
		/Intent 1
	>>
	/ReusableStreamDecode filter
}def
/spot_alias
{
	/mapto_sep_imageormask 
	{
		dup type /dicttype ne{
			12 dict begin
				/ImageType 1 def
				/DataSource xdf
				/ImageMatrix xdf
				/BitsPerComponent xdf
				/Height xdf
				/Width xdf
				/MultipleDataSources false def
		}{
			begin
		}ifelse
				/Decode [/customcolor_tint AGMCORE_gget 0] def
				/Operator /image def
				/HostSepColorImage false def
				/SkipImageProc {false} def
				currentdict 
			end
		sep_imageormask
	}bdf
	/customcolorimage
	{
		Adobe_AGM_Image/AGMIMG_colorAry xddf
		/customcolor_tint AGMCORE_gget
		<<
			/Name AGMIMG_colorAry 4 get
			/CSA [ /DeviceCMYK ] 
			/TintMethod /Subtractive
			/TintProc null
			/MappedCSA null
			/NComponents 4 
			/Components [ AGMIMG_colorAry aload pop pop ] 
		>>
		setsepcolorspace
		mapto_sep_imageormask
	}ndf
	Adobe_AGM_Image/AGMIMG_&customcolorimage /customcolorimage load put
	/customcolorimage
	{
		Adobe_AGM_Image/AGMIMG_override false put
		current_spot_alias{dup 4 get map_alias}{false}ifelse
		{
			false set_spot_alias
			/customcolor_tint AGMCORE_gget exch setsepcolorspace
			pop
			mapto_sep_imageormask
			true set_spot_alias
		}{
			AGMIMG_&customcolorimage
		}ifelse			
	}bdf
}def
/snap_to_device
{
	6 dict begin
	matrix currentmatrix
	dup 0 get 0 eq 1 index 3 get 0 eq and
	1 index 1 get 0 eq 2 index 2 get 0 eq and or exch pop
	{
		1 1 dtransform 0 gt exch 0 gt /AGMIMG_xSign? exch def /AGMIMG_ySign? exch def
		0 0 transform
		AGMIMG_ySign? {floor 0.1 sub}{ceiling 0.1 add} ifelse exch
		AGMIMG_xSign? {floor 0.1 sub}{ceiling 0.1 add} ifelse exch
		itransform /AGMIMG_llY exch def /AGMIMG_llX exch def
		1 1 transform
		AGMIMG_ySign? {ceiling 0.1 add}{floor 0.1 sub} ifelse exch
		AGMIMG_xSign? {ceiling 0.1 add}{floor 0.1 sub} ifelse exch
		itransform /AGMIMG_urY exch def /AGMIMG_urX exch def			
		[AGMIMG_urX AGMIMG_llX sub 0 0 AGMIMG_urY AGMIMG_llY sub  AGMIMG_llX AGMIMG_llY] concat
	}{
	}ifelse
	end
} def
level2 not{
	/colorbuf
	{
		0 1 2 index length 1 sub{
			dup 2 index exch get 
			255 exch sub 
			2 index 
			3 1 roll 
			put
		}for
	}def
	/tint_image_to_color
	{
		begin
			Width Height BitsPerComponent ImageMatrix 
			/DataSource load
		end
		Adobe_AGM_Image begin
			/AGMIMG_mbuf 0 string def
			/AGMIMG_ybuf 0 string def
			/AGMIMG_kbuf 0 string def
			{
				colorbuf dup length AGMIMG_mbuf length ne
					{
					dup length dup dup
					/AGMIMG_mbuf exch string def
					/AGMIMG_ybuf exch string def
					/AGMIMG_kbuf exch string def
					} if
				dup AGMIMG_mbuf copy AGMIMG_ybuf copy AGMIMG_kbuf copy pop
			}
			addprocs
			{AGMIMG_mbuf}{AGMIMG_ybuf}{AGMIMG_kbuf} true 4 colorimage	
		end
	} def			
	/sep_imageormask_lev1
	{
		begin
			MappedCSA 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or has_color not and{
				{
					255 mul round cvi GrayLookup exch get
				} currenttransfer addprocs settransfer
				currentdict imageormask
			}{
				/sep_colorspace_dict AGMCORE_gget/Components known{
					MappedCSA 0 get /DeviceCMYK eq{
						Components aload pop
					}{
						0 0 0 Components aload pop 1 exch sub
					}ifelse
					Adobe_AGM_Image/AGMIMG_k xddf 
					Adobe_AGM_Image/AGMIMG_y xddf 
					Adobe_AGM_Image/AGMIMG_m xddf 
					Adobe_AGM_Image/AGMIMG_c xddf 
					AGMIMG_y 0.0 eq AGMIMG_m 0.0 eq and AGMIMG_c 0.0 eq and{
						{AGMIMG_k mul 1 exch sub} currenttransfer addprocs settransfer
						currentdict imageormask
					}{ 
						currentcolortransfer
						{AGMIMG_k mul 1 exch sub} exch addprocs 4 1 roll
						{AGMIMG_y mul 1 exch sub} exch addprocs 4 1 roll
						{AGMIMG_m mul 1 exch sub} exch addprocs 4 1 roll
						{AGMIMG_c mul 1 exch sub} exch addprocs 4 1 roll
						setcolortransfer
						currentdict tint_image_to_color
					}ifelse
				}{
					MappedCSA 0 get /DeviceGray eq {
						{255 mul round cvi ColorLookup exch get 0 get} currenttransfer addprocs settransfer
						currentdict imageormask
					}{
						MappedCSA 0 get /DeviceCMYK eq {
							currentcolortransfer
							{255 mul round cvi ColorLookup exch get 3 get 1 exch sub} exch addprocs 4 1 roll
							{255 mul round cvi ColorLookup exch get 2 get 1 exch sub} exch addprocs 4 1 roll
							{255 mul round cvi ColorLookup exch get 1 get 1 exch sub} exch addprocs 4 1 roll
							{255 mul round cvi ColorLookup exch get 0 get 1 exch sub} exch addprocs 4 1 roll
							setcolortransfer 
							currentdict tint_image_to_color
						}{ 
							currentcolortransfer
							{pop 1} exch addprocs 4 1 roll
							{255 mul round cvi ColorLookup exch get 2 get} exch addprocs 4 1 roll
							{255 mul round cvi ColorLookup exch get 1 get} exch addprocs 4 1 roll
							{255 mul round cvi ColorLookup exch get 0 get} exch addprocs 4 1 roll
							setcolortransfer 
							currentdict tint_image_to_color
						}ifelse
					}ifelse
				}ifelse
			}ifelse
		end
	}def
	/sep_image_lev1_sep
	{
		begin
			/sep_colorspace_dict AGMCORE_gget/Components known{
				Components aload pop
				Adobe_AGM_Image/AGMIMG_k xddf 
				Adobe_AGM_Image/AGMIMG_y xddf 
				Adobe_AGM_Image/AGMIMG_m xddf 
				Adobe_AGM_Image/AGMIMG_c xddf 
				{AGMIMG_c mul 1 exch sub}
				{AGMIMG_m mul 1 exch sub}
				{AGMIMG_y mul 1 exch sub}
				{AGMIMG_k mul 1 exch sub}
			}{ 
				{255 mul round cvi ColorLookup exch get 0 get 1 exch sub}
				{255 mul round cvi ColorLookup exch get 1 get 1 exch sub}
				{255 mul round cvi ColorLookup exch get 2 get 1 exch sub}
				{255 mul round cvi ColorLookup exch get 3 get 1 exch sub}
			}ifelse
			AGMCORE_get_ink_data currenttransfer addprocs settransfer
			currentdict imageormask_sys
		end
	}def
	/indexed_imageormask_lev1
	{
		/indexed_colorspace_dict AGMCORE_gget begin
		begin
			currentdict
			MappedCSA 0 get dup /DeviceRGB eq exch /DeviceCMYK eq or has_color not and{
				{HiVal mul round cvi GrayLookup exch get HiVal div} currenttransfer addprocs settransfer
				imageormask
			}{
				MappedCSA 0 get /DeviceGray eq {
					{HiVal mul round cvi Lookup exch get HiVal div} currenttransfer addprocs settransfer
					imageormask
				}{
					MappedCSA 0 get /DeviceCMYK eq {
						currentcolortransfer
						{4 mul HiVal mul round cvi 3 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
						{4 mul HiVal mul round cvi 2 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
						{4 mul HiVal mul round cvi 1 add Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
						{4 mul HiVal mul round cvi		 Lookup exch get HiVal div 1 exch sub} exch addprocs 4 1 roll
						setcolortransfer 
						tint_image_to_color
					}{ 
						currentcolortransfer
						{pop 1} exch addprocs 4 1 roll
						{3 mul HiVal mul round cvi 2 add Lookup exch get HiVal div} exch addprocs 4 1 roll
						{3 mul HiVal mul round cvi 1 add Lookup exch get HiVal div} exch addprocs 4 1 roll
						{3 mul HiVal mul round cvi 		Lookup exch get HiVal div} exch addprocs 4 1 roll
						setcolortransfer 
						tint_image_to_color
					}ifelse
				}ifelse
			}ifelse
		end end
	}def
	/indexed_image_lev1_sep
	{
		/indexed_colorspace_dict AGMCORE_gget begin
		begin
			{4 mul HiVal mul round cvi		 Lookup exch get HiVal div 1 exch sub}
			{4 mul HiVal mul round cvi 1 add Lookup exch get HiVal div 1 exch sub}
			{4 mul HiVal mul round cvi 2 add Lookup exch get HiVal div 1 exch sub}
			{4 mul HiVal mul round cvi 3 add Lookup exch get HiVal div 1 exch sub}
			AGMCORE_get_ink_data currenttransfer addprocs settransfer
			currentdict imageormask_sys
		end end
	}def
}if
end
systemdict /setpacking known
{
	setpacking
} if
%%EndResource
currentdict Adobe_AGM_Utils eq {end} if
%%EndProlog
%%BeginSetup
Adobe_AGM_Utils begin
2 2010 Adobe_AGM_Core/doc_setup get exec
Adobe_CoolType_Core/doc_setup get exec
Adobe_AGM_Image/doc_setup get exec
currentdict Adobe_AGM_Utils eq {end} if
%%EndSetup
%%Page: (Page 1) 1
%%EndPageComments
%%BeginPageSetup
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{ userdict /AI11_PDFMark5 /cleartomark load put
userdict /AI11_ReadMetadata_PDFMark5 {flushfile cleartomark } bind put}
{ userdict /AI11_PDFMark5 /pdfmark load put
userdict /AI11_ReadMetadata_PDFMark5 {/PUT pdfmark} bind put } ifelse
[/NamespacePush AI11_PDFMark5
[/_objdef {ai_metadata_stream_123} /type /stream /OBJ AI11_PDFMark5
[{ai_metadata_stream_123}
currentfile 0 (%  &&end XMP packet marker&&)
/SubFileDecode filter AI11_ReadMetadata_PDFMark5
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="3.1.2-113">
+ <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/"
+    xmlns:xap="http://ns.adobe.com/xap/1.0/"
+    xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/"
+    xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
+    xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+   dc:format="application/postscript"
+   xap:CreatorTool="Adobe Illustrator CS2"
+   xap:CreateDate="2005-09-07T15:18-07:00"
+   xap:ModifyDate="2005-09-07T15:18-07:00"
+   xap:MetadataDate="2006-04-10T13:36:50-07:00"
+   xapMM:DocumentID="uuid:DEC81B9F214411DABD12D45BA291F212"
+   xapMM:InstanceID="uuid:DEC81BA0214411DABD12D45BA291F212"
+   tiff:ImageWidth="289"
+   tiff:ImageLength="361">
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Blue Square Test File - .eps</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">XMPFiles BlueSquare test file, created in Illustrator CS2, saved as .ai and .eps.</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>XMP</rdf:li>
+     <rdf:li>Blue Square</rdf:li>
+     <rdf:li>test file</rdf:li>
+     <rdf:li>Illustrator</rdf:li>
+     <rdf:li>.eps</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <xap:Thumbnails>
+    <rdf:Alt>
+     <rdf:li
+      xapGImg:width="208"
+      xapGImg:height="256"
+      xapGImg:format="JPEG"
+      xapGImg:image="/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADQAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A5YqqFAAAAFABnU4MGM44&#xA;+kch0cKUjZ3boMs/L4/5sfkGPGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8gvGe91Bj+Xx/zY/ILxnvd&#xA;QY/l8f8ANj8gvGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8gvGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8g&#xA;vGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8gvGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8gvGe91Bj+Xx/z&#xA;Y/ILxnvdQY/l8f8ANj8gvGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8gvGe91Bj+Xx/zY/ILxnvdQY/l&#xA;8f8ANj8gvGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8gvGe91Bj+Xx/zY/ILxnvdQY/l8f8ANj8gvGe9&#xA;1Bj+Xx/zY/ILxnvevf8AOMQH+P7803GlTAH53Nvmp7Uxxjw0AOf6G/ASbt5COmbbT/3cf6o+5onz&#xA;LsuYuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV69/wA4xf8AKfX/&#xA;AP2ypv8AqJt803a/KPx/Q5Gn6vIR0zZ6f+7j/VH3NM+ZdlzF2KuxV2KuxV2KuxV2KuxV2KuxV2Ku&#xA;xV2KuxV2KuxV2KuxV2KuxV2KuxV2KvXv+cYv+U+v/wDtlTf9RNvmm7X5R+P6HI0/V5COmbPT/wB3&#xA;H+qPuaZ8y7LmLsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVevf84x&#xA;f8p9f/8AbKm/6ibfNN2vyj8f0ORp+ryEdM2en/u4/wBUfc0z5l2XMXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq9e/5xi/5T6/8A+2VN/wBRNvmm7X5R+P6HI0/V5COm&#xA;bPT/AN3H+qPuaZ8y7LmLsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;Vevf84xf8p9f/wDbKm/6ibfNN2vyj8f0ORp+ryEdM2en/u4/1R9zTPmXZcxdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir17/AJxi/wCU+v8A/tlTf9RNvmm7X5R+P6HI&#xA;0/V5COmbPT/3cf6o+5pnzLsuYuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ku&#xA;xV2KuxV69/zjF/yn1/8A9sqb/qJt803a/KPx/Q5Gn6vIR0zZ6f8Au4/1R9zTPmXZcxdirsVdirsV&#xA;dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir17/nGL/lPr//ALZU3/UTb5pu1+Uf&#xA;j+hyNP1eQjpmz0/93H+qPuaZ8y7LmLsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVevf8AOMX/ACn1/wD9sqb/AKibfNN2vyj8f0ORp+ryEdM2en/u4/1R9zTPmXZcxdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir17/nGL/lPr/8A7ZU3/UTb&#xA;5pu1+Ufj+hyNP1eQjpmz0/8Adx/qj7mmfMuy5i7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXr3/OMX/KfX//AGypv+om3zTdr8o/H9Dkafq8hHTNnp/7uP8AVH3NM+Zd&#xA;lzF2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvXv+cYv+U+v/APtl&#xA;Tf8AUTb5pu1+Ufj+hyNP1eQjpmz0/wDdx/qj7mmfMuy5i7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXr3/OMX/KfX/8A2ypv+om3zTdr8o/H9Dkafq8hHTNnp/7uP9Uf&#xA;c0z5l2XMXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq9e/wCcYv8A&#xA;lPr/AP7ZU3/UTb5pu1+Ufj+hyNP1eQjpmz0/93H+qPuaZ8y7LmLsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVevf84xf8p9f/APbKm/6ibfNN2vyj8f0ORp+ryEdM2en/&#xA;ALuP9Ufc0z5l2XMXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq9e/&#xA;5xi/5T6//wC2VN/1E2+abtflH4/ocjT9XkI6Zs9P/dx/qj7mmfMuy5i7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXr3/ADjF/wAp9f8A/bKm/wCom3zTdr8o/H9Dkafq&#xA;8hHTNnp/7uP9Ufc0z5l2XMXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq9e/5xi/5T6//AO2VN/1E2+abtflH4/ocjT9XkI6Zs9P/AHcf6o+5pnzLsuYuxV2KuxV2KuxV&#xA;2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV69/zjF/yn1//wBsqb/qJt803a/KPx/Q&#xA;5Gn6vIR0zZ6f+7j/AFR9zTPmXZcxdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdir17/nGL/lPr/wD7ZU3/AFE2+abtflH4/ocjT9XkI6Zs9P8A3cf6o+5pnzLsuYuxV2Ku&#xA;xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV69/zjF/yn1//ANsqb/qJt803&#xA;a/KPx/Q5Gn6vIR0zZ6f+7j/VH3NM+ZdlzF2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2K&#xA;uxV2KuxV2KuxV2KvXv8AnGL/AJT6/wD+2VN/1E2+abtflH4/ocjT9XkI6Zs9P/dx/qj7mmfMuy5i&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXr3/OMX/KfX/wD2ypv+&#xA;om3zTdr8o/H9Dkafq8hHTNnp/wC7j/VH3NM+ZdlzF2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV&#xA;2KuxV2KuxV2KuxV2KuxV2KvXv+cYv+U+v/8AtlTf9RNvmm7X5R+P6HI0/V5COmbPT/3cf6o+5pnz&#xA;LsuYuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV69/wA4xf8AKfX/&#xA;AP2ypv8AqJt803a/KPx/Q5Gn6vIR0zZ6f+7j/VH3NM+ZdlzF2KuxV2KuxV2KuxV2KuxV2KuxV2Ku&#xA;xV2KuxV2KuxV2KuxV2KuxV2KuxV2KvXv+cYv+U+v/wDtlTf9RNvmm7X5R+P6HI0/V5COmbPT/wB3&#xA;H+qPuaZ8y7LmLsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVevf84x&#xA;f8p9f/8AbKm/6ibfNN2vyj8f0ORp+ryEdM2en/u4/wBUfc0z5l2XMXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq9e/5xi/5T6/8A+2VN/wBRNvmm7X5R+P6HI0/V5COm&#xA;bPT/AN3H+qPuaZ8y7LmLsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;Vevf84xf8p9f/wDbKm/6ibfNN2vyj8f0ORp+ryEdM2en/u4/1R9zTPmXZcxdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir17/AJxi/wCU+v8A/tlTf9RNvmm7X5R+P6HI&#xA;0/V5ArKVBBBBFQRmfgz4xjj6hyHVrlE2dm6jLPzGP+dH5hjwHudUY/mMf86PzC8B7nVGP5jH/Oj8&#xA;wvAe51Rj+Yx/zo/MLwHudUY/mMf86PzC8B7nVGP5jH/Oj8wvAe51Rj+Yx/zo/MLwHudUY/mMf86P&#xA;zC8B7nVGP5jH/Oj8wvAe51Rj+Yx/zo/MLwHudUY/mMf86PzC8B7nVGP5jH/Oj8wvAe51Rj+Yx/zo&#xA;/MLwHudUY/mMf86PzC8B7nVGP5jH/Oj8wvAe51Rj+Yx/zo/MLwHudUY/mMf86PzC8B7nVGP5jH/O&#xA;j8wvAe51Rj+Yx/zo/MLwHudUY/mMf86PzC8B7nVGP5jH/Oj8wvAe51Rj+Yx/zo/MLwHudUY/mMf8&#xA;6PzC8B7nVGP5jH/Oj8wvAe569/zjER/j+/FdzpUxA+Vzb5qe1MkZcNEHn+hvwAi7f//Z"/>
+    </rdf:Alt>
+   </xap:Thumbnails>
+   <xapMM:DerivedFrom
+    stRef:instanceID="uuid:DEC81B9E214411DABD12D45BA291F212"
+    stRef:documentID="uuid:DEC81B9D214411DABD12D45BA291F212"/>
+   <tiff:BitsPerSample>
+    <rdf:Seq>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+     <rdf:li>8</rdf:li>
+    </rdf:Seq>
+   </tiff:BitsPerSample>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                               
+<?xpacket end="w"?>
%  &&end XMP packet marker&&
[{ai_metadata_stream_123}
<</Type /Metadata /Subtype /XML>>
/PUT AI11_PDFMark5
[/Document
1 dict begin /Metadata {ai_metadata_stream_123} def
currentdict end /BDC AI11_PDFMark5
%AI12_RMC_Transparency: Balance=75 RasterRes=300 GradRes=150 Text=0 Stroke=1 Clip=1 OP=0
Adobe_AGM_Utils begin
Adobe_AGM_Core/page_setup get exec
Adobe_AGM_Core/capture_currentpagedevice get exec
Adobe_CoolType_Core/page_setup get exec
Adobe_AGM_Image/page_setup get exec
%%EndPageSetup
Adobe_AGM_Core/AGMCORE_save save ddf
1 -1 scale 0 -361 translate
[1 0 0 1 0 0 ]  concat
% page clip
gsave
newpath
gsave % PSGState
0 0 mo
0 361 li
289 361 li
289 0 li
cp
clp
[1 0 0 1 0 0 ] concat
288.5 360.5 mo
0.5 360.5 li
0.5 0.5 li
288.5 0.5 li
288.5 360.5 li
cp
false sop
/0 
[/DeviceCMYK] /CSA add_res
0.882353 0.768627 0 0 cmyk
f
1 lw
0 lc
0 lj
4 ml
[] 0 dsh
true sadj
288.5 360.5 mo
0.5 360.5 li
0.5 0.5 li
288.5 0.5 li
288.5 360.5 li
cp
0 0 0 1 cmyk
@
%ADOBeginClientInjection: EndPageContent "AI11EPS"
userdict /annotatepage 2 copy known {get exec}{pop pop} ifelse

%ADOEndClientInjection: EndPageContent "AI11EPS"
% page clip
grestore
grestore % PSGState
Adobe_AGM_Core/AGMCORE_save get restore
%%PageTrailer
[/EMC AI11_PDFMark5
[/NamespacePop AI11_PDFMark5
[
[/CSA [/0 ]]
] del_res
Adobe_AGM_Image/page_trailer get exec
Adobe_CoolType_Core/page_trailer get exec
Adobe_AGM_Core/page_trailer get exec
currentdict Adobe_AGM_Utils eq {end} if
%%Trailer
Adobe_AGM_Image/doc_trailer get exec
Adobe_CoolType_Core/doc_trailer get exec
Adobe_AGM_Core/doc_trailer get exec
%%EOF
%AI9_PrintingDataEnd

userdict /AI9_read_buffer 256 string put
userdict begin
/ai9_skip_data
{
	mark
	{
		currentfile AI9_read_buffer { readline } stopped
		{
		}
		{
			not
			{
				exit
			} if
			(%AI9_PrivateDataEnd) eq
			{
				exit
			} if
		} ifelse
	} loop
	cleartomark
} def
end
userdict /ai9_skip_data get exec
%AI9_PrivateDataBegin
%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Illustrator(R) 12.0
%%AI8_CreatorVersion: 12.0.0
%%For: (Alan Lillich) (Adobe Systems)
%%Title: (BlueSquare.eps)
%%CreationDate: 9/7/05 3:18 PM
%AI9_DataStream
%Gb"-6rK8/2OXKo,q%!3rRn7t-g5*PRDJdXuMPPE==u.r,k]Xtc`nDh!>N1H-C>%t$lCS"Qk8ss4!`bMRCoN?%@WY[OH3/&@_r5QY
%3"TGEEV'2,GMg&YpUcphs82!"ft69"LSK(](fEDBn\p!-oBY#cojt;C1^+T+6ICL9L(pfm'n>rVeb=9khgPFQL\IuYJ+qddqmZ#Y
%I/!6mm@Rb"49"g4n*$7-a.'Ok?iAsQ`V&,BY@"qfqte;/%sKZk*qRnbfXuT[oDP/fhu(CdGJAS)iTJ68QNF\oRbR\`GLQo+LVF#j
%GOJkOrVi;<^S42)J+Il.o_!G',(7^cJ+`Zu7j=HoR#/E/?iJ7+hgYU]a7jf5!!2cgahRiOp$^abp[Q/EO)NmiqmW24fsV\pGbX@K
%^NfYT[kHV[T=o^Pa5^7)d@p#9UWWUZS?=U^R%$FWq!e.Q48DchY@%7nq[]lu1Kq8ga^>(klaLfis2bVlRf^?RrCsCc6dU;Tec5LF
%j`eK>WGq'n?Jk_OmE:QoH1]l["*J\h6eD7<-##>LN8mp.-:4'&67MFAW/R>qIn[si\RIq3NqVf=Gk:c-5GoZRp#b)NpYYpU7dF,o
%?HG06J,&fhS,\fZ0$_WpPsq@\rr2<N&&3Dajs(<G%t9XU^O6(+laK)C0"(,*[kBIh;rs/@PQLmWo#'p&Ij?ass7UdJhp7@/d]Z3!
%^3ob>f,nQ$J`%XMq"if2^&NSLg7KtB?\L>KA'1#50jjb:*.0clo.h>QaETi?gJqAWA<uB*(n*3"QnZ9!WVa^HDgqHCh9VA'o^sk$
%]_Q0)`3^Mjr8:=8AEs36rYK=Kiu^M"I](]Egpm=Eg<MN\rUMI)n5$fsl149()rfRFUGOY"R#.+J''a\e?@I8nbUi?B*WQ$&s*_QU
%o1)K:M>fMjT/#><.JS18CJa3`gGsZI*56Pj^4#MQ[A?o_-l!sj`J@DHU/[()?<E\nTF?ZS`)"GaI\Tjk.##G*';]Sb;<mij2/dF'
%c0[+*]Qf!G?bD1,[9pS^pFfiD*MHU!'m^"XI#FHe]lSr^n.VYF-i?@]oZ;D/hk<R8M)+9,I\P`>$)rhHi?pg_8,.q,KMU#OHA%pS
%2gtjd4oqR#;t-OrqLtOioATp]2Emd=GV!)60&`_XPb&9U6G(SkfKm'-Od2#X.#%ZZ-X)ZFP[;OW11L$<;Wsa4Y]*%rU4;rp:["@.
%5CNt$JD_eITmuhdUF9"aHklRpBJKS19n$p&KKe?U8dXC60@Fp8*g@%<Jlc-anWFOY%qX*LP>(TY[ADLG/c(6p-meGDrWuAr/q0N'
%H?]/$,hqIAE)&*CFIN].XI-AGEfh&u"e-;dVS[PN::Mp$Kl<X>7`>-M[%ijoQe&"IHnYMQEg`=>bqeFu)en77rtG36B=lYRHss@(
%SQWt1<VAkm:$u*Y6g[m.Co4D2Cg:;e!>HD!;1%DZd;&:l?>3JUcL]!Sn6<9ZXT+ST^0,s/5O[_*qHNq>^'I"IlYlTcP'gScbJ0S/
%F3]M%lbDb$q.BRWs))`8oD2\j*PQdl9H`Y>q=jftHsV<G^T%2GI?(SM:Dm70CnKcIol!uRE0pN![4eWWQ`QaL]m-gCV+gFYs+rfJ
%I/DRr5=Y$*EZX"(k/d+&.K!H?Rqc;4'@1"cpL^f%h"P$_p/$U$ILGR:><!.;4'LA,(Y[aSrdRhRF*]I6`W)9[J*V?O:ic2tC0t*7
%I,$J\bJTM>A'U7\E7_Y.S1(ptbuo'ImQ+NIFd?97],e#O3(qQ;c(e9>9t8t+WFu81d:_[bldk7*NqM_he!q^#r(jc\3U9`Gqrt7n
%rOUPZrm>B#,rKs[X^$3fZfH/^UNPl/c&rHMRiZsgZfHMh&$9&3A<pJTHa@HMbuo'Nm`3n\V_CarWkJ#4T%5I'*;<t/<r`''=N?0Q
%f$g$5QfC8@h>7'3fR;W-e!VNFj$%,3qN5C3A[iiS[[tJi3VU#45%i^JD!'BF;8UY#*=KOCHHs+Ps*g-sfL\rWcYji1<U7cPOpc&t
%)C></f!0\SHBPVq1>HM2#sXJnCufFr]ifAQmB^uFQG;uA\K(@bgNlc(j>,M'mqrI"VnS2IkA<AM=`Rs<96Re9p,_o7\+M"YaX&NH
%^Z<8fXf&dkNRk502bPduT3!V0o-ZLj0#rB4Pjl"`a7=DgjJgCebAj-m-2bF<=M&<2buo'Nm`3n\rqC'3NpXK]V`.8oa*l+Aojc=2
%MeWd9Xf!sJ0#rD.mZuH'CX&$cE8Ttu4cNTb3UTO`\"<R=HcXrf)RJM[h_O&TmV_ugB$"Vo+,pp4pp9&:RPqLV?ZOiferuY7-Ue>+
%^NHX20=ap!Q1D]>/@c2`a\fq$CE71lXX?,%0!'IrPjn9Ha%"q:PFEkbiBB=.ropUrpN]t=CR/4)qs<.@cXS!-ceEb$ZfEms([Z*'
%rH7HMDsL!=Opc&4]"=g!r<1`WdCT#3B#u>VS+@q%FdAPYqn@4=C!DeKC=Q>MC!MmbEM"-qr2eJS]\P5dC9uuAguh'35G'seY?F_?
%QCO$5P]c:^SgB`^*dV$dCR1KOqp]cSZ^YJ!H<X0TQ<]IIP237Ti[hVKpOh>RO$?8ia*m4?f$g4#O*Oqor[^(=VQF%HI`Vc!rZp+#
%PG3`&f/hKc>#0@.>ZCU].,j?sNjYq=PFNqciBAbaq"_"$rMoPOB$#b7c]&Q$rH7HjDsL!>P07fOFMlSV?H4,X[[tbq\Z#3j]3EHc
%BpN"aq]TnD8^*>j>0,IsP,C320$!pX\+QNBP)F'mn)J_OZfHMhpT7Zun'>klCX/8/eQHoVmYBAqV_UmtWkDQCT&)$/*;;Hj_Tug7
%gNd"!CR/4cqqNUYk:t"HhU^/E-0O;PFku>45P]Hg?>o/ob`_R;T<iE`<cdUnDsPH9-(!Z+FE^A,s%C\$bA]Za-2]mWZ0"6QV`@C&
%XF3^*nFKi(g/[I\cB?@is6]b2T@4eWs7Q7^BXA-GQeM#^-,12hKe<4a\9Vs<][I/thGj1;Ds$je,tG^Iqm)[Ri5RjYY\nmZr7s;V
%NMHDoqu.'Yh>GQ)nG'$pn)(kZSU=N=k&7t[rUKbLb,[#fo@O$3Sk?bCLDNK&rdhi+?iTEYp[luh5.pppO+6olg\6Jq>^uAE\$(k-
%HMR+*a.'QAhgP+P:QGjHO%608cnF;Sa(p63]mTFlT0Coa5CL>Z6%=+Va5?mnlW51-Z3&Ul^A@iRa4HA2o[PJ)'D'-3k/6rNrVlRf
%n)(m^oPM@CA1Et?./u,Cr/*#;qo<otkrg@FcssZdnF=V/U!i[FTJ)pXlaJP)^4#Ub%kmtXq_t]J#R90f9_.!WaBlN-q;M!MT0M&u
%'?'IfGJAS+p<@f*X#)_r?bQC,n]e,DYJ9r*G9:2L4l4o!fAF=BE7_=RU!MWpa6U5's4@lc+YV`$F8VX`5Q(&FVD1d%^3TG^bn-Jm
%.i[C'r=Q5q5(<2%Q[aD-jF7%*$SM8*$"Ei+jh$j$NXW*c6N*#DP!7X#,_=K8_q1\$>LiJST08h\j728;oCXb#]_pn$C"o7%J&7ZB
%of'ou;sV3;9::!cj)du8Rr8f:HMF\!(GB)WkN<^G\+JJ&F%oH(-e":CM=^ps4?\]G1-8gdoLsM>3rV:;kP"ECpA#.^fCTc'1-LJd
%85Go!oAf%;kaD77Skm\"#.26cKY6F0k4%_lSniWZ5FJ+]:ZNnMj8!]m/H!`i9[BS?maUWFI^m?!rK)Lfr*8hloZ@"VIA/nk+0UaS
%B>JZI?ZYg4m;qkcT#6%&G3:=#]OJJ=F3$)6S9)g(q1d6[,?DK+;jka&E5e#j&PFUaP]C&ILcG&,H$OBm?-h-G[Cc.aiG]g@dl#[j
%/pQb1p#I"\rPd#Lc[<(S\/To2DB_7.-Jt&WCOQ`U/[=sDbmUCe-JBJ_$/LNKl+m6N`/u#$d5,5N0p#Kt1LhF[)D$q+!#UU16Z^/8
%I7>GO,=l=$&RBX7rIK\anB`Nu"c1)S$ODLJ)+tH2&Bb\s$F0gQK<.B$+FB29a<G0#**>=WV_Yh-37%9FJ&Lc3T)&0#f/Fc]1[uOT
%9V%Kk9n!FJSC3Y"10kQkDFmTp'6_#dFd_(Pk:jq:c$:r5omFYeqM`#X@[WO-=VeLA,qSSj,dpaWQQ$QfB-bYR*4>3H[lEQ`$SK$O
%Z7G@sh6=OS,EBG+PFqg5SbG>C85Jg0(Otgj%O>6(G]LG&;jbH8>bEhqKG[V.TnI3-DJ5i;d51oCVDuUB3j]MeN%ma6WEA.;7QfNK
%BS&?Z##8l-6uI%%d%uhu]\#*(I&6-s_SPgBN9;XW4`/lmJd]s`iJ%%nJ0Dc@il&$Q/M,$Ujr9m^cWI!8o?^2_fJB#6`0(5E2^B@u
%%Om1'B7@bg2,!fU:IgQBk88E+HH85p+0lFApL"5#!).rccrj3+"ggB.0H2\fT!QAVSA;5A]YMb,gp#I_q10E83Pr,`_!9kr:R1)o
%Cbf:.T'hUdND5n`g-TCH@=</pkKbqb4X?m0kTeYO16EPl/X]:p24@2eRo2/DT!:nPM.KVD-eEqBBW0C\SRCh!4*cu0l7B7jB%'C#
%(/'?6)UEZ5\E7?HnH.ZpBpa0;^iFD;X$C+l+'J%of(ThnH"csl<pTRsg,uSLL[La9@m=H<IEbAEYnHc3EbEt&c\Xrs1ecLX@[T\=
%dR\[&eV-J;3Y;89M2Si"QIdApR3X&@XE]ntKk+kk5!C>hhpQaVPK[U$^IYZo8Mh4rdY[bgS4;P)AE'$\1ET0),>#Kpa^8]s9Z4'r
%1h='@37fFhR:]BnH0&ap/Mu'+iokG%elrciCQe0\;_ui9oe]efR^COpf`%D\rg"i!R\iBJ)'3LhH^aO6c2EKRjuLQ(/P51a9pJED
%2NfibUc9,f+;54AF-<5$P2pDI:\d8e-Bc[EUjEm*5nf7JEtYia')-28X4%\QD0]#d$`UCfjPW$)j"3u^CRUWY'OE'(k=G\,U^1].
%^VHS&'o]"2Z%OrG,gAoZ8W2RceGlXN&Ft!Zf!*N+d'D$)U1p<:7GE^6'ocui=1#-p?.HTCWdLF=jkHeB;S];^>7E,EfJN(e#9PY_
%G=pN;E)jcVK:d9IGc60()[1'C=-W0UBO96$Y3OfDqGq^?kh5u^!3=l_I@faLp5GCXXK``q5$.N1(/FcqIKDatOuqT]k/7AC!?N9m
%b^&?4Qq4\;))j)ef/<7'.=n!WQ5)pujM`/3S`2F.LILB[Qu+rF[k'oY,7%1U@=gHb*mMJejb4=(J,ql";T*rn+aYQ5&rRZ]Xg#Sd
%(:hLq`&qMV>?K)r(;P21_226m'B\C$1UEX>LJ)7ASug!)jh2S=f9rWr&#(u8&rp`,Woe,>VeJrUT;FoF>-"Ad=cXV'Q&7=3FXd_u
%<9h=.kCcidp$+>>>]3TR(1);#lWDQ?rkO].Yd0gF87/UDIEkL^/M#Zs?L"_>dEenG'<C*5AqB,8A=Z-[+G*T]2L(d%e)EA,):-6;
%B>`ba9os/AgN`'lWXg%?#M/)3q"hM_=h88&4k'6Ig(3p@>M8f'_fV0\E@-HWU7YjTQ?&7f.H9Zs%UXU3hq'gE;%qDYcu31"RV9DV
%1P&d`<r8R7dXlr4__EcF1eZQ&qsUJD1cQF;5$c.LkEXi]\#;fm/A]&X=#<YLd;@!RY`-"f^RhW"&,>0)YC'#bgVeM/\:n)#>_jCG
%8b@5/\c7P%gcVX?\[g@&YPYA]Y@#%-hZ!=&LC2,emJtaAg%a?P1S=YY5##WOZ+2LDn-_/%(H0QIQtNkIDqGPL/f(tIqB>29p?4=M
%EB#`mdD[<^&)2a\%UBcXNBsWXLc,/CfnH`Y!s]l(ll\S!nrXD#EO`8e"$8niL*Xj%f`/L"R3WCY2N6AtkC^'cP%5V%1g:Y5hX86C
%D97tC&;0Ji0`"&#mpR&\(kj$>2Xe<pmpQYcI&aierVi9%r'*g^Y%.L8=NY%pO;;Y5DM+m%6D%/d+rhPsUk,g3;W^O+dP'a`<)srM
%r$Br]2jYq"OEEoh`NQ[=?V7Gj8c%P,i30*ZTrBpE;@KFQM'-/e'c+k9C@%e5QX%]M&saYI/<OXMCQ6'h>*GjMe)na>U$:CcAtq"\
%?;DT.cSL'"oBtGX]@Yp[J#ArLEF]02T[^2)6\t]_a.E5o[s@oJ*8"m5)BFneeOPSnU(9=5l2aNt?i8pH&k1^aflUVe3cdPp@Ahgp
%=<XopSQNpEp/8%rdorF=)>inV=QbRmj_2QJqb>j)Z^V%3g]SZt&T7ceVN-Q=+B0R-i#`K(^h'1++#=(F_)buCii'e;cG01kLLW7J
%q,JNGHi3"4RjU*iP38KXV6&&jH`l[UUX-Ljo1Ye>&q?(ba?7\QL83gL)OBs,+pSQQ8VekdqODhj/fa_tjrha)D?=h-lG,+e$+W\'
%as;:uh,RQO865gLiAAAuEI_;c5<:1iq[5@XY^Du5*%n>&h"UFBH-W`4?@!+Z"/DX=YtodSfQ10pCrC&f4K^kJD'&E);e<48TWJPq
%9f/Y^<U$2ldoE03:,T0-BNBQD7_P7J<@)ug4W?5lRInU$itdW0hGh18X&7@/VL;JE63GO=oFM$?ZToV=L<_T0ADGdmk8NaCL-!pO
%k8NL<#!$IT;^V@Oo)A-[7$BJ:]FP),9b>rD^`3K[&`>8Ggp6QL9D6bpldh"Xgh4Z"5E,RT6J2%]^W*JgRkT"l_q6^Um9ID2F53O>
%>"&[4O$s#+c@[t+!siY<\@N-R^b'Br!d$AOpB0"*6T?jFKac/*3CcIJaWXqL.S!P3gfs-CP\$n;??29Timg/H7,O.^50\m7_C-f/
%[l4&,;/UAF"W2<<pb`5qA5#i3P=\F]WNj]D.kZ!h7UO57Enhrra/M+>gU_JAPFider1r>EAkDln-1*XWZl1'^kGEOU*#6_[frd0t
%,''V4a4=&n4%!RmVUS:qg!&T2`[#$$QreW;D<5L]]3THq?t\o3$WZ8&)n3)0H_M79fheT7&tSiE(tu-`e_1kB]tq9;<ln#u<(lo[
%`_pZueC@*,:"6:j>"fP=X`\@\?S.%U`*:-d)=8eZH2[sV`I#Z%;[c)oB?MEgoF1G\l;QF"cj]:>'>C%.mBkbGI[5W(^pG)LOaGFO
%*iJn^R#>1Pqt`T/;-'P1IlU/=R1=)hW]/^:e#bRc:>Vm4XB+,QG2+;Xh.GC5AmK?'o`e];%^j='Aip$c0g.FHg>VhV5\M5E4k)a\
%7:FQVq07-8$n<T)CKQRZ.[lTZ`g#1i<%-A-p?9ShN]KrWZ:WZ!G]p#qd3i"3m*[b%1A"2bI1@:U#<$[Jk,oW8bj:#g%*ul0p4A(f
%3=k"'c+^mM@D(`r/@o]EBoQp_E52lJ[Y#F5XJ-tp1Y"UW28a%6YOBf>;)($m-3maJg+Sl]bW'sX3_L)iGo9`4-^5?=>&E<!ckeF#
%8K5`;G#os^NOepoW>"W2^Kf$dh:4`l34Bl[T@jGBgln-j\L%#t%-SAJT4:1ecelM5q"d2sDr/3Uo`m7C2]ml0bMTbes3KJNH>FQ"
%jDCklgF?q!nb?l$^O4d-WBlZ*ni("US$7p,oc[ak9T\]XeoQiod5Oh7dDL5TgqWXRk*tE.G=VQXWSW#U1A?Uha=g_YQ:ZRg49*:O
%heO-rA=ibkTD@OITKiIIJ:BWVj"HJnqJXjQ)i"CaYL2H+K6Jh6)a/XATIl`NUkQS=[04Q47e;\HF1NV=36#NZbe?d'm/7$QqR&'q
%eGm35CWAZAXh&`lOgWdPki]#5At`fH=!Zs;"'^ld[`"r1Y?^@#r-OG*_^;j^2m<cB5ej/q\bTr'1--f40PkI8c*`Xe[t;,,Wkc.B
%]S.e/>SXWW%B.=XTk2n27R8U>I(Fq)DdX_[fWf"H_-/1=j_?4`8;GYb@9IPR[d<*#VQ5m.L+O-U_j1`Xb(I3/-*iP7:lj(=dFK1<
%M"_4_a\*#JeeqTqA"qs`?<UHd[?h\g6:gh\OpT?-HDt6gKUb,+K39Lt"nbtZM.p+fTU$$60eLVhUh,P%>0J0F4'Ipj@r1d@`i-h_
%9JDSH8T2e>&M5Ig/Z?^)e<p$aB]%W%4%HX0,j@T`BFpF$N>+60NL"2).4(_q0q('[E"1[;DDFaMaVLZ!d:o>q=Mi%Dqo*iVReFm7
%T`0DPTDjm+V57`K5m'DO:eStskHqO(En)pWUEp-9GI0u%(,H+[9$:7==q%I=['U7>j^?5i(5D\kWMO/jaW#LcPqC59\<WD?()eTu
%]damJ^IDO)AP5[SaieDL:J8krhgcKJ@l.ibC8P?2B`FHsPeCQ7BYMgH)(CGo5++kD>'^,@+D)H.l@l@DH0/3sMBG7QY^oZV<t>BR
%EhD0n$qN@;+5MkY-.uRd1U=Ik[Z%`B<Z#je/of#nn5-oS,HpH-$IdAJiO_V2l;mH1CQWd$iS23H]R+2RC[jMti:V=+KbE-%kb)97
%-4e>rH.-Vo]XHPsRs)A]*?6Yt8k(/7Lk*GMMAdqVRcTSp$l6C>/H[5<\o/<'/XA_YUFG,('^PPCk^2G^QqE[4\[NtWl?Ju0VoNVl
%F67"ks'@df`I=Fj\-tnfM%Q<,CSp1<aP-4D5#Z:9N3adodCZN6mS*Ip[COo]Dq_g&;HnH:/'2JDH-"k1l1rT_\V(B1s-!QoL*;5R
%5/-saiQoQJrpXPa79)PlkCo.;>`O^e">^a)7$7g)o*CRR3a<@dkZYZ8@+MRQ^-fA`>5^)ZD$&;.'+41P5YsTO.*2^[(![tj>Zhi1
%]7&.PpGDiJjGL;YRR@f9E5="*BiuXc-6Om,0,"L$SB.OuUUutB.RFl4Yb[[D=7B:4R`b.P.h*,Bj>'$clQldeOtOkEg7:f]JcW,X
%iR/H-@9P-ed>T52hHdZ'Zl"pr@j01Ojf;r&=eW1]nX8Ic=]t*=@&^%bKdMU4>A+YRnG'%`JeGZ\e6?Jl&3;^N,,UM!jAanpW]Pud
%9pMM[869]Oe4;!N"(])NJj\5eC<f;gZs6&Z.T)/"!a:bAE=ic,0;H`u'cK7#E4EdaMfjVD&\!1=MDHl\X-B,eBQhran:oOQ_B0DM
%r7b)XXM642n<5R^:W+<k+jMYO4&HXpm4*1O-W,m!=MS/p*)AB`V5.Uur[X^FLf5?b2PrT.5?"?i+LRVoFrE]%A`<c>5e3C$ktbX<
%UdAk=9j005KJ4Pm)@64FV#Ca^GqMG=Xr#YPkbM29hC_24.GR!6*FgP=P"=SF),-JT&Jj"]d<q<\c4Xjb9`6UP%SmAZ8/i<d*I<p5
%e0T9h[5fG#XV/!O:G)Z>]GJDWY'M)ITOMVqft'+<d2t.ZS!M3NR=pIm]_Fp(I4qV-;O\O:i#q,.XX$XI<mJd-$RT]>PCc1ckQ.kB
%6+fWHRX$&:5ujl=16GC.Zlm[uOt6k[&XMg\#_#s^F/FX(6j6E2,r<dV9[&oL>GOj7gkkA.cni3XoISrN/MoI1`3)c`kC%QUT7h"B
%kt:7g/c&6=#oUXVA>D78BRTHc@/>tt#,a8"(/_p'-qQq!<XjWcR`/0Z,Vmeq"#/KNcI=U;Z4uBr$#G/6aljqNMb+/+1g0Cn91RH4
%LQ^kq<>RbF%L&EH]<86(LSS`5@A(#N.`F5?]#nP_*(e,2nE=C0.5*OJE+V-Y;`hooaGV\s^X7RiR!us^4r>T`mc@t=l.HW5IV>2S
%;@0HmG)l]]>mno25WZdiP#W8OLdVfpA#2cV:S@5%jcUC_[JTsQNY45+_9a?6>D`pQ!bom"qCIQJ<L(/6G*g,C@JZ+IFce"oUq,g&
%j'Y]0R]!PKbpf;3jgZj"a9ufV>(@VfUfrr$Bm-j)GoDeoXSnZNj[j7=P'(e!6QCIgi_gNF^,snA/Ai`k]QAk#!u_8"]-3fBA%aXd
%GSpj&6*sF&/=FBJe*L5MQQV6aeOnDD"VP+J+>%pDb7MoI?9riX3#N=tFdd\4I4_c=1F>iA<)nrNOk6E]_8qA>E+h`(p9$W&%AAV4
%AX7#$?#!3ILrJ!i%:RPZ4"&\1-oilZc`'\d6b,0%#>?>;+k%^TEWr#-lU\rZEgLI0U+0?`6Sk&#($R.+N3bqY\$'ho&9Z*Gedp+9
%UiE8:(GL$<J\0,Uc$af9gd3=(0L6'Skl?^pF(thK,tgc4P#`>=-\nO(qF!q$(>M[c+^@uR6*kP$"0%a.9Hca@dhSEo9/[H81__V;
%cq:X$,`+_1os&8T`TBNaUBbk2<,/g,19Du6FjVPcY#fCg]e&0UOLV$N+-g17@jIo1Z7[(uVb:G9,Xt8hRnp-G*TiN.R$KttO/$VM
%5HVti0oRs1[)>QTfrpE;'@P-@2rZSc$Y2<qg?$Dm!Lq%'arK!iTO;c)NS@dA$CK<J3.]J0X`gUs'<f)<`DeYu!^f@.(?si'n=n#r
%g@eW\,e:Fb"9ZY&_bg#,4]$'2Hjfj->G060UQSU^JAspg/s$nhEDj5][_NO!F05\/T6VtAX<oINF_L.k$ut8-%0ha?SX*"f=DG^B
%gp:*k?qZU+'^J^AQOn>f]%/G%5A=Q!:3gIs#jsFBE2uL!.p3J%b#V;@4+KJ6PY@e)Z=N^XTMkM3;KnC%CaN'S)q2Rf:c05sSC&5X
%AP06V^,Mb+KT33THo5MLF935^BJpiqj7+C#7-hPY'&!c3M:JNfJr59;(QX@Q)2Y]Q4?T!1Nho6_KL21SA^<[POIp&3,D=W\/&ieO
%Z-_d'pYDe(bL17UTknGu8Qg<:W1RpX,h64?Jf<K@b-Q5E#EcU1Ga0+T"-4UJKhZ`%"1*_im"m/S0p$trc%8T1P@2UBf9CDW4TmkJ
%jKeW<6o#8pTlhXcK5J2.h';g:jT7(EVUd$DH[qs0r`-d3D<W2=RrcaAnn>8Ok(Uh\CLed?h5ndbn?Se)92(8$3?b-9.^FPjB3iD`
%iCm&sW'Xh%/PNu4$b,@p+2I5o)?<@iqC-UI=+Ks65lTg2W(47r7Af8W"3=3BLf.ql`PG;RFY/DeNuU3FUiCJ,.oCD]cXoW(FiJFV
%U^d_(:cS^VdoE\c?CIh_=`k8&+%).DeOrD.Tj@^m0^=WF+GbIoZa=oSBfd5hC)Z\7Y(l=f'XIIAI.HXP*YhJWO2R)22C6J_i-!DR
%l<V10-@*BY5*>b06dE+?M/uSE0Kin(@b#M:XM_8>F"X?/X:[A@M%m_')otX&`"OrM>G&NF<24ADYFR"-L&lEE7G/B-d51*a_T9$n
%%I8$LQj"Z7HP-nj)qW:S@0UF#@Ec$gfIZ\jXtg>FkD<pje?F$B2)_0B5DW^J9h&<J]J=XBD!lG:YeF7b("#aE6hnPlQr@J/cn[4`
%&MMLW1:D'9mgtBuoi0bc,Ru\^<JeTt>G<\";k>M$[0hkajHV5*bH@&:53]Z:&.StbbMX.^;c>sh;MAr`N!q;d)iQl3>2^#O^eDX$
%AE15d:W!HkGpS#a-;B>Y=brKQ\oNCWf43D=/ms\7_YaaUPmSI$:8^ZWr9CAh)4\W;UU=MbL9\2Jk`31_`*-'_1BWhE+`Jsk/GruG
%=F9357g,,m9fk<tF(UfG&KlN_2%UG<(N2fl3E7&2&%@n$QDB_qa'"$.ACEQ?$%ubCK*$V>84/HZS[mUaG-JRZ/S5@o#6qD7+d-Mj
%%QjoGN.B!2)+6Zo(f8%b$T6pS"QunalB*8=RB\aA<7>4k6?61TTnLk"U=jYOA80us>b$(`_l"EL+a;+fM,;G.oP_UL$FH8$,]I3a
%0KS"Shgo>PFsb*P6La]q33?V(>^MN./^4@V8=:f34#f[g$^JpN40]t50RWRGbFn#"gpfC%?%5V8Ld`+UEogt2HqejSGblO@?rCU#
%dP$=+PTh%V!7KlL_^Fc<%MbBI;aN%je(6%:5Z+X+lWLVX30_9a_6'4qF^2.+>L44i$/AH^GEq,Q_DO,&J``s)*BIIQY`qF2_5)u)
%l$%-0-*r?;Bh_];%O4dj]Zt/kXjfP<\B]2rk?+hG5*s6CC1?mm%?n,dcr;)*`ZoG'B+^PiE-m5(\YtI+_D7Pc0s*!:4\aS00'`:S
%W^LCm`/FDt)BjZ5J0b5iZmD^-NMn70D++83N^So=$S[ig(!/b_kHJJnE@QcK#"3ZLP[R*=OSY2mH\/WgdRRV4J;&q?SXI+N5I&6/
%OuR^,^d\4a)'36&6sY:;(5JUb3dA6-RMAR?TS.1K=ZmA:5amPIY)(f_E'!7I=98^\X!s7;V+O+8:7"Q.^C3gE6ZG`!6]1YeMOoI7
%2(h9l(KP3!kIiq0"bY#=K+6g@Nc>o%E7abtf:UMl`$-6IP`Z@,I+(ZrJNTHPeP3s_%aAueEYWK"Q(^k6ft;e#TO;Z"ks0&l2j[X-
%+OlTL/D.dli#o8E>A"!HZ;Z<d.uRgRY][q=gf,Hoh2sXCBP"2j<di"`f+hgM,V/r$W9$o%VS&j;^FX_iH=i"W6:\Z,e0-`d0KHC%
%\@IG5_Zn(X;V`Q-^gu;@_na;MN3SUL3(UP39[lj];,NX-:?)X&%mle*[YZ1*KASsO<.AuHZ]uu;D,1oQH,QDS):lPt)g8I-jBlO/
%/Y*.tPOblr6q5+3@D=spKq+oSn`)7L=Z8Aq&XL9L98rq:-sN.m@l$3B"MmB=OVk6i"8Y8rR3pD>?Ii1_2.dVJf+$aATj`F+l<M)f
%U?qes/6G%QCdr\<b/68i1T^>=6Q4KX+uRM1NbqJE7a+<l9*<*UB@E1NP9-2"B'R`*a%:`oW-),Y6A,kQ+9&TF&Hj'2nA5-\](G^p
%Yl;JI`&8a(]G]!AgW<4`1-Bu_d1-Y<bM$R^aC<V#ca-'aYU_TIXCVJ]e-HN(P^'fbd2#:``T6c"K"qeb37cB%[lU#CCXL!BLgEpD
%RH4Re)XQ5O`k(E.Q!sJ54qK;@'/f=gL?;Ik*SiuY[1upDB%&!OJ_i%d(V`C^(1drac6FO3gZ#$TUD`a7#_DZ%H0bgH7+Oeo.ls50
%o4#H=5[Nk.6TD<#:o]rf]Dbo&0ob.3dkX2U:9(7s^Ra&"MO8C`V\(-5I<)V1MJ^>bSeP9t%Z%/$X@?[W/t/o31_'s.ENrQ,GQ91Y
%SU+ii,X_b83['s6K%;%RTPKOMq]^S35bg!p&9Jqn4be=#.hah!D.h9eFZcolOkjcCca`mkNl9k$?G"FlJ)J6(/aeKM)+'q$ljXhL
%=St1(K+68N<SCtn!(NQd7E?:MnC`U,)LY*fM$Y?(;+'X,&+:<&`0"kamCTh#R=q41@e_0e.+EL$#_MV`;9Jrd%l?Q@S(+2['*4F'
%+L479h5kpcD+&!)Qm6K!SB1OLJ[X?s`Ja(mlRM2b$$S9M`fW:2Tm?c@19rHY[:+o]l,]HT\Na@1XCmHT?"m7;G>ab""P#/3ok7eZ
%Ji?nL+9a,oiDA85.HAF>$r6Kj`ZN+(c!.KSj+Xm%F4T\eR1HVBIgAG:^+)F/1aD"MF`d`rYf5_ee`uV8EN8PoMQhd]+$3bu/-2@s
%o9-q!b2"G894WgBQQ:fLjIdK<VC@^\R*m%,AlU4+)u7AMHZ?2@?C\2!dBPQlXB_?c5oj-5YHdVXFkDR'N%HmN+akG-[^'q8UI,;.
%_WS[t`cs@l_eD.]BeT]f:Ku!T]L\i#3q8LRL@#/Sh7;Zk&2.N]:U;=>.(pV_J>m4UrJ]QH>+WFaiNBkdYX]+ab70dLYCRP:)YEI0
%EO+Od@7p]<6:T["4cKU1!K1s7/63EEgNn`/mpQ,](868=?&GetA.2-Li@'aKQRp16*0LTNN)re2&BSs8\3h!g4U/6]iKge&c&#VH
%$@,30&p8$%%@J.:F]Df9]*7DV;Zq]#(Cibsbac$<:G2c--d5u+N>?=V!X[!CjK#aHGtH%$*DsLKN]^bI@++B_185KBB?NI],iZFE
%ns$F,d]k+@I_Vpt4C1Ka<o^%INIsB)m9qGIF!A%U3a4Z'k9/Qe&J"$c.[)>$94MF3dE(WsWCb+HRi&jQ%-4XhYS@S%>sjg+.Mq2]
%WdCit'i:*f3drOm95.@Ehj]gp7-,Pm(KVh`.M<6-2"M8X,Y1uAgH8Aj+SBQ/7[44fk/OA_?r"bE1eaGWGf`SEUu6"*-'eTlC.h8t
%m(./A$q+p@([TMOH([nf=7X"9JU7#-3!XEI!F=bc$=^(pf!OSe+@X'1Xr2!a@6j[GAUn6n**Z@_ridtPlou:kE=l7MaK]i-$M1VO
%IkJ)4OBIq5-M+S0`5s6bBKV^93NZGX;$-E9=`Zo$Z#`Mc!]"O\.'8+Y02l3K5ol7U+pf-O(7q<&pE[mq?Mu3=307T=.b1Bunm&EF
%JMl*B(Vde<]MO414A`sS@'?IZf\c,nY]fu`9OMZYZ"(5a2WSiP0&;Vj,pXIJndTjhYtm>i`r_)aD8II_d!`pmN)ZWZas!r^IEiuM
%S=I*+P7Fj(V$3Q`:"J:+?e*LLKS-p)/4I1h6WhNqUdqh\LER((&!<Qs9g/u2P^SA^Yk718;!@fS_\k5D90f#r1<;`9pZc8u&E(SR
%gM.D;8&TXU\d1KI:rt\66hidtfXBGNnDUd3K=;0H#7XOJU\O<eTfBV;r\TGkZTA6kGT4^OT=9J;P/$>:l"^>YifPA3`puDbS@`/m
%A7XYXKJo:FS*l+/Cr6#+T6de[4J-l3-7.0/-c]b@&UbqPm6^XldL#q31&X];]=1*)Y%MB_N)0_M,(`7>J$lF'7qN%W``Y_-#@;-1
%/[?o=1Uc-al$R1#`a-M>g%gQmkX0&B%cbddgDc1c]cFVAAaD4i^14"FFW*i:bfeRQ`:1r)]@Lg-8>AQGC#_.h>iqQONT19VmJOsZ
%E#^$*YU*K!OUYkU]lb?`*I8]DQ*@taVjdpTA0l0\!uqe;='Gb-K?[iDNJ2nILsABoIUFDY?<Hdo=rRKgSU8m*$0[pfBrhHI#-=k/
%1BCDq#=l4G6J%\_e3W6YF^ljoRdnsr$;c%2n/GR4Y&&#-biULdecOV1Cr'r4Kh5&$2"lMp?,&66B$SMAH"/R:j>fceRLEJ?:)*to
%XAk^!$+^S^pGWWe#s&YqF'!*;L+FC%*6]>(-\3P7#74qpo'cBh0F@-XXE2N/"G&sLbSZhb32OVT-QZlQHC_^d+=a[O*jA+RaHJ%C
%M]iV4bSZ_F=Rg2hFL""OE`i,'&E9b5$!(MhcUlA.?"AA&&eAWP9kl.c[q'+5/5[E&W'`c.^o?S@7^%S[G]u^m%LJ&(b'CIBHT4;J
%_'";um<&Fq5QXH==jllh0T8A\SC'>9E7::T"X5/3K?-*l&G)6P`4c)nb1[=e@3qA:`(ilYf-G>r)1m$pMDd@h30asCG%V+d5uW]'
%9UN1;O[I&"<`U)pRNI.tA%&K7aeGOerM"2J7*Wna=$$,6B%rrAjaleX=N7l7RWN%&(4]Xri34@njr>X.+g^!FrG>(MVgiBCQjF8t
%l&:UnnMAPC$W`<"P/nGBf*ltK'\G)f2?,mQ`&QBZT.@felq0rU/^.L5c8H7kYg,GE=U;HEJ6bZXd:h8f=Jj(VW;?`h.'!r&ZR2.Q
%@'a-X[Dj0NDSb,nA_ScW9m3u4'd2;sZQ[c!!c77)4/(t:2%qO0c=[d^,[0"P5jnEImWG.P>i03VD0;<JC"@G[XP"n5%#T1k5k;IF
%.bQ&6)L#lN,%q$)lOEs?T5(n$"p$JhVU_-gFQct0J>B[8\!d:org[`+.4YIiU!P+.e,YNDfPZ&d!_F$J2G*t+HZQ(eg;I8s!dnUc
%dfDGR@6n'q!JmN#r5u/]B.Eu-1WXPls#Gb/qpRV+iDuEOC""0LrTn9rXlOph,AWKmd:3pGaY2Lg485'g);F;f*VsR75/]:[a,W(6
%Yl9iG_e0l21IuuQ/U?#E`S0X1Y&"F'-g\QUc)KqVKJ[tr#9\l+^]g^0]T18&<]8">3RL,ab".R`ckB8T3t.@EatkC,''l+kgKpPo
%[[8k66mpYcNJjX"FhKe8aDo!Q#>$gXZJ'lN@cD5jfH&hW8]Xig*EJVg,UD'S/-hB#k\/_#.8+,(\kKi7QK5GL&jC7@U&fNq!K:-D
%7:r+O-#i]e=t1b!U1ZLa[W3qDN',@NJ^nu.A9fi76p`Ve]%l8'#Yco;/_Qgelu0[!,hV*5-@tbC#[cM7Y8ms<;A>uI+)nRYY$%(e
%jB%I4\jFga(6VkQ7CQo-Cm#.a"ZrDH6S&CR[69^OC'MSa';p]g@>m!FSI%Blf(iJ>r*\N^<:e+SK&K^R`T4;&eK<le-GtuljsIk2
%(4hkr*Ia"PH-7bEbQ/io@h=cWpu#toA_n1UGq97n)l[jq`\(7`X2E<Yj5e$HA-X/*B<,-$4>?gj/pKgnV<BpH/l(^r)^ZPbe)41k
%<_WQe'[a9!,ieX$@,U,OSu)[Ui)=.M7U3m_"9_C\Dqir;M8LBCi=),^WGnBi5St&1Yh\ue&#Tn$+3L5o)4*5J(D[8G*kRV2,p,]:
%8ab91annVCWQ0J<b_'(kEg'*YfE5.Y3I@"XLb*o\*01M:NVXc4!c<e33OVs5i<NM8U"P\;\n@'mA]j<VKXMgIO$-7[+W&t\le!Eq
%NNY:`le$:6QB+qn_4M=l+?;gONX\0I!5S7mIZP"&ncEgQ2)<d#n83@Ll$G>`89.M=).S;[jW1TC98-g,/DdVSleqN.3-F_1qAJHs
%r3QqtX=(qoau]=+\`K`3n<'c-oH@bqeYC1MS)YdH[$K`_;o!5=eNe2Y8`J:D16?HSG>#T%*0IO;@h0Vh9+ClsNIB]BPK/.'/4kN[
%3Ci+)3m3r/7JFI6N9!oW"X,%q9=+,Cdr$bU,<$l5?d0A0.<:1K/qPJu%lj)H3Y&c[FqBRUJT.nKM'6:*6DP>&Ce_2k]K<cHh9L`A
%H?&N>cP#-s?&^sHfuMB:OYc&VWZ7tQXV2jX+D9;mgiOW0.#:@3\k58/&75[`NmSJkM%=RVe7Da*WGogS4,S[d_=Op.b7%o.AKHWL
%i*@^**dte:c4",OJr&:?)9BhZ,>\!6@hrqIijq@2**&p["?LV,=_P=>+6T:V"b^<q_1g?BB"Pna64OJ8*T`a?`i6X(XCeKQ;8nA`
%RHHI)D8m/Qf-DpAh)KQL4]YMJ#8c(.dGPhETPh.nYhas8G9dij7ma.0ftr-6FK,qY)$_jX]"BBJ$/].Ob`u9MO2*)a4f-/t2he:J
%Rj&,u/Y3L(/Z)^f,[)lj*>j:<:7ON@]cM+3+7(2.X6\gt%D1f.B!eNr&#U3sCf2\Z4E^h(2;K>hZeS.aS((sk_0.VA9AnVE@\.%n
%ZDkj2&HlJLGZmfahK';CG`e1u!f`Af5.<Td]:PQC&U__La^%-Y&maTW+(\"RG*X"Vb_maDc?2(jklr:4JiV/BH[KdUjqZ(C5nW(T
%>AYB;-;d.^SAXBo*$d.VZFm7$HO>,T!;a\*EtDH<<;1[OBjoVsdo?N%?<dgpo8=q`6i*khr[/P()IE&%7Z`Z^3'/7I,f>nN3j:uL
%(g[GE^eG'j-9H)j642.or?fcs6G1q?NR'Qrh&'G=Qq!Qg=tnT?"&iAZ,D1a(!@6RI)4k]#:,Wbu4+0scjl9)TitFsCBp!N'%1XpI
%Qm\u#Y0LY9Jk#$!?+0$_^i`1s2'6IU[/cAaX$@8^$$eM(>1p2'3H;.1>1p1s"F52]AJh;^'\>ag^,mhaB&$e9Q`6bS&<1/Np5+Up
%9S*#U2h02K6R&^J-:nt7S7K^d:25k=9AgK*P-_"&6E<V[7n2gIQr=W[-*X6SZcremYW485<oe-8PcW!S4I6Zc(%[mT_to4&0^MsN
%gs19q(s1G6/\^@kF<*GGGJIOTK&dJ:#R2,=pe1qP5,KJD^DgE16V/f^9&a:rT.oRbM>;as=:*T[r6WR=fc8$6,["80Xl3=38ZFfj
%,3tps5%uX^?TI;?N*Yprc=GP+1ZcQ?2/OW(3HDK`fIiRo3SCPBFU@aRCeh=p&5$P5V_4RnKu-h9V)]:Pe.>%ARU%+ijU1bM[&+N1
%V:Z:&ld\S>RZXt.'&+bLU'%#-#+u.XqHf\.@;)r$?]j>Q[dO$\%t&q`lciD5Y5o#SjUMfl:q)bMK-M\EpY]FNJDF'6VpL]s@!PL`
%FCn1s6,-eai!pU%o#6A76Jh2KM\Vu2(l;Md^Y!_i>TlY^^*Kb=0Hl8]@'dk#%![PhJZ("4%"m5lX/3HHj01!U"#6ll"-X-K&0!,$
%ndHClH?#*f'J^5B!\(=?b;&St4^*e5!1U"N9QkhD<<@[_XG]N14LFQ.!!ph=UI+l/hB>\&UI#e%40BP)@8V'RPqX9Z(cRe/nG"7'
%?"I.0ZEZ&nf4SO[@/QG-WUc%h5NXG<>p%?3I71(O\YL^0U)D^LT)<_(Z\+Te&]a,Yn*22rI!F#_let_%1ZO>s51^V9IR)oi!ZWs*
%1_RFajr1N8c*53!;Ri&./b0(I=u,&o7&FV%r:sJoE#amMX$Z3#F/g?.]*f99s.ZB%d_f/%i/A%tci<JH^:E+OW79(mC'M0.X<an.
%V/h.K#='ARqI6K.d3h-K2oU*bQiuR1LfAOhLg,+0\V8YunsH6G6HO(Oc8?YN)UTI]o4tRlmM*[L"!YdL/c7RA$e#-3"fpB4A[*4o
%"]N*T?qOlfi3[LKSAC%l+NgZD:5Y9:9U$OYSh2J7FouWfX9V.u1PmtL_pGj2RnC!:J2>,e0!OfkaYj6[:b8etSPmau'/1;C_<-p3
%m_NF!W86(lo;q$722q_IK>E)ug!q=:Z<mL!jICnrK?XQFgj@cj7HZA1\\53^Ck/ptj`_;X+\ONLmAMrQ)sjH^M7j;nK@Wm>0f$L:
%DejG`[X[WBng'R2/2[HiF#$:3@_l=<I.4E\_4%d'"k29b54>ttGiOf/N94@K$!tIuX"c[]`c?6'F*@]ScLUr*H/3O08I^S1a_[rj
%4-^D(!ODOY]^^o6C/M[c249iegtQMq1G6jh_]`+9^pRrMEnE;#b>mV`N5G,%28@:L2B/9+9WO)s3uo_P\(Q2:(@/LTAe+MlJNB%g
%$AqQ%:*+dhoD!u&,2G9dGh\CBe0hkH%iK;UnA@2_/iBtdeM6W/<C994.F]@nDqE2G^??<nWm74^!0;/#&O_VWF+\X1(j%sIiddG3
%e0ajs!=X.Ob'Vm0dDuDE?][R-pl*XlejOfh:/'0,O)X`Z:%BDS3>KUO&c+?k($5qQ8bnC!ajp'8eH^V:a@3eO"C2N"H=/Vlr*@g\
%_lPgj=IZ\`A=,B`,#>a%LtgdV53oP.\9J?l2%4J[+Q!QW3F,S+UYKrBkA8@&8t*)G0N=$R+L[Bn9`J#:hIO=9H!-1Sj$\c8@c:c:
%b;%')7D,J^RKJjEm_@d"B6i.9W`5QrPH1tFD23l;*aqH#9900q0j)M&Z?uM<h#e0Il,D+._s8XC4`Q-Vobi,OC/`DAR7o?oJrV7k
%m%hA/!BJA]?;Hk4Km5ghm=OV8r8<aqg88"dbTFOB+QlR(Z0fo[!e:u4N`JPYK.jR%/*AH(A:-Cq+lI/oSDtG)j40lb808AcHKQ"*
%%n1<2WP=<B-GIqPo"LMJ>?Z4GOf_N@?a$B3UL/4Uq7\0"3N',gXJB+i(3!HOhSH\gcY36-<t`'<XKd*)iO!,];9pCGc2Qd/pQX99
%:Wf8TA$",];LCIWDQUo)LjX&/Cuj/-n[['53LU=I$5H.#>^]a<P-rPFj5AN&aMi8jY",C*!!IIa\fN<,<<G3\!GQ<>Nh*0MkTJ'7
%EiK.LBbZ(r%D^-8Y?>Sd!&;ZnC][NEJG$cRF"N4/eQCB*.];k[MQSeP(7tQ*4\O2sAiTa7)hCI'nQqCP=DqD;9nEmGKJ<F7^=NPF
%l26<@<%lI9Z!M9Pn"nqb&`u<"IVq-bQQ.2JW:"/9DD,/";(c4\:=ghnWT/*s"*qT&V!H@kP@*c[YmA'M[SW]oj4@NnGfK7OO[*Gu
%%mbcfLB3Rk>hGP*MkJmPO9"j&f;El(R#=8?[M?itZ)k(Z/F^q0oW2V,Z`-B7c\HYdMj`aqP%Zr.I4p=253ig@.(9Is$p`)J[o&)4
%R<37c=Vc"Y#8HIN!PU%8<cQd4G.isc>JgGFjr.1Y1O4B>bXsOdF.o*EWPl#UHRAA[ZfQ_GL17`3S354Z:VhTRXPQ6]SjrXG1R,/D
%U4H#Kf^meUKjOlP<m";>V;,mr0a,5hhsh1RZ1H+HAs3f]]u_nc>V$\>>5,/:U73T\=YH_niLUb&*$E\9Q(6ekZJglr`8:6#1upnA
%(0OP1L4Vd@)b+lp/i#=jOb177W[MBu_5:7-H%C$"ajs?^lNW2JL]H.W]ZAi7S8?BN2glkNHBQI*;SC9%X_h+d#Ce)T;R9JAhkAN$
%HbD6O$dW?tPap'Vq^oM;fSetD";b]R,IS2U%:$Slh:cC<(J2)I2:#^q,%Q:H]k3OMXK(bJCV:];l?`n`gNffr4o#1HMe-Whk8!=a
%05J,4)l#\hR"g#Jh<NRob!i/F5Kao(Mt1pMo)4rVDhG]0g_OX-WX/0(cNqo89:C]P-ZXlPWJ8,['Ak9C_hh4d38DTY0aKXHPZ83$
%VY\(@ls%#s\Nmmp`p'Q"XEPN#d(C9*.WU/P`$W!bT:*!T@tX/[Ad%Qj'i&/:@7J&bTS`9/EQf"7^3^aL$.h,Ai+tsC$^L\eAd.ha
%kt)gu6ZG+,^BR!-9!U@#P:X<-AIVppL?gkh6M!Z"JYtT1ag'T48"ZPRCiK/lWuC`aiT_#BX0KAu!Wd8q"2-Mr.M8*m<l_$s:k^##
%RW!,l!,g@D-s;OdH'T_tfGpaN^^^cH[[##So\/s#$tBb`I.B!/(b&coiT,t1I$1j_*0<J,amW?TlFtmprT5s9<6^W[Y#B<*`<ic.
%O[dTN-GANUZ_>.TXjPOjV^SUdL\P?+>*NY-doEU9LX"&?5#N"D!I_`&G+I6cPQQj]]<*)N>e'BQDD!j':\'N3^<s)_4?QdB^("F$
%dRg`Zq#k0*<nANm*JQ2sk$-oF/0DX.hQPE$T?F*Hrd)2ob--/Bcu+/^;dAU)VgZld('ts>_0+&6\LnJV"fSpN2k$0+gMfI4P,i3W
%]f+Z1@b)='%<0lIYDZ5GjaQR_f0pl8ZIM7[Or_D1Zc!5m\?[D8/X!A3PZ4KKoLb%S"qCH)N(+m+EUk5"nGr!a*_q,oh"`%-8(mj`
%CPF(HS1'&1:7S;%X>\b80-S2)Kb]YVdI,2aaF8#+2;TC+n2*U7,8bfU:n,o;#OF]>FUi3\>2P1#LO%9/F>su#orNt^p7ZF.BhdtD
%HJ]%gE$a%]>\2dnn%nO;M:/2d(6Uk]pKuiDaXdV/q/OK2S9X'6-dG_MnbF8`i_>VSQlr#=ZB1A4El]Pt2>EH]Ok]PA1upXh`9.\D
%^L"j2RXD:ZRObdm%U!!K24H'l\)lEan0selK3Pq2K]O^ATofnlbIR1P%^Y"e&7!HhN.jWcS.&=6Z*kNkjTKL21@f5in,(QBs!&n&
%]]p:T\M&.ICgO'h#XTYoaN#2+YDi=d3ViU<^uo<?ZY;#?2<)'3Zr2Si9AOT)-$G[8MQ'LKAUNBkhdbZH*fJ$!*,Eg2%ci9&$j2e6
%!#A<@%JDr56q\ha2n,+*[ErC1.LP0K$Wkb7_A5dXYUCMiU@^%%*>ZBVd6nY^Vr%+!J=&T<0Cl6BfN`E4A_Zs:S8[o[SO`r:V/)b.
%Ufp2Q8I/SU86[XeYcMqKM/<W+?`]1BR)uP@8=%b+@4Z5$o=FbB&;B"*.NI$cBT,mC0F2H^>pC:^>,fA@fP2pamqIDG5AMR=`ldAV
%OhA`QQfSBZ5maSnd_PWp/rPJPMf+U72BVp)5P+)`)2qb=GA[+,*j&p+ra"7a*M1X90j<-`gGZnicaP[+"eO;LC5(Vo!a1FY087;4
%V^MX)T\o?ReL*\YQ#U(KDMuOLQbqB)X)4XB:MTA9/Sgbk)h*j'2:/-Pf(!N?/'J<ZfK.$r02C6HRN-.9d2"WXYs[E5l.akKd5hJA
%)J^;+_rE\#KGK8!oQ(t"J#o85hValc-?41s)Ap)b6t;Zs;FJ2U%(;4Gc_"R$V8JLt.FYc2_4u,]`\^j<C"hROcWZ*<WF_BuNFe0+
%Fcjg&EgN<Qk1II3dN?-IM5V5HGb$eeR2(D#X]i_gD>5\(XWoM_[SkjN*M1d=0j<-`gGZnicaTVV\Gm_Sj&oeO[r<Q=GSp(SntNVH
%g1StI:@L/QqDL6V[#VtI/8?-'_im!'KGH)u]/KR.&&1+pH0UmhCg]@@60Gu6YmRKQHo%?[F\"+E\i/=ZO4Fo1N^[e0Fa0AFXL,'?
%[Vbe&*du_>Kq`<H)]7%[g`fL\d.u]KiNms`-!\/gbOfXfn7Whnl$_BqNMXP!D"%]^9?"AWA)?8)nI-$g>Oj8Q'p_8M&6M3iIo0A-
%(N.@h<M".n&$aoebdItq`M7Pa`\LWMa;pl-i%\E:9^(19HT^j?_'"WfQZYPt+HH`iWq0HRMqT_G3o1'c`RVUNLSiS(SIIKX`k\7(
%7(&R>Fk@+1eRY]2;PA"Vm'56e'=g9e^9*r4JX'>4r(0Q5S[>b73,)kSjna/U(7S;;TJL&Z*S4eB*K-=4f<Jq)a7$9QVe:E:+.nlU
%)kqo/,*ABdc8I%V3$BsPM#%0/K.n`q1_Q6tqmNpmX_*8Z4DSeLg#62E30gpU0(%BXqcRc)]p0]s3kBn4?q#MB8l1-7WcS!M%K]u9
%L\]SefsWVRnRrqoWICsdU^g1qUFRosB'J#Op39cs`NPkR)qDprVM-7,qLW)'jf1r#O0.PJ96;c\%@1%7afDM;40EEO>:`Fd;X'8U
%Tl2+@Y^EK`%teLAmVW-DQF,\39fXIWF0;Q&ioHjQ6?7jTQ>h6[DM*YD1n_Y=[^D*?Me-e1-ll>tf0YP;h?-s=TTe_rV[\ST!>'OS
%2YKfaJ"Ecq[YAQUfr:u_ii\QV_.C#2=>e3&XR4s*cPDjpI\d_c4_pJ"Q*eG?Dt"KCG%pWu$8nA09cDql9^bZdn5kFE8m<+cEr3;R
%33?eHMG@=/>';ll/P`.EQCE)8p&/,U@!]'aWGR/*>i8P'nnK0OQiS>@ZAGU'=YPrmPhJ('_.WEjO@'FN9<lMR2u&Ue.i!7;`B?D1
%1PIH(HtQoP'O-,TYBLbOab%Ca.teYQKQp]>Ro9-<2Ya@["U_qY9;T[12Y]0BUCH29OPf)^3UTipGhXk$[i/>@d#4rQ=G:.N!"(ga
%DZH2ORQ&TZl5Np8poId*$GC4J994"*n5ZKiPhS(VpA"D(,/*QAm<8qJC3/"m]VqQ@3h<lHf:.P1,Kgjd<iRjN1O&e'0s09V?#Nqf
%V%L2W,gm^o@bIi<]'h[&-hPZ(pE/j1Tb-C?ErcHWdQ,.t[4Todj1!+2RK5E%@;X'ZfR/TO8ZIJ2hb;ZIdqG"k)eG!m2DDl0#_s>J
%A)Tj&Qg3,NW*h7.o<C'?2O_spWFIWr?ECS43]pum;e]*26S#XnpSSM'S[2Qfj%)!lE<))8#Au2l8GV@O;IVNNO_CVc:G%k.G1%.q
%<>/b>#GAL=HYft+Ai)BA\p!WcRp;8WZ+JN(Q<PI:L2fso,%DNOk+hiZU'WL!jsmg9G3s+M=Z$:rG*THKH>I#J9k^h1%Fr$A54,Vs
%,dnAoe'opG%8a$([[(BE..^)Gl-LSW9;Po]BoC=&<M6KGa\9<<(S>O;hn"_BWG5*!%HT`:o9Eh?J\)Dj-h)QO\%E)mo!RB@YYD:o
%>>)N@*Oj""eQ2+Z+)^JS@q3E[h-Nen^NS@(oaU^[54Opdo-.9%]7l*t4;IHX`Nl(mH*+.?4k44:/[KAl`FZF[<pf&'N`t!K=(?Y[
%HF-AB\@0iYX"MJ*PW&",Cd8U,?foHKca[pVRft>b=neAQ>YFEeBX)4c"Vj&B[C/r@=A"37l&ZO!hnm%D_J\mQi+B0+"_o/?bgs;l
%"GPM7BXWi9CdbG&G3s+NBse;4YZu#mp"7[sS'kiDQG/p(DpA9KZo@5=bZtHYFGEOreiDu<9[kb?"mCD:Wf\ad,jX0(*B($#JQ_`h
%;@V8qZ%WBdV.hO3[F=lP$%V4rDZ_*sA-!7p6_7m!4O!Nt)?>nJkfElK>ml+67B7hM%=i+2b8*_i!)YeY7+XcX@GuX"XKeBEK%[rl
%?GJ/%*'_lm,equ;^9;\[a/+2tbA>p(><H(Z?lF'eD7C'O'=b-N=IIsPOnX*&IPl6TH``K<7+8sH#Y3CN\N&Ar1/Zn3=$OH_3rE0@
%=seH1j=MFUZblK[7^W]_iUIjL6H`Q0De"PmpZofY&;d[jq?i/MAbaR0,]A(MHF?pp9L$:T9);j(/`Z^tr"]rIW\>2bG?e>Y*N%1m
%;JKs7>pDF)ZF4LCHu:j)>+f!084dA7V<Z-)Al!=<OZ7u[c2)]k*P6Kl/N0XV5huZKgKAi=D6Ue'e<K7PRJ5?Yj36ZU]\8DuN1EsM
%Q%=T$>ZcW(`^*[+MO*d\,CYPB.odG@HaT,ag1$LPZa!E7QK]:oHVAUR2CEb@*T#XZ=1:MYL03LI\MssIS.G2%fOAD/nk,I2KPTg1
%jncE_%]@jYd',(AVQ"-^EbSBOdV?>'DlW9f.c<a%Y_8QMD`2Y=j?qe1?!rK[(ikpC%rE1L6r%Y2>>+(lS\2pReI3j_`3gWCA+M91
%UT#]m[8ZeO^/^-_G3^ikqb%Ybfq)%"Z[;c&/Y$??R]W/,a87dVp.]C$>0RDV>=.&p]YcaJE=-Ef=PbpcpTeOQ$S!a=8\&SdI&l53
%fRAU$l*Kc6Ua@$q[XF@I<7fFN@FJs+aLBR"mGo<m'4k<\Z;O?Q:>\"rFOK55V"<6#)_>3n9bB8"JJ]khCR"Mhb5%8j*RupUCEmcf
%BH;^sWf=GaVCeCf8<qTNPhEKBp3=OSfBr"Q35I+=Hrhu1%<r=&bdQ-Z"tj<[c@.A*\i/=ZO4FnFZp[H%,Be<@)^&!]ehYu<r#Up1
%$Z\LPD@SJ)0Fggm["5`3>qr*lM:lOJq&suWR;Em\Mb!(M9N$_KNOcq_2gC8s/*"6"r#QBlD;5@E)]7%ki\j&i_EL5AfBBXDaqVEF
%_EMqk^mN-q7d9D!+c/gLQ&/ccnX]_,a*/:_HI-1`X?b$,R+/4:g[L#[/>WD-8?-sG#"-V3D5I&uRQ:N!/aM+[l4GoNhCCT\WD,1\
%DH6L4?Sf-GnQ)%!*]oZ-`tu:ToEstcY1*o[AX9KYAW'(E(sG`a8K4hMj#6KsBN`MpgMhL%R]X7XL$r1^G-='$%-3`aApma6abkLY
%e^++iTe4a&Yqrp0(t2O?QodG%#*7-*Y_ITufp_VZFIk,U*f>e]b^J*ZGkW@MH/Ss7E&dB`93)%bFjeC&>AKY0Og)g#Pq%`RS?K'=
%*N",$<2n8#Z#:oU0kopR6n8AJeJE/7Y6s@(GKqsIJt+BM."ig.<e(3EK>)E#/[]G-mVlmB$M6N[j4[2lOei7b--8b2I62l'G$>:N
%HD>p>!QohsQ!gqo#5?lO<4;k];S.*1fJZq?Q?g0Pdr/L0DW=&sZ;M.^gT?,ERqs"^2(,SN\cE/C:/u`s"LoCQdfCEB5SoKi<7amt
%@^BeRe<:Nr:?\s"/.nYVQAU)PEK<gTX]C=#m7u=Ae/^0t96[i9maV#OD%`@eBM7aHfjM.$!q`q=AaT76S)7ZgRVF;/\)[58bR^#@
%iS8Od!=H*Alp)!h9fJGmpBE<IekD',WbZ8$@^BeNZn#Et4/L!KVK,_+C8na^BAR.q<b4p86#W^9l_/]Y)'GXgq!KgU$a)c$K=k)*
%;.6Ner2qX/iO#$gb,<XV[`T(mBlR2-RW<g\I6[%(MLDbj27]E38R?uP=4kLPK:kPdIccV"$dr,ph`'Q(R']bF8R=`#-$Pa-Um[L:
%>,H'\lnS$DCYZA*5/4qX:"S%$3F/u2LKhf8eeiF+B%of/imBdk'AqU!QodF4Mf5t)RG>34pNUpVor]>QEL%,A@>g_JdJ*Z/IH_2Y
%A(9s_Sp&[hd$le=)]LnCa'`re`nGAP*k/s1ZriaO[?:3.Gj@b]r_aEJBOJKKE1X,CK8:mR:o?'+&I_th8EafVd'XIoGdNLIpigR"
%GBb#2XO=D?fsVLeGdsA'#qsg\U';k^4LWSGn1hgW1]HZ*`0u!Y9C,hqZ"OjUA_l:DD<*:7ggEu?Ur;&t0^l6=Mn_875C@JLGOFe[
%n%SVJbE!`PIs<?5DdNJ3br^XWr:lK5]R0DDme&M/KcK9J*X8hnaUB&-oH,shr;igjB0@(0c[Y)<s+C=KG67d.k`<J@rp.<na);go
%cbG2s*qa)cB]Dao)OnJss,lt5Onn["!fHgKN*H'Ir1rl%/[K\%jl?tr`C5e4_L+Zf#M!ItFpSY>pd6a\\3\uXZ+oMW05J*O%sGng
%R<VO/0;c"$WU(kEdEQ*,MdQ:9=7F'co(ElH30P=&<m](Z8$,eYj'mlRT5]JlW`W8+.Yk,[Dh%"`)^A@Ed:@A=P&9"Sdr/'b&pO(\
%Lc^NepBUeSIcd[:Q@d]uP+Oe5kjdZ\8]3s@VOJ.T.Pr#hh!\;Dd\3"J>9SN/DM4[3<2,N(fapl,:I?sF7b7'3?e&RbmA"Vf58gZ+
%Wj4CuQHt:b5t7'gD+NLh_+NM=P9K?FIQjV8VS(j<DnMs%?Wt(TDjk>;Sc%S<[7om.45I,u!2?6]d5J/oA't*-CPN]Q1ts+r\@'eQ
%BYlC&B?]CM-6JJW>#!\Am17m7&8_'s(F*OsWsU>YS$B.rh)te=cJd]0'>J)5OGUg*5GGir=Ka+J6_3:YYht0Ra4BN_4(YXV3o4W*
%N-bH$1ueqML1WZX7)SD/3:,FT`V*/r@@rca<`M.Om5Ac=V"SBTZFM-(1\`J?G>Et'ZhX>f'0f8>"M)g%!j$n9d-#*r"Ah:A&Ccb5
%F:&t]e'\lbC-2QcZIGnTmc:Z^_e6$]C>jonL=Er]><XtkDhMLEmdA1.G8<D-aTR].YBHRC9\6ItmBjdf%eS5i%V1E5lkW.!fIcr$
%CBl=[XXU;c+/d]>Z:SY.FUmEmO`"fH.EH2.\dccp*N54X4W38)io_\'!h&^r#O9\5h#+S/%XU96KqNm:>J!<q-2DG7DH5V0C0B(e
%R5Uq.nZ$?\Wg4Sf)c?hW9s'!h$,K6hh30#M/:N&29d$cKm6LMDbeO"p:,hP,5i%?t+4JeuJNU7RUOP+DTL-SuWqC04XVP!/Qtef2
%[CGjif&BS(-"bk7>g;\og4;l6h%QIH*"IFt*N3Jn(S$tl?iSh/K=r;(UL$0^Xkf_IOuPBg[i00B[B/Yn3u_,!.b;,g1:>l@foXpS
%EQdL!jPCA_7fR06G8<D-8I4lt6BLM\a+^2Z0-0mOm=i=a(#+Jf>GBA[;,YMRBo$ZE+02AP<S'K.@qsOB9A].U8QdR9%B4cD[sW'a
%md7eZ#bD6?BCYRlj+7'\:AS`]<F>dYl%ZkdQo@JWX/s<SRCsIiqH%G8.`dk7]Wne`CM%k&*4f1849Mr?J$i=CJuT]bpI\M-HNR*D
%\9ejAS]/WF%0Gh9dpJ<<qte?.+m_q<]WqBn@^B$u:1QPi'Xn+)e[Vob23QD?<m%7B;0[mt<sD`j!ii\m<*dW5XhJE.Isf,Yio@ZB
%[Cn#m]>cC!OP(XSKDA58Z@902pq2GTju+LL[up<"+FOnnhaC9m!Z.*I:&OY<_s%X?U*OM-CBu5&(>ap)DL,GML@)inn_gD6VChQM
%;KKXRg;g%t($`pS2gnt'?9<MfLo.$9C^h,4blVBWmBb5?5DJP,U]!bWgY'#pF\T6Cp2Ofu`#;CmS'J/^2k<*'>J]VW[BnC0/fTSW
%qHrqVDKMmI<U.$:@QLoRWmoRHBpX>gR8'/iE7tGHW^U"58n\8lSJXT$.)WZ$4'Q"*Z>gk"phAE'[XKc325:&chSc]u`ti2:S'Ka.
%fW%*8;VgD;W9\9.C!\=L"dqiZG-g'c^\+AV.NESVF6i`"FY[$P;sS9%2B,`R>WntlVfC54R=d36f3VK^h/*j$`>LVJX<68!iE5#H
%C:i0-Ypp`oC*0?SiDb:RDYgr-I'-SKV<r*,8_lkp[$n8aD#NS+$:juWQF=-%L0bUT<F$>PUN!56c(!"],[[3`FF(D'a.e%3epOZn
%rC5b5q-N*2P:<$AHuIbA'i#2=UeTVfD*3hnFk/m=a)RunBf]HMO0hbDX_)B1><f!e_U8@9fQO^Rd&Y$_^2@XHCS.K+_HBn.Y-Y$0
%6>DOgMJ9NCjc+t++7hrR<I_gLH<!UtJ`^%Q<n1*Mf=DQr/SUK'QJ>Z,B3ISq%r:r+5ZR+ub1QF75#o5HD0h"mrD"XfaAi&L;+\=K
%8ETH\9g;^"0<ftqN`Hs#5ZQhM;Yuh?lH#p+FhOcLVPC7r]W*3W>&Dh[)ju8L2]Z2G[>nR^KB*4s8FECrE4,JX5P`5L^DN8dVg,]s
%/#dCSY("q;,rW-LZ@PT\0=uBYK1WbCm5mRG0Iu`V?\.[b5qX>Am&_iV#K?4FlOL"5fS*d_,<agcl/C?TIGHj2_sMLU-`u\JZ@VO0
%6kX%VYI`;/?;E>C=cQ(b$d"2%Ou#Z"?5)__b/><.jf/s,"'Ac7mP(&5^SuLf!]1ae^#"3a!:Rof%K)63]Zrt/Dm[!MJE,LC`i:t&
%#cW$B1Vu8NQ<);&NuKDsRYTdP16b43Dnq/LdJJCc6lEJB-1?!s1+Ck)H3dHmYaLH6!'\Y6hidE#!>j=7,u.SYlln*\C.*g6q\;&[
%i0WckZiT,rA(X>fW1SDTp\h$hYc67%ALuT9KY%JY'=K%bQNX/^e9&Wt*.[I>6sDF[a;nRh39)kp?#g'j^o%WO#Q<GA^ILJ\0I;-5
%E^TI7i>QEGFjbA`,-^WFDJJoN=PSkQ<HqXUXP`'VYAp,O*lK"7>(rb.WR1u0h3oe2P;8A'^$n#o/#?Kd$/-'*ldJ*"DMbBP\sbEE
%('A?`-5ZlcQE82/`E3Z)H/!MYe5"a'dlT/#f$4IHUi!]XB@;<q>-[>G5d(X(T+TgWm/+?aBsID4/_-`(<uB1;'E6@WO]MBRO).9Z
%'hR05&O/eX=P\_uJZ9V;1fZ2'7@T-NqZ^j#Yc9:gI:%>DeJK)I%A]Z*[acA6R]>Ps85g0krnT`n*3mEH2I%1MUAG[?gDd3(l![)P
%nPNn@CDBS:dp>c)V\Ro()ob1.f.$0.k+fYUXYD5,[-UCO2=*$d@A?js5$I's@c#S>Vg"s&XEbQV0DBRZ4%&>fh"7XNVG5*)3OCq*
%*RaZ!6tHH6;;!X7calD4XCBZ7Oes+4e4OXX\*rY*.q^T+qF@@71M=.d+;95AYiY;E-4OOEHDL1&$H%,<eue(#K;1I6%0LD%L<kTa
%,AKio#%f\NF[oof.^W6U&(R#`>!,i0"M<:.G\h,``\?E@mU=IuOgT)En=`m/5Spo#Z+?D7G4]W/RX)N)7VNlN"+cjI@U8E2TTdku
%g[=mgX=>=[:"X,Elh$P(0'n_h#om[$%\^/PjK`?%Kf(t1E,IpGhqF)L-i':4WES/;1uUu8R\ji3Bgf@f*>*V4]X0OXif&pf7*EUX
%CR@$>m>..D]q1Fc3MV#Smi(TCp0a]8L>#BM?!GppDj`GVIalQgd!Rq5gtb,14r!)3.#jA_<*23pUCl6oc]`rMVP75p*icLNo_2k$
%0]ID>G?p@ZUH91V0d(dX>,p7XR?#&5=Xk&lR#+bA!gCKNcc*ck:PYLeFE\S4KD58%&'':q!MfOe8hIWf+89!-2.VbAOnk[!-eTT*
%LUAd_+MEr(!-=2kGA3iJM`@khJ(T$9mGrT3m2L;*&,;6I7"bbqUOgbbgWe(LfDlJ8qPr=?$rD`:QFn-H`>G=cqYS1U$bU9I6UT!E
%7Pfk%4:m!f`2+H!SpUK:]5M;oQQ<O)qK'f,q>8(dI(hZNXmCTj5&rgSpJ;of=q"jZ,K!i#J;4ScNcQTQ4gVjtipN6@fM'[-]3*$A
%!d[5HSH4fI$6u2&+lD=bBZ;Ic0ldtW],ffZ#T4i$RgG:4!#GGmDIm2mPSjW]"qcEKF8h77s-OlaoQLLgOg76r"MVlLPX1Gheof`p
%o_(dUje6:&3sF>/_SAJVfMM`toDu;k&U/HW'TXe7)g`?.BR/.m=_1u&oVNM+WFa6qpUmt!gPq?9*5@VgplH`rQo-t2H:QP+-i4Dn
%"/i,KhDMr-N*WfG>e.nVae@8\J9AHnfa"Z1fPp*SDB/$3`h+;b]Q^8Arf*u+E!s5WjH'+UaY%Mhl<OeHL3;W@%+Y2]%bg8D>\F%h
%)EJFV9u`To"7:n*8Pe;,\`_'_;j\e$T![TGC1IaYRU6P.CCJhl-R%Zoc[.DUf&FWkDsr=d8Gi*]6;D$KeLu8iW/j$i,?WVt;msX>
%!Uou;pMRco2rK/BhT=Q6"7F21pVVOY@DMiU]lU_+pY:f3mY:i;_k-aFbl'BVIN!/i%_*Sch!`uZRJUR2rA*;[*cO=S\DOc>0)*P\
%qdmSA4Q(\FF2*[EO#QUr(!e_b4<rB4dQN#:'pZYR5fL^U4r]$h5fJFM<EpB>\2[;t,?Pe]\32"uWAli`EIOS,7PHbtEpau#(C"%q
%%Q)lF('[t1liDop!Jl@/#_N-`K)t2j]2ZtaJXZ04Pr=6)JY)04+:SMt%0dpb"s=B[TPs:872H/c/e4-"#SmW%ma;+aK)mBQ!Q]lo
%aFaNWgY:u(0[b)`T[uZ;0[b)lf1e?gJZ][W2Mu>Oaobq90@b2jT^,dOeQ*U(nj(go#rtf5`IY0b"2-UE`IY1MpZT1Ncuj1Ih15NC
%0E?NJBC!,kcugqg0Go<o(kB?696FM[kdiUtCElq$kdl3CdU3('?i]1o!9.AdqY&4cFa9YG>,6Et!-p6uI=%=G\iA&ZBqX'IYW1!P
%r;]gAPXi<&UMiU_BV^=X((F8D-sW`md\Ke(V2^"+qo_9`L+*Td`=\t$_A!3AqA'N=).4p=9R2:?%l!Z.Y(BT9qI\Ia/%/$t*!"@!
%,S"t@\maZE_l0k@,j"GJG/a.?!GGm!2BW-H7WFWq%aF/#8R2UK6:YAJ-tZ<;C#F,O8bG:RWHh;)aMf)YfPs]%*g<%A&5q\::MYYI
%k)YfkZ$gt!#5[90A`WQIUK1X;?8`%]a5Tpt_"o-@@,4(W+*.HQ;6s-TVNoh1UUH4VZpOYW^GLg'NT(q[fR=aH<Qs5hDBEpQ7WFi%
%M`]&Z1lD0\5V'Bj0;\iuA)W,BEmkOC\T&b&Nu@Sb@*$D*D^G/,W9kVM<cT:gIRfNQOlP.fm\`odjXcE;pG$/tjCn!cge$q3;;Ad-
%XlLu"X[+Xk4m"A7bQQZWq)%&IaUKJ8X&UhT53?0gN.k%P\9Autq;'C57g+nN_3$gb0c<07i$r[t`TtCu;HH=5O$'@HRsW'3?D8N9
%O("b/4j%#sI:/n2J<t[\h#*[j>ihR@6%d#b:q-N9[n#Gu8CAPN)Bak=,]SkjNKL:PhnTQRn7KVB!Q1d]nCW3+?r[&Q#R2D1(mb%C
%fPWAsIP;$PQlD".I=YQ\(`P[VLCq`>#3XifU`0c(*t6*ok!nC;6Y/R/_#U>1BFI.G0L5Adh;VgmdU4auYW*Jmqk?`'0L0>+(aE-&
%%+)[RPW0SS1`2/`/<0pJLWUrE'6'mrXc4pb6lj(scpHXH::E**r!8?&+`[ZYI>^/jf3h2q9Q>_7%P[Q-m^6<C]P5I#+o=b,le=7,
%QfbiS6(UaG.:1soq80=USV"S(aQFtdb@Pl8oPNGB0Q#EBnJ9^\Ap(j.Zj57W&:u4PlfjaP(U195bX;_!^XHU?H+e\-kIi]G\l^@>
%f^Zc><1qd&iC[Ig<*NV1OMp5L7RDBA#U=j,oO[uKHXPTI;oY8VJaVd3I5[,@2J?hC7!Rf/+E#*,e)KW8FJNgOEbf.>%FN=l27^#)
%%belc%>T9sg0r;n'&W3Dn$9#8*-JbE;s?nUF.r-+i\:0Y5EUqNgCg]Dda^+T?(!SV[bpIC*:WRSe)`,36pP&_Ed$/>)6:Np=`%"?
%04^f\2BV%b:eU/`JCQRJZ-P!hqD*:sF,1?bEaP]AEmp"(H"csWP%Zt"k%CK9Jp1S:*<UrI0RJ:<C3AXULbF1E8s]mQIGRNSY)p89
%;g_^.q_C=>UB*?,T2og%q]LD['Qo]\>#T'FL:>]7OfT#7@%5pgfT^VRDI:D4&*qq;mE5K8S0&CC^.:cY[OZ!r;:/Z!Po[8V/'*H*
%bu[h]2"6SS>o=kZV+j0l,dJp5$@P?qrfH48ANE-_N'DrUrORLH6IUkE>luki\[0bb6GO.6ZJY;[02r6V:/tf"j^qku@XMS1qD(-I
%#8?5.L71`nOXs.:W58;kUm'\</Zc^NY@`^C2-".Y>I2:V'd$JFH!jD>"k4NsqR4>N3;PBnSUFjkX(>:+kKM&>P1F6M3FMQ:@+][H
%qgC=DBV(N8CnC<2`#t3=;q#aphbc8hi<<gc0/CcY)-9TL4]&m./VD`<M'6=F<+iT1D@9F,6tl906s%/TOG>*j0=)n.lc+X5b"h_*
%O"L7P"8B4X0rQcHAhu^U_k&71n#N"PJi30dqD)f4gaCt5msFn#9Y\@ufo'9uak!;]k_*h?ZE8[m;J7a'if2o$QE"_)MYf/o/<R<Q
%e^,+/X5a4`mu-gKp0G5Q2VAD2AH"F=5oIn1E;]QQU+Np8AR`Pn<en%Hi5au,1CmI%#1c+B_U.'cjkK5cg'5d8^_jUurTJs72+=MS
%V,i?9EAL#6hJEX"><mHiZ46XcX^*h'T'c86!XCO@!pbJfEu=4Jl*L5'\>Zj8<e4BrL;VN$I;Z/$K2mg1E&Y3JG%DA[[:-+PMl/5W
%e(XQZ9Qh>s<i954d^6nhgJhHr-B$h"Z)00aD=EFhN/b?]N#48"_R+$,qq[:L!TPgeD[%t2pH'pLRnHj:6eFh9>+)I/R\e0XMd]F6
%eC(r\:e_B6[?9_$QSJ*n+gLLZm)\P)EhS>r(WV_K#<g&.NFQI82N4=HEMbC!D4%+.h3Pd6id45]q_C=:UCk#OhDn#+VKLpH]k+,K
%qO1[?2Kcg)@']0TZ[-O]m`SSq6NqC=NU4fd7J";'k_o)/p>*:'kS\&+ZPd%3&T+8QZ[1?!YQf6Sc)NK$6`tNB@_Jh&AStnGF<t*`
%qEF04bB.h93.HJ_FQnD+b?&H]e\J&N3*"e(("Dr_04^%ZVabi%?`&gMhD\tnR2rPb$.FVIg<'("LLqXnXDO,7ZSH#J>dm33_oS)+
%b>bJ[Ge\:mARt29(8ah'g[@3".d\%T+t`+5M<Ia)"[n0PV8:k,/U2]38l&sXm-Mj.9OjOH2`Q5R/Z!59/lQkYE_i`3Xc='P9RBpc
%,DFp>0k-TU=/UGW&oG_T^&dNBCoFH-?`;W^Hoik*4Df2/ct(;!:))/jD6Ne&Q(W;YZdUaZR<Ds.^*2dbFJRK*2#OD@"KchP9@=?\
%fmRJ*WE$3?B`IGDm.1=bh]D4=1q[52rY,"rCeX*t5,#TdmCmH2qcNJ%SbI!-T<Jk*T^7(&#54J$TrgYKNHLW?Z^jH(N:#:;f]S#n
%^HE!Lr@Z`q^N;R*_3$d6.h>L$h_t:?'*!UN/"[af4(kQ&`pW3lj`;ZAh]BcVS<rT7J&8YSK7\.K?QS"Z+)b^T,1Sp1VWJ'0JJ2#-
%BLhTU^!03eDs]<gfi1"Vs7YG8T*N?t*7in<g3@U%@9<)s)?5>*CL5rWT;/Pnp0Fu=GtBEd=ijk>kAK3a[Z,@VaIU5>HO1ZFnXh<*
%5L_=I-*`ID1tH&>0A3Eh57lBuFY3<nG@N;_hE#554,#?^mh:a_s$n@6#MTd$+F\<e,LXU10%h2U,bW\jFITCd$haQb+ln.$Ed%k?
%*hr*e9Am(WZ6*Tfl[hsY)?*a]RS3@Z/d^i$93I2PK$Cl"KCUClnu&_S+mSK"jWB]O+)6SqOtbHM6Z^@%deQ2PFu=$>?a<[TkmkTK
%SUYUVDS-ZJ,+81q/.21Mofp*=pT"gChL0eCmWUnmR=P+K;>\>k+9%(7Z@$`biVW(mDsc&L7h!?;Un8^*j#-f8c[S!'J(U8E)P8YA
%ZUI)O3P2>JeM7A=ZKLrdr[ao*i)%$#qW/K]n9/*++^],V\-H9nG^$s[%e^S/,uJa>P;Pmn4LIDHKaCg2dlL86e#9c*0Q@)*^)!-Q
%\A00$RD^Qi!V6(?5ju%F,f25p!a\LGZIHTgO,Ag31-nlse*;0&J6']p&Y`<e,^<KNQ:6?G@H(]#D@[;<s)S(sj0L\J5/)=BmcB3g
%++I%YTA[<FS7;E\n\9JEOX/k/a.M/B>ebUXrS=[7Isd*I5<]!Y.enMBs%LCP[:Bb2TPn]tb+&WlVHLaR8VIoFgq5V#269rX=o5YK
%(#oAhfk]9K)fnX&-k390^.i=D:BS<]l=a-3(hRQjU]1S[NP!?\,fK6M;$=I.m$Ap'd3P<A''r3t$Cp+O>i8i'Dmb.]j<aZ$AHQqm
%J?uYp-/]"KpIO"/V/KuG8&/iE1%m>5j`(X68bK`VVTrXETAuui%]Ig6&Pdcc)i]17Zd$RqBZXM:9sR[f6]=Ie.G>mqd>7O\16t>Y
%`4#"1?\>[n2D($'1"JdWke'O`m$66MUrle@foR6Ih.Bg<rhariJ+9[%A7Ml.?g+\i:5CpA=eP@c]FN?%YTW%19H!qXNu,D1kb<,Z
%DR>^BgoCr>6%q8s.aP1JJ1Gr6;-:Zt$B1iS"-mF0b>8G%85;!2;QEg4a/`=annp?cSnoMTS0fWM/L5uu9<7D2!sj=pL(f(_HTF>f
%Ada5iR?^m@N2kgC^>l"*!P72V(#9^3('81>ZGjm8Ls:*G$5QMrb1=(Y^.kHnb68SRn=ot`V#XV"?NR_gITEVe:9t.*r:<l(Y,MPA
%J<mE9f:qV`^mOA//_"D.TWX.BUn^@`c/';AQ(]9n4CM@QAFi%3]$RA7YGNVHDFT"\@*Ui7<+LtSjSjjk#4_kjl#sS<!_bUlV\uVl
%[$5p.Ad(+T$6MhLjq+n*5=[<kVE>6Jk&+3B\R&Eh5#+!IKIhr\TT4s4KtC#1.gg0%ZJLlnVqSq\qMrRFSs+?L01g_j3JB"fE_9#/
%&pDa+E\XR#7'bh.U1L)U9uRn9OP`:d=L&bN+699O!aa<Vr+-7@JDMRSk"=Dl]aMe.gOkudQ.=t%F!au^,giau/(iR+T:LO=0aa4C
%aV%V$g:7AfdS_%2=Tu#[iFq%ieppuaEQEbS:mEEVM3GBmH9cRt&SFMIKbqpX(7hH,O]]/V#=iR?$$u*@apIE$<8hhGb$*B:V6W$K
%"ib4rl?ubR:pggE.6B+cC'/O?Kl3bfA+hg7VaWK-m&QCTaPTTj2Q!-YV_gI=QJf0S'6KNs5WU%3fuf3'+s:$Y`K3ekJP0rOetNd$
%i)%8#e?UOX'V8?5WENuWZBu2jbTPqs?]5&Q(8]TIQ%Ds=(Xd+6bgEdo7(_0VBP!B0=($U-PS4XDkU5P9A5YuglC<`GOLTIKN8@@H
%<#Z:+Q45!P"&q**0J1t(8ePAJ.+oN3j\CO\2KR(GD'00lPuk9p;0F\Q,(nF5[>oG5]SD)8RC0gs[=4CjM;eD"0NBhYfoW20e;@[J
%j;@E%X.N'l[%j\n7I!5e@A8l>:SLNp:D&u+\#p,@FA#0UJ.>0a%CE9IYI&j9c.8dql-,YqXt4S3J5PJ5Xc:H%3C)L:NIhj3e?UnO
%X_\PqJq0\Ng!&I0I0-<XC"cQp0N4QkB*Bn623r6!5aVEKO0s19[;ALD_nMfC@D<Xq_(,#)H'FWe?o*e%i>cqn`e]%<=gFFf+R:0J
%p[/X@>0EFWN3u:q;%tl<<Zg#$k;=kD>!+i=Ck-/C$dG&!G,MS9@WOm[IW"J>,<Jh_<_4]Kl`0WQ^Hh#*)>*<I"s3<_E3lb0GSbN[
%'uDkS]]R$O4Q6s0bk;@fPm.oIXd;2/ijZ\CZb'i+cEOQG0nZ":gBs/'&_=PJbKEL?ENZ<TFm7Qc44UoR^)7`)W\#PM4$bHGB!GcX
%N]dTqc%h53`L#r[J,7]jDqk3Oqqq&=m8s7,"?<^5ku-Qhk;(eo?]Ts2-p;']`KqLP<S49dEjQntK!s;?=2D(%n7K8g:@-.Jpqm:,
%D/oNlT74<^h_*Sh/FTLm^9Er;gH;+Tntu-9di$(qkJ;Bi+X[,TVA.Y8Hk(e5cK]K9joOEZEC[EL(Ai^Q=Trb%Zu2C;&3gMiO)96X
%-H35QSo['?SSl0CpoY4lY;afeXcmI&J+_,.c_!"R""W^RZS8#jPo;cK47O!HUM6f+-#7VMKKBO6\aWH@>\I_$mUNabI1R3$??5b+
%03^fnrNQPKfsr."TY:--pt,eb2eqtEhX-%c(ieO6Yi]"(JPSpSj7huDF"`)I@6%;m=a=qe'Si[p%?8!hVY[sR^O84fFESrZDO4f1
%nHEJDPp9O%I8F'Rh<"n;7CP"3hfbtX]lHuRXq.h+M_!s&\f9$YDaBU+2Y`(KC27J0b'SH==u[+odmp+^9F\0VH>-(lf((;CpZ(lB
%;F[0!:"Ja]5J-NsfkX=oGGp>+='HNMcOdJ'mBa]6E+,T#[B7k'`HCZ.?a63do7hkG11!tPRo%^@$=E'CDH$j7M&_oKR1jqO_YAM3
%ce)_/Xgc7Yi((Fs=5eb3A]C_eV4l;B)n[#jG+B"e_2eV\e:_]7&S.G,d:h$l`05PmUSK_(Yh,P.\!l'Njtc0U$/#_mY#SiQdZDt`
%1_Z.R<AV?I<G>QF<]Y9<Nqs>WJN>]_i`1n)_*-4YUT*gOqXe8[HQKp\\*/Rqjk5ciA/%(VX]NPp_X1rfAb?b4!Sq>\@0I!pd"!I=
%k**[d(;e3*6B6AlB\/3I&E76nEIn(OGd<cfBhQ]CcOaWCWTI:b3<hA`)_P!_Za7IpNX`A?Th2a!ZH&<rH#&DrZk\n#$12p3rD11S
%p/eBqU'GU`qt@YYNPX)K*$H,fEr,C0+=d=mcUOW"d!HU)Y!cJ;aY5G4A];)t@5nCR2Q-rT$-cYMpG%@t@KiV24kO12fsBgSr8HL&
%lI@uKF/&b[GGAY^TRfPfh?nRpPp&O`@<n0Y;?Kb)+*#-1R7n-bX%seh9n",7haUTJXjc3+0^H:&1Q?!jpYo\(`iG8>E=V!\]]U'-
%dF]3b]b.S7,Q%4[[O*I]<"gm.Dt:cQIk]aMS=)?aD!%kUB=MOj\4PO:08_gRBgB8`UE3rnfJel65Q!J3f%=,<NYg>S$t7l+<p?V4
%8VVCU\8a$BB&3XR5[W;(SQF*Rk`'5V35mp\a('JD:3MVZLA#Vg3*me^,tj::3eY7r_XIMAL?J"L])?RHqN"umg],eIn)*^9n"=k8
%'kBA9k`>P<6-h`O)^2"!?_u3Z@8@$7qceo+M't;T]DP0;l-Zn;pl%^2>!=)^X$UMp]t2D]&\@]e1tgi3K*h.n&0@b5ZAmSkDK1_i
%$WFu_T4`MC&3e,>o[ZNF.Vcb/)(nD2d"KbC*oS0*Xk"Ain2UC_)^G3!/='3rL2M`hjC22I324TZ\jCPs2-r6$%ZMf9g:r%VHZNTF
%o=DUb)L0c)VKR1Ff=CUj?9BSCQ1`/ck`M3A%>QUP7qX4ClT)1+3b-*M5FUp1UYLPR%%nB]F0l8j7=1=d`UB-BA!D]MefJ+bA$C:F
%R,;%^j%AP,1b_FR\7Ic`&gnm2[=3J7^s(hTs'Q%Q*7'\s<"N2XUlQ[Sl1*LR!$3RgV\ko2q[nU,BT&\LE0@-gB#P1>khAiE#)mKT
%0R?FJV\TS&fii7O&?s'`2[H*FR;d54fs;u=:X&#g[Kn\p@TCM)-ut`&HIMs)O8m0g(X,N:N^H@Dm2=!ekfttl"8EF3XY!S*q:o\V
%<mILH^4SMtY&qtM`n(^cV_1pZ!j(?2Tbjha2>$e/j7okp5Rl[%'0@5CQO@H"E5Aa?ighf2DC0ei_bsbO1MjI<s2=IVR6oNR6<Mi?
%]*uN_J=_/XF]`(5V:BO>Cor?1HK#1!.^01#>%q`iZ#Ml8'N6gI$X.ZKh>69FIi1_I\@g$Z4GPiPjt7&%jUZOqqe**5O7<$7rWNcC
%XBSVd$hgBQCQ*o3cCss>cEO*Yg$mgdYc`Fhc=(!C_cJaKoT+DAQ]m8m!r@_'4I.u(@*YNd=Z!H@h$ru^LKk>6k"<c5gj+t-0cBLt
%%i+UHqL+"+o>k[^K4+5NmB-tU=$W&;K6rtoXUBT>)#O"S48jFG]4\`km6U:-BQo-G*iOb/[lpWg8MC^JrA!iNR4#Vn34e"E#P7(i
%oOq3'0l:O<'rg[QS8W#TaY7Z=$D4+qF$E_I4@1>FmLV$9#8[h].,45\II@.Pe;1WYnHjV1$l.*)Eq='cG^<'q[tL.gnRpLR3IGSF
%mIGt]>SA?jliq,7;Jc.l0uEU,_6m+m9c+>g0?47/kJ.;r"6`,33\E.@md^')bdUF9k/):_J384a0:Z5diKk(m#PZ7(I9dq2dQfT?
%*G7"Ce2KDO*oWk`a_fPt_>`eg'SjD>_EQ"5"(+-?N`?H/`=8!I)<3l\47E`@3(I*J"(J8?R5h<=7Z\iiN=`6*Z^/KTp(P2jFBq!J
%2st2G77>C3RKs"g1cCeI6J8tcK%S\!9Q6.-R^E71M7A20("pJTf2;a*>\O+B9Q1>-fr(qP"a"mg4C8c+8*`GK<Mga!g-9BVWl4DC
%4l]ZUU4s56]Ep)-BPA5>O@I&6\1ck%rUbKU]\-E[KZbO.rVT6,b>;R$3VO]ek0o,nGnZT4F'ZOtpZHg1)URG:On]mao>kQL>pZ.f
%p''EfobR9#m9R']834gG&'4<4HF=oVk1t=VPe-(=$T75:g%4O9h%ZE3,Pt?K$<lr?HuoC6K%GIB9=^+?Zdj!OcTf!M[%GURD_ZOn
%BNr;(i;3@8.6-3d$J4M-lZgk-d'.rmHO-35%;rsOgj(;I%_d4pEV5\`^@S/!$g8dM^gZurGK(\NKSY&EMg<TTS2BG1>4>@Ld<V[E
%9tCn:L^.?pGrT2ErI+t9A/QdGB'<s%6Jq"c'FQ'lT8uee]Ytps)tsAXc3<p7`jW:"5i6Cc=Pu50d*=fb!)2KE$m\iCb<1;&@L"gB
%,olA:#+.R;[:<f2@.5Bb-(C#0^oL-gF(J]9KJOTid4Bg5I;2,k\ZHr^>6CM*kcsA./ogVBoF\TUHW=d9W":K4LO'k&M>7%*Ldt"p
%[-hNPL#_&_h$j",+NAL`)bccq8A_h3J9YH:%d=WImYD\r+;pa_gkjMA2@9]_bd[m=6:f))90kEY^,64WDa0#kAf](th<M9AUK]bV
%\/)nQD0'\CmK1GJ7(^%s9WXpR"P4D$2U"-R^@@f!W7IDMa2)Aq03DE6$(#uDUsZYF#eGPkO3BgL?3JO?&JCH,%)`K_^dDrPUGo^b
%Z6CPRf;$kdo50N@YV47'mM5n=fWflg6PpWA[AkPF>ip#Eg@446LE</Xo6==H-2J4>Z-e,730@ksdFMOk&,bqL02/Cb=>9Kf#RCs%
%ra2V1'5oAHAqp:>/Ck>BZOZ!b*#oFXQ%N1Q1K9*OUS+*-DA8aHK6P`rrOu.]J4#l4b`K^eb_*/R.M'cJk);%&TqD(bn6LK4LTlbt
%H]"l5/NVG+^_;%.m>+]Zqk86.'Nd.UYi/mXq%'m[cG6Qgob!8/#V&ld?ko_r#9!t(2*P\g&/T--"kSRB*mm6D&2GHn&cK[QW"VMF
%/c21`JD)d9jXPDoGc]Ck;<)\dp[.VGdY+(>dtMab37B7oS+4*n$:i;BFKpoc(3d(*5$+("=^9"DQd,1<\sE`pSm5WR,^JbX0DZ=,
%o_?-$S?.Wg9,Qf?EfZPBq.tRT^HJ!-RMIQ4"#3iONI.+^%BTQLPArb?)eZKbj]ZSPHi!h6pZn3W'Y"A4IW2cA==[>E,CVj+!PfDd
%`LrNLp3?YfW^+tcdM"Qf(6&7IX%#SNa3Pne5h.2!,(c]o'c)]V_;XnS$0U($X*,RXY55R^)9_C/1Z6r.1trLN5uWlaKon+Z:+q<G
%&f?3pfPo#&(WOg`II.i;foi>J,Dc@+1#.ngJ""(I_5D:@QnotQM4sMJUPZMO?<ZIV\pQrDP,<UXjW[Fl(qT,[nuZo2J(3=KfWWJ?
%n<!:3M)QWk!-Y%+7]_.j`f3g)"-CK3_P>VGk[h-5!IqAAr4oWK<VqF9Q??%L*AiFkGaU^P"4<97P\D=49)"iGIMm0u\g;.UU-N8c
%f4U6CD<':`G&B)<5%E[T1Mi'1PV#)0r:t=;V&![+$&>Z?=psI\VmFS^@#b50WZ2oc4uSp7mSA]JfX-ftH9,jd+0B(UM7()C]F^i,
%6VdnR%cc>u@pWop?KVCH]K^G5GEJh6]2U\$f$u,'+,`WROSu>JeZDX2eC@$d&s@(d\3.sq=ibQ`WOm3"C1+Uq:ur`d;dp'5H+mkJ
%g"Hd>jpjcHYQOQdqYdmOLE"U)'CB,`H(Pe3!r&gp[R04L'%Vj\S$;BQkf47,f=?5c!'e]Z#/9cGcAI,AceaPIlPgnP@42"$`-isT
%Z5Teo'BV0NV8U's$rYdQGE&C5HB_I\VL!n?iWj)^btV7b_"H92j7B_$Tt*1(Y&Zs3Co^#o`I3L5mJ/p?_`\#_KA$X@\gKUjk`3*h
%W**S0@2E;g2G87.:k*itdZp55X8LgN&"_)?8bHct+9)U>j#-67H@?^j89Ts:6+:Kh?KtAu]F&gf0dBb,JBS%@FJf')d2IR<$j!G#
%lY8Ku^f<DQ*j_Sf*fsa8R0u_1o98*O!Ho#K5iHTfJg,h7q^am6%@r&3Wk<=U-?rm$.+5V,G=S_%Q9A==7(Y%mAOZ"#`NPpk,\kq6
%kHeqEr*Ukk1g!34p-tDu"6e.A*q1/K@6`Z`JFRor"fon4+kUEbHo'QY<%b2P?8I^#%rKHS8K."g2mmc.keMBAhPjrCd1\6B8EUSV
%3B-J[h$CBG)b:Va5Z#3%,C[:U&)[\g7#)$\f\OL#0X&sQX_8,,b@S%:"is[t:K<[?<s+@gQ8`&`Qbq:VP^cn+n-'Zu1bgK1iH=M0
%E444\(9XhLKcn8(m6,-!^d0%pA7j'mJs_[=HV"GT##IplRDC';4"63-`r`,"WTl=`!MP='<TUC-f4![9!1I"(]#s[=S@149s7WYD
%20c%d+)T3m&>u]7$\U2+m>ZDC@HH^^YD_A9?,&AumSCs^CUoRFmg$G@`fsW$`0[sc:Ef)?U?h/i+]:Uq&KW_?ZO%eL*kH;,`0gqn
%GjPO]i%gS8G^FEPEEsG62gLUF)>ehf:SS4AF.IC8[9^MNE8f,jjfXq:Kk\D`n,[M>Q]4Kc6FA72=Ha_2^UNSS^:pMXg?&S\9_4c@
%OI8(j3FpQ=2"AGE:80L\oRLg6iF#p:/aK%t?O-PL#\a:J5_A2I`KfoppoAImMpu=E-4(8'XKaGb&`*MX<!=a,nBN0[<q<X#B1`HT
%aFV%aPi2*f1%q^W)$*Zf;GfR,gj'VnYU@*Uc$%!1C-n_BB%IB>0m@R5KqYltN`,BXIcGfRXCaB_Rn'u/rYDdqiF$a;O`N@0%Mo;d
%:"]7V)ijC=*rK!h>2E@^Nd+s`E9E^8`5PQ]E`$#MJ0BlHei$:^h>GtZ`hGZ+9:lL]%E7M1!QkIaKGjZ;(t[n$b$'.\fP'%/k&E]#
%[`^pRU3#/AU"MN"&ApLgCZpllL82kDJEPJt2]H5ke:_TMm+4Qd*KLh,pncAV*T0[G$A6VH3;J5pJc/0s',P+\9JWDs0_QN?5M8;Y
%'6Qb]kMuO,51C*N.N"C\5>k7l:k`dq-ntD57T=E2%cOG(YL/o5,C5IS:]`)MD'e0L?[r+HIS?:uZWG!fZA(Rm`V=POKr"kWm.+0p
%2EW^ja;m<0B(s+u-b?o`-j8'?U%Z0AJ2>fEl>7S`1I-4O*g`\\HtKU)4A42'&MQV]RAVkaJ&7hC&Ia_Q^T?[2EIGLa_<K[_QH9b)
%7BJ86jhe$VQ%0c5KgEN-gmKllP.uWCin:2Nr4Ubk\7=BE>MLVuR4()J6TuseM+ItlkaQN(Eog/_&7X[hE2Ji)YnQY54>OU$_([gX
%6=,#S;9OPm)VJ6OV2K$*$IiXEO+%JjKGG+lXV"fOr+XOd^N:icOPI9M:cSVUL?2r=c).*-8cmohcalB*::/_5)tg!oQPHA<4)QlU
%Pb5j_mokS%'"eM\n4_?b)XUuMDsDO,bWP>/T&d_L_W)PqnOiF4!G#P)Ba*9gVrYpe6E5SoGf'6%a3]SS0Yo><Qm"6d/&Li-#F3If
%c='g!12#JO,c=?qHI*k?#h1A4Kr0a*1PGt<p.,Dci:.R+=4a^33jo:O\1&WD-6,QrLPL`R%cCcB+F2UW/es/*-9O'qjY5TJrp\R2
%d/=HmgtpQf45Ci:p</mhpJS,8gb1`IGotO&-^Gj4]N,m"YbuJQ3<pFU>]rQ/L_Q<+chFWT</&8XPZ&-A;S;7Gnr<Z80mjcp1l)^k
%McK#DI;S\*pE$,4o.0i>ic^7Uh1W]u3fHC-a/e]F]2VK5k,)BUS$c%Kl1BOt'gdB+S71TLE-?[;4\>Y:Cp/m@iSE^a%^9S'ekTnE
%AugAQ]IK2qn.3'Kc`_)b$)_n"-Dd]\"V9]Or-ThbPo=G>c8Rnr#E=2@97aapB]>ZjX"Ysj55F='f<`7,36LBm\$)\V?'QK:"P+s>
%S!Ofe;8j=r4o9CJr&pWo@YYKsM"9Z\;'KEHqD.c=o57^h&,:N*rh)6Tj<d@IQ3lkBN,QPI?b0WC\3kcFWngM-2B?B>#D<h-@^7*l
%VlgG27tQ#C_$K"p.e38MFkX/E+Xmcg=eeX:6NgS!4)h<o07-13-U<f;HGF#hRrI7EBcr?c(&&e_&;9hbk>[&tE$24SA73/ig6fH>
%s,[md0q_WHTHQZ2*jfrC/=&2g$'fLD2*s#fl/I:=m'Ru5DgeBBBK;987>(Tn0tIX6fF]X4NK=JYq9^IJ&D<&jeqgknBuE+(*EKE+
%Um&q1^!t`O.Pn%7g5f0NRFJcgE$bZop8mHqV%G=L7?+bWk.NLR<&0bcPjp+biNrt5cP]Od#qb?XI=u*fmZUh,O$P)t$f]A'BFtau
%=cg)+F[a*0@t&l&B1>'5i=u@-GS5N\:djmKmW44TAP[ZZ,c>WGaH']Q0Z3t[/qs>J8L-(Z36@%[)k!8Xdjm1D\ok(^:rkO)lIU1N
%;[_sHqVVFU6A'FaHa:FJ:?XS^gf5=g;uK$BcD5CdH"Xl(_S'6Jd5)A4H0PSmCHe^E8X\$S<$!Xm2o^U%W&FHVrf.1TbaW5iM\O@p
%XCtujWV($;Lnn^8AC`[QDbE@dNW]2L`5397Ld8IqI#N]!k^QpXN8)Uk30]@'<Pl:oI$MR36o0%+!\_7K"k&V]1]o5s8MOIV;clmA
%`^Ih_'NR%J3>uOl,lL+5]/GbH:]j:K6kq'(JPo9]nmc;nVG@Y3mUE^K::D#!0X"j![BjBTXRH[H69G@Ci=*JX>YaqgXFRt]_4e9t
%:L!p6J2$M@+cc6'#<t*2crMLG/3)pN;I!IFO0C!0d#m352$X!GR(l/)(@FOVT2N9,o18S:)KFsS`:%MmIdSe2(jfE\,b3#4,cT\8
%i-\]83/0B9Lj28?#fQ[`Jti'"qF,W'5,>>ggMCW_lhdl!rQF%ohG582H''RnB9=FbX]L@!!%r!\XX`j_*>hnP_doo[CI`&enBQRY
%dN[?$)2Km7D/]mD5#*L9==!=Z%l=Z'IGZ_<GtKbs6k`sOZ+uZ]M/+<%K*A\%D^U//)X'=hfSeb^8@GfOV%,TsXN\YI_5:uc0Bs<?
%TBR5AdPZlue,^294F;tFB,qLEc?B\*VWQlA/OtOPGtTbB*s/H6c]?^Dd2lU?+)h6h@F/:>[*O7s.Vr6J@$An\lhfH,/W<XZ(YHYT
%%cba*,ch^/)acu3>`*t#2Zo`G%_+k3pb<='GZc7Zek`\e2aoK@`%;i.:/(RB0Mk,Q57,D-mQ!)Q,LKQq?X)gEU2,pXJu'm_8mkm?
%V,E3FGchaE]ElA'J[3>"';8Jig$69_Y=Gdu97bh1No#!rTh^A6"Z4S4'n3Jh:9(QX!'n<3\=O$BNX4?H+iJ*T'J<(92";il1Vu1q
%$@H-d46d.]bPI)EZY/ASp+(gL=Nl:DG8HXs:a.VYKJY;S&8h?`ct9)3e<nN'8H%h@DISTQA;Yn(?,'1XpFALLe4l)-pOa`S@R2_l
%lYE)CWT[Cu<6dPZ#`Qo&$*3?EI"B2b7@MjZAZ2asdB(.?KK<5uPqOA9]o'J<JXhjum#MY/Nu]c02M].kT.Cn-[\W_9Fj:Aq"S])-
%JHE!:n\YQ'YZj's1M;F"1(XdmG*i$O"O7-5n6<q:Lg_G=2becBXt/ZJa,!Nb6kFPOiA^u#8pP["`28l?V.,!*h3J;7IG#t5p;r3"
%i*n[@9UsFbJ\nDmdGi&Gn>[u8VY4tt6j%tGRLlAbNO8X+DY$X5\\$PJ5jB&i`'NeO#dVb[,c)P!EfJh.%I?dd3]uBH)2Mhn.\3AY
%!UFNO0%kcMWag'WQIgT]$3q1d]n,($.tg.%(5HbX%lcpA^YipI8^<F:/]Jb,SN@;?c5[!kGkL-^?%$Pk$.]K/=q,r#-l-6`'c?sQ
%0jq&a._K0,Xb3dp2&lLG>$111W;$G2goCG\q5q^2I2Y)PCII2^gcFu.M6m2cjP?dO[F!gIK.<H=D]:IF+Tr,]^cr%%=6"6[XRcO'
%#C_DP1U=bCQP"::b#\?VTXSg4)O*M?$02[Hk74VD"ugL$Wj4d4=?X,iH`&VbfnpZu_ine<-kELLNk&WuOF:cAHpA+$NLrc#1Fi"e
%e`g@<n^MlsaX3PiIK3<10sU6!ggObB'r1u\,D=9+/)d%/]7^Y8XDnj;`\V\p@pO1WGk@>LXK:Vsgt?]1gP92KEca3m`;$0b'#j;E
%"7aAO6+k[.5;t))fnA>OnF?kL1r(q3$c'VP4N,a9_?p\0M$4o,eB,m)EOF3i>g%s9L#,\NX$Jp_GJ3n[cH-?JQr^>Cd-_#OO=-Ai
%]4)pSqW"-5Ra14d!R_WDX+M\a`X@BWpG.QtE-:O<IY/W^B86+_l#F3u4OJkNGhXME\?0+j\T#:^fk_2!Sa0Uf7T1Xh+kLoK/'":S
%97nIQ`E+f=<ppK.C9JXiR#RfH=!^s4;E0hVLNF,X_?;S:=,]H=G_*8M%;]NLZd0'#Kul[dKW,ro40h<%9EAScQTNEc*`A8ohb2c/
%@(,tNk];ZN+K6UkJ.Ubh<9e!K-roPtjZmF!,;g6l$=Ffki\kVgBoh<-Y0Jd*RWZ*+as'a/fZ75FV$`;e"?nb2iPQY``;iVR"56lL
%^rRXsH>VRMo+jK"<N:kcIMOTFPJDL,QW>W1K0<rPXGmeh6'D6cG#k,^oX%@>&=.9Dr^6iY+.H*)N7/JOZ,\UR>1Z?G<o7cA^jW4<
%h9oI*ZuJ?jCWu`Lf5YRM)?=[7b?8]!9%/A)k1/2aO\&)Yej/79Ui\5ihlsV&kr$WFcA_u[/`.u[K%$*3LmZa/dKcT+aBBrK1DelB
%Kl@>32Bd!6nq]FJTi;)6U>6g"A>-c`I)JNH8tnas%NfMA7c$epUH'l=7cSZ)DB'HZ=piTB_n<OFl;k(3@h7ab?34L<D\\r?bQ'r?
%noKLZ0eo'eI#h$O^ebdg'-#d/J+0^8/>[f'cb^;FMQIc9k\r^=\u)P6:f3+un!n"^n3^gie7`scMeOV7V&1H$r?I+[79JZ=g`K;(
%f`ZbE-[.CT(aRB-]ffC19&i?ATF$aZQS8=CGF3F*3/I&+ijF#:32njUa"cO$6],S^0[n::Z^Vo6T\tCs`!_j3.ef7B9F8%5-$)TR
%W3TMT>@!NYZEES.'J^o@I4[We4&'H:Whk(*0*8Poh'mRO/'rEikNb:>"SpS@b<"L!Zg..V1Ra^ba'_G]q(4l2?"]-$bbh)U_k9u?
%Xb[s1lVr[1V/6p]\&<J#(D1^;a&RW7\WdD7['pi`>G`AH;XnOU>ci0ZVQU/GO%bp/A)_RG"pf:O12Tq?6:O-fq@la\hY1iZJf(0c
%^cd>urK!*!PTgSY6Ijg_XEq-Jr!:/7,Kf]?J&&B]>&\O/Hk5JupIp$.l!fA@RlN/q(0'Z\UNU:ZlCutVF8G_rQ4Q-)<gI-1RgAu!
%>3ntr5`LIm24'VNQ5WVm%u?8S"pm^F">nJL(SI8,_b88n'=2FV4`EWl5Sg]Y,%8q5#Dg_XRK\o'B33m"4BW":-@`29,>N*tG7"c7
%@$(8]N1,jk7QKm1'/P!6Lb[Bt&:em9T4k[\VMC=0?LIo:#263Yqo04LOgp`:YljUE'eG_1?4*h))Ko2>$+mjbfu\$h608=3!7+*?
%?2g&3$B6IF7L1Xji+<!$fBZE@fDpnYF')F+3t$1cX&\F4jWp.;c*So7/N03PJfF?A$.[Xl&7(;$-_BFZhZ<@ef4`^Bfdg7.W"'i_
%DjSTJeB4&-`'e;FZRQ]mIN"l_4<Ig;@mQ/U"C:CE*.XP\rdK[b$Fm-e?1VM?FL>jmEYroG5aA@0@dajdq'UeCjprTd]PG?3&7@gO
%r6lVCYgYo*k!GI7'!U%MZ""S@or*;7HnD(.8t[<EcQgB9;Aao2eLYV=lCg9.'rFG]oKNi[?]9?*k`I*lJ^lOj'4luoGg&cmY=p'/
%$reEhYNf(c^e7/YpIY8S0;shu%HuYTYjO3??^7%?561qj*9!J[GG4r7WWeke70?m:.>dhN$O2D<Q`U_UnWLEFqPUnn_KTFZ.og+i
%M9'=H/f#o-3mMPl(J'FfoEU\+(R7.HX8U]7Uti$TKapUts&K\oVK5(coH50Ql\If!#^+(B@W_9d:<pLSO:;@\r7oJir(L2s#$E:S
%9d(_t$RF:YO7'S^M3,43#\S3@f*%$S=#!+>*DW2PpUC^Q;k<NUO)oG[%SL8b`$o%_MC_-MP_Y.8Zjeq/q]Gp/Cc<rFXV/=7EIT?"
%GRgYu:K:jm0b_i(7*c.u2V/9[II%LKT\W&G==(!F;#hND2i*.S"#`O&lal@Q3PPMe'S:h"Wqmkc@R;>O]5UZ!^s2In]hTk?+>V(i
%Q"7l_%#@>/#]A%0g_K3`VkA[GQc3E1QFQ_+M\;\u)>b4o:Ea+m:]kCY(uRFGjKotQAmpFHPH*PDLHVA_+k23ZT$IGrk_@c564fuH
%+p*37@iAtC\ie8eKhiL[$(:F7,R8[J6SsONW5UT''\P3M+=DG_rA[,^D,om'4K\JZB*/:.c@GkJ&>Wp0L"?8n+r`.8X'K;JM(UKT
%[77q?E!N*JK+KY2L-Ta?EDjNSqpL>6F&oo.$rf="n7J/BT[1(bCEWnC%,43h;.t+UKd_Vib`>]?a9Q@^=;Sh\Xp.QGIjD!%T^A.1
%^aWG\8/LP=h5>#H2$P#4!>I?nKohObc5c;h]"1n;[7[UnlXmG1J2l#*l"=!#kY-Q.,/jeLSc9`IgKb]4e%s.)?Y@NmXp,YOQ_N>j
%>4!SkNkN&hk+#5VQpE5d8llTT):iGNb20"ea31+s=NV0[EPrtQ:CUlpg-OK?17?EO+3MF19b$m4ArRHZ%RAUTXeADX>c]/!aVp$0
%;`W8XP,^inl6on[P^f)eSjRq7Ks3J]Alb=5,W3!dP%<2lq';%\S22`(?(>L?`YMrM(ZM6)F;4P_-Aef/8]c>s$PUBVTQse5"i#lJ
%24@".D>_2i(2:fm)<(U#?T8J0L)>i,XCer!ckpTlBrk");Vp%$KH=HL2F,Lj`2"BAg)?FD4Ar%UQ[YtK@$nE&_gF9O,_+$5jI+o;
%M-4HGG>n"8IU)/UqM28t>Ld<?R-E6:eV:07X#cKG(h(BD1GMmo)Qn"^rIN.(#nPYuAg$Mic=,[,Gb/cC3JCF[-3I\j4YF^1E',G#
%RrATgQmIH!.T=,HQ36gMcb^UkEn$"n;^,FseEdpJ?1`51-!.>)cU]q/KVqRHQPZ@QXI`>9Q8*eZB4Th?U5JipQBks-.>CIXQ"7+;
%:!@F7(=j)q9$#$@kM*GFA%%1edK]q4KG2G-!Vc]/IS$@PZ(ap/O!kN%G-H4UL?cOWg,#ClG2[$Cl0*FXDtcVPBl6<QlE,*@S$;JI
%4QPQe!i3AggKF')=jK+As3+F<E9EV'/ps_+19nik"G5-V'T!D$;GK,i55'/'k?HHpp"C?9&-OV3C#;J6'cb5[enV]+#&hYJY#&V'
%j?l>Pmbro+Te>Cqd%k7t`ho)FfC[<gH1$93-lq/b5T`!8$"J;PK$r&LM@_7uOIBs]:X?_t.*tf.s$rD5&`bfiF$`E`R=gVn<L&Nc
%*W/_reij,FETX[LYu@(Gla=q:bcPm]12]?]Tn`RccU*=6U_5Rg`&sSs66-o%WEd@fl+X]cC9\e6PJb,%#5J[EB.O3nL(4IsX<;C7
%_ouF4,7)ud]Ob<te4qI14Y#\a"H'bR>t)td7?Ofc=ERUTYpa#=0gPZ>7J9!/J<QT7S6AU(7XQ=b"p/\gKq@=\'=61g*m#XHW]i[=
%@m9_@NF#9ldVutcZ#\FlBIY6?%7i,p7o.E]9N`ir_Zm'8<\`@"#ii#GRe'F79o"ZW@OBKt*%5)V8blB^0d]:4=cMW"#EjpiNHVKg
%99f2p`;Oi$,h$gmGj2;\bRtBmTI98=PZW&8P(GcmS20b?KM*(\8%)AD4hGPN0l5Mc_Bi$CenXk>;)u;EX:M3YE%0g8=V:/.?-7OH
%F*4d_aD$kbVe^OJfRY%;N/:(L_r#"(W_pE,@d0YEM[!G8d5#m0L"2k.QZ0&_#[ah_8jp`eR)G*i9g,6G4b#\]X9tsEA,L(La64t&
%NhkV4-Goj%XmL7`\ejs"X^di*:QDGOIs$r8V]W_\XQ\%5j$5=q%^'XNN_ikX_X?t4M7r`;rrsl4L^N\dSZ9P0`=6MPr,>124D_J)
%ag5[/c?n$&"s4D/GB5ZW4siBqAP&+@HNp7dAsoG*a@?NpXZmdi=\rGnPlMh1W@(]%]IXQSqktAfcgLRF*i`IJQ"+A79\/fT%3%W9
%JgGqgJ'\:fe13<JEEY8gSL)/?*.jc-bp+WN1G^3Z4>UhbTC+;>-=M][A+T;RJ*/0Qa!&OL9f]",\g"@QU\<2&"CU\e<7;`up>0eA
%iRpgXkM,F__:&WcFo-UJ?r&K6BPgck8e)EMb"upq5PS_nfANm'6m!rDWM?UM*pD6'%6-3kS!rj(cBHn!KgHTTaeYruEM^?1jIa]&
%l;.fE'L>sYq^";IVeHSUl$EWRg=3Q1[!G8#/R]m.(IcA+$55ldDK:hU/m?s/2,4qdS@-B%.EsuO;cHUW5!j#3jiWFg$K!7-&$B\s
%ma`Ob5]LJQ[7$QMo4+\9Z?kM@f'ZZuVcHT"9\X]l=*(pT8leWbn3#aUI0uoEhSbZ28TF$Kn&r1\AT@>(C'Oa0(i;*>MOl(,pI)/)
%k-^F![CM/<3")Cu:LF]HGo\C4XH]J_KK?NT*`H:qFSjic.t`'7-FN=oU&iBV!%t0WM^?6$dCDN+El`$MYV.aM0X&,/=.#&liqglt
%8lUsGP30:!nYM@;2IW\#$K0UZatC#,"fC!SIHF&-8Y)k0>KFf6E6`?r'G;+%e^[Q_@3j[K(ECSt'd:H#_m&&3FXhgU;@\/d!2!C/
%/"AG+&=?T&nNVpK7e7$o%Yo^$i@lVZ+i)W62YVHIAnd`+LY_X6FGrR?d:Q!%:aU#A&p$Cj4h;I[oVmuD[&t9feFs2;]YLVpibYs_
%*MC'5"gkVlJT[?@BAE4dnq'NqQA!W\AtYAg6>R57F0CX$`e>_ED;.AZ/4DGQg(!W/EigE@X41@S!u[4EIrgfjhaeU<UapaRO?ET,
%Q1[8]3D()C_9XDiM",fna>9O&p8uKE0sNPDR[PS)9ugB:4%kn!<c@VPB&_RAU6M`'_^HnQ-b6sV\n<^0pp!FrjW>&/FG_YSj^<CY
%H!dec?ocGcLI&qQeuED-N"MO6&@\5o@LTC.c"AbPfXQM`"+U:!E/0a3EgIm*`\He&/OD>IO[)C`XFiFO29Knum%Y&4ei4Y'5XpX7
%`jf4]:<.(H1I@bA?W!@pnoS5,:,ZR#L6O)Wn0<JYM2mW!HnC-2kuMmGMU.HlSjDolE\_UiAC\`+FG)![6V.'&n\m52cS?"XD]>:+
%V(k9ZDC,DM8lNFg.M,rQlInXK,!;b2>6KoA.s\^V5qJR<+IocO1*)!J20Q3Qh\i50K8u?1a/_aQW?o_%g6qf=+TgVK@_@h?6PGGO
%XC\55cGn,c1,g<S!Y+LjUM7dk;juKNYaQse2;G1E@FKaO5IOSucg<JZ$gnlI1:R?)[>^!]&6sg4;6&adr5G0q5GCIbMS%M%2=r:T
%GmjWYqL9fq!"8(Q-;GHL.a@_+"I:[b]S?`J_Zf$H&()rj-IG0Gb/X,EVH</p2JpI-PkKXga+TT!Yc2Zl.s5tk0U]lDVW2,L)rSAa
%CtjZ'FJdYfSj`ID#HmRj8<K;,D#5O)6jl3eJ'Y^[5gk>tKoF\fFPo6)G-joX"j.N5;/]1c/NuWIIR=ql@R-#f;o'8C!N_.[63T%.
%o(AOlGY\DhHEJ4`cln;igNe7;>bO2UC:XZr3>",S?9'>B>Rf28<sqo73iVAFF8"P^m6l3>'HFf_a.e<X1PG_^YSeY5I[=P+eeB"F
%EDhE(VVX1<#Q3F9lV90?Q'nkE(j=Ba/l#n9/+)'MOCV6_1Xm.-dN,fnX$<-*&]L^I9'@P"Ah!MVZ:45LX$`D;QIiVtQ7N<kS@0Ec
%7b.1Tg@RoEY!o3p/f5O1$qZbKM9Q(dA,^pH=Xkf[*__/SWmWGR5C?fO/XV1"gW=57Zk42>$Uf-Y)#>]um=s_P%f0^+3HY#fn/'c.
%Fq2Un_3,cbS9/kCMAjL$Y95='Kr(eeoa94bMl"]PX?Lh3nb6/r$*H.$!4]sf*CM#>pc>KDd*AB@H+PFOPphDIoDYSWEmcp0;3P2_
%Q2ZUK(OI#4lKs7#;WEe'589RlPZEJ@&iThX3jse$Ak=I>=gjR7I)(?J$<h8_'HLg=2UC"i`7Q4Q#f2dIi"X.!5qO+H;t]Hm*J6hZ
%(1#E9/eJ@>^\;8E<*s@pF-DXt^%UeE\5Fn%54VM:_[^T3\0dl?`qugrj$c(U[HbE9c+U."RqBOB"',8"=co`L'ac=Cn1^:fmGnrs
%6O8N?8a\V<!=B%&(oM[s<S=<rZ(H+M%&ZIC0GJ$>&JL',L15!K/D<H]gUTB-On&S"@:#.-K@`\TkT\!E"@KY*#Z'Xg.7)8C6/RT1
%E.6g@=]NT<c+J&U[S/!M6b>1uq-0,p9kr:PC1-A#SL!.VV0q8rmo]BQN3kTpQ8Xs:,rhI<!Nb$l4R+!DJZ*F#F;0H&+XnIlG620r
%EYY"QVR%\^?k&bM7T"0QC2d#GX+o,MCLGWC5r,-[Jd[,-a"#o5'0OPd>+$(M3Lm+G%<HV-!"cON(!QLbC]N"^mNJdM'Fpftn=;M)
%r>ORK5fM8+>M+6:'GIfXV+g7a(,6YOBaCa:"<7>\'-d)'Xt.]J3sM\2=fnZH'&K*)8*-HQ6I7?20b`^`^$8OsK0dPX#Y.%No-QtV
%*BM.)PltiKE[M'`;5VpR:+#UgKL4]s^JBO5G&O5Bl7OaXh?'n!_:R25/Ql)7a#Re$S/Mf_eoPh3"_m:"[]@'":'nk\3V@/^]G+?j
%43Y8Y-3Z;\o0VtILQcC+$%JNLEYB47iHbEYU4T<UIK7WP)S(SG>e"2m&gCQrR3lf)cGT/#V.IHeCi,b_2X#,G;P^Q;h:#K*F:W69
%k8@VBGk+TE9B1o`;M]K@2:npg6TE6CgMQ24+So(dcEk_%&u+)A3@sRIB$DmQc3V3]1scgIDkSZ[L]U>8"T[?*&l6paX/D8E;po50
%/f*hj=a$Io[?NNk[r,8RbEl,\70[r>"j,VfaZD41aJOmWk,8Q5HfZg4+.IECZFglJQ.Z/"b!j-9'*:=%6>OPJ(Fk-Aj/<3:Q_T&i
%#A6_JHrdOJQWK&Q4VPsEk@$a'32?Mr-$(t*\YPYOgld]T*)HesE)(OV=?NCk8]@6[JIj/9]'^++4l#TVN.F9J$id$f5JgB&Y=RSY
%?\_S!O\fGu+bqZ;RS5n/jJ'nHfCI5(L1H!s:*DCEB!gRD(S(91X\BDEF+]lWeFE1[1aL(,;_<d)OQ"*)p_Kq.6n&C.IfuT!Co2:j
%BP_,q:84Ir<KYgRC.tWCWI9@XV-:KI"6*FO1K?_p(UmpV-@n/a1lG'LOW;1?Q=<7u4rZu>n94Bgf]O%:HZP5pk_TNNB]@8@Ll\h+
%L`dj8.^\=1)6'\Y+pBJ!LcQn3=rbjp]`,"H^1>=?N&+63N'<uuC^>lsb2QC06A/N`-[iXuXIl4ts&36DIOX2]F=:KY_NQg<DUGJn
%FjYN4gXKuW08@a^(Rogj>dsO!;bO:V9X<umRC2B_KaJDES[1$)@WM2H5Cb-QOj2!ero2^NJ]6T's,#W?O9Trj9\=(<<E<O68ouQa
%I+Hd]C47Eu[a$d#:l2it7\BtCmho9%Y:KeS"(F#!,8*B6_18M#6YJ`#K([)!YVG8=hEf.JL2F/2JYG4AD<lDu?K=K*DCXhNmRm:+
%JgK.eM[Wr+*kL$RJa4("W(bjXRlmfY?52MJplQ]o";Ql=G_n4q'()&4q/X,+e=R*<k*r=H*a?NaK+mYEh9R6s'LFm\<=6"1!7]6e
%nnb*;\"f_H7'pG9>Ccuf"4p=23>/``is35?Z^Gb-Nd@J4RRE]EaA?"@gZbY2<"b&P0Oe7;#uiVP(f=X@JRO6J%67:,)4PV/+YJ3G
%K7=-`(gfr9P(bL?C_:]>%'K<,5mrA'<A0SmJ.F!GSiMIu(LM*mgLPGpG-VR\)Q""/<<M/sEoBj&e&?&kLWf(#"*:&FJ6KSqb%n'_
%m"I7bCd%*O(0fJTDV`?D@i(Th">pSg#iVS^Oj1m?8,]1=FamQJTJ=>A9$V$0s,Z`0`M-8MjrpQWIXuga8o>:s.cQ^OV6X+'M'^_g
%Jc#Cr7D`fOcmW`[&p_0>PN^2F+8j\ofBccUZgFeEC1@[t$I():O$dZIiX7L![+K`:1=jn31";C0kGJ\Nh'm98ZM'INPP)^Z-In1?
%^EHCo+0AP?Me^]'WdtaSW102B_upD6q[)1>O\>E]L3L:ENme"]TGCUW4A1IeTd8r,/ts+!]56C.MEL6d#%/0iBi_pGITaG@-N2FU
%4BO29Fl0]e.q%Vt_k2m`Sd)2[GK1$:Rf_tOpODY[>4;%#I0^tDR8Nt]/R4NG<oK#%95rR5Q0@K(8j`-Mc^38T1qE3J^i1`oRDR0k
%BbbeG'0efeT]Ua?X-P<2Y&'!08@iG:".[:__+C(u=.^BS?sSF@;t\m=fJNcOhpA9Y^%UBF2rPMd"`U%EK!EW;L8%9bM3>QOgh=1<
%,TTtA#!8j\`=c#BTl55V>*p-KBU45G-D]fq=63bQ65k^I3t.O_>N[D*5k^3hn7RsT22XY</^QQ+5SboGaY>K,!mb0']!],;K3%<g
%!$P'Bm&JV:p3.;oF>uo8P=-*fZ=aDD/.U?1"b:9\<ZU;E+$TR8f`!EA/];Tt;1=>#;@SU`Hg?GV_o*[&EZ\R8JE(1X2c:*q&8;jG
%6pX=CEPSaSBs\7h\WA@$)B$i&;>JF+(VoVB!eqHXA&t&l^gSVl$?otsH(:,S/p,A`4HK[IMoS_i&0T!?^`k;-]r]Sm5*gRV4X`DC
%fZGc2%'DcL`ln3idZ,=U3]>FI0euMPaXQOnG%aa9.&&2g9If!T$_ZR8Cp2IVd"&>9<O.ft3Fn,[pOiMV7ek6j:$`Uo+D6S+WmN4D
%QqUa':H`_+RS_$?>c20gkCQZ^_&uHl7Zm4\W]U&i+np(,Pj^sN97FhHaoP&+!]Y-^p[iP])B<Sf4Cp:'(^&Se1!(bm9fk-;^TCuI
%,s01ci%$"=15gNg1P1Z2j?YIQ1b$+_nU:K%(^Gq"_>\ZMBnJH4g$rjL8erX.V[nS$OR?T9o.a(AmDdqQ]Yf2DmbC2X9*'H!o0<C\
%g"9hGd27WhBXt"\0hf+Tlj.>'4o!BiYL>Hka/-\lES!2,EU_0S1E3.5Sg*1b_OZYEH&=N3TpIKkJJiKfFFb0C8oVi\3Dk`u"/c(-
%>cgq)"IuN%i&!.],SVEe7-Y]>#@b>5Tf+D\1+S/G%Zd]r2?U*ELeD!N2XFiE;AUNf0eQk@<sC8O4Yp]/I]AKIK=%RMe:)ID!G1HB
%_5gte)7p>S"XB2knUBDsVO)ekYF,PNKn_H?Csdt+qjj*+FHm`3N6snV/NDrJ1*T_CX@@SZ#[MjB4#VP;b1_fQ?Y.)(20OelgT"$l
%R;6,?ad:.EgU%!mkIg;[EbR+CcR%.OUO<_PE#h+\d/J][OiAiaEj'u6+ZT#!<Nh:'N4l>c[O?J?N8.EE@&tk#_jD(QeZhH]q1+hW
%^+Y6T\Vg=Kk(=r2@RW&!'Cb]GF9[a_.A2^SA))1+<(J3*HZk3u$C[XpEM;b-P-FLG43#?n/W?JdB1I1r?l`J&4'p9a)]0Y0WsL$j
%0AV+..I,tO?Q-JcCiB63bmA?gZa@\&)ESLN/skRqIVEX1Bq6Z(hbW;R$W=b$G7+`"(g4(kR`QChOoqTQ23Et0a:POrbS"qQVbB(h
%kE^6+''HsGJdN[]M-JnV5M*GH:&uD7]c(O<DC(A*P3.d52b2B#HOcg%.WWZG+]$l*S!=58:[j9pXC8#QS7b6H$OkUB\X4]mdQ!$M
%E8Kq3aX@!e5,<EtQf$:R,2]T[Lo?At%S9MG;>N&d>[6=LMIWCQ0QW*j_2BF`dj(DA/6:/pZu.UcRkU(\"Unou0PK^^3't-ma=5)b
%#7'SYpPRQRN-i_3iZ7'^%m%SQZr]PQgfJg6]kjY<*00jBFet\K1&=mUF/dlSC&XYB_.W+eikc=E3;l>\e^IFHOs(l<SrpB8L(4nu
%:)sS90m2"WPqncnMYMN#XSk!g8fF9<_As+ZZRVeaLGHg*'E>B"]mk\U)Qq6LN@J\-*RFid5$)b\dU+c09S]bIh`:bGh/oLP>._&Y
%([*kC@/c]AQ.5*Z3+nO$)rkVaqrAKNXJiuGJ5ceM^Db8hfTS@+%SugiTmT96!8n_d@Iu.<pdg!+mdNNK!IACe'"1Jii8GI8b.IoI
%pu"F9*PR47O7F&[V=-)A^PkfeR5#ZL9GQI'RsQK"5So^2O-LfD[H;X;#lJrgkP!SN(eo_((FU*OEDII-+C`$4Ye9'l6>5A4ngMi#
%A<u3[`&s8?f3Ic$hsA`'7mug^TG]#QWnq@6L9b3*Mj`g]N4Ec2dBg>SEb\KgO6\XfSI&,qAE*@DWa>.['gIUu@9WajH^C$&'#8f0
%Aeu-)%a[m)51@k=Hb0Pdl&b?`4c1nhhiT2\8PZ<YI#7M<2)3>F)'fJO/Tcl>7s9[m'"57EDRWRK.-Eb:kh#o%Q1I!*no49o"(K^Y
%D'c0N;`_2IM^sr6m$2[i-dpc`/!%rWgs:H-kbf2k2is\<qPD7;5kjS7UcmDH</K?_#.s8lMc;'\3U9+0a[F(ULu\/;312L%<">@)
%&7W/BWk>o^$sNm#!8!8ZQg+e$'5:gEn+Z&,#?l7e,/il+`hJ'uX&4B_9Z?q<C>E#p"gtV`T2hQ#K!aLrF';m43Z5DKb:^-G9&@t%
%]C""ah8r=#*R\bErL/\Q@FCiWMeI'q^9n6+BToq"@,]<NoXs^jNQ-d2FWh@;fD9V*K.PZ/B?0E2qm3m"#mR<H3p@p3C0cSG^.9!O
%=k8S_ZV>//kF-4b#k<qUO.itH<UCOB$3WA^-a6<W1>OFl4^+i,He'VJIXN52>k.0`@^[;Bi[mKTGh]qU,>B#`IHn#E9.SA2^FB*Y
%(YD='mFdUpr(6FH1>nm#LudnYAaAislq7X?EFROuaK6,NEeEB=qgX)VQ@Je`eqhk6K0hZ[LA?LiE/lA3YQ<TNQ.H$:jW`E7Gr[cu
%@E#rNbga4=V&3hAHEbu4^@IW5G'$St<gIs^ZFH!!6aSAlH5dEMVM<QG`ts-mHS_!AM]b$oQ\D;j(%(Sbc&3%Tq?;3L&0H9:Wd@O0
%41,DBBF-1:'B%VqUCqf'QRS5'cb($iO)J<#QD>Z%R/s74\5r?hJRc+_i(r5sB%FiI/T[t1XlVMNWg)MJnUq5fD;b2K8%GEtde`&-
%D#G_4Z_Akn$B(6Xf)a<*Vllf65ZHC&)"'a7[(b[FHu&K:XR5-an+=uZ$q.Yj`%$9amR0W!W$fW3EAV1GEc!;I)'D@3$fFVipY\qX
%=)/L?g'U9-^Ln[<.DfMAeTK,qT%=LgOj]DEW$$cUQa'0WP'ae.0H*96BL(CT7,oiG8or[PqX6oXEM[A]I)nclYk::L^T]Cu4,+e<
%*1@VY4I>RO@N;S#EHZr^$"2XA=m]d"Go;'&d5[u?Bj"QS;oEg%33,Dkkt^6219n9N8s<#HMXGG^5q&!N.ID(&jn[Vf,P!%nIDBnj
%g`)Zr7g4fDcSAV;mR!^X3RiQB/hEpcCu*TRQl@bZ\1@e[![$-q]8?L?-QiskTmVP"&1SJ&\c-aJY0ELE[3&W"B&e>,I#NR--E..*
%I]R3"W)h?EOYOKhf#-O@>`lUPGKG3JMoces$h"EENbIA?GqN+B[IQ8Gk8>q&UEg$?^^diU2;j^dNOIb:F#QS29VVj8k,EH4X.pZ'
%;Y[$=V&ERQZKeO/R^H<^+q+^,no\>iT$o96"[$Ca3M-jMT6Fp(g!cGlOsdAYBL><p(U`[[6p3""lXlXkdHN!0L.PukY6G^SSmtf[
%W\@a78J1=KX^3FW5KS7cmN!^3WJYt<rL&&*LE1/98]t..8ldrDZ]b,m1)_I'_M$#.=CJrBNWs0[/TD.Dckt^gNC,!L<Z8G=="Zb<
%9#9D?8@48>Bp/hXK]GYZ=3@<J@:=G7'+qV'WFu;\ZX&s_)rZgWME[IJTBAh01X![&R''&>_Tm\#3FcGonWG=!FDK7,$eEsG%.%NG
%Rdm[c%(4pWAY?taNa,F4U</%IpUsQF;uIF1btkECec<Ejf#`bbp(R(.IraJh,VQ[:X"+8Q)VZ=E>>R&qKOrceWTd#E>KV?$Qc[dh
%Og^^5nr!-p#"aHtR/Bcgrj&f.(:D?&H&!tuOc%qIe?`1$]10Cg@YX4B"/L'b"I]+P:25sr.&MI.V(,BBZjoddKZK$jRB1A<L!p`]
%d6<f-99i^].)^C4(O+-TXlXtBKZ4\(59R*a_`RA``mG]l9b/JBLtQBgL6XF,DV?oYCb;tgiMIQBj[4L/<<tF0V'4CK&mt=G$M]WU
%f3R)[C7b>=d)1M4!,6k`Y+t\BH,S,GC!2IQ3t3ZP7_@e:Zn3UX)q"*3@B>AU(VdN-O_0uXQG<oikhkE'H:Lrn_LtU7T+R`FHdP*V
%4-bXS?>F2l-cKiRWKAF7]IJ2N*nl,glLT"?ThZ#96ibTKY+4:;H&,J+E_XQQWgcG?Nm_]ZJ-<!81;n4a=WEDaZ>*+$,)b&W4`6jS
%"[a1?</tTo!FR>+d29>X^GN,LoZ#@7o5=clg(1EBYpp%G$)@"Ur)VGHiqKB`Je)XEQB73%8@Ai2?iu2Fep;rr>9XFu&R4kVGX_Nm
%KYgb-j^R9HBOnFi+qC5;,d8Y-MNl!r4-eX/_H81p@:(j`)W1VPLEX]M@:q*kgFQcs?c=ZbZ[DfP^[g&^R/3;=A\]"GnpUF_l%S5e
%SlMMG@B+"V*J8SSSPgf)1_sd*\o9r[&k7k>'"_c@%a$9XD<b4,X_AT&#=()m^kjaTH:]`9<56A)ceK9"RFe_-1o^\3H1mWDKuXX.
%]LIR3BqJ:ZE`6H*]HTm9HonVj<KNDJ6A$%&1((,FE2?0Qdbo2W*&eps+e^PLY#UV)q43'jSqeKZA3A-f2J1r<gI2jsS96h.bu#^4
%2gHs?Lm=LQ\LE8$^<f59^B/h8IPj#5.`2*r?FoB?_.HQ?+CPZ8)MKU&#ug"2hmoRPD>ep+=]o,F1Z>3hA<>j!Y]K0[`UR&p2s"%"
%8R,K\,7u023>H9&GYt#FTF,;>%l\7:MUuDB_=FSZ@i+*4Z_^9<*#q_gbalZLl&4WSp`Hh#"7`qf@cfK:VL+S*:Fi&sV/`5n\VY]O
%8(?[FmNrVj9SD;7-'3?g%u5#bG';?)ag<BY+fiW]bW;-UYekUY:cp;(ETsK8XWhPpo>>]F6U$M?/5/ui'NE//nmf!ifM1N:]a?n&
%Q-'SER!R*sidKPC-QM$;8:lWTmh%<c#;1ADf!b@(jZ.P0T42cSXX$ih^0r_`85_Vb<n?oT\?Ug(:8XZa@_9]-3\f2QD!L]VE1ee.
%1\\:>pD#BUY;Iu`@8:h6`06i1YSW.+bue)cUqW's@rXpDoqX@Y)=X_;hm%_QPZ?:"&!t=Fi\_lni[cf,6[q;ajs;JMC'a]W3#gfg
%o4mH@m<T[O1dN]F"lFq?h,X&.eKL052NKcH.F^L'((L4?EVhC6K7neUUcBT'(r&S8Z?+m.XR/;.)XXZlca#0MhTT0.#+A!s^*n>l
%lkg[EPX$l/#38JdE?3V8)j\=oV^Hq3@Mh$M@,2oSqDsF4H"s3TB%Bcp^QVq["XTa9,/2H=<n8X1->?&<O@`.m?,^Qb.Xm`p*dm,L
%lon?sWn?<)ZUa&Sp+l&me>fF2rCO4AR5OAJFeg1/J+Hgm^icAK!%.8:j1lUAE1_oS&]mX9`n;!k7u4Na0'0qp`OC;.#EZQ-Vt.)Z
%MJ@M[O0a])m\%R-K,Bl]<[+'dl)P1M65!R4UApCq-op8"nZ3PGYJgXKR;"<#!`\"+Yn!aJh*`-kn\nO#B!W#G=lO-LpL.;h<L.S0
%BscjT?Ae=gCl::8aI7ImJGUOs\Th998gEk<4n0c45"\bZe.MpU;13"Sr8ttJ8g]h&.K[VQWVVQ9-sqs5>-ClC8FTl;okJ_^6>/O5
%+_EQ"bl%&]5*96I6B0i=12bASUJ[Kf-uo_?,@Zii\;ta1jGl<JOcsga54*?@3nG\DhGShRMhtr1S'8D;UjJV^VGm+!!4%JA(?%;=
%fEJ#u7!8*C.bkr'>@.MZ@-uR`0=',?bs>tFX:9a526kL26U26^c)b$Y%ZNp%F@CF]#C56r.M@(b:k?qaFI).*b-f]T%B:O;^rMHK
%_M6sg5%9H=W*C5EF#E5kS\@Ecq9jB?PQ!YXCakN'ORZM\f'\iH;Tn0&4;O*>6C,rcFZj#8l!-[%D&:(S=e_rUi?m:-Y@G"64SH$J
%C1d.o\O=PKP;A&D^Qq3P%s)Lg3o)-t/-37cP9<p'9!bNh=gOSd)S\2GK<Us.R!j7qN+jt#b/a'"`\^d#>_];[-?1L%=B'%.&TXTW
%WqiKtJEiQ)@bpl'?9G6)nlT=j`2HC1.$pcNCd4m"2`P;3DV<0*"U`B]>c*.l8/Ts`42f7QYOIdK3O-bY4/S"S'1"<S`C,^5G3W4h
%f>Zg]Nj?-tE::mWYYUARb+*?2PCV%A(0Oe?Zb(h?O?Igug\H!>Q$#e]#rW6r5ss7J.h>(G=e,gn61tM!o#aF)H"L?-@a6<((^*bl
%6K]#Y4,(l$KHMlC,%S=q5!-2GHHCHR2!:.`!ZFS((gV/kb_tl`"Pm'W@hKaGLAg'erHc05E/^XScPl)g-cLkl)d8%*&*_d[We/b=
%GCPpkkd=Ii5-*(+G-s[aE73cQqdj`,J+7`467lU[0pnlb->%,KH0Pll;_Wk4[5SJQ&9iu&@`DsKS4)Ug7HUED.[CKmks/nphLllt
%7Lm_(0p-S_i@k()iEBt.EOFZ/36aRmQMtHg1.<Y>O10')5VJ?MD:bEu:7i)!Q$'8]K:8dJGjM.o*RSt[JZgi/.@?#<r_bPabWnh4
%^B:G4Pn//@26]0mHhbIjeP6RmWRX=kg]f8&C]FW6X^dL9@5$r`BWNZA[k[ZW_*L8_=aK4TkMWT*4>+qjM?EeA(6*(8B3BRA:?IW3
%D0&0W*KlTLPN#/+:[3mn5Y,EHhLN%;l-@/W*@JD;Sh2K^_.69X)P"Z[KbZJ[FTB"VZNIH^JWH2es!qG4.RHV-A.pSs7*]u^M;CbJ
%_V8\m^9gmmZj.d$YR2/<-ca1/^I)0@o`k4S/E5>SO`>,q,e2"qUR<j)g^T*>dKHaP3`U*9o(L[qIAk3)3eCq#4[+!):l@Cb&sB+G
%_bXm,`6&Dl?35^39LY2!>L?+klIJ%=8p9,2&Z22h42r?9+L;E=?V!ooI`2'G?3@e';eL+3<W4P]m'R9ZDGFM\gJ.<9Ll#G)h'COr
%/#:$GD!8'^SCS"P/[5cb7dIf#Ir"*R%-SlO.b8QHOGLQbXiqr=am8bfB=P[`_8_heKG7q:FTNAUSWBWb0u+5-gVcY%8`K_n830,P
%hjVMZb"VoD&nq;@GZm\#>p<@?5&<P.l<R#e.H@O89WkR9F+1F!r$?(ZI6pVXHjQTZ#aloVQ$g_@UYI]g^M3aKYL[-+J*d9W_pZC*
%e[%@ENX$16.1Y<#2EYc6G-RS*:q>f$AoZU#qH%HS1:N'%IBO[dRlq\ln6\='qrgW$HOW6]WLaeWC'k!#8Q6&1\\IRd'Y2a(SqTsr
%8L03>Je("='HE/b05*k"#!fO2Yh`!uE8MPnV'N;"iPpSUBnDMBcFiUhOG>6q]*Zg7(JeT`/c"a>6b[;#YuR7Zr\B2[ON`lA7s48r
%5&kLma\VJHSt\QWhQ!I1\"PrmM'8%&O)bg`OUg=uJB(\B7bi0-$<:MU!H/7%TITefC)Ktcl-6+[<gAF0KsDes``Eij6f!DF7Ur9k
%]m]srm%rZ:LhRf?V50>SORa)&.&p./,?W'JOh`t!K<r_pGc4a%I2TL:d:+u]JoisPFBl!^<#-C)Hb@@Us*3E,:;tX7ZGNra+#,p)
%=l?<#Qr5^P_51MH4jJFuZ#1kieT.tiZA;.\huC;8Uh72SgcX_PYbK`Y*W&_eZtLI0Yf3,bFWpVJfdX-OPV&Nh/T?f;lF.7BWJk'S
%24k;*Y&p%;'h,nu&sq*CX9CHtMn*3Fh<n12M:Kn+>dfEYn[/T<QmiUZDjugBo,K/jck=L.F@oe,gV,V_Ki4/2=Q:CsKU<<D0oT?,
%]Z(mf"do_V9FL(ITB\jt3AMHt.`AKm;hEQFK1`OhWo!C$U!#7`q5tL;bpm1cf+0iFs'*BGBcoPnnMuhg,%-?VgZ]A8*>:&N`@L7[
%/QMahAdsWT8eA^afO*QfC:_,4B\L1`Hcbqr_F!0+LZ+T&2'r[$'Q4X;L8-^%`CgGblI=`._h-gG!@K8F-<=++iDTeg'5P+u+mRdG
%b/YXJgEoZH-"SL@<TV,VWqY5BaEFpL+i1\FJX2Yj?Kk(9Pc,X4?q/Hk0aJdA:Ig5eWgY>flm5n]/-^He-(.IBkWgikojpfI3IGHg
%*r5`/f@f,E<*Q3*4N4;$64!@%]:?SMf?T9#9Z(LIOW6EA@Bu=,:td+]:sAqeb*+Ff96286W1bBRs4+USpAGtf_oGe%AGcaRNA0Wc
%K_g<s:\)4@!8)'3SF%I0K);_B9H+G)bRR8q;72o]]',D'8/gql]8u]'J*<*3HG70Sb1oCXl;hC'g8]F?52*;7N.`EaeO/;!;4kY#
%oi/20;6A]o`:'8(5'o2eE!VE#L$XGamlQH2k_JE+6se^t`2=.Uj',"6fuPi7Gm+bZ?<Ik>\S(FN'`m]J&O>q):R9=eS;_J'D!P6.
%@_fZ$FoB[g(53[>$$nB]k+4Z\1=N.7E6kO1>be$(#VWLJIV#[GTmTucq'S3gG[uX:8I1aJ"U%B'b,@kAnpX8[b4(SN1+>+],,G,]
%aCdS-L`Zkkjk5QkSdYl6/.i8d82l3W`;0k23?rX6A^B)Eb2AN5.'(_Un36I<6Y\5:9'pR/B'Kb@X%\C"S)\&J1J&`sV7rF,0OA]J
%X'aflni^5KiB%\`cr5,;"t$["*+Q!3$+$46Xk5,?l:b'1Qjo/',p-URbc?.=\H+<T=qo$RM/C.ne1h4NggdXL$qr=RC,$tJZKrt3
%24Z=2AGl?.pDrd8/[8g(g%P:U+Y->A`;3UAFF+o.Y0-;q+S:<G`R;8L>k]S)+U:R^KS,TK+ZJ[\R*-ISb7L\HKX`S%4:=/9ESeK%
%$H@ee5m#YN@A:@K5scf78[N,\FLud/F8.rP.VX]r&0-,A#F/9jdTBf_GN29k2P(^^b'1?sqj&J680\sCeMBg&2XCI(`hJ?&eptoD
%HRoXnD#LsU6/TiEYE8qV_`;-*&=<IKL@>mjBS=NrFGPJi)&,R8$Z6!,[tg'#=,iG(2S^;Xk[EPE3G%MZs3:=io3l!uA>MkOBA-D;
%E^,*P)?_Z<TG`Yui@%jU:Jo_Bc_uKH34c/\$543kWqPp$=#dnN71aYfHN@s=8FS-4VO:-fZVrsK9[D]*285D,DY"5#j%@CbQeoj>
%VS$08^M(#ifj>CiY:;i6Gd)'[QM)%tC+h=M8l0Pim:BAMh9igCKq3I*_\.;r#,&]DhM%Ra03+s1?7rk4<'H*E+$EnPhUXgPD&k)`
%LJY]D>4-V5i\LK@[M4p__I`?7LBkoI?8#[p*U,%58tq61<ghXT</!BR(%_ee0<)%k'-i.OdO.[4V*2B`E\(PRLu^l'mfm^K']>gU
%'q@1J)HD.J7o`s2<^%7k?b6]Jmj_V+*,PXH.CAVD9=&K;^F\0cY:oTVIE#=887\8oO)`o%Ac'.4l_jT;F3B0BMsa1&>MR('>,W,A
%-$T3Rrpd]7lG/ff+r?./Hr>ZXjElMMJi1AD709j3*,HlnKrD*sN2l+OSN3j:>,c7P=U]TGpYT<W;uOR^?8t4#YO,)eea>4QbC]i)
%d)Z#QnC=;Q!aGduHr@&=N!RP[<?$uE_W)n?f8Ht\*2cc$dr(hVBOJ/tD`p(L]'lM3C2d6eH5?FQX!D%6L#`7!#YflX;[(eqVg]G^
%YOYegVq`EsOClHjEZ?#4PFAs/\im@O4,Y;Y,HE:0plhHdjbf._B%!X:L[%SXLg`.2EbQWl9I!E,e1l@fP+6H/I`3bIAl#VKUC!@B
%7M$t:RFL6hW[S*)g5fX&bgc;+e/HS,nSOVcieV5M=ec,i>6qF:C>nS7p.3^C9'!R"=#Hb=6*f,GFt,HLA.ur\Z,<Yo0V@a8"_E5S
%6*AFiI1Y0t)C'M@2%7GFWM7\0K0V0WQK<W?@*DVPRmb<:OsnSu[;&GUVq<Et6X.%Qfi4*$YiFJiX6J^,N@'C@,5gJ_[p`<k+l;T:
%oG.ip<O'6"Q/5J?;XS]-*G!0O;=3H7T+lL8*6b,f$mh6L(_T#hKqCI`Tc)bA4YNVV?a&[Qc,&J0kku\T#M@W?*rG6CqsKU4q^`M4
%U!.jkb%D=dBXn\RYFWSY8lIU5JDDC8F]2:B**"O#Kr,6geO^u`&(\k;)Q8t%13qG9@OY&Q=7baLFa&jAhAY#L^p+6&gSCnS`4QJ%
%G]G/I!W67gN0hX#"_NU=Mbf/n0nR6Zdt>RWjT(e,1ice"edPdGp:I6W`'Rjnc>tII=b>6gKWOBWgGnX_*Sjg60Yo8>HpZ%nlJq.J
%>Ki!O0#nN0<SV/N]s`8oa;j5\WBF`sC3Na)oQSQ5GatMiTPf"-XLMBN!;ZK&T,R`J"3l9K!Nqr5*:(1TBF<JZRd-KjoA+?"j3=t1
%"]cG'_MiGf7S"c<ahp@7fQ\Vs8]gMM'Vjg(qa]aKr8'8;3EX>Hn4?+R)a]MA8qAZUPh%k_qG>6A\PbZF5d9d^;aAuA(=Bm>DM-O^
%:cef2cLXO:R*6qrE&Oi$32lAb7S0-#7E/ucJ8d$@I]-9C;Nb<!F1[\j6?:[X`G,VQJ."%1js1PU6M29SJBX\+5YkI$YgrM[lt_CO
%W\jq)WR[#5CIUJFkeNnE*EP@"#5:r/l`$QSX3$bdVUdb?D-WeLaZA%WZ1Mqr\",:Ah0H8KFH#Gsk.:pLe`Fa^,n'5,M"?jP^b6P`
%(WLi4ac)VH[u5d;j08QDYZ*g^BdKLZ6aUN5h5PK[];l-P6$P-,.RIuXe*l71\)3eqs4.2l-<W(k*=9u_e;FJcil,[:Mo<e3?c"3-
%4*=RFl,ZJIh\R]t'V$VD<BsWf%jD+GZUjl!A#I@>W0pSma=lC>m:Il\Eo\a]M@f](NF%5^#'Z,qnneU9erS?IEfl8qrQRht4@jup
%-9E$,W2H8F<o85m;bBbJMQnnlHr;M.5(Q=4j/:f^TsrZZm;i.cEADYDdKQ1G`+o3$@PgNns3_!mD-s[mh>$o$po'X:i5kLbM!em_
%/VbX@5`(tsB$$HE/dggb-*bBW\WWs=X`ALW,-Soc%7659HL^=-+PH6b7C<<VdRsgo599XTE:g6;>.hBi?mR?<*KN*dO=\e0Ok/eF
%)ApN6OU9*7p#ZY'mF2F#Z"dE4S]*hOiOom"h@7D1rq(DaqX=FFs1&'SJ+M9Ar)`p_TDtO5s1eQFs88Mhks,,(K`C>0ric@kf.Z.`
%rpTj_f73Pj:]L3Z97M<,^QniX:[,?<q>C!Erg,kJoCG3B\)dSb\,YpgJ,ZA/O8o(hrKlEqDu]EIs82hYIeuW^npg8&H`(@;VgV%e
%NMt<P8IRdq8=riYjAk3SqWlW(s73(4IK&UuU6V"^;jOSqFXGT^9kJ\h(m6_kLNrR:r#CiQ&7Jj.M+!4In$UK&n+tYf,7.cf#!pM%
%ej0H*@O5-tY@-?[6Y'AO3>k'<2hGjuARKiT\G:o/6<sC7E]0FVcc1;9+Oa1(kE6-e9k[oecsrI<\Re#ji/XH@Lsm>WJe:J9G"JqV
%XUC3K$od&Nf@6;XEg/K(oBc$>KAU+jVj/.Ji<d!;O>NA'=p'Lo:SRL58d?U'im(\8cAN'!2'3a5$R[qh=Yn0qU[[aR,Dcd3k`21?
%2]m"Qlta62YZc<o3!STifD>/o+o>9S^.OfA@]iJ38b`>d$#p^OKW@`f&@Y.&C8KB)ARo^)VKoM%\%S-D5"RrN'fj=hZg!m[No>9N
%f?)E+T[EIr<O-(hcg`PgAn3EsD'WkB09Sk$"',8rh4GUZ[Y2YmA,NGF5)WH3EQjUS/(Qcf\blg_;mOC*im/tBZ)jrK*hjhr)PM*J
%3ZTht>PPY[ho?/cA^F?6,1O/aU`Fr*e!j-[`#$e[V$M%H0C5[T$K5]HIK*(`4_#"1oDG?CdDH[d&qIb.LeAt,L'JqeFAS+V!dCsW
%B-qUg?ln1;mH!4HE0XX+9Z3Eg_te+=-K91<CP(-kKnCnPkKNk1_I0d81SBJmk6!WnhLMrfq]K>b"QA6[m.C)-$e]$%S"rlPq82;?
%cdtL<:oXG(meNmod2qVT2puoB>!af'hS+pr^X04ob_&RRa%IX>En\Jj\[Jg1N8TP,ls2!!eHSprK3=91>8sL18,;6hRQK^Hi[O:j
%<+hc6X43qZQmGf5e%fEq'%\C<G.VI[9^]&(^Mif+Ti6+i*YnbYrb+="S(bZa-*o3?l4^l,!)?/L5B+kp6G/bs5/IJ4_NX&A@R,Fi
%[:`T%PZWej.U_D&])/T3m$T.4*9p1I4C-`a6LpL$J?C_@-lUk4,EbEYTo@8hPc2'L8=GHXkOH7UERd`9OrB&Intoopa.r5gFj9@G
%O'hZeeSHQdRO6h#P)_'jk:T`NlPS*M*9'iDA:XNr)_IfU3fSUSfBMcbm+i&b%[.Prjo,+Xe%(n/08G/*P#2Fr+D;Kqo9dkY*aD:C
%-n^_fM79gF5Y'kofnCeYq!Uq$9\>&26h6mO==A3_2i\Ea^&6Qs8IRH<8`RNHn@Q]AB#]i/jOLM<RlH1Df!3?ISPP!L_&2u3+PH\7
%1pBU-meZbYFWY8aFsBN)=D.&.T#];sPD=<[c[Tfm6cVOHeC<8"_./$#U%;Sus/XS<k1Xu>3It-h1sQG2/H))_.?VMZl_qp@9/o]L
%\[+EK*0iZXg8(m"^\r\T3m(;%_cE:i"n=#0QkQZRN'jq<qL+,:\qh0n@.;.SRHuWZWQX8.!Q/(>dK0&XhR/.V%<HNhCjGDMhXcZm
%LJ^"]F(,at.5b?m=[)/#G*;_!l-kqpqt<_<9?5=-adk9A:><Uigm]'#!p1g4lcK8n/VNsY`sHf@GG0KQq;7QOE?:kXj<(H:A7bS[
%(0<n5EO=ZLHLh0-$`g[;DRJeoih1O!EWVZuPbAN3XiZIm^/!*9([pDP#sH`U*Fo^KPkRlWcMHqoP^=lmb`<qWdPVh9l-+^3F5]+.
%N`AG11:OM5Zm\Vl,i40jD]SVB4WBS"+U6R;RUO$X,DA5S%i3'(W,iVlrEIT9cjkQJ+)K3YGdEU1UKs2OJE?[o:Ks.Q`qTTuD^G[H
%XG(b:jj$3#&BbGrPP^U_7#6bBB)t`e^9WbhgCR*8/:VGNDmE[L^@bK^)Xu<XJ6;1#,R8mWSW,/,Cn0\npIqg@G%R5fE@=,A`h/IC
%WWXgcg'i5_@6l_YJMNNeOPQPb9XZ-2Lsc#p-@-.0Is0mDpeCGQr="'M*0GqTc^%`=n3m<eaT6<lp70,o$cLGR499W!D7V4!P%fAa
%T$\,_o#VV$+1RD[FutCM>jsc&,&[L8G@;;u)""k@T$^,iVcA%'*W,[J+$/=PAMZt_bTQqLBb.!/-it^baomjFq'9"cN$:G4:6!Jh
%Mk2[SUg@`@Fktb5+4Xj:2)+=4Jo&IsQt^M._u4.R:fpP'Xg1\4(,(.2L#HU6c[*b(+"A_tbIVW_@3A(2+X!NToc]sk:@CjMJIG;8
%Mtsl!(!t`_kkA5/^#Q^!+s'$3(dagH,NX,93g!-!kQ;a$A%?5$i;0[j<8W%u1H4L&*M_q+]Fi2OqH1FEXF6(dU(>b.`jJBs-2G%%
%`L5'3C9?aI0,iM0'*P-mrh'LW`Pg'1H+r2ro<c#V22(/GHanEN1GNh2p>,7IjSeu\WA^>^WNBCURurh[fA/5VbB*_IXV0LUQ6[Z0
%:`bjd^*FuqXnRA.&u`8*=`/Z*GZAe#0);*QFl;o94Xk@kZ;cpDEQKV3_S'NM9H2KWbdol=a^_AaoGW/R4TejKR$bYd[%9A.GId2M
%9+O&gc10@2HiRqpH)m2Z_+oS)H`uY)j?Z]tqf:+n5sJn?\fS6P(i)'dro26)]QBdBI#-[7p"$u@r+>r=[+kZZ>l^JEj0_qMB@mA?
%0e2%H!'=$4K0d_-_X"eTr%>)GoqiOlOgF8DFp.K=Ocp&tFo=Y)e&@IBd`@49[%WYo6h)*/#>p"W\iFW8^)Cp,pEk:#DhPWH"..!h
%m?-fN3-EU[X<,c>%u?idL6r-U9Sdr/,OE5#^U-XAI$R./8(uiJ`JD>'^h\Eb9HBj_o,C$OP$KJdf6.ZbbALV8ieZV4@sCkDZE-a>
%EEFXOB1+ln@oqa]Q49,T'>K%bFO&JVA5-8%V+;5_70N9MR`F031%X%<fI#+bdKj'U:38f#O#8Y5n0N_pM4A/k:+GBu:Gli1Nf4t1
%ea&D4(5;rH-PPV,hu3&emTBS6:Ml3'Pcj>9!;-*gkK=\Sm/\HkQSCC-pabp])cJ6YPGT=$@nL#95U@dIHJ@l0_Ut&&AMYOlBpWT8
%.FbMr&+]C]1a#VOV%;0S8b1J68]s"_F*N$n]SoZ]9VDHp,T647P_Vd%W?)M6:F9(=)KuA$\-)Y?,+N:7LY!UFe36+h^P_-?p__;0
%n[B\U3K*COKS^blXHHi>Y.2JS8Ap0]"Sm=7ppC>H[<VonHg2k[F0)DNI8ilr6;P,pOE#'tZZadU`k:I[8u7ep9Gm;j*"sA$r.AFe
%B8^5&RkG^Y(^mi5?9a!#T?^\J4%Jlf"KA^oUS":^]J8@j%ao3;#XQJc"7PiF%D\7Wan0MW_+2E2IImFG&/6iEpSj<"c?[<0YeU^!
%&<;2Z^6uiEaX?O[BLDuCe&kM]#*s(rLoJ)P!?a\M;dJUqafKr*W!;Ot"TP9F+[b%:IeW`3Dd31egRe!TlA:^lnTFKJ=\_Adlh%#=
%",LBLMTWL36'.Ija+i;J^a!a62Agn6fZ5^/i'78f([%`;pIm]k\A8$W[)HHOca#ZqBF'*nJZ8q*f!Cai)T?7Dp>Di<m3qN8n^f$d
%m/pmT-_o9?:8fBZc\.2THT[gn2LEoZMpItHa+X6>*h9Bm,c^Nj!0BDu="A"]9pk.(Dub1iT/kmC6/#<T2qk9SY,u=?8].47FFZM)
%\h)<a`_VV:r.^QEjZ3RilWS&<(pm:2NX-rQKGOtk$htNBA($@m^uAk;C:"bu48AXU^C(3;s'1I7&-WF+:_U<)&EgBlE/!n1LZ`C]
%#[(6PTq);6*lacZiCdrFMY(*X82*tqPOD@>iD\ac.F'2S.UrI#:-uglS/Du@mVdSuo%=@V0l&X1XY]jd'S/CCKp[>Vf3u-Tl"j:D
%-Vu6=*[P;EG#dc4>)\O%PPY:=(UbVZQ9dR?f@N#OoKTD?[qX<Fb-l0O:`P4[S4sE@O)X.g*?8(]+4V[X&MsP?&o*&cM2'$YE,\%f
%c:2B;ebGTuGVTk]M8FONN-)8E<Anm_#$?'Ms(rE<OK3MNWrXmeH!dOm[KDU/,$2.qhbDj7ibUGD&+t)oCX0?/L&M-:j;Oer@A_kK
%O<_"'Th7VUG#na0Xp\Us3;Ea?gFa>qPF5o@]QllPATc<O7(FbJbcn<g1p?tNfS:pOZQu4%2(Y>Hc`_qM`.`/0GEjL1@GVj%6]f\i
%d@?T-;AQf1*hsFm<s\q`ENT7DA9lb.cM^A0G5H^Jg@`s<4?4cMn9c`*W62:-;59K]#lQ:Vk!rVg7H`$6ct4,5!eh[W'EnOr6<C#$
%DP3JV2<S)3&D!0#C?'/IinV&,U%VW4&)=Bp"BN4XL"QQEc5qL'fdB[i0G0SVnIdV[?!mQmSF?q3*Z.G-m0Ce]%`ubjU>1bBeQGmq
%=HW!TKJ\SiF5uC.:)/:KHR)]^"*T"\0RU5=dUk1pftFuP&("hUgi+)8Ih/-7"_,O`LlW4da[mpnTWLYS-)it&]tn_sQrMMYN5?4(
%a2:J4W2X,;@:J@=3M)1/,7,O+F&Z<I9%Rf%Vp\QC/DDEoq3g<)FC,@l?\[(nCJR`WiJ5lSl1\!n]$/3DU/YEae0@BG5/.NI`RU=I
%aK@S+:9:b2`c50df$nB#1FGq*H4e?4%B6EL2*?:lC>_&<agmftFfIk&9iRM)A<&NboJf^nh8YPh*F%LCIR5I.YQM-+#XXG_+SEQ^
%'3I%(*n*a*6^FAUlqJ![)eS*]d?Th`JtI*oZ;gTingO44g5tJL1WrIbFO.m\-ap&]dE&,f0YJiH.79MmhnAd!UB)(a24"Y$Q#Rnj
%#l'dK!TkH=9r;6pS_*oN6)P>dI'urCU;O$WAj-qgJdP\#Z1A'r1H7\:0,-?m5d+?2Msk;OZ,P`"!SW/4^DN=]nH"d&\Z.3;;-6oI
%ohjfI(O9>,*3]J?BoOra+4c%,\\8EW7>ip")?G44Ut+3E?lSK6=dDcDIsBKRZjOO\;+\Xi)IbpI$=Jb]XLu&"?-!,0ld2Z\="8u@
%E66elL0l1!HJ&&<1eqRe3&:RfJ9n5r%]GUB8:?,#Eqi,gS<k?X)I8r.G5.TodB7"SUljC.ccM(H?hXKDm[m[r_qi4@.tfWjg^IcY
%JATI;!nI[AmC`/?J/-'FZq3Sq2KB'?P>,qU@E1C-4r%V5B:i%VTtE>(hhnBb17X#QcZ7#A=\kj7N&q:;0[:(o*A%%E7q&mH*6KFq
%b^$(0Y$XS$@gO.+%m@lEi3.tDDHKc*8Y[d,Q5N0'c"C/dF_hp[/OFn0ClOq]OL^esdI.jUk=Apc,EgN[_9m1XEJl?%kC[j6AXtjK
%Ut]a"@kI6p8VY%MFXJJk'2IY-<o%S4+2Ag2c*kdq)e/BFEYaN+,$:DLQ:4:OSq-Ur]k]4<[F58SaZB<A.04O$63bI+<GpL.P9"$_
%5AN."m>]kLg'bER4n?YuR">JniWJ2*-^uMp2OMgEgcFgpd'ZX+73"(eW6_0>O7KYBd6J]k%A5P`(O<$iiakGdHnLr\:6I[hVc9\Y
%/5?m45g<p\Z;RfnP8*5=A7Aa!.aPi.Q_g]^#G6bD5W\9Nl1Em^gOto>I\h-aUcGO<Q%s8]fS!D=>RPl$E.qo'-]OO*+f9tE1q"/f
%D7nPJh\7j8C-.1Yf.2Pmh<g-8c^"I/'%6,^iN5*m>2Cd2[7g)A\1Z`WpPKu=;^E((`JN1M]k6tE_5><MAuB?Uc-E:]`&37&!/$oF
%*tZ&rD$<fb/&*kRh7VZhZhH?nROo_RYr?<-&,EOR'K:Wa#2D82lQZ?d39G\WeE4?aM?8(IRHQ<\_\R5eoMV:opD,cZ9X/:San1I%
%/3o%+Yp^JX>g]5\\#j!4AZQ2"q_^2qNk96;j1Y1I'T*n-4"!3rjA5ElC`[c"5H/F:qI7-8jub7(dKi^6"O@iaE2&se%TZ&a6u$7h
%b)6:!V^@5+4YK,.Ag>8g!T_kl"haT"i'eW":!_D1O^SU1h]ieuOGLJe3h"UH/nmMiNb[Q.h?@ta=@8+d`I!Y"54b2"<!:-9/$!3Q
%?,q$BH\>Jp+XJMXNEu.4TQb]GXeIo[0rmpA4#,n<\bVp\bfP]EjEPY],]aElR%>AlV[:QZ#S5D!BN\k+6VUKpXB4bCp@$?Wk?o!#
%S6b9uA]!i/c.7h$K^2'nhIt?&;Lif/"ZB?Xg.R#og`(h$^g4Q+8N9#*:eC#b;!XT3FPS.`,Q4#d>RJ0r86>Ih:5eG-/p!f33m;sW
%L-(II]N8bPS#W$+8RFBk,LF60rN\&5WjFNsh0B\+E)LnZP[*#r=2FD]as#1oHO#!XpUCl+8OoVF?((N.Qd&r<(X-%-LO<S#D!-A!
%q=aDOSdE;s^VAurm+C=UHBmP%f]o,mAbOo??o%i]9aNCH8s?j_:_'*i08lkf;No@h;\S2N/E,DH$%3Qjg%$L*<=b0oDZ6HCoe]6B
%>G>?XG=2_Y:K#(DaC[_4k:l0\(S.IkG6:JkpN&+Q:n$W^UXM/W-V.K-TE)=j\3rRFM6Dq*AnVf@jGQ:Do&4]mp3tf79M7]`RG_Xf
%6;SR:5Bpb.)2V26]:HL[Oc0l7hE8Td>WI5p#C)P*T&5iF,kI1;R<57f=CZ`hbpWT7a3SKp6&+RHerkk7YaMr@UM;8HYUXkA3iqB5
%_ElNTgZG=k!7'_hMbt5^VP[s7c(_P<INYGlUeV2Pk$m*j6LR(po'Eh;$pqIj>?,LcaAZ2eW#:KsVl,_*]u\Hj'fZ.MQiikspP>.D
%p/]WhR"Mp?*7[+&J;:F2!1a,faNEhnKRB7C'qImTOGfD-&'q!;Ce=0=_p7*)hIdmcZZE@%VW*u]GLV$e64p$a#Z$<c0p#EjFm#m2
%BrpF-=eaWqE#@c!n7:pt$-NP:FZGqjH4>)Vb'"I9W@LR_a&knNYhoh16AKXTnoocIJcMZ/,FX.9<s.CX>Y6iY;@uu9(jK_oeR0aj
%e-W8-H0$).mYKC?dc,-G,hQj+e1+95/s1HRb4=^oaE_%D&e:1eB"R!sruZUV\fBCCS;TQ3hdQLD_KHck\mNZgd`?J(*9\$0m-PfT
%:+/@9-t3Q$ckq]eqWUf;jiaY.)Ot]6*&PI>6deZR>1L%3WliK-QX:Z'"pok21qM"Hjh@N9\p^e+c2`iEO;\!EE0sQH0^/ks8ZF59
%UBmb8YHT8a#L,2)%bpi_6t=L2."pPk)6MW#$#M7*-6eT_UlD>c9"/8(jY_r^l<iW&W^dh+-k6LDA:S(8)fIiTd4Yu0f&0?2IM@1f
%+i>-[fKT,OU3.b@s2$h-GiLXh9.H"\I0Feb<er]9GRgO>8;lqqi_3*n!(8eH.N1%[RI`6^(i&h%#o>p(ZP@XBF"6F,3WlEdo3;n0
%"R3i\4kC!Z,<XX"C6[.b,qJd[0#(Tp9qc0d!&%[7FVuch-<L=[Ddd704fZ:dS;`C,mEE0'e`9t!iQa8NH+50X(n*mIB?Q*=]S,V^
%WsJK"^L0K$D!WQJ01"E7:p:puCQDZ_8?mNjIdqH.=\Q9$/R1WJI-K.+eFQFD1g\OK1-i3C/`EEZg/\7Nk19f=+i,5Wk[apV7Gr@n
%(dgmNXPo%3Gk:j`.T$g&b,E#2!09D#c5YXX5q)lVJO%m-][])s`C:>Y\'SOoGQhqN;_JHnV(cCHb6-3RLGm8q$j:4YBJ64#nn[PW
%3NT]GCHG;FT'^t/a\TB-\:lP+Mn$eH!_Ft,Jf5TBgJREO<>::F"c,s?,fT/?)&pjBbI>Gl9'/&/[X\FQpkLPI32fr:KYVJN<>l\s
%>Q%GulnaV>;9b8gSX'I6!:FBTp9RMSN`lspG3i6_WTW_;YVualZW+23hq)JP=^-$@0\j9Chsg%Rg1*kj-LSu'j48qG6-4V$J-$W7
%1sst\,1gV\K<hM#*jnbn(XOA5=AdFuToccL8N!mo8SD]*@,!'&2\Hi5(\+nX@pLlg^+NZ-Gi.$i-]8DB:LBXjFqH(m;ZKjr?DPF*
%&(o1A/@]56KMSu*.qhVfp@4q2]ahin8X8Y+U!0$'FNXYTRa98?e.amffEDt[:Bnj^7_e18Q'jS8LF8<M[Q(2"A:S?S]<Kj_?fjOR
%XZF<_(]_EURmBhh;A=+jrUUsK^jAmV0sX0dp%HOnUlpB@ANiNEil-UlI9CYJORKat5Eh-sKW#&nW2AZWg`G#C$Y5R?>N#>qLQ?=#
%f>R'<0;6`78)0il<k&C3IObuBfVe@FO@q>S1Ycdb5A\^K+D!::aA!=J.kP==Bq[ZK-kjPQ!1%I&g$"Ftn5aD#r2MA$(&bB[na':k
%'P<mMiFF&t<liZcBN:;uA?IO9L".053n85X)fW,5;SG'*n3]Cl9nk#)Q!iD"EQ3$Ei2MTd\`Dt7lN4XIZN[P_$/@HR-[LBIE+(Jd
%Xm<VY*iAb\]]FU5d#uQM7$rb(f/Bg,)6>Wuds+^Q75bK-!*Y^N__8:AI'-qa=a"^1S^Y"o)tkKaZ1?joD*oo8g2,A%]@K0V@f6$&
%N7&rX549#j&=UG&)sYXDM=`d9H'VFmACliiA`3CdE'5tE:0?.[J.49CU9tbSU!eg(+iqqE]bem6"t3NnX6H#*XjpFX:,aF<B?84L
%8H\IiAg]>":P9mb7TrZA,]qG>*lSuj-qF?Y>EOF]S45&upGmhO_bO^N)?]U=GM85sGPW0u(^??3nf@=c^s^CD+3[kdGP]4fhVJrT
%6jBHe'5*u/TJVKV$aAWuV7XIoJ;m[B.94-q/p'rmf(&A6#md]6.tCQ!YI1Y@6`l,t*#!8lB3dfj;)QWV#?iLS1;gc)6U@.i5Dk#8
%oSqA'9/LJ#YYu@^@RTdoolUorVeD#)D*D2+_1%:U.nA;T)5F`'8>NqY:]ZQa8:,!fD5W"^^Jtj*eXeoJ7\D$ZWU5l!L`"_JC\heR
%biUjpBF]/=(S=[<1G7)+0`W[HrGq8R`9bG&q<F.Mbp7_V+p_@B3)hERoldEI"&dSaQ]r8XNQ@og/$$kW0>KaZbZZJko6=an\YRq0
%4[#l^1WtmYG7I.G3la%j%>ajdZ(MT7[*\*$a^Pf-&W?bKas>_"Fb-o?.pN\_M%HL.<pm.lX<.V9W.S87?FfTNWYuGA#t2CT2@kNC
%c,F<59_Hd2FTGKU$)LrI_"3TO7ou%'+N4FZQ!-SReVn)WA4`&\0+^BhZFX3lpKldD_B0@7DB-Kpb/01/TOo;%Uq7&.B+o@7AZ.TM
%`?HJp#S@ElF3t@\-&+POA4[^e:C4'bS*g%Q*8Cm>mV.iYFUV)-TM&S`\L5pf!Dr)N6GkW=1X<WL-s9b_dGA)eI^3Dc]$^UXAu5Xe
%mni2AWOQB!O*:o+81h(&>m)ioJlOp9><i6Yh8Wc(Fl^Fi1mEI3>*jI%VtgiaP9<[Y&V=0::QI<a,50I^*.A2l&cm[^Sm"6fIGK^;
%qFQ+.\7J>677_]M@F;T4#csu]D+&_i`iGFd!>L)3ZPS$F^hPb-M^RF'n6k:L`W4-="b\9kf2FmkH8:M/EY$\J8Chj;SAT/6Ho#5&
%XKhe9cp45Ae86^DO[b=$&/m1@k@H$Y%NV/-</1+XMWK]dgu"$:8fS+-.[)ie+:+oIT<60rRfPdkllU=n(r+(^]mR)8ecDAJ?3":4
%Pidml!82C_^)3bW(1ml3gC$VMd'eNqSWt8D]R1h9#iep:%?PFf+R8.]6JI(2_OeQSE4gISiJlBJc/>ZTPKumrZPnMB(CMjXbC]Ko
%\6>%1VGO'4LU&J8qdGn'3Dg.,pl)ne[D5F779e1l&M&YP>#%BhYW0E,^+Z_WAdrQ)5j&.6o>r1WIG$aHV<g;?Q-m+u`WbUIQEjOZ
%"5<s(Wa6-P6'Q[!/^]gaFf#hT:%?:1<3tmV5=EkU8/\moPtBRg@#1@34V$&rPKm2ba!a\tp0?'*(7_4aP#/CKQ-q=FOjOpmSH7N!
%KL=ZC0=7:)Q0A]B;kMp.6OkWZ*NTQugLB+UlB$Qu0sC+jDruO-e!EDR%?O02(-bitkRElF//1VWF<oY8e0qJ*5qa8LN7S:b,k<!_
%%>f4odQ&-U`qT12:*Cc+bV4`3!&SeI6"T76GNHF^irMf-oa?.jfTh8QKkr_SD7=_hic121=CVh.Zt@lgcrF$NY+\'<Yp1N;fV9jb
%$H8`6o>Csg*2=cbZn+QW@!\O#-57uVc<rN,'T9$:["LSF0ouY-4#tO&C:\.:Jn,`WNql\K=KQ#;F?=&T3\65g.EYJ()<M+J&ZW'P
%kZ07U0QGQ\=`Sb@c*VLpqYgqD036?Z&\&8!H3bl#$Go?$9Q><Qj+%_7JrMhCq^3Hk!+%Jc_a't(M4PhtIoZ+-8F0&hB^Vo=_+,1\
%,CW]3S[E(c`ji<(Q8P*5(:kg"M0r0@&<mV4L>Xtj,<@o%P1Wm7.L)7b9DLfj?&9YdPc]NO`Q]U"L?'rE$+.[8Og#\>IV=h9q+kqV
%Lc"&o?HcaOXU\qZ+&UDsH^rc!7^gF8MI^!Jbm@'n/Bko!ZSR.5@\8Xj1]pFH<n.fOllMk*RCJ;+&0_jXK<Fj(nm^PqZAPn$ZoZXA
%AS6*s8.]/:12*F*O_rkaoM,DF0+3bU+6g:*H$$'p[gcB=6:.N-$dqo^^B>`2%`%$4-AsZ_1L5I5^es$_U\EK4^/q3e^hr^++pK]F
%"SYb%Mr"iLi+(T<lN&\J/0`P4LcR>N_(7OQ`hN.ZjDkG2C;jidi@Htt+=7(KbnKRX?^jWgob]DU?(FZiiV\S\)SoQBFl^sq<RKU;
%8;-T1SjDhd2&&$!JdjD,%Udu:Pu\H6FIk%D0Y,!-5sg@\0])FO<)7lnglL.`,dKh)!LuHt5W86nTkV/"4;uJ#H(i5u)%)A-3tC?d
%#'DCb'UGj+FKAuMU3:k6kRFf*C$-,W!q6_>)oX9c`g'_lb)e"+NRGj`7MoQpXS=)QJ=gHHbrfVFk>Y<d@;)6Ehk3O$8;%7&0Ekpk
%!C3!@K`gaB`UfJF!$L=2XO]nR#r4!S9OU$]@UG";P<+7^311AAp)G#<eA>drET@.`>LjBYj9Vm=R[3%k!(;Kb"_BFZH/&TJ.jnY#
%Eon;V8\Brm$(9#E\@B:$\%6OV3j3-&*?QgeMFKgS;>=qt`ooqu@'o)`^bo>W^uWF&PI9X/<IiWJP137`fH'V^#=TWXNb!qer[jA[
%1c:bdQ`[,C<3]k_9hqQF'184^FJ9E(4lE9V!6)J=U,2'q$E2[Un^XG_-/5hb.:%3h[/?&(2^;ci`-o_-LLFho-#,btY=4F2@bE1K
%A#Y1dADB_%\DMXAd2`'nkBbR.4W[ul=t,l2ba-["T`\43o&U!gNQ/ne^/uXMDbT/=Ld8pSCf-T6/!e&oG2>#$M80cOrYBXY"U*a/
%7,FS-D"iUf[ij0O9:`l9h_CpEWR)V'X;\qo^_D;Cq1n;c6qcR)>/d29#qJ(k+`cTn]H.NT`%K9OWiHTF$Ij']!d`V8`Zp5UM7.n&
%d:X8ik_BfO:S0F[Q%]/->/`9G)\TX^Vs.gsK[)7h8W)nDq*]XJdoNA44!k0(n_jU9TbJ<M#Sh2`hoh!-b;t<l,,'!)$`u.9"5Ljm
%6kQA)-/@TEHpj]k6[7?45SI(r*#FS[7?LK8>mM:fK(dtih9&&F#"L$OS[.@a$t$1@e07;,)VWh<>#cm*_Z0sYHHUXh?R-1@GWGN\
%^FWFR"qT?77qJl(N0'mC'X>6?KWG_mga--h\C"]&)4#aC+9*?.X[USSi!$\_'J[j71CN1$Zb(;L>qQD52//ea8I3?DjY.3XYRjI]
%&S[32+pJ2m-b`QI@4%\bD(GEX>'I+r1=?<<B$_92AY@g>/*3"i<.K`Bo%"<*;jJ6$)N%'1a>`)e=B:K\,$ZlZ>TIk2M+B=0W(6dT
%pT^=sNt53[mmbmj(750dpaqcfJ-83h3!g&FU(mAbmNs1ra`).u[&>:;DJDIme+_h6AePVUr_Y(2N'cDHqM/C#L!WF_Q;q_%0cVq[
%VTrLk`)RA16UO9n;r+@OW>7qM0aGJEG=SH$[`f*mmK,1_!\1T1JDIjCmOIj$&J,jp$PMi(#Xq%!Torfa\/MNX)`.ZIB7O>_N9KE;
%<lSen8%JkH]l^C13r/SN'1Kd7R!:*Nm2gs"N;#kD/V>r(bod2DIorT!8/WA\5N/lWr`cN7&MNJ,$ms/)1n\Iba'Z'TUbaW-&p@5*
%19s6#&K!F'639VKj$)7F9O]iSm]D9LS.G@DJ%dWk]uIH/)Y)ftNA2.54%_0?,8f@?`S?)#-Ac=e%`IDY]:2&4#*IgPUg['KET0q?
%J48=I4M=btUs*(T[;5qrOGm*Y0l<Ka#WEKMs);;.,kBg-coXV^>(IaA5,\RV9,mLr%3RO[L.A`h.9E0;Bi(juKg3'6a\3q*AA^E4
%J=3)@2+eT=1a5PIj-%`63!_]I2D\\hk.sk&C9esnl_b:E<D'KC-=JFS=]l:o'K&Bib#pG4rEMi-:016@;3)'s,S'fkSJ^3R1)QQ/
%:p*fWR[],II4X_UV/_P"&]0B]e*D(sP$<eS38ORLo>Ml@Y$oLhLc^u>!+L/YcVZH!gTB-12EL>^Ano3XLaP?)102d-'*,d-Q(fHF
%b3.ZiMIT"+3HiU<&Vec=4V_DeLP*B_BObV(,)a,t)4`#=l5:KS].GWXkkHR>R4!8_>6*g*LW)A,14YG\Z(PWTKVnLb4Lfu*%8ABU
%@a%JYP53kG\NYcI^\8"Pm+LfdN+[cWk(9;f],?Ap6de%MPB-f5(m5D*\n`^\K[%@RaJEd"1*L:*$QP?bHe0`BhR]gfM@m35Z`ckT
%QFhp)SD*2Wj65O=+\&Y`G#,.]cTm2=_$O:K.YEM)c#90c'<h^LRQ^Qp31.r%*(<VnCPXi-;P[4/,'$kU;^@t\6?m-3GV2bDp#Xu6
%#jW,f]D$C1ILr@K2?*dM"ekeom$>MU1c.E^;EmgWkB-S<(qa%JV+?^F>/dF).L*1P`?GWm).ffh2C_V-?@)5<rRHG$PMY`d"FcG=
%p$$htW_Z*k<n<;;;2Y:Lq"1.[:P@2DK01?d5ot3TB9ntfKFYo`YNI**<d[G"c1p(EO]m2XThhtO,E<0\/HCU\$7U>sj0QLW0/uB[
%3fO%b@*csQo]Ba`1KPs6>AbK[*C?OZ\E-IrXs:IabI8Ap5dH,$9oK<;S7ZQ0^4c?q[#,ScD6cncg-.'`7_BaL[5-H+T"#nH8bE5k
%:,-d31)uAseK/]MP-C0fp2pQr:qN8FDg/Rs95-G=AH.16DV3*K%Zm`>i/F&I9[G,!JJso/P]0?/5.HCc"<sTdS1d0lln/T<?7+V.
%`#6U'/9Jlakb]7u7p4)fJ.i+*4g%>RM^DT:4<^j@F+YkdfcCIa2N)+.D2*nl#:nfXkinq@Fd)_m>LR_4/<58"iN/2NqLu7?#79F=
%)EKenQQR2cIoPDJ>-]4DUTSU.a]*uD-gb!)#Z%s\agc-m:>-:51!h2^TT*<`+i@#`DkFgtK>i0\nnjP\1u'B9T%0`u#b`N!YWM"M
%JGdUp'TYp^M/g).@p@DN'L[d[8Ke$(6&q:T%g,<i4Fh3$&!\#Y`XcjHY-@Ph5k2'+a3PC"@.WtU-pm+#afs1Nde_Be'W3rI6Q(\T
%PT/`;?BM;B/9GHh:lq&d>;Hus#u1"ak#kcPm6c+)'G*%G-,Z`oLXO&h^d:!OSm6sT\3pi3\>t?s=pc<Jb*<_F!?#t+TYX\)b0b-i
%WD?1LBJuAp#7cGbHk&CW-.A`+<[0h6#!`Q[Zk/E00i(ZT:9uG'mQi5a;=R1S$:GS@5hL.k3BifGDicY]lSdkbomMD31URVqi.Q^k
%:^l'5VVhilH4>]L'SiL0G]-SV&2Z(9UamcL/1eFL@mLAqQF`%/)dn(m:U3STd@+bD;V$Jh0ne@*69lr];f8Lmp>dB%?ms+=CZ^ln
%J3H6o3<4SD!;r&oJH]tRp[hWl2+]]K[fNN9C=jm^5ZA/ennc&DlRBXFi]/A(+:*V'D@H[U`dn$)puDCVf.t=BShrJ\"YZ&kfVYrj
%4hnWEm0teKI+3GhCR&16Sj$RG5oJI1!P/k[!WissPfi5'd(4JAcQft,URo8Q'3Cm'qum&ciVk>Q2CIG1K(1W$6>:OX(b`[`OKJLq
%AqLt:\8ct+J.b-:aAm;3+>WD`QiUCO5X3hNC""\m4Dm$7`>_Q(91A-cH-[$ib@RVt6t!t@XP[P9,7%b5TaCSZ:_m52YI#=D)IcW"
%H%mK$`ceI92F<]&WVU@oVP@<rZ6[gP5jduj;bg?:0Ei$j``UJdekR&+lupZ.7hWi/eM&mHB+dJ*>,L-N0=Zg@cddPigD19ITOnJ`
%QgeaqI^!F8qCDaU\::qbE/JoaA>1+3?IR;q):+2W3+W)afaS]'O@imnHK:*gnOT"^PR8!/B#l-%QU<9'VA6(\0=ta',f.O_-&N8Q
%.[9SMhM.St')$%<N5m@A-eV'h2S(F\'*dC!]t?`EP70Sr&WeGFi>-&4kfTDg1bR@Q!T[*'eFLRpG[;S6BeXhbNlM.[MZT`MAhKhY
%@EtPVQuI$On!h-##&[C*:8,`id$9D9&.*!Y(44I*Dai\GdW0&iQkjoY0[@rNR+*i]<O</gZ!K_JJ8I^jd'X@rmB?ddkckdJdjW'"
%$3ic]$5-rd0nI8)L#d6.bZ\Tk7t=hQ^(ehj-ENJ_3s^J:7BG3e!e<?Z"I"[VrC1&fbmR?J;$*0^]gAt)`h1Xq7A8\Yh.4Zsr>#u?
%P@r=eP1U*cZlgqMLH'ceY^@'ecEM%QKM>?+0UkL+@lBM@4>Ej=ReF09@nSS0AQ8!T&<")XL,Y'9I4.^I=[MCoYF/%'FumlKb8oi;
%krO/&'U-l\YcI"_RZlu<Rs^q/l52c\EMD^?YbW)bCU'1^ft;bP^f]bc)'62(Nm9LWqQJoK;/?\>Yu&7DJ9iV:=-q&+6bpP=KhUf3
%5>*0`L5+U4!f6o8WNL/*K[*A0+C8oMR[L^I6jPiT@Qk"DV02"^E<o8Y@kn-Fjb5;r":08cd8g"@S"HB,>'bc$@[6\h]3aA(*MBjJ
%5rD]F<u=);D0(6adE9N:$RPs$kMh_B2f[+H[-*fNRUTJfpYZI?I>Ketdj!#2mC54;Y'og`5lsDM-=ps@6CMs>TVhjU0'c%n##RFQ
%`TIl-1NO$S$"jC;H(h%3q[L%BX>Q]CCu^(@Q&q(J/#HI!N\nlD[HZ"oOqbo9GDi\<49:cL)ecJY*!eTM&pcB0C/NP5UD%WY2on<0
%E[3_I'7c#I3>Q*<+n!>-EMfH*4Ga([at(,e)2(s0H_<879<GtimJbdP$[r/0'-RM7"(;`[O=JI`LB1#V`T7n\,]gN[5m=o0L_2.<
%$$<-]Ym#WGZ-B(9=Iq*'8IUtugE9ReVuf$GgR<e&"@I")Cec)lU88^M9$6;!Y6SX-r@P<Oh28G*%0MtMJI@D#c5F\N<GbI)]UX%W
%UPYlqMg5N2:Dl\ZBAdXS9-AgUF[3+H#u?Kp`V)&6H((kQRRPSU^l?GMU?WbF"9VjaI=^?%S&%j`cB`LeJ->a!m6[d0S459V639G^
%(N%o<$rE)fVDJiMfat2cj\2Ua6aUm=bT>[f:24tg/%_R(84,oV]tR$Njtn0N(cRkXZ#IaLDTu:)!-p+aM3g(I"14mTG-Z9!9Ju]T
%kHuVA#9`sVL'TT6R#h::>*.jke]dPo&]P=RBoTEfnXSYD'URN_H/`5)3ET!dePI(\PQ`$A'SlMDj`!RBSUm>5-sl$RfS3)kra`.+
%@(?mTY_/JUdru'6PasfWe>:J9TMW&CJqPl3dH85=m$4i]89DiU0]154CL,Y42F@\,0F"2[Qc7UZ(-!8N)E/0p34Q"45XMde=Fo0+
%hN7JScF-r`?mY!0Ba#pN)4)<%g"QPbX.)DXjUWQ:c>:7/+Dc'.]q*%M'.A#2o@^(W'Od)ml()FrNg8JfXDMPjlPUA^1Y3u.bg'R%
%i=$[p17W=*##do)BI9IGYe#!%6tEMmW.tVNAr@BP#5IT=/\qFKHt9):e&;cc1coIjSgEhPI,$N<3*0S_dSrsg<mfS44_2Xm6stkj
%3*pmP?s"]-W+)Xi#`F\>IaQU4OhpHHC0:>AW$OchhUs@h>!`H`Y[4?t_u85ZLd1!/iO\:-k$Tft)UGq,>CaTICU=Y$1&-!b[0WfZ
%6t3Q"MY26<@Bf*FYjR@Pl&4U=AH7H0i,,6UT,R)J9H(8aUA'Dl3tp)d!4:2EYnL7$HU0?=P8#LJ(*1KIV6ELc=C%@b@6_@(,u&Vq
%iibWn__r<&/V7WmH<sd6r?UtP$ie3@C[s#N/k3WDm0NlpKbiWhQ`&(r>mhlb$Ku4jf7os8OO2+21LK]Y/I+b3g0(tn63Ms()\eli
%(3U))R#90hXF'grFBDdKL(W9>Mo.YoK9!Bo^t9H@9-uEsQ'5()#b/aAQhoD/0KR[[?CS2X$&$Q%"p<r70s7+I\X=q875`R;d9\@O
%L1L?WZ^>fl67cl+Qr"E*)kgITV.)ShkfO/6aMtHg]o+S0SOb]YBKB&On^R9:=Hodf(H3h\Km@7C_Lgn-b3Vn@eu)fco/62Ub0l]A
%H<PE<?JhiF?8imU)XB`36'$!p!RFIpi*:jrKXuSFNCkp)(_%%-nZca-QQt,u<J-U,lN*:c1p9<t$qdk/:OiIRVAALJ8HWX*VhdEZ
%ZI.O480o)W-s"f0D_YD/Y.W>q,^!"i#I++hFnbL8iI,q*c<kkg!Kr.@b<f!!SQK^knptq`@\bC7-DcL*=A_pgTB>DNqO`oIP%4rW
%\:ZAsI]ce!:3@J7M]>R%Ahjd1@Nh*)^3TX"JohjaN(;osl,_2""%DfAncStFC2u4\VG:[\Hl0;Y1&``k&.>6#KeO9ER^V"MGh?iU
%)!Cg0mp6]oQ>C6));(^uLIMq2%n3'T2<S#i5@*S!G*dMT,qli;Fos8J$CZic2A'C),#_IJ8Y.ONS-Y2350O]<P\/RkCeIj\00h](
%PVe?e_KC'ORB$TZl;f0P.K^AXH59.YP\b?F)8N!JQ<3;5!+9js`hl)I+0.1dK)8K!_`mr2Q=<<[Z1_Y'XLh]MTgC"G0Y50gWEH%s
%[b<Fpmnuq.&%eX3HP9SOlGAe?X4?eX#'?E9e>f`q$WJW8.$criN_iB1YhP8T=;2n(8D&&bB2&\q-pb+?"nZX'.ndW[BWW-36YUR3
%c*)jDmN$HUqUdAaN*o^im=6(<fsi%3C)aSCe1Y5N7gZ>LeN>Vm,Yl_Y"iM^`/QOp<+4QouQB>d+Wa`_#P;:q!'Au9#kU*"rC52"f
%QBX&>_2.uXK:an2^84K?+k\p/,u)[!rUS[nC&!t0$=U%g1\Dtkr[i!4JT4s\'J+!DP((Uj2!c8%f1nDGU&#pm"e,a=3Rf+Wg@H)L
%(qQCV6+pY+cs[W(8m*RY3"N['1;jF?P-(BcblO1?a<W[i">P3$Xa&17/$nNDT`47F3l%/O#0[**3,SHSRbHa/UOL:ihN%l`7@MS]
%0LZs5n>rWG8<n"!gclSqP&o.[r`Sni6*n1>8ms>k)ShXIifheu'fL]=Ja0>m.16MYFfWhpd+"4^[ha%&ag+;&f*S^7kscmVi2CM,
%?4^:7,)J9ckh:nbH-i3\SWmA^[$M%s1rOqsn]FPqd.ti0=hSr].[FtUe3Yt#q&/;n?nnA:MhT-giFo7t&Qd^h1,Dm9N'Y,]l+Eb5
%6[PC/988^cOK+&sP?BQi@#=#$444b!%USH0POJRLW>'YVUNNB&Hb:hL9Ja]j")ouSg-,s1<b@RtJUhldg=1Y1c(LkZ@04$kc^rD8
%3*+4`VGIJQ9/%*2(?ulRn7^oH-(.8*D"aJKYqt]?/+)PC`F@d?n\"+Q1-B3Eiig97AG7To?X8eQel%^5HF"Q&PM9d?T-Ds"'dao0
%$9MZ6eEkE@dBFYs/I1B5<=Hb,,,J'H!ubAh_PKV5%N.u%O]tc&]_p3RG:6]cB5KgQ%M8D81h)4^.OIcI<j5^PSqKE":2kedDJZa`
%/c+4&8hmr8eR[=T@M&K!)`/;G,3kiW*$(f?TPH-H?tu0[XBL]To'\G-qGMKeiQZ/DJ5.hHC/pedjpjr*?CB.SlEk<_@[c[c&Y@V'
%r^?Xmih[EKSoLscH1GWMBJR0c*B"<5-H76T:>B3)]<C8dOuu=mqQs^9'Ib]T!3RR-NM<kMN,#[)6qN)u@$h7_Wd^FnPt6a=(\0e*
%As9<!"kM0iaa0@NluL?_&l2=CFjQ0DZG@.^gfW<eH"O\D"i?qk58#;.(`"]fNJoV3c%!tG:(1g$=r%L'5m]:H/KW*l/!0o?4ZmMi
%%lH!CZV,B0,#iOX&]E\07A>p6$[LCt))$0)Ap$,2Xl42(A+n&+>O-=pbR!DD,87%m.j>DYNk"4+^^Q'2$]372%I4QS.CqE@JX?56
%,jZ;hZ2T(!)8+3BP@X,r[]SFgj`QE3cOOD@K8eHJP.9'\D4H[f&pgALB5^W3/3_B3%=6N=YgEbHV(6C-b\B!&6Cr$7<qImq[Q&7B
%FMm9TY#+PaTH4jL\:0m1]t.WO;44'h1!Va8pTqZOLC;Kn-JL_]1;F%*M_tkgC(Mnl5eqq4dEL22"i<hA(<naUWs-TP$>n1g9ndmg
%DN\LcE"28,*s2T^iLu&/)[*IQCkE[d(u8',W"Zb$"?"p'ag=1I<[9T]'REP5^XV9:N>Cr\Ms@NpQsKb0hkCDai`n0h*!W6t&1M7G
%O37O>C7TITBPK_nB2KPY\bOl<@)]&)?Kl&gRl9?YmAM8iGg`RKk;q\>M2;\)N!^[Sg,0<;m+:)Ekj3Z5U89'pLfZLXOh&R8.[/5b
%Pkd16LS][rbghNDNFi?+1ot,`!6:p>EsnuK@a!R!W$Y@k$+r!o0[L:\YAr-&E.P]"&Nc6T[qPQ(AG",'"3h/bg06ZRVMdj)*IGd#
%^&VCbKPHlr_+<EMYZV]Z(\U&][qZP_9V^.#6&HFUZ0q>2C>S>cjuQ,-gVI8lMpVVn%\?I&Tr:n[eT`@b&2-7+CW922JmNToB0\=N
%pbC\VW/`j15)dZ2<2\q-YY$2u/t,F+KYc:\Mh:hq[]#ORD2;3'enP?@Vc@0A^'2Q1[$Ito!2'Wck:uce4b9*rop0<gW@0Rf"t+%+
%lX*KC:9msh'idM;%\:*:Z+?pp<WJuD@P`-gKTg,]g'jIc+ljkGK[]!r;OjrZ[d1AuP>/<`EOqcB37d`^G1[tp'Z[$=Y@W+m.@BAR
%cs?guW\k/YX^"F-339sO;(`$&%s]8R#3aOf<qa_%E1B&8%/gtLfH8dH`GW&&K<,ja4E9n6;32A![TV4QLYQ&BbM1QGW!6c!eOgY]
%/.a.(QA2HsE])?+7"oMmPr$%;;2@`)5hc)<TboCWB!HqYb%,aX!+8Vo0DG,[,,,k>`rHOAR%Qfl)QM(3W0j8+BA!?A7]dnmibXC3
%4!0AWpBUq=NP&d'T.&dd5tQ^U'nrj!%P8T=)o]od`nO+O[%(AA>-`W%H'nfphbq'4r&"<l"k[S36+(!n=R$N!%#-`uP!V<o$u#o;
%'6oga2\q3/$+nBVk)0l-5aE4hBJbYo-%r[%#JGe@@>E:MYSK=Deo[@PU.Eo`\$`u6>'cF2G1\"F6g##-UJo9;%Up&SgEf"e.4\b_
%^9=Ne)+4JeQ)MW6"?5h;5b&sQE?X&\1d;!OW2kc<[ldZ1;'&MZ?HqGmY^mTorIV*gFqIp'.F4:udF].S?M4hs0^!7@C2kR[Z50gi
%rTZu:A7=7I@16"ZPKQoW+cphZ2Il=j+d7-9Db5m17u<M;O?'j*!;a`*9+`rKVM"G.@sU/&@h:r>VIG<>ma^Q+J3TM*(dg>'RPKCP
%T&1slgdaj\Znf?>UY]M]B1;'K7sbO)_1L4RW&X.UYjc%"qZsD:P2\Fm*=CAX$qBRcZPq7C&lIKcUDo3Vecl+>MA@k*6B<6U['br&
%MD:PM)^fXlUc+$Bn!s#caR>U>80I2Nm/b4E_JiSX,#HT!7;]?M=k9.5`#Y<LFP0&ZX0B;dVn3:O"\Fr@CFqO<.+"n+7^jUo44bfX
%$>8,9W1kK_IE%l;bb#/nOm4/;SD:E2ZGGF3gl-6`&`nk4)B8Df8k$<:$"\WFb7;$&Vb.sH<-+MOfN=E$]%+f@1-i0tdl;,C\-3=B
%+a@/]3\*:m@Tp3gZEbSe,"LnE+;Z4((F;A!qb[l"qd0h6&dC0MK:TW=5fG$?5n)oWgk4O]MTJHnPL7@g[![L/gIh->)%FB_3[ks;
%2pQFa1/jij3R]P^`3kq/5fMC(UIF3*0cEX*_TtYKbp:5]OY"eR6'SJ*$!5s!",^^V';&ogBjnWF.Q&`"LN\O8RU9h3`5^O<f14/)
%-qb'WB6@$ZD;bR*@B^03T;BatMEH+`5J+Ns/#aef_`J:\_1D@l.N0$Q`)k>GPp=@T8N)p/!a33[DNdB2Eop,$kg?=g<$H\Q=B]YM
%Hn[rk=:-^kf9h];Bl;K`6\beslr+QXop3Gr'R/@aggC9i,]%-%"=&d.BVnJZdV'KrP(Nl^:*EA?&EN`o`5,Sl"u+#=,>k28'ot?t
%HOpsFg*st"`@teX0j"b/U6S"V2,6Sq`*$]gI8I27[Dsm50.-=Je536N;VD-7[Edj)&N5t"2i&Kq>;*\tG+_EqUcLgHLeAC+p!C1P
%%fM.pKS:^s&10[[RjrHlo';Ai9;k*O?+ol@!Vj#%A_9TDE:\uB-%uR"FmS=I1Jm)88l-'d7["IuL3QV_.RK]d^BRHaWKAk:(uo4k
%[9D%L,5"h])tDYhj<A"5R*Z^=UX"2Y@Y(K#E"ntb41sX$:Okqck!g&Y:qVOm+rt0W-jr3?4XFjJ-q%4lq)fWuq8kT>A%3hB9O=d0
%)P"9KUh"(-!Nofkd6ph[&E;cLam?TJ2-;^RK"i/JmGS3)fZ`9<.4tc[K,%lE8;[KdS2Y3+W(K\pl.T9u-]':J)3De,mCE[,]l!^r
%9T49I"454ui#6'cM(.D0V%Ri[9J*g<%E2FUf*P<AR7tM/GU`<!K'c-[.,=]FS_"'N7;30%(+PK_c92*o9W1E:JS=UB,f>A0k^\4a
%1([&`MCN/BE;=.3J!!bODmmjs[!6$DO"jec;cqe*1j#QAYu*#jK]$tL+K%\7%q;^n2AE+UU"X-"B64Lc9u3=H=kIbi'\8*UV7YT8
%k'e)J,+\II!r@mC>jCV,0Y`@P)g;G8.\OO[CP^bc`927>+K%F,V-j5YP^ZG^74E=o/IN&Z`M]27i\[Z#m^MSHH0`W37r]08nZ0gL
%3L4,WaQPY%b8N&f0FoZ(B8)mhKh0I%ZCK+T=%d#eW0W?a[@=.>W\`#g-5CmsnXnPS<%MK/[rJtcDn/PB=j,!)"A]RS8\,].[h,=/
%kas[faka&9C'?J_MTRI-$hmuD3K`tJVW/E?A'f^dWAl+doU1a\Wk$1/d`gI*MEquN`ZZNB=%_C3bMST(;_IBiVb5M1>(+p0cV-[e
%YMad7DcS?F[rNIKPm8<039uk1(8\nIaWnAWH0Iu+\L&^R-R>>;$+fD*A*?OlQTYnZ'Gdmb8#]Zc/NO5]$^a(=0m!s-DpjJ&F_eNZ
%"/rHW8^n>:U70T]An^'.7"VFU'mi^o=NOXB,R&Pc!*UmE(!G2$R\$QFN+-et1GZ!9C9aLh;Kg<cNln&*Uh=eKd>uh<oZU@0^3gia
%*/a@.#D`@3V_%U.VNi>a<\heHHpntp;1;#q]i8hV;K>rW[T%p7c*B>2\>'[A-%+[!.=6=3^:e,paXcB'03*i5KN$P)@80+/,K_\*
%qs*ad\t-+u\C1$P@4)KAKEe%a_FtKH8&3!7Z#\4NauV9_kM]%__l5=fM>i(1@h#O"V8+[c1[IS5n`EgWN_Dd)9+6AjC0%E0#]N@=
%e2SshWYeo=BP*7U(j=/i9hc!G'#iG`SItK_pMs]D7hHo%KSn:5&(u7k&qW8']ta@K[/4lnDKl6OS-l#u+Rj,Ge$ZDQ82YGsU2$(W
%6u!+*)Mg(&+RYSRJY3ZD(6j<-]ckNW'b=_(Hq74g*!9S;i`(&NVA,0j_:Yt:Tp!Q>_#^&%,U@$_*&E]'!p.)E$KUIV<YV&EK8_`$
%b8<!boL+g*WBdD<:r171BSe.V:g]V;:hLr,9CfM@=r:-p:b2D62.VrgB\'';.i`;obcc:-/m4CgROmt(E##"KlF;[3c;\,'f1^,C
%>,B%eCC90l]&i8Ei_5&s660DjiqPtJ(lj:;!$HE)5s7.MF+]_m3[sLY$m;(e>_L(*r*eT?9#,FQU,XY!Sr2!<Ha_t0"XnA>1,=_$
%ob"]>\=mVg&W#Klj<GWp`sEhaX[2WeRX:]AX5+Ai6T<t&V3;64!A&+`J7<4?OCs2L7Pp$[OKA=>@@oWa$s9E\p(hL4mi?X/@LdU.
%.7dT$PK51NPhol"(Au'c26=clk5655n7GHB.oE(n,)$$h!$T2Jd9J.--PXr`YF4T-)q)CQe0cVp6*%5oZH-1_Pmu).5u3LkqD"t>
%UJ)6#XFSMqc8.F_\V4Z.lRt9#g1lF1(2m#lWlC.K6eY/=C9+&C<O&Ec`E5FL"B^i$QGbFnqOoakFU@>[TiC2+>>o9!)BEBIL6&-^
%!.0?P.8c7adCHr8gMu'eeL?Os(fO1FZrdC1_pi'rZ)./O,];pYgL9ujX'1u\"n^eSNE>)+ONjoD,gmS,$F=_lf<sn#(;D]GV>uB@
%_eGNqe'.lFN);Mkd:th)U[$0prlHi@$Ct#Qbu>6m;3*mg%,/reX:S[(KLj+WOL&=#'rm#0>8GT2&1_.OHcJZdPW70_[L((6#G<3K
%nT)-mQLAgfr>bbgn!;V-s.-4]-,s1=i2@*7.FKXWF34o*ZZN&mAikU6=;I1dqN5$B/et"`LWL8Ag1S7MU1rTPm:PH/Zr71m@]>/L
%VZhN;<h&lZ&s7n-TrIuXAMZPb=ca%g!)t=PKP82A"j9ck;R8*L^1U?mY7je?Y<\LE;E(O6]r_uj!/C9jQ/eOYWcH3]PAa8$$7?`b
%Fgbd4;SAAZ\.dg9Q_"aKcL-S.\ZYJ6XIX`73*NE%@AH='!OacOU:l:lJ.;iI<DL^ei+TBC"kq9hI7?Q*7OiDP#V"E,61!Ui0\#N@
%A#(#jM,DYeekY+MP\&7rPqh]%[C-n8ETPh@<1V]2Q.KWu#?dJeGR!7#aOe[k;kn3-i>1FsLsg>/iEk<lZ!q&O]r#=dA!DNjS5Sk\
%d<PFS3iYh8R[Y"h8\W@40)DD2MHEWM</u8k>EeS02"mU^^mTK_8rpU2f(Q9g"tic,l@($c8C=n?SggQV2-9K,!B4.BU@AuIT8\L\
%$c+8d<T6[_T7=:?e,o'4PTK$RV%o1?=I1hlTg9Iu-okO%OXf<^]^:9)Zr?LX)O(]/HDoJ,3BneTVda*Z/jf8&X'H`5c]hj,Y&+oa
%0Pu?Zp_.GD@eoS"-2)Q"3As%Wka:T9LS64eB4l(db$&3M[2J>TGu@-//6P@^TGcb*=0OUS`mC;9#n\7KC+/CkL-nJch5VBMT=Vm[
%/6TMrPJ&S-RB-Kk0emKI/0P/cRP9#TQjCo3bmTj$e'N68U['e."YK!ikcfK7FgDk>%/$X'0r;rKR,J]^n8aT:jY5$u#rPN(eb\2\
%KQhN\qLXm`\/%?VlP9IIGL4X4b2k1IQ)ljX`)L*KO0-$E0<!3V6+F3r<]4eeE.cRtU8igD8)Y[I'fF`JEM>OHFcE+]2)bB"G1`fd
%[d'A7qt#rP]PYhVU)_8FAN`@#mkk7bXZ2>qFQ,C&Lg##2-7k1J`85'@!_AL$Kd2e8H4WZFS2W`M95oR4q@[n4QIZ6kOOm+')U5Y:
%]C9k'L6Wi^E3<=]#j(U0XQ(n.)&T)^XuKN13C]t5*`d<?^he^Da>?R%'"Du'ntuU8msq&?V:EX?i9&V5U-&`OLkJuWH'f_pAe78C
%QCE0<ZnK%i>\amAer2N$+1e^[gN0ZJUe%h:/,(4XJ'"Z'M2F4>,ca@mr#h]AF4ETGZEV:Ui(SVn?=Cs12tpM,8(:a@6?(8@iW+r@
%j(MrE*[]c6")JBGi$D(IaHfZpMH=7A8g6fi$WA%15,0Vq!/#E:Z5dEUX%aq5#oWOc'e8S!FJTRi"_f#e,ToO(Xu8#[Z>-I@eEKD:
%GfhSCG@#k(r*ml"kB8^\jiQLi"1WksQ#-*OBt@`2LbZ3SC.&$=/Jd2D>B$Y!pkXp?eJ`kcEntKl5.$(eZ(8AYfip'!8$)HeQMspW
%i">utX08eY.s]'cg#D@7onjf1TXO]#O*G5?4h(ji3BCNon'F&ekTJ8tM7:'jW(g:R!USI:;aDjmI6\YM#t'A/[I)K!HGFD]MB=je
%\"3"m9n>gYL92fB<b#[@h6PSLfkq3]@Q83^ZF602O-jh>c+L._i?QA&<^ZJ.CqadEMB=RG\(TJ>NUfRJparrR<i=k1#@aa?Z-=fP
%U2h>UcW_.[,>-k8Gq6-Z+4/bDMj9^(ajokNTssmQ><VR0?MloCJqh>gT!-a"EZ^mlO.=p.:\_'C^fJ)+&K>5L3V&!^ZH^DBC(G0j
%S0"r@[T[3GD7<%%]WF*N<pOb;V7Fi!h/9oD1NU%Z_qQa*8$)'Z(AV"cr@pB`X&#tMHe@b"AG"=14t,-;TeH/8:n4cWP.G&>XV&ra
%/t.5hHAThQEorHdU&<$`h'0k8VN*C`$r\J!5QP1rI4A\:pL<+oclhfr:>2@q<rg&AjF1]7T'[9bfPd):MqY1%^7gZYE-DY4$d%sR
%"W\tZ:c@BN/6FVND9dfq@6m0%O"lW(;I;p[';V,F#D4'JiPIY-^bBE+@C>*P>+Fe/9GZQ`73kjFUbEJS?&5^K.?b.Kc6Hdg2/-`1
%ekt[;("@qI?dWTkL]^U:!O"m?)m(c<bg>84'Pqn6[^[66_A%F?4C"E9+h^5L$38m]Kp,*%k;\SR#mAV!,F0YRS@$$U+h0N\LE`]F
%lEu<[W>_mIOpIB[qJ_H'3[A2d8JT?6p0`F$7c:fM6unV\bs>"*/u]ENP!WIhToodur2Gs8B)cSe#iuQjOhg?*\P$Dc:IZnj>uJ06
%3\N2^U1>\!WnKW?oLC7T&pd/,5\(-jTJe#4C4c4+kU(k%A?/_W"qeAq=]rPmFSnS>.0)j&$[U/Q]\1f07p-i1g:KnDJ=LVW;Ga30
%@31OR=J8p*g.!9<:bFZSf!>6(2d&tF&t`($khPIYls1-'1iA4@%8!E'kenM:*pF5OkU&e/)<Asr)/_`5M6S3]s-llE6t]%hC^:9q
%AH6=5ckF;3D*25)Hcbl89$cAq`?fFH=K.h@f0lHPOB%r1jeTl/N67[8r!l&]C$Eia,XnN;MCK>K2-d0BarU;fYVLiq![>dkd-N'C
%WVL;)ndi5"`a5;-rHh-G5gCqgn.A[27B:<-^tU^=,>.os"(:FlZ1V5PH3A(JXL93egCM,;VrdW)Fo*?[k]+</BQpbb=Y,AN&dk:p
%Kun.``bU0[nA]-NZ3R=p);:E&'Y^]dN0k*.nd69i%B"R)G4b\UP>7f,Zi^Hb*9pEh6TS/We5E2+,m'l\-Z-uB,TV8C[qsl&gU?#b
%gNEDEhPp]";&G?BQ`Y"9S''HbhR4rO8!N-orOP]85GGNaQ(QR9eX7h\Y9^`o2Od\pn;+&i,JlS%?B7>eJ6-jf"'W#c#%5_/FLtLV
%W&E*9gmYPabVgUqZ-='<C,^"=YdRYD;n`!`@-1@*2FY.0&I<!FWqJ6t85MB&k%SkmBVRDH5V5ln@@^_o<#u5N:C8qUU?nBbDD;o_
%bj#N(CYZ**=#-Y37]0uF<i2qoJVK747)Gl\<g/!84DsV5Z6nfp%,,(I6s5`+GmhH=V'IV)$RfaG$Z*rsZ_'s@+K3:8BJ0F\OeZ?s
%ZODp!3mUEN3<Z+'9&,5,/4-K<TGCSQR'j>=0.AU@$TH?H[568W=s8Dji6".8LJ%S%m&2CV?j':Mj,%D6LPsY]k/l"=YpTj1E<1B<
%cqD\13i0JH&BHi,M`3g2,.&0$ZD=J.ZBPsd7L!!).F'Q53,apdWhg9N2LVB(0s$BaYk[_1cj\MekXC_XV/CbQ<\&*h7C^lkI)O=c
%As7,??6?Fo[p$c*mH<l6p/\5AS,*&^V>nmmf]k[`k%ef+9-3p_gDq<.m*nagBHckL/.C64jIpbNcsc4#4^;NLnU+k5DHXQ3/G#uJ
%@b^$jA>=#!PZtWcp8u&//SnK2O!pL"MJ9*uHUQ[i5RaW5nDr(tB#ILS2b'9;,(ju^juO$).$[,@+DHZ56[PS[>L9p`>0?p25&+m]
%"R[l>^1`_>Lq8p]9PA8K0\uA+9cu4pXu@[IMWfoql6]95U>1q`(`-&KWAY6/d7[N";fT`%BDk_!fPrKH;UP:l<Z29mSm6h6j`,AP
%Y6l!Hh@B'YpQ7<%NI,*JCSjOR)T,7b=E&"@QbsM7PpbQ:+Uo2']IGLL:!l!(dJ9rSG7-YK/YkR.1*R"84X%%cfEi@=MY!Jl4E#<J
%(9Ie_ntRCNPnu\8Y:#O6E]Xi/`^0d.YHD"AL)TH-G,]d#Tgg02>M+*)]r[6[RmooPI"Sc2CZ7KXQc^mki\`8%(CJ8r33EKkb](0d
%8=9@OBVEdu$(<,>-9Om9CQ<MFD_'UqRkO-FD>?XYXX4mCQJnI?5HK"!AN$H\hCiU]H?j$u@aluoh(5G(DYFiO<@S\[NDYbP+:MF5
%/@</7WFu`VA]EkJ;$Vu0kfP"rrRpE@pJrN^a:ZH?m/u`nT.-i#e2UeRr=HSmoKdItLIQ2[QpKp9ce<,i+b3FCd>7Th/<hS_(Ss,Z
%8pr"2dV`UNUq)a-MB"$_pZL+L!ljadR:VqsKqN)O;T>jjC3Tda,g*OQkTQB,r?Y/_;IWotb?_@/EdId+JIG_(.ah:u=A!6bj[$fj
%c;hB1?1@'c=^=*TrY$4n[>Q+(NYs7CMS+MunI7du5T@cK5W;Ilq>lYMecqC8.4lXd[X\sH'-AUg\Y;)o>c==em"lX?e:DD05Xe`H
%$t=?%+tc&=fA"""gPD/jC%iibN-%pE3>&!r9Nolir;5E"oU7KX0AG.F5XnLOh$.W48[H@+o=W?``QEinE*ZTqd&)nn^Be\ncn!YX
%iDJ/Bj9DRZ9oLVj-^iE!V6eEOhJQM81W$U=lp!aDDuH:Cp8V3Z+qAk)m[Fgr6;`Z@=hOW._KW,I]\\ND\L)oVD;#%>9$PdgSW:<s
%1_GU=W+@_n-Am-6r>\a`UB:qj<NkM[k:+DfW8#2B91>f-etPoWH`:O+9>ILNXN/>Nk.O<(4Er2L#8#f\:?a1[d;'J0Qd[-BI3@\!
%)oP`[i)#9/_H'cS1nZ)?U>Wl6@3,k'Mb+epY#RU`XFhAYiIbo7fNX9We6m3(7AprS^k$Y?`=NT%U">h+8$7#EA>a,>X"%2&_A;Ij
%N8`RCF_O\^iF=/U0<3jWM"=GE/7<.VU5/k9=\3[*>po4Wk%AEOL88gY'bYl6_*uR6/4Vj"nRJdYLD#Wj\1/1;H[Y:^O@+N[-hIK#
%&*+>ga+W]a5/D:>K26kP4h\*n"`\HQA+LF*.D*9BnEDjF^N6YE=ND!W3OPLPr3Lk47gUTB>gcAfhq'=f7Hia$EQV2n+"s.G?BPI9
%<)<tS;o@.]EKu[6>IS/&\kM$6dMNl[T90GDXQA,KAr=L%cn)I&Li?Db>*K%fQ<c/##n0XA'iWe*#\`(X,5@rF`,c;XeXXFpV4<&:
%gF$/\kc^OJ3F8lfhJ[\7P[EU]>cZ2$4tjeseZ5*OlMf*iM3H)WJHXX43b@W44?!T\I?Reqi8G'q^sC&uNs(HPm8R))#0<-e$8`Gc
%=?3\i$[8LJ7t;b,,#g$gb'U*41Y3(iFKAHF_nfD'3XI6lI*PA`F*_AX.`g;#X.oqS/%YggR]_IJ'P\/^p6lnmN_4?k0V`1MYI;0N
%2]p_b>[pkM--@)Q]OW/!F<D016/1NtC,bt$ZGk(lb32b5Ci0,mlVC4^l-dpq#V;?(>G6#ZP9bBuKJ_B>QetEtRF+Y@GEmQ/4?H=&
%pIkrB4q1=cC:[Z^jfLalLMo(MfDR]bnZTW<?aWEA4q75uMsKBTHqTq>3Mei\ZmPt3^n]o"(7Bn95*Y((D(NX2cQQKgSo.SPJ+ZAq
%=:MRc4)X<d$:P6"Xd>QW$FRF'.dT)T5VB#h.f2W^bV@pPCdhPah:Jc.(^_u?WhgPjRCC[OiG`(M0S=YQ5/Jbg9jY$3Sr4Qldb+iL
%rY=EHkrOIMAUBit%"g665YuS0]&&52(@!Z+17\\&-kq*3i`$'kkCc2$FRr^5-YsuW6M&IYPNEX3@P23V3ZZ'u3ca-rj=&U7C1H%Y
%T@5G`T&&b.7hM_dmu;.eSu-,T(J`[J@(Q-@l<AZ*'W[Vap2CZBCT!Z&Pu=pt%1\1&+LUo.CpP?@3XW#W6pa%Sr?,ioHO:]N%?PQ$
%92M47<+^k&jbtH_Q(V!<W'#6VNTs:!"-We2\[E@cJA>/KV$@*1#'qR"^pVG(3?+a=@PDDOSeoQJ`"B<]:N]Lq$m<`sJR)0S)!XM<
%&u]).!'&2,-=eZ`)Zd2LEs.DUcW3,`/'H?n_g?LZ,'"+Rp@6W9%Z[7ad2\*8MUhm-m@]JrF2YU\,2#oDdWX]^W/*\I*/_/$N]Ir0
%/22-.&-Ir5gkMZs)<EH]s41'3&NRXY.qJ]1C<?<^%(6hCQ@e&8:)JK:>YsDG!9H$T,>XV&G#I]JU9ir*X@l>YB0FV_S'n`&6eF!+
%JMlN0rotEaS$Y.-!@:*.(0MNQ.TXTC)r"JCKt=J?1jWa%3WOC"_78bE'A&C*L2pDuF;!n<IK:qF&0q;n,9p7%M!(JmkU#JMU(kPK
%(h:=P-hoIE,Q*;9Q>R=4cXUQSfF9J"W81gkkCh(JboL=?=R?H;1KjV*#Y(e&W[T6piY\2_mmX)Vo\N_La!f1/Dfg+H;Ab+Pk>_0W
%pb.8-2'>r;O<T4^&g::,3!RbPFGN3aE]f$=jV!kS`6//Gb/hm$am3GeWe2c8`2V8L`Qk*Bncq>VD"HY#7eg@Bp<23YN=sjP4#I`j
%#?bh,9I8Y.5=%;!^V@L1Z<gccL8q>EX7?0#E1.gh+_h/lS%h!CX4'Hgk*=h?>14EW[Tb\EX4'I-U!hDe;+cZT=2JDUSoC-nGLXFt
%Q,nE]"B1T+4k4Pm_tdlX&&qU*TB]:<\Rfn?EW\dh',Sa4BTjiL.RFikD;;=#@a4h99=6O,A?%k[R4]9M`d:R?-R&PTa<]Ha?!8IM
%[T]-7Cq`t[,QjkR2dI&i2O/hd[.VVB3C1ZDI^(HcB\+0fY3J8`UVEMt[lt[,.KD]5[V&Vn08.K#;VG+7[O+?.nO_E8N;M/NA\&Z[
%Zusa.jD#O.6shi#9-WXX'7!bZRaIr="2TEqg/=7GNQ,PqWOgS,j_2&(FX]An9_4fDbY;59<EpfBa6b;%6@t<`:('asf7Gq/1(/hP
%lhd7q6DM;[.r7JG;mN\:j,]'n<NJK'.Od\J8P(+/=9;<P:/^^QRG77X]WAaY%:qk>44\3og;18g6OXBJF)SL-s2.uR5'=$(NF0Pu
%_?*V;-5D3bicK5nP[L=SbgFK!%Fku'lB;k+/Lr;]FurF)Y/s6KPS;?iW;T%O7:$X'R9DN7W!gV1OE[4.,]KN%ocf'g(+W,A/S6h-
%!EunbM+(*7*k3-1H;Kp\DJY`YA<TWM@BQ%Km^^P]e^:7+oYh_JB]t]Y7BIf1"M_`oM_N0XnhnSU(Qp._*1RXN\.lp/nG"c>c9*Fu
%0kr49OL#9+8Lgsjohpo0B`h#u.-i<Le<WF67)^)ZGrsOe2@e+_=#5s$7.X[M*0pmi,"<BRTsuI1!&r)a;6c'A(JU52-pk'!-)%mU
%Mm*Mdn=Eg9(b=*/#FY6B2Y_Tf6If*N%'d>@11,'C_Lq)2leSq,:^%Q?q&6W(4n*_c:9?9[giLhW1sF-JATcr)@28+qdh?%W-itOF
%3#gF;2]o*%m:rMmd:T5"Mqt/$P&YqI.f<;Br(p%UQQ\-9<c;^pD=VgV<GD2-$k)]7k+K4TM*/E8No[KILq38GlsDWb3D1C#Fo[9n
%6T)%CI3*Lc):2qVB_A(0#G/,?75aBMeh,@/p<:@oC^HS5d/JPiiq(JS2W<'o-Y6.=Cf:GB2MC@%E=XIMjX29Z:;Wp?T`q@sW)H^?
%bkK7H4os>.]>lkpp`=s]<"2PajQcE_Fk4^8*,JK]\UW-0!4BA>&<A0m'4a4$Si3Qg;hsDWr7J<D*e'T>7D>*oW6>/9JXGIZQoDCo
%ULG;*FSj_JS]mhJ4*Hp2V!n/2(gTNB<@Zpc\!fsNjqB%5g?[#$!RN/A^q*d0"G4!0=2nucU`_,)p#t9Me8,'Ei=kFP+XUhb?e!<1
%<jD@j+F[#d%%jP%Yu_L/E%Oa<j:tug,`=pF^Z/4)X*)4*GU(oWWVa#LU^98Fgo<2I9N]4?]d_Yqr']JddVW]hPt-q@BJ4=U,^\##
%fles`.)dQc(6tN?MHU?E)O2Q?fb$X,`f_ON"HFq6XR/h$5[@A!B;IVb3Y!lJ0eQeW=<["V@9iK]fD0#(lIPco%Oce:;T::rLYL2O
%YooC@(e-n8m\'/[(bJBH/ZUhA'Ju"KFnd"`DFlBC10(i"QWk@pZsoI%7N\eGah+`B([A_Bn^e?"7#k09g@6CA!kdD(7YH1<burFg
%Jk?e>]<)Y1!(sih/2J.FW-'ORB^jS<CUT#;`"IrWMH>V?n)310>(&)!QojJaq(&gQK^r*^In_aL\pk"\/$Fo9h>0"@WGsEc:eSP2
%j/<Ao9U9gQKLm#\P(Qrg/f/["PsO-;aT,jdJK3278t&!t"m$$8Qk%-#)?gk)^A/%7RkgS8=HrmF5]ng.>EHg#B2b5VXQ2nWGb_GX
%&]eW"6,B=A'D#`>Q%ATb$JR6%<rdH(.!aO.Tn29Z0NV*(&2/WGcgeLabFm.,]O`6U@?7ZN-_5qSbu+ZW>p6F=$1eB55iBpk;8p+B
%2M>K%h[oA!H(tJ;OAm2oD:@'5\n,'3Y;RcjXVLKGSbKBf3m^X%b1Y!UCp1)iEq@I8_bP2<npmc:[h&%^oZ1_GdiKB#$,N^KNN$jo
%,!Ofs=&gIY6MF;3D^ArMn'0_aJ&e2\WkMZ"%YmG#:1;`>cbB2@n,E*gTASN(o()_Ho&ec]mC0:uH&2J!6rIRGs21n0I;sIXq<h%^
%rr*_Kq"aa]L[3jTgmuj#s7#<G`g*0Ws1kNDF=OVqo9];^#2_fTH?g8u>Y-E;ijAs0G\p(j(HRqW<ZTS,oPu.VU2"a'<gKh$-po2V
%-O#8Oc<2aV[^7W_bp)G2c#Zhu&Ln"dA$o#[QYt%d/WX*>m`e)<?M!Q<OkkNu.3b24`Z5UNE$b'kX5YEY"cTRQdo&:ff*7VsOW=p+
%o_PSdPDKSP/8ARf(K05*G%!#OPjsE"0X\p!=go"!iJLqkic*%;O[YZd*t]fUdFi0@V]?"/'_i\-_Q'Im'mc,S,!dM3!F<UdN;$E7
%U^7?4/`D4=3a62p7a$n?ZhM'bG&9_@.s*0Mm\JH2K0/&afg;!u!_Yh9-`psR>`/33eg*13E7<;>AO+B7UY!O<gq6RE\9:+\`b92q
%a]0ppX&/C9PjGck%?rkfk['<.+@/)>90u@*VQi]BO9`j[mlX[LEQK[3:$o%t_";1ecnDM1C6F_]7'm!ZNtXeAOa:Z'IYi*1=aiVA
%4UZ#4.\]=Q<(8GGEA6"T`BZc1)l:ucRWjoH=A]_uZW.6c1/kK=C7;hI1f)4fdfn;AZ%PZ3BLN\Z"K][<K8?(A>m=[3`,F)<O!kZ,
%KY%C:fjeGj5VDf#bU=kn7T.Z=%f(.X5L+a=9qXQ75K\i(U5NT[AI6L,fQk&/[jsCXOV<$Va>[lZ<42In%NlAuj`9C.YAaRiHKJi5
%)%2gX^@J>&]ToU+o^na%AT"NGF^s5Y`O>E:kC(eoR=K1DbQ3k`pBq.^1p#cW,5TAZ7P:@V"+<o^RV9)Rg*;3@THX\$gU5MZ$4(*,
%OO@9>eLsH2nr$83-(_@rqFa.!csASh<IjsDVC>,@G8$/:-L8->Nt"hU,*PRdZ[0=9.qF5sdfp#FXk=SRm1iQR[8*CaDBN%59lJgV
%9_5.<E];8%L!qK(9!JkmK<EbYM/(-WH5dX)PJfW4dRmk46>MGc1'7HL;,bW-B#4O=TlX`G9.$B%Vc>u?8XkR`=q5VU5C.5q_hX:S
%UgmT-,$g#_g[+)g;?r,Rc_&Y'0j%V>KgdAcjF"`=Tkp`G7a;N'3;JqJd4X5>)"e+nR>?1)@A*_k6[1aOWj&N[MU[*B\S\`[@pP<)
%o-m9TMF.C[.I"_,A;f.=QQOMu,u698CqB`8mO0QK!HsRG'-66C^8oCkqEn!<ET\X3n;k>pH2"p*`n_Koj@$rQe#`T=fl+TuJ+6;5
%l&5T:f3_fiNF>$JRJh,!m:ZIpldObH]Y0t&DTqq(J,&rlhuE*?lJ;65P;02ob:c*8?+d)GO2nst]6D6if9]QWD_Ln=_Q0=-gUk)n
%DtIC\hgTW4s7Z3D\\B)ek25'%Se!R4d!Fq`cE9@P[=>l;Hh[2W?VJ`b>s"pX=9$_m5LJ(!Q[el.DWaO,je)I=G(66)GCGotTAV_I
%^AP_^kBF\Nq=*h>R+a32rjM-&IDu(q>^H-nk6KePkEA-qci<Bn5JR'Wla&hP?(^ZXm@p?sGp^,bJ61Vu^?>&0J&D;8pN-p7:#:<.
%rURkV`Ok`"?!i<@]&VP\msOC24"Tc)TBFD(pD:TU^%ecAj!F&pAFA:Hae/(YbnkSjGNU&.[H:E%kH"W%H$-C(T%UX:P<WL.p!MWE
%\Gkmkh:Z0/Gd@".:]=b/j`Z'\gPbeJY'*%MEVV4*k`MkAn!Nrp/\W3:(OoQ;a`gPS45Ti8Iuqit+'FrrR7>eWo&]P`c%k'FMgrE'
%qr[4foA(L(O/I;UL\f[$k*+SJF)cPMGB:Cfo?8/FCtH>1\c1aRrT2ifS*%bY!8E\ZrU$6Uo&?]OT-(b[_gA,Q[s.K<IV`pU*PK-<
%&+[rW]ru>"L=pqHS"%Uq0?i>.3>caXpC>[.gKD92h7]SqGBES>mbZ@Iq['l]l,C2[HT]\sEVE5F96'`](\EWD^Kb#lnb(SiS%l[f
%bh#%Nk/DX6EceU6qbdpL0<[Qej='p,N6O`_%,TmTrT2"*/f"8hZe)P?oOKkr^Rfjus8MTUh(Rgk4r7FLTCmBkHY;Map3(Y>q"AW%
%n/sYsIJ*U!mMA*!<Ub0UHfFG%:UoeAbFe(0iLaYu^]3HUr3mb3ZL"4@-Fk=AT7EHp2chrIs8:KP`REW4#lXI3pLpa:rTTlLSKDKl
%i=B"&[r60@]tZXU\,43mGiKG_!;CoaJ,.hX2t&B5a&C8&5P\7G%+BP&iV'=Yo8>9Ich:M7)`Ko-hrM_fnUE40HToPu4Na8Pk,7sC
%pNW#(hYC=Rq[%,$hq_PO]0"Q)dSn(/0>:7GFK-_?1U;eM<t+'7Esd747YbmEIA1Pp@=P*9Q<N&k8TH6%@./Mbk_e:e-5Y!G0CQWh
%^:;qrM4To7\@T?Mh:^o1S:KeceaDeqrH\-3p#i7*;nG7bh#0Ou'0O@]B(2EWo#U-Lpk+$WO2N-l#>*8?m!M"2o)A1I]oT*>qN/J+
%\Gak[]uant"RUO9]u4jZj%\G;)>_(fY!57-ScNA8O(UN?T]]+O7c_h=c.+Ib0/!6Nk=j@`6DO+s/+A@RH9P[8gWQY(h=I;calD:S
%'0R.5J+khpG5!lg'WT*dhO2=?p?_2.LYW\//q5otpu_:>YA^R]rq,S6E_VS:m,4/^O'aAZW"3uLAk-G+j".86=(Yh-*"dZYH[`^2
%OTXJ4-V),B;t'=E>I2*9H#g">J*\&F[Ut""4a5gsd*=>pkJf^TjmGUmF#dKLI\OLdf-`VBSgB<3*hVEL@88IGO+$g9bfDTqmQ3Y\
%U"e!W5KNa#C)g(*n;/7MpH*"ZhL'bFmbPk4(Dg-hkPKq+*o?\V;d2=2,JW\75.pF-cCnTO^Am?\m/5l>in`Focb=ZoLXGeJ(i&4B
%lZ;QUp/$*kIO+;#6?kCYdXGGW#CIejQ(iWulG4S@`ZKDQ@fFjE^(DuI6E&tqc0_^.5+[\HgLCC.\ou`Zo6rUO@HT"!FR?;ZRJ!I$
%?9+8+pXNS8Vlq_VY4_m:>s6#j^:J]9EOIZLH8lo-^V5!*]+$W9q"0-NO.8X3!ome[nMPshi@1:ZSJB?(c0j`]bonU'YAS9]GMbK0
%nY`S.gfaHtkH^`[%8VJo#J>94VoN@SrUoO3SbLSmJFCd$pH#P?qG7)q[hnE)melV3^:h1kr6$/=c#.cX*7VUVT8S"#IeYn,BRR2J
%Q;?t^m(=%IUje$0k7-P<-ZVf(hHaH[4W--DZfRm-.K7]iMZ^l`r^;P0&"U'P)!8qGYEoTN3ArGDI*1W-L=nrA*V^eb48%BMK>X4o
%3&o.M:NV9-*6)VNGW<pj;.SiC%M#iB'-4YA]sBGAKYtG`_I9%o*'1rF[X=\pnrNK@H\[%q]f8!qmS@rg8('m]0Ln+HJa0j1<oBZe
%LDL2Ng&6a;>rs#E*9Npc5L0SZZc<.'=*ZpU2ggXeJU='PNaLbc6[8Nn5JiI?JLC<ak>0h,o7-Yt0:D+fO8FXEI\?3(TtH*r8]1OJ
%3K/+l3ko3sS>/RNDN.\W)XXKNSr#qkH*&,Fg.tS@rQFR>*)3dVVpI'[]=p[]G-oVVqWt!RltE%4p";.KB1MjcW6`1FT<1\U5OOl?
%Ipm)/kD0'Djm\;bAs[@5J'-MXkD)9>S"KJaq.[6"qVC8j0!9YIFnY2EpFC8H7!M@JYO]uK2L4o/hZMT@h!pmkhsJDUc,WHTT,6,&
%qeq;XA_/;U:0]IOQ2`tV=$D]FG-Ao84s,7qs82WeLK?]$@e5f8ke/*NRiU&$F!jepI/!?oX35^R]-iGQ0>=tV]DL\2+)ndNP<[re
%+@]\TOW_Z8lpq]Z6TYUd'>tlJ%J9e78Ue3?Zgm41eDKGW%NVU"$s4L\3nQO%FQc`rHYoAW=)T1Mht,'TS_m\%F7Xi_hnT-Z&U"!R
%..8P3$#f<lcV>YMBce>+3qtmsmEjD#g$RnWf@Lg_];t>^WZGId$fB5?o]P$het8RD?g[h8*s$Yh%hbMO45K]u54Ze\KD:(JOH3r0
%f*=mnr="*<.?<knpPoE-qb5q8:-PP=5PD#pl/_e6r=1O`F%ds"HRga&Sc"(DLX6C*KQ;%(n$SUF.HDk$Qt$L!;%N>e69_9.O"'."
%$Mg&Ur_=!sJFc4U--CI++WjY(#Ihtg>S"K\r9C<n]6?&V/ui=*a#\<ZnEn3Fe]hHFI@@4[5CIr=rr(oJpf)HdZMV*ODK813eJEQe
%ZZ"W?\<!KppW^spi@DRqIA]6<n'_LmG!</pgjV,NOo7K$k"WmhgG.pcj6>7Cs)`U-na?!gb[5aHq<mY3T5HjmbN7"!`SK^d(N2OQ
%\NP<6Vk(TcZ\c]8UfPJ3*.Z(kgb*7&0dQM2*t-,NgbC'u%*<qTo;_2J&3KdXbNf[_+)1\`XtO&[aVS%3q3`k<`aAEHq(-_P=hNpa
%QgC64ddd67LmVP,UNEL__D>Bd0.H8[rgSi;Tu(_4"W%*$kI#MWK_6YXmHd'MnHo,II@p(;rq=U@$bjY[c5WCk8Gbqcn-&sNNcCOu
%guc/fD)=j0E>oAHE;8Q4[lMHFNcCOugu]H_3Q>orELR'7WijkGIh?Dj@h@oBK_f"rpd/9@B,H>KOlc/k,91ji&[n#tU@B\mL/4V;
%Sg0$1^2U]:<sUIb!QE5/d($["qq]rea5Y:g0;#I1_81\DBC,U?#L8mF3siuj46(R/r[>5<Tq@tS.c]R:GmHq'Oa$(ecd!d(eFDmQ
%%VOtr8al,Mo8]>>qb5q)If.8Iot38^^A.QkmEK!fN;c8l7hZor"eLE"\MG\gYp02RNW("^bK`gKhgXX"=Q*M7H\)L5q<G$T(O*6L
%DD0l7V;@f%9%a)@ICoBSqXt6)s)7^srA5LEn%UtlU*jn.?ff`^hO_Og3P&f-kF25-rbg=6q:Eg!H_A(El;&L&N4V=%f,#NamOaKQ
%b<PeYSbTkh1[TWBJ,9oae5%e5nGKhppK<$YS+(nh"uVE,N?A(dat]i7Ybpn_$>QqX:uf*bK\\lC0rT)2a6k[\EJU(](t:ML2%DLB
%nIot!n':XBn@cbVo2iD6kBCQ?^U^o1]j='DhXMQFQTd8Jlh/Ok-=<@X^\H@H`IE<GG^$m6%<M!@-`G>iipQC*r$+MHeRPATs)<7k
%#E?^B4eMWYc[S&.f"lAl^&)dIgT_k#ZH#I=Du'%_B]o0GF7FHtJ"jX"d@\aaE$RMk5%I/:M=JX"hRV%Uh9G@7aN\-4+CEs]>joCV
%pu5'kmG?Yi3`7^"EkEElR""ftlU]"e:HngodusopG,Hth;1_8epi-,lLT@-'SmNK-KlO<_@=KB/fCt+M=.Uhc]2*k-1"<ct.e)He
%@s^>cF2<q)r^99Kf\lu,kB['IO&SA/!sI<F9CTp[a6m"*lie[agbDHAo=VCD46'hB>A0Y;glEN3Ij3qGkjBIK]=6*94$%aZL[XHr
%D-J&OL[XHr*?@=dpi\QpNt1(+3d`RsQaS\C^sV1(9TO,T%s[aANZR**j#_R78!!*dlga'QkOIs07*ij447Ph5mlC5ls6Jh0m@S:B
%G#uNclgX;J!ai%PpEH*.]L8'A]pK'8]P$-IcJ4QPilH@aV"+@30OEOb+QB;qi-m`b*M47t]MJ:mkH[\QHDj3g,@=^c:I;Y:s7;RY
%BBOdDr0<(U^,\9i]_hDppP@P<^\d_>pFLu(rFDD^=7hm+BJ9<[#]1&70Y6/-3cKH/AbMUAq8Ua-VVQXkUMBO9&C*HRIJ8n0TKTmg
%5F3CsDmSI+[tXhXocAh5=5'nXA;@L,H*I1TIJPM7IZ*]Ro<USr\rD%HpX+*=^:AO`rpK,_XZ9JGn,@a-r"4,WGeO,rqpjBq`I=Ft
%o;:[b5j*"Wj3cJ+E\dK^^[p-.?XA67,C+%UJ+A@E4#90.>`HMb'l74EGVU6(Q^=cf:,VS='W?R;#?F[!HH7).]dL)Y^.0:2k@3uK
%I)P"bm!Zl;]^Z<$rVJe?^\mJgRs,\+j!j/N7r.j407@;Vl"D[ic)%&>\b(SjiFcgW]h!PCpFr*Ih%kC+aad0$i>tAK5?^2Ci"a+e
%`'p9R?J^*YIBa%Src:sH=-n-G41kEX/+ia%hjr#s5OZ=crqmIWCA.u/#^t5!+RtP'&V'f$Q0X(tKDm&:J`<aAP)a2<O)<;brqX+.
%1-QbMa.r5T(%m,"S\%,-JKLGpT/aldo,/U?cR03Nm*^-7[a:(Q2EZV1n`*@%)(gN.8k!hIT=su`c]<tIHR1oegUhaA^%20,2i%'I
%9,B]`P,7KN1"=K:):(URn%[3Z>q,^;\Fog@;(9gF.e(UFs)7du8ToMurmU<#&=5VTUN^j%qeL#`kFs\;i2QU:9A5C?+,@In5"X,]
%;j05T(p8qW^A)a#PFZ";,<a&_/[E8i4mm0r*kH69R7KNa2p_X(_[@eVIZAB#n+0fpI0Zn#Zu`A3F#d"omS2#g`qCe;:+u#lU:p2k
%?X;IdlLOW[@]G4SSaXk<h#/0VLO`u][<#5rTD_"J$\N<Oo5mr:+5WRgrY]F6(UqOnf2qCj:LfsolZ&IYiB$Qp'm95.Vh1;?ZU6&#
%J%.Xgp\q36\k!gdHN0Su5)10dq*)7@U"c1m2]<lun3H@*@m!/o$mXqaIW]c5hrIU?anK#@8$(i:'6p5nhlH_)hu3K1]_ga(]R+F2
%TLb;=o#KYC]_gM%JiQq.7/Vt$5@)!-s5C<AI%t3@5CN(hop7U=TDe`7DpQ/1GlM+m/mb*])RA[e0phL<X+0og^&%R"c[YreZO`],
%j+m/p^Dqb#m:Yj0MEUb*b.S;4`u;u?gA$`0.Jm1rrbR0Jrq"n7QiC^riVsD8?XKX2^OGj*r]g/B/IhRRcVA6BnTD$!]P>"Sf=?S4
%lC,]V[?!bq,SaGjTe2Ug0_q;.R)YB9q=agA\Or2HqKEaqV9P:WcFZ&h[CgBedR30ol^Sl#3$,oH`qQqR?FT8`M>cb/H_Y@D*ku&3
%$0e't@UXUh>Y4cbIJhM4*h^169ua<=>B='TW0)cs]_:BH.SRQg''@e+\"Y\2&Bhu^$t<[SI@Z#:YQ"9/X15Z1DaSuT^+Ps_6#l:7
%.ZJp/qU`EmnHd*pk=T6mr*tlG#7ob5cPDpc)SbT"$d3=X'$h]@nIFf)'d$eD2,N@R=e&O_<[#dIO4fiAEsSs*IAJ)<I]T=dBt!t_
%:ROFB)3YAl#&nk3!'aN%lf^)5i9G)BY+f]IIiZ58K/)h^q2:;0;L7>Hi8cukisp'Od6m8-6,l\nZ?^rmG(1A#H\;1t^P$scL6`ni
%)Y8U=n*[UXV.-U!+*N$/+*-4_Wp\;;a!'8c"+>PohoAf%hcBL3g*.WdhJ44*DJY3CHiog'%qF4NrO)04HQ9NV&iNcVO-TEb`ekY[
%`A>"Ojpeaf80>LBnWt*h`_,T3bdP^([5C%"[_DRX8F0hgp;/8:j7p4"Deu>C_X!Fqg=UX5NP-?Q\@5%D>jpmA0,qL#np4Q+2n"02
%I>m:VX,1.rlL`?!7d5%Da2#$MWi+IMgLeu6,k\>4%>@9gZ-`'Aq+-flcc_$P^[RCpZ!LO"nKNf%^Kk+p,4i@d,3CV<W5u5ddb%?n
%-?`\5TiI02:G/VcCd&,1%jLX5LZkPRXBjui`enQ6^609I8u=VuoQk<or[O<G%/q`a^@&@IG_#;b`]oTSXmPdXd/6qb[iV09a9V42
%ak@_A-$:lucd=q>[2F'6k0iT(N8<I5WZ&`JX#.,:)TP7HQ(BLe/)/]iZ9RC8>$4W3EUUK*8^Re>Z(\4'(ZfK@,*sPWLk;;m<m0X5
%oX/_L2ej5n:Tj]r%#0cNe`Y31%P:sl-l^L__AH[^m<e;PNeA0n(!ZJAVcp+5N96V+'/4$)K^2^4_pXm]q8L@o*REj$`j_cXfEI\Z
%Z4?Y;kG)Wl1WsJs<u26;8BXVQUBB^m`4A*cfTripEKW2G@77c^C0$jSp=1iXIefB[7JT'A.75'Cm$boR]IK?AP]td)N]pGOU6W?j
%WM,6>pT1A.SRnfr`[f4b-4tUf$XYu5F2!R(bN%4eSN%<o/!3V^E?mW4<*@B^1m\"(.LU`RZfl`Lh)@N#;?^B6&$no9c8afOs,I=t
%o$JC*&XJE=)Jb!qkAJd41,L1NS1cI?!$m#e3bYS"aV&<]b"=.CGFJ.0@W>&!piO.ClCk^Jr*4B=XMtL%bA"f@Z.m:@Pd`VqH?LUW
%B5j^:l\]5GA1ui`]<8=a3`Y*[j>D6S3Ufr)PMFVQY<(XY3hSo.VU%4t&jQ!7k1rI/+N#BCDmehIGE)")16`X%/<<$7l=F%Xo@^Sq
%_QgP]m&@7RADN>Na<;og>`r_G5*Y-\U:_qq?IhKB'N.$GoL^^gMZt$1^r,_7M=m^CXj441[O7QjF_l`te]q[dmZT&WPWETAZ0c=<
%$[->)W/@jpa2d4Y6Q.FRSNnGVW/8#brf/7_^*U%)S;S6"[B?A;lOTE"R!0%O7u$ITYCQU#"p1?ZZ19sr<_sLb.u\])FU$mBHP8co
%]e4%eO098(XO.7,CV5VrD7aVS'W^N,+`>1QQ)BTn28-H=MM4:Gf0/(PdRbNg!#;t_:jN!o=sdAeA(+;q<*Lqh8YhYO[uW0\4<LH.
%ac7_,QqW<^(@k<o_QaLOq_gg/o(_]0!1bQTN!s^rSS+$GF9fKgZ/@G&fRcJ3BQ$%=)U&Ch"^TE9ENO$9nVfblrI-(dSZN[5$KUr:
%\=#'-VQSO2P6&+J'9A!'OZ*LOc$g_GV_gTY`]"1>M<R=cnWJKQ)LX9,N7tEikF2g,lREkm!&$72$]mI*LZh&>qlj*7NcWI'YU!<:
%SW79XV\Mo%Z$D,E&+W`F;]232p?VLR-.Zf5p]QXtS53G(Rdk"W"%9edjLlA'X$P@f=92p(nHp+6aZ)t9[NY6kUJY%O$k:ikQdWlH
%2?D5NCnHZ/am2<I@hYk"QU7mF_G1lLh%!j)PpaEefg[6:gm@L;56T;Sq>IRu`5!:<0P#T7'h0O<>(1o:hfWR%H;^gO0ni0b^!:#5
%@.iHt$A*"0b::nT-/ie[TGhK$MIKu*SJTh\T>o!BAHk?frHW'X>u]i0=)TrrdRX-8fLt2D,&sQ1&X./NH]B<O6T()2c^#&@27gf,
%5E9Whg/8O50_A0p?N'@J$SUDa#Mg2Y/?Pk>Tni`sL/TrL+l;Th%(r\IPakuh(Q=!JhE/9h,S$D)iZ*Wscf(gUNLqF;DCiSM1SajE
%rJ0USo^qS.j7YauZ\cc,7R&Mn0u:j%24hYt/,X2\-$[hDD%u.\b:o\H408@&Z`#&[F$'OH?%h7IYWS?W8]Wq3#!g1#nl>YSEW5Wj
%2:pN-K@&1^-UY$*f:fT'#Bcr:XeB[7H4ij.@rmEagIffdFqYn"dFZWk[g;.,S\hq(jepb[R(L)]Zt"ZA+MUr`<Y?F[-keLM`<2Q4
%LL/mUoY-&(ECnPrBJVE*6gJ;Nmu^Et1XV=Vh.>4"aC"ThNB2I1^7fgdWhJolX]h0c+Rj3F7VAD2iu`a];&%Du3cm:1F58fI82sp\
%>)sYdeKcN1Ska4rl1qQTBA'8Aa&;CGk8k!Er,k.G=]f*<gM,A)fe2mS'r.6<&BFM!4JGF2QhR](3PEr]6<I$4q>`8D9bW()&=mV2
%bR)u?A%AKHdpjrI75q0-6AmF.V[J;n,n%&90rr;i?kk\,`M"XdbbX/UKc;Ah,+dp57=\:UVbrXmr05O4h)FUIgfni*m6@&@"G.CV
%O`j4X\_f=qfsQu&h)%AgJ'gpG0NH02`8i#-[6m'`8%WC8B6F/2N9*0<+82`o$u:anA.Bk97Q<KL]l';)S[KCX?5od?R-d^mBu:<$
%f<1@Nkq7poNgK#!],#M'kART7+[]%j&2tUFdY#rr45=dmBGm\_g2/l;_dOTUI+[qU[N&00FcGYJ.Se038T`^p^7$1I#\c(PN(@%B
%U2"`h9!:.)0qI<_ppd-P@SRl/d\:V!6s.JLRkF<]iqMQhd\@V,iMG\6%U*uf*Z;/nqS"rjHJdf2^<snSNei)O>)E^W8mY#9n-8O8
%`2H/'\[q]R`X+aigU?&V;rGEF#R>ZlX:6>#D2AnUZ/$\0\iB5Edm+c$gP-ca2>g\g/sK?24[qKm`>DpU$Y8ioV]cU;-B$'gk\.nd
%X=GsWPKl)"mcS#O<T!FA<crA94t&F.6qk\_b;%Km](/<RPa8=eh4`STRZa`YB@Q'.4qi9,`KiG,4Q?O(.l]k6TcffRf\IUrJuBVA
%NH<^Zc,`50_t?Y_Cr@I)HpmhBs7l'(X@Xs[W&Hm6*%_>)_fW:`Uml`A&WU/_QYT%BLFKBE3Tq>Hq64*9!9YYL_BHXenr"pqnHrCa
%"Xg/RlZdTN,TUHYm]l=M($CO-N*Sd3d:+2.("O458['\_;Np/C/W&++RhWkXQ=Gr8H-PE/;1"4,QKn+'mYSo/,,''mIQ9/)O:W'[
%/W6dje$5nT#>Z`Wd4*R;hh6"k%3IGpT19_EPR?B/TjO7J"\P3lCKULH>'I*iQgRVDlR_2&XGOCnOUrJ?\/2EFXG<ln4pcM>UtjL?
%l9,kBV@"OCPRhOL$`"Mr'j*J+_/YVmm3I/(p`cDbTU%>'#V<,b9k0OOpg^!;Q%!4nAcj=>_arM(_b3)blS<-qn\G@lW,9XdZDjl*
%:qD=;m'52N/%sbc"_@'1'cP]571oP4jVuoh-&5uXqS%=Y$)^\nhJ[jH$E*`NXJd`QMPiL:)A^Q$@DtOd'MF&<Thlr'PeV<[@j+`&
%C)kcLA'%K>/T9^PL'^tJX`1<"5W8,CRj`:9]S,6\hf5<uEr]h.U\o2`pPo.,8O[9scY_iDlA"\g9eAYFSutP=BbX0q8]5Mo4d8'l
%D6oq6329JPgsBa\UfXstrH]J[*_KV=PQ?L^`f#Sj@`aaOVUSel-8]e6mHuno!5E2j8*F4-Zl&aHM^g&(>(mG81sV*'Cr\aS&Ip$R
%='2:5A^so2YX@(i+B(oqh+H@12LOcFE_(aUmmL"S8W+#]lIg'MJ8`B#nRCE6-Qt>Rm;%*(U<'^0A;(MO^9cWd+]SCKFC[sb@iV]4
%-fEG`bLmM.7Dk,g^IYH-F15g"V0iW*-k#/8";>3IJuh-Wi/JXQZ0/cF/U`B3mYs8nN9%i7B94RA`K@>a>E4coNMdu$A=-g(hAbD%
%VFtOLhA.,J_eW!4CSd9J=@;W8(SLB*MYfHL<p^T8Dk#XLO7CfM]f!T75&?PXZ5i[]A[,(klr\s[F9'^f[Ur;Y[\^(kS'a![+gRZC
%`P,I'@TC/RW@Q,:>?Yh[G#>RAf[Rgm+($a<:1)Q%GX8Sm%IS<**M0U<Y)0Z5p$gX&%r.huRj9RDr1#1V$At"hNq1^Eq46jUr[gJ#
%[&PjHlDg]"\g4:9bbSuu4@#(uhV_^<7VOgcC:Q53+k#3b^92nnYNN^JQG^Vi5o&0A8pn.-;*@c3&`7tJijOY=[u7F2MBsQB6<:E$
%K&C`!:(7faWu9&Ck[&Hj.MO4.r14t3BGusB_h.)HoW#sR:5oU>+<3o_$Markp/bJM_+]ar1EhW#6XDIP@]^@#mC?:)dCQ%/@hip$
%8Vll@`!RWLP!i>CQHcWEL[siRC@T]mUCJ<$Ulq<<PT:r(eJ*q?dF-'6M#BUA83ECR#u-#N@m<U'Ogac3p?LXoG&O*/\h"fGTns[-
%IQ5ir35PYOEoM'>&HjqK)nJfb%ZZ9S%8LMmdYY2=>ffV!>b+j4`04`g:*a2FL;Go&KBTp6`_c.3S>!%4)i`_cqc[hj"%A42*+Y1T
%Zb\$lQ4TTlEeApBSL.oOQWum(,Z2G,fD,:goE7sqqc,[^gCu,dCT(r#B7JDs.=mR?B%dNNegrCR.j(W.`iA=0ED2P_$-V68j/*V%
%@s&1/e!Z@N@MK!.25*@KLS3UU;Q0u#-;s+Sp)V]p@Q6`r^+S^]Nk*7?L:Yp&*ufsUMcGc5"^G(?GSheq;W2T*2/lt>2!9/FeW2kb
%1`o0u5`[R]FCT;u5kC>eB4T-LfP\9"Z)37T5taR[\J*D7i\a38k&e3TC`G0(d@Nk5.23b"ZbB6C>0NJC3\*c[CC=oEN`,[I;e8<.
%A:4J58$c>*KO'Zgc#J^)>Ve_'G>4\UjJ4OWm5;=gl=Teug%)>cisE:+9<kXY9p&%F;m%MD/5nMl9.3Y)p5>:Y@(eBHfL.k2rM>f:
%OKgM@A<315!/oS%X9*"*;iWXD9Y*48"[IWi?l6I(W]G.,X=?-InFk@c)[H$EKXb"3$01&5P%(eaSYe/%]Ir'?f9K>a]d6OFZ0s`$
%MJi27(.0ajQVJMfdVZgN*G!,ma75XiB_#T>\]Bm\b$/Pj3!Nc98P@'$/M/l>Y9oakMu>mCE.j3<AQ`<Y#7&c&MCDA<3OfnRep&^j
%+Xed?-"fDkN#Xj]>%!a8)&E&I6VpgbaLe"(93JO)!pnJ$[O3;s$Hrm]nPft&Ur\1?FjHqIZYu^I&1(K]4SMYPU#Z%Y7lBeh`=/g0
%jc;]bji)u;gTd8(dR&duV9?Fpf=P#'Cl)%\4\+,.RcSfD7[t<14kDip%g8o@mL^(m%C`m?33UlE?T6gk>P@8)T)2Z>96(ZRo=N3c
%>(ZZVA;8+0%3$4>?;!niD<RS:7[AuoeJ+ps"OJk\)@;nKlDEtoWu1mh9&MV'VM7#P\>#s$Bn5.N`!u+Wq9#)nCMNi**SH'QBs7oL
%;!lU']BV<c$BgFWlo33(=oq7&f]bc?kjeOt;Sg5R`@Zi`;Ia4i_?1+Q$AU4aECfZX,OkSRQ;XldCV6nYW:5HR_m(EBW$aE-=m+Nu
%J=Li)9?r`nd<r*7g'BfndJuXg4[BIKeC6Bm%n_aG42=C\[B<mj6=A6C/18t8KBXWD*//B)atT!!gD$gae0:H\(ZiDZ^dh7KMRHXV
%%h(L"mEohhIl(:7#;'OsB8;(%]FC'f*30^iVYS?eR-HU><D)elrkPJ/Xk*t/%g0>/j0tDuA_96HJQY_E>Z.&L$-k_Nop`r^q88d7
%Y78C@!fK(W9dbJ]W,-r9mK.eI0>>Qn>'+CB]]k/m_]MU.L#2/Mmc4>nhO>q7<?,/ZrsS$2areV=#"^a0Df0A\C*=NI$q?W'*fO=Z
%-.L;"gl":`VuLZd-SfU?[:m.jiai=u'U9Duq\!o.`6.+pf!YQL]8$s.`Rpj:5FL(5.Cd?s+S6O^m`#sc/QNi,K)l2_loXK)*XFG_
%1WNJ#2hhN7*XCIG;:b5^]iO^t3c6Tc+N$8u^@FX#l>q.*aSSGhbM;,4c>,[.?BZ:<VEUXO19Qin;t%7sX_W=b`u#b5CO>Afhh7tC
%ebRn)R-jq(76I6>BdU4-p6L$?65BrEpPe9C+19.8>LR]P#Ctj4M$&:SZm8f,bR<JJCV(K)h'8Jp=QjM+TF4d50++1-!\@`1&:M-e
%V]V2uN:(8jd=af3iiQ,UMVJGhJkZn'+0s[-WLn7ubVl*Ym<uQa+DaE9-o$j8`6F6,Hui!#$jN]"B2#t+ST/)llNsGSAnHkl;,kTg
%T<Gs+eZITHVm?BHQbRiVqY+0!>^p>Tq.Eu$SA_^MLi3+g&LGTdA(`\pD7ZMY$=]KBd1j)Km9P>hCZFot@b>o-::qqebUL*(/$rD<
%9P,9-lk5`&.3,.Y#&Zb8N*`&OjoqS+Cq>mldat]`9<X?'WC\/,CrYQm0R<4t7js2B@6@?iHns3<ZPnM5YS,F?&,]*,A2208=a<!(
%Jm.tiY-Aqrdkt-1A*Z9C,Iha_Y&fugZtd16a#eK_n*HPbI!g$NPZKogH=ubFUSSf.J"YfB2OaiFLGWPC7;pHP].Lp;7M547$b\?B
%/2>t/VUZ!s/n*)3m*#ql9fa@h!;L@CO*U6+5h(*M!EZZQ$>Ykb!W=_u"e)ddg90[cbi4TP;H[`Z794GB<sG=6XUAH;pX7W]VWBJB
%ks]`f;Mbb>pS<D*l%W4Vc:XE:5uLZM$.9%#jpo$%nC/[;T>r^Zgeb$-#KU+&_P#aY%`,KNQU9*6/IGscFI!!304sW=0;P+[m:8O:
%mHDfg7^$^_+W%&SaE.J.a=teYHEI-!W,(WPPj.R1=-2[JU_qeLQ;*ZeHLT:A1[QqY\8p.3!6f)HhU>G`0G:T5F'l*a@0DB0'&IP6
%B2U0IYA1FqMDT(X5[qs_1`R'.$*0S>$O4@2XPjk"K,+,tq+7JG=mu5K5iPIGKED[<Lo89gp54Tt5W@orK?M^5I):\a3fV.\0FrIf
%m-D)?h3A\h_@%=B0leNa22_q^&^u*DX-fGM-nW/0;N_=s[BJ%goFWUAVA7$JkDpf.d&Wsh]"@3<RGWr"qV[mP$U'1=$FPpD5?'MK
%>5tk;38IGdeudD01L_r43!S[]@-\-<3rR/mWsaUM):c."R8'7N(Gg9kiqARO*:ZYiidmW&16ZdRD4aVJ5lU+g0dg[ao+5R8[pVA"
%,'*s:PLA\:PBNnE`UW*3*]TbUG5+$$\*F+R1JJ??M:gnPMcscGM$Zu[^\+kHF5Rj1!O"BeB1M>gXcNnLJ@ltH;6dZ5'I4-[i2Pfn
%aprDf>XcT!8lJMD[bR9ZkkkmAM^\9'V'bu1T!P-rbg](d!h,;1%<kR<X0c^$pa4=V&,KL?p(5N(i.^Q,'&l\#JO99Gcq-["QfY^Q
%atFLqOtD_"Gl/AE]/*@p*=5$_.H,CB>*+?84\fY$8HpcHSce7>/9WdL%`!?h?.39gl/9jj8HoO9ET\((`^b4E:1n.#gCG=GF=G5Q
%/a/m$&*s<4"Bjg8qhT,qmt)A,rtemkoHkWCf9nsl\c\57.g8$aJe"^QNL*"09Kj20-+II[_-O0;@WWo<fdN?l6(hS*!mCIrKPV6N
%r?;Y=<uUGt%"u#Z07B3"SA&U;_*F)a>TrAl._(VsOK+tN&U1CPZ8b6h4GSRA'h%j*"qdm:--2R/+P-+6W`cU5/?F*RnniAG&7AKP
%@&8B!G17,P8;R])])TfTIgcs5<FJc683488@5X]Wf%/SY:(TsUVOEt<Z:!8ZEO\:HhB]m&YLl`6X7WA.ou>-uJ))G#T!G`n0-#Sb
%,;fa1N_X@Y#YY=Ln\8$(]cGS09E;nDAZ8uXL%$p!23>uK)3WsSk?[R%Y<TH'noK;,rmQ+O\d8RN<8\!Z_@9l'$Xq<P=J:TW&PXL>
%\fI_!97n$b)]oDa?B>?>ROt;?M!==sK7sD<A<0D.Qj[@RWqp5&_f6U`M"hm22%uA`SVoRU-VTeTN'%r]+U5W&OB/eaD!Z]po*cfS
%GL3B@_iW:E4pea*!9Gg$7Xj#epM7DF"U>K'PEEeYZ@fJX]Q0%*/[420Ddlb9"YVLF1%Y:o&__VO2LrX^5b1daF2GG=+PdiB(8n_H
%m8F5JR:T^_MEVjn!mN4JfI/^ABZS;!(VI9Wa7EkA/'1>7^]L]m5@am8FfI,j0GHC`;'9kC]sUCUcb@[uF_%0;5&LhTp#>kK`3ZA%
%?57;7gfHE]U?MI%lSZ4K+K(\t*aKIAj/85(bos;.OkG2pH$lYre`BA0-Y)kd>WbcJ3=;X6P@NmMI(gFid#\f`qkAfJI0a]b8Zo>R
%_C;_!ck[<bN\BZWQ^jGD^0RoJ7AcH?KT/MH%b4kq.ct(h;<p`'ND>=AVE5H1/:*RkE:)06T5%S8P-^h#G&k[/drt=MjU5pu#&(2_
%LHZnP\MlmGSY17\i;B1qV]-O,_eiVte7n!/l2SPgLCAC,n?\'BS0'NA&Q)P<&PnmTPQbZYF:fqtgn^=olrD9=JpfMMl3!A\\E%)<
%,>X<E6u-7IK!2?d5TtY2R7HsZVikFd@UuM8B'$NW$1Xo#N`M@Ok0TUE\@^i%@GUQbh7Oo8%Rt4;3NE[t<GHZS3"'lpF]&Pl-a8A^
%Vo,.qHfp5u3f<@7p4N+Io$]-]X+a8/dnHhDnq'%qh!6(jYr8HY_/,6oZbe&[Br5"P&tU?9FYNiH>Pg]i?u`;l9fgm2o`fN0\CX$<
%Wp7Id&!G0i`NWOuUbg8=Ps8&,dnp+6S,ZmH/S&2?UqLC&[n?HVi_B`2&eaY9r=:Z65u>D(_Bu+%5eu:mc0'nX(UM;"XZ)/b-!`I#
%,G$E"6a0]U;pr\`*:Z]o2kN!dk=TOlT-KpVkn_<OnOuMYNTZ+19"L;%=ZfX2[[)!QF!Y\Xg+8gEREdO0!1kF,D,;aPkP^.7mNr^'
%<!5:I+XJ';:>]s#SKemjX&Be^7k<&jrF.FNWG[ph*-(kpFj9ZMK3BX2pPYTL=5?TqF2ZlfY%bm/[].s[@[$Mc]*WhE\GsNJc2*@S
%K^F5nPP2#gBmbrNqo(G;qMX/dmXDF)c;_9pI?(i7`APp7`S9Z1Ic$YU7rL*\;M,F!&A6VGcJ0nE$M")*\Blf8@AciA3T?psd=n2=
%7)btC!Tj0>RM"n"-GD\\(CE"B\AXbtF2UcZhmN7A5/2&.Z\.fL-#qc`bf/%1@)=FQP!U_G&OX\=c+;XVe5q,2],tXgOD:3YregJt
%og)M#CXdu6-S%%P?q&jp4@/^no?S#LP5C_k\#i3EcW]%Zqmn^DkDB(b=kDJ5lM7tGD^c8YMU,m8pJ*hdBiB&4Gbq81_7ZU=gc)52
%k]u/j9@n:GCghubhdHa?ia,?gR*H<<F]m=U+)OZYn(q)of"IW!o>3[e4R_.8#\Mg\-glJkgBc(:pHQ6lqtk<IZ4j%PYtBsG#HF1T
%.u[>W=KW%\OWK_SU)^]h<M\7dT@Uqr\iYP_7=>eZbiO%o-?On7<^-UU0YRoi/VMhUQZ-cS<*96\3>&t/iFHJX(IFoc?>he=L9W5;
%F,.3"!'T^_7+%.,7U^-c'!6,*Xj,!bR)qq]Z3nQ,6sA8&+po_N_.a>iQ9po%!B$g[G8#UaE4pg8KApksN,s=57kfoNM%Bn9AO-(0
%=2p%c!WWL<Xsg,#[0aqO1>QLGM7Y'TRo^S8cGC7S]-s"DeYc-/4$udF=M_=om^4"SDs,ifMn()?a<i>#[CWU`F:JO9P6:*_%"^&V
%QB`'Gm4i4D%On+=m/3hb32(q;7\!X-$lUEZc3o7O:6uut(h8@o:p*_UGdnGEgm,[9:4$LS=Y%Ms35_Ldb>g'SL!u9>dkG1M;-Ir$
%-]2;G+h!:\]iZ(ZfZ]<jJ@J8u>*PmP:.B2#0Vj\2UC`E:;k.V4"/>(GQ8O"6!2,Kt!;(F+^uQ-t:f+$Ad2.tL7RtIVK72c.deM"W
%;1d9E$-D.@)O)q+].>Fc+?*4H&QjF:$`4:$0B$R&0hc*[Pf%s3p]+/f1'^*BLlM*FBpD5QU`N`.bD9`#`($I\WlL4t62N"6O$b@0
%(nA@9]ADc)qFnhO>$#2,aVnOqO!P+G49KX@/];+T6VIR,Ol+UVKG<COVNQSMK2=[3!p5tik"b7a`.NTt&sG%M!6d^H+^')#,*L&/
%[K_!01FU7<!DXUgQ#su$6;&r]dr))#0Wf4m5W0Wc+H<mu+q?t:]JK\eQr,9s\/<#HCQfslMMIUOZ\2pP3s!?W:c\;aHZB]5aQgt1
%e"Jf*B*F.bj[g_'80DX8Ys8SOapMftM-rLN'7Cp]*,,O9-?Y%cFD6X5RnJ@^RFdeFP>eY1hbSLh25>[EPjS!mV^&NuAmNK:DnmPh
%a_?:*9d'l@p:<@V56/)AQrtK17O(J1QD@FZ&H\aniWCW%*[=5%MP@qoag['^,qG^6=&6?jFjo7PX!Qf)X!O4hSR7^$*49gOP>J3?
%"^N4>:oJH!0U"dgP_1g_R1/AE;:o4]XdlUPS'7VnH"m^Q1bCkErmA&DY-e+H<Z)=T\T(HMQpF?W\Ua?/!RFJePE6FJ`0O4Q-D7K9
%/Y[6`]"?UP0=GF+0Hd^,?>[,>2WHB[KT.-*U_.U]b,:d8crd,\<9Y+q3fMVldn/TljRsn6W(!N<bnh!98tr)s%D#jsEg2#G2W?h+
%s.A]g`Sp;c49q(<io6l@k4c4iV$pP68c[9AL^1-P6uZkf<["Of3=0H^L.%:sl%Ih\.2+p:eu0YY"hdTr!Gt4K/5]9<NX]@&N,49h
%gk1eL<7$INh`Lj0@p0'uGRE:&Du`giXIMG.N$Yfo\jQ;);8=n5UiO+:Zn$Z.0JIQnU+D".M$U6CN"uN<<SW-V-Uu-c6,FO1h0(J4
%$5#sWSOU#LgIIaiUCk`dMkJCk1#8.kYf\@5E4a!ND@-Gh*YopsaBn;'19@;VrI)ZX>jMMQPog1.9\`0\rPR^D(nWo/bobc/RCn?f
%?MRT8o2#'JUYFaf^6]"Q`Y\;I^gNls(MF-`aFf0KIYn.,Qp&U59Y;aa3>0Gi`5Cc>W&P:4EJ##X$()Q%8RX7UV8D0[*8LcfUXl0&
%_OaPM^lWF$N-a4g`dGrd_RM-!kp&S$G(JbJTmPolSBc:Jn8JGFl5p3kjQO)mVYa8Kc/^0"H[,9%]9be&.E>m0C@j.cQ#hk:$)]V$
%<oPD:7_GH,=Z-RL#9h0kj3*mQXbQn32)1c^Q$HB7\V'qdCA!;m$F8I&k%1"sMjM'`K`cn'63;uW1UgiIBNYrt_*ugF_Ve<tWBlf:
%3k&-Jjm$LGRL?5.k$j",%*UngSjb@"!1Hk"L9:if@[f=Aej4$@6s,ud;sf7:JU5f.ASWd*)<J@TF2XB#mmA(RJXD\uU5rG`]4dL)
%Hk0OnmXh/<>o0E/oSa&BkdW*9NE*D'Ntcr?r=WN3Sh;^1<X<rsYn.7!(i`m5NS&MD(a'g(4f)m2fB,ql,R-1g8>V\r.]A)e,m$EW
%jCj<s=#L>l+$VtaCD4-hdnC0V4BbAYS%!DYZ*96*ReA9[64d3Q$IsT!M#,f%@8Kbd-RqLn,\UdjQHVH+Df*0FG='/T%h5Vm_u]5&
%:$ZV^>1q;HHK-#aNYYAJ]jupFQNBCj2.=*@HCPheLMFG1'+`A+@b+tFpOP$0<N6UO8ai%K/5Is23A@RV+kOLVUPVJamHq:o/7nH(
%2,L"6M@SsZ/)/c8JdQb)%sD!%-PnpV8gW<qh-B`&L=(LlA+%8ZFP^eC'TjagAl2(5j)(WsC"QUR<f?;lQ%QeqK2l<%-e,14Cb8@$
%,_1r*9P?=D)i'fM.,6;&H?QZK+_1]oL:C9-\l,R1(q`D,EFE:iAi(YmS7l22jhL&e'$5Z2rV]<djD=FN&o5k'C*ma[0Gj%ZWj61T
%?&0Wu(9]sFKkCcNW&T&6ZqCaZ[[)WaY"D#>\5%huk\G3F2J$B='*RW+(g@u00=Ek<!F4u=*]`PR#W=n;YH]\F"&'rX=VLhC&=8Q!
%$nJV+:IJ0TM/@I4A#%sAEn2du2_h"oHim(B-qfah#GH"g1gSU=*oq1B3f=%cpDPdH#!=ZW%RA81$*Q6&U'Ab63A7Ea_`?AMD'ifR
%4qohn/S6rl*0Ja+fpbeKA54;9XU/m`&pN7_XN73Rmur^leTR,Wd3*6ap"3!?/B*6O2t:l^`#P3?H5#mCI8sph6`o]ehuA5kqHNDg
%#A[cP%eGd-b\rJcjh\?AP(aa-l$)]%=f!+0CMcDMnBJq@2K5g!.2:r&?m-5kg3.%3]/m&EI;nuaL(.r&M`"MPS$`%n;SEj`Cp?f2
%A]<:%p^GGM<t88=Sl5a6.P?E,TJ<MSKDBP6WTBg!NcD\]f8T/'[ANSn18:W`o=.h%=?BW#JPu7E7NltC"*."O[:lt=c#e8X=Osn;
%p\g#PQ,P8TCK3$(*RIGf2CM8IL^m+2#m8J8Q8435AuJ%T:dL21lkN,2i[mm]L_+A7[qeZ=[b]W:4CRBh9W3%]B]9;dA.NigH<%aT
%KSWiRV:_!gisDJs@[o%NYEEV,_Re+QI%,t$'VU(,AjD1TRKY4Q$8IA_7U]?KRI/'S6\@0jKU9="l7DLNYjj9o$od&@Yr#emH,6Ej
%2,G4]H!*,a]ijnfTk(XKpRB[5FdRgc&"(Yli^Z+=Qm!>!;!L:Y.o.,k"!0.@;fl6#$Ddq/]Nfm<_,>R_H[j7m*7bB!9anb\:?u_K
%>1q+PEPAdiV^k=UD*r,Kh#>DVAT)\Grb6Hf*\].`5\N9$?^?(m+g5SHKj4^RjsC:NH`'lI"S3P1&2b;oTqR`gmHV']oYIBM(Lj<u
%cRBP"*2kiaA!t:c<5:t5VJeHt8SD-[.Q]VtM[sPK@lc0OdjO1tS-cl3a_##W'6CQCI59hHiEh2j$plA`EJSCAKnb.U'l#$>\lNsU
%-h2JT#rP^I02(PJL2fXt)2&6@pA8Aic"K@D;COH7<m?<"#A.H7IhMRHqQEgZ2<[V.eRE<!m4;:el%BU1(<-=Xb'7+pjZP;kXm?<u
%8QW@c22LIMigMF77Q)'DRZrbq(8.H)[bLn_dRXW_R</HL+Wb?6#_*.J-+JA8_F=X]M+?MPduc(u)!#/NnnO(a+V_GLi`]K8#h6_o
%6K-1$k5f7W\lhE.eAb;1?tYgeMR3]4-3k^VEI1,tAVHgCSsH5g64+:h<`0S]Z*^SXUjMX,V=VWN9[@M,aJ`po')250ABOJ;A*_\5
%2;:j<fuS1iLNI+Lm>0R$T&l@oR>l#07Y[S(eo$OPg!@D4&_$Dt'_'_jRTQo+OUt=\BGk`%G\s2aY`\GaaW]!Rd_#sebdG`L))ee2
%(l>@UXiV4$F>Zl<"p23'Q#5o?f(D5:r"5-085arUA346u)np,Y9PR'k[Nd-l7ng?9-FY3HgTcmq&^q-",Gl:3&X2U<amIa%G/WJ@
%LrjhYbf\q$amFo+G/WJ@Lrm(cFCg@N0qHmi8'L>oM]FOYOuPA2<qX>4#C8+bQq<)Y-JK,"69SduGJoSFO-j`R$je-kar77*Yp1T>
%7gtU\eZ`'ik=3<#1R#3kAgYM06V@$-8Tr$kU.JT'g(D5.i;1>mKmIP\4(;g=G/SL^BL`JjN#j_$NXZmoF8**fL(f08\5jA89XH%!
%K\etjm>,J_.(1?IgCY+RZ'"F0M>\$M]>`WlD9%AO0hn&3,Gl:3&X2U<8aV>UG/U3ULrjhYUis[e4(;)L2Yu7*4(>K9#$onma$sf6
%9J>amQsOT!9WtkYUK7)p9,o[ga&@K+oO9mkEjoc;&X0g9^)\pb6gQM2ZGhi`:2;M!8'FYCLI'CXgTf.@OS^9"eTP!%[EGq[otdJc
%(rAsmF0-&QpAr4c%'hT2YqRj_U[WQ/:f3XNkL74C$8]kb%l@;5A!/iCBj>7:-4\e@[OTj-p\\4rLd9/Yc/?%[$%Z^Z6V)!(6YN@'
%##rh/'amQ[6S.fbYEr74rOLKkB:IGEH8M>=:Yn?rB\,r1qHtZ4?m6>GGj@,&<.CooGQr^<@4B2s%3u@[:&):U5hY)RRdk5apBK!I
%XO9+Qk(uj3[*qju`$r).mf=8jkq'&>R6-m@)7Q[PTO7og^U$j&(n9bpB[GD"f]gsDFc/;`]f?1/$qJoR\M/ae<52HlN\HJ9EuRWT
%Br_H]C"Q-(ju,Waq.]Q'd\7WS#^)M$l@`7E2*h8cVQ.9^r*tW(RL)"G.24VDU(Uu[2+p\B=Z)8j8<,7&ABd6jYS+U]KaWHb_%^9-
%$&oIN"":j6/Qu<%lV!EAOQBe>-Q0YUUpZ4r!0ke&Vj4s^q]@IsIqr6CK/GACXZ>@*+Y/fCL^)I8b<S\;F2md5G%FU'EOaKOKNnVK
%M5?YrbB>*@o<q0gR8s>'iqoZj/))r)PcjbrjUW/:fEsSA/-.6JB05QDYmM02pMdVT7!O6'Q@1>hctd5!2gU]/LQ$C$Q$k:o7M7Tm
%><3C-.:ddX?A'^<6(,!u%_G%VdR&d@AI5p6b0$+e4$4oe3GAO4'N/6fWtZe"XU(tqeUTD(U'Y+.i=DEcWu#r-0GEJ'VJECV,i2uB
%1uB:#1MDA0(j%AL&rqK"3o0@0Qr>A#%I+56U6SGF2]K`lg\j8@T<`jR(W/C2$56\$S?H7K]FK+>j9D#*%_d2+SgDQ[a.$Z+<"lQE
%`qn$"88UtoU50:tJN>W>)6OSf630EKB4\adJ<q(a$6:g.S<IB(%f$lO'+I^p%Fpt<6^F\_ZPZ9%An>HhTiJf"SM1?J(_ee]OKg(T
%0]srj-i]G,<LB*m.p93:Yg4lQO87H*biX8/$;gmsNk/->.@N!</%_qj)romNN:_dof%CP@ZC>.ZG\K=D"IfX3ihR%m)RP;L%VT]g
%qkWP2QqN7PR["mN,@[RY(E+lK0-:!u&SN0oAD#F?li;lJD7d*U?(KQS5.LLk';t(n1e`kQ'aNA1K060)=YWeW!AGbN/HqL#Xd(CW
%$S1J59fH2HRj>,u6k=#bR0bk]%Q^qQYpuIkpg(MO`%LV<L"P0;CNj-OJfp4+Ql_P/;Po6o-gV4FWW9:PZa'SZca7-^Y1*I7^oT*(
%XBMrV=k<bh=>@ZDe5OtM$(M'X+qjl0+;G@$CiY8j-_]B"?->m-lnPV/WBdnu\1:4"N<kctYgp;2Lus'S?k.5*WY)7`6-uQ5%^FcY
%Y%5_e5UOn*16,'qh*VBfMp@%%[?.74Ag222Y*s55+V5;1:gHH3:rEGg]__6*\G?X$APOQ_Y?EMBE^,OSJbDC8LC.m>"iA+Qg'R/*
%oWG9[V4.i:Xl-^]#rtb[h/XW-a8dk>"G.s0#c=Gg#&OF\A(Vf5a;CDTP[SbU,eNu%.oDu\dMdWn/*eLH?lmO.3"n1m?mg+ae2l2B
%gRqS*ZV-fAXi$\l6P%bf_-W7iS"1o_k,0`\Z>MP;*ncm=)S=n+CdS)GI(tMH.INE]b>cpg^'a8)=Kk8sCu8:B]%-m`3aC_a6<0$=
%HAS*j_8JC2"Se:OooPr%UIH"($R[,%Jl!f!U29Ub.*70@MdPh)C$]a*9t[',OuB;5]=NaL$13*PKQ:FcJ-D]KX0aJ1AOLl#8C'0u
%_3WBiC3&1A<jouNrdGXWdCa!%pJKhJ?J+p90*_E5^D=4T(.V((=k/'@?.T&co7Im,COcJ!LL(RG15'hbBY8+^2Cg44#qal<M2#]i
%QR7^sE$h--:Sr!P=U]'XHnoVep3]Gfb9SfYYmD`shFjqW4/&?pBB#S[U!tZ7SY3G\H]`%=BaF*J&V0GbXJ3XIheU't?3&+nbk?Eu
%P:/=.%__1u`n807cL8>Qm"AIGl2dB@N<2/<*t+BL[0\i6L>C<PbUiHi84eNkNis$^I#[ct>ndI8b\,(SK0]0N<]/UnY+&#Lr/f_.
%@pU\O"Ep:lBu[0WAQS?=*$gF\5jN6E>1q1RFhFBf'?>hKXGm<0:Y%8lR,M2C>FB9C>39ZAaK6<M>1lbLa1^%NPR?&B1oXQ.nkNm3
%9_Z1$W<7HjQ0l`fNA[i=4Wp`V42N\cP2!s\%+Q2:<lAD@BlDfs[RTtedBAJ[FK]\N>r]n]=\)MQ/Kh<m&"DI:de.;/:r='1;!ip!
%[X]'j]sqJYC,3kL_\UILc*KSI@iM<fo5OG6SMY*!R;]he$hBgQ7?D0"$]n2;4F:lFAJWYN]WQ(Z+O<eu[NNn!%C-._cH7>MZYNVq
%m/!@k"'n/YNA#,3!rAlOK+Xa_#kDfq!`C_rJ-6FX#n:0*"?d*VS<ZP(VP+B0ZA(!!M=FgtV&JFJcir2Uj=+p/!q(ZgK,[fmi<'=r
%?m]^RJkk+J"k51DjOk(H1l<'hhp;Okb=@1IB4V\9g!BmZ@5Q'37i-:=W1aT61/hFF%+(5uTE8fj!m7bZ!B'2c,&jl^$T_^W/sqKH
%/tfTd^sE7,!=:X)ZUYgn=FF`i?,0Us,(La@h!Fd!L+],]'d!7/Q&QQhg!BmY@7(jT`'>-_[!'(2b)UY%+OAX!4h>#J"qI:E4%Y2E
%TIn-kb(_OAC#auU;Dqb;AuE$Q2KZc/$lhO1[35ac)YE6FY-t[BX^.fHXUd&_KVE9*#lpM3jB9Tr*CD2T@7"jN"F8R3GjX,eH#f2_
%#<G="Q&A*;'$XM4#u_r*fS_=$P&@2UBs>CpW7a.(#R/\Bf<(;AHWt6dAeDS;RDpMZ4M?taCoqN]<G5RXi%h+9)A(mH:$B_hhl%lV
%Z6nr7?m\@1-XER-W=E@.Zst5QZjZJ!aES1LFpp(:=m0HQZA[@jGp_;BB4XB\&R1W80C6P<Ha/9M-6mkOCbr`=!C>FnH#b"*!XnTF
%Es8Mj&E_YV@isjdMfZ?l)PG$c4B!?\jgm([dF"5=7[?$BfR+SJJ=Ki2B/bl@$hL0N3$Qf$P!DOD&rtd8OHs"&K!+H^G=E%k8iRKm
%0[H.(%\q_kVBX6JI`dbu/^0F$(*(I&o-C"jo:q"WcM!G;k"-Gn'(uth45r-Dd-3Db]D^'o#kOSNm.RBCrTk.e9^D0"KmCt^E';cc
%X?4fr2_DqV$14B"UA_eW*L%[/0s/-nKmCt^#frNM7Him8"te&?<njcnCKIEVV%52.`"Z]A@lbgWil_lMPH$/Mg_5eiNH2$Z4!0PV
%R`_Yd\@X^4)d"koAJj$P/LY?\Sh=_J":l>b1/^>/Of>_/WR&Oe5\N&/$X\&i#!roRSrud&Z!%g</,F!`9!:.+'s/3?^3L/+`V$=6
%)M@m0otmjBHElk_"HRcj7#IoWiAcE0QC23j<5BCPeRUCf\.IBKLdKbA";[^9T[fTu"n*62=N.WkUm9d/5neJ/7&^ks0f4cML'6Z!
%Gg#p`$>)+5+9;g(`\jFpqIq8[Dc^da-)5G;kpRH==<kiGbg/JSPoU&jbu-ur4YR@6H1J)_UTnHB_1Q<8Uor12FZ@QHLma2EKNVG"
%KC17B:#mY]A.SHa-a(G&?gZo-QIINDNXXY!d/nt_7,u'-"WA)tRuo;bK%D"Nm4hfr<!?j>!D%=i>8=SKf9t:dH^iT8O.,NLQT/>E
%(KSV;bC_Zl!e2ueZF8FhD&@:_AQagtW+DeNnM:<WU9bZEJE'Cp,[Y)cZ[9s+?VatCF'$gnfbWGml!.s&jl::UM]h303e1=(H6`!C
%P#-1+bM3J5R6sr&P_:;d:loWV)YM+7qjVfXT_+Y6:X>SIX5Z0$q_8Po:<&JkO63^Y:+-I<Bqd+N[LJbL8=`>hp='F$Duq0==j`<B
%9\CkK`FYkI@)SY%D71$l<\NgNTGM\G?PTHSempN>!s1gam=6Ob4=MD[7BLJP&fPs=$`+%A;h@3;ZF#/P-L(YGRZN0QT`F)l8jljB
%h#[7FDAPS3\[F2pW=/4jd&Rn8Zl!)C@7k1L(:hhNN>sd!d!ah#BbVfE"uTP]Lo7p7YEd)EFL;"8-;69J4$E7;k7P4+R+E"LLm#c`
%fbp"h,f;+IF1X)n*!54&GFf,9SZO\fdVpl!O`dZ;]]*`4!V.aRpu(4>Ktu<fIX_@A2M8tkp.Fsr>O]O[#]""Bg-#bL2l%0s'G>R;
%BOY>r<[aMU:+I::,m&!gDb%?2*NT\O-us%7!bUT%TWeo3Ya.;B<&dpXNb`4d!+<*HD8Oq2nn)@kaDG,@9m+[&'o3mtD6%G&fsfL2
%Y'%PAT`rQbO>Lq7VI=B&d<4FflBB0kgc;iI?$o6RF+bDK)q[@uK2IYpr-0QI*Fbs=F"t[I(_^@G81&CSWR1Rs6`hkMVaWedp&a#O
%mb[l3l$,k9+$9W'>#F31B0)6[j+cGE*Y%>UeqsZ6X*S4@?t2oG.)0R\]<QnjB_*gC,%K4)aop.L<G4\N#ioD;>/3J(_/q*8P#ofS
%_\)&MLHNk9UR].sd)8J@bt1V\C`^=agnFc$9k@%tJ8iO1icr*TRuqA2A5Zr;TS](L?b=Lk?U;4iK;^_pSt:`$j@>u/De2E`4#Y;I
%"\K\u&<`%FZY8\3n\(%fJ>eSQ(P_`-HK\WrDlmj%%Lff,R4ra@MC'A:IDtM#Js$_F(6!JY-aVc1lju'Eq.(NuJlm@N6u4/!D!6i*
%Xd/S4iuA."Yntsq\SC+nQ.p#DD,;aPfd2.PXi$nVg^huU_#Wc]OMh:b4<lnu!Tu?K0pU\_R[&jIoM;#Y#djjp(JP=$mS7Q)#dg`=
%Z"%A6C>5$@S*M$O@AOL5+9/u6*AhDSY)DVL/3a+#g<6t_F2M)J*pu4:G4>!7?iPRfq=WU<9!5pQpupoV3iT!+5QBn(4g]s_LC.?i
%b7?N_hOjf:bp</K@U+;bq!49a@[Fh,Z(ALp*J0*CaD,[u,%g,s;/`hjhS:.!m"5U\'0(,7-r9L:M/XV-C.$@b2\jl\$I\lT-e+$1
%?5$BnBd)oJL]c%[M(-MpXAZ])!;3*f$pqK+=u.;8Ir3ct:.=K=m`.A^<buPmru07ZK:3KA"B7%8iWBoGNbf?'[n8tp$)P?:LMDKl
%(dah#KjoOp>:CMg$Tdb!PE;=^2hZr[J=2RK&dfVQjX9RXA8k-i.Z&s@F*2OIOT^u1,S+A/E[/Fu%d-0uRg]Js31H@2IoQYNDgK.f
%&p+"Zh#'IpN$V[<WPX4SSC]G$l:r#rfI=Ao/B\r#-;'R]1-$br/-R@IUdcn-Fu9=O:>G^aqeDhO7(scXEfl==D.b7TVbr(0NeClg
%UYKSr)[`DKPdEXdhnM&g?hueD(a>$9,i;@Vf8pOFI!6i9)3;U#rZsa$W?2hc=!HiiBMoQO,Ua74DsCQ!7VeE`d"O(f)&[-YUphd@
%cV^d[Em(/MN&j(cN(^H%;Ynto7RHW-PT=PTA5&9%N5W@8L8eJrlqTJQB8NQ:!=>#@d8Cj/^4oApH`K(D;elAEpDT0*+Vi(uF6G/.
%Es"aNC_:;M?e3S<U_Hd%FT%4LS6#,m,E=3JHs7Y'X$"(PDqOlu-KO+u"a-8?Hu)0_&$]Y/WZ9SBSOd95=]]]EO6HF0Z_Ig9'@P9m
%+NsN;)L>;IYDVePLttc,`SY%M+k$>6RPj!Z$T\jf0=N%**/G\Wrcq+)9$&OqB<:m"k9:op`G8Y_3fSh3?R]qj^_]H=,jFoT=qqH[
%]\W3Jj#_N)n5:WR(A't^(-K-c=90e5k7&U>Z<pR3^kiFU)frtD-8BSV9-WKU,\%c>a5T0eS1\@4-nOC]&D`PsO^BrS)@T%Lj>9E\
%;'&l1$!bBn\6YjPQAO^D"RSE..i*Y5/`Bn&KD*Jb's9e66fMAs._OJ;WUn1iA`?sIT6dWST*ZQ[H@+$i]UDi*1M9CbEA%Hs(ml6*
%S=Qg;e"^E+k;\KDW$PLr1Ktk'MT`m$o%2ekCj;Pi[-7`BW0Ch)&lul;^nK$:&(,-8bc76Ad;-I74u?EAO/%8!#X:0QadSD4"N$9?
%DA%0XoqH!S&I$#?;4O,6($+NL*F4LG`64;T'XU_56@*E-THY656'*nFB@<H1dn]="4:Yh++QOJgJk87"*^U&ZZd:Wi@hq]@.q$,\
%#SR4>-D@mK9MQMi=b5mcY_Y6)`?E.Jb()SQ^4uTJHR_Tc*PJU:cU&VXLg=u^8Wq('7,4qiXWeU#((MC02;6c^>F$NC6sa5D?a2T0
%$tm[=af(a44\l05KpYB@Ug:bq4TsY#8N\$Z85R."^I^sl3_S8E-ItaZ1VC.)(HSWb_"EIa+QJq^aL)a+j8,RI+%KP;dI@nl]I'f@
%`#Ss9l4R[o(d1c5<1^jedKkd`-NUii=?=G&5K/[Y(:&u96Ee8i;R533a@r0`0qb\GlHQu%hU5./r;<A04<WkubmGLC3lcVAju(A'
%_oQk<J&X_8,n<X%bZT"B&?21ict(7d%`5,K<j-p&eh*4$!6G86OYqdb<fUm]KOiI@ka3R3_.(+QOFjHc:)"*c@rk\?m3H3i&N4Za
%$)n!_)sAOq8NLJ;E$>BQVjiEWaYF'B,@gsQa!u'k0RZsIMolpan5\=R=i_7Y^?PjWb2OUDGg[rG9NYD4<>h^3Onr$OEE6@q_h2_M
%a+`!_mPLsam$f8bDB`L/nbW[e@qg+Lqo7#&L2<H<o>5#Dfm#/K26!^e3_IaY<`(QlNMk2?8`AS_eOT#S/9bkFd\TgTT>c&pdc+f1
%*0KU0_KP2Ki.<9?nemr%3`JVX3Spc\<Cnsr8]]Oj?@fTk394W2AXP"d0T@#'#2THp*).^.1MG2TFBpo$W@TNpihF6;SYkTtil/Z0
%l0P1l,SosIK9sP&k'W\n6DD+`J]p>r)>2QZkk.j)+d@]q#XHa_6+$p]6Q0m%X`kCG,XWg&9@CsKT0/'-D`ErB'<(.Hb0deT8X<I0
%R=(uIG"IU$BW2.qi;5d?OI4:pZ4Os*91jIqb::diTPMMf81QLLcTBZLfgU%$)dsKK@[NWbO<g$O;"UN2T@n?hW^3aL$PS.bkY?a*
%P/X]I66Em8bs<t,FOfn!ZR?)9W/duS=`-j;@H(_<ds-s5HQZBQ(+6!lj.4S_!K/Jm17gB,2b%#B?J)?[ZQ.A7=35:Q,tgM'&BZch
%a,a=2FjUPnKAKs]S"r].m,OTr_A*g.RV25B%rHegJmb?$XB;(ijsqELoIs#P4)Q+$>J;:(N39<E?fZcO\Tk.8>:8S1W=Nr]YjIOq
%C=Z?J*=@R(E72404E+ut<_R&fHLO\99K%;j"UAJXdK1fdF4g+&1sU;P9d%Xe'&-`[D&B/\j(RP;>jX^PKqO.=A!Zale'>/d>p;FU
%%W;\;Neqe(^qM`uMIZI1?!R%"Lh;.c,MEUD4!VVYB(mG2[8`g_(.B0u<`Ln!OsnC;7ceGk-F#`@-n2jT/19dPr(O?.f^&7N$,MJ5
%#2eTSb%a/j`C14*_JrE>7H9V]9M3mqmGoa7:qNOWj%8J#W.rP.;H4mp[R=5ZjiM5n.8bVZLHs$SKmZC8VIbrHgD>,EC(1m==+h%@
%WE)\FHMk&gogm[2FWmi9bml>SWBnPC^1DU6@:qbnJ^&p#A)!>nm=8Rnk>HLO(b?+D[MU[M^`nmM.B/C^E\''4&fF347`I19e(1aY
%+m[mm9"MMVYpA2g2H$^,$cXRm4pQRqbKkP%"N;1mQ!-eo.Lm)6!:)BI'gQ?T9u&\K96[#&?-!:)&HDoQ<`U8WD"SkoKXtR4V(t3f
%9gOU?YY2Oj7KQuoBL=aUGQ@M@VTfsieqhl$e6Xm8kYCHZZ;Q+oLDL@)d38Us.3LTr"@cI!(*%Ro"A/Mt7V>5Ld@n_l8C3cC:EI@C
%//)b20A@h3@oY.412,mk#Wi"u]8cNAQ<.&Hgq:1k[H4-u\\1L]n;`Y8<&+X/#R+`.)V&!2'MQ=kB,Z&uU-_s26W$.B]4Rh:!N.#0
%R+dHUaF9oCWX9jX\5`e:P>e13UP[I@innM_G:AH`g5Ba.pi$uaB5-XH8h,c8b;3EqK1+f+R0P4+[nZG')NmqkpnTi\..Hf=R`*\S
%;7.rRFD0>9@uR#$<75TWeQKb(-[nAoH<CQrDW2q3*Yh+sd<GDkMO`U=&ACUGMD^-q3^9Vq%r?PcK,?iCrFo"sW3t\c*8&Kt.(ua>
%nWP&=Yt.IuZ&'5>P*j2<`dlJJa\bi;;aeJMB'5>cNa6D!+Q:h7VC*V7S=WYNT2k_\@O+T]@"<h?1)'lPTjmUEO!/_5(gj>jJ0lqH
%iZ7^_E52cU![-\6h*$HY^mjMVS/ij3CnVRN3'N\JC(=WEn%`4r`b&?!17XN6]9K08bD?3[]_RU#<_Dl;,V4b8+8QnSAXtBFMBXSh
%LE]/h_m#\O!FinNo7[b*%$V9;;.+Hj&0?_I5\cSSb>Gul]^eW<.-:=l:%MMlE4hP,dA0*78-Re3,3CJL2_Np4`EEa$)'?3i7FIXJ
%^?;R*LkQe<84`;H?5I]U[Id3]em[fJ,L/>h`#RdkOB;$hXHk==AnBleV3La9@V3D7PK@DcX9b'd+b@^Z*#Lb+>>B(_.m6\*n+3*%
%KOiIE[K_'CA`RICH?V,!7DT67,V>CZ8\?oi81GRD2Kk;iS8<*]R@(;:dq-BHKgYPnBZZ':*,&iMKo(N?m$F,=J#O9ncKsX>,"k;t
%7q/c=qdVCM?O*>qEjh++/3#rP>mu1EE<1qs7b0h+M5L`<#7";0Wr5XNEn@h(:ff`,R4ouP%Qc^ja!nLU[->E?P_,Q%=\-=Mq0ETK
%(e`gYU=1H$h4BUc1Z86ICC`B3\D"r;l\2o@*>Z$0H3eY?V6.7>co2AJf4Ar"((Fn,G-HOo1J!IaM/tV+^;1*hZ&G@i"gR'Y&F!%;
%F#3*&Om>'!Oh-lKoh=XZTKI@L]_6F_.?hh\eT,+6Zl7TP84eCKl,Vj#8IbD,6q9Ha&$//p61%%.,q5h#"pK[).r'ef&rHufVIm1i
%:nm"bg*@[-A4T"X,!#pS9q[GWL3%?8JRDSjRROfQ:kErtE^d[rdj1p6_*g[:*]oT8+PYGF$7`WKDH1(cBl7,R1!le>1EIK/ZE8Y[
%GWtA#@#mE>j^a0?B]r$u#1LVEE2IcFjR/+J_N.#c1^WPZ"Ps,2>i*4u(rH@QBZr@id2EkR_&Go(U4cXf7]XBQ;YZ;NZAM@E'Tges
%.Cf\L!HW5&_imb?ZG"ZY&c?4bilqKj?nK;:TNs2\8h+FU*di/h0/`lq=Q_rHa+FN?1,@YUO=KOT"*oFDj"jjQ0_SUU4^Ke])5^5"
%:Zd6c&Sui*@3[&B<BUcgR.MVNrH/t-8Z5)rE[@cQOrSr`YsRMe01k'n!tIOCpjR\&+r`?,\mAb9,r]Qj*CMY>!;m\l$/c4cEj\]3
%ohN^iU[=p"Y9j>=kRB3pa#.(_&4/fY2O]\SLqsc>2>)XBiABIb;`^@H15Rb]M%C:%+E,_0P/Er(3HMlue_:=[7eCgi-,iQnE!F*2
%BeT$K`C4:Xl"goDFW"cV<h\:k$2]j)08s%sfs/L*2q,i^P8'YK7u-K!c#a#WYp5No$o,V`B^Cp;RCOaa0UBB1@Pt!_>f!flRU;M%
%SoX\G,]d7A-q]a=UCBp5T9^m]l7-:COn'X8;-g<"5`HC&#3>7ujFdd!@M8!E<nO4Gh]JE*0Tt5ZA$DZ/E_tKa9g$,1H-/O$'aZ4=
%%UaQ)`<"O6::lJZ8K<Du=hl';;^)BK"+#H2XiT:h'W^>s!FqC-R6WscKfg-@^Z6f4Y,h,j+"Q4JoE`uOE:dW7?st0s_:*0DAfR]3
%X]ACRLLb_^:fW)b6q4eOON`pP(e%0GK3=g[D7Bk+VX&khehQ$IbgZs?fU-2rB<d,Io5kQ\+uO-Q=2%G\6c?7K,XtG4H0G,TB#,Oh
%7PR*Fg_n60@?.=hB/5=WJ:M.G5u6tB37q4WTMt6d7b7mu38"S1-`U)]2Igo&_F;;a5!Y0O$bW2mj:KiaT:Ba/3@=.Z;>4@FQB&a2
%<^\McLSmQ-DA=4*(QVt./^e5r$15=&gD4p?[-oel!.Q*f;c6A)(?2@6=,N_:5;`S&Bn0VePu^X"H9R'L4hr$RMX*$4jY-`"EhSLj
%Z<TEu>>T7Emr$l_f[jZ8E*KM"-BOS3CFIV]e]L+0R&_@/;oJF(0KTVBn09&jF_i3PJlX--+_C_N192#V]j`EgFg-dY7m>DrRBl]*
%Z[;;59Cu]$4k5FHVeS'['k`(4QWP&3k$aRV8hu4gO$4k*K)^l"7)Ek9:+c"nEDd<e&WjI`i"F@8W`>VJ82NUc3R@21nu<."!s(`M
%0]pl*I2"C[P-5@sP"#3Dab(GH5[B&q:V=T)&\k8SNI@2:.`llhnTPItX/%6g>A'o\?V<gReI+TueNYZ0.>%[Qb#g4c6*N'(L:+\2
%KJr"QPf,HjM`tALi\;YP"8Ih[-`&I_A'O#5QS$XcBG+cR8[q0LK7I*&(Uu_5j;<(sV"Wrm\ihee7I:t7Fll=V$*u@Q-,h>>asDB'
%;Mki7%IG(YL)@qd%!5($m5<)qQpEVTh@WmL81N?tJ&%IZ\sH4poP%tS)5`[qadL5bV)0bj244UBdnCC]Qa$:@`9LF`9nQ5/<mX!)
%GUYH<BQT6iPUS0eB/CHhX""R1QdX'S$l4,.bc!l^W?C-$l/ip:YCaFC)1C%+PN@p$LoOm"P`X"6-dlCeqKtM;PZZ9T4*knO\Whch
%LsqN!IUG_!TE[6Q<.P+Sp2MkMnQ@CMCkpX#&k/E]r#!HU0d_q@+J*:Y`NDVu2r60`#I=q4C-^C8VqAK__WT@+*`\LG\]%c$L>Wu\
%!bO/]f`m#A'eBcODiiJ'kt["QWSjNY")tbegMlOd9+-k8OPC*!dk8Le_EnIW@"/aa(fla*Z'C]PP)Lq)Bi>W[k5gHU;:>WO/i8Q.
%/#tlm[YR^e6[<DL^uFrnF-Bp1g"qNg/T56Bg.e,[X;WGU7[.*tM.7B>6dF+cH>+$9kCFETSm<H%9OX:m,Q!AdVa8"%]G.XBC-Di.
%F"pfESPf?I,Z^QA$,pGr92Tn>NX93sMk`sH\_.tApJ2-R-GPLiHnr')D3e&YTm23(S06%E-[;=/DIjCah;nt@QRqPaVkQ7P_E?%s
%N[-RB?od&]S]tB/c4,XBQQ:e]$[CZ.7`[lWJD"Vd3D3l14`XMh3G3Xi$9G7'W)$/O>u\#\D6%W&nhF#7AjamP-X*9I2/ij6ZN>uq
%oYPXVUr*GdTI?eR@#OB";k0DdPVs#n\JsfGRDB6u(%b-'.,\A)r&PrT:4s5o"%+H4Jd+dp3"&2r=l'Yr@aO.JYW"S;nj`l)_&,jJ
%&hsI</4Y><58_R4QQr=L,[]$Y1kL8&^<a0"a[rZDHK?DZQ/36FGr5";7h<5![1<IQ`u+k^,nI;5H1@&m8^')g/bR;DWIiGF+GZMr
%MUhfeBRE["HHbKuHW)%N;dT/9CI%>9g4lG?bn+?03k9!A_6l6:h+WbbaJfK$FsD]E:eA2>dr*5B#:OO;kb4.sXIoHY<Hh2m$`]<U
%d7L!$pAN(8J)5NF.iN]X\n&?p30$R65j0c[%&eEEOr.?fa:Tq\K+t8ZU;H3<LQ<abTPLsDJEBCS!ZY1Y,2,,\<IC!,0PD+LE/s9X
%k4^81@6btZS*W\eY!"186+^(b"G)F:)4q^eeHRcm<d=n,'o:Y/#:ckX/0Wc.qW?Fu_,kHY/ZHLE8r>Wl,&Q$k@Lsrii1k6)eG$@Q
%[mk]kas2HFVTph<DlV5s^@MUS+S-KmWftjD'OA\2qG7`V3Lr(*@.tMS.C+MCYj<+"=r99=AU@6%d#L(?C.646gj9dB_m0mRGVV_u
%Xp#jqG`^A=lDuA7dHD9[;)0=@"i/6!'=/G7$q"9;+^Gse=^`IEYfFmP_dJOk]hh9\`-*Zn+p@_-4pMGV:/VW6,s1A;C6+l']LPMr
%BFf8EEI.G:FcWaFQG'$p%7eiUSuq/42/=Z^M%K6b_,YdqE&%r$`6C^-p$?%EnEpJO[7h+F@P&/,/U:"I"JX0Y;7=>)35RjNL(eL^
%]hpFli]%AiP#++[9g*IA'LO,o!#'"QD!:3eBq^W)d8Bs866meG>9edUE),rP6JTCrZI=3D3f(;f(-S4![*m<KjQpY5P46H'oXZsE
%:0R>_ar1W&/s*p/qAQ5]9V`SWQN3]>;3\%W&o:n@P:Z3$-\KDq_I:kBFsmRM,W*?Zp:q$TG18"-StA:e/=3IL]8jueAgW4+Ta"MZ
%5bhK<aEKiU>\3:#r+a[BN+E2-a>PpW(bPIQo6VUc/O'67:aB0bc&L57%a;U5djR;N70'B-^^p"_.Yu*$`FDF,"c/`glu#c7&],U3
%XG#A]22eWH7`IC&fMB4R@(Z^=$J6^i!cats"D`,ho#(B]/;>a3Y6tML;.!,,H.lPnaOPFid$,I2-p`YoEHHo]H)N$5E%X5RAOQ"X
%BjYrjE9F<I@k_)<Xp@i(%)UY,][TVL92TmH&gfjdOJSV=)i1&Q'tCL_Oi/I.G!$)]q2HX;:nSS0p.@6-S!?\W4/_i"V"n"Y!UU8X
%*$[E)DMjkl$<O2A8dC1nTpMi$WRZNNA?Z1c])kuQ<7G0gL.1RJls&qr4.0ojF$l&kSdj;!M5=%X!(a$81K2:-j9q>]Zkg<<OenI3
%_";+>?5s)s5kkh?.hAD'T*(i7+t00YZT^D1qan]73mL&%e#?`t:f%CL3\/9%gn9K58Xp!TZ5Pko$Ii.q'T]+klqKh$Q:=g27o1Pu
%=;0,)FJ'FL&j6`g8RRa80:&lG<g6*?M`PshVGU`#X3lEC]FbGN$iDA8C)#LkYhjFf=uD%CLT!.pdHf1O@X]h`=CJ1^YTH0DXp:$G
%\0YFO*oj+_S8c^CV(o$er6^c1N=*T67f"fB5XuBg1r3g_4.;GW:<kh6JbV;o/s690=`1?[!:PN^.Pc`2J;BEY#[JPrgkZA5(;(*M
%d47PcFNO]Z5)7Ps%:2M5SQsB8@Bb)IO-W'5EtgMcO=(+^a*nRGDOB>$0'[uQ6D,7lCk-#2JH\`pHVkpRr&2"jVhZg'+BPWH6p<R:
%S?lo\&9kil=';m:2n7:FI0Q'53V("uCb%LP$A\C$`:?O$*k-AIXttp5#QPmmbo%\EF@pn.LN"0!Vn,&]%j/,?e2cG]^p:rQ<sIoi
%B;Do=<PeJY$]0'-R#b*r%L\4TgkTIfkW[bF)>5XF,AA23[NkHh6p*J#W-9hJ<7c#KdsrJ0mifPIJJiQhTI73VVH^tKh$F)C(+U*>
%qp:U6qSc^XA<kLF9(!,\R1VJ97L4'7>6hA#SSP98]pI--'q%Qc4^518B8uDfPSGb1I4t-2#hr<?1I\t\m8ge"M[u[XA4g=NPGkg_
%i0QE&;Tbli'G@TAD(MH&cf,dET>4!$c./Mmmm?"Qi4k(kbc0'B/Ro!$Y.DGh4>-u_Md1u_FI2hlT&.78Yg"hR&V_Zt=J<f=?Hb+@
%O9W/E$tbmcYYMIi1pb20&Wrp1.qak@-"gim0o)dCV9\"aFbR.6$;f9)\/`pm-<M+d1m!S7J,$9Z?@K1m9n.JhGAH;.B<#AF.M%*n
%Y_PrH&d@e\1_9@0L+*XA`<!</q-2KC8G51HGmFRX4cGMhAWgPd0YSd'#>QG_e-ieTnqNK1aFH/si%2^m@ql>je0W<S::7o36Ds@G
%RP5-\FkA)u1K`F/>!^6^:]+1Oa35pNii(64AH"2Y-QOt9n`)]E&340GnXu/BNbb<VJ;dS@T(O!c@AkRAJ:Lm`=]R,0Q0QucnZK^r
%:>WM,[%pmrL;?Cll"-g:`lST_KNL&<O)4e.ETIXA6=OTFTH7A`4`tujO[n#$'+do5VcMjD5rM`rNs?="!+<?Ee5d`I)+rDO3P)0o
%b_&1XZ%ghK^Q-sB@rlf92LUhYaC'^,e9u5a\"bWDY(0Nn:gebNW*k>=&=^U2#>:(8[&?qeJ9#GPW#u)]a=VIhYYnrJWe`SMTHM<g
%fUXK:>Oqir_s!O28hm!HjYrdnYbD2HcV]MI7"HfLUK%k`2sP2ML<=F;1-OJCjHi+Y_N%97iK4tVD1f@@"PGL0!hqDN"9E3Gn;--L
%]S_^M@7V$(0q`o'"&74DZCM%(e>C(B2*uj\bfPgHcm"(,bK[+<-ic4HJF<b^?XY!UC_GP]a@Z8.b6!'X`AN!PPM)4h93)@4S2:-W
%I1m8"1,Sh?E<HUH#p+2U[FoFPSDuqJ/[GW`nlZQPc`,2(D-.717R:@<R:r9fr,coF;2g%KA=QoT?lr')X',`o$d1':=WC1:?58Jb
%"IZtk*"8=_1mSH4'TjUSYf=bn+:u=n-1#VMG>[Op&^/KWF/aeKR^J*&#9/&WG&Fl0*iKp5lkq*3@U_m,LA%L^.3sRu!8Loc7&c>F
%=:Nj7K.nKh7[0qMb-[<gmXl*D0L4p&bD_B)68ShB_1pL%i-oa)Q*.u$d:uKTfkd&00Yi3p)\&5('rgL[.ki,9p#59In5YX>XFigi
%(i8HP]4pJTg:W$B=2Udh@/f?EK#KjFe`?P-QHG1.I03qc'gf5j@*b2m&KFV[cWNsA*UA3YZ2QQN,(@7Q/V*ogX0_%tU@aoR]5\b%
%r7*e@!?YQq.^4Z.9a4X<[HZ%QETmcQ.]tTS7)bE<Kac$kVo?hd4duBKZdQC$g?^Ibk=4R1.HPA1i>mWfD:AM93"^I>n:RD![c3Ro
%MSnkQDqg/hjq'pJrQ/#*lr^)i<g_Zj:h.TaE5lLN#Zeh!CUt?<@>k/=N#`gL8`3^UrA+\W,mcJq2"J4W,B">20b84-=u+3BM_6<\
%__&u'5U$906#OVW8.Z5iS`J-\\_DG(W<?bO%:XGN%Gt>7]:bOR`.C>)>6?A><EB22AJg;+o+hUs.?He+UNB-W(?qg\E"]T=:QA]r
%TeIre8>k+3$ZL+pllRIT8OL+co[bA`hupa6QQ5Lg(;)6)!abEqB"0G3k5*5B\bH4!hjO2qRJ,WPg80kV%FYm/k7o><*.CtXMQGf0
%P>O/ABf\jJXu%;ALgPI#MLqm&9$qUCBaG4bS!`dLr7po;d\jULTLMhK]02D\o]:Wcbs\EW3R@q`W%lmKcSY']l5^)]klIUA0%C5&
%-CPLlN"\NY]da>1JF6_"2qI70%)s8K1:7+)*,Hp3`+$&Ih.Zi1@ca*ur;^.O^l78IP>SJZZtZKHe2K-&!?NW-)B/Of8mXda_GY;7
%e%Jd*h*[Zu=hOrEc,6(8.02SgS"ao=dR.:rhpAMKo:NH%,<2OSWq^U-"jIb%H"o$@'V"U3&QG'*jsD`r-K/bi#6lRf='h5;e0>[+
%.!OiQS@BKO8AQSU3!7!3O>0^KZ'sp.4VJt&@9<8,1^M!Hmm1Xh(bF>pabZ4OT\D%oCG8B1-j6n9`6g5H+KgMJ*@*_!^d-RI"To5C
%dSVbo49[-!3>I1cGZ,P0-q,][8H0S2F!./5B##Rp]$)"i,bdRaV.ebB`_W?16Hnp2gNu`0o#,hT>Y=VYQBpoTD:(WMSA3am=R.42
%9W*II%s$6)?n)0,Qd,/(/V'q4p>u@^T-9<827H^+Z^Pem$sc$KC-IUi3\'2q6#DsfEA0--V>B!TTZ>".(R=RAFi97"6l3IS<AkO&
%ECjPKA4/<QUe9:Xe&lo7'aV])AjK<eNU%g&F>i_o!gP-M:($#lbBHo=4Mk7$L$R-[D`fuE_^=E-"[n_(G%]j&g%R@'>k(i6LTuiB
%)M)>pKV;Ar'T7Tq:P*">aN=e>=4"==k+a,e[piU!#R+OaB2idQeB87]:e48o!Q?=e2PV!"6a-Y%Pbnh>ZBR?W&Bma$A.EAu"Q;/l
%./76TrUj8K]\#8,po-A`L),"C3:E@uJ_T)s\9#a#)FdZP&aD,27(t;oZcp$-E&eQ>acZ*\*%$Gh!r!--.Z2S%<K89iF>48m0a[3O
%k=h\ZnST"K7>WU<]f'Fh:(lP\7Q9kF8T1gV.s*Y;H&MXi6F`4F-7S`f6%NaFab521H"flcZrK-mJ>nE&UGN:/#%[IYn7.&/qOo><
%&2>%c56Z*9hMqG@[9*NA20s9:=p'H-KFBd>YlT^-,8L]l%eOh)286E&JX2m>Co+J14oaScl:'d-e1C3EIiUdS0dui4!ICJA!f][=
%`,CK0X^GPh:=Zks#j#co=R&6uJ=s0-><j:ZW8n4KC/bNu")SA&>2YKFr'OA7.b(A$YokG5\sA;t:`(bV4P_5Eq#,q^:?RT2G'Z5`
%N[aBejF:a,Pio3)m'(j+(%\s@T9I?Dl12Xrn=B(6lL(Z2c@QLUn2Zs"M+JWkjf:Wend)-'6$C%*'C<e22\Bk?IQ0CeRj6:29SNO#
%RcfAKs#%*ZJO1U#KkL'(%Nn0:d!b&8Q>gTXCCm>4d!?G%o&ZJVgM>d'gh*ceIMJluONa>''%ess?+>TXNo$OFCnrRhQQ7#i+b6=,
%00,F)5!+231#!6Jk#Jn@l-eo#G+Y&9>(*Vnb^o<[>Op?KVf^:0q#s>1^9H$%UNMY?]aD#sBXe\_K;c9]\H<ONRbg=E>_V*%1hZl_
%;EWUu<GWVLWu[_bS?bF0*\p$C@/8.dNN.M''l(Lq(9-RN/JKL"kS-_h=JQF_dNgr#6inm7Mqu;a+Y'Y3'7iaiQdh^IiUm%<'_]Y%
%_=C]j2nl[e1YgDITdK\D[7VQcGiH94Z]Z?^:dJ0IN!=U_iq2M<om&%('tt#'\,p/oW%_Chra8"@P&k%0#UroP];?U1A/JOJJal>n
%<CT53Pdue)1.&&jf5:f/74<"J:ol,@0FW&c/^4>[hi6H"PrSpb0$g(3f!Hs4B8DGFZ/$!kPrHY"VNaM@a:`B4BJG8&d%,U.%!"^$
%*\mYXS<'<sBnUVuE'\0Y"r,HS][7WQ8JGu/0l=ijD88VtMSV3DCpE_63m)DPn\Buf-iDXc_\!*B'A46$.#eUp:FAP$,#i@eGnl%5
%PD"%,2AO[K'r>]b%t`_L*"=m9L(Ub`=@8<i`1Ch_WQE((3^TW]Y^E'B3\)b!8B/9(gh=RS[bN&=EWWEIO$El\!<j?RKA0u2ai][(
%a])(J?.&9[J1N$X(aL836uQm.luad-8qUr></db3TBMnNl)<"g^?,-cMjQ2q"E6bGU+=';^&h`"p&1^992LHqOHr/N'kg7E_d8qE
%"<+F.>p:c$6se;:MTaG7TG!S=0S+u%;j`Aq/!62a`C4H6^9B(oLr]^IHj(u5S$A;,1Vpr?!hBWUO=Lm2i"3I$V$U++J^ahZ`[fE)
%5fFIo9`Xt!!jr>6>b9^R%a-BLRtuqP&Y+Z7.oDhpU3?d('3t0-5SSf?Pk-"FP5*[o+-X%-"Jt_JE#.4DBnK/!O]!H!N'P1B"rCr"
%27A!g6%p;<fi6nnMuq6:@:N[o$74FpQ6If]7$f)IY!eX$.O_f1hD\;&.rU5ne>Io]Y&Wln'sDs*TeA)'ptjdslS5>59]e8lLV^b>
%]cK#:0t_*]'F/;.ZD)ZA=b2-\Bi^r\]q/iT%=3E2=i"QcoIWP=1:gl1<(o7rH>.N31t>5tEG;_FL<I1ch+L[d=i-N&iR3rD9uWr#
%?_HBcZnG.m'o64i@ZC3f+']u>WMm=)Z;[^3I(E8(E.rtC:iM,QVkW0C8Pc&>$>E:)`>'#X6GXC7T8JLUqkti+<LJG`)/l7P&NV$+
%lqW_"8qkqcR+q=:%;M!k7Rs/M0&u\jn=s`]/J6Fe\#I/)/P@R<&SB9cR,nGdiE?^l;K9Z,XAEnj4KP::$CP!nLF_Fp73/OmN>6MO
%oDrr2RLt2DZ*L($QigTH6)h29OP5d+!H+I.\HE.H)1VaN/LBS5>Y@GYRF.ct0o7TD=^`3\bS5dcU:UaUkI4DZP"7bpVlB?VUVTHB
%OO3W<bQ'.3f\r"T"-;MRoP/J_@N3^T!^_<qFY)B!;8c'M+)!HD6\RO='VO.!k]NqZN^q*#K8&!ZN=@9O14Juu("o)[r.0e3B;kKh
%[Pj'c_?'%+a^khp=3>-u.P@4:<k`sHN4,J>.QM?7_j.O]MMeIq[1s-Pa_WIGY*@[A<*Ula/ZZBhIbQN_oL1RkRdSA^\A\tb+j2Gu
%l10+;d>gk4\j[>dTBd72/t_MH'D;e/DP?%s)/ld'YE8>k.^"m+(;&36o%qMY9JKY$80<E(@H$Da#>lN:=H[o`8N%:?Bpe0CiWD,S
%l00(hCAD.U@hY\3;rMN-#Ip"/KS0r^,-kE"&<[T6?RWcZ"^SG;AJ&h><#^oB[!3N#`_n1D7c5j:8()o$PJJmVM&V5GLmTkUkT(BN
%i['Jq]5^jK+G7_1AmV8+"0gT#nc_D"<AFd=BYAf=@%?[C,AXNh(C5@a#,fi[5tRlj3@$.1G*SGD:/r]BJ`L5[<N)9(8aa`=B+i4-
%Kr.hR`g<K^:(g;T&IkDkl#C3CmUBk>6M=keES:9/H:te8#%M>V64RM\<N_G&=B&NVO7=#eqI5kO;8"L@15:\0B/?t8iT9YKA#*?9
%?r"m7P3-3Sb8T*niE'ZP[0hQfIipg6-Uk2JQO^DgDfA1[[`[H]L?*"kbgjeTU64r%R=nXJ7S[<&KPd(IBp2QIG.7uJ6rnun/fP&O
%C1_%UaHEVM7o3QsE!53lVP)n=6<M?3k[mVD![^'!Y)!Y]GY4m@M+J3r1]iHnfEM_(2Rg0A:g-jl[0g"s.q7lrP+\6`)k$dZ![>00
%_6Z;V*)];%-cs`::u#a94q_V:fXB8#>*uJ?Eja5I6c&Y8NR6$IpiZGNNC8UB8/4S47LI.0>`B\9*F\V->&0"<<u/m`ImItN'tV27
%W09@_b^qBV=l>GI+ek_hje?jfC=2(>^8="5jO2pH!i[V#_($N31<;2#h,IF0j9YGl]%(DWJtSkDUR4^tDHeB]b_YSJk,F86)Vik0
%644)1$*lY9>=L'goI`*+!.YnL2n%[a*VZMh<7m;3BObsE6r$L:5^AAR6$Fe`Y4NFWl^>B8a*kANh593&ft3s;$Mh<Y8:L@ChGAd)
%X!?L"*9/_B#fhb$EO%P9k0faa6O"X7SeFFR>>`!-*+jT*SH9>i>*,0$>K/$Z_2l"qA-Di[^<3hi^k\q;+;ZI5W[M;.E1Vq,)Qo0\
%*%Igqa3+^F[jK-n"LIU)NBdSmNgm71@qraK#fl'[!]+_PZ6eCm6RCB9em*6AO\RK,-4)7q[kTFPaGCBA=3-7/'j0gTf]#jY\!eo_
%/Hr6j2aTrcH?(j#%*0Pi<eWRjLZTf8_"8$M3KIA,TJ.RM?"*@PV2ItaTdS;1Uo_r(2JeXt'u+D?&QMZ0R\*l6i>_?o_po\rj;$fr
%;(9c0$.eDVT0gC<C3?F1XnNT,41jV_#0N)NcVA*g^V3+G6G)&QjG82sI,(`@'_69WnVIDT5S9=1qlDqmXi1Q":VP*h`8#0$'b;$!
%Rjkp+*G!P'%p;\W7(.B-]Q2J"Qp[pm0Hbj'P#kQ*KC17%ZeNE+%e%*F*g1Gm\/FpEPZVmXJm9R[`eu'`b;;UKac`O_UtGV'Co_ME
%-*s&G*\&!r_]KR]@oGpTmXr@664>c.]&g3STW<d6#WUV^6cF-a@Fo=K2JZjm>shYlj3Jm:?R)A%MN.9$Ru-Q78b#MD`UO^RUX7<s
%6M7[(GCiDbh`&)-#<asGEMS?1CS$S]9b*8HR[8_F]-3A:M9+);<s[(Si)J?k#-F^,0GWoq"?*+tfT;g-%7+$O@Ssod9LZL['Ne0k
%DGRGdjAp-B#_BP5#t,#Cb;=9<<k]oV5qa-l+]G5T4d#h8lqDL@#K3e\9qgr#<`=[]Rek_)La##-VS1jM$]!Bon?5]o<s@QU8Pm"F
%O=anLDkJJh$4ke,Jl,R#%=aB]jc%Ml:PF\1IYpui]U\iMR@bs=jlV;Oc6HS)bd1E%A(.JC$Pac(r;=XI62MR""@PLPNXiT3&kF[_
%F9`7kY/pkP3HNRV1::3^!$6Q71lO#5H829r9AZgSLeU=S?,<hHB8tT*S.3MC(kb#S-6^,Q<!B1f7V6oRH,sHLP*<6REg:I2O)<Ka
%d#052P6KApK#F07.-p\]`9f,Bie^QpX!l/do?a.8gQWU[B6F?U"BCbKb>(LB;-[9OH+]o0AG-Y0"pE:e??63-%uOiS&!S"X3H]ai
%/Mq&`[6,k%[CYn$,\Mtc#:&W3]7E'm.%Ud^JncCjqY!TnZ,j61&!2$i-B:4,]B`H8XD/[OhpoSU$Wu?N#;*K?f?dImM1DWoCnQ'B
%2[Pi$W_Wjpf8Dcmn/PWLYt`j&NJI)jE6Q^c,ee"p93o>u"4\oU^P7JfV(-1*6Aq9LiU9@5O[7@I-cW?cd@O/H@AKWW#qCNNpE`I%
%6jE=a)c2d+l;035FAJ,3&C3^[GC%$T\=4EUI3djHY<Lbk3-C=@pn2j^?1e%dftdA58VWZ@jliBKW\%,8MuKC+Cm&gjZYV\#qFXGB
%DEU/4*mNp;3bY`WSl):aN)[0HoPe]ENhM)";,di5`]hocjdt"&:kW'g]@C9q>"YQU*Y@4%_Nr[%foP[B@EVXFd;h>5UPj*C&okt/
%!\h'[bbF^;$U#ahp/mUS:jl1\*#"M+'-c6DrK4u#3#bGECughm*8&7qD.%/sgrOQAO>EVr@nV,04CSfs!Vh]M6kOKE]5Y*u.Vm6g
%>O7dc=KWZ"A^G^ql0@NS-k=2=c!"#V\XgFeU?U?Gcu8Hh:uu!"3@`Z;[\+5hY+;?0=+$*L@]!#h42Eh9:&2Ol_o?M$)tSr(a?_.&
%BXb!V4+_$t386s-;.-/l^utbViXSLJ+%YUMOC.3/MHW.k9gmAWbeaKi`XC5+U2\C1V'nT1$td#pL'?Fub72)6L<OQTF2Vq:-RUB%
%AtM.4:Yf2L4/c7WJ@?t+hPRB#G'[uK_7(jth[7?pQDmCf--b:F%7_bK&tH-6gA'/i$Q+phaDrAuX+V<pkQdYI2!]Jp,E=gS$,*]B
%P?<fB.2o?H(+_14[+F-Q,4[51#?B#P0pr\.)/2*6FX%`n8nf*rB\$0q.[:CbU]UI#76I'668SSeUK9uk7"n()dj%opCN3<AC1R<#
%jnB7NO@>fA:_=t!8\Fg9)?f-GKLna3_D-.C@%'++1tW%9N<.E>Io$JL!FqBS?l,kr=GWY[d-rI/qiJb3'*0s<+_nGT,sWB)Tkso3
%^p(?AhVm_YqX+%4Yh1rsG]InL\@X_G]_uBO3&oVt^9W!#.eUgRn+=rhY>5,VZL4LTe'mFKiJ2'Dqg4+AHUl*eSfDZ5>98"M_0k`-
%l2Ku(_qbRD%NZ\Yleh.^^YV%Oan61*^V782HG"ZR]"##t3]]B.m[P==^N+0nga5Y'IpP4Kp7!k3QXg$)n&#G^>LY>dNE9ZUJ:j7l
%W-F2qr@$b"$b@9[9&'H:-c1mTRoNdKU(f7b:_9q<VT3.F]oK;EF=]gG#nuMhm7C;eijP)415IZ_0:QhQc5+JsQFo85[0fas(HhJ!
%F+hr@#Ys3n=d)Ah-Q>LJ9+OG8>@LLrY5=]8OYW/=S5n0ZOKE`J28-<*p#,Ien*oY^ofIA8n*HPbI!g%I9kCr)ns_k98!!1g-dmW]
%g)MZPp5dLB:M/'Gk0D$!-k=6/R36.?)$ogMM-=lgL\ZUDdtDc):8l<46k"FB&s3E2Q7OFm7`B!C@SX*0%HRZgF68ipV(U\FoIZoL
%R79KY:rpLC(:flUpJJ+J'4m'gKCC@!PbD_(>=ke-n$ADQ$g8Y1FV)K\mr>5aRi\nP-rG.Af'Bsui-8NZ/(e?K=k/h?GKn^H3tI1l
%n]uuGgBYpX`Ri/b]6h_8e#D@Xgte6AhW_nSs5*SJg5Tf[kl9GTB6cJb_h)>Eo`K@<qIK!Ak'hbe?hK>>65nX'I<?OJ^iF(#)IL%^
%a7&l4-r,FW#8d@HkNJu;%5JgPkt:d,D\+mjbn>67GEXupJ2k-;-9]$((O,:LeqHt`$[g_LJDWs?&-OS<Xbq$oXqOE2$plSrQ*S=P
%UY"6Ef8_M_lr;GJL3jdW`]Hl25^*MX$Qi)/'67on1)j"*AI=TCSbTpVI4<=/V$LPV.!aWhPF*4)nsHH6RFud1;jjf$:-j'GQ9ZM]
%14mLJ7(;J&[WCk9%MtPU;q2n^+f:U,(tnQq?;2TF2Kq'G6b^ok_]YX\4IIEY[dnYA?5=JX2pnKl:aGGtS_q\<=.Xncg='_\I)gGV
%($.QMi"p2Wk$OV:QTRPXrUm3U*Z]\dSPlB76$;4BM"t<?5IgF--hKum:HmJsS,W<D_f)EQb-gQEGE3dt(O(nc:*)&PfKS*iH?m0u
%n9B/g%mBs!Km^D<]t_<@9r9;!pNEq)-V$]([h`EBjE0oHh8sPO./M*G`h]=^T;_\$rU&(QVXh'fdsZ-ab::g9Jb^*+IGr)Ag\^T:
%XC=PB5G0dhWL?h?@9*=aRNESG2pKCL_UCYfs4bMFS`@D=&,2D=b::g9_XYq!pAT0C]XOCp>TRh_!EQJa9:n?'4+)LBm[``;79IO>
%`SN\HlMZBScKFM''ib$^mGi,_WH*X2s6I_OYJ=f*PKo_or?EflM)8a]kM*tX<u*`+dS@,r2J$7be3@SZV^X7iN2INkNTM8],QG3C
%Ed1nj0DEXJ@HE7hr=]G4-h0F4=hjGJDDRo7Gl"J-Q;7>2oT-HUL&Yskl0(RCDD'E<:c3]pSo.1;%3E()H-flA5>[QuI`FZ8*VMP/
%DGYCm>d2I+EZo7&T2XS.Rhj82Bns\c6:t![>.@cEr'/Gh>79jZGND86I]ZXo`cGqXJ$PNjp3U\b`ZMZn[*bLIQW=cG;%e7"HbQ/"
%#+jHhDTT0^_cF-+C<l4Yr8[M,r&d'M<oqB(ebnLh6hB*5`P-*JO=A*rnbm4t^%[sFT1mdbE;FC#H#i<'*tFA2H,tK'DRe.fffN@)
%06^c+h"p&1ho0B_DV^n%^e^:FEGJ4lHM@.,Vma`l[eC7J;F%&KI(?(B?JG+K#H-<Tk</K3GIC<@G.O;+3numQ4$BM6)qPk74sH3J
%qA6%om6CW;qHNsKn>"HnQTI^dV0\IlUp"S"(Dfk._<Fp:h-E3J]WnuT\8Fp[:c84FSS>f30>E_4]2+cK+7AQ[pl,GYAC3?t;SBcl
%I[RG_5'h=V4JeJ?p_@[8qndLON'=h`^%Z%UH^SMFJYgYDla*ePqIK&:J,*A5kLCLKc/In#C>ZP2p$m(VKWcKami@MJ7Y^!fdE1Wu
%?*MbG#H,U4h_(PU!M9>(s5C5KrN6`u@Vq(GYW"`$.rW(O2VUn@9R8dT<RW!9JR>#PDKQS6^N762b0\s+qnN/X2Vm:e^0M[<roi0.
%O/Dm6gnDVoI)0642^=(=j6bYcHHC!)l[R8<]bu:5'@fN75,S??B5UJNq;5h.rc`8*k2uI1SXDp:,,#Dip"%B.rquCAAqL#+fRJXn
%5-DH6m,IYhp8.d!qp/[&R3%9<7<m/]]hQfjp@.Nl(u5T:].:!ap<N[.E;']X')m@GItH6XkZuUt\7ta,UAF[<WZlrp:[Z(cr+^o3
%4E"g0qcraj,p"3ojKnm([_iQLmVs4Npq7><?J-[pSKi:OpuoiZ_;jq=UOTEU'n%DNSNB`UY?u+Q2KW!AS8^Pdre*SC5&_cU\k8$S
%m-Gg0B?AqR\:;L"Vi1K3ro*8qr@?jjanCaDK+%%9*:r'_WS$#jr`6cX"7TiJ:O_A:p*fQTH$m1QH[Kr5Im;J,T3qM6J*kh!s1@&H
%UIt"\r7tBE?oL"[%uq^%rX@&)5Jk]n8K6U^hg'\m-;Rgj'G*j[C6::6%`Hijhu3"h*Mu!j!qs4q]CrgMY?foNh"T^o_WkGDIeo&l
%@U8`f\%-\n*ZglBOLJhOn*juK$[E=Cn/po?9'@bLYrt4i./?4KbWe,E5!4+4FF:=$rp>njQ[ebc$U+Us>?iO;g\]1OJ+_4[G\;;H
%g>=t%cORCDT'S%)Ap`A(o$RGYC&XWp+h!1;Nh2Dse!&HbkEq@VbHL+f4B54%#1i``n*m*I4o)dZP#".cqLdOX]13*Qs#8hU:XN^l
%iGYgY(Gka>dSIWh\'<:r^,UU_J+$4&]%T0:p7:5EqJE*Hf'9ljYE,$n+3WC8UFh^m%TU(W4"pX0$.d8FiO#Bp5@MB=,kO<96"E%7
%(N=tL%^#?KclBgd$k;*BL:Ynke6Uu@rRp*.IU&66^]3]\pY3^n7u,D+>=\SfgKuU`%bHX=^7el[dIDf1?5=KQ-hG335%jgas8U\'
%7c;J/P99`lp4JhrI!kHWoj;Li_ggaWL]@!T:]Hj#rZAo1o7,i2QQL2!s8B-d!]RjlO0e5m+.!ZRrL\>:Uj'5EjK\l7lI*1E1I**#
%RtrSEOE^AYeBF&\0Q8hko:"qC`L@a%qLk=%>cd*Ie,MZM`uh:GM,IT!/&QEH).""Rm\do-&R,pX1@a-_VjZS'C#csi.I_p0o>;"9
%J)7U3a4e*Q>[FllGQ+P<IuR>(q*2`GXFlk<YPI+Y-(I3$q-RZ7J&kLcY<DbIi8O4X8\0>YJ,3aNjERnQn7:FJ*350WO7dGS6A.;I
%gZ^6^UM3dhm4-">NUIqV[ZJMtN/RUIH[e&hZag\j4hTo6ipuqQ5Ft&%3B^tDW@qs:5!QTd._YQ':=kftT0;$m?$8OY':X;kH5cH&
%ah@=`MaO(a7#8A=^Z0S2R3kO066G#IGs%8p&jA:Bp'hV?"4<=iN1=PQiI/!Ui5<J]4Gj.ho'+a!PI$gN]u)'H&]j]+(63FqrEq,H
%_9pQgmCpq<qP0BIqTVj<OFHUT.\H_0/P"uq/3[D.Y'`h`I=1bXRC9$8:f;U3V&u6K4Sb;;[Ik41i5,'*D4Mm)jb'nWPK/$*XVX^\
%nT+0=Ee",QT<1TMe)g,Vma8"_dX?(an!)Uq&"Xa_SXhB^GJ%0%c3n?%hr!9ZGN\cL+4+8@s(m2\KKjZ]>Q+KUKB;Xsrbh`Z/(]h(
%/@W6`[/sTY*_@OU=Df35md-Pt;$Jh?)nko\Hi@UPm.]97gtpdiq;P-Gplg3q&P'^ue+r1[$;>C<j(V0_j(]He!dC!S-OZrgI4/Ik
%FPJraSig?7hk#!eVQW9'f/;L.rmH,JjL5YcViRI@SG&.>5PfX%jPb-ZR8'p"00\%fH?j`b1\M=Kr5dlGD'@)FJHahsfnaW^+?lHD
%;:U26i6L@_AIF6,m!fP:pdV=>K@Aq&Ii:S(+Q6ij=4Kq%VM-u)l+$M5g,:%9O8c\)<_JVt%/,<lT3]Abfb`hTs))"GMs:/4s1OMG
%fbaLUiqi-;Nui3-o>Vt%#47pT2W#qPM=).[?^PaUZZ#Kj`Tl(+\!"&fD-=*DhjZ3-rr8BU?De`lX'<DXp:^87>Q+!d!rV8BSW#N.
%^CO>[rTOaWch_cKp::QN%8"#06/6GiXI\JNS!Tg/QnpacRfAHDS@0Ll:]>@B>hiFT+&';fn_Ob>bl%J(lt"4#(QYEqn,!"Ep7k^7
%k7M"YKj:;PP92m$db:gIO*8eYVX<U8p?=JTNT'>"1H)l=dGI1gi;OgZG*a.4Ht.0pIh25`ViPaikPfQIS=L!bMAaWu[soA400k"g
%C?P-DrpK;SBg!'FK2:_rVpCq_Sa?#V*M.ZOFLlG(dF!U?7A"Jh!o^F15<5V]\R:XlFFf%IrQFr\_eIq$9m%99S>d/D/5Q;eh=05`
%e<bXOVetJQdG]@Nmb>4#[.>kJRs\l';"=c!rtSc,T%j)LNU,Hp_u8[c-N84LjA3G8GKrrYNt-W;V>d[*MnT,^_Mt=b(SAi7gcTu_
%A=LdEFQQ;%a$lod&&'Zn])7Meo'`eT:EKK+B7(Wt`67(LIrFLWI4mMBo6H=CG]Z"6e+]2i:-UktS*mm))<LP[r3UgV-gl?@e5m4U
%H#<NChCcjDIqJkki(r)Wb'`e$%=5Z4_p1\SKT\Ri5e2.24%JPg7G@A"Vf%A2.Bi71SZV_F$Z2@tMdrCR]*Ci=a#hI+jPp'Yci**M
%qPgN7YWUauSZY7[X[g'64^QiB]>I(7;cf>3?+(QY0`/h2K/n:a\A*Iep"B&jbJctA:X5Q5S/M6YO,fPSbN#MD`@&k/4^G_4]6Cjb
%E,U6p'J"-6d@%o>J/KbG,Jt^NZG!l^nf&rPN`n;/[(X5PZT_k.mQT=9.ADW3T;2?pC[g`c(:VUbNtrgUT:@Np2/KGEa:1G5/G;i!
%p:!haMhbh2SU,=jgi'r/(E@,_A:#6.SS*kaaio$>8mPM9qtTgBdJ!+uJuM/GJtCC%SQBF^Vk:r,IV7'3`C,!FZH%1pVauZMc7S:l
%$@HL6Xod5TqS@2rn*FHPnT*p01NgCaADB#PLna]eH+5u&8T_OW7Yl,?k1df<5u17GYE+`\3jt\pWoF?FNPIfcYHP!h::Oa+N=X?1
%T1g`,s.-;ZFn'#>a].Mg]n<Zi/o/^Up6H.R^Oh3Z,O:(3=A).[QcDnCgo(m7m*odR;6Tu`Cn"JZir8N5ErYs8O!H+%ie3F$=?iq!
%Zbjc<'fV_iTlfgDH[kp3BD'-Ons,dE]dK="C4H&o;a\<kHKA[c-o]]?FP8[X;K$\qnWgdteS@@n3!k!1kjCU)5<$>;H?f)C<.;EN
%H%,;_dDNqYnkh?hDV`uuo%O\`hKuHE]@.;WP3;`(n[BV>lE@D*q:SueIUi9HfA7%QqXDLqGE./snG)[[%tF-K]jJEqrRY8#gG_oW
%RK!-]GLK3g^[pXG^&>eBgXkooc`]QXkP/j@hg<t):gS>*psLjdh#6C'f<5XuI-6L(h>GMZDnbr+jIMK!pfl?VIcl^f^Gn]VpJ:7*
%rVJh8J*5'rq-\",Xg`NBhRr[MYLe6grpCTOn)_1U?@G';j`dVH^\RHGpm2r'h**g0IrbG"#H*ViI65,aG44kobKoU(ZiB@;Y.]5W
%dI@.QNQQ^<l_FCBTDn[O[m/QWq<@]>g6[0bbBMh@p>2/)]RFnmi75HC]mP"lqX8SL?$hu$le^O6qXEk>UG"jTGP9qIs8;O[G93Ao
%4jJOsZgRVcYO:hgqu:p(c/8Ns1XS!Yq./f0?iTM,qU;YIEVI0&pO7,F7eu25[iaCMktp[7q=a70[?p2<f3d?ZG:3CSqUX]sX#JnJ
%rGq\`X*=R<g>?7cBC"0!^:1L4qp!lf^AlXA2g0AQ^SO0^^&%/lqiBj*h/I-k+7K1!n#u3YmJYj&q_/!Cf/J^srL^FNpE0=u+&r8A
%hKe/[a5Paql&AKRI-:4^cE@abIHuMEDWQNNH##(r>:5KKmGjc3goK>HmS)Zdh=j]/S[pEQHC6u*_sZi;>IV&=nT>qdFoB<qb<,Us
%UB>5H(\_9cBC!5i?i'-Ff4mF9`oXnKVO-/b>=X0ip!$9Vs8'<VpsPM1p?fbaVZsi*Ie+0]a^<M0ktd)a:N,.dp6B_eVrjnhpBUHS
%9-;s&[Jf6kmeu.q^Dt_+,l6G;XG)R;H[0l2s5"^jc`b'2mnNc0S"ICk#:[C[g:MhNAc<);hDB@>+'sBmm<;q/GCTM_>H6km\))LB
%pR=DHNCVDH4R)b4:=NX=$Jg!b.e%#MJ@kg3a&H_4Z7Q"7cJ>\6X7%Z:IQOFAUi1EoIrb:Q=78>aonS%0]=n1/?f"?bs88cRIt.3n
%[r6ceGj"_m8&*jTi:\N^9V[)!J,.&Vds$!8o'Y[js6Z4sOj)P42#Z1<9j-/aH2N!tfG@&%+$FjmQhti%]D]mQDnkqaB/2fLq:a$\
%IcXo7oZm7-qtJr-5(<Fmnb!DVq^mk*M0m9W)SFt?p?J3DqR>"XS2\+LGP%(-/?-5Snf+dHFa!`?h0jK[GX&o+rTACBT'1G]4Zn&R
%NDE=LhsF4r5<W6>b*A+UqAf\<q=-+/p;s\&rT!%smF?YHqm\9I?2rH==100JO8ne=_r8ktgg(sC^G[W-HKu$@LieDp`r4fNrp"pP
%ZgH!VJ%nK(oaa"M^@tA$s(f6lp#L+0I0JCnJ.Oc/hE.*n"@>[N,LhBC6eQPCcbB)ta\=[Z$a?8lR1*J+93RKZP?t@7ZhBdfNOJjf
%p"\S?rgkadC/N,T+&1t9ACX2e;e?H\q.2PY/CY\(1fCOQ9#mHb[)$,NXdD9fb6uK-OD6)8KF(J]q"*XT[F0)*nB#f$Db[!/baA`#
%82ud2mPhJhHp8-/C$C(^qX*E[7Hd`\)S]L-Q2G0Je*GkYWkHtCU>PE)NWm3s9>aUj$mr#[ql<cic@_u,;o-[]$0OADS*t0s;]X;_
%B^<WFM;LDn=;>c`6C_e9U?R6bpqsg?I8Qgq;"R:T-=-RD3>_KJmW2A((_OoU7c(W/>gns`@p0-AZb_5]1]H1C]MH,_o9W^[F6CEI
%O,k2"9@e7WN?=LPZda?$E!jR(=.J@R;bZcR:Vl8$cV$LAg<T52qR5]7r9UCQMR1S\>ccUcg1<pf(8U0gC]HZT!8[<rUiYS*)-Gg\
%5>^FG&#N,,HOBT^cTR]C&%!o([[5dP=g4:.^U*Gsar0sA9#es$a!:j9EAe4('M@j*>[2B2q\4TW$YfB?<qI?%#LX67LFL?[==EYl
%U/+MU%f\FoNop?UB_^`sr[DkV+u)K>/r<,m6<HC,9(B7qU%,u=W?Tq4VF^qj$UZ5dG;IK&Wm1L^<*%qV1hBdR,8!WohCoq%2&7sA
%\$PRL$N?>(WlX^aZTK%.+r2m1I,Je^$%9Vp8nhtH%tnI1(b3BfP^-jUptsL^T>^)(H6ms`oA-5hD.'=3@k$Z#L*8kO17r57;=#g-
%,!Rg3VaWu&.q,HJbZR>fa=N)'GnE-B5.=*W'sGa]/^3:>DK>2"TD0l]Xe@%^3\;\9lH:sC,-Z\`*E@i<"hosB8q*`nI#"o%pdN$C
%8m3'[VHV6Gei7"JbL6lb-N=Q?nCTg>m_puZ+e$k?D"J)tm77.SS*pPrqu^GdA:F5B7dh?9e]7%E@!To&Nu!p]@;LH?^UJo(=/?Y9
%qLBG_oDWPW@B*B).mQu#.#n[h'em5j$_Vb-+j@Xh`IN;4c\JX<:p[VbUSLgM3cUF?Qg4^RD`A0IHV(`XP^:;j*:NhKm=SXDkR+nO
%dXFoJ3^fCB4f]#_R,VZ0pn3P==20D\,k9T]F.o\E>HHK.k$5UW?AkBbho!',V4C>l,GnqpBb#t^52][4"&!IH!k/_R9RcV>S2s7O
%;,8oV_[.<Gc<m_W[D*MJ^^6:*J8p($`GDb4/VF%%BYT#=1UcCRlY/@8^#:&Gb=78RfWrl4A?B!:=W:HbO+fscF^k1?IjHm>`e]-\
%Fn.%S(XFq`+Viirk@Z4.)Jd^r.dt@8])2u=g'(dQ!Dfp?Nqk-]k)P>sR&>H^iNRsDO//?NWle^X.r0h0FL(Q,i@Pk,Z?rFu\UmgM
%%$jHY@p1P2>5PaPhL*MQM[&l9i&A=uqhpoU`TLUd,I;HcCK[l-#dK<Gga9aKgT9hb;9@+ahgYHjj:"5B:W77]4i9sT<o@n[X$=AS
%K&u#\e#*?FJrP>e;h6e/=T<KG39=69'0@+gT?esqYQ/-jBtXKmbl,IOIgsi2@_U5sa>=UB.Go'N]t$h0eLPn?nXA?PP>j(-'7r0Z
%GY)5-ClWfl9qpZDWjWaFr*Kb#'0`8PPLYftdaD2aJkKf`FX#L,]l*s9c&[u/rAa;0QBoa)Y$IXsJiT.Nq6O@:N*.:+>OPe=G4\R]
%HZ_8W*q5@6q8badXUl/XI8V.H6"L[9ONP.9TOtGqPmncSqj-$t2IFQ2O*Sn2lL+I*qr%QroBe=M9@VeqK+@(3VS==;Nak]3.]*@,
%[`=dQ`IB(fZG@_Tqq@:.(1V$a;c4NEn\6^#KqER!gmKc*#,8[lp&*h+H0\-_B>P"7_\)[f0Dm8onA&Gj,9QpEeC])g0;j)&@;^J!
%!g/pi'rfr[>\UkG]0i>*qq]5)qK#]Cd^`Bn#l&FunT-+.3-WD8kEf?nGX8*lp\sD?#AXh-Z+e[)POic?IfhHkBjA=d2k\%P5aD!]
%>LK"/QIUmPK_=.%(#I..Pmd8][)Q]hfu"Vp2a8tn]G84C&)Vl-<dSKeX4Nd-IlQ)#U&=/i'bCB&`p@&E4QV=FHH\fJgM`.VdW<6M
%d"-Xl^Gtg%6OZ1X[G@FS^6OnpJh"`T_i]_:T]tqJ"\<d+Q.10-08fDu/+;%oVsr=kHCcJOD#@]r(GqF3n!J@b?01;S3lQ"`fB3("
%Mg:X!Tdhr+#^ppOj15=;,d6VhTVk7b;"rTqk\dh>IKLof47H7Of/JQ'f-2:>k!]!L=<0J-i4"`-[09\'Y/9oDm0;^@bnP"B[]cNi
%Qhgp;`Q7p;O$A">k+tr<mS@Z?KUGA6kO,cQ&'T5noUqU6^f^8#^@C*H"W5"A#t@-0TY=;P^PoOi5UHm$%ASs#8R$B$NZE0m7rai=
%a/<,JdC:iEI%]m*joJR[^'Xh4iCqcD-H4(Vjq9(prn2*qNmYDLB<[2U6.$qCO8!;`q8H>g`L_\O.iZ=)S:"rKo"G5<7fd\QD=iLX
%?/s+Zd0CuHnQE#$-Ph;&Wo60\_LGHofs]7["^$]-\(Z1CS@K"BlW%FVf!PA'fmU!mbJmpm$$/.c$?O[5QsGI:&njX]l]TO&G*Bf?
%PO6W+GrW`HgcAuH!om2XLtKDO;!"H%[Sb_/O3[@7dO4GNk$!US$YBOJK,Cp0C]!64XR36iCam+0EpIai812SERnsi0O1hf^c83S^
%Ibo-=Y_\53\Yi3r&%B4)Q?e&Og2Q*smtj@hrqn^949kr:>UR!@R<&;Ri\)CZLOl"d>?;eoFHR^6Z,r/(K`c/!YW-9'U9F$[=d#c,
%:QVg6"PPR.cA"9e047eg/=WkjmHX3'<%=!qoJ2>@1;/+WFhRHYBk.YbMtDNDYj\8<bjjZuZEdr:$b;=:nAd[G=Qj5chLA_JhNcp,
%3u+u5&jOfU60p&8.=g%@<dY-OP,6M-@!2<9(ipg`l^bmgkg1l,^UB1#mpS)ol[DS4JVJF'Q^j**$ocJJ+89r?s311S%gSe6@.[Cj
%Y@FY:Hi:`@%#&Z911#Y<<qGkR"qnGVp>KjpSD@22dEjN9N4*4/e'I0;b^9G4$nAJ2&35b4\r_t5TW.Vbm(1uT2#M[+i<)-d*fJq<
%pHEO[Cu`r'Ces2lFDW=lqh]%=5;(OT].ZF8<nq(X^Qei?6jkE'!jR]@21Bh<JTd@j^p\Xd.b7JuJ*HQEoMM-$efLMg\.t/mc6Z9i
%nJ]%8"^D3s6F-RuW9c%#HeaRhZ%p]!#)6[e"AI'<-PqV&I>c_:04P3;:HuLC"Y28[Ee/k<R!W#o(JCOV+=0M]'FNQ'O$K%.XjZu)
%)jRQ\C@?HX^HOZ4^lYh8aD$I7M8$`W,>]f>N&->V-1lM2,Zg,r#"uL'B%EVlol:K4S.o!R47,$X8e[g-^;!DNo2I&oG!,77/%9N7
%(Nocl@dbpMX3gk9k*O&$o$[^e9XFEg!3Dpm4g+Ed\J6e.So7b5K&)B5c*^'r)7(XM:JJHq2m?[Y`_Rse-9e@?!udR`*#ZaaHHSb_
%#1.9]KC*3(\:^gb1oFRHB)#bj'+LGFo.*c3(\<EfQ0f[&.QM-mV=GTs%O6h]@hVrM?2pn&&+,8)eU1./VYLs?iA+)Vh-4?!^&AjE
%4rGo*qan\1GUW336sCfQgN^c8dAGo(.G)+WrW%keC<E`MGI$OgUYX-V]RWkM8'&qj:5WPg-S2#/"2Krff]2_O^g!tjZ*a;Y"fH;H
%&#Ii9lR\i)<b,'c<(>UCbscD#lDbW*M3%';R6aff@C*:q$4\`XFK$+7jMT8t5WK*e9-(kaLt9iP.+,M@fg9nkq;l?)'q7BC3R`cP
%9CpGsaurom9($Y/_oTCDPAu?pPF0A04a%2n>jFH2m8l*a`Kgh!p15XM`b=NU8C[afc0r%QZi(!8GD'sM!NgE=><s2K/RW$j?$UW<
%&Jm5d!QZWS[JatY*Xd4VYUt6=4hUhW\Ei-T=F-!3(Wl5g4j=3JP=^?IhNbI^c-,0)nDgr00_[Xl+HEF>M3?ib1#>!Z9ZA)BAd&Zq
%f;,JIe]TW%^.u4'fRAZG(am"A_8WHR7Tcp8(oYEjJ%f#&DDG,cho5F-;Q1IJ0C>hh51k7BFM:AUV!Ie>&#]FIM:/nF:PiPFW(=m#
%(QUSd.J\nsmOmW@koLZ.&WK!$[$8I]6s0*G=L\U.1:P'Y>-h7e\43h@MtPfE+-MS787X6AIhlEk@@E7D%tBejan+>a-/r2n&!ong
%p`1b^"MYiE(j*&C.6/JRGJMhS:&#!2(p`E1qCeDpF7D=+2T6HbhaTM5>!6q"pWf_SH%'_B6Q.OTC##>p-&0a8hkIUPCS=DKV[=c7
%9@1Ksk8rrS+n?e=["Q:P>+?S=^"aqn$VLjdc/B^&n$86mkB7j]l4s^G/>.6%!o<NVHB?Fc_>$l1/r0rdF+",k[s*?\CtUKp55N-J
%".!W(qpA%HB="R:^L6_&U9.-oU:Wke\6lSa9`@T;GLa!("jojf<<8!?c3*3`]+7r=.%VK7HfEW)ph6,:V^_4pmsc>OV&:kNO5dlN
%D>)3]8s_ac:eo6#A`16'Dl_4ie*A7(rd&A^IFg'`!GV+ka26[3j1u.GDX"V%\a]OtYsqrUoQp")r:p8apr6H6/]g>\^B/;[c,TE&
%*IbF3]e:BZ;]1bY?pK4";`\;"pTtImcb4:rM7tK![a(Drpu=#."8DfSm9?*L)Om^fZ/G*PCV6sN*Hi6\r'9\_33u3.A6h7O<E%8+
%qZuVBRhrY\GeM?bD1G]uY^LoT#6(+ScGE26_\LShATSnG&dnsM!l_"ip]4IT,ij7rS5m4iYL*ZlboU2AEn8WIPnSZFYt_E@rnY3b
%?7e:7j`EQ:b\!HaAo$"%FsgZ=1mDTK/aQ>1@e%uf\(JUXbN\Ad\M2oU%:ueFCFG1ORQHssQ_(;iSd@(O-B\s&/[O9X2Z/,*;R-1?
%Zp0?W9T.W5#CPLVWle<C8rV,j9Z84Al1YbGKrS5\cGeU]^W4[ib*Q<S&F`eqbgH`3)]h`a&5115Itj0ODQ:Ju=D3#2a'dMlD>_2j
%eg<#gT@UtSrSQ0N3hM>!-<FrkPFQ;UkGI?5IS3<HaoT5mr#!<H?+KbWP[dH0/!jMd[u)Fig[Rb0^g:Fl;1Zhdn\BHp4blOX\^SHZ
%f@Td(ooo5rPMP(O>seVU7&AE"\/m./5#[2!/'UcgRr\,I42^`["&&tjTMJ07k\K`kN)q&d,hT]"[ccdu3k?bVL'JiYhehcDa6(#4
%k!+=V(4g5/]?P0+S<?;B-j+S3FM:eC7&V0hB`*,Jmt/beXPeh);p(%UG-dT7F#QaZ+ULgFiJ>!KF7tBcB>W/S'H^+@\U+#h>@*[d
%>2Iq-i*\+fRN&Z*BWdkn$2baJ&o5*XSM78V9:]'W5/40q"6D6/A0aVqKd.4Y@?8($"6JYq?pe>Uee_=:b:D=D/E@*eQc52+,SEp(
%N@S3JhSY[J_W8)\Z%Q9@69)._WnO,IbGph!MOc@T=:.?eaCTfZ,;:55oC)?K=c^@MBMj^j8>0ca9V*Yu)t$5f_eQ-C:gd.tN)\i:
%$m'dn=VHa\4--[E"\Wg'EP#)RX'eNUa<!'[S.Ws4-D&J"%dundjuY+R"6u1FBI+eaUns/9O4P[6D\1H;O5`Q=bHP&MpuG-t=:/W%
%j6BMopE/K\m`4)Dpg43TK$'&(H_h#ZarKP:*XYI+*uLj9E3%7h[[]\=OVP'78t](/mcmSjT`^3/U0Leg>2B8nrW#m6Yq:NNooV?I
%TEQI>9.[R5)ie/RPqqCU7UZIq,$Q19kO?JEj^L=<qG/uC&?n)3me."J.!?((rKH/ZZ-XfBEA-*4cW2PodXRI].\S),&0<=uaC=Df
%,]k+X`?6/64U0K((W#re&1(8d]GjV=+LrAm-S28q#tN+M";=8]jEAa?#SAV9aX:fPUBKj17MhD[D=u1/`AI=L.B^.,bZh[Ta#7;Q
%6'W:B][`%L)OT\Ql[C?$J[!dU1#E$aYu]3aYh0H\iOf%&'&G((KP'b9Ms,tpGAT-fGO8h&qdaFW+>C1<!^iSN^eiE0mdM9o(/QaH
%Z,X2g'\:hZn_=eHU]sG>X"K`/,\OnD]WU,m>Lb:QK)u`_`Q^V_jr1,nI'(ZMLO=jF1Os+_M>-pihT?GChlJcsTA=*:Q(ps-L1l<B
%.sI88iT,.e?!T!VpP1b=HTihrC)iooj-\X5GDcr\mt0O,?o:u1XWno]+Um!0[[a!d\^rpTq$K%H)0^oOa8s]^YM;AThGJu`bPG-W
%Yt*k,csUmE1&>Oh>NAd.Nd*&^6AUZ@Z>4[q2AF6-cHgJf=qBdh"k/ld#HVse^pEmdi=$:4?d;%dN,]RnKXoLm58r*o*a0.@ZRA@\
%Xsbga3nOTMCu[ij[Dm?>ak&_eVa?[SSBB8.Mb(aabVAWEPqn:@;_X7%"%-ao<"LlFbP>6`Y0=T-h+s.ik[5aPXn)Yeapm;(c/E;]
%_hL3i^eB;<_X;@Aq3eC(p;?nqJM^Whi&UjAg,Ho4r)pP6J@j4GEs&AW.`#J3AcHY.2d;rpi=3q..&]GVO>Knl2pA6U(D1]D!+Pl,
%CVZU4_Zj-rT&.]=k03=,3W']MSh]#<!@o"$]K_F+@.UDf6ltjLKk_H>CG5r_d(7Iq+@"c@*7kRc4M[^p*05=8Xg739cZ,U0Su8@?
%I/8oTWUQ]5)#]DT8&9iCH47;1R1V_Zq@B([Jm;;^HZ5F3Q_%Ap=X)#2Mhu`AJ@@?R*ZDqGV`S`MA$JT*#_4qWE_08LqAJ)l-51m4
%8Vh$dBXj?sI@)mj(=];V!LW&fh*g6P.-NgJ)c$aQ=2)gFIN(buSs"+]j1qok/cL/pN[9Q_NUkXG;%m\LAZSLSTe5LQdpR_T?6ho!
%-taakeQ8,;A#\0PU*YO#g_(is$c=Q;j40[+Qh9_t8^ohHcM0,]5G1!0g;adFWm1D0"P;3bK.BV&\Qp-/*X<DK)npo]VD"J)MFq3#
%SFXS("<$[_<$sr(c"D+Ca&TRs`>4;"5=J.mic?2dcCcF=Xp*\BP6MJ*dUNpEiL8LS=$I^FdQV&<0)#S]pg4#Um'kX?O_U_40BdL!
%#t996iUS[/mK2`7JaST8b2T^HaG)Ki6<G?NB":d7jnF;qgga8Y\TknG>^pfl9=:)\4YR@!m)uE6F1rIa,1RUk`uCbi:Q"83?WZJ7
%fntp;!A*:V\('qK*u&!hHk,)i:har8gglBb$tu';IVB&)WfqY8S,OE35Do#bAN/]?#)VK8)Ip^d::W4#m0IFcN*e@4.W`slcTsQo
%->Ks4h34Y^'JCEeRORJ$WN@of6PO/,G]Qi)=7Iapc^#AJ>a?4,)54?KHR]e`g=Ss\P!4?Z[":<Q<15&#[;,$EJ$L]6oi@R/nr),,
%`mR%f9b5<%?'1BbdA8gLnZlm=U!D_m:GOksS3j7I8+Xq5Lq0]92^jON;I8/t-(SCd'lo_Ue2lpEhcY@@P:c1n7+>rfXXZ3]L\4e[
%Z[LPp.?]j/Z<c5m`M0)QQ&Ps><3iP8U)o.]SLRMh<eHIB^!W-@FhP;9M4Lj[X2Lt\/L7)*B6Sr-0Nk%+FqFDlJD:D-(YS[RS`rsj
%&^3@dV5_RB4,^hMA!PeUiB\S.%7J+;iRKHi?OrhHZ.CIXBjnJDVa`\up7[eSa7eb2-2Ho$2m:&(C%qU!)(`a.]&02[\^]9pa@4Z'
%A&7"/mK9rf*e9B>niH7<_.5'f#\5uOHuToP0.Q+^e?Cp-qJ#r.hjJctrtt-S9$6Ak>+^c!oHJ"V9RV&YlfY`oYeV>o:S8:%+&Z;N
%9AntE88mn;/SK0A`AW#:P\34/eM='V*q);b#<oQ)-Ug<#p/-.ln_7OO>D!+KabP33-o>]5^Aj2pb0ct?>rLOCp\t+S=)G;aGYXW=
%i+mTEhX),i4u`2I?"3iFqa`Oc.;uG-6Z#7[!>U?*g%QP8q.[?LM10j8.n$+?s0($F,!+G+HC`B4MO5qfoHA-3GIPbM*7;Iq1Rog)
%Xe]0`F\b=<;F+iGp(q@Nr-0kbFEdY?gDlNTnOnlj78oU"JS<\`)bnOcBI:pp2;!DVkYAi<gJ\d!NE[IepJ8(_bN;Md6Bkb/Loe#8
%#i:a^gtfZ)rA@-qI_ssIkrE,X*N\2,i9"QDj0rFg=gCc&<ALSj:8GNj7);2.Q,H'TFs"EF'7jhE&F*$)]`M&`"XEp/mQ;&;7_H(9
%<M!mPB]&4;cFl?fB&jV%@H[)N?h`,nha\e-qQX8re$;*`T`)cr9WYIiU3i#V;&tD8J)TG$*)VTr\+0Zr@C%6o%:of5qZAO9ktS'#
%gK.>L2KdW=rcD_.Q<V`XM7o09\'afb&1tRKBS^<?(i6MHX]ZHLYiCCMAZuO?3OTVE)VI`>2Q@90/CD2d-L%MG&d`hGY6%j(?XND(
%A(?IX'<R^`d7/U*PpQ::S5oce?sLW\l^kknMa6pZ8[TLe7sUj%^h8:s1IaC!?sGbCH'R%6p3jIB73Yp2HIQS$SnQ#YmS!hF"<n1m
%PN'=M5#ZePd@P29fTM'I;pXl*?B1u#!m$[tce7Nb+Nr\E=6Gc<o[hT,j9\63_pl`rbDD$!bd=m`&)I%*DL$3C')h`U)%_XBVA\-t
%*)V=lP.dd-8r]Q-KB]PboQ"VFjbW>J%rO0rF;1rP(6(-4-j:/ZK>fc+*Qhij']0o5"UYlbSIg3Cg&=0.03LOs[?D/E`]&;^96:be
%#Xj5;L1DmB2\Vt/rV=12.M`Rk<9`AD%#MPkFm=VVFra+1!R\bMb2-%\f7SmrENtd6&lE>53*E3p\;_<i@So+-VP4T>OJqo<B\6cd
%od^bBZt:#._L!i,-0<H;r\/cF`*48hK7>hZdXiX2kr'Ghp4@korRi<a$;@C1!IsB!XGm/RHGiu'VpCEJ`kZ,mQ%'^ZK11t69hA-)
%?o$N`Kr8Bo)=0;];Y%*24?p(S?;jfJ)t9W#VZQiT6T(Gj6+Nn,-GS]A`hXY&]j7<!NR(JMdh;=5Y!.u>%]FPZEF:eMqY\T,[<lL1
%l)BI'AFFB2V]i'Ur::1i-2PSOm>f0lqtsDk<N'6UQsuXZQW`g[7eOLO)7cZ$@rDhAq)4N`^&:2ZLJ%g!djFa&NdQq[r_agkY7?S&
%-dUZpeAq%%7=#lI5.cXOl"QG%KEj6jWFV"uG!:t^*[86[[/"0<rd2N2OkH)9qkT&g)mt+eQDm>uHbAl3/GsS+dtuo4s/k2#57N%D
%4,N%WQ,GEW^1jt.CCfX.hjUuR`(tGD:F2KBSk:<$s0+=,K=,(F.H"=Em<HK20\`D`b]!1cN7_Y<Z_6Uj8u4Y;GLO3plcD2S)4r5@
%4]i)6-PP_h?aBH18pUp8=,JWk4l\jPn#\Zks6\"8K^B("oJ"GMJ/,VH8BO4_k=q%chYZNj8pO>g8%:>2J8h#)L!dXoHfqAj*NUG`
%Bch32Rj*Eq1\n/PVOLF-d*KP(4AIa*"9"aLKI@fV6oN\I6"FP`RcoTp8/1k["JW]="b+`.\&\!P#5_a77*G!87W`ZpB,6:Il^oOC
%5X^a$`%i05rs=^!Gq!4,abCH<[Vl>D^`W2oLd[BuO4e"D8RJ1as"7)(fRG+Y"mfOj,t&1XSAE#;-PD-as+Ed^8gYI)JG8IFqhf1s
%!mtZbg(XW%d?\<:%2SEf*-\Xs5bH\s*^:Njq/QcNjVY&%TrH&)]ucLKUkQPq('fL\$^X$Y:YY_Hi$0MbV`_9D(u`@%<`nlpT<%:!
%nUKD7B,tq113JMYVD%*N<q+&:T`o(Lo54Z"<tOA$6A1/pKe+#3#7frRD?R9K*r4A$U$kLH,*LTB_30hD]1qe4SV@"uI).@G2I+6R
%>Yt3tkUV)Jb?/ua-GsVH/F4J1rJ'8?kDO?>=QfdQK*;hhER*a\5LZ>1rW*Zf6WKD@KShJ[L!V5Lai40dq<=*$"L]GrO30"4=9QpU
%4[ab,D#]qnp&:XL:Qk5]H$j9.JXq0A2hLi"%?:q$nVg6gf=qbZ_uVJ#UHX9_r["'Qk,1M`/;;5OQV;S*0?eMkpUAbB=k(Z.l3hup
%C]Ae-oCQ!_N^3cRW!f!#'h>F@4<'.H!L-ko&HR@;knH;-jp0]j@oZpQISBCdn'J_3k?Ztf:i6`C?dKm\G:7D[_n4?DcU\]'nuIpn
%Ch-QmpsiGa>hCpC=jf0V>XYZjVG5AWZ^W)TA^K8q9"e;M9Ws,`Lo:,_M43iKc^0[B<mVE%WXQtpoQ'n*@]PEAWT_kd!tebqH6G(V
%5h=B5o[*9:1P_UEN.3$9PKTa""dOpE^2JA(l:1b;`dbODh9dp4<$dPMg>t=uJZX.bih_ft+9dP-s5TKMoA(]$-iCk?SI%ZmGeGcq
%Ti_YZ.Wa]gCm4@33Jm-tAd-L"]Dlp*c,Z-?'rEf5_7u0W=[[J4=(q>&?Iij+4ePk0H]hQA/4P7\d:O*4[k*fE;RN;W]!sBtMGMC/
%iN9M."m]k71CCHi[)7eV.lFW3::WsLT7;jNjI=)s#6#4c$b9,HU952b:3lb>RicTkEN<bTQo0qsN'YL)9Z%-.Qpj`)K<EeIJFC1o
%=8"`CSN4%GW&7eI=J;6d),o)0qY,"fNf!/7$TU,'gKq)'0dtMrY)J?UEH.@5qG2'8d1eK@r:u[TU);<g*Ih.HY+WUOi_%9BkR-*R
%WG$BiUm;(k.e>;$doBF["n$rk($F5+UMM;u-ZGQR2`*P;J2_9ak+k/oh*+t'$LhZc;3T+h9gS'&RSXPQ7,HgV:!rC:&0&JZ!Ps7G
%K-u,M%Dg'GZmj/@?KrEJs5XpE+h`Z3P,Rj1HucSG.6_:\^#;FT'#N=p28<-6"bn>B#`437+fOB"fWS;,)?u&n+>&]4Wg_V7e0NgB
%!f]7.Y9EtH&ck8gpU(9Whl9]X?r2\*q*,?aWud*LgE`S%^e@S0'r81%[H46k2Ie6YI#e+X/a4?<F/=@arFfN!m+N8gEp3k,bO9os
%1CLGpoL7pU='ue`J]m9";eClQ\E@sjYA.a-':gtt.02bW.<$4bR<6C\"PsHrE`H'-oCP!W)'9M=:lg^:LL`^&Hrd@T,>.r8/Wf4>
%ma_5DV=6t42YKX4r(;YC#K_:l!@kdBL(5(PEhe?5*JnX85OOa*eW0,]$nfrRA5#NGegHH.&0a"i`H[B4.)7#9#)guucGZ1WM(p$l
%F=eD_M.BOg=>/F?fU+jXGF>V[,1d_u7B[o:9.aTJ)1ehSid0;/`JX/tY,1K`C]'d6%]L^17&p/UoA!_NR-F.,;69T=l]<Ek.FtCF
%!9trcmZ]:-9oP2_3a'HNfs7.)LYNKB3WaL^fs4XDfk_D3@[WWh!5I5EKY,c?fU'&%mY%+NV\o"X2coj`*?Tj!WU.9BX'AX/bJfAM
%/fL?/RB/ALiMbFHQcs\_o^.Z3<t;7L.9?nd^TXCRQi>Q,pQA?9DLJd>K&/jpGr/Y?g3+t4p/?>0V'G=\E;#YuBP<FHJ]cKmNBs>s
%"^@k.kp*s`a7oRT>UFZD9fl4>q5GXeJE%9J1GehmTE9S%CG=g+8@5NBd7E;l7ABH5=s]V`"<LTeWC5eF8l41U,hd\Z\AHsT)t@Q3
%U6@T\HMZS?M$@b3,`$,@9Q*'8XfWc8]qThc7(;%MZZ2kP=X7nni)+8LA58sq+`-Jk.r1uc#JJcd!^.UF8SfCGWb!=&2dd$O5ugqk
%@Fhs"AbOPNhT-uM=h4KZ:ml4%T%krCp49aJW`@:8[i0X.KA(@#UF$sr3`@H2UOTO_cdY:%k/>Xgom4o)W'q:2=HD%.8'9#:WJY&9
%)UFHnC;ZaEm$-ePTrEV=1npqV?>]J=p%4B0`s7$olU8)+9EpbfbJ&K+PLG4@0j*Oojtj!T>dS4MU$;O`=q&n)h6B#MSh$<R6M4/V
%l'5'(n"6]kiIJHRj2q/*@GL".BLDP6faP[B_.q>OTHS4Y9h2+7@i1m5niM]4ARpQq`(FH(P'5`5WrPrL?R8_^.jM36Z/jNB\d(;k
%QEFo8O?")jNcPLrZKKeY8rXs\?PGlZb`(IUF_YZU`Yid%\Ce<f6o"N/07C;t0qFi)d%QaNB<GS;8r?3`agFW9]7,_"kU:_%a\S1R
%8(KU[kHlhB9Ts4Rft.h@L"XVO22UpQe")eLZL$G`a[iEQ^;]ib$&a5==#t_ecNn!DKX`=C'KIkKq5gThcR:G0E6*AAlkhFCYrr#M
%QbD@NBV$2:FR1p_8U&V-OrT3O)*oXXqTd(,iAdK/"J'LY_dsZGAHX%-XhFjk:)Q>f5RZkscoDgQF?Ear64=lc.#X`3Uuc/)3b8Gb
%J/5d+6UrI1&TgFJTM>od14i7`qWDAPPS&""Npf:CSMGeWM3(u&Ti4G-@Je,(<CcV^.!O<4a_,+'5Vd!1Rs0A)LKu_qM%:)X4E4cr
%BS$JH6VO:#VjO#KMWDMe`V-JrT?*/OVU]o35)DX#Ep&[onk#S>:X>Gc*%p[A(3pagkdZZ8q'9#Ve1\t.;fhsQE-&Z$,O-GW;6#ub
%q'MXV+/PGeW_=cu8Nh*j^aHCgd0,k!3N&Zi_L@em*<dUZCJ4,W7#,!u;32Ct)Jb0$C'Yc.QBXO9K9g`skh<XOh$kULe^6rZ#^4[?
%(dnPo7Z&!tO7YcCS)t.r8Vd\j]p:Jp##X2q!,RcX$6j^1RN)pP1,54`dALDhISjYh4N#7TOVe[n@'SKLf-lhQrhK$$BSMla9`pSF
%p*>q.OK!KpdE2GY\1a_s[tdgO^])$:Lh#G[+gcAti\3qA18^k`SC"KM2(:%h2A$Em'a5@9>S5$NGuW?cH>n7H[[.(,>)A[n3Wj:p
%9o0u0%ApK<R\k02rp`PaU.N?oWL\UlKB"23caAe*JE,t+0<U8;as3lX7dk,rN4`XQWJX1T-rd'q\'`5Nht8rU4md_2`r_TI9H<h=
%Y)!c4Fo&8>g$0cf&ZgD4JR)+Xm;e+j'eMpB5A@&_:#M\PmF-T5r2s;km.$Ci+euW[3STsPU<;7?=("k.,/"eb,#B+j&kATa<l<7`
%Nf[da6r(Md7L]shVRg#4R3=`>Ig/!aTs5)[QBMQX6U<l_!3$\^ngcN)i_ErQqEO]2#9@\/E@(eLW@Me)#!<C9nmLl8)%i\s]VE:a
%qlO1;`Bu96WS:q:p`p[4O\AZ*72)<cKm/?8.hXb#*,/5_dRch2oCt/g9;Y:,+u7:H4'`F9KdNeZ?5<5\Nl\"+dYJ<b,cR>deeXBN
%eMK[)e4utHDWA1[M^'uNCqOr!K7'`R'i#<kXp&\=!tUPXnQ"uIL^Y8E8ONd;):8UT;qV;?6tBiuqmC3-A0<po;kf-s]%*M:O?4Ar
%3=6[-Cb0p/NTG"_)2B]CBJuSU17%6mh]%l<[k)8A<O=e*JP8!hL5m0'H@e3N1[bbdc",0]q_d;A-V"uKqF)@+:@Gl)Vu'p/=*FfV
%U]ii!Epi2.\jcs^R2!,pJEt9B:t=+>a4o5`/<l8tktW`'9k?(n;fj\[X5)=)MMF"O3E(,[*_p>9'i]?n4P\U;<-@0Y'MbT5&J'(G
%,#o!l:,?)C,!6hla"Tp:[IJ4gRB+W$:^rh(.)j*_?BT3)L1WQ<5o(%[*LBFhE;WDl0`VasV]-/EZKmG/`@f^k:qb!E)97YL4qe5P
%;h<Ci(l7U3QG:fK<^trnd=M(-CYH$k`[Z*gT7g1I8(4j]aud87*jPTiDQi,\G^W,cm[89]b'Fg,jZ@uM^^29E&4N_M%d>`"]bcnN
%W9s'X(^@>QYu@3+,-+\9(i5^Le'V^lT;Il@\lM:XZ-qegb)WIF_$9kh3.q]Hj#1:EcXk:]X+ai4Qe^DJlI"Zc/)PK%lHsM''+K:X
%_XpU+Qr1J49'LF"kas,T`T"kD]$uTI28gV#ahekdag(#E,#Y&:LIcj-%O1TEmja,mT?2Kr6n5.u$A_Y`b;Bj1Yb#VQ;B^K`gGR@K
%kV_m\$3%?fY,M2R-0[0)lqS&b_;G#V8@m>VgG77cKbJ5V,$O.r.%E7X$Lqp3$RhP)4n)O*_J.^q]GM!2qj"&a8Zi5N_l2e1VHt>Y
%cCj:=P4P>cQskf`=/'Cgg+2r23c9U`1icrLU$uX'\qTc'`09"9NMidaAUhkW5?R]JMiAAOaKVt&#'We*%F^YM1486H!Wujmh8#/`
%9hX_o?7=%2$7_+0*/M(<JOW6!qUUG&A!I.VH-`7t4_3d8ahhmj[h4iF*9IHD(u8'`_!%^EHq%3-l.P:cIC>-<_5(R_FE1gbW<p`_
%N:-Nb"MLUt7>+Z2WQbK_1:PjZ#.rP&^huk"L%C[!S[#^bpX\(.ScDb!G-d0GT,%RbRJgD??/2>^XS4#K[s[t55W!9m_4m`5[nfGG
%?.g'XlRSG4\\.8"7&=!:L!4C*j+eI]-%UTSZ;2<7$.pi7loku:L41,qB?-<kYRC1%8mo,HMF`u+5:U2sSRpdINQ;C;T`WUs'djXM
%mD!FK#uM[NB7)Xn]-ITmP^6NHPDgqqY&6WKIH!^\qJ_rQQXn9&R\s?3R3#9rnOZ8<ak^s@^es0scR4Gq[rB0q/t58".c7)"IcOO=
%_)Ca_dUVk-GUa@I4VL>l-&.s9;%jCaXKouM2/?n=P::Eo*N0hFSfH_5e[70Sa[MPPRIX<4a_;_UX%D3:.ttWLWYn;PkP?f),)>b]
%<#+h&C.KPH\UWTHO_*s3QQ44Nkb%Kl33c%KFB#5:WeW#\1^Q`H[JY$uq:#\ab;G.&/1H)(oaE[J>RN8SlBT_<"HHb*9daS5P&kW7
%Ml)^(g<$H8(Sg6UY]Rh^b-TK;\r_tcUZo!kihObb7'5RuFE5Y32Nt=tVGfV]I2+RZ8L%RY9rB:PI6!`k%SMTRE`Fre_V(M2U?PFN
%c_RXu'0ck!-`93(HPN]<VNV[qZFchIU$4s>@^1#WFS&1=3]S`3KBBZjRSIbu`0&nlT]tOAFJQ!fkG.:ehVm"=VUL(!]E4Ns%SM"+
%a&I*Bki8%B1n?bLY)T<BgI>Tss#&2GEYTEBf1+62X_f4BH7^tE*0s@Y-43Wc.VLlR$H*S>)JD/l/=eW\j5jr83@p_7m9^#k-O7C0
%gd4A=LHYr>El4T\6g(6/,Yd8<5^eGfYlbj#T7D-%79L9kI,[mGOH,R&P)(iU[4\Io\LJol-YGMNZdm0$(Dl26P=n`L2/e(m^,dRa
%)R_;"<QeRFR86%ForW80%_6B?H"aH0.@dlsOK)&kPF0f>b"69Snqk#HAT'S-i0.pL=kP-m8f5pRn/3EKI(Mr-2R`)^rXaj5PB]Kn
%kE!!'_2)gnFIe.I43a<)roGuaSZ_R?U9:b8mOj?%BMW]iTE\@.h-CSN@FEq:Hp1\3RQH-KK]/bAmU0'BeO4U"0=)t&\Wb<L9rAPF
%Vn(8r0-&=Hjte@eVI/Ui_c^gA&nDR\/#iWs*cG<bb>[#7(./Q'BLGWL4)5;G>g%t9K0#+^iZn6QqPgV[O"opu1i8('+Eo#BY$NFZ
%.mXm&:*!o5S*kYm-aJu6_guX(1VLT,TJSQSp1Ypco3^f?'LMh,H;5J)+"prJnDLu8Ln2#p2:SB;;_*WP!qffggQec"FT%bo-W,Af
%8VK9`f)aI.Sct'1fM6t)^JgE2,jhh>h^PB2?`@r%_9*`c@7JHt5s2^0?>F!rmRB7Vq-Kn1W-bFH]'qZ75R&G/.=:<m$4r;A]aTYO
%CM#9eSp<VPAF9+L(FQ4PC"MEr%!lt'_0Y_U),>6<TR*blkB'=7cT\fZL"';#Z`46&AI''-K)^8=%PP'":7!.!m8?%YRu*Dtj%^u+
%MdXh?B1TB^__X('&bB&03USM!SSX%mbE7ih1>HTdP]njRLs)$,nM4(fE2PKjhO,8LA?sF8EnooZ$p+O5UF/lm]@2/2=#jrF%]K`O
%E5!:o`gmG^>qg?LmN%"HBu7_:RQ4WC+&j#gfQ@5MT#tLqF<_n#!c.U6T<t35J[Nf:f:&3W;8"%<QW0*Djg3s[E;DgnnE*=,iL7sZ
%m4q1I$L$86=':)g>_[m%,/-q[N/9uVklidbNY)k3,BEQSQeRN[p7pTVTSC?dY[%W2X&;:tXr%$Z-DFj-fP.pP:)Uta[s=(,-0]i+
%(g#'071^,Uhmc.7lf_m"(&b"C(`Kbk>k9V4,AEIBjJ.p`qf^XQ4)lXQZdtIP>X;qY=&Xrl(c@9<BWjYV,FN')L*obeEo<(Q#0t#o
%p(^T!"SJjq;&X)#]Q2pSnA>#rL[Nd"o[km3lutPkiKaZ3eREr_mH_PP=eg')WBjWn!FbjfJO\uAo9&Jec!rtpTP;$Oca(I?V`53V
%aWHQUdbL8Y$l1#qDg2-M\FI*Q:32coJ!2\68TO-JE=nn_?BqaE^HNi=MOlu<M*qf=4'uhY-=Qp$8pT([D2bD1R^P0T9JJXL>a6K;
%VuLX9Hs\1E3'/"2#M>LiB:K(!:WFjrp+L6rI9QG28KbYV,s9sH.'f$_fY=`XX%+FMS_>8P,S6Q&8CV#JA/eQY?[)Bbg.3K(b^R&`
%U+r4Y3:c8H3t)=O^$n'cBdd]q4Kd88jhg/pcdL"3U`@"9+=\9*@HSZ3-6[9i4XVsF\VQ2]FeUq]j%^eYnGO.heIgi[@V\tU2s@@l
%GAQi_/7qU,9aEJq7S"LeS,]Uhmq<HH8\j*rhkPEKg58qFNCS>-QD0,/<Q&jZ`8c1pl8r0<jHJ6;]a0nc+?ESM;/%NU%Sl2N>ZE3'
%#:n8C:.qjAZM@eIV[&J0DRrSWJL1t+S-da+kZXHTn@W%>]d1Z(>BtnXl02<T\?_`aX3Zs3(c+0b9'H]7dIpkoge[+.O\5(*ARF/#
%d-:UtY-Q7"GFs5X7KdmuO)+!;O$OK<=^0J:;`>6kG\L\+@K<5@G+P3Ee]&Gs=#Q6%0I>^=/WK;*XiTe.I/-P3G"2Hq[4na!#rAB\
%k9H#h-KQQl2",b.R,GNA?-1k*%@Eu2)8:ieSKt)<Li/o>&Z:nV"rPZMl<P1l2VD<[oVH+t[G+MI2Jl8UQ$X!_@B;qEmPuD&MDIhm
%Usg4u2+\eU<!!-,)Hd(J.$jVj5rk((1b#J;^!R8Mgr[BS,bB^Mb1+dDGZ@9Z.o`C777U:gi4-SFeE=Kq:27T8BWk*Hk>E,:<:fA<
%iKsZhm0#%8Zjt1p5gbVB=WW\@$m:$1a]U#WXVa;<CKq#H-nn+."/mT=I""OJIO:\@!Yi%.!<[S8`Jha!9/>f&=OFHOJ=%NW_uQC%
%Cl%Gf,blEDr+Dc)AND(E)^>1#>#9`)Q:Y/\=3r"P!"]&68bn$uD#_\SHqI8GlQtX;7cCM=Pg?"*BW,;F(!VrkS](Os;Ef*7V#OFm
%4q2_8>p1Yhar0t)-07Mi.uT/jP4FI!1mM@[N(hMPm88K?/*-A%p2W%G%AbMWT/r/$)L;8u,hM_WL6BmKVt7:_R<eaqZhg582j@!B
%5NNBsa'eT'oogDnX5"/<kOhb;AtjTl=CYZ%jg.jP[(IfjT;'/.^IEZ,R+G+cVPMbY=3g-0I%EoOeiJ;0?9`G]Ul!mPLg/$aoi%HS
%EnM>Uam1=0]">fc<CpL]jb9agYImKu%j$pZ2>@b<X.O_;8o8kPPZOE!<8&Y_!@52[cHb`'f.KAD?%D&S%Q#KodZBMc1DX(QX5B35
%nYq%'2<X!uam5j0$]>n533Ssa8Q'Z%]X61\f8j9!Z<@.%G7^=7f2!9U_SjJIcg-AN/f@]1j)Sj?5NStq*+J-[]RBo]9$VNC"-ob3
%B/r%?hR:q+f2"E-h\F^+b3Ps:\,,[.I`f&(q=lS_4cm#Hl-ICo:3(5$Rc?6.htabeiFZ]t41b+F*gF#-Oo6)EH2T?cV.n';VejZM
%LnP4JqMErQobPlX`b"c<l*n[Yam2HqV74"fHc>UQ.G(:;+5]*%:f7[i@k&'EX^Dc^<kktYe<.l=k>][jGIfT)#dtl<p!\mm]2nc;
%/?9j!=g'cfT<c_;H>A_a]RH=?nS,etC<<5@MIu+ta*1hmo->F8`HPM-AG,PP4hgOZqT8(RBt-61DdGZi\/#m3^GN-d*9Kg^Md;_%
%:XVgkgFdQneQI1rPhgN#Q1Fc#mq-#K]-skTBI$BZqC26*"MlCRfC.MDKDP08.3"##QZRLZ5:+3d["i:?YE@EiXdIWLGnsK&l_hC*
%K<4SnjRlI,0SATCX5rqH.q\Gfmj4Nsf8gX1,i.6r?=#j:PMi]n@^]YB8RJACqi'_taZ1YeP8VW<Eeu5&lc-Wdcn>)f\sUHL'N)96
%KD-#2U1c`-,r$r)36d'5%uSEhbIPW\J7&F@"DVUR(Kc-,Q*IM%VM3hYrA;iH&'8##(O^2uX_C]G'nL$JLumkXLHD9mh0EXdTcg-'
%ZgqVuUjdC17/AS!9I?A-cH^gBTh;.g03.jka!nUV.T5nNhOr#nR%%hi*sP\S2>a6lQd[%VI348BSa*jXFn\*VW^e)fWpG/2NmtDI
%B;8d=>s%^61-JO-T.`!8n.[iY?\'"DolY1gm<6+)GIN(Z,^)]8]!ja2U:.`mEX*&*VZT>1>2AdAjg"@fRq6pgYMVgiS`Q\n)bhl7
%eRrU)bI+sSKuIS[Gopkbjk*H?`pOm<^G!R%K7a4DO03?hi<p)$"+/5=SW8E8SPHt=c&Je-@E52FUa9]nILcIU%AQ#B%q6t1ffXlV
%4FpZ*+CN7[O8;Itg3:.6\!,HC80qr!E@(e=/4JafH&A2QCK1-"@C8%DL.;feC1QS*s%:R9o\kf#dK:`4,dsXL0/>e,r[@6qe0S6l
%_XcZ)YP:MlXb:pLehobjn=5$(EG)X+++ctkf@kk5gS45H)"eeQp1tND<\ld@V?__W!cK1=UQ!Tk$VZM^qj32fnRi&S*WAL\3DCUS
%I_4JDjlW\k;=Gk=o:ab@HSrkk)TEd9*4k4GO+L0pXj?\=SHb^4Ir(XInh*TWoQK.N[Q76Lc/V6"Thr,$T73[Jn4psJV!FORs.&SZ
%PPlE/\`$UKqm@#H.f`K*:`;"d@ZX3\9''*C`]dIRIf9=Fi"0B;RZ?$S#C$d-.4=gsG[!^Y%gm45JNs1gc(G<'9"O:&*Wb$]43,&+
%ki3b4JcW2/.;q6.&:VMGQO>G4!CjV)ocRQ)EWB,5mKE3MmJ`1Fmh%[.ntE7<9\0Qa2R>a+"(WU-he3fWiW(n11lnF='SK=+9,g_N
%NZQ$P2BTUdZKsoho'[@lcpcJGR)/;NhZD[3p*'LnmJusMP@jU>#mbcVPdfN])"Y^Dq#UX?IWZI?_rP,$HYr/ua\qUES&lWiZi&7g
%*ETc\1OgXha\@J(-']B")QMmE/?79-Mmd*B17bgJ42pK<9iDAppYt4FEl[W"\h$A*<iK-up>s)+Yb7s"$4VVM'8H9M)a1bUZWr$s
%OYupfoqE`45.se,;57k2TAFsSp$3WHqU;^L+,noe(dO_gVuj"%$b4Ueo*H35r;+nd!0ZhM%K=J"[?'C!lYlYK0*%gDF1le%CGsb9
%!$[m!`oGR"efmr!D$T>h&fL3<E[Iu'LdG)E1=)d?4g;]OiNi3nj_SE>D,0g5Gf7/P?rsh`jRj>FDbdO2;_DrEi7\Fu!r/nUJ`b&^
%j%G"hG2>t(d9cY,#`oJMjFbp5Ri>b[#&V_CpJ;Nm/^CKY39l7C=8Ik'\_j\F1rmheVKhq>5L:HF5^_ogMu;#1VL>UaJL]66)sUBD
%!8!\X3Zo,a^`J"]o"g/P9t\B%X;#?a$:C:XD2%#ABKCpE0fnagS]#nAk(GP@/kr:$AR4*Y;WBjD%>0V%A=[_5:iUuY1C=Hn)#=]=
%pV#aipc>D43,8EnjVL'8ad_a*rAE!e%eQeVeR*;#_nIY4!!1C!@)%P"&_bU[$3Ja:Tn51h;j]EY!DhVV@M^+LYkmafHj%_kS$2bc
%9u/i,B7Cm"3S<4)-79eJOL*G`WPGd-M"hJC53OfLqo:?tEJbA>%tO_&d``^D:^<^"G$F*GM&EKF=Y4]!6uh,H01CCoQt%Hd__Gu)
%M6S]0igV*-gpi$^[ui'8K5CBn2?b@:%!/fZCP;aE-eZEie<,4_oa;bZj&\-hFi]_&DM30hf0,\5>EZ;G`D;pEa4i4#ibZ08:LY]H
%"=:!lW!^g@8g[S7S:+ptJIfs[=eGZ^JC\&0eHQCKQ5p7'LH#ir9]nZT*=0b@Yl6hm,Ko!B_,p/X=##0:Q`C2B9>W_BWdr>A:2C)4
%"hY<5Ou=FF1-`-Y<PcU:'Nkb=U=]o%0u[iA+-O0qZi"n`@So*(c<I+`L#/RElMQ>ZDj#--$NZNV)V&F.;[#DIW(O<Xi^p8kjm5gK
%=P;*"kYAi<Iu=V@S&?+S4X,>[4q@*$`oBb%d1BK6hShK%IbVk3H[%a9qn=QR("J;&&n%be=]LdQ#N`T$W;#u]$2V=<jq^[>IY*#%
%!SRB3r<3(*K#+2=:XJPV+O<BPT:k(7J/m&(-g::;:o%0jT:k(70NduE$2V=<2@"mV59VZg*>0Ha?!^a?Y5qRkn^rVo)NldLIU<L9
%3A>Y>d!CH%H/HO&?JYa0#@A]`$A<ecquqRJ>OXM%$tH5fg-Kmf`GL+[]#qV3F[pCN2M/-J>4:jG?;6oO,U5=b1459KR5k)f^@MR-
%*PY<Ln@>Vbn18_<0(@NVMB,N#6?O[TCVpJ1I[sX=51aFXb"8-bW$9Zj'YY?n#o)\u``@<@<e%V'%sHe@chkioP6Z@UE$gpX:2%Q#
%F!8L#J('-C1`Er^L8'eLn'c8:h*(2ght-N#bE+E&F&ej9]:Nj&h/qA=rnjEZ)';r/p#.6Hj3=t>eS6p?S;oOll&A?#\.T1`MLpP5
%Ho)BD^P5gn8bX%7M*)$Aa_</C\1TF]^SC_YI4LY*XaM:JN3=$LRO?.=_,;g`hETA'P6hF<pE9Q;<PCGNPnt2,;efF);>i?6>Ti(]
%]']F3n6-!MN@[QN@.IoOq<>?8<nW,>^`WE3Bud_6ifGZ)q*KI0Z6+ocN-*]M3#5lckmM6MiM6>C&q26&9INN%p$O16K8#>R(X:BL
%2Xm,ZD623Zf.ZU'9%Z*idou7+dIt/t\VS&U\b_rR38^nCBunWp0AqU<4fn+pUgm#PqX!SA*c03%*$!UR(%PJ;:Hf`'mb)`A/W]04
%q6&p3OIpGQjL0*4d9\(Z&=!TV:LWQ"Y:6;(I`Oa89_pLD^l:S:VE_C`]_J7=iL>>;LHR'Ks.FO`E8\KRD'OLh\F9a\_$U.W"/u8.
%!4]F>MNKq72[u%iK9'/qQ-9p>g;<.sI6/Tb>:ueopbiatN="P,1FmJ3:-kMQj[G:5+S*R@.[7Iq[b>`%MlI4o.]>,T=dY"uh&V.m
%U#X,rF=*L8BDb\Wl1oM`Rc@PG=K`Xt'UBf(5CQ`HDaDJc"j-Z/'fr=!Xe\jI78pUr7S6dTTgSEp>5ic+IcoG*gNi%+d\L:NI)8SN
%IiL\ZXIe[+#/GQDZr@TH689/4Vp."B0`Ask!D;'Y0.VWAc_0^R#<^E2m,Jf#1Q",.i26SH8T`TW'Z:bRfUMs"f;B)Z&H@"1fLjKc
%H_?8fp>rF`KL*,202\=dW;tj&$nD=ZCs4pV[3D)rlUGs5Y/Q_2A$D\5>@`:Oi/=R[a4m86:;(oi[tci66:!].)GBO%pbhL#695jJ
%TLZg;4ZGbC&)+7Bi$f0l3l"EAIsN5ZWT#4?ErsJ!9ti]*DLaT[K/i'ZT8Qm&na"iDC;#4Q?`nOI?dPu^j;6E2\.n^5H+?1?K;(]-
%H:C@FKYcaHIUn*u]"^Ndd`u+b-TVI.)R)WYq;adf2u6406jUCIF`Ud`%.UToQK43(']e&]nSll8>!Ij&*Gg):MWSWca\ha7/%HB2
%e_3"D!b:YF/21[oo`Lr(=P.GsjDTrCD!e$M]GIWa8&(::(j%jc`mn"9)q%L<H+I3H1XnL1`RAKqF2.DI\DR-En,.1m%,<1n?RV]g
%aRgP=U:JTe<Lje>@@T?G&<TYb"cS@5YXNNc'qK0Q[a:=YM`-Zbkg:d7+j'\`Ms+27BT!G9GaD_>lc+N\TSbDhc;JhH1A#&qh*/LS
%PohP54?5^aT!Xps-a3^#=,;0r<.`g.68AtN(5'GG4'0C(nOqeL41GVoa70M`[<$)F2]0qd?IB&A;T*FTbIUR?\<U3R6G/335fXFH
%WW6ng@WNVnCC]>\`".hoEUD7TA(SaX*it?Xf-u1O/hFI`:dVZq>2rGs=@&k+a-%oRncC8]Va%7&:_%Y,ONcK]ba5[>+,XE7?sX]M
%qE'\p9Pjo2pt*i.#4IZH-R.[i[>s6R)pSTcoeVcJ^OE*/XAK%8FXEabRjmMH5RF4;:XJPVTP\G7IY*#%6.S%snItPA$%RnN5=*&N
%!$mM@5=*&NJ2jFT:XJPV(bGO^"T;X.Yf:h_$2V=<%[*R,:OjoJUh`mHD-!0C.pmX%)6M&FD<5PO.^L)8P&9;rD^qNMI'TmPhm=P8
%Ye\W8TX:<K@4?iJ!e+iZ&'$7Q&/sW-ht(u#q!W<;nD,eu..@cHNPo^^rof>+'EVW.nCP\$?peLDI.j$6&8qYhDKdMSa+sJ&4l$!_
%'8Jfcgc)gpi_B?*.6@N@'/qhr)JT7EK1C)%$QFU3%Lgi]%fH(l%j7IuJkqF3aqKd2"/3L>jb\Yc@=JEfB*"Se)(;q1FT]Uk'>42q
%peh29I_eh[g]VQ`Dr*[VRgH1iaUemUDu@?=c-"rP#!E[iI*gK"n21o2?XYtR'2rFPB]L$X!LBF^\D?Xng[KRDfa[+;^p<G-n3>Bk
%iHi0t$kLf=G]NDhS*gfVh=P=ZZhXk*!aaiC"6MhrLAqL@P;(S~>
%AI9_PrivateDataEnd
\ No newline at end of file
diff --git a/samples/testfiles/BlueSquare.gif b/samples/testfiles/BlueSquare.gif
new file mode 100644
index 0000000..7dcc9e7
Binary files /dev/null and b/samples/testfiles/BlueSquare.gif differ
diff --git a/samples/testfiles/BlueSquare.indd b/samples/testfiles/BlueSquare.indd
new file mode 100755
index 0000000..c8b9680
Binary files /dev/null and b/samples/testfiles/BlueSquare.indd differ
diff --git a/samples/testfiles/BlueSquare.jpg b/samples/testfiles/BlueSquare.jpg
new file mode 100755
index 0000000..81b8a22
Binary files /dev/null and b/samples/testfiles/BlueSquare.jpg differ
diff --git a/samples/testfiles/BlueSquare.mov b/samples/testfiles/BlueSquare.mov
new file mode 100755
index 0000000..2ee3885
Binary files /dev/null and b/samples/testfiles/BlueSquare.mov differ
diff --git a/samples/testfiles/BlueSquare.mp3 b/samples/testfiles/BlueSquare.mp3
new file mode 100755
index 0000000..0b275b2
Binary files /dev/null and b/samples/testfiles/BlueSquare.mp3 differ
diff --git a/samples/testfiles/BlueSquare.pdf b/samples/testfiles/BlueSquare.pdf
new file mode 100755
index 0000000..2498719
Binary files /dev/null and b/samples/testfiles/BlueSquare.pdf differ
diff --git a/samples/testfiles/BlueSquare.png b/samples/testfiles/BlueSquare.png
new file mode 100755
index 0000000..91589cd
Binary files /dev/null and b/samples/testfiles/BlueSquare.png differ
diff --git a/samples/testfiles/BlueSquare.psd b/samples/testfiles/BlueSquare.psd
new file mode 100755
index 0000000..1850b8f
Binary files /dev/null and b/samples/testfiles/BlueSquare.psd differ
diff --git a/samples/testfiles/BlueSquare.tif b/samples/testfiles/BlueSquare.tif
new file mode 100755
index 0000000..3ae7b02
Binary files /dev/null and b/samples/testfiles/BlueSquare.tif differ
diff --git a/samples/testfiles/BlueSquare.wav b/samples/testfiles/BlueSquare.wav
new file mode 100755
index 0000000..c9983ff
Binary files /dev/null and b/samples/testfiles/BlueSquare.wav differ
diff --git a/samples/testfiles/BlueSquare.webp b/samples/testfiles/BlueSquare.webp
new file mode 100644
index 0000000..d68328e
Binary files /dev/null and b/samples/testfiles/BlueSquare.webp differ
diff --git a/samples/testfiles/Makefile.am b/samples/testfiles/Makefile.am
new file mode 100644
index 0000000..791f4be
--- /dev/null
+++ b/samples/testfiles/Makefile.am
@@ -0,0 +1,39 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+EXTRA_DIST=BlueSquare.ai   BlueSquare.eps   BlueSquare.gif BlueSquare.jpg  BlueSquare.mp3  BlueSquare.png  BlueSquare.tif\
+BlueSquare.avi  BlueSquare.indd  BlueSquare.mov  BlueSquare.pdf  BlueSquare.psd  BlueSquare.wav BlueSquare.webp
diff --git a/samples/testfiles/Makefile.in b/samples/testfiles/Makefile.in
new file mode 100644
index 0000000..c5f5284
--- /dev/null
+++ b/samples/testfiles/Makefile.in
@@ -0,0 +1,500 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = samples/testfiles
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = BlueSquare.ai   BlueSquare.eps   BlueSquare.gif BlueSquare.jpg  BlueSquare.mp3  BlueSquare.png  BlueSquare.tif\
+BlueSquare.avi  BlueSquare.indd  BlueSquare.mov  BlueSquare.pdf  BlueSquare.psd  BlueSquare.wav BlueSquare.webp
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign samples/testfiles/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign samples/testfiles/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/source/Endian.h b/source/Endian.h
new file mode 100644
index 0000000..9df508d
--- /dev/null
+++ b/source/Endian.h
@@ -0,0 +1,101 @@
+/**************************************************************************
+*
+* ADOBE SYSTEMS INCORPORATED
+* Copyright 2010 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 _Endian_h_
+#define _Endian_h_ 1
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+#include "source/EndianUtils.hpp"
+
+class IEndian
+{
+public:
+	virtual ~IEndian() {};
+
+	virtual XMP_Uns16	getUns16	( const void* value ) const	= 0;
+	virtual XMP_Uns32	getUns32	( const void* value ) const	= 0;
+	virtual XMP_Uns64	getUns64	( const void* value ) const	= 0;
+	virtual float		getFloat	( const void* value ) const	= 0;
+	virtual double		getDouble	( const void* value ) const	= 0;
+
+	virtual void	putUns16	( XMP_Uns16 value, void* dest ) const	= 0;
+	virtual void	putUns32	( XMP_Uns32 value, void* dest ) const	= 0;
+	virtual void	putUns64	( XMP_Uns64 value, void* dest ) const	= 0;
+	virtual void	putFloat	( float value, void* dest ) const	= 0;
+	virtual void	putDouble	( double value, void* dest ) const	= 0;
+};
+
+
+class LittleEndian : public IEndian
+{
+private:
+	// Private Constructors / operators to prevent direkt creation
+	LittleEndian() {};
+	LittleEndian( const LittleEndian& ) {};
+	LittleEndian& operator=( const LittleEndian& ) { return *this; };
+
+public:
+	// Singleton Factory
+	static const LittleEndian& getInstance()
+	{
+		// Singleton instance (on Stack)
+		static LittleEndian instance;
+
+		return instance;
+	}
+
+	virtual XMP_Uns16	getUns16	( const void* value ) const		{ return GetUns16LE( value ); }
+	virtual XMP_Uns32	getUns32	( const void* value ) const		{ return GetUns32LE( value ); }
+	virtual XMP_Uns64	getUns64	( const void* value ) const		{ return GetUns64LE( value ); }
+	virtual float		getFloat	( const void* value ) const		{ return GetFloatLE( value ); }
+	virtual double		getDouble	( const void* value ) const		{ return GetDoubleLE( value ); }
+
+	virtual void	putUns16	( XMP_Uns16 value, void* dest ) const	{ PutUns16LE( value, dest ); }
+	virtual void	putUns32	( XMP_Uns32 value, void* dest ) const	{ PutUns32LE( value, dest ); }
+	virtual void	putUns64	( XMP_Uns64 value, void* dest ) const	{ PutUns64LE( value, dest ); }
+	virtual void	putFloat	( float value, void* dest ) const		{ PutFloatLE( value, dest ); }
+	virtual void	putDouble	( double value, void* dest ) const		{ PutDoubleLE( value, dest ); }
+}; // LittleEndian
+
+
+class BigEndian : public IEndian
+{
+private:
+	// Private Constructors / operators to prevent direkt creation
+	BigEndian() {};
+	BigEndian( const BigEndian& ) {};
+	BigEndian& operator=( const BigEndian& ) { return *this; };
+
+public:
+	// Singleton Factory
+	static const BigEndian& getInstance()
+	{
+		// Singleton instance (on Stack)
+		static BigEndian instance;
+
+		return instance;
+	}
+
+	virtual XMP_Uns16	getUns16	( const void* value ) const		{ return GetUns16BE( value ); }
+	virtual XMP_Uns32	getUns32	( const void* value ) const		{ return GetUns32BE( value ); }
+	virtual XMP_Uns64	getUns64	( const void* value ) const		{ return GetUns64BE( value ); }
+	virtual float		getFloat	( const void* value ) const		{ return GetFloatBE( value ); }
+	virtual double		getDouble	( const void* value ) const		{ return GetDoubleBE( value ); }
+
+	virtual void	putUns16	( XMP_Uns16 value, void* dest ) const	{ PutUns16BE( value, dest ); }
+	virtual void	putUns32	( XMP_Uns32 value, void* dest ) const	{ PutUns32BE( value, dest ); }
+	virtual void	putUns64	( XMP_Uns64 value, void* dest ) const	{ PutUns64BE( value, dest ); }
+	virtual void	putFloat	( float value, void* dest ) const		{ PutFloatBE( value, dest ); }
+	virtual void	putDouble	( double value, void* dest ) const		{ PutDoubleBE( value, dest ); }
+}; // BigEndian
+
+#endif
diff --git a/source/EndianUtils.hpp b/source/EndianUtils.hpp
new file mode 100644
index 0000000..6581f18
--- /dev/null
+++ b/source/EndianUtils.hpp
@@ -0,0 +1,461 @@
+#ifndef __EndianUtils_hpp__
+#define __EndianUtils_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! This must be the first include.
+#include "public/include/XMP_Const.h"
+
+#if SUNOS_SPARC || SUNOS || XMP_IOS_ARM
+#include "string.h"
+#endif //SUNOS_SPARC || SUNOS || XMP_IOS_ARM
+
+// *** These should be in a more common location. The Unicode conversions of XMPCore have similar utils. 
+// *** May want to improve with PowerPC swapping load/store, or SSE instructions.
+
+// =================================================================================================
+
+#define kLittleEndianHost (! kBigEndianHost)
+#if XMP_WinBuild
+	#pragma warning ( disable : 4127 )	// conditional expression is constant
+	#define kBigEndianHost 0
+#elif XMP_MacBuild | XMP_iOSBuild
+	#if __BIG_ENDIAN__
+		#define kBigEndianHost 1
+	#elif __LITTLE_ENDIAN__
+		#define kBigEndianHost 0
+	#else
+		#error "Neither __BIG_ENDIAN__ nor __LITTLE_ENDIAN__ is set"
+	#endif
+#elif XMP_UNIXBuild
+	#include "public/include/XMP_UnixEndian.h"
+#else
+	#error "Unknown build environment"
+#endif
+
+// =================================================================================================
+
+typedef XMP_Uns16 (*GetUns16_Proc)  ( const void* addr );
+typedef XMP_Uns32 (*GetUns32_Proc)  ( const void* addr );
+typedef XMP_Uns64 (*GetUns64_Proc)  ( const void* addr );
+typedef float     (*GetFloat_Proc)  ( const void* addr );
+typedef double    (*GetDouble_Proc) ( const void* addr );
+
+typedef XMP_Uns16 (*MakeUns16_Proc)  ( XMP_Uns16 value );
+typedef XMP_Uns32 (*MakeUns32_Proc)  ( XMP_Uns32 value );
+typedef XMP_Uns64 (*MakeUns64_Proc)  ( XMP_Uns64 value );
+typedef float     (*MakeFloat_Proc)  ( float value );
+typedef double    (*MakeDouble_Proc) ( double value );
+
+typedef void (*PutUns16_Proc)  ( XMP_Uns16 value, void* addr );
+typedef void (*PutUns32_Proc)  ( XMP_Uns32 value, void* addr );
+typedef void (*PutUns64_Proc)  ( XMP_Uns64 value, void* addr );
+typedef void (*PutFloat_Proc)  ( float value, void* addr );
+typedef void (*PutDouble_Proc) ( double value, void* addr );
+
+// =================================================================================================
+
+#if SUNOS_SPARC || SUNOS || XMP_IOS_ARM
+	#define DefineAndGetValue(type,addr)	type value = 0; memcpy ( &value, addr, sizeof(type) )
+	#define DefineAndSetValue(type,addr)	memcpy(addr, &value, sizeof(type))
+	#define DefineFlipAndSet(type,x,addr)	type temp; memcpy(&temp, addr, sizeof(type)); temp = Flip##x(temp); memcpy(addr, &temp, sizeof(type))
+#else
+	#define DefineAndGetValue(type,addr)	type value = *((type*)addr)
+	#define DefineAndSetValue(type,addr)	*((type*)addr) = value
+	#define DefineFlipAndSet(type,x,addr)	type* uPtr = (type*) addr; *uPtr = Flip##x ( *uPtr )
+#endif //#if SUNOS_SPARC || SUNOS || XMP_IOS_ARM
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns16 Flip2 ( XMP_Uns16 value )
+{
+	value = ((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8);
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void Flip2 ( void * addr )
+{
+	DefineFlipAndSet ( XMP_Uns16, 2, addr );	
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns32 Flip4 ( XMP_Uns32 value )
+{
+	value = ((value & 0x000000FF) << 24) | ((value & 0x0000FF00) << 8) |
+			((value >> 8) & 0x0000FF00)  | ((value >> 24) & 0x000000FF);
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void Flip4 ( void * addr )
+{
+	DefineFlipAndSet ( XMP_Uns32, 4, addr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns64 Flip8 ( XMP_Uns64 value )
+{
+	XMP_Uns32 oldLow  = (XMP_Uns32)(value);
+	XMP_Uns32 oldHigh = (XMP_Uns32)(value >> 32);
+	return (((XMP_Uns64)Flip4(oldLow)) << 32) | ((XMP_Uns64)Flip4(oldHigh));
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void Flip8 ( void * addr )
+{
+	DefineFlipAndSet ( XMP_Uns64, 8, addr );
+}
+
+// =================================================================================================
+
+static inline XMP_Uns16 GetUns16BE ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns16, addr );
+	if ( kLittleEndianHost ) value = Flip2 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns16 GetUns16LE ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns16, addr );
+	if ( kBigEndianHost ) value = Flip2 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns16 GetUns16AsIs ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns16, addr );
+	return value;	// Use this to avoid SPARC failure to handle unaligned loads and stores.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns32 GetUns32BE ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns32, addr );
+	if ( kLittleEndianHost ) value = Flip4 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns32 GetUns32LE ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns32, addr );
+	if ( kBigEndianHost ) value = Flip4 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns32 GetUns32AsIs ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns32, addr );
+	return value;	// Use this to avoid SPARC failure to handle unaligned loads and stores.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns64 GetUns64BE ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns64, addr );
+	if ( kLittleEndianHost ) value = Flip8 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns64 GetUns64LE ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns64, addr );
+	if ( kBigEndianHost ) value = Flip8 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns64 GetUns64AsIs ( const void * addr )
+{
+	DefineAndGetValue ( XMP_Uns64, addr );
+	return value;	// Use this to avoid SPARC failure to handle unaligned loads and stores.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline float
+GetFloatBE ( const void * addr )
+{
+	XMP_Uns32 value = *((XMP_Uns32*)addr);
+	if ( kLittleEndianHost ) value = Flip4 ( value );
+	return *((float*)&value);
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline float
+GetFloatLE ( const void * addr )
+{
+	XMP_Uns32 value = *((XMP_Uns32*)addr);
+	if ( kBigEndianHost ) value = Flip4 ( value );
+	return *((float*)&value);
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline double
+GetDoubleBE ( const void * addr )
+{
+	XMP_Uns64 value = *((XMP_Uns64*)addr);
+	if ( kLittleEndianHost ) value = Flip8 ( value );
+	return *((double*)&value);
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline double
+GetDoubleLE ( const void * addr )
+{
+	XMP_Uns64 value = *((XMP_Uns64*)addr);
+	if ( kBigEndianHost ) value = Flip8 ( value );
+	return *((double*)&value);
+}
+
+// =================================================================================================
+
+static inline XMP_Uns16
+MakeUns16BE ( XMP_Uns16 value )
+{
+	if ( kLittleEndianHost ) value = Flip2 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns16
+MakeUns16LE ( XMP_Uns16 value )
+{
+	if ( kBigEndianHost ) value = Flip2 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns32
+MakeUns32BE ( XMP_Uns32 value )
+{
+	if ( kLittleEndianHost ) value = Flip4 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns32
+MakeUns32LE ( XMP_Uns32 value )
+{
+	if ( kBigEndianHost ) value = Flip4 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns64
+MakeUns64BE ( XMP_Uns64 value )
+{
+	if ( kLittleEndianHost ) value = Flip8 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline XMP_Uns64
+MakeUns64LE ( XMP_Uns64 value )
+{
+	if ( kBigEndianHost ) value = Flip8 ( value );
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline float
+MakeFloatBE ( float value )
+{
+	if ( kLittleEndianHost ) {
+		XMP_Uns32* intPtr = (XMP_Uns32*) &value;
+		*intPtr = Flip4 ( *intPtr );
+	}
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline float
+MakeFloatLE ( float value )
+{
+	if ( kBigEndianHost ) {
+		XMP_Uns32* intPtr = (XMP_Uns32*) &value;
+		*intPtr = Flip4 ( *intPtr );
+	}
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline double
+MakeDoubleBE ( double value )
+{
+	if ( kLittleEndianHost ) {
+		XMP_Uns64* intPtr = (XMP_Uns64*) &value;
+		*intPtr = Flip8 ( *intPtr );
+	}
+	return value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline double
+MakeDoubleLE ( double value )
+{
+	if ( kBigEndianHost ) {
+		XMP_Uns64* intPtr = (XMP_Uns64*) &value;
+		*intPtr = Flip8 ( *intPtr );
+	}
+	return value;
+}
+
+// =================================================================================================
+
+static inline void PutUns16BE ( XMP_Uns16 value, void * addr )
+{
+	if ( kLittleEndianHost ) value = Flip2 ( value );
+	DefineAndSetValue ( XMP_Uns16, addr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns16LE ( XMP_Uns16 value, void * addr )
+{
+	if ( kBigEndianHost ) value = Flip2 ( value );
+	DefineAndSetValue ( XMP_Uns16, addr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns16AsIs ( XMP_Uns16 value, void * addr )
+{
+	DefineAndSetValue ( XMP_Uns16, addr );	// Use this to avoid SPARC failure to handle unaligned loads and stores.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns32BE ( XMP_Uns32 value, void * addr )
+{
+	if ( kLittleEndianHost ) value = Flip4 ( value );
+	DefineAndSetValue ( XMP_Uns32, addr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns32LE ( XMP_Uns32 value, void * addr )
+{
+	if ( kBigEndianHost ) value = Flip4 ( value );
+	DefineAndSetValue ( XMP_Uns32, addr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns32AsIs ( XMP_Uns32 value, void * addr )
+{
+	DefineAndSetValue ( XMP_Uns32, addr );	// Use this to avoid SPARC failure to handle unaligned loads and stores.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns64BE ( XMP_Uns64 value, void * addr )
+{
+	if ( kLittleEndianHost ) value = Flip8 ( value );
+	DefineAndSetValue ( XMP_Uns64, addr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns64LE ( XMP_Uns64 value, void * addr )
+{
+	if ( kBigEndianHost ) value = Flip8 ( value );
+	DefineAndSetValue ( XMP_Uns64, addr );
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void PutUns64AsIs ( XMP_Uns64 value, void * addr )
+{
+	DefineAndSetValue ( XMP_Uns64, addr );	// Use this to avoid SPARC failure to handle unaligned loads and stores.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void
+PutFloatBE ( float value, void * addr )
+{
+	if ( kLittleEndianHost ) {
+		XMP_Uns32* intPtr = (XMP_Uns32*) &value;
+		*intPtr = Flip4 ( *intPtr );
+	}
+	*((float*)addr) = value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void
+PutFloatLE ( float value, void * addr )
+{
+	if ( kBigEndianHost ) {
+		XMP_Uns32* intPtr = (XMP_Uns32*) &value;
+		*intPtr = Flip4 ( *intPtr );
+	}
+	*((float*)addr) = value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void
+PutDoubleBE ( double value, void * addr )
+{
+	if ( kLittleEndianHost ) {
+		XMP_Uns64* intPtr = (XMP_Uns64*) &value;
+		*intPtr = Flip8 ( *intPtr );
+	}
+	*((double*)addr) = value;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void
+PutDoubleLE ( double value, void * addr )
+{
+	if ( kBigEndianHost ) {
+		XMP_Uns64* intPtr = (XMP_Uns64*) &value;
+		*intPtr = Flip8 ( *intPtr );
+	}
+	*((double*)addr) = value;
+}
+
+// =================================================================================================
+
+#endif	// __EndianUtils_hpp__
diff --git a/source/ExpatAdapter.hpp b/source/ExpatAdapter.hpp
new file mode 100644
index 0000000..2f3a732
--- /dev/null
+++ b/source/ExpatAdapter.hpp
@@ -0,0 +1,59 @@
+#ifndef __ExpatAdapter_hpp__
+#define __ExpatAdapter_hpp__
+
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! Must be the first #include!
+#include "source/XMLParserAdapter.hpp"
+
+// =================================================================================================
+// Derived XML parser adapter for Expat.
+// =================================================================================================
+
+#ifndef BanAllEntityUsage
+	#define BanAllEntityUsage	0
+#endif
+
+struct XML_ParserStruct;	// ! Hack to avoid exposing expat.h to all clients.
+typedef struct XML_ParserStruct *XML_Parser;
+
+class ExpatAdapter : public XMLParserAdapter {
+public:
+
+	XML_Parser parser;
+	XMP_NamespaceTable * registeredNamespaces;
+	
+	#if BanAllEntityUsage
+		bool isAborted;
+	#endif
+	
+	#if XMP_DebugBuild
+		size_t elemNesting;
+	#endif
+	
+	static const bool kUseGlobalNamespaces = true;
+	static const bool kUseLocalNamespaces  = false;
+	
+	ExpatAdapter ( bool useGlobalNamespaces );
+	virtual ~ExpatAdapter();
+	
+	void ParseBuffer ( const void * buffer, size_t length, bool last = true );
+
+private:
+
+	ExpatAdapter() : registeredNamespaces(0) {};	// ! Force use of constructor with namespace parameter.
+
+};
+
+extern "C" ExpatAdapter *
+XMP_PUBLIC XMP_NewExpatAdapter ( bool useGlobalNamespaces );
+
+// =================================================================================================
+
+#endif	// __ExpatAdapter_hpp__
diff --git a/source/Host_IO-POSIX.cpp b/source/Host_IO-POSIX.cpp
new file mode 100644
index 0000000..2fa65a4
--- /dev/null
+++ b/source/Host_IO-POSIX.cpp
@@ -0,0 +1,560 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "source/Host_IO.hpp"
+#include "source/XMP_LibUtils.hpp"
+
+#include <cstring>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#if (SUNOS_SPARC || SUNOS_X86 || XMP_IOS_ARM)
+	#include <limits.h>
+#endif
+
+// =================================================================================================
+// Host_IO implementations for POSIX
+// =================================
+
+#if (! XMP_MacBuild) & (! XMP_UNIXBuild) & (! XMP_iOSBuild)
+	#error "This is the POSIX implementation of Host_IO for Mac, iOS and general UNIX."
+#endif
+
+// =================================================================================================
+// ======================================   File operations   ======================================
+// =================================================================================================
+
+// Make sure off_t is 64 bits and signed.
+// static char check_off_t_size [ (sizeof(off_t) == 8) ? 1 : -1 ];
+// *** No std::numeric_limits?  static char check_off_t_sign [ std::numeric_limits<off_t>::is_signed ? -1 : 1 ];
+
+static bool HaveWriteAccess( const std::string & path );
+
+// =================================================================================================
+// Host_IO::Exists
+// ===============
+
+bool Host_IO::Exists ( const char* filePath )
+{
+	struct stat info;
+	int err = stat ( filePath, &info );
+	return (err == 0);
+}
+
+// =================================================================================================
+// Host_IO::Writable
+// ===============
+bool Host_IO::Writable( const char * path, bool checkCreationPossible )
+{
+	if ( Exists( path ) )
+	{
+		switch ( GetFileMode( path ) )
+		{
+		case kFMode_IsFile:
+		case kFMode_IsFolder:
+			return HaveWriteAccess( path );
+			break;
+
+		default:
+			return false;
+			break;
+		}
+	} 
+	else if ( checkCreationPossible )
+	{
+		// get the parent path
+		std::string utf8Path(path);
+		size_t pos = utf8Path.find_last_of('/');
+		if (pos != std::string::npos)
+		{
+			if (pos == 0)
+				utf8Path = utf8Path.substr(0, 1);
+			else
+				utf8Path = utf8Path.substr(0, pos);
+		}
+		else
+		{
+			utf8Path = ".";
+		}
+		return Host_IO::Writable( utf8Path.c_str(), checkCreationPossible );
+	}
+	else
+		return true;
+
+}
+
+// =================================================================================================
+// Host_IO::Create
+// ===============
+
+bool Host_IO::Create ( const char* filePath )
+{
+	if ( Host_IO::Exists ( filePath ) ) {
+		if ( Host_IO::GetFileMode ( filePath ) == kFMode_IsFile ) return false;
+		XMP_Throw ( "Host_IO::Create, path exists but is not a file", kXMPErr_InternalFailure );
+	}
+
+	mode_t mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+	int refNum = open ( filePath, (O_CREAT | O_EXCL | O_RDWR), mode );	// *** Include O_EXLOCK?
+	if ( refNum == -1 ) XMP_Throw ( "Host_IO::Create, cannot create file", kXMPErr_InternalFailure );
+	close ( refNum );
+	return true;
+
+}	// Host_IO::Create
+
+// =================================================================================================
+// ConvertPosixDateTime
+// ====================
+
+static void ConvertPosixDateTime ( const time_t & osTime, XMP_DateTime * xmpTime )
+{
+	struct tm posixUTC;
+	gmtime_r ( &osTime, &posixUTC );
+
+	xmpTime->year = posixUTC.tm_year + 1900;
+	xmpTime->month = posixUTC.tm_mon + 1;
+	xmpTime->day = posixUTC.tm_mday;
+	xmpTime->hasDate = true;
+
+	xmpTime->hour = posixUTC.tm_hour;
+	xmpTime->minute = posixUTC.tm_min;
+	xmpTime->second = posixUTC.tm_sec;
+	xmpTime->nanoSecond = 0;	// The time_t resolution is only to seconds.
+	xmpTime->hasTime = true;
+
+	xmpTime->tzSign = kXMP_TimeIsUTC;
+	xmpTime->tzHour = 0;
+	xmpTime->tzMinute = 0;
+	xmpTime->hasTimeZone = true;
+
+}	// ConvertPosixDateTime
+
+// =================================================================================================
+// Host_IO::GetModifyDate
+// ======================
+
+bool Host_IO::GetModifyDate ( const char* filePath, XMP_DateTime* modifyDate )
+{
+	struct stat info;
+	int err = stat ( filePath, &info );
+	if ( err != 0 ) return false;
+	if ( (! S_ISREG(info.st_mode)) && (! S_ISDIR(info.st_mode)) ) return false;
+	
+	if ( modifyDate != 0 ) ConvertPosixDateTime ( info.st_mtime, modifyDate );
+	return true;
+
+}	// Host_IO::GetModifyDate
+
+// =================================================================================================
+// ConjureDerivedPath
+// ==================
+
+static std::string ConjureDerivedPath ( const char* basePath )
+{
+	std::string tempPath = basePath;
+	tempPath += "._nn_";
+	char * indexPart = (char*) tempPath.c_str() + strlen(basePath) + 2;
+
+	for ( char ten = '0'; ten <= '9' ; ++ten ) {
+		indexPart[0] = ten;
+		for ( char one = '0'; one <= '9' ; ++one ) {
+			indexPart[1] = one;
+			if ( ! Host_IO::Exists ( tempPath.c_str() ) ) return tempPath;
+		}
+	}
+
+	return "";
+
+}	// ConjureDerivedPath
+
+// =================================================================================================
+// Host_IO::CreateTemp
+// ===================
+
+std::string Host_IO::CreateTemp ( const char* sourcePath )
+{
+	std::string tempPath = ConjureDerivedPath ( sourcePath );
+	if ( tempPath.empty() ) XMP_Throw ( "Host_IO::CreateTemp, cannot create temp file path", kXMPErr_InternalFailure );
+	XMP_Assert ( ! Host_IO::Exists ( tempPath.c_str() ) );
+
+	Host_IO::Create ( tempPath.c_str() );
+	return tempPath;
+
+}	// Host_IO::CreateTemp
+
+// =================================================================================================
+// Host_IO::Open
+// =============
+//
+// Returns Host_IO::noFileRef (0) if the file does not exist, throws for other errors.
+
+Host_IO::FileRef Host_IO::Open ( const char* filePath, bool readOnly )
+{
+	int flags = (readOnly ? O_RDONLY : O_RDWR);	// *** Include O_EXLOCK?
+
+	int refNum = open ( filePath, flags, ( S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP ) );
+	if ( refNum == -1 ) {
+		int osCode = errno;	// Capture ASAP and once, might not be thread safe.
+		if ( osCode == ENOENT ) {
+			return Host_IO::noFileRef;
+		} else if ( osCode == EACCES ) {
+			XMP_Throw ( "Host_IO::Open, file permission error", kXMPErr_FilePermission );
+		} else {
+			XMP_Throw ( "Host_IO::Open, other failure", kXMPErr_ExternalFailure );
+		}
+	}
+
+	if ( ! readOnly ) {
+		// A root user might be able to open a write-protected file w/o complaint.
+		struct stat info;
+		if ( fstat ( refNum, &info ) == -1 ) XMP_Throw ( "Host_IO::Open, fstat failed.", kXMPErr_ExternalFailure );
+		if ( 0 == (info.st_mode & S_IWUSR) ) XMP_Throw ( "Host_IO::Open, file permission error", kXMPErr_FilePermission );
+	}
+
+	return refNum;
+
+}	// Host_IO::Open
+
+// =================================================================================================
+// Host_IO::Close
+// ==============
+
+void Host_IO::Close ( Host_IO::FileRef refNum )
+{
+	if ( refNum == Host_IO::noFileRef ) return;
+
+	int err = close ( refNum );
+	if ( err != 0 ) XMP_Throw ( "Host_IO::Close, close failure", kXMPErr_ExternalFailure );
+
+}	// Host_IO::Close
+
+// =================================================================================================
+// Host_IO::SwapData
+// =================
+
+void Host_IO::SwapData ( const char* sourcePath, const char* destPath )
+{
+	// For lack of a better approach, do a 3-way rename.
+
+	std::string thirdPath = ConjureDerivedPath ( sourcePath );
+	if ( thirdPath.empty() ) XMP_Throw ( "Cannot create temp file path", kXMPErr_InternalFailure );
+	XMP_Assert ( ! Host_IO::Exists ( thirdPath.c_str() ) );
+
+	Host_IO::Rename ( sourcePath, thirdPath.c_str() );
+
+	try {
+		Host_IO::Rename ( destPath, sourcePath );
+	} catch ( ... ) {
+		Host_IO::Rename ( thirdPath.c_str(), sourcePath );
+		throw;
+	}
+
+	try {
+		Host_IO::Rename ( thirdPath.c_str(), destPath );
+	} catch ( ... ) {
+		Host_IO::Rename ( sourcePath, destPath );
+		Host_IO::Rename ( thirdPath.c_str(), sourcePath );
+		throw;
+	}
+
+}	// Host_IO::SwapData
+
+// =================================================================================================
+// Host_IO::Rename
+// ===============
+
+void Host_IO::Rename ( const char* oldPath, const char* newPath )
+{
+	if ( Host_IO::Exists ( newPath ) ) XMP_Throw ( "Host_IO::Rename, new path exists", kXMPErr_InternalFailure );
+	int err = rename ( oldPath, newPath );
+	if ( err != 0 ) XMP_Throw ( "Host_IO::Rename, rename failure", kXMPErr_ExternalFailure );
+
+}	// Host_IO::Rename
+
+// =================================================================================================
+// Host_IO::Delete
+// ===============
+
+void Host_IO::Delete ( const char* filePath )
+{
+	int err;
+
+	switch ( Host_IO::GetFileMode ( filePath ) ) {
+
+		case Host_IO::kFMode_DoesNotExist :
+			return;
+
+		case Host_IO::kFMode_IsFile :
+			err = unlink ( filePath );
+			if ( err != 0 ) XMP_Throw ( "Host_IO::Delete, unlink failure", kXMPErr_ExternalFailure );
+			return;
+
+		case Host_IO::kFMode_IsFolder :
+			err = rmdir ( filePath );
+			if ( err != 0 ) XMP_Throw ( "Host_IO::Delete, rmdir failure", kXMPErr_ExternalFailure );
+			return;
+
+		case Host_IO::kFMode_IsOther :
+			XMP_Throw ( "Host_IO::Delete, can't delete 'other' file", kXMPErr_ExternalFailure );
+
+	}
+
+}	// Host_IO::Delete
+
+// =================================================================================================
+// Host_IO::Seek
+// =============
+
+XMP_Int64 Host_IO::Seek ( Host_IO::FileRef refNum, XMP_Int64 offset, SeekMode mode )
+{
+	int posMode;
+	switch ( mode ) {
+		case kXMP_SeekFromStart :
+			posMode = SEEK_SET;
+			break;
+		case kXMP_SeekFromCurrent :
+			posMode = SEEK_CUR;
+			break;
+		case kXMP_SeekFromEnd :
+			posMode = SEEK_END;
+			break;
+		default :
+			XMP_Throw ( "Host_IO::Seek, Invalid seek mode", kXMPErr_InternalFailure );
+			break;
+	}
+
+	XMP_Int64 newPos = (XMP_Int64) lseek ( refNum, offset, mode );
+	if ( newPos == -1 ) XMP_Throw ( "Host_IO::Seek, lseek failure", kXMPErr_ExternalFailure );
+
+	return newPos;
+
+}	// Host_IO::Seek
+
+// =================================================================================================
+// Host_IO::Read
+// =============
+
+#define TwoGB (XMP_Uns32)(2*1024*1024*1024UL)
+
+XMP_Uns32 Host_IO::Read ( Host_IO::FileRef refNum, void * buffer, XMP_Uns32 count )
+{
+	if ( count >= TwoGB ) XMP_Throw ( "Host_IO::Read, request too large", kXMPErr_EnforceFailure );
+
+	ssize_t bytesRead = read ( refNum, buffer, count );
+	if ( bytesRead == -1 ) XMP_Throw ( "Host_IO::Read, read failure", kXMPErr_ReadError );
+
+	return bytesRead;
+
+}	// Host_IO::Read
+
+// =================================================================================================
+// Host_IO::Write
+// ==============
+
+void Host_IO::Write ( Host_IO::FileRef refNum, const void * buffer, XMP_Uns32 count )
+{
+	if ( count >= TwoGB ) XMP_Throw ( "Host_IO::Write, request too large", kXMPErr_EnforceFailure );
+
+	ssize_t bytesWritten = write ( refNum, buffer, count );
+	if ( bytesWritten != (ssize_t)count ) {
+		int osCode = errno;	// Capture ASAP and once, might not be thread safe.
+		if ( osCode == ENOSPC ) {
+			XMP_Throw ( "Host_IO::Write, disk full", kXMPErr_DiskSpace );
+		} else {
+			XMP_Throw ( "Host_IO::Write, write failure", kXMPErr_WriteError );
+		}
+	}
+
+}	// Host_IO::Write
+
+// =================================================================================================
+// Host_IO::Length
+// ===============
+
+XMP_Int64 Host_IO::Length ( Host_IO::FileRef refNum )
+{
+	off_t currPos = lseek ( refNum, 0, kXMP_SeekFromCurrent );
+	off_t length  = lseek ( refNum, 0, kXMP_SeekFromEnd );
+	if ( (currPos == -1) || (length == -1) ) XMP_Throw ( "Host_IO::Length, lseek failure", kXMPErr_ExternalFailure );
+	(void) lseek ( refNum, currPos, kXMP_SeekFromStart );
+
+	return length;
+
+}	// Host_IO::Length
+
+// =================================================================================================
+// Host_IO::SetEOF
+// ===============
+
+void Host_IO::SetEOF ( Host_IO::FileRef refNum, XMP_Int64 length )
+{
+	int err = ftruncate ( refNum, length );
+	if ( err != 0 ) XMP_Throw ( "Host_IO::SetEOF, ftruncate failure", kXMPErr_ExternalFailure );
+
+}	// Host_IO::SetEOF
+
+// =================================================================================================
+// =====================================   Folder operations   =====================================
+// =================================================================================================
+
+// =================================================================================================
+// Host_IO::GetFileMode
+// ====================
+
+Host_IO::FileMode Host_IO::GetFileMode ( const char * path )
+{
+	struct stat fileInfo;
+
+	int err = stat ( path, &fileInfo );
+	if ( err != 0 ) return kFMode_DoesNotExist;	// ! Any failure turns into does-not-exist.
+
+	// ! The target of a symlink is properly recognized, not the symlink itself. A Mac alias is
+	// ! seen as a file, we would need extra code to recognize it and find the target.
+
+	if ( S_ISREG ( fileInfo.st_mode ) ) return kFMode_IsFile;
+	if ( S_ISDIR ( fileInfo.st_mode ) ) return kFMode_IsFolder;
+	return kFMode_IsOther;
+
+}	// Host_IO::GetFileMode
+
+// =================================================================================================
+// Host_IO::GetChildMode
+// =====================
+
+Host_IO::FileMode Host_IO::GetChildMode ( const char * parentPath, const char * childName )
+{
+	std::string fullPath = parentPath;
+	char lastChar = fullPath[fullPath.length() -1];
+	if ( lastChar != '/' )
+		fullPath += '/';
+	fullPath += childName;
+
+	return GetFileMode ( fullPath.c_str() );
+
+}	// Host_IO::GetChildMode
+
+// =================================================================================================
+// Host_IO::OpenFolder
+// ===================
+
+Host_IO::FolderRef Host_IO::OpenFolder ( const char* folderPath )
+{
+	switch ( Host_IO::GetFileMode ( folderPath ) ) {
+
+		case Host_IO::kFMode_IsFolder :
+		{
+			Host_IO::FolderRef folder = opendir ( folderPath );
+			if ( folder == noFolderRef ) XMP_Throw ( "Host_IO::OpenFolder, opendir failed", kXMPErr_ExternalFailure );
+			return folder;
+		}
+
+		case Host_IO::kFMode_DoesNotExist :
+			return Host_IO::noFolderRef;
+
+		default :
+			XMP_Throw ( "Host_IO::OpenFolder, path is not a folder", kXMPErr_ExternalFailure );
+
+	}
+
+	XMP_Throw ( "Host_IO::OpenFolder, should not get here", kXMPErr_InternalFailure );
+
+}	// Host_IO::OpenFolder
+
+// =================================================================================================
+// Host_IO::CloseFolder
+// ====================
+
+void Host_IO::CloseFolder ( Host_IO::FolderRef folder )
+{
+	if ( folder == noFolderRef ) return;
+
+	int err = closedir ( folder );
+	if ( err != 0 ) XMP_Throw ( "Host_IO::CloseFolder, closedir failed", kXMPErr_ExternalFailure );
+
+}	// Host_IO::CloseFolder
+
+// =================================================================================================
+// Host_IO::GetNextChild
+// =====================
+
+#if (SUNOS_SPARC || SUNOS_X86 || XMP_IOS_ARM)
+	class SafeMalloc {
+	public:
+		void* pointer;
+		void* GetPointer() { return this->pointer; };
+		SafeMalloc ( size_t size ) { this->pointer = malloc ( size ); };
+		~SafeMalloc() { if ( this->pointer != 0 ) free ( this->pointer ); };
+	private:
+		SafeMalloc() : pointer(0) {};	// Hidden on purpose.
+	};
+#endif
+
+bool Host_IO::GetNextChild ( Host_IO::FolderRef folder, std::string* childName )
+{
+	struct dirent * result;
+
+	if ( folder == Host_IO::noFolderRef ) return false;
+	
+	#if ! (SUNOS_SPARC || SUNOS_X86 || XMP_IOS_ARM)
+		struct dirent _childInfo;
+		struct dirent* childInfo = &_childInfo;
+	#else
+		SafeMalloc sm ( offsetof ( struct dirent, d_name ) + PATH_MAX + 1 );
+		struct dirent* childInfo = (struct dirent *) sm.GetPointer();
+		if ( childInfo == 0 ) XMP_Throw ( "Can't allocate SunOS OR IOS childInfo", kXMPErr_NoMemory );
+	#endif
+
+	while ( true ) {
+		// Ignore all children with names starting in '.'. This covers ., .., .DS_Store, etc.
+		// ! On AIX readdir_r returns 9 instead of 0 for normal termination.
+		int err = readdir_r ( folder, childInfo, &result );	// ! Use the thread-safe form.
+		if ( err == 9 ) return false;	// Tolerable should some other UNIX return 9.
+		if ( err != 0 ) XMP_Throw ( "Host_IO::GetNextChild, readdir_r failed", kXMPErr_ExternalFailure );
+		if ( result == 0 ) return false;
+		if ( childInfo->d_name[0] != '.' ) break;
+	}
+
+	if ( childName != 0 ) *childName = childInfo->d_name;
+	return true;
+
+}	// Host_IO::GetNextChild
+
+// =================================================================================================
+// Writable
+// =====================
+
+static bool HaveWriteAccess( const std::string & path )
+{
+	return ( access(path.c_str(), W_OK) == 0 );
+}
+
+std::string Host_IO::GetCasePreservedName(const std::string& inputPath)
+{
+    char* systemPath=NULL;
+	if ( Host_IO::Exists ( inputPath.c_str() ) )
+    {
+        systemPath=realpath( inputPath.c_str() , NULL );
+        if ( systemPath != NULL )
+        {
+            std::string fullPath(systemPath);
+            free(systemPath);
+            return fullPath;
+        }
+    }
+	return std::string("");
+}
+// =================================================================================================
diff --git a/source/Host_IO-Win.cpp b/source/Host_IO-Win.cpp
new file mode 100644
index 0000000..71551af
--- /dev/null
+++ b/source/Host_IO-Win.cpp
@@ -0,0 +1,819 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "source/Host_IO.hpp"
+#include "source/XMP_LibUtils.hpp"
+#include "source/XIO.hpp"
+#include "source/UnicodeConversions.hpp"
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+// =================================================================================================
+// Host_IO implementations for Windows
+// ===================================
+
+#if ! XMP_WinBuild
+	#error "This is the Windows implementation of Host_IO."
+#endif
+
+static bool IsLongPath ( const std::string& path );
+static bool IsNetworkPath ( const std::string& path );
+static bool IsRelativePath ( const std::string& path );
+static bool GetWidePath ( const char* path, std::string & widePath );
+static std::string & CorrectSlashes ( std::string & path );
+
+static bool Exists ( const std::string & widePath );
+static Host_IO::FileRef Open ( const std::string & widePath, bool readOnly );
+static Host_IO::FileRef OpenWithWriteShare ( const std::string & widePath, bool readOnly );
+static Host_IO::FileMode GetFileMode ( const std::string & widePath );
+
+// =================================================================================================
+// File operations
+// =================================================================================================
+
+// =================================================================================================
+// Host_IO::Exists
+// ===============
+
+bool Host_IO::Exists ( const char* filePath )
+{
+	std::string wideName;
+	if ( GetWidePath(filePath, wideName) ) {
+		return ::Exists(wideName);
+	}
+	return false;
+}
+
+// =================================================================================================
+// Host_IO::Writable
+// ===============
+bool Host_IO::Writable( const char * path, bool checkCreationPossible )
+{
+	std::string widePath;
+	if ( ! GetWidePath(path, widePath) || widePath.length() == 0)
+		XMP_Throw ( "Host_IO::Writable, cannot convert path", kXMPErr_ExternalFailure );
+
+	if ( ::Exists( widePath ) )
+	{
+		switch ( ::GetFileMode( widePath ) )
+		{
+		case kFMode_IsFile:
+			// open the file in write mode but with file_share_read | file_share_write
+			try
+			{
+				Host_IO::FileRef fileRef = Host_IO::noFileRef;
+				fileRef = ::OpenWithWriteShare( widePath, false );
+				if ( fileRef == Host_IO::noFileRef )
+					return false;// can not open in write mode.
+				Host_IO::Close ( fileRef );
+				return true;
+			}
+			catch ( ... )
+			{
+				return false;
+			}
+			break;
+
+		default:
+			return false;
+			break;
+		}
+	} 
+	else if ( checkCreationPossible )
+	{
+		// file doesn't exist. Let's check if we can create it temporarily.
+		bool created = false;
+		try
+		{
+			created = Host_IO::Create ( path );
+			if ( created )
+				Host_IO::Delete ( path );
+		}
+		catch ( ... )
+		{
+			return false;
+		}
+		return created;
+	}
+	else
+		return true;
+}
+
+// =================================================================================================
+// Host_IO::Create
+// ===============
+
+bool Host_IO::Create ( const char* filePath )
+{
+	std::string wideName;
+	if ( !GetWidePath ( filePath, wideName ) || wideName.length() == 0 )
+		 XMP_Throw ( "Host_IO::Create, cannot convert path", kXMPErr_ExternalFailure );
+
+	if ( ::Exists ( wideName ) ) {
+		if ( ::GetFileMode ( wideName ) == kFMode_IsFile ) return false;
+		XMP_Throw ( "Host_IO::Create, path exists but is not a file", kXMPErr_InternalFailure );
+	}
+
+	Host_IO::FileRef fileHandle;
+	fileHandle = CreateFileW ( (LPCWSTR)wideName.data(), (GENERIC_READ | GENERIC_WRITE), 0, 0, CREATE_ALWAYS,
+							   (FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS), 0 );
+	if ( fileHandle == INVALID_HANDLE_VALUE ) XMP_Throw ( "Host_IO::Create, cannot create file", kXMPErr_InternalFailure );;
+
+	CloseHandle ( fileHandle );
+	return true;
+}	// Host_IO::Create
+
+// =================================================================================================
+// FillXMPTime
+// ===========
+
+static void FillXMPTime ( const SYSTEMTIME & winTime, XMP_DateTime * xmpTime )
+{
+
+	// Ignore the fractional seconds for consistency with UNIX and to avoid false newness even on
+	// Windows. Some other sources of time only resolve to seconds, we don't want 25.3 looking
+	// newer than 25.
+
+	xmpTime->year = winTime.wYear;
+	xmpTime->month = winTime.wMonth;
+	xmpTime->day = winTime.wDay;
+	xmpTime->hasDate = true;
+
+	xmpTime->hour = winTime.wHour;
+	xmpTime->minute = winTime.wMinute;
+	xmpTime->second = winTime.wSecond;
+	xmpTime->nanoSecond = 0;	// See note above; winTime.wMilliseconds * 1000*1000;
+	xmpTime->hasTime = true;
+
+	xmpTime->tzSign = kXMP_TimeIsUTC;
+	xmpTime->tzHour = 0;
+	xmpTime->tzMinute = 0;
+	xmpTime->hasTimeZone = true;
+
+}
+
+// =================================================================================================
+// Host_IO::GetModifyDate
+// ======================
+
+bool Host_IO::GetModifyDate ( const char* filePath, XMP_DateTime * modifyDate )
+{
+	BOOL ok;
+	Host_IO::FileRef fileHandle;
+
+	try {	// Host_IO::Open should not throw - fix after CS6.
+		fileHandle = Host_IO::Open ( filePath, Host_IO::openReadOnly );
+		if ( fileHandle == Host_IO::noFileRef ) return false;
+	} catch ( ... ) {
+		return false;
+	}
+
+	FILETIME binTime;
+	ok = GetFileTime ( fileHandle, 0, 0, &binTime );
+	Host_IO::Close ( fileHandle );
+	if ( ! ok ) return false;
+	
+	SYSTEMTIME utcTime;
+	ok = FileTimeToSystemTime ( &binTime, &utcTime );
+	if ( ! ok ) return false;
+	
+	FillXMPTime ( utcTime, modifyDate );
+	return true;
+
+}	// Host_IO::GetModifyDate
+
+// =================================================================================================
+// ConjureDerivedPath
+// ==================
+
+static std::string ConjureDerivedPath ( const char* basePath )
+{
+	std::string tempPath = basePath;
+	tempPath += "._nn_";
+	char * indexPart = (char*) tempPath.c_str() + strlen(basePath) + 2;
+
+	for ( char ten = '0'; ten <= '9' ; ++ten ) {
+		indexPart[0] = ten;
+		for ( char one = '0'; one <= '9' ; ++one ) {
+			indexPart[1] = one;
+			if ( ! Host_IO::Exists ( tempPath.c_str() ) ) return tempPath;
+		}
+	}
+
+	return "";
+
+}	// ConjureDerivedPath
+
+// =================================================================================================
+// Host_IO::CreateTemp
+// ===================
+
+std::string Host_IO::CreateTemp ( const char* sourcePath )
+{
+	std::string tempPath = ConjureDerivedPath ( sourcePath );
+	if ( tempPath.empty() ) XMP_Throw ( "Host_IO::CreateTemp, cannot create temp file path", kXMPErr_InternalFailure );
+	XMP_Assert ( ! Host_IO::Exists ( tempPath.c_str() ) );
+
+	Host_IO::Create ( tempPath.c_str() );
+	return tempPath;
+
+}	// Host_IO::CreateTemp
+
+// =================================================================================================
+// Host_IO::Open
+// =============
+//
+// Returns Host_IO::noFileRef (0) if the file does not exist, throws for other errors.
+
+Host_IO::FileRef Host_IO::Open ( const char* filePath, bool readOnly )
+{
+	std::string wideName;
+	if ( !GetWidePath ( filePath, wideName ) || wideName.length() == 0 )
+		XMP_Throw ( "Host_IO::Open, GetWidePath failure", kXMPErr_ExternalFailure );
+
+	return ::Open( wideName, readOnly );
+
+}	// Host_IO::Open
+
+// =================================================================================================
+// Host_IO::Close
+// ==============
+
+void Host_IO::Close ( Host_IO::FileRef fileHandle )
+{
+	if ( fileHandle == Host_IO::noFileRef ) return;
+
+	BOOL ok = CloseHandle ( fileHandle );
+	if ( ! ok ) XMP_Throw ( "Host_IO::Close, CloseHandle failure", kXMPErr_ExternalFailure );
+
+}	// Host_IO::Close
+
+// =================================================================================================
+// Host_IO::SwapData
+// =================
+
+void Host_IO::SwapData ( const char* sourcePath, const char* destPath )
+{
+
+	// For lack of a better approach, do a 3-way rename.
+
+	std::string thirdPath = ConjureDerivedPath ( sourcePath );
+	if ( thirdPath.empty() ) XMP_Throw ( "Cannot create temp file path", kXMPErr_InternalFailure );
+	XMP_Assert ( ! Host_IO::Exists ( thirdPath.c_str() ) );
+
+	Host_IO::Rename ( sourcePath, thirdPath.c_str() );
+	
+	try {
+		Host_IO::Rename ( destPath, sourcePath );
+	} catch ( ... ) {
+		Host_IO::Rename ( thirdPath.c_str(), sourcePath );
+		throw;
+	}
+	
+	try {
+		Host_IO::Rename ( thirdPath.c_str(), destPath );
+	} catch ( ... ) {
+		Host_IO::Rename ( sourcePath, destPath );
+		Host_IO::Rename ( thirdPath.c_str(), sourcePath );
+		throw;
+	}
+
+}	// Host_IO::SwapData
+
+// =================================================================================================
+// Host_IO::Rename
+// ===============
+
+void Host_IO::Rename ( const char* oldPath, const char* newPath )
+{
+	std::string wideOldPath, wideNewPath;
+	if ( !GetWidePath ( oldPath, wideOldPath ) || wideOldPath.length() == 0 )
+		XMP_Throw ( "Host_IO::Rename, GetWidePath failure", kXMPErr_ExternalFailure );
+
+	if ( !GetWidePath ( newPath, wideNewPath ) || wideNewPath.length() == 0 )
+		XMP_Throw ( "Host_IO::Rename, GetWidePath failure", kXMPErr_ExternalFailure );
+
+	if ( ::Exists ( wideNewPath ) ) XMP_Throw ( "Host_IO::Rename, new path exists", kXMPErr_InternalFailure );
+
+	
+
+	BOOL ok = MoveFileW ( (LPCWSTR)wideOldPath.data(), (LPCWSTR)wideNewPath.data() );
+	if ( ! ok ) XMP_Throw ( "Host_IO::Rename, MoveFileW failure", kXMPErr_ExternalFailure );
+
+}	// Host_IO::Rename
+
+// =================================================================================================
+// Host_IO::Delete
+// ===============
+
+void Host_IO::Delete ( const char* filePath )
+{
+	std::string wideName;
+	if ( !GetWidePath ( filePath, wideName ) || wideName.length() == 0 )
+		XMP_Throw ( "Host_IO::Delete, GetWidePath failure", kXMPErr_ExternalFailure );
+	
+	if ( !::Exists ( wideName ) ) return;
+
+	
+
+	BOOL ok = DeleteFileW ( (LPCWSTR)wideName.data() );
+	if ( ! ok ) {
+		DWORD errCode = GetLastError();
+		if ( errCode != ERROR_FILE_NOT_FOUND ) {
+			XMP_Throw ( "Host_IO::Delete, DeleteFileW failure", kXMPErr_ExternalFailure );
+		}
+	}
+
+}	// Host_IO::Delete
+
+// =================================================================================================
+// Host_IO::Seek
+// =============
+
+XMP_Int64 Host_IO::Seek ( Host_IO::FileRef fileHandle, XMP_Int64 offset, SeekMode mode )
+{
+	DWORD method;
+	switch ( mode ) {
+		case kXMP_SeekFromStart :
+			method = FILE_BEGIN;
+			break;
+		case kXMP_SeekFromCurrent :
+			method = FILE_CURRENT;
+			break;
+		case kXMP_SeekFromEnd :
+			method = FILE_END;
+			break;
+		default :
+			XMP_Throw ( "Invalid seek mode", kXMPErr_InternalFailure );
+			break;
+	}
+
+	LARGE_INTEGER seekOffset, newPos;
+	seekOffset.QuadPart = offset;
+
+	BOOL ok = SetFilePointerEx ( fileHandle, seekOffset, &newPos, method );
+	if ( ! ok ) XMP_Throw ( "Host_IO::Seek, SetFilePointerEx failure", kXMPErr_ExternalFailure );
+
+	return newPos.QuadPart;
+
+}	// Host_IO::Seek
+
+// =================================================================================================
+// Host_IO::Read
+// =============
+
+#define TwoGB (XMP_Uns32)(2*1024*1024*1024UL)
+
+XMP_Uns32 Host_IO::Read ( Host_IO::FileRef fileHandle, void * buffer, XMP_Uns32 count )
+{
+	if ( count >= TwoGB ) XMP_Throw ( "Host_IO::Read, request too large", kXMPErr_EnforceFailure );
+
+	DWORD bytesRead;
+	BOOL ok = ReadFile ( fileHandle, buffer, count, &bytesRead, 0 );
+	if ( ! ok ) XMP_Throw ( "Host_IO::Read, ReadFile failure", kXMPErr_ReadError );
+
+	return bytesRead;
+
+}	// Host_IO::Read
+
+// =================================================================================================
+// Host_IO::Write
+// ==============
+
+void Host_IO::Write ( Host_IO::FileRef fileHandle, const void * buffer, XMP_Uns32 count )
+{
+	if ( count >= TwoGB ) XMP_Throw ( "Host_IO::Write, request too large", kXMPErr_EnforceFailure );
+
+	DWORD bytesWritten;
+	BOOL ok = WriteFile ( fileHandle, buffer, count, &bytesWritten, 0 );
+	if ( (! ok) || (bytesWritten != count) ) {
+		DWORD osCode = GetLastError();
+		if ( osCode == ERROR_DISK_FULL ) {
+			XMP_Throw ( "Host_IO::Write, disk full", kXMPErr_DiskSpace );
+		} else {
+			XMP_Throw ( "Host_IO::Write, WriteFile failure", kXMPErr_WriteError );
+		}
+	}
+
+}	// Host_IO::Write
+
+// =================================================================================================
+// Host_IO::Length
+// ===============
+
+XMP_Int64 Host_IO::Length ( Host_IO::FileRef fileHandle )
+{
+	LARGE_INTEGER length;
+	BOOL ok = GetFileSizeEx ( fileHandle, &length );
+	if ( ! ok ) XMP_Throw ( "Host_IO::Length, GetFileSizeEx failure", kXMPErr_ExternalFailure );
+
+	return length.QuadPart;
+
+}	// Host_IO::Length
+
+// =================================================================================================
+// Host_IO::SetEOF
+// ===============
+
+void Host_IO::SetEOF ( Host_IO::FileRef fileHandle, XMP_Int64 length )
+{
+	LARGE_INTEGER winLength;
+	winLength.QuadPart = length;
+
+	BOOL ok = SetFilePointerEx ( fileHandle, winLength, 0, FILE_BEGIN );
+	if ( ! ok ) XMP_Throw ( "Host_IO::SetEOF, SetFilePointerEx failure", kXMPErr_ExternalFailure );
+	ok = SetEndOfFile ( fileHandle );
+	if ( ! ok ) XMP_Throw ( "Host_IO::SetEOF, SetEndOfFile failure", kXMPErr_ExternalFailure );
+
+}	// Host_IO::SetEOF
+
+// =================================================================================================
+// Folder operations
+// =================================================================================================
+
+// =================================================================================================
+// Host_IO::GetFileMode
+// ====================
+
+static DWORD kOtherAttrs = (FILE_ATTRIBUTE_DEVICE);
+
+Host_IO::FileMode Host_IO::GetFileMode ( const char * path )
+{
+	std::string utf16;	// GetFileAttributes wants native UTF-16.
+	if ( !GetWidePath ( path, utf16 ) )
+		XMP_Throw ( "Host_IO::GetFileMode, GetWidePath failure", kXMPErr_ExternalFailure );
+	
+	return ::GetFileMode( utf16 );
+}	// Host_IO::GetFileMode
+
+// =================================================================================================
+// Host_IO::GetChildMode
+// =====================
+
+Host_IO::FileMode Host_IO::GetChildMode ( const char * parentPath, const char * childName )
+{
+	std::string fullPath = parentPath;
+	char lastChar = fullPath[fullPath.length() - 1];
+	if ( lastChar != '\\' && lastChar != '/' )
+		fullPath += '\\';
+	fullPath += childName;
+
+	return GetFileMode ( fullPath.c_str() );
+
+}	// Host_IO::GetChildMode
+
+// =================================================================================================
+// Host_IO::OpenFolder
+// ===================
+
+Host_IO::FolderRef Host_IO::OpenFolder ( const char* folderPath )
+{
+	switch ( Host_IO::GetFileMode ( folderPath ) ) {
+
+	case Host_IO::kFMode_IsFolder :
+		{
+			WIN32_FIND_DATAW childInfo;
+			std::string findPath = folderPath;
+			// Looking for all children of that folder, add * as search criteria
+			findPath += findPath[findPath.length() - 1] == '\\' ? "*" : "\\*";
+
+			std::string utf16;	// FindFirstFile wants native UTF-16.
+			if ( !GetWidePath ( findPath.c_str(), utf16 ) )
+				XMP_Throw ( "Host_IO::OpenFolder, GetWidePath failure", kXMPErr_ExternalFailure );
+			Host_IO::FolderRef folder = FindFirstFileW ( (LPCWSTR) utf16.c_str(), &childInfo );
+			if ( folder == noFolderRef ) XMP_Throw ( "Host_IO::OpenFolder - FindFirstFileW failed", kXMPErr_ExternalFailure );
+			// The first child should be ".", which we want to ignore anyway.
+			XMP_Assert ( (folder == noFolderRef) || (childInfo.cFileName[0] == '.') );
+
+			return folder;
+		}
+
+	case Host_IO::kFMode_DoesNotExist :
+		return Host_IO::noFolderRef;
+
+	default :
+		XMP_Throw ( "Host_IO::OpenFolder, path is not a folder", kXMPErr_ExternalFailure );
+
+	}
+
+	XMP_Throw ( "Host_IO::OpenFolder, should not get here", kXMPErr_InternalFailure );
+
+}	// Host_IO::OpenFolder
+
+// =================================================================================================
+// Host_IO::CloseFolder
+// ====================
+
+void Host_IO::CloseFolder ( Host_IO::FolderRef folder )
+{
+	if ( folder == noFolderRef ) return;
+
+	BOOL ok = FindClose ( folder );
+	if ( ! ok ) XMP_Throw ( "Host_IO::CloseFolder, FindClose failure", kXMPErr_ExternalFailure );
+
+}	// Host_IO::CloseFolder
+
+// =================================================================================================
+// Host_IO::GetNextChild
+// =====================
+
+bool Host_IO::GetNextChild ( Host_IO::FolderRef folder, std::string* childName )
+{
+	bool found;
+	WIN32_FIND_DATAW childInfo;
+
+	if ( folder == Host_IO::noFolderRef ) return false;
+
+	do {	// Ignore all children with names starting in '.'. This covers ., .., .DS_Store, etc.
+		found = (bool) FindNextFile ( folder, &childInfo );
+	} while ( found && (childInfo.cFileName[0] == '.') );
+	if ( ! found ) return false;
+
+	if ( childName != 0 ) {
+		size_t len16 = 0;	// The cFileName field is native UTF-16.
+		while ( childInfo.cFileName[len16] != 0 ) ++len16;
+		FromUTF16Native ( (UTF16Unit*)childInfo.cFileName, len16, childName );
+	}
+
+	return true;
+
+}	// Host_IO::GetNextChild
+
+// =================================================================================================
+// IsLongPath
+// =====================
+
+bool IsLongPath ( const std::string& path ) {
+	if ( path.find ( "\\\\?\\" ) == 0 ) return true;
+	return false;
+}
+
+// =================================================================================================
+// IsNetworkPath
+// =====================
+
+bool IsNetworkPath ( const std::string& path ) {
+	if ( path.find ( "\\\\" ) == 0 ) return true;
+	return false;
+}
+
+// =================================================================================================
+// IsRelativePath
+// =====================
+
+bool IsRelativePath ( const std::string& path ) {
+	if ( path.length() > 2) {
+		char driveLetter = path[0];
+		if ( ( driveLetter >= 'a' && driveLetter <= 'z' ) || ( driveLetter >= 'A' && driveLetter <= 'Z' ) ) {
+			if (path[1] == ':' && path[2] == '\\' ) {
+				if ( path.find(".\\") == std::string::npos )
+					return false;
+			}
+		}
+	}
+	return true;
+}
+
+// =================================================================================================
+// GetWidePath
+// =====================
+
+bool GetWidePath( const char* path, std::string & widePath ) {
+	std::string utfPath ( path );
+	CorrectSlashes ( utfPath);
+
+	if ( !IsLongPath ( utfPath ) ) {
+		if ( IsNetworkPath ( utfPath ) ) {
+			utfPath = "\\\\?\\UNC\\" + utfPath.substr ( 2 );
+		} else if ( IsRelativePath ( utfPath ) ) {
+			//don't do anything
+		} else { // absolute path
+			utfPath = "\\\\?\\" + utfPath;
+		}
+	}
+
+	widePath.clear();
+	const size_t maxLen =  MultiByteToWideChar ( CP_UTF8, 0, utfPath.c_str(), -1, (LPWSTR)0, (int)0 );
+
+	widePath.reserve ( maxLen * sizeof (WCHAR) );
+	widePath.assign ( maxLen * sizeof (WCHAR) , '\0' );
+	int wideLen = MultiByteToWideChar ( CP_UTF8, 0, utfPath.c_str(), -1, (LPWSTR)widePath.data(), (int)maxLen );
+	if ( wideLen == 0 ) return false;
+	return true;
+}
+
+// =================================================================================================
+// CorrectSlashes
+// =====================
+
+std::string & CorrectSlashes ( std::string & path ) {
+	size_t idx = 0;
+
+	while( (idx = path.find_first_of('/',idx)) != std::string::npos )
+		path.replace( idx, 1, "\\" );
+	return path;
+}
+
+bool Exists ( const std::string & widePath )
+{
+	DWORD attrs = GetFileAttributesW ( (LPCWSTR)widePath.data() );
+	return ( attrs != INVALID_FILE_ATTRIBUTES);
+}
+
+
+Host_IO::FileMode GetFileMode ( const std::string & widePath )
+{
+	// ! A shortcut is seen as a file, we would need extra code to recognize it and find the target.
+	DWORD fileAttrs = GetFileAttributesW ( (LPCWSTR) widePath.c_str() );
+	if ( fileAttrs == INVALID_FILE_ATTRIBUTES ) return Host_IO::kFMode_DoesNotExist;	// ! Any failure turns into does-not-exist.
+
+	if ( fileAttrs & FILE_ATTRIBUTE_DIRECTORY ) return Host_IO::kFMode_IsFolder;
+	if ( fileAttrs & kOtherAttrs ) return Host_IO::kFMode_IsOther;
+	return Host_IO::kFMode_IsFile;
+
+}
+
+Host_IO::FileRef Open ( const std::string & widePath, bool readOnly )
+{
+	DWORD access = GENERIC_READ;	// Assume read mode.
+	DWORD share  = FILE_SHARE_READ | FILE_SHARE_WRITE;
+
+	if ( ! readOnly ) {
+		access |= GENERIC_WRITE;
+		share = 0;
+	}
+
+	Host_IO::FileRef fileHandle;
+	fileHandle = CreateFileW ( (LPCWSTR)widePath.data(), access, share, 0, OPEN_EXISTING,
+		(FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS), 0 );
+	if ( fileHandle == INVALID_HANDLE_VALUE ) {
+		DWORD osCode = GetLastError();
+		if ( (osCode == ERROR_FILE_NOT_FOUND) || (osCode == ERROR_PATH_NOT_FOUND) || (osCode == ERROR_FILE_OFFLINE) ) {
+			return Host_IO::noFileRef;
+		} else if ( osCode == ERROR_ACCESS_DENIED ) {
+			XMP_Throw ( "Open, file permission error", kXMPErr_FilePermission );
+		} else {
+			XMP_Throw ( "Open, other failure", kXMPErr_ExternalFailure );
+		}
+	}
+
+	return fileHandle;
+}
+
+Host_IO::FileRef OpenWithWriteShare ( const std::string & widePath, bool readOnly )
+{
+	DWORD access = GENERIC_READ;	// Assume read mode.
+	DWORD share  = FILE_SHARE_READ | FILE_SHARE_WRITE;
+
+	if ( ! readOnly ) {
+		access |= GENERIC_WRITE;
+	}
+
+	Host_IO::FileRef fileHandle;
+	fileHandle = CreateFileW ( (LPCWSTR)widePath.data(), access, share, 0, OPEN_EXISTING,
+		(FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS), 0 );
+	if ( fileHandle == INVALID_HANDLE_VALUE ) {
+		DWORD osCode = GetLastError();
+		if ( (osCode == ERROR_FILE_NOT_FOUND) || (osCode == ERROR_PATH_NOT_FOUND) || (osCode == ERROR_FILE_OFFLINE) ) {
+			return Host_IO::noFileRef;
+		} else if ( osCode == ERROR_ACCESS_DENIED ) {
+			XMP_Throw ( "Open, file permission error", kXMPErr_FilePermission );
+		} else {
+			XMP_Throw ( "Open, other failure", kXMPErr_ExternalFailure );
+		}
+	}
+
+	return fileHandle;
+}
+
+static std::string ConstructPreservedPath( const std::string& inputPath )
+{
+	DWORD allocate_size,retValue;
+	std::string longpathname="\\\\?\\";
+	std::string networkpathsuffix="UNC\\";
+	std::string pathSep="\\";
+	std::string casePreservedPath,systempath,widePath,leafname;
+
+	if ( !  Host_IO::Exists( inputPath.c_str() ) )
+		XMP_Throw ( "Host_IO::GetCasePresevedLeafName, Invalid Path-Doesn't Exist", kXMPErr_ExternalFailure );
+	std::string utfPath ( inputPath );
+	CorrectSlashes ( utfPath);
+
+	size_t pos = 0;
+	bool isNetworkPath=false;
+	int skipServerAndShareName=0;
+	if ( ! longpathname.compare ( utfPath.substr ( 0, longpathname.length() ) ) )
+	{
+		pos = longpathname.length() ;
+		if ( ! networkpathsuffix.compare ( utfPath.substr ( pos, networkpathsuffix.length() ) ))
+		{
+			pos += networkpathsuffix.length() ;
+			isNetworkPath=true;
+		}
+		casePreservedPath = utfPath.substr ( 0 , pos ) ;
+	}
+	else
+	{
+		isNetworkPath=IsNetworkPath(utfPath);
+		if (isNetworkPath){ pos =2;casePreservedPath="\\\\";}
+	}
+	if (isNetworkPath) skipServerAndShareName=2;
+	bool loopvar=true;
+	while(loopvar) 
+	{
+		size_t newpos = utfPath.find_first_of( pathSep, pos );
+		if ( newpos ==  std::string::npos )
+		{
+			newpos = utfPath.length();
+			loopvar= false;
+		}
+		WIN32_FIND_DATAW fileInfo;
+		HANDLE  searchNext;
+		leafname=utfPath.substr(pos,newpos-pos );
+		skipServerAndShareName=(skipServerAndShareName<0)?0:skipServerAndShareName;
+		if (!( leafname=="" || leafname=="." || leafname==".." || leafname[newpos-pos-1]==':' || skipServerAndShareName-- ) )
+		{
+			std::string partialPath=utfPath.substr(0,newpos);
+			if ( ! GetWidePath(partialPath.c_str(), widePath) || widePath.length() == 0)
+				XMP_Throw ( "Host_IO::GetCasePresevedLeafName, cannot convert path", kXMPErr_ExternalFailure );
+			searchNext = ::FindFirstFileW ( (LPCWSTR) widePath.c_str(), &fileInfo );
+			if( searchNext == INVALID_HANDLE_VALUE || ! ::FindClose(searchNext) )
+				XMP_Throw ( "Host_IO::GetCasePresevedLeafName, cannot convert path", kXMPErr_ExternalFailure );
+			
+			allocate_size=::WideCharToMultiByte(CP_UTF8,0,fileInfo.cFileName,-1,NULL,0,NULL,NULL);
+			leafname.reserve(allocate_size);
+			leafname.assign ( allocate_size , 0 );
+			retValue=::WideCharToMultiByte(CP_UTF8,0,fileInfo.cFileName,-1,(LPSTR)leafname.data(),leafname.length(),NULL,NULL);
+			if ( ! retValue )
+				XMP_Throw ( "Host_IO::GetCasePresevedLeafName, cannot convert path", kXMPErr_ExternalFailure );
+		}
+		casePreservedPath += leafname.c_str() ;
+		if (loopvar)
+			casePreservedPath+=pathSep;
+		pos=newpos+1;
+	}
+	return casePreservedPath.c_str();
+}
+static bool ContainsNonASCIICodePoints( const std::string & value )
+{
+	size_t vallen=value.length();
+	for (size_t index=0;index<vallen;index++)
+	{
+		if ((unsigned char)value[index]>127)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+// =================================================================================================
+// Host_IO::GetCasePreservedName
+// =============================
+std::string Host_IO::GetCasePreservedName( const std::string& inputPath )
+{
+	if ( ! ContainsNonASCIICodePoints( inputPath ) )
+	{
+		DWORD allocate_size,retValue;
+		std::string widePath,systempath,longPathName,shortPathName;
+		if ( ! GetWidePath(inputPath.c_str(), widePath) || widePath.length() == 0)
+			XMP_Throw ( "Host_IO::GetCasePresevedLeafName, cannot convert path", kXMPErr_ExternalFailure );
+
+		allocate_size = ::GetShortPathNameW((LPCWSTR)(widePath.c_str()),NULL,0);
+		shortPathName.reserve ( allocate_size* sizeof(TCHAR) );
+		shortPathName.assign ( allocate_size* sizeof(TCHAR) , 0 );
+		retValue = ::GetShortPathNameW( ( LPCWSTR)(widePath.c_str()),(LPWSTR)shortPathName.data(),allocate_size);
+		if ( ! retValue )
+			XMP_Throw ( "Host_IO::GetCasePresevedLeafName, cannot convert path", kXMPErr_ExternalFailure );
+
+		allocate_size = ::GetLongPathNameW((LPCWSTR)(shortPathName.c_str()),NULL,0);
+		longPathName.reserve ( allocate_size* sizeof(TCHAR) );
+		longPathName.assign ( allocate_size* sizeof(TCHAR) , 0 );
+		retValue = ::GetLongPathNameW( ( LPCWSTR)(shortPathName.c_str()),(LPWSTR)longPathName.data(),allocate_size);
+		if ( ! retValue )
+			XMP_Throw ( "Host_IO::GetCasePresevedLeafName, cannot convert path", kXMPErr_ExternalFailure );
+
+		allocate_size=::WideCharToMultiByte(CP_UTF8,0,(LPWSTR)&longPathName[0],-1,NULL,0,NULL,NULL);
+		systempath.reserve(allocate_size+1);
+		systempath.assign ( allocate_size+1 , 0 );
+		retValue=::WideCharToMultiByte(CP_UTF8,0,(LPWSTR)&longPathName[0],-1,(LPSTR)systempath.data(),systempath.size(),NULL,NULL);
+		if ( ! retValue )
+			XMP_Throw ( "Host_IO::GetCasePresevedLeafName, cannot convert path", kXMPErr_ExternalFailure );
+
+		return systempath.c_str();
+	}
+	else
+	{
+		 return ConstructPreservedPath( inputPath );
+	}
+}
+
diff --git a/source/Host_IO.hpp b/source/Host_IO.hpp
new file mode 100644
index 0000000..74f0515
--- /dev/null
+++ b/source/Host_IO.hpp
@@ -0,0 +1,190 @@
+#ifndef __Host_IO_hpp__
+#define __Host_IO_hpp__	1
+
+// =================================================================================================
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! This must be the first include.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include <string>
+
+#if XMP_WinBuild
+	#include <Windows.h>
+#elif XMP_MacBuild
+	#include <CoreServices/CoreServices.h>
+	#include <dirent.h>	// Mac uses the POSIX folder functions.
+#elif XMP_UNIXBuild | XMP_iOSBuild
+	#include <dirent.h>
+#else
+	#error "Unknown host platform."
+#endif
+
+// =================================================================================================
+// Host_IO is a collection of minimal convenient wrappers for host I/O services. It is intentionally
+// a namespace and not a class. No state is kept here, these are just wrappers that provide a common
+// internal API for basic I/O services that differ from host to host.
+
+namespace Host_IO {
+
+	// =============================================================================================
+	// File operations
+	// ===============
+	//
+	// ! The file operations should only be used in the implementation of XMPFiles_IO.
+	//
+	// Exists - Returns true if the path exists, whether as a file, folder, or anything else. Never
+	// throws an exception.
+	//
+	// Writable - Returns true 
+	//   a. In case checkCreationPossible is false check for existence and writable permissions.
+	//   b. In case checkCreationPossible is true and path is not existence, check permissions of parent folder.
+	//
+	// Create - Create a file if possible, return true if successful. Return false if the file
+	// already exists. Throw an XMP_Error exception if the file cannot be created or if the path
+	// already exists but is not a file.
+	//
+	// GetModifyDate - Return the file system modification date. Returns false if the file or folder
+	// does not exist.
+	//
+	// CreateTemp - Create a (presumably) temporary file related to some other file. The source
+	// file path is passed in, a derived name is selected in the same folder. The source file need
+	// not exist, but all folders in the path must exist. The derived name is guaranteed to not
+	// already exist. A limited number of attempts are made to select a derived name. Returns the
+	// temporary file path if successful. Throws an XMP_Error exception if no derived name is found
+	// of if the temporary file cannot be created.
+	//
+	// Open - Open a file for read-only or read-write access. Returns the host-specific FileRef if
+	// successful, returns noFileRef if the path does not exist. Throws an XMP_Error exception for
+	// other errors.
+	//
+	// Close - Close a file. Does nothing if the FileRef is noFileRef. Throws an XMP_Error
+	// exception for any errors.
+	//
+	// SwapData - Swap the contents of two files. Both should be closed. Used as part of safe-save
+	// operations. On Mac, also swaps all non-data forks. Ideally just the contents should be
+	// swapped, but a 3-way rename will be used instead of reading and writing the contents. Uses a
+	// host file-swap service if available, even if that swaps more than the contents. Throws an
+	// XMP_Error exception for any errors.
+	//
+	// Rename - Rename a file or folder. The new path must not exist. Throws an XMP_Error exception
+	// for any errors.
+	//
+	// Delete - Deletes a file or folder. Does nothing if the path does not exist. Throws an
+	// XMP_Error exception for any errors.
+	//
+	// Seek - Change the I/O position of an open file, returning the new absolute offset. Uses the
+	// native host behavior for seeking beyond EOF. Throws an XMP_Error exception for any errors.
+	//
+	// Read - Read into a buffer returning the number of bytes read. Requests are limited to less
+	// than 2GB in case the host uses an SInt32 count. Throws an XMP_Error exception for errors.
+	// Reaching EOF or being at EOF is not an error.
+	//
+	// Write - Write from a buffer. Requests are limited to less than 2GB in case the host uses an
+	// SInt32 count. Throws an XMP_Error exception for any errors.
+	//
+	// Length - Returns the length of an open file in bytes. The I/O position is not changed.
+	// Throws an XMP_Error exception for any errors.
+	//
+	// SetEOF - Sets a new EOF offset. The I/O position may be changed. Throws an XMP_Error
+	// exception for any errors.
+
+	#if XMP_WinBuild
+		typedef HANDLE FileRef;
+		static const FileRef noFileRef = INVALID_HANDLE_VALUE;
+	#elif XMP_MacBuild
+		typedef FSIORefNum FileRef;
+		static const FileRef noFileRef = -1;
+	#elif XMP_UNIXBuild | XMP_iOSBuild
+		typedef int FileRef;
+		static const FileRef noFileRef = -1;
+	#endif
+
+	bool Exists ( const char* filePath );
+	bool Writable ( const char* path, bool checkCreationPossible = false);
+	bool Create ( const char* filePath );	// Returns true if file exists or was created.
+
+	std::string GetCasePreservedName(const std::string& inputPath);
+	
+	bool GetModifyDate ( const char* filePath, XMP_DateTime* modifyDate );
+
+	std::string CreateTemp ( const char* sourcePath );
+
+	enum { openReadOnly = true, openReadWrite = false };
+
+	FileRef	Open   ( const char* filePath, bool readOnly );
+	void	Close  ( FileRef file );
+
+	void    SwapData ( const char* sourcePath, const char* destPath );
+	void	Rename   ( const char* oldPath, const char* newPath );
+	void	Delete   ( const char* filePath );
+
+	XMP_Int64	Seek     ( FileRef file, XMP_Int64 offset, SeekMode mode );
+	XMP_Uns32	Read     ( FileRef file, void* buffer, XMP_Uns32 count );
+	void		Write    ( FileRef file, const void* buffer, XMP_Uns32 count );
+	XMP_Int64	Length   ( FileRef file );
+	void		SetEOF   ( FileRef file, XMP_Int64 length );
+
+	inline XMP_Int64 Offset ( FileRef file ) { return Host_IO::Seek ( file, 0, kXMP_SeekFromCurrent ); };
+	inline XMP_Int64 Rewind ( FileRef file ) { return Host_IO::Seek ( file, 0, kXMP_SeekFromStart ); };	// Always returns 0.
+	inline XMP_Int64 ToEOF  ( FileRef file ) { return Host_IO::Seek ( file, 0, kXMP_SeekFromEnd ); };
+
+	// =============================================================================================
+	// Folder operations
+	// =================
+	//
+	// ! The folder operations may be used anywhere.
+	//
+	// GetFileMode - Returns an enum telling if a path names a file, folder, other, or nothing.
+	// Never throws an exception.
+	//
+	// GetChildMode - Same as GetFileMode, but has separate parent path and child name parameters.
+	//
+	// OpenFolder - Initializes the iteration of a folder.
+	//
+	// CloseFolder - Terminates the iteration of a folder.
+	//
+	// GetNextChild - Steps an iteration of a folder. Returns false at the end. Otherwise returns
+	// true and the local name of the next child. All names starting with '.' are skipped.
+	//
+	// AutoFolder - A utility class to make sure a folder iteration is terminated at scope exit.
+
+	enum { kFMode_DoesNotExist, kFMode_IsFile, kFMode_IsFolder, kFMode_IsOther };
+	typedef XMP_Uns8 FileMode;
+
+	FileMode GetFileMode  ( const char * path );
+	FileMode GetChildMode ( const char * parentPath, const char * childName );
+
+	#if XMP_WinBuild
+		typedef HANDLE FolderRef;
+		static const FolderRef noFolderRef = INVALID_HANDLE_VALUE;
+	#elif XMP_MacBuild
+		typedef DIR* FolderRef;
+		static const FolderRef noFolderRef = 0;
+	#elif XMP_UNIXBuild | XMP_iOSBuild
+		typedef DIR* FolderRef;
+		static const FolderRef noFolderRef = 0;
+	#endif
+
+	FolderRef OpenFolder   ( const char* folderPath );
+	void      CloseFolder  ( FolderRef folder );
+	bool      GetNextChild ( FolderRef folder, std::string* childName );
+
+	class AutoFolder {	// Used to make sure folder is closed at scope exit.
+	public:
+		FolderRef folder;
+		AutoFolder() : folder(noFolderRef) {};
+		~AutoFolder() { this->Close(); };
+		void Close() { CloseFolder ( this->folder ); this->folder = noFolderRef; };
+	};
+
+};
+
+#endif	// __Host_IO_hpp__
diff --git a/source/IOUtils.cpp b/source/IOUtils.cpp
new file mode 100644
index 0000000..726aaf6
--- /dev/null
+++ b/source/IOUtils.cpp
@@ -0,0 +1,118 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2013 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 "source/IOUtils.hpp"
+#include "source/Host_IO.hpp"
+
+#include <algorithm>
+
+// =================================================================================================
+// ListAllChildren
+// =================================================================================================
+
+static void ListAllChildren( XMP_StringPtr folderPath, XMP_StringVector & list, XMP_Bool listFolders, XMP_Bool listFiles, XMP_Bool sortList )
+{
+	try 
+	{
+		Host_IO::AutoFolder af;
+		af.folder = Host_IO::OpenFolder ( folderPath );
+		if ( af.folder != Host_IO::noFolderRef )
+		{
+			std::string resourceName;
+
+			while ( Host_IO::GetNextChild ( af.folder, &resourceName ) == true )
+			{
+
+				XMP_Bool addPath = false;
+				if ( listFolders && listFiles ) {
+					addPath = true;
+				}
+				else if ( listFolders )
+				{
+					if ( Host_IO::GetChildMode ( folderPath, resourceName.c_str() ) == Host_IO::kFMode_IsFolder )
+						addPath = true;
+				}
+				else if ( listFiles )
+				{
+					if ( Host_IO::GetChildMode ( folderPath, resourceName.c_str() ) == Host_IO::kFMode_IsFile )
+						addPath = true;
+				}
+
+				if ( addPath )
+					list.push_back ( resourceName );
+			}
+		}
+	} catch ( XMP_Error & ) {
+		// do nothing
+	}
+	if ( sortList )
+		std::sort ( list.begin(), list.end() );
+}
+
+
+// =================================================================================================
+// GetMatchingChildren
+// =================================================================================================
+
+void IOUtils::GetMatchingChildren ( XMP_StringVector & matchingChildList, const XMP_VarString & rootPath,
+	const XMP_StringVector & regExStringVec, XMP_Bool includeFolders, XMP_Bool includeFiles, XMP_Bool prefixRootPath )
+{
+	try 
+	{
+		XMP_StringVector listOfAllResources;
+		ListAllChildren (rootPath.c_str(), listOfAllResources, includeFolders, includeFiles, true);
+
+		XMP_Bool matchRequired = !regExStringVec.empty();
+		if ( matchRequired )
+		{
+			size_t childCount = listOfAllResources.size();
+			for ( size_t index = 0; index < childCount; index++ )
+			{
+				XMP_Bool match = false;
+				size_t regExpCount = regExStringVec.size();
+				for ( size_t index2 = 0; index2 < regExpCount; index2++ )
+				{
+					XMP_RegExp regexObj ( regExStringVec[index2].c_str() );
+					match = regexObj.Match ( listOfAllResources[index].c_str() );
+
+					if ( match )
+					{
+						if ( prefixRootPath )
+						{
+							std::string fullPath = rootPath;
+							if (fullPath[fullPath.length() - 1] != kDirChar )
+								fullPath += kDirChar;
+							fullPath += listOfAllResources[index];
+							matchingChildList.push_back ( fullPath );
+						}
+						else
+							matchingChildList.push_back ( listOfAllResources[index] );
+						break;
+					}
+				}
+			}
+		}
+	} catch ( XMP_Error & ) {
+		// do nothing
+	}
+} // GetMatchingChildren
+
+// =================================================================================================
+// GetMatchingChildren
+// =================================================================================================
+
+void IOUtils::GetMatchingChildren ( XMP_StringVector & matchingChildList, const XMP_VarString & rootPath,
+	const XMP_VarString & regExpStr, XMP_Bool includeFolders, XMP_Bool includeFiles, XMP_Bool prefixRootPath )
+{
+	XMP_StringVector regExpStringVec;
+	regExpStringVec.push_back ( regExpStr );
+	return GetMatchingChildren ( matchingChildList, rootPath, regExpStringVec, includeFolders, includeFiles, prefixRootPath );
+} // GetMatchingChildren
+
+// =================================================================================================
diff --git a/source/IOUtils.hpp b/source/IOUtils.hpp
new file mode 100644
index 0000000..fd4542b
--- /dev/null
+++ b/source/IOUtils.hpp
@@ -0,0 +1,31 @@
+#ifndef __IOUtils_hpp__
+#define __IOUtils_hpp__	1
+
+// =================================================================================================
+// Copyright 2013 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 "public/include/XMP_Environment.h"	
+#include "public/include/XMP_Const.h"
+
+#include "source/XMP_LibUtils.hpp"
+
+//Helper class for common IO function
+class IOUtils
+{
+public:
+	// Returns the list of folders or files matching particular string format in the given Directory
+	static void GetMatchingChildren ( XMP_StringVector & matchingChildList, const XMP_VarString & rootPath,
+		const XMP_StringVector & regExStringVec, XMP_Bool includeFolders, XMP_Bool includeFiles, XMP_Bool prefixRootPath );
+
+	// Returns the list of folders or files matching particular string format in the given Directory
+	static void GetMatchingChildren ( XMP_StringVector & matchingChildList, const XMP_VarString & rootPath,
+		const XMP_VarString & regExpStr, XMP_Bool includeFolders, XMP_Bool includeFiles, XMP_Bool prefixRootPath );
+};
+
+#endif	// __IOUtils_hpp__
diff --git a/source/Makefile.am b/source/Makefile.am
new file mode 100644
index 0000000..681f98f
--- /dev/null
+++ b/source/Makefile.am
@@ -0,0 +1,60 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+noinst_LTLIBRARIES = libxmpcommon.la
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+AM_CPPFLAGS = -I$(top_srcdir) \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_HEADERS = UnicodeConversions.hpp ExpatAdapter.hpp EndianUtils.hpp\
+	XMLParserAdapter.hpp XMPFiles_IO.hpp Endian.h Host_IO.hpp XIO.hpp
+
+
+libxmpcommon_la_SOURCES = UnicodeInlines.incl_cpp UnicodeConversions.cpp\
+	XML_Node.cpp XMPFiles_IO.cpp \
+	XMP_LibUtils.hpp XMP_LibUtils.cpp \
+	XIO.cpp Host_IO-POSIX.cpp \
+	XMP_ProgressTracker.hpp XMP_ProgressTracker.cpp \
+	PerfUtils.hpp PerfUtils.cpp \
+	IOUtils.hpp IOUtils.cpp \
+	SafeStringAPIs.h SuppressSAL.h SafeTypes.h \
+	$(NULL)
+
+
+EXTRA_DIST = Host_IO-POSIX.cpp Host_IO-Win.cpp
diff --git a/source/Makefile.in b/source/Makefile.in
new file mode 100644
index 0000000..ffa84df
--- /dev/null
+++ b/source/Makefile.in
@@ -0,0 +1,698 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = source
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libxmpcommon_la_LIBADD =
+am_libxmpcommon_la_OBJECTS = UnicodeConversions.lo XML_Node.lo \
+	XMPFiles_IO.lo XMP_LibUtils.lo XIO.lo Host_IO-POSIX.lo \
+	XMP_ProgressTracker.lo PerfUtils.lo IOUtils.lo
+libxmpcommon_la_OBJECTS = $(am_libxmpcommon_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libxmpcommon_la_SOURCES)
+DIST_SOURCES = $(libxmpcommon_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libxmpcommon.la
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_HEADERS = UnicodeConversions.hpp ExpatAdapter.hpp EndianUtils.hpp\
+	XMLParserAdapter.hpp XMPFiles_IO.hpp Endian.h Host_IO.hpp XIO.hpp
+
+libxmpcommon_la_SOURCES = UnicodeInlines.incl_cpp UnicodeConversions.cpp\
+	XML_Node.cpp XMPFiles_IO.cpp \
+	XMP_LibUtils.hpp XMP_LibUtils.cpp \
+	XIO.cpp Host_IO-POSIX.cpp \
+	XMP_ProgressTracker.hpp XMP_ProgressTracker.cpp \
+	PerfUtils.hpp PerfUtils.cpp \
+	IOUtils.hpp IOUtils.cpp \
+	SafeStringAPIs.h SuppressSAL.h SafeTypes.h \
+	$(NULL)
+
+EXTRA_DIST = Host_IO-POSIX.cpp Host_IO-Win.cpp
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign source/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign source/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libxmpcommon.la: $(libxmpcommon_la_OBJECTS) $(libxmpcommon_la_DEPENDENCIES) $(EXTRA_libxmpcommon_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libxmpcommon_la_OBJECTS) $(libxmpcommon_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Host_IO-POSIX.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IOUtils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PerfUtils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnicodeConversions.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XIO.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XML_Node.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMPFiles_IO.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMP_LibUtils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMP_ProgressTracker.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/source/PerfUtils.cpp b/source/PerfUtils.cpp
new file mode 100644
index 0000000..6cf8b31
--- /dev/null
+++ b/source/PerfUtils.cpp
@@ -0,0 +1,147 @@
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"
+#include "public/include/XMP_Const.h"
+
+#include "source/PerfUtils.hpp"
+
+#include <stdio.h>
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#endif
+
+// =================================================================================================
+// =================================================================================================
+
+#if XMP_WinBuild
+
+#pragma warning ( disable : 4800 )	// forcing bool to 0/1
+
+const char * PerfUtils::GetTimerInfo()
+{
+	LARGE_INTEGER freq;
+	static char msgBuffer[1000];
+
+	bool ok = (bool) QueryPerformanceFrequency ( &freq );
+	if ( ! ok ) throw XMP_Error ( kXMPErr_ExternalFailure, "Failure from QueryPerformanceFrequency" );
+	
+	if ( freq.HighPart != 0 ) {
+		return "Windows PerfUtils measures finer than nanoseconds, using the QueryPerformanceCounter() timer";
+	}
+	
+	double rate = 1.0 / (double)freq.LowPart;
+	_snprintf ( msgBuffer, sizeof(msgBuffer),
+			   "Windows PerfUtils measures %e second, using the QueryPerformanceCounter() timer", rate );
+	return msgBuffer;
+	
+}	// PerfUtils::GetTimerInfo
+
+// ------------------------------------------------------------------------------------------------
+
+PerfUtils::MomentValue PerfUtils::NoteThisMoment()
+{
+	LARGE_INTEGER now;
+
+	bool ok = (bool) QueryPerformanceCounter ( &now );
+	if ( ! ok ) throw XMP_Error ( kXMPErr_ExternalFailure, "Failure from QueryPerformanceCounter" );
+	return now.QuadPart;
+
+}	// PerfUtils::NoteThisMoment
+
+// ------------------------------------------------------------------------------------------------
+
+double PerfUtils::GetElapsedSeconds ( PerfUtils::MomentValue start, PerfUtils::MomentValue finish )
+{
+	LARGE_INTEGER freq;
+
+	bool ok = (bool) QueryPerformanceFrequency ( &freq );
+	if ( ! ok ) throw XMP_Error ( kXMPErr_ExternalFailure, "Failure from QueryPerformanceFrequency" );
+
+	const double scale = (double)freq.QuadPart;
+	
+	const double elapsed = (double)(finish - start) / scale;
+	return elapsed;
+
+}	// PerfUtils::GetElapsedSeconds
+
+#endif
+
+// =================================================================================================
+
+#if XMP_UNIXBuild
+
+const char * PerfUtils::GetTimerInfo()
+{
+	return "UNIX PerfUtils measures nano seconds, using the POSIX clock_gettime() timer";
+}	// PerfUtils::GetTimerInfo
+
+// ------------------------------------------------------------------------------------------------
+
+PerfUtils::MomentValue PerfUtils::NoteThisMoment()
+{
+	MomentValue moment = kZeroMoment;
+	if ( clock_gettime( CLOCK_MONOTONIC, &moment ) != 0 )
+		throw XMP_Error( kXMPErr_ExternalFailure, "Failure from clock_gettime" );
+	return moment;
+}	// PerfUtils::NoteThisMoment
+
+// ------------------------------------------------------------------------------------------------
+
+double PerfUtils::GetElapsedSeconds ( PerfUtils::MomentValue start, PerfUtils::MomentValue finish )
+{
+	double startInSeconds = start.tv_sec + start.tv_nsec / 1000000000.0;
+	double finishInSeconds = finish.tv_sec + finish.tv_nsec / 1000000000.0;
+	return finishInSeconds - startInSeconds;
+}	// PerfUtils::GetElapsedSeconds
+
+#endif
+
+// =================================================================================================
+
+#if XMP_MacBuild | XMP_iOSBuild
+
+#include <mach/mach.h>
+#include <mach/mach_time.h>
+
+const char * PerfUtils::GetTimerInfo()
+{
+	return "Mac PerfUtils measures nano seconds, using the mach_absolute_time() timer";
+}	// PerfUtils::GetTimerInfo
+
+// ------------------------------------------------------------------------------------------------
+
+PerfUtils::MomentValue PerfUtils::NoteThisMoment()
+{
+	return mach_absolute_time();
+}	// PerfUtils::NoteThisMoment
+
+// ------------------------------------------------------------------------------------------------
+
+double PerfUtils::GetElapsedSeconds ( PerfUtils::MomentValue start, PerfUtils::MomentValue finish )
+{
+	static mach_timebase_info_data_t sTimebaseInfo;
+	static double sConversionFactor = 0.0;
+	// If this is the first time we've run, get the timebase.
+	// We can use denom == 0 to indicate that sTimebaseInfo is 
+	// uninitialized because it makes no sense to have a zero 
+	// denominator is a fraction.
+
+	if ( sTimebaseInfo.denom == 0 ) {
+		mach_timebase_info(&sTimebaseInfo);
+		sConversionFactor = ((double)sTimebaseInfo.denom / (double)sTimebaseInfo.numer);
+		sConversionFactor /= 1000000000.0;
+	}
+
+	return ( finish - start ) * sConversionFactor;
+}	// PerfUtils::GetElapsedSeconds
+
+#endif
+
+
diff --git a/source/PerfUtils.hpp b/source/PerfUtils.hpp
new file mode 100644
index 0000000..4bf9831
--- /dev/null
+++ b/source/PerfUtils.hpp
@@ -0,0 +1,44 @@
+#ifndef __PerfUtils_hpp__
+#define __PerfUtils_hpp__ 1
+
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"
+
+#if XMP_MacBuild
+	#include <CoreServices/CoreServices.h>
+#elif XMP_WinBuild
+	#include <Windows.h>
+#elif XMP_UNIXBuild | XMP_iOSBuild
+	#include <time.h>
+#endif
+
+namespace PerfUtils {
+
+	#if XMP_WinBuild
+//		typedef LARGE_INTEGER MomentValue;
+		typedef LONGLONG MomentValue;
+		static const MomentValue kZeroMoment = 0;
+	#elif XMP_UNIXBuild
+		typedef struct timespec MomentValue;
+		static const MomentValue kZeroMoment = {0, 0};
+	#elif XMP_iOSBuild | XMP_MacBuild
+		typedef uint64_t MomentValue;
+		static const MomentValue kZeroMoment = 0;
+	#endif
+
+	const char * GetTimerInfo();
+
+	MomentValue NoteThisMoment();
+	
+	double GetElapsedSeconds ( MomentValue start, MomentValue finish );
+
+};	// PerfUtils
+
+#endif	// __PerfUtils_hpp__
diff --git a/source/SafeStringAPIs.h b/source/SafeStringAPIs.h
new file mode 100644
index 0000000..705aeb3
--- /dev/null
+++ b/source/SafeStringAPIs.h
@@ -0,0 +1,650 @@
+/*************************************************************************
+*
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+*  Copyright 2010 Adobe Systems Incorporated
+*  All Rights Reserved.
+*
+* NOTICE:  All information contained herein is, and remains
+* the property of Adobe Systems Incorporated and its suppliers,
+* if any.  The intellectual and technical concepts contained
+* herein are proprietary to Adobe Systems Incorporated and its
+* suppliers and are protected by trade secret or copyright law.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe Systems Incorporated.
+**************************************************************************/
+
+//Safe String APIs Version 1.0
+
+#ifndef _H_SafeAPIs
+#define _H_SafeAPIs
+
+#include <stddef.h>	/* Include standard ANSI C stuff: size_t, NULL etc */
+#include <stdarg.h>
+#include "SuppressSAL.h"
+#include "SafeTypes.h"
+
+/* 
+	OVERVIEW:
+	--------
+	This file contains APIs that will map unsafe/banned string functions to their safe equivalents.
+	The objective is to make minimal change at the actual call site.
+
+	There are two sets of APIs in this file.
+	APIs in first set should be invoked for dynamic array buffers, and pointers to buffers.
+	APIs in second set should be invoked for static array buffers.
+
+	Note: Any of the following functions which take more than one argument does not verify whether
+	the buffers provided to them are not overlapping. It currently expects that they do not overlap.
+*/
+
+#define ERROR_SAFE_INVALID_PARAM -1		//Error for invalid parameters passed to the APIs
+#define ERROR_SAFE_BUFFER_OVERFLOW -2	//Error for buffer overflow that could happen on completing the operation
+
+/*
+	NOTE:
+	Defining STATIC_SAFE_API macro prior to #include "SafeMemoryAPIs.h" shall make all 
+	the functions defined in SafeMemoryAPIs.h to be static. This macro is intended to
+	be used ONLY in those .c or .cpp files which needs the definition of the SafeMemoryAPIs
+	in the local scope. This macro will help avoiding the linker error due to the redefined 
+	symbols from SafeMemoryAPIs.
+	If STATIC_SAFE_API is defined, the warnings for unreferenced local functions will be removed.
+*/
+
+#ifdef STATIC_SAFE_API
+	#if (defined(_WIN32) || defined(_WIN64))
+		#pragma warning( disable : 4505 )
+	#elif defined(__GNUC__)
+		#pragma GCC system_header
+	#endif
+#endif
+
+#ifdef STATIC_SAFE_API
+	#define CONDITIONAL_STATIC static
+#else
+	#define CONDITIONAL_STATIC
+#endif
+
+#if __cplusplus
+extern "C" {
+#endif
+
+//String functions
+
+/* strnlen_safe 
+Safe version of strlen. To replace strlen. 
+It returns the number of characters in the string (excluding the terminating null). 
+If there is no null terminator within the first maxSize bytes of the string then maxSize is returned 
+to indicate the error condition; null-terminated strings have lengths strictly less than maxSize.
+
+ex:
+	strnlen_safe("abcd", 5) & strnlen_safe("abcd", 4) will return 4.
+	
+	Please use the following replacements for the other Windows-only strnlen APIS.
+	Unsafe/Deprecated	|	New Safe API
+		_mbslen			|   _mbsnlen_s
+		wcslen			|	Don't use it.
+*/
+_Check_return_ CONDITIONAL_STATIC size_t strnlen_safe(_In_z_count_(maxSize) const char *s, 
+													  _In_ size_t maxSize);
+
+/* strcpy_safe
+Safe version of strcpy. This should be used in place of strcpy, _tcscpy or strcpy.
+size - The max number of characters (in bytes) that are to be copied into the destination including the null terminator.
+Ensures no buffer overflow and ensures null-terminated strings. 
+
+RETURNS: Zero if all the characters including the null terminator was copied successfully, negative otherwise.
+
+Note, that the string will be truncated to fit into the buffer.
+
+ex: char buffer[5];
+	strcpy_safe(buffer, 5, "abcde"); -- will make buffer = "abcd" and return ERROR_SAFE_BUFFER_OVERFLOW
+
+	strcpy_safe(buffer, 5, "abc"); -- safe. will execute normally.
+
+	Please use the following replacements for the other Windows-only strcpy APIS.
+	Unsafe/Deprecated	|	New Safe API
+	lstrcpy				|	StringCchCopy
+	lstrcpyA			|	StringCchCopyA
+	lstrcpyW			|	StringCchCopyW
+	_mbscpy				|	_mbscpy_s
+	wcscpy				|	Don't use it.
+*/
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 strcpy_safe(_Out_z_cap_(size) char *dest, 
+															_In_ size_t size, 
+															_In_z_ const char *src);
+
+/*
+strncpy_safe - To replace strncpy, strncpy and strlcpy 
+RETURNS: Zero if successful, negative if unsuccessful.
+A zero return value implies that all of the requested characters from the string pointed to by src fit
+within the array pointed to by dest and that the result in dest is null terminated.
+
+NOTE: n is the number of characters to be copied excluding the NULL terminator. 
+
+Also, if the length of the source string is greater than the buffer size, the source string will be truncated to fit
+the buffer.
+
+ex: char buffer[5];
+	strncpy_safe(buffer, 5, "abcde", 5); -- will safely truncate the source string and null terminate  buffer.
+											The contents of buffer = "abcd". However, 
+											this will return ERROR_SAFE_BUFFER_OVERFLOW.
+
+	strncpy_safe(buffer, 5, "abc", 3); -- contents of buffer = "abc" and return 0.
+*/
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 strncpy_safe(_Out_z_cap_(size) char *dest, 
+															 _In_ size_t size, 
+															 _In_z_ const char *src, 
+															 _In_ size_t n);
+
+/*strcat_safe - Safe version of strcat. To replace strcat.
+Ensures there is no buffer overflow and that the resultant string is null-terminated. 
+NOTE: The second argument is the total size of the buffer and not the remaining size
+s1 is the destination to which atmost s1max characters of s2 are appended. 
+
+RETURNS: Zero if successful, negative if unsuccessful.
+A zero return value implies that all of the requested characters from the string pointed 
+to by s2 were appended to the string pointed to by s1 and that the result in s1 is null terminated.
+ex: char a[10];
+	a= "abcde" and buffer = "abc"
+
+	strcat_safe(a, 10, buffer); -- safe. a will now be "abcdeabc"
+	
+	strcat_safe(a, 10, buffer); --	buffer overflow detected. Truncated a = 'abcdeabca'. 
+									ERROR_SAFE_BUFFER_OVERFLOW will be returned.
+
+	Please use the following replacements for the other Windows-only strcat APIS.
+	Unsafe/Deprecated	|	New Safe API
+	lstrcat				|	StringCchCat
+	lstrcatA			|	StringCchCatA
+	lstrcatW			|	StringCchCatW
+	_mbscat				|	_mbscat_s
+	wcscat				|	Don't use it.
+*/
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 strcat_safe( _Inout_z_cap_( s1max ) char *s1, 
+															_In_ size_t s1max, 
+															_In_z_ const char *s2);
+
+/*strncat_safe - Safe version of strncat. To replace strncat and strlcat.
+Ensures there is no buffer overflow and that the resultant string is null-terminated. 
+NOTE: The second argument is the total size of the buffer and not the remaining size
+s1 is the destination to which the first n characters of of s2 are appended. 
+RETURNS: Zero if successful, an error code if unsuccessful.
+A zero return value implies that all the requested characters from the string pointed to by 
+s2 were appended to the string pointed to by s1 and that the result in s1 is null terminated. 
+
+ex: a[10].
+	a = "abcde" and buf = "abc". 
+	strncat_safe(a, 10, buf, 5) -- will be successful since the length
+									  of the src buffer is only 3. The contents
+									  of a = "abcdeabc"
+   But, strncat_safe(a, 10, "abcde", 5) --- will set <a> to null and return ERROR_SAFE_BUFFER_OVERFLOW.
+	Again, with a = "abcde" 
+	strncat_safe(a, 10, "abcde", 3) -- will be safe. And a = "abcdeabc".
+
+	Please use the following replacements for the other Windows-only strncat APIS.
+	Unsafe/Deprecated	|	New Safe API
+	lstrncat			|	StringCchCatN
+	lstrcatnA			|	StringCchCatNA
+	lstrcatnW			|	StringCchCatNW
+	_mbsncat			|	_mbsncat_s
+	wcsncat				|	Don't use it.
+*/
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 strncat_safe(_Inout_z_cap_(s1max) char *s1, 
+															 _In_ size_t s1max, 
+															 _In_z_ const char *s2, 
+															 _In_ size_t n);
+
+_Check_return_ CONDITIONAL_STATIC char *strchr_safe(_In_z_count_(maxSize) const char *s, 
+													_In_ size_t maxSize, 
+													_In_ char c);
+
+/* strtok_safe - Safe version of strtok. To replace strtok.
+ strToken: String containing token or tokens.
+ maxSize: The max number of characters (in bytes) that can be present in strToken including the null terminator.
+ strDelimit: Set of delimiter characters.
+ context: Used to store position information between calls to strtok_safe
+
+ Note: The caller function has to see that strToken passed at the first call 
+ should be NULL terminated, without which buffer overflow can occur
+
+ Example: 
+ static char str1[] = "?a???b,,,#c";
+ static char str2[] = "\t \t";
+ char *t, *ptr1, *ptr2;
+ t = strtok_safe(str1, sizeof(str1), "?", &ptr1);
+ t = strtok_safe(NULL, sizeof(str2), ",", &ptr1);
+
+ will print
+
+ Please use the following replacements for the other Windows-only strtok APIS.
+	Unsafe/Deprecated		New Safe API
+	_mbstok					_mbstok_s
+	wcstok					Don't use it.
+*/
+_Check_return_ CONDITIONAL_STATIC char * strtok_safe(_Inout_opt_z_cap_(maxSize) char* strToken, 
+													 _In_ size_t maxSize, 
+													 _In_z_ const char *strDelimit, 
+													 _Inout_ _Deref_prepost_opt_z_ char **context);
+
+//- Variable argument functions
+/* vprintf_safe: Safe replacement for vprintf. However, for non-Windows platforms, 
+   it does not validate format string and hence it is strongly 
+   advised not to pass untrusted strings as the format argument.*/
+
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 vprintf_safe(_In_z_ _Printf_format_string_ const char* format, 
+															 va_list argp);
+
+/* vsprintf: Safe replacement for vsprintf. Avoids buffer overrun and ensures buffer is null-terminated.
+   However, for non-Windows platforms, it does not validate format string and hence it is strongly 
+   advised not to pass untrusted strings as the format argument.*/
+CONDITIONAL_STATIC SafeInt32 vsprintf_safe(_Out_z_cap_(size) char* buffer, 
+										   _In_ size_t size, 
+										   _In_z_ _Printf_format_string_ const char* format, 
+										   va_list argp);
+/* vsnprintf_safe */
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 vsnprintf_safe(_Out_z_cap_(size) char *buffer, 
+															   _In_ size_t size, 
+															   _In_ size_t count, 
+															   _In_z_ _Printf_format_string_ const char* format, 
+															   va_list argp);
+
+/* vwprintf_safe: Safe replacement for vwprintf. However, for non-Windows platforms, 
+   it does not validate format string and hence it is strongly 
+   advised not to pass untrusted strings as the format argument.*/
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 vwprintf_safe(_In_z_ _Printf_format_string_ const wchar_t *format, 
+															  va_list argp);
+
+// printf functions
+
+/* sprintf_safe. Safe replacement of sprintf. Safer version of sprintf.
+Returns the number of characters written into the buffer including the null terminator, or an error code.
+NOTE: We are still not using a completely safe version of sprintf on non-Windows platforms. The format string is not 
+validated here. Format string could be used maliciously.
+But, with the below implementation, we will prevent buffer overruns on all platforms and give us runtime 
+checks on Win that we use sprintf correctly.
+
+*/
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 sprintf_safe(_Out_z_cap_(size) char *buffer, 
+															 _In_ size_t size, 
+															 _In_z_ _Printf_format_string_ const char *format, 
+															 ...);
+
+/* printf_safe - Safe version of printf on Windows. Replaces printf. Still UNSAFE on MAC and Unix.
+NOTE: This is UNSAFE to use in Non-Debug mode on any platform other than Windows. 
+Please avoid using printf on these platforms or ensure that the format string is not user defined. */
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 printf_safe(_In_z_ _Printf_format_string_ const char *format, 
+															...);
+
+/* snprintf_safe: Safe replacement for snprintf. Prevents buffer overrun and ensures buffer is null-terminated.
+For non-Windows platforms, this can still be misused by passing an invalid format string. 
+This routine does not validate format string for non-Windows platforms and hence it is strongly 
+advised not to pass untrusted strings as the format argument.*/
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 snprintf_safe(_Out_z_cap_(size) char* buffer, 
+															  _In_ size_t size, 
+															  _In_ size_t count, 
+															  _In_z_ _Printf_format_string_ const char *format, 
+															  ...);
+
+/* wprintf_safe - Safe version of wprintf on Windows. Still UNSAFE on MAC and Unix.
+NOTE: This is UNSAFE to be used in Non-Debug mode on any platform other than Windows. 
+Please avoid using printf on these platforms or ensure that the format string is not user defined. */
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 wprintf_safe(_In_z_ _Printf_format_string_ const wchar_t *format, 
+															 ...);
+
+#if (defined(_WIN32) || defined(_WIN64)) && defined __STDC_WANT_SECURE_LIB__
+
+//splitpath and makepath
+
+/* splitpath_safe - Safe replacement for _splitpath
+   makepath_safe - Safe replacement for _makepath
+These are Windows only routines and are not applicable to Mac and unix platforms.
+RETURN: zero if successful, an error code on failure. 
+If any of the buffers is too short to hold the result, these functions clear all the
+buffers to empty strings and return a non-zero error code. */
+
+/*
+ If any of drive, dir, fname, or ext is NULL the corresponding size parameter must be zero.
+ See corresponding documentation in MSDN for _splitpath_s.
+ */
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 splitpath_safe(_In_z_ const char* path, 
+															   _Out_opt_z_cap_(driveSize) char* drive, 
+															   _In_ size_t driveSize, 
+															   _Out_opt_z_cap_(dirSize) char* dir, 
+															   _In_ size_t dirSize, 
+															   _Out_opt_z_cap_(fnameSize) char* fname, 
+															   _In_ size_t fnameSize, 
+															   _Out_opt_z_cap_(extSize) char* ext, 
+															   _In_ size_t extSize);
+
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 makepath_safe(_Out_z_cap_(size) char* path, 
+															  _In_ size_t size, 
+															  _In_opt_z_ const char* drive, 
+															  _In_opt_z_ const char* dir, 
+															  _In_opt_z_ const char* fname, 
+															  _In_opt_z_ const char* ext);
+
+#endif
+
+/* The following are safe replacements for numeric conversion APIs which are not ANSI C. 
+ size is the size of the buffer. It should be large enough to accommodate the resultant string.
+ For radix 2, (sizeof(int)*8 + 1), i.e. one character for each bit + 1 Null character.
+
+ _itoa_safe - Replacement for itoa and _itoa. 
+ Returns: Zero if succesful, an error code on failure.*/
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 _itoa_safe(_In_ int val, 
+														   _Out_z_cap_(size) char* buf, 
+														   _In_ size_t size, 
+														   _In_ int radix);
+
+/* _ltoa_safe - Replacement for ltoa and _ltoa */
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 _ltoa_safe(_In_ long val, 
+														   _Out_z_cap_(size) char *buf, 
+														   _In_ size_t size, 
+														   _In_ int radix);
+
+/* _ultoa_safe - Replacement for ultoa and _ultoa */
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 _ultoa_safe(_In_ unsigned long val, 
+															_Out_z_cap_(size) char *buf, 
+															_In_ size_t size, 
+															_In_ int radix);
+
+/* _i64toa_safe - Replacement for i64toa and _i64toa */
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 _i64toa_safe(_In_ SafeInt64 val, 
+															 _Out_z_cap_(size) char* buf, 
+															 _In_ size_t size, 
+															 _In_ int radix);
+
+/* _ui64toa_safe - Replacement for ui64toa and _ui64toa */
+_Check_return_opt_ CONDITIONAL_STATIC SafeInt32 _ui64toa_safe(_In_ SafeUns64 val, 
+															  _Out_z_cap_(size) char* buf, 
+															  _In_ size_t size, 
+															  _In_ int radix);
+
+#if (defined(_WIN32) || defined(_WIN64)) && defined __STDC_WANT_SECURE_LIB__
+/* Win APIs only. Preferable don't use them */
+
+/* _itow_safe - Replacement for itow and _itow */
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 _itow_safe(_In_ int val, 
+														   _Out_z_cap_(size) wchar_t *buf, 
+														   _In_ size_t size, 
+														   _In_ int radix);
+
+/* _i64tow_safe - Replacement for i64tow and _i64tow */
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 _i64tow_safe(_In_ SafeInt64 val, 
+															 _Out_z_cap_(size) wchar_t *buf, 
+															 _In_ size_t size, 
+															 _In_ int radix);
+
+/* _ui64tow_safe - Replacement for ui64tow and _ui64tow */
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 _ui64tow_safe(_In_ SafeUns64 val, 
+															  _Out_z_cap_(size) wchar_t *buf, 
+															  _In_ size_t size, 
+															  _In_ int radix);
+
+/* _ltow_safe - Replacement for ltow and _ltow */
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 _ltow_safe(_In_ long val, 
+														   _Out_z_cap_(size) wchar_t *str, 
+														   _In_ size_t size, 
+														   _In_ int radix);
+
+/* _ultow_safe - Replacement for ultow and _ultow */
+_Check_return_wat_ CONDITIONAL_STATIC SafeInt32 _ultow_safe(_In_ unsigned long val, 
+															_Out_z_cap_(size) wchar_t *str, 
+															_In_ size_t size, 
+															_In_ int radix);
+#endif
+
+/* gets_safe - to replace gets. 
+
+	example:	char line[21]; // room for 20 chars + '\0'
+			    gets_safe( line, 21 );
+
+				If more than 20 chars are entered, this will set line to NULL. 
+				
+	NOTE: This routine relies entirely on the user to provide the appropriate size. It has no way of finding out
+	if the buffer is actually smaller than the provided size. 
+	Hence, please make sure you provide the right size.
+
+	For eg: char line[5];
+			gets_safe(line, 6);
+
+			will end up reading 6 characters from stdin and overwrite the buffer.
+*/
+_Check_return_wat_ CONDITIONAL_STATIC char * gets_safe( _Out_z_cap_(size) char* buffer, 
+													   _In_ size_t size);
+
+#if __cplusplus
+}
+#endif
+
+#if __cplusplus // This guard is needed to avoid the templates getting included into C files.
+
+/*
+Methods which will be called for static array buffers.
+Here we will invoke safe version of APIs.
+*/
+
+/*
+char buffer based APIs
+*/
+
+template<size_t _Size>
+_Check_return_ inline SafeUns32 strnlen_safe(const char (&s)[_Size])
+{
+    return strnlen_safe(s, _Size);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 strcpy_safe(char (&dest)[_Size], 
+											  _In_z_ const char *src)
+{
+    return strcpy_safe(dest, _Size, src);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 strncpy_safe(char (&dest)[_Size], 
+							_In_z_ const char *src, 
+							_In_ size_t n)
+{
+    return strncpy_safe(dest, _Size, src, n);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 strcat_safe(char (&dest)[_Size], 
+											  _In_z_ const char *s2)
+{
+    return strcat_safe(dest, _Size, s2);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 strncat_safe(char (&dest)[_Size], 
+											   _In_z_ const char *s2, 
+											   _In_ size_t n)
+{
+    return strncat_safe(dest, _Size, s2, n);
+}
+
+template<size_t _Size>
+_Check_return_ inline char *strchr_safe(const char (&s)[_Size], 
+										_In_ char c)
+{
+	return strchr_safe(s, _Size, c);
+}
+
+template<size_t _Size>
+inline SafeInt32 vsprintf_safe(char (&buffer)[_Size], 
+							 _In_z_ _Printf_format_string_ const char* format, 
+							 va_list argp)
+{
+    return vsprintf_safe(buffer, _Size, format, argp);
+}
+
+template<size_t _Size>
+_Check_return_opt_ inline SafeInt32 vsnprintf_safe(char (&buffer)[_Size], 
+							  _In_ size_t count, 
+							  _In_z_ _Printf_format_string_ const char* format, 
+							  ...)
+{
+    va_list argp;
+    va_start(argp, format);
+	SafeInt32 numBytes = vsnprintf_safe(buffer, _Size, count, format, argp);
+	va_end(argp);
+    return numBytes;
+}
+
+template<size_t _Size>
+inline SafeInt32 sprintf_safe(char (&buffer)[_Size], 
+							_In_z_ _Printf_format_string_ const char *format, 
+							...)
+{
+    va_list argp;
+    va_start(argp, format);
+    SafeInt32 numBytes = vsprintf_safe(buffer, _Size, format, argp);
+    va_end(argp);
+    return numBytes;
+}
+
+template<size_t _Size>
+_Check_return_opt_ inline SafeInt32 snprintf_safe(char (&buffer)[_Size], 
+												_In_ size_t count, 
+												_In_z_ _Printf_format_string_ const char *format, 
+												...)
+{
+    va_list argp;
+    va_start(argp, format);
+    SafeInt32 numBytes = vsnprintf_safe(buffer, _Size, count, format, argp);
+    va_end(argp);
+    return numBytes;
+}
+
+#if (defined(_WIN32) || defined(_WIN64)) && defined __STDC_WANT_SECURE_LIB__
+
+template<size_t _DriveSize, size_t _DirSize, size_t _FNameSize, size_t _ExtSize>
+_Check_return_wat_ inline SafeInt32 splitpath_safe(_In_z_ const char* path, 
+												 char (&drive)[_DriveSize], 
+												 char (&dir)[_DirSize], 
+												 char (&fname)[_FNameSize], 
+												 char (&ext)[_ExtSize])
+
+{
+    return splitpath_safe(path, drive, _DriveSize, dir, _DirSize, fname, _FNameSize, ext, _ExtSize);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 makepath_safe(char (&path)[_Size], 
+												_In_opt_z_ const char* drive, 
+												_In_opt_z_ const char* dir, 
+												_In_opt_z_ const char* fname, 
+												_In_opt_z_ const char* ext)
+{
+    return makepath_safe(path, _Size, drive, dir, fname, ext);
+}
+
+#endif
+
+template<size_t _Size>
+_Check_return_opt_ inline SafeInt32 _itoa_safe(_In_ int val, 
+											 char (&buf)[_Size], 
+											 _In_ int radix)
+{
+    return _itoa_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_opt_ inline SafeInt32 _ltoa_safe(_In_ long val, 
+											 char (&buf)[_Size], 
+											 _In_ int radix)
+{
+    return _ltoa_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_opt_ inline SafeInt32 _ultoa_safe(_In_ unsigned long val, 
+											  char (&buf)[_Size], 
+											  _In_ int radix)
+{
+    return _ultoa_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_opt_ inline SafeInt32 _i64toa_safe(_In_ SafeInt64 val, 
+											   char (&buf)[_Size], 
+											   _In_ int radix)
+{
+    return _i64toa_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_opt_ inline SafeInt32 _ui64toa_safe(_In_ SafeUns64 val, 
+												char (&buf)[_Size], 
+												_In_ int radix)
+{
+    return _ui64toa_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+inline char * gets_safe( char (&buffer)[_Size])
+{
+    return gets_safe(buffer, _Size);
+}
+
+/*
+for wchar_t based buffers
+*/
+#if (defined(_WIN32) || defined(_WIN64)) && defined __STDC_WANT_SECURE_LIB__
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 _itow_safe(_In_ int val, 
+											 wchar_t (&buf)[_Size], 
+											 _In_ int radix)
+{
+    return _itow_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 _i64tow_safe(_In_ SafeInt64 val, 
+											   wchar_t (&buf)[_Size], 
+											   _In_ int radix)
+{
+    return _i64tow_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 _ui64tow_safe(_In_ SafeUns64 val, 
+												wchar_t (&buf)[_Size], 
+												_In_ int radix)
+{
+    return _ui64tow_safe(val, buf, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 _ltow_safe(_In_ long val, 
+											 wchar_t (&str)[_Size], 
+											 _In_ int radix)
+{
+    return _ltow_safe(val, str, _Size, radix);
+}
+
+template<size_t _Size>
+_Check_return_wat_ inline SafeInt32 _ultow_safe(_In_ unsigned long val, 
+											  wchar_t (&str)[_Size], 
+											  _In_ int radix)
+{
+    return _ultow_safe(val, str, _Size, radix);
+}
+
+#endif
+
+#endif // __cplusplus
+
+/*
+The definition of SafeStringAPIs functions are included if STATIC_SAFE_API is defined.
+*/
+#ifdef STATIC_SAFE_API
+#include "SafeStringAPIs.cpp"
+#endif
+
+#endif //End _H_SafeAPIs
diff --git a/source/SafeTypes.h b/source/SafeTypes.h
new file mode 100644
index 0000000..01a6a9d
--- /dev/null
+++ b/source/SafeTypes.h
@@ -0,0 +1,187 @@
+/*************************************************************************
+*
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+*  Copyright 2010 Adobe Systems Incorporated
+*  All Rights Reserved.
+*
+* NOTICE:  All information contained herein is, and remains
+* the property of Adobe Systems Incorporated and its suppliers,
+* if any.  The intellectual and technical concepts contained
+* herein are proprietary to Adobe Systems Incorporated and its
+* suppliers and are protected by trade secret or copyright law.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe Systems Incorporated.
+**************************************************************************/
+
+
+//SafeTypes Version 1.0
+
+#ifndef _H_SafeTypes
+#define _H_SafeTypes
+
+#include <stddef.h>	/* Include standard ANSI C stuff: size_t, NULL etc */
+
+/* Integer types
+
+	The following chart shows signed and unsigned integer types.
+
+   +------------+------+--------------+--------------+
+   |  Typedef   | Bits | Max Value    | Min Value    |
+   +------------+------+--------------+--------------+
+   |  SafeInt8  |   8  | SafeMAXInt8  | SafeMINInt8  |
+   +------------+------+--------------+--------------+
+   |  SafeUns8  |   8  | SafeMAXUns8  | SafeMINUns8  |
+   +------------+------+--------------+--------------+
+   |  SafeInt16 |  16  | SafeMAXInt16 | SafeMINInt16 |
+   +------------+------+--------------+--------------+
+   |  SafeUns16 |  16  | SafeMAXUns16 | SafeMINUns16 | 
+   +------------+------+--------------+--------------+
+   |  SafeInt32 |  32  | SafeMAXInt32 | SafeMINInt32 |
+   +------------+------+--------------+--------------+
+   |  SafeUns32 |  32  | SafeMAXUns32 | SafeMINUns32 |
+   +------------+------+--------------+--------------+
+   |  SafeInt64 |  64  | SafeMAXInt64 | SafeMINInt64 |
+   +------------+------+--------------+--------------+
+   |  SafeUns64 |  64  | SafeMAXUns64 | SafeMINUns64 |
+   +------------+------+--------------+--------------+
+
+*/
+
+/*	If application / component specific types are to be used, define SAFE_INT_TYPES as 0.
+	Note that such specialized types have to be defined as SafeTypes in the following section.
+ */
+
+#ifndef SAFE_INT_TYPES
+#define SAFE_INT_TYPES 1 // Define it as 0, if component specific types are to be used.
+#endif
+
+#if SAFE_INT_TYPES
+
+/*	Application / component specific definition for safe integer types goes here. 
+	Here is a sample usage:
+ */
+
+#define SafeInt8	XMP_Int8
+#define SafeUns8	XMP_Uns8
+#define SafeInt16	XMP_Int16
+#define SafeUns16	XMP_Uns16
+#define SafeInt32	XMP_Int32
+#define SafeUns32	XMP_Uns32
+#define SafeInt64	XMP_Int64
+#define SafeUns64	XMP_Uns64
+
+/*	Application / component specific definition for SafeMathThrow and SafeMathException goes here.
+	Here we use MyException as an example.
+*/
+/*
+**	For XMP, there no math function which cause exception, so can be leave no
+*/
+
+#ifdef __cplusplus
+
+#include "XMP_Const.h"
+
+//#define SafeMathThrow throw
+//#define SafeMathException XMP_Error( "Math overflow exception" )
+
+#endif
+
+
+#else
+/*	If the Safe Types are not derived from any specialized types, 
+	they will be derived from the platform specific types. 
+ */
+
+#ifdef _MSC_VER /* Windows VisualC */
+
+typedef	__int8				SafeInt8;
+typedef	unsigned __int8		SafeUns8;
+typedef	__int16				SafeInt16;
+typedef	unsigned __int16	SafeUns16;
+typedef	__int32				SafeInt32;
+typedef	unsigned __int32	SafeUns32;
+typedef	__int64				SafeInt64;
+typedef	unsigned __int64	SafeUns64;
+
+#else
+
+#include <inttypes.h>
+
+typedef int8_t		SafeInt8;
+typedef uint8_t		SafeUns8;
+typedef int16_t		SafeInt16;
+typedef uint16_t	SafeUns16;
+typedef int32_t		SafeInt32;
+typedef uint32_t	SafeUns32;
+typedef int64_t		SafeInt64;
+typedef uint64_t	SafeUns64;
+
+#endif /* Windows VisualC */
+
+/*	If SafeMathThrow and SafeMathException are not derived from any specialized definitions, 
+	the std exceptions will be used 
+ */
+
+#ifdef __cplusplus
+
+#include <stdexcept>
+
+#define SafeMathThrow throw
+#define SafeMathException std::overflow_error("Math overflow exception")
+
+#endif
+
+#endif
+
+/* Warning: 
+		In case of signed char, the Microsoft VC++ compiler shows a strange behavior. By default, it type cast the "signed char" to "signed int" 
+		during function call.
+
+		So you must type cast the "signed char" to "char" or "__int8" (on MS VC++ Compiler) in function calls.
+		It works fine on Linux and MAC.
+
+*/
+#define SafeMAXInt8		127
+#define SafeMINInt8		(-SafeMAXInt8 - 1)  		// please read above notes
+#define SafeMAXUns8		255
+#define SafeMINUns8		0
+
+#define SafeMAXInt16	32767
+#define SafeMINInt16	(-SafeMAXInt16 - 1)  		// please read above notes
+#define SafeMAXUns16	65535U
+#define SafeMINUns16	0
+
+#define SafeMAXInt32	2147483647L
+#define SafeMINInt32	(-SafeMAXInt32 - 1)  		// please read above notes
+#define SafeMAXUns32	4294967295UL
+#define SafeMINUns32	0
+
+#define SafeMAXInt32LL	2147483647LL
+#define SafeMINInt32LL	(-SafeMAXInt32LL - 1)  		// please read above notes
+#define SafeMAXUns32LL	4294967295ULL
+#define SafeMINUns32LL	0
+
+#define SafeMAXInt64	9223372036854775807LL
+#define SafeMINInt64	(-SafeMAXInt64 - 1)  		// please read above notes
+#define SafeMAXUns64	18446744073709551615ULL
+#define SafeMINUns64	0
+
+// values for quick and dirty check of unsigned 64 bit overflow.
+// They represent SafeMAXUns64 +- 4096 to assure that our 
+// tests account for precision loss in conversion to doubles
+// with a 53 bit mantissa.
+
+#define kSafeBigDouble			 18446744073709547519.0
+#define kTooBigDouble			 18446744073709555711.0
+#define kSafeSmallDouble		-18446744073709547519.0
+#define kTooSmallDouble			-18446744073709555711.0
+
+#define kSafeBigSignedDouble	 9223372036854771711.0
+#define kTooBigSignedDouble		 9223372036854779903.0
+#define kSafeSmallSignedDouble	-9223372036854771712.0
+#define kTooSmallSignedDouble	-9223372036854779904.0
+
+#endif //_H_SafeTypes
diff --git a/source/SuppressSAL.h b/source/SuppressSAL.h
new file mode 100644
index 0000000..0d75c72
--- /dev/null
+++ b/source/SuppressSAL.h
@@ -0,0 +1,614 @@
+/*************************************************************************
+*
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+*  Copyright 2010 Adobe Systems Incorporated
+*  All Rights Reserved.
+*
+* NOTICE:  All information contained herein is, and remains
+* the property of Adobe Systems Incorporated and its suppliers,
+* if any.  The intellectual and technical concepts contained
+* herein are proprietary to Adobe Systems Incorporated and its
+* suppliers and are protected by trade secret or copyright law.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe Systems Incorporated.
+**************************************************************************/
+
+//SuppressSAL.h Version 1.0
+
+/* 
+ * This file defines the Standard Annotation Language(SAL) symbols as empty, for non-windows platform. 
+ * This file should be included in multi-platform code which uses SAL, to avoid build breaks 
+ * on non-windows platform.
+ */
+
+#ifndef _H_SuppressSAL
+#define _H_SuppressSAL
+
+#if !defined(_WIN32) && !defined(_WIN64) /* The following definition is applicable only for non-windows platform */
+
+#define _In_
+#define _In_opt_
+
+#define _In_z_
+#define _In_opt_z_
+
+#define _In_count_(size)
+#define _In_opt_count_(size)
+#define _In_bytecount_(size)
+#define _In_opt_bytecount_(size)
+
+#define _In_count_c_(size)
+#define _In_opt_count_c_(size)
+#define _In_bytecount_c_(size)
+#define _In_opt_bytecount_c_(size)
+
+#define _In_z_count_(size)
+#define _In_opt_z_count_(size)
+#define _In_z_bytecount_(size)
+#define _In_opt_z_bytecount_(size)
+
+#define _In_z_count_c_(size)
+#define _In_opt_z_count_c_(size)
+#define _In_z_bytecount_c_(size)
+#define _In_opt_z_bytecount_c_(size)
+
+#define _In_ptrdiff_count_(size)
+#define _In_opt_ptrdiff_count_(size)
+
+#define _In_count_x_(size)
+#define _In_opt_count_x_(size)
+#define _In_bytecount_x_(size)
+#define _In_opt_bytecount_x_(size)
+
+#define _Out_
+#define _Out_opt_
+
+#define _Out_cap_(size)
+#define _Out_opt_cap_(size)
+#define _Out_bytecap_(size)
+#define _Out_opt_bytecap_(size)
+
+#define _Out_cap_c_(size)
+#define _Out_opt_cap_c_(size)
+#define _Out_bytecap_c_(size)
+#define _Out_opt_bytecap_c_(size)
+
+#define _Out_cap_m_(mult,size)
+#define _Out_opt_cap_m_(mult,size)
+#define _Out_z_cap_m_(mult,size)
+#define _Out_opt_z_cap_m_(mult,size)
+
+#define _Out_ptrdiff_cap_(size)
+#define _Out_opt_ptrdiff_cap_(size)
+
+#define _Out_cap_x_(size)
+#define _Out_opt_cap_x_(size)
+#define _Out_bytecap_x_(size)
+#define _Out_opt_bytecap_x_(size)
+
+#define _Out_z_cap_(size)
+#define _Out_opt_z_cap_(size)
+#define _Out_z_bytecap_(size)
+#define _Out_opt_z_bytecap_(size)
+
+#define _Out_z_cap_c_(size)
+#define _Out_opt_z_cap_c_(size)
+#define _Out_z_bytecap_c_(size)
+#define _Out_opt_z_bytecap_c_(size)
+
+#define _Out_z_cap_x_(size)
+#define _Out_opt_z_cap_x_(size)
+#define _Out_z_bytecap_x_(size)
+#define _Out_opt_z_bytecap_x_(size)
+
+#define _Out_cap_post_count_(cap,count)
+#define _Out_opt_cap_post_count_(cap,count)
+#define _Out_bytecap_post_bytecount_(cap,count)
+#define _Out_opt_bytecap_post_bytecount_(cap,count)
+
+#define _Out_z_cap_post_count_(cap,count)
+#define _Out_opt_z_cap_post_count_(cap,count)
+#define _Out_z_bytecap_post_bytecount_(cap,count)
+#define _Out_opt_z_bytecap_post_bytecount_(cap,count)
+
+#define _Out_capcount_(capcount)
+#define _Out_opt_capcount_(capcount)
+#define _Out_bytecapcount_(capcount)
+#define _Out_opt_bytecapcount_(capcount)
+
+#define _Out_capcount_x_(capcount)
+#define _Out_opt_capcount_x_(capcount)
+#define _Out_bytecapcount_x_(capcount)
+#define _Out_opt_bytecapcount_x_(capcount)
+
+#define _Out_z_capcount_(capcount)
+#define _Out_opt_z_capcount_(capcount)
+#define _Out_z_bytecapcount_(capcount)
+#define _Out_opt_z_bytecapcount_(capcount)
+
+#define _Inout_
+#define _Inout_opt_
+
+#define _Inout_z_
+#define _Inout_opt_z_
+
+#define _Inout_count_(size)
+#define _Inout_opt_count_(size)
+#define _Inout_bytecount_(size)
+#define _Inout_opt_bytecount_(size)
+
+#define _Inout_count_c_(size)
+#define _Inout_opt_count_c_(size)
+#define _Inout_bytecount_c_(size)
+#define _Inout_opt_bytecount_c_(size)
+
+#define _Inout_z_count_(size)
+#define _Inout_opt_z_count_(size)
+#define _Inout_z_bytecount_(size)
+#define _Inout_opt_z_bytecount_(size)
+
+#define _Inout_z_count_c_(size)
+#define _Inout_opt_z_count_c_(size)
+#define _Inout_z_bytecount_c_(size)
+#define _Inout_opt_z_bytecount_c_(size)
+
+#define _Inout_ptrdiff_count_(size)
+#define _Inout_opt_ptrdiff_count_(size)
+
+#define _Inout_count_x_(size)
+#define _Inout_opt_count_x_(size)
+#define _Inout_bytecount_x_(size)
+#define _Inout_opt_bytecount_x_(size)
+
+#define _Inout_cap_(size)
+#define _Inout_opt_cap_(size)
+#define _Inout_bytecap_(size)
+#define _Inout_opt_bytecap_(size)
+
+#define _Inout_cap_c_(size)
+#define _Inout_opt_cap_c_(size)
+#define _Inout_bytecap_c_(size)
+#define _Inout_opt_bytecap_c_(size)
+
+#define _Inout_cap_x_(size)
+#define _Inout_opt_cap_x_(size)
+#define _Inout_bytecap_x_(size)
+#define _Inout_opt_bytecap_x_(size)
+
+#define _Inout_z_cap_(size)
+#define _Inout_opt_z_cap_(size)
+#define _Inout_z_bytecap_(size)
+#define _Inout_opt_z_bytecap_(size)
+
+#define _Inout_z_cap_c_(size)
+#define _Inout_opt_z_cap_c_(size)
+#define _Inout_z_bytecap_c_(size)
+#define _Inout_opt_z_bytecap_c_(size)
+
+#define _Inout_z_cap_x_(size)
+#define _Inout_opt_z_cap_x_(size)
+#define _Inout_z_bytecap_x_(size)
+#define _Inout_opt_z_bytecap_x_(size)
+
+#define _Ret_
+#define _Ret_opt_
+
+#define _Deref_out_
+#define _Deref_out_opt_
+#define _Deref_opt_out_
+#define _Deref_opt_out_opt_
+
+#define _Deref_out_z_
+#define _Deref_out_opt_z_
+#define _Deref_opt_out_z_
+#define _Deref_opt_out_opt_z_
+
+#define _Check_return_
+#define _Check_return_opt_
+#define _Check_return_wat_
+
+#define _Printf_format_string_
+#define _Scanf_format_string_
+#define _Scanf_s_format_string_
+
+#define _Success_(expr)
+
+#define _In_bound_
+#define _Out_bound_
+#define _Ret_bound_
+#define _Deref_in_bound_
+#define _Deref_out_bound_
+#define _Deref_inout_bound_
+#define _Deref_ret_bound_
+
+#define _In_range_(lb,ub)
+#define _Out_range_(lb,ub)
+#define _Ret_range_(lb,ub)
+#define _Deref_in_range_(lb,ub)
+#define _Deref_out_range_(lb,ub)
+#define _Deref_ret_range_(lb,ub)
+
+#define _Pre_z_
+#define _Pre_opt_z_
+
+#define _Pre_cap_(size)
+#define _Pre_opt_cap_(size)
+#define _Pre_bytecap_(size)
+#define _Pre_opt_bytecap_(size)
+
+#define _Pre_cap_c_(size)
+#define _Pre_opt_cap_c_(size)
+#define _Pre_bytecap_c_(size)
+#define _Pre_opt_bytecap_c_(size)
+
+#define _Pre_cap_m_(mult,size)
+#define _Pre_opt_cap_m_(mult,size)
+
+#define _Pre_cap_for_(param)
+#define _Pre_opt_cap_for_(param)
+
+#define _Pre_cap_x_(size)
+#define _Pre_opt_cap_x_(size)
+#define _Pre_bytecap_x_(size)
+#define _Pre_opt_bytecap_x_(size)
+
+#define _Pre_ptrdiff_cap_(ptr)
+#define _Pre_opt_ptrdiff_cap_(ptr)
+
+#define _Pre_z_cap_(size)
+#define _Pre_opt_z_cap_(size)
+#define _Pre_z_bytecap_(size)
+#define _Pre_opt_z_bytecap_(size)
+
+#define _Pre_z_cap_c_(size)
+#define _Pre_opt_z_cap_c_(size)
+#define _Pre_z_bytecap_c_(size)
+#define _Pre_opt_z_bytecap_c_(size)
+
+#define _Pre_z_cap_x_(size)
+#define _Pre_opt_z_cap_x_(size)
+#define _Pre_z_bytecap_x_(size)
+#define _Pre_opt_z_bytecap_x_(size)
+
+#define _Pre_valid_cap_(size)
+#define _Pre_opt_valid_cap_(size)
+#define _Pre_valid_bytecap_(size)
+#define _Pre_opt_valid_bytecap_(size)
+
+#define _Pre_valid_cap_c_(size)
+#define _Pre_opt_valid_cap_c_(size)
+#define _Pre_valid_bytecap_c_(size)
+#define _Pre_opt_valid_bytecap_c_(size)
+
+#define _Pre_valid_cap_x_(size)
+#define _Pre_opt_valid_cap_x_(size)
+#define _Pre_valid_bytecap_x_(size)
+#define _Pre_opt_valid_bytecap_x_(size)
+
+#define _Pre_count_(size)
+#define _Pre_opt_count_(size)
+#define _Pre_bytecount_(size)
+#define _Pre_opt_bytecount_(size)
+
+#define _Pre_count_c_(size)
+#define _Pre_opt_count_c_(size)
+#define _Pre_bytecount_c_(size)
+#define _Pre_opt_bytecount_c_(size)
+
+#define _Pre_count_x_(size)
+#define _Pre_opt_count_x_(size)
+#define _Pre_bytecount_x_(size)
+#define _Pre_opt_bytecount_x_(size)
+
+#define _Pre_ptrdiff_count_(ptr)
+#define _Pre_opt_ptrdiff_count_(ptr)
+
+#define _Pre_valid_
+#define _Pre_opt_valid_
+
+#define _Pre_invalid_
+
+#define _Pre_notnull_
+#define _Pre_maybenull_
+#define _Pre_null_
+
+#define _Pre_readonly_
+#define _Pre_writeonly_
+
+#define _Post_z_
+
+#define _Post_maybez_
+
+#define _Post_cap_(size)
+#define _Post_bytecap_(size)
+
+#define _Post_count_(size)
+#define _Post_bytecount_(size)
+#define _Post_count_c_(size)
+#define _Post_bytecount_c_(size)
+#define _Post_count_x_(size)
+#define _Post_bytecount_x_(size)
+
+#define _Post_z_count_(size)
+#define _Post_z_bytecount_(size)
+#define _Post_z_count_c_(size)
+#define _Post_z_bytecount_c_(size)
+#define _Post_z_count_x_(size)
+#define _Post_z_bytecount_x_(size)
+
+#define _Post_valid_
+#define _Post_invalid_
+
+#define _Post_notnull_
+
+#define _Ret_z_
+#define _Ret_opt_z_
+
+#define _Ret_cap_(size)
+#define _Ret_opt_cap_(size)
+#define _Ret_bytecap_(size)
+#define _Ret_opt_bytecap_(size)
+
+#define _Ret_cap_c_(size)
+#define _Ret_opt_cap_c_(size)
+#define _Ret_bytecap_c_(size)
+#define _Ret_opt_bytecap_c_(size)
+
+#define _Ret_cap_x_(size)
+#define _Ret_opt_cap_x_(size)
+#define _Ret_bytecap_x_(size)
+#define _Ret_opt_bytecap_x_(size)
+
+#define _Ret_z_cap_(size)
+#define _Ret_opt_z_cap_(size)
+#define _Ret_z_bytecap_(size)
+#define _Ret_opt_z_bytecap_(size)
+
+#define _Ret_count_(size)
+#define _Ret_opt_count_(size)
+#define _Ret_bytecount_(size)
+#define _Ret_opt_bytecount_(size)
+
+#define _Ret_count_c_(size)
+#define _Ret_opt_count_c_(size)
+#define _Ret_bytecount_c_(size)
+#define _Ret_opt_bytecount_c_(size)
+
+#define _Ret_count_x_(size)
+#define _Ret_opt_count_x_(size)
+#define _Ret_bytecount_x_(size)
+#define _Ret_opt_bytecount_x_(size)
+
+#define _Ret_z_count_(size)
+#define _Ret_opt_z_count_(size)
+#define _Ret_z_bytecount_(size)
+#define _Ret_opt_z_bytecount_(size)
+
+#define _Ret_valid_
+#define _Ret_opt_valid_
+
+#define _Ret_notnull_
+#define _Ret_maybenull_
+#define _Ret_null_
+
+#define _Deref_pre_z_
+#define _Deref_pre_opt_z_
+
+#define _Deref_pre_cap_(size)
+#define _Deref_pre_opt_cap_(size)
+#define _Deref_pre_bytecap_(size)
+#define _Deref_pre_opt_bytecap_(size)
+
+#define _Deref_pre_cap_c_(size)
+#define _Deref_pre_opt_cap_c_(size)
+#define _Deref_pre_bytecap_c_(size)
+#define _Deref_pre_opt_bytecap_c_(size)
+
+#define _Deref_pre_cap_x_(size)
+#define _Deref_pre_opt_cap_x_(size)
+#define _Deref_pre_bytecap_x_(size)
+#define _Deref_pre_opt_bytecap_x_(size)
+
+#define _Deref_pre_z_cap_(size)
+#define _Deref_pre_opt_z_cap_(size)
+#define _Deref_pre_z_bytecap_(size)
+#define _Deref_pre_opt_z_bytecap_(size)
+
+#define _Deref_pre_z_cap_c_(size)
+#define _Deref_pre_opt_z_cap_c_(size)
+#define _Deref_pre_z_bytecap_c_(size)
+#define _Deref_pre_opt_z_bytecap_c_(size)
+
+#define _Deref_pre_z_cap_x_(size)
+#define _Deref_pre_opt_z_cap_x_(size)
+#define _Deref_pre_z_bytecap_x_(size)
+#define _Deref_pre_opt_z_bytecap_x_(size)
+
+#define _Deref_pre_valid_cap_(size)
+#define _Deref_pre_opt_valid_cap_(size)
+#define _Deref_pre_valid_bytecap_(size)
+#define _Deref_pre_opt_valid_bytecap_(size)
+
+#define _Deref_pre_valid_cap_c_(size)
+#define _Deref_pre_opt_valid_cap_c_(size)
+#define _Deref_pre_valid_bytecap_c_(size)
+#define _Deref_pre_opt_valid_bytecap_c_(size)
+
+#define _Deref_pre_valid_cap_x_(size)
+#define _Deref_pre_opt_valid_cap_x_(size)
+#define _Deref_pre_valid_bytecap_x_(size)
+#define _Deref_pre_opt_valid_bytecap_x_(size)
+
+#define _Deref_pre_count_(size)
+#define _Deref_pre_opt_count_(size)
+#define _Deref_pre_bytecount_(size)
+#define _Deref_pre_opt_bytecount_(size)
+
+#define _Deref_pre_count_c_(size)
+#define _Deref_pre_opt_count_c_(size)
+#define _Deref_pre_bytecount_c_(size)
+#define _Deref_pre_opt_bytecount_c_(size)
+
+#define _Deref_pre_count_x_(size)
+#define _Deref_pre_opt_count_x_(size)
+#define _Deref_pre_bytecount_x_(size)
+#define _Deref_pre_opt_bytecount_x_(size)
+
+#define _Deref_pre_valid_
+#define _Deref_pre_opt_valid_
+#define _Deref_pre_invalid_
+
+#define _Deref_pre_notnull_
+#define _Deref_pre_maybenull_
+#define _Deref_pre_null_
+
+#define _Deref_pre_readonly_
+#define _Deref_pre_writeonly_
+
+#define _Deref_post_z_
+#define _Deref_post_opt_z_
+
+#define _Deref_post_cap_(size)
+#define _Deref_post_opt_cap_(size)
+#define _Deref_post_bytecap_(size)
+#define _Deref_post_opt_bytecap_(size)
+
+#define _Deref_post_cap_c_(size)
+#define _Deref_post_opt_cap_c_(size)
+#define _Deref_post_bytecap_c_(size)
+#define _Deref_post_opt_bytecap_c_(size)
+
+#define _Deref_post_cap_x_(size)
+#define _Deref_post_opt_cap_x_(size)
+#define _Deref_post_bytecap_x_(size)
+#define _Deref_post_opt_bytecap_x_(size)
+
+#define _Deref_post_z_cap_(size)
+#define _Deref_post_opt_z_cap_(size)
+#define _Deref_post_z_bytecap_(size)
+#define _Deref_post_opt_z_bytecap_(size)
+
+#define _Deref_post_z_cap_c_(size)
+#define _Deref_post_opt_z_cap_c_(size)
+#define _Deref_post_z_bytecap_c_(size)
+#define _Deref_post_opt_z_bytecap_c_(size)
+
+#define _Deref_post_z_cap_x_(size)
+#define _Deref_post_opt_z_cap_x_(size)
+#define _Deref_post_z_bytecap_x_(size)
+#define _Deref_post_opt_z_bytecap_x_(size)
+
+#define _Deref_post_valid_cap_(size)
+#define _Deref_post_opt_valid_cap_(size)
+#define _Deref_post_valid_bytecap_(size)
+#define _Deref_post_opt_valid_bytecap_(size)
+                                                
+#define _Deref_post_valid_cap_c_(size)
+#define _Deref_post_opt_valid_cap_c_(size)
+#define _Deref_post_valid_bytecap_c_(size)
+#define _Deref_post_opt_valid_bytecap_c_(size)
+                                                
+#define _Deref_post_valid_cap_x_(size)
+#define _Deref_post_opt_valid_cap_x_(size)
+#define _Deref_post_valid_bytecap_x_(size)
+#define _Deref_post_opt_valid_bytecap_x_(size)
+
+#define _Deref_post_count_(size)
+#define _Deref_post_opt_count_(size)
+#define _Deref_post_bytecount_(size)
+#define _Deref_post_opt_bytecount_(size)
+
+#define _Deref_post_count_c_(size)
+#define _Deref_post_opt_count_c_(size)
+#define _Deref_post_bytecount_c_(size)
+#define _Deref_post_opt_bytecount_c_(size)
+
+#define _Deref_post_count_x_(size)
+#define _Deref_post_opt_count_x_(size)
+#define _Deref_post_bytecount_x_(size)
+#define _Deref_post_opt_bytecount_x_(size)
+
+#define _Deref_post_valid_
+#define _Deref_post_opt_valid_
+
+#define _Deref_post_notnull_
+#define _Deref_post_maybenull_
+#define _Deref_post_null_
+
+#define _Deref_ret_z_
+#define _Deref_ret_opt_z_
+
+#define _Deref2_pre_readonly_
+
+#define _Prepost_z_
+#define _Prepost_opt_z_
+
+#define _Prepost_count_(size)
+#define _Prepost_opt_count_(size)
+#define _Prepost_bytecount_(size)
+#define _Prepost_opt_bytecount_(size)
+#define _Prepost_count_c_(size)
+#define _Prepost_opt_count_c_(size)
+#define _Prepost_bytecount_c_(size)
+#define _Prepost_opt_bytecount_c_(size)
+#define _Prepost_count_x_(size)
+#define _Prepost_opt_count_x_(size)
+#define _Prepost_bytecount_x_(size)
+#define _Prepost_opt_bytecount_x_(size)
+
+#define _Prepost_valid_
+#define _Prepost_opt_valid_
+
+#define _Deref_prepost_z_
+#define _Deref_prepost_opt_z_
+
+#define _Deref_prepost_cap_(size)
+#define _Deref_prepost_opt_cap_(size)
+#define _Deref_prepost_bytecap_(size)
+#define _Deref_prepost_opt_bytecap_(size)
+
+#define _Deref_prepost_cap_x_(size)
+#define _Deref_prepost_opt_cap_x_(size)
+#define _Deref_prepost_bytecap_x_(size)
+#define _Deref_prepost_opt_bytecap_x_(size)
+
+#define _Deref_prepost_z_cap_(size)
+#define _Deref_prepost_opt_z_cap_(size)
+#define _Deref_prepost_z_bytecap_(size)
+#define _Deref_prepost_opt_z_bytecap_(size)
+
+#define _Deref_prepost_valid_cap_(size)
+#define _Deref_prepost_opt_valid_cap_(size)
+#define _Deref_prepost_valid_bytecap_(size)
+#define _Deref_prepost_opt_valid_bytecap_(size)
+
+#define _Deref_prepost_valid_cap_x_(size)
+#define _Deref_prepost_opt_valid_cap_x_(size)
+#define _Deref_prepost_valid_bytecap_x_(size)
+#define _Deref_prepost_opt_valid_bytecap_x_(size)
+
+#define _Deref_prepost_count_(size)
+#define _Deref_prepost_opt_count_(size)
+#define _Deref_prepost_bytecount_(size)
+#define _Deref_prepost_opt_bytecount_(size)
+
+#define _Deref_prepost_count_x_(size)
+#define _Deref_prepost_opt_count_x_(size)
+#define _Deref_prepost_bytecount_x_(size)
+#define _Deref_prepost_opt_bytecount_x_(size)
+
+#define _Deref_prepost_valid_
+#define _Deref_prepost_opt_valid_
+
+#define _Deref_out_z_cap_c_(size)
+#define _Deref_inout_z_cap_c_(size)
+#define _Deref_out_z_bytecap_c_(size)
+#define _Deref_inout_z_bytecap_c_(size)
+#define _Deref_inout_z_
+
+#endif
+
+#endif //_H_SuppressSAL
diff --git a/source/UnicodeConversions.cpp b/source/UnicodeConversions.cpp
new file mode 100644
index 0000000..b4de085
--- /dev/null
+++ b/source/UnicodeConversions.cpp
@@ -0,0 +1,1654 @@
+// =================================================================================================
+// Copyright 2004 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 "public/include/XMP_Const.h"
+
+#define UC_Assert(cond) /* Nothing for now, should be XMP_Assert. */
+#define UC_Throw(msg,id)  throw XMP_Error ( id, msg )
+
+#include "source/UnicodeConversions.hpp"
+
+#if SUNOS_SPARC || XMP_IOS_ARM
+	#include "string.h"
+#endif
+
+using namespace std;
+
+// =================================================================================================
+
+// *** Look into using asm inlines, e.g. count-leading bits for multi-byte UTF-8.
+
+CodePoint_to_UTF16_Proc CodePoint_to_UTF16BE = 0;
+CodePoint_to_UTF16_Proc CodePoint_to_UTF16LE = 0;
+
+CodePoint_from_UTF16_Proc CodePoint_from_UTF16BE = 0;
+CodePoint_from_UTF16_Proc CodePoint_from_UTF16LE = 0;
+
+UTF8_to_UTF16_Proc  UTF8_to_UTF16BE = 0;
+UTF8_to_UTF16_Proc  UTF8_to_UTF16LE = 0;
+UTF8_to_UTF32_Proc  UTF8_to_UTF32BE = 0;
+UTF8_to_UTF32_Proc  UTF8_to_UTF32LE = 0;
+
+UTF16_to_UTF8_Proc  UTF16BE_to_UTF8 = 0;
+UTF16_to_UTF8_Proc  UTF16LE_to_UTF8 = 0;
+UTF32_to_UTF8_Proc  UTF32BE_to_UTF8 = 0;
+UTF32_to_UTF8_Proc  UTF32LE_to_UTF8 = 0;
+
+UTF8_to_UTF16_Proc  UTF8_to_UTF16Native = 0;
+UTF8_to_UTF32_Proc  UTF8_to_UTF32Native = 0;
+UTF16_to_UTF8_Proc  UTF16Native_to_UTF8 = 0;
+UTF32_to_UTF8_Proc  UTF32Native_to_UTF8 = 0;
+
+UTF16_to_UTF32_Proc UTF16BE_to_UTF32BE = 0;
+UTF16_to_UTF32_Proc UTF16BE_to_UTF32LE = 0;
+UTF16_to_UTF32_Proc UTF16LE_to_UTF32BE = 0;
+UTF16_to_UTF32_Proc UTF16LE_to_UTF32LE = 0;
+
+UTF32_to_UTF16_Proc UTF32BE_to_UTF16BE = 0;
+UTF32_to_UTF16_Proc UTF32BE_to_UTF16LE = 0;
+UTF32_to_UTF16_Proc UTF32LE_to_UTF16BE = 0;
+UTF32_to_UTF16_Proc UTF32LE_to_UTF16LE = 0;
+
+// -------------------------------------------------------------------------------------------------
+
+static size_t swap32to16Offset = 0;	// Offset to "convert" a swapped UTF32 pointer into a swapped UTF16 pointer.
+
+// -------------------------------------------------------------------------------------------------
+
+static void CodePoint_to_UTF16Nat ( const UTF32Unit cpIn, UTF16Unit * utf16Out, const size_t utf16Len, size_t * utf16Written );
+static void CodePoint_to_UTF16Swp ( const UTF32Unit cpIn, UTF16Unit * utf16Out, const size_t utf16Len, size_t * utf16Written );
+
+static void CodePoint_from_UTF16Nat ( const UTF16Unit * utf16In, const size_t utf16Len, UTF32Unit * cpOut, size_t * utf16Read );
+static void CodePoint_from_UTF16Swp ( const UTF16Unit * utf16In, const size_t utf16Len, UTF32Unit * cpOut, size_t * utf16Read );
+
+// -------------------------------------------------------------------------------------------------
+
+static void UTF8_to_UTF16Nat ( const UTF8Unit *  utf8In,    const size_t utf8Len,
+				               UTF16Unit *       utf16Out,  const size_t utf16Len,
+				               size_t *          utf8Read,  size_t *     utf16Written );
+
+static void UTF8_to_UTF16Swp ( const UTF8Unit *  utf8In,    const size_t utf8Len,
+				               UTF16Unit *       utf16Out,  const size_t utf16Len,
+				               size_t *          utf8Read,  size_t *     utf16Written );
+
+static void UTF8_to_UTF32Nat ( const UTF8Unit *  utf8In,    const size_t utf8Len,
+				               UTF32Unit *       utf32Out,  const size_t utf32Len,
+				               size_t *          utf8Read,  size_t *     utf32Written );
+
+static void UTF8_to_UTF32Swp ( const UTF8Unit *  utf8In,    const size_t utf8Len,
+				               UTF32Unit *       utf32Out,  const size_t utf32Len,
+				               size_t *          utf8Read,  size_t *     utf32Written );
+
+// -------------------------------------------------------------------------------------------------
+
+static void UTF16Nat_to_UTF8 ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf16Read, size_t *     utf8Written );
+
+static void UTF16Swp_to_UTF8 ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf16Read, size_t *     utf8Written );
+
+static void UTF32Nat_to_UTF8 ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf32Read, size_t *     utf8Written );
+
+static void UTF32Swp_to_UTF8 ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf32Read, size_t *     utf8Written );
+
+// -------------------------------------------------------------------------------------------------
+
+static void UTF16Nat_to_UTF32Nat ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written );
+
+static void UTF16Nat_to_UTF32Swp ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written );
+
+static void UTF16Swp_to_UTF32Nat ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written );
+
+static void UTF16Swp_to_UTF32Swp ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written );
+
+// -------------------------------------------------------------------------------------------------
+
+static void UTF32Nat_to_UTF16Nat ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written );
+
+static void UTF32Nat_to_UTF16Swp ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written );
+
+static void UTF32Swp_to_UTF16Nat ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written );
+
+static void UTF32Swp_to_UTF16Swp ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written );
+
+// =================================================================================================
+
+void InitializeUnicodeConversions()
+{
+	UC_Assert ( (sizeof(UTF8Unit) == 1) && (sizeof(UTF16Unit) == 2) && (sizeof(UTF32Unit) == 4) ); 
+
+	UTF16Unit u16  = 0x00FF;
+	bool bigEndian = (*((UTF8Unit*)&u16) == 0);
+
+	UTF8_to_UTF16Native = UTF8_to_UTF16Nat;
+	UTF8_to_UTF32Native = UTF8_to_UTF32Nat;
+	UTF16Native_to_UTF8 = UTF16Nat_to_UTF8;
+	UTF32Native_to_UTF8 = UTF32Nat_to_UTF8;
+	
+	if ( bigEndian ) {
+	
+		swap32to16Offset = 0;
+
+		CodePoint_to_UTF16BE = CodePoint_to_UTF16Nat;
+		CodePoint_to_UTF16LE = CodePoint_to_UTF16Swp;
+
+		CodePoint_from_UTF16BE = CodePoint_from_UTF16Nat;
+		CodePoint_from_UTF16LE = CodePoint_from_UTF16Swp;
+
+		UTF8_to_UTF16BE = UTF8_to_UTF16Nat;
+		UTF8_to_UTF16LE = UTF8_to_UTF16Swp;
+		UTF8_to_UTF32BE = UTF8_to_UTF32Nat;
+		UTF8_to_UTF32LE = UTF8_to_UTF32Swp;
+
+		UTF16BE_to_UTF8 = UTF16Nat_to_UTF8;
+		UTF16LE_to_UTF8 = UTF16Swp_to_UTF8;
+		UTF32BE_to_UTF8 = UTF32Nat_to_UTF8;
+		UTF32LE_to_UTF8 = UTF32Swp_to_UTF8;
+
+		UTF16BE_to_UTF32BE = UTF16Nat_to_UTF32Nat;
+		UTF16BE_to_UTF32LE = UTF16Nat_to_UTF32Swp;
+		UTF16LE_to_UTF32BE = UTF16Swp_to_UTF32Nat;
+		UTF16LE_to_UTF32LE = UTF16Swp_to_UTF32Swp;
+
+		UTF32BE_to_UTF16BE = UTF32Nat_to_UTF16Nat;
+		UTF32BE_to_UTF16LE = UTF32Nat_to_UTF16Swp;
+		UTF32LE_to_UTF16BE = UTF32Swp_to_UTF16Nat;
+		UTF32LE_to_UTF16LE = UTF32Swp_to_UTF16Swp;
+
+	} else {
+	
+		swap32to16Offset = 1;	// ! Offset in UTF16 units!
+
+		CodePoint_to_UTF16BE = CodePoint_to_UTF16Swp;
+		CodePoint_to_UTF16LE = CodePoint_to_UTF16Nat;
+
+		CodePoint_from_UTF16BE = CodePoint_from_UTF16Swp;
+		CodePoint_from_UTF16LE = CodePoint_from_UTF16Nat;
+
+		UTF8_to_UTF16BE = UTF8_to_UTF16Swp;
+		UTF8_to_UTF16LE = UTF8_to_UTF16Nat;
+		UTF8_to_UTF32BE = UTF8_to_UTF32Swp;
+		UTF8_to_UTF32LE = UTF8_to_UTF32Nat;
+
+		UTF16BE_to_UTF8 = UTF16Swp_to_UTF8;
+		UTF16LE_to_UTF8 = UTF16Nat_to_UTF8;
+		UTF32BE_to_UTF8 = UTF32Swp_to_UTF8;
+		UTF32LE_to_UTF8 = UTF32Nat_to_UTF8;
+
+		UTF16BE_to_UTF32BE = UTF16Swp_to_UTF32Swp;
+		UTF16BE_to_UTF32LE = UTF16Swp_to_UTF32Nat;
+		UTF16LE_to_UTF32BE = UTF16Nat_to_UTF32Swp;
+		UTF16LE_to_UTF32LE = UTF16Nat_to_UTF32Nat;
+
+		UTF32BE_to_UTF16BE = UTF32Swp_to_UTF16Swp;
+		UTF32BE_to_UTF16LE = UTF32Swp_to_UTF16Nat;
+		UTF32LE_to_UTF16BE = UTF32Nat_to_UTF16Swp;
+		UTF32LE_to_UTF16LE = UTF32Nat_to_UTF16Nat;
+
+	}
+
+}	// InitializeUnicodeConversions
+
+// =================================================================================================
+
+#if SUNOS_SPARC || XMP_IOS_ARM
+	#define DefineAndGetValue(type,inPtr) type inUnit; memcpy ( &inUnit, inPtr, sizeof(type) ); 
+#else
+	#define DefineAndGetValue(type,inPtr) type inUnit = *((type *)inPtr); 
+#endif
+
+static inline UTF16Unit UTF16InSwap ( const void * inPtr )
+{
+	DefineAndGetValue ( UTF16Unit, inPtr );
+	return (inUnit << 8) | (inUnit >> 8);
+}
+static inline UTF32Unit UTF32InSwap ( const void * inPtr )
+{
+	DefineAndGetValue ( UTF32Unit, inPtr );
+	return (inUnit << 24) | ((inUnit << 8) & 0x00FF0000) | ((inUnit >> 8) & 0x0000FF00) | (inUnit >> 24);
+}
+
+static inline void UTF16OutSwap ( UTF16Unit * outPtr, const UTF16Unit value )
+{
+	UTF16Unit outUnit = (value << 8) | (value >> 8);
+	*outPtr = outUnit;
+}
+
+static inline void UTF32OutSwap ( UTF32Unit * outPtr, const UTF32Unit value )
+{
+	UTF32Unit outUnit = (value << 24) | ((value << 8) & 0x00FF0000) | ((value >> 8) & 0x0000FF00) | (value >> 24);
+	*outPtr = outUnit;
+}
+
+// =================================================================================================
+
+void SwapUTF16 ( const UTF16Unit * utf16In, UTF16Unit * utf16Out, const size_t utf16Len )
+{
+	for ( size_t i = 0; i < utf16Len; ++i ) utf16Out[i] = UTF16InSwap(utf16In+i);
+}
+
+void SwapUTF32 ( const UTF32Unit * utf32In, UTF32Unit * utf32Out, const size_t utf32Len ) {
+	for ( size_t i = 0; i < utf32Len; ++i ) utf32Out[i] = UTF32InSwap(utf32In+i);
+}
+
+// =================================================================================================
+
+extern void ToUTF16 ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf16Str, bool bigEndian )
+{
+	UTF8_to_UTF16_Proc Converter = UTF8_to_UTF16LE;
+	if ( bigEndian ) Converter = UTF8_to_UTF16BE;
+	
+	enum { kBufferSize = 8*1024 };
+	UTF16Unit u16Buffer[kBufferSize];	// 16K bytes
+	size_t readCount, writeCount;
+
+	utf16Str->erase();
+	utf16Str->reserve ( 2*utf8Len );	// As good a guess as any.
+	
+	while ( utf8Len > 0 ) {
+		Converter ( utf8In, utf8Len, u16Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf16Str->append ( (const char *)u16Buffer, writeCount*2 );
+		utf8In  += readCount;
+		utf8Len -= readCount;
+	}
+
+}	// ToUTF16
+
+// =================================================================================================
+
+extern void ToUTF16Native ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf16Str )
+{
+	enum { kBufferSize = 8*1024 };
+	UTF16Unit u16Buffer[kBufferSize];	// 16K bytes
+	size_t readCount, writeCount;
+
+	utf16Str->erase();
+	utf16Str->reserve ( 2*utf8Len );	// As good a guess as any.
+	
+	while ( utf8Len > 0 ) {
+		UTF8_to_UTF16Nat ( utf8In, utf8Len, u16Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf16Str->append ( (const char *)u16Buffer, writeCount*2 );
+		utf8In  += readCount;
+		utf8Len -= readCount;
+	}
+
+}	// ToUTF16Native
+
+// =================================================================================================
+
+extern void ToUTF32 ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf32Str, bool bigEndian )
+{
+	UTF8_to_UTF32_Proc Converter = UTF8_to_UTF32LE;
+	if ( bigEndian ) Converter = UTF8_to_UTF32BE;
+	
+	enum { kBufferSize = 4*1024 };
+	UTF32Unit u32Buffer[kBufferSize];	// 16K bytes
+	size_t readCount, writeCount;
+
+	utf32Str->erase();
+	utf32Str->reserve ( 4*utf8Len );	// As good a guess as any.
+	
+	while ( utf8Len > 0 ) {
+		Converter ( utf8In, utf8Len, u32Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf32Str->append ( (const char *)u32Buffer, writeCount*4 );
+		utf8In  += readCount;
+		utf8Len -= readCount;
+	}
+
+}	// ToUTF32
+
+// =================================================================================================
+
+extern void ToUTF32Native ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf32Str )
+{
+	enum { kBufferSize = 4*1024 };
+	UTF32Unit u32Buffer[kBufferSize];	// 16K bytes
+	size_t readCount, writeCount;
+
+	utf32Str->erase();
+	utf32Str->reserve ( 4*utf8Len );	// As good a guess as any.
+	
+	while ( utf8Len > 0 ) {
+		UTF8_to_UTF32Nat ( utf8In, utf8Len, u32Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf32Str->append ( (const char *)u32Buffer, writeCount*4 );
+		utf8In  += readCount;
+		utf8Len -= readCount;
+	}
+
+}	// ToUTF32Native
+
+// =================================================================================================
+
+extern void FromUTF16 ( const UTF16Unit * utf16In, size_t utf16Len, std::string * utf8Str, bool bigEndian )
+{
+	UTF16_to_UTF8_Proc Converter = UTF16LE_to_UTF8;
+	if ( bigEndian ) Converter = UTF16BE_to_UTF8;
+	
+	enum { kBufferSize = 16*1024 };
+	UTF8Unit u8Buffer[kBufferSize];
+	size_t readCount, writeCount;
+
+	utf8Str->erase();
+	utf8Str->reserve ( 2*utf16Len );	// As good a guess as any.
+	
+	while ( utf16Len > 0 ) {
+		Converter ( utf16In, utf16Len, u8Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf8Str->append ( (const char *)u8Buffer, writeCount );
+		utf16In  += readCount;
+		utf16Len -= readCount;
+	}
+
+}	// FromUTF16
+
+// =================================================================================================
+
+extern void FromUTF16Native ( const UTF16Unit * utf16In, size_t utf16Len, std::string * utf8Str )
+{
+	enum { kBufferSize = 16*1024 };
+	UTF8Unit u8Buffer[kBufferSize];
+	size_t readCount, writeCount;
+
+	utf8Str->erase();
+	utf8Str->reserve ( 2*utf16Len );	// As good a guess as any.
+	
+	while ( utf16Len > 0 ) {
+		UTF16Nat_to_UTF8 ( utf16In, utf16Len, u8Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf8Str->append ( (const char *)u8Buffer, writeCount );
+		utf16In  += readCount;
+		utf16Len -= readCount;
+	}
+
+}	// FromUTF16Native
+
+// =================================================================================================
+
+extern void FromUTF32 ( const UTF32Unit * utf32In, size_t utf32Len, std::string * utf8Str, bool bigEndian )
+{
+	UTF32_to_UTF8_Proc Converter = UTF32LE_to_UTF8;
+	if ( bigEndian ) Converter = UTF32BE_to_UTF8;
+	
+	enum { kBufferSize = 16*1024 };
+	UTF8Unit u8Buffer[kBufferSize];
+	size_t readCount, writeCount;
+
+	utf8Str->erase();
+	utf8Str->reserve ( 2*utf32Len );	// As good a guess as any.
+	
+	while ( utf32Len > 0 ) {
+		Converter ( utf32In, utf32Len, u8Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf8Str->append ( (const char *)u8Buffer, writeCount );
+		utf32In  += readCount;
+		utf32Len -= readCount;
+	}
+
+}	// FromUTF32
+
+// =================================================================================================
+
+extern void FromUTF32Native ( const UTF32Unit * utf32In, size_t utf32Len, std::string * utf8Str )
+{
+	enum { kBufferSize = 16*1024 };
+	UTF8Unit u8Buffer[kBufferSize];
+	size_t readCount, writeCount;
+
+	utf8Str->erase();
+	utf8Str->reserve ( 2*utf32Len );	// As good a guess as any.
+	
+	while ( utf32Len > 0 ) {
+		UTF32Nat_to_UTF8 ( utf32In, utf32Len, u8Buffer, kBufferSize, &readCount, &writeCount );
+		if ( writeCount == 0 ) UC_Throw ( "Incomplete Unicode at end of string", kXMPErr_BadXML );
+		utf8Str->append ( (const char *)u8Buffer, writeCount );
+		utf32In  += readCount;
+		utf32Len -= readCount;
+	}
+
+}	// FromUTF32Native
+
+// =================================================================================================
+
+static void CodePoint_to_UTF8_Multi ( const UTF32Unit cpIn, UTF8Unit * utf8Out, const size_t utf8Len, size_t * utf8Written )
+{
+	size_t unitCount = 0;
+	
+	if ( cpIn > 0x10FFFF ) UC_Throw ( "Bad UTF-32 - out of range", kXMPErr_BadParam );
+	if ( (0xD800 <= cpIn) && (cpIn <= 0xDFFF) ) UC_Throw ( "Bad UTF-32 - surrogate code point", kXMPErr_BadParam );
+	
+	// Compute the number of bytes using 6 data bits each. Then see if the highest order bits will
+	// fit into the leading byte. Write the UTF-8 sequence if there is enough room.
+	
+	UTF32Unit temp, mask;
+	size_t bytesNeeded = 0;
+	for ( temp = cpIn; temp != 0; temp = temp >> 6 ) ++bytesNeeded;
+	
+	temp = cpIn >> ((bytesNeeded-1)*6);	// The highest order data bits.
+	mask = (0x80 >> bytesNeeded) - 1;	// Available data bits in the leading byte.
+	if ( temp > mask ) ++bytesNeeded;
+
+	if ( bytesNeeded > utf8Len ) goto Done;	// Not enough room for the output.
+	unitCount = bytesNeeded;
+	
+	temp = cpIn;
+	for ( --bytesNeeded; bytesNeeded > 0; --bytesNeeded ) {
+		utf8Out[bytesNeeded] = 0x80 | UTF8Unit ( temp & 0x3F );
+		temp = temp >> 6;
+	}
+	
+	mask = ~((1 << (8-unitCount)) - 1);
+	utf8Out[0] = UTF8Unit ( mask | temp );
+
+Done:
+	*utf8Written = unitCount;
+	return;
+	
+}	// CodePoint_to_UTF8_Multi
+
+// =================================================================================================
+
+void CodePoint_to_UTF8 ( const UTF32Unit cpIn, UTF8Unit * utf8Out, const size_t utf8Len, size_t * utf8Written )
+{
+	size_t unitCount = 0;
+
+	UC_Assert ( (utf8Out != 0) && (utf8Written != 0) );
+	if ( utf8Len == 0 ) goto Done;
+	if ( cpIn > 0x7F ) goto MultiByte;	// ! Force linear execution path for ASCII.
+
+	unitCount = 1;
+	*utf8Out = UTF8Unit(cpIn);
+
+Done:
+	*utf8Written = unitCount;
+	return;
+	
+MultiByte:
+	 CodePoint_to_UTF8_Multi( cpIn, utf8Out, utf8Len, utf8Written );
+	 return;
+	
+}	// CodePoint_to_UTF8
+
+// =================================================================================================
+
+static void CodePoint_from_UTF8_Multi ( const UTF8Unit * utf8In, const size_t utf8Len, UTF32Unit * cpOut, size_t * utf8Read )
+{
+	UTF8Unit  inUnit = *utf8In;
+	size_t    unitCount = 0;
+	UTF32Unit cp;	// ! Avoid gcc complaints about declarations after goto's.
+	const UTF8Unit * utf8Pos;
+
+	// -------------------------------------------------------------------------------------
+	// We've got a multibyte UTF-8 character. The first byte has the number of bytes and the
+	// highest order data bits. The other bytes each add 6 more data bits.
+	
+	#if 0	// This might be a more effcient way to count the bytes.
+		static XMP_Uns8 kByteCounts[16] = { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 2, 2, 3, 4 };
+		size_t bytesNeeded = kByteCounts [ inUnit >> 4 ];
+		if ( (bytesNeeded < 2) || ((bytesNeeded == 4) && ((inUnit & 0x08) != 0)) ) {
+			UC_Throw ( "Invalid UTF-8 sequence length", kXMPErr_BadParam );
+		}
+	#endif
+
+	size_t bytesNeeded = 0;	// Count the leading 1 bits in the first byte.
+	for ( UTF8Unit temp = inUnit; temp > 0x7F; temp = temp << 1 ) ++bytesNeeded;
+		// *** Consider CPU-specific assembly inline, e.g. cntlzw on PowerPC.
+	
+	if ( (bytesNeeded < 2) || (bytesNeeded > 4) ) UC_Throw ( "Invalid UTF-8 sequence length", kXMPErr_BadParam );
+	if ( bytesNeeded > utf8Len ) goto Done;	// Not enough input in this buffer.
+	unitCount = bytesNeeded;
+	
+	cp = inUnit & ((1 << (7-unitCount)) - 1);	// Isolate the initial data bits in the bottom of cp.
+	
+	utf8Pos = utf8In + 1;	// We've absorbed the first byte.
+	for ( --bytesNeeded; bytesNeeded > 0; --bytesNeeded, ++utf8Pos ) {
+		inUnit = *utf8Pos;
+		if ( (inUnit & UTF8Unit(0xC0)) != UTF8Unit(0x80) ) UC_Throw ( "Invalid UTF-8 data byte", kXMPErr_BadParam );
+		cp = (cp << 6) | (inUnit & 0x3F);
+	}
+	
+	if ( cp >= 0xD800 ) {	// Skip the next comparisons most of the time.
+		if ( (0xD800 <= cp) && (cp <= 0xDFFF) ) UC_Throw ( "Bad UTF-8 - surrogate code point", kXMPErr_BadParam );
+		if ( cp > 0x10FFFF ) UC_Throw ( "Bad UTF-8 - out of range", kXMPErr_BadParam );
+	}
+	
+	*cpOut = cp;	// ! Don't put after Done, don't write if no input.
+	
+Done:	
+	*utf8Read = unitCount;
+	return;
+	
+}	// CodePoint_from_UTF8_Multi
+
+// =================================================================================================
+
+void CodePoint_from_UTF8 ( const UTF8Unit * utf8In, const size_t utf8Len, UTF32Unit * cpOut, size_t * utf8Read )
+{
+	UTF8Unit inUnit;	// ! Don't read until we know there is input.
+	size_t unitCount = 0;
+
+	UC_Assert ( (utf8In != 0) && (cpOut != 0) && (utf8Read != 0) );
+	if ( utf8Len == 0 ) goto Done;
+	inUnit = *utf8In;
+	if ( inUnit >= 0x80 ) goto MultiByte;	// ! Force linear execution path for ASCII.
+	
+	unitCount = 1;
+	*cpOut = inUnit;	// ! Don't put after Done, don't write if no input.
+	
+Done:	
+	*utf8Read = unitCount;
+	return;
+
+MultiByte:
+	CodePoint_from_UTF8_Multi ( utf8In, utf8Len, cpOut, utf8Read );
+	return;
+	
+}	// CodePoint_from_UTF8
+
+// =================================================================================================
+
+static void CodePoint_to_UTF16Nat_Surrogate ( const UTF32Unit cpIn, UTF16Unit * utf16Out, const size_t utf16Len, size_t * utf16Written )
+{
+	size_t    unitCount = 0;
+	UTF32Unit temp;	// ! Avoid gcc complaints about declarations after goto's.
+
+	if ( cpIn > 0x10FFFF ) UC_Throw ( "Bad UTF-32 - out of range", kXMPErr_BadParam );
+	if ( utf16Len < 2 ) goto Done;	// Not enough room for the output.
+
+	unitCount = 2;
+	temp = cpIn - 0x10000;
+	utf16Out[0] = 0xD800 | UTF16Unit ( temp >> 10 );
+	utf16Out[1] = 0xDC00 | UTF16Unit ( temp & 0x3FF );
+	
+Done:
+	*utf16Written = unitCount;
+	return;
+	
+}	// CodePoint_to_UTF16Nat_Surrogate
+
+// =================================================================================================
+
+static void CodePoint_to_UTF16Nat ( const UTF32Unit cpIn, UTF16Unit * utf16Out, const size_t utf16Len, size_t * utf16Written )
+{
+	size_t unitCount = 0;
+
+	UC_Assert ( (utf16Out != 0) && (utf16Written != 0) );	
+	if ( utf16Len == 0 ) goto Done;
+	if ( cpIn >= 0xD800 ) goto CheckSurrogate;	// ! Force linear execution path for the BMP.
+
+InBMP:	
+	unitCount = 1;
+	*utf16Out = UTF16Unit(cpIn);
+	
+Done:
+	*utf16Written = unitCount;
+	return;
+
+CheckSurrogate:
+	if ( cpIn > 0xFFFF ) goto SurrogatePair;
+	if ( cpIn > 0xDFFF ) goto InBMP;
+	UC_Throw ( "Bad UTF-32 - surrogate code point", kXMPErr_BadParam );
+	
+SurrogatePair:
+	CodePoint_to_UTF16Nat_Surrogate ( cpIn, utf16Out, utf16Len, utf16Written );
+	return;
+	
+}	// CodePoint_to_UTF16Nat
+
+// =================================================================================================
+
+static void CodePoint_from_UTF16Nat_Surrogate ( const UTF16Unit * utf16In, const size_t utf16Len, UTF32Unit * cpOut, size_t * utf16Read )
+{
+	UTF16Unit hiUnit = *utf16In;
+	size_t    unitCount = 0;
+	UTF16Unit loUnit;	// ! Avoid gcc complaints about declarations after goto's.
+	UTF32Unit cp;
+
+	// ----------------------------------
+	// We've got a UTF-16 surrogate pair.
+
+	if ( hiUnit > 0xDBFF ) UC_Throw ( "Bad UTF-16 - leading low surrogate", kXMPErr_BadParam );
+	if ( utf16Len < 2 ) goto Done;	// Not enough input in this buffer.
+	
+	loUnit  = *(utf16In+1);
+	if ( (loUnit < 0xDC00) || (0xDFFF < loUnit) ) UC_Throw ( "Bad UTF-16 - missing low surrogate", kXMPErr_BadParam );
+	
+	unitCount = 2;
+	cp = (((hiUnit & 0x3FF) << 10) | (loUnit & 0x3FF)) + 0x10000;
+
+	*cpOut = cp;	// ! Don't put after Done, don't write if no input.
+	
+Done:
+	*utf16Read = unitCount;
+	return;
+	
+}	// CodePoint_from_UTF16Nat_Surrogate
+
+// =================================================================================================
+
+static void CodePoint_from_UTF16Nat ( const UTF16Unit * utf16In, const size_t utf16Len, UTF32Unit * cpOut, size_t * utf16Read )
+{
+	UTF16Unit inUnit;	// ! Don't read until we know there is input.
+	size_t unitCount = 0;
+
+	UC_Assert ( (utf16In != 0) && (cpOut != 0) && (utf16Read != 0) );
+	if ( utf16Len == 0 ) goto Done;
+	inUnit = *utf16In;
+	if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) goto SurrogatePair;	// ! Force linear execution path for the BMP.
+
+	unitCount = 1;
+	*cpOut = inUnit;	// ! Don't put after Done, don't write if no input.
+	
+Done:
+	*utf16Read = unitCount;
+	return;
+
+SurrogatePair:
+	CodePoint_from_UTF16Nat_Surrogate ( utf16In, utf16Len, cpOut, utf16Read );
+	return;
+	
+}	// CodePoint_from_UTF16Nat
+
+// =================================================================================================
+
+static void UTF8_to_UTF16Nat ( const UTF8Unit * utf8In,   const size_t utf8Len,
+				               UTF16Unit *      utf16Out, const size_t utf16Len,
+				               size_t *         utf8Read, size_t *     utf16Written )
+{
+	const UTF8Unit * utf8Pos  = utf8In;
+	UTF16Unit *      utf16Pos = utf16Out;
+	
+	size_t utf8Left  = utf8Len;
+	size_t utf16Left = utf16Len;
+	
+	UC_Assert ( (utf8In != 0) && (utf16Out != 0) && (utf8Read != 0) && (utf16Written != 0) );
+	
+	while ( (utf8Left > 0) && (utf16Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf8Left;
+		if ( limit > utf16Left ) limit = utf16Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit > 0x7F ) break;
+			*utf16Pos = inUnit;
+			++utf8Pos;
+			++utf16Pos;
+		}
+		utf8Left  -= i;
+		utf16Left -= i;
+		
+		// Do a run of non-ASCII, it copies multiple input units into 1 or 2 output units.
+		while ( (utf8Left > 0) && (utf16Left > 0) ) {
+			UTF32Unit cp;
+			size_t len8, len16;
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit <= 0x7F ) break;
+			CodePoint_from_UTF8_Multi ( utf8Pos, utf8Left, &cp, &len8 );
+			if ( len8 == 0 ) goto Done;		// The input buffer ends in the middle of a character.
+			if ( cp <= 0xFFFF ) {
+				*utf16Pos = UTF16Unit(cp);
+				len16 = 1;
+			} else {
+				CodePoint_to_UTF16Nat_Surrogate ( cp, utf16Pos, utf16Left, &len16 );
+				if ( len16 == 0 ) goto Done;	// Not enough room in the output buffer.
+			}
+			utf8Left  -= len8;
+			utf8Pos   += len8;
+			utf16Left -= len16;
+			utf16Pos  += len16;
+		}
+	
+	}
+
+Done:	// Set the output lengths.
+	*utf8Read = utf8Len - utf8Left;
+	*utf16Written = utf16Len - utf16Left;
+	
+}	// UTF8_to_UTF16Nat
+
+// =================================================================================================
+
+static void UTF8_to_UTF32Nat ( const UTF8Unit *  utf8In,   const size_t utf8Len,
+				               UTF32Unit *       utf32Out, const size_t utf32Len,
+				               size_t *          utf8Read, size_t *     utf32Written )
+{
+	const UTF8Unit * utf8Pos  = utf8In;
+	UTF32Unit *      utf32Pos = utf32Out;
+	
+	size_t utf8Left  = utf8Len;
+	size_t utf32Left = utf32Len;
+	
+	UC_Assert ( (utf8In != 0) && (utf32Out != 0) && (utf8Read != 0) && (utf32Written != 0) );
+	
+	while ( (utf8Left > 0) && (utf32Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf8Left;
+		if ( limit > utf32Left ) limit = utf32Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit > 0x7F ) break;
+			*utf32Pos = inUnit;
+			++utf8Pos;
+			++utf32Pos;
+		}
+		utf8Left -= i;
+		utf32Left -= i;
+		
+		// Do a run of non-ASCII, it copies variable input into 1 output unit.
+		while ( (utf8Left > 0) && (utf32Left > 0) ) {
+			size_t len;
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit <= 0x7F ) break;
+			CodePoint_from_UTF8_Multi ( utf8Pos, utf8Left, utf32Pos, &len );
+			if ( len == 0 ) goto Done;	// The input buffer ends in the middle of a character.
+			utf8Left  -= len;
+			utf8Pos   += len;
+			utf32Left -= 1;
+			utf32Pos  += 1;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf8Read = utf8Len - utf8Left;
+	*utf32Written = utf32Len - utf32Left;
+	
+}	// UTF8_to_UTF32Nat
+
+// =================================================================================================
+
+static void UTF16Nat_to_UTF8 ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf16Read, size_t *     utf8Written )
+{
+	const UTF16Unit * utf16Pos = utf16In;
+	UTF8Unit *        utf8Pos  = utf8Out;
+	
+	size_t utf16Left = utf16Len;
+	size_t utf8Left  = utf8Len;
+	
+	UC_Assert ( (utf16In != 0) && (utf8Out != 0) && (utf16Read != 0) && (utf8Written != 0) );
+	
+	while ( (utf16Left > 0) && (utf8Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf16Left;
+		if ( limit > utf8Left ) limit = utf8Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF16Unit inUnit = *utf16Pos;
+			if ( inUnit > 0x7F ) break;
+			*utf8Pos = UTF8Unit(inUnit);
+			++utf16Pos;
+			++utf8Pos;
+		}
+		utf16Left -= i;
+		utf8Left  -= i;
+		
+		// Do a run of non-ASCII inside the BMP, it copies 1 input unit into multiple output units.
+		while ( (utf16Left > 0) && (utf8Left > 0) ) {
+			size_t len8;
+			UTF16Unit inUnit = *utf16Pos;
+			if ( inUnit <= 0x7F ) break;
+			if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) break;
+			CodePoint_to_UTF8_Multi ( inUnit, utf8Pos, utf8Left, &len8 );
+			if ( len8 == 0 ) goto Done;		// Not enough room in the output buffer.
+			utf16Left -= 1;
+			utf16Pos  += 1;
+			utf8Left  -= len8;
+			utf8Pos   += len8;
+		}
+		
+		// Do a run of surrogate pairs, it copies 2 input units into multiple output units.
+		while ( (utf16Left > 0) && (utf8Left > 0) ) {
+			UTF32Unit cp;
+			size_t len16, len8;
+			UTF16Unit inUnit = *utf16Pos;
+			if ( (inUnit < 0xD800) || (0xDFFF < inUnit) ) break;
+			CodePoint_from_UTF16Nat_Surrogate ( utf16Pos, utf16Left, &cp, &len16 );
+			if ( len16 == 0 ) goto Done;	// The input buffer ends in the middle of a surrogate pair.
+			UC_Assert ( len16 == 2 );
+			CodePoint_to_UTF8_Multi ( cp, utf8Pos, utf8Left, &len8 );
+			if ( len8 == 0 ) goto Done;		// Not enough room in the output buffer.
+			utf16Left -= len16;
+			utf16Pos  += len16;
+			utf8Left  -= len8;
+			utf8Pos   += len8;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf16Read = utf16Len - utf16Left;
+	*utf8Written = utf8Len - utf8Left;
+	
+}	// UTF16Nat_to_UTF8
+
+// =================================================================================================
+
+static void UTF32Nat_to_UTF8 ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf32Read, size_t *     utf8Written )
+{
+	const UTF32Unit * utf32Pos = utf32In;
+	UTF8Unit *        utf8Pos  = utf8Out;
+	
+	size_t utf32Left = utf32Len;
+	size_t utf8Left  = utf8Len;
+	
+	UC_Assert ( (utf32In != 0) && (utf8Out != 0) && (utf32Read != 0) && (utf8Written != 0) );
+	
+	while ( (utf32Left > 0) && (utf8Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf32Left;
+		if ( limit > utf8Left ) limit = utf8Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF32Unit inUnit = *utf32Pos;
+			if ( inUnit > 0x7F ) break;
+			*utf8Pos = UTF8Unit(inUnit);
+			++utf32Pos;
+			++utf8Pos;
+		}
+		utf32Left -= i;
+		utf8Left  -= i;
+		
+		// Do a run of non-ASCII, it copies 1 input unit into multiple output units.
+		while ( (utf32Left > 0) && (utf8Left > 0) ) {
+			size_t len;
+			UTF32Unit inUnit = *utf32Pos;
+			if ( inUnit <= 0x7F ) break;
+			CodePoint_to_UTF8_Multi ( inUnit, utf8Pos, utf8Left, &len );
+			if ( len == 0 ) goto Done;	// Not enough room in the output buffer.
+			utf32Left -= 1;
+			utf32Pos  += 1;
+			utf8Left  -= len;
+			utf8Pos   += len;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf32Read = utf32Len - utf32Left;
+	*utf8Written = utf8Len - utf8Left;
+	
+}	// UTF32Nat_to_UTF8
+
+// =================================================================================================
+
+static void UTF16Nat_to_UTF32Nat ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written )
+{
+	const UTF16Unit * utf16Pos = utf16In;
+	UTF32Unit *       utf32Pos = utf32Out;
+	
+	size_t utf16Left = utf16Len;
+	size_t utf32Left = utf32Len;
+	
+	UC_Assert ( (utf16In != 0) && (utf32Out != 0) && (utf16Read != 0) && (utf32Written != 0) );
+	
+	while ( (utf16Left > 0) && (utf32Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf16Left;
+		if ( limit > utf32Left ) limit = utf32Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF16Unit inUnit = *utf16Pos;
+			if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) break;
+			*utf32Pos = inUnit;
+			++utf16Pos;
+			++utf32Pos;
+		}
+		utf16Left -= i;
+		utf32Left -= i;
+		
+		// Do a run of surrogate pairs, it copies 2 input units into 1 output unit.
+		while ( (utf16Left > 0) && (utf32Left > 0) ) {
+			size_t len;
+			UTF16Unit inUnit = *utf16Pos;
+			if ( (inUnit < 0xD800) || (0xDFFF < inUnit) ) break;
+			CodePoint_from_UTF16Nat_Surrogate ( utf16Pos, utf16Left, utf32Pos, &len );
+			if ( len == 0 ) goto Done;	// The input buffer ends in the middle of a surrogate pair.
+			UC_Assert ( len == 2 );
+			utf16Left -= len;
+			utf16Pos  += len;
+			utf32Left -= 1;
+			utf32Pos  += 1;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf16Read = utf16Len - utf16Left;
+	*utf32Written = utf32Len - utf32Left;
+	
+}	// UTF16Nat_to_UTF32Nat
+
+// =================================================================================================
+
+static void UTF32Nat_to_UTF16Nat ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written )
+{
+	const UTF32Unit * utf32Pos = utf32In;
+	UTF16Unit *       utf16Pos = utf16Out;
+	
+	size_t utf32Left = utf32Len;
+	size_t utf16Left = utf16Len;
+	
+	UC_Assert ( (utf32In != 0) && (utf16Out != 0) && (utf32Read != 0) && (utf16Written != 0) );
+	
+	while ( (utf32Left > 0) && (utf16Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf32Left;
+		if ( limit > utf16Left ) limit = utf16Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF32Unit inUnit = *utf32Pos;
+			if ( inUnit > 0xFFFF ) break;
+			*utf16Pos = UTF16Unit(inUnit);
+			++utf32Pos;
+			++utf16Pos;
+		}
+		utf32Left -= i;
+		utf16Left -= i;
+		
+		// Do a run of non-BMP, it copies 1 input unit into 2 output units.
+		while ( (utf32Left > 0) && (utf16Left > 0) ) {
+			size_t len;
+			UTF32Unit inUnit = *utf32Pos;
+			if ( inUnit <= 0xFFFF ) break;
+			CodePoint_to_UTF16Nat_Surrogate ( inUnit, utf16Pos, utf16Left, &len );
+			if ( len == 0 ) goto Done;	// Not enough room in the output buffer.
+			UC_Assert ( len == 2 );
+			utf32Left -= 1;
+			utf32Pos  += 1;
+			utf16Left -= 2;
+			utf16Pos  += 2;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf32Read = utf32Len - utf32Left;
+	*utf16Written = utf16Len - utf16Left;
+	
+}	// UTF32Nat_to_UTF16Nat
+
+// =================================================================================================
+
+static void CodePoint_to_UTF16Swp_Surrogate ( const UTF32Unit cpIn, UTF16Unit * utf16Out, const size_t utf16Len, size_t * utf16Written )
+{
+	size_t unitCount = 0;
+	UTF32Unit temp;	// ! Avoid gcc complaints about declarations after goto's.
+
+	if ( cpIn > 0x10FFFF ) UC_Throw ( "Bad UTF-32 - out of range", kXMPErr_BadParam );
+	if ( utf16Len < 2 ) goto Done;	// Not enough room for the output.
+
+	unitCount = 2;
+	temp = cpIn - 0x10000;
+	UTF16OutSwap ( &utf16Out[0], (0xD800 | UTF16Unit ( temp >> 10 )) );
+	UTF16OutSwap ( &utf16Out[1], (0xDC00 | UTF16Unit ( temp & 0x3FF)) );
+	
+Done:
+	*utf16Written = unitCount;
+	return;
+	
+}	// CodePoint_to_UTF16Swp_Surrogate
+
+// =================================================================================================
+
+static void CodePoint_to_UTF16Swp ( const UTF32Unit cpIn, UTF16Unit * utf16Out, const size_t utf16Len, size_t * utf16Written )
+{
+	size_t unitCount = 0;
+
+	UC_Assert ( (utf16Out != 0) && (utf16Written != 0) );	
+	if ( utf16Len == 0 ) goto Done;
+	if ( cpIn >= 0xD800 ) goto CheckSurrogate;	// ! Force linear execution path for the BMP.
+
+InBMP:	
+	unitCount = 1;
+	UTF16OutSwap ( utf16Out, UTF16Unit(cpIn) );
+	
+Done:
+	*utf16Written = unitCount;
+	return;
+
+CheckSurrogate:
+	if ( cpIn > 0xFFFF ) goto SurrogatePair;
+	if ( cpIn > 0xDFFF ) goto InBMP;
+	UC_Throw ( "Bad UTF-32 - surrogate code point", kXMPErr_BadParam );
+	
+SurrogatePair:
+	CodePoint_to_UTF16Swp_Surrogate ( cpIn, utf16Out, utf16Len, utf16Written );
+	return;
+	
+}	// CodePoint_to_UTF16Swp
+
+// =================================================================================================
+
+static void CodePoint_from_UTF16Swp_Surrogate ( const UTF16Unit * utf16In, const size_t utf16Len, UTF32Unit * cpOut, size_t * utf16Read )
+{
+	UTF16Unit hiUnit = UTF16InSwap(utf16In);
+	size_t unitCount = 0;
+	UTF16Unit loUnit;	// ! Avoid gcc complaints about declarations after goto's.
+	UTF32Unit cp;
+
+	// ----------------------------------
+	// We've got a UTF-16 surrogate pair.
+
+	if ( hiUnit > 0xDBFF ) UC_Throw ( "Bad UTF-16 - leading low surrogate", kXMPErr_BadParam );
+	if ( utf16Len < 2 ) goto Done;	// Not enough input in this buffer.
+	
+	loUnit  = UTF16InSwap(utf16In+1);
+	if ( (loUnit < 0xDC00) || (0xDFFF < loUnit) ) UC_Throw ( "Bad UTF-16 - missing low surrogate", kXMPErr_BadParam );
+	
+	unitCount = 2;
+	cp = (((hiUnit & 0x3FF) << 10) | (loUnit & 0x3FF)) + 0x10000;
+
+	*cpOut = cp;	// ! Don't put after Done, don't write if no input.
+	
+Done:
+	*utf16Read = unitCount;
+	return;
+	
+}	// CodePoint_from_UTF16Swp_Surrogate
+
+// =================================================================================================
+
+static void CodePoint_from_UTF16Swp ( const UTF16Unit * utf16In, const size_t utf16Len, UTF32Unit * cpOut, size_t * utf16Read )
+{
+	UTF16Unit inUnit;	// ! Don't read until we know there is input.
+	size_t unitCount = 0;
+
+	UC_Assert ( (utf16In != 0) && (cpOut != 0) && (utf16Read != 0) );
+	if ( utf16Len == 0 ) goto Done;
+	inUnit = UTF16InSwap(utf16In);
+	if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) goto SurrogatePair;	// ! Force linear execution path for the BMP.
+
+	unitCount = 1;
+	*cpOut = inUnit;	// ! Don't put after Done, don't write if no input.
+	
+Done:
+	*utf16Read = unitCount;
+	return;
+
+SurrogatePair:
+	CodePoint_from_UTF16Swp_Surrogate ( utf16In, utf16Len, cpOut, utf16Read );
+	return;
+	
+}	// CodePoint_from_UTF16Swp
+
+// =================================================================================================
+
+static void UTF8_to_UTF16Swp ( const UTF8Unit * utf8In,   const size_t utf8Len,
+				               UTF16Unit *      utf16Out, const size_t utf16Len,
+				               size_t *         utf8Read, size_t *     utf16Written )
+{
+	const UTF8Unit * utf8Pos  = utf8In;
+	UTF16Unit *      utf16Pos = utf16Out;
+	
+	size_t utf8Left  = utf8Len;
+	size_t utf16Left = utf16Len;
+	
+	UC_Assert ( (utf8In != 0) && (utf16Out != 0) && (utf8Read != 0) && (utf16Written != 0) );
+	
+	while ( (utf8Left > 0) && (utf16Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf8Left;
+		if ( limit > utf16Left ) limit = utf16Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit > 0x7F ) break;
+			*utf16Pos = UTF16Unit(inUnit) << 8;	// Better than: UTF16OutSwap ( utf16Pos, inUnit );
+			++utf8Pos;
+			++utf16Pos;
+		}
+		utf8Left  -= i;
+		utf16Left -= i;
+		
+		// Do a run of non-ASCII, it copies multiple input units into 1 or 2 output units.
+		while ( (utf8Left > 0) && (utf16Left > 0) ) {
+			UTF32Unit cp;
+			size_t len8, len16;
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit <= 0x7F ) break;
+			CodePoint_from_UTF8_Multi ( utf8Pos, utf8Left, &cp, &len8 );
+			if ( len8 == 0 ) goto Done;		// The input buffer ends in the middle of a character.
+			if ( cp <= 0xFFFF ) {
+				UTF16OutSwap ( utf16Pos, UTF16Unit(cp) );
+				len16 = 1;
+			} else {
+				CodePoint_to_UTF16Swp_Surrogate ( cp, utf16Pos, utf16Left, &len16 );
+				if ( len16 == 0 ) goto Done;	// Not enough room in the output buffer.
+			}
+			utf8Left  -= len8;
+			utf8Pos   += len8;
+			utf16Left -= len16;
+			utf16Pos  += len16;
+		}
+	
+	}
+
+Done:	// Set the output lengths.
+	*utf8Read = utf8Len - utf8Left;
+	*utf16Written = utf16Len - utf16Left;
+	
+}	// UTF8_to_UTF16Swp
+
+// =================================================================================================
+
+static void UTF8_to_UTF32Swp ( const UTF8Unit *  utf8In,   const size_t utf8Len,
+				               UTF32Unit *       utf32Out, const size_t utf32Len,
+				               size_t *          utf8Read, size_t *     utf32Written )
+{
+	const UTF8Unit * utf8Pos  = utf8In;
+	UTF32Unit *      utf32Pos = utf32Out;
+	
+	size_t utf8Left  = utf8Len;
+	size_t utf32Left = utf32Len;
+	
+	UC_Assert ( (utf8In != 0) && (utf32Out != 0) && (utf8Read != 0) && (utf32Written != 0) );
+	
+	while ( (utf8Left > 0) && (utf32Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf8Left;
+		if ( limit > utf32Left ) limit = utf32Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit > 0x7F ) break;
+			*utf32Pos = UTF32Unit(inUnit) << 24;	// Better than: UTF32OutSwap ( utf32Pos, inUnit );
+			++utf8Pos;
+			++utf32Pos;
+		}
+		utf8Left -= i;
+		utf32Left -= i;
+		
+		// Do a run of non-ASCII, it copies variable input into 1 output unit.
+		while ( (utf8Left > 0) && (utf32Left > 0) ) {
+			size_t len;
+			UTF32Unit cp;
+			UTF8Unit inUnit = *utf8Pos;
+			if ( inUnit <= 0x7F ) break;
+			CodePoint_from_UTF8_Multi ( utf8Pos, utf8Left, &cp, &len );
+			if ( len == 0 ) goto Done;	// The input buffer ends in the middle of a character.
+			UTF32OutSwap ( utf32Pos, cp );
+			utf8Left  -= len;
+			utf8Pos   += len;
+			utf32Left -= 1;
+			utf32Pos  += 1;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf8Read = utf8Len - utf8Left;
+	*utf32Written = utf32Len - utf32Left;
+	
+}	// UTF8_to_UTF32Swp
+
+// =================================================================================================
+
+static void UTF16Swp_to_UTF8 ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf16Read, size_t *     utf8Written )
+{
+	const UTF16Unit * utf16Pos = utf16In;
+	UTF8Unit *        utf8Pos  = utf8Out;
+	
+	size_t utf16Left = utf16Len;
+	size_t utf8Left  = utf8Len;
+	
+	UC_Assert ( (utf16In != 0) && (utf8Out != 0) && (utf16Read != 0) && (utf8Written != 0) );
+	
+	while ( (utf16Left > 0) && (utf8Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf16Left;
+		if ( limit > utf8Left ) limit = utf8Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF16Unit inUnit = UTF16InSwap(utf16Pos);
+			if ( inUnit > 0x7F ) break;
+			*utf8Pos = UTF8Unit(inUnit);
+			++utf16Pos;
+			++utf8Pos;
+		}
+		utf16Left -= i;
+		utf8Left  -= i;
+		
+		// Do a run of non-ASCII inside the BMP, it copies 1 input unit into multiple output units.
+		while ( (utf16Left > 0) && (utf8Left > 0) ) {
+			size_t len8;
+			UTF16Unit inUnit = UTF16InSwap(utf16Pos);
+			if ( inUnit <= 0x7F ) break;
+			if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) break;
+			CodePoint_to_UTF8_Multi ( inUnit, utf8Pos, utf8Left, &len8 );
+			if ( len8 == 0 ) goto Done;		// Not enough room in the output buffer.
+			utf16Left -= 1;
+			utf16Pos  += 1;
+			utf8Left  -= len8;
+			utf8Pos   += len8;
+		}
+		
+		// Do a run of surrogate pairs, it copies 2 input units into multiple output units.
+		while ( (utf16Left > 0) && (utf8Left > 0) ) {
+			UTF32Unit cp;
+			size_t len16, len8;
+			UTF16Unit inUnit = UTF16InSwap(utf16Pos);
+			if ( (inUnit < 0xD800) || (0xDFFF < inUnit) ) break;
+			CodePoint_from_UTF16Swp_Surrogate ( utf16Pos, utf16Left, &cp, &len16 );
+			if ( len16 == 0 ) goto Done;	// The input buffer ends in the middle of a surrogate pair.
+			UC_Assert ( len16 == 2 );
+			CodePoint_to_UTF8_Multi ( cp, utf8Pos, utf8Left, &len8 );
+			if ( len8 == 0 ) goto Done;		// Not enough room in the output buffer.
+			utf16Left -= len16;
+			utf16Pos  += len16;
+			utf8Left  -= len8;
+			utf8Pos   += len8;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf16Read = utf16Len - utf16Left;
+	*utf8Written = utf8Len - utf8Left;
+	
+}	// UTF16Swp_to_UTF8
+
+// =================================================================================================
+
+static void UTF32Swp_to_UTF8 ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				               UTF8Unit *        utf8Out,   const size_t utf8Len,
+				               size_t *          utf32Read, size_t *     utf8Written )
+{
+	const UTF32Unit * utf32Pos = utf32In;
+	UTF8Unit *        utf8Pos  = utf8Out;
+	
+	size_t utf32Left = utf32Len;
+	size_t utf8Left  = utf8Len;
+	
+	UC_Assert ( (utf32In != 0) && (utf8Out != 0) && (utf32Read != 0) && (utf8Written != 0) );
+	
+	while ( (utf32Left > 0) && (utf8Left > 0) ) {
+	
+		// Do a run of ASCII, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf32Left;
+		if ( limit > utf8Left ) limit = utf8Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF32Unit cp = UTF32InSwap(utf32Pos);
+			if ( cp > 0x7F ) break;
+			*utf8Pos = UTF8Unit(cp);
+			++utf32Pos;
+			++utf8Pos;
+		}
+		utf32Left -= i;
+		utf8Left  -= i;
+		
+		// Do a run of non-ASCII, it copies 1 input unit into multiple output units.
+		while ( (utf32Left > 0) && (utf8Left > 0) ) {
+			size_t len;
+			UTF32Unit cp = UTF32InSwap(utf32Pos);
+			if ( cp <= 0x7F ) break;
+			CodePoint_to_UTF8_Multi ( cp, utf8Pos, utf8Left, &len );
+			if ( len == 0 ) goto Done;	// Not enough room in the output buffer.
+			utf32Left -= 1;
+			utf32Pos  += 1;
+			utf8Left  -= len;
+			utf8Pos   += len;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf32Read = utf32Len - utf32Left;
+	*utf8Written = utf8Len - utf8Left;
+	
+}	// UTF32Swp_to_UTF8
+
+// =================================================================================================
+
+static void UTF16Swp_to_UTF32Swp ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written )
+{
+	const UTF16Unit * utf16Pos = utf16In;
+	UTF32Unit *       utf32Pos = utf32Out;
+	
+	size_t utf16Left = utf16Len;
+	size_t utf32Left = utf32Len;
+	
+	UC_Assert ( (utf16In != 0) && (utf32Out != 0) && (utf16Read != 0) && (utf32Written != 0) );
+	
+	while ( (utf16Left > 0) && (utf32Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf16Left;
+		if ( limit > utf32Left ) limit = utf32Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF16Unit inUnit = UTF16InSwap(utf16Pos);
+			if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) break;
+			*utf32Pos = UTF32Unit(*utf16Pos) << 16;	// Better than: UTF32OutSwap ( utf32Pos, inUnit );
+			++utf16Pos;
+			++utf32Pos;
+		}
+		utf16Left -= i;
+		utf32Left -= i;
+		
+		// Do a run of surrogate pairs, it copies 2 input units into 1 output unit.
+		while ( (utf16Left > 0) && (utf32Left > 0) ) {
+			size_t len;
+			UTF32Unit cp;
+			UTF16Unit inUnit = UTF16InSwap(utf16Pos);
+			if ( (inUnit < 0xD800) || (0xDFFF < inUnit) ) break;
+			CodePoint_from_UTF16Swp_Surrogate ( utf16Pos, utf16Left, &cp, &len );
+			if ( len == 0 ) goto Done;	// The input buffer ends in the middle of a surrogate pair.
+			UTF32OutSwap ( utf32Pos, cp );
+			UC_Assert ( len == 2 );
+			utf16Left -= len;
+			utf16Pos  += len;
+			utf32Left -= 1;
+			utf32Pos  += 1;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf16Read = utf16Len - utf16Left;
+	*utf32Written = utf32Len - utf32Left;
+	
+}	// UTF16Swp_to_UTF32Swp
+
+// =================================================================================================
+
+static void UTF32Swp_to_UTF16Swp ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written )
+{
+	const UTF32Unit * utf32Pos = utf32In;
+	UTF16Unit *       utf16Pos = utf16Out;
+	
+	size_t utf32Left = utf32Len;
+	size_t utf16Left = utf16Len;
+	
+	const size_t k32to16Offset = swap32to16Offset;	// ! Make sure compiler treats as an invariant.
+	
+	UC_Assert ( (utf32In != 0) && (utf16Out != 0) && (utf32Read != 0) && (utf16Written != 0) );
+	
+	while ( (utf32Left > 0) && (utf16Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf32Left;
+		if ( limit > utf16Left ) limit = utf16Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF32Unit inUnit = UTF32InSwap(utf32Pos);
+			if ( inUnit > 0xFFFF ) break;
+			*utf16Pos = *(((UTF16Unit*)utf32Pos) + k32to16Offset);	// Better than: UTF16OutSwap ( utf16Pos, UTF16Unit(inUnit) );
+			++utf32Pos;
+			++utf16Pos;
+		}
+		utf32Left -= i;
+		utf16Left -= i;
+		
+		// Do a run of non-BMP, it copies 1 input unit into 2 output units.
+		while ( (utf32Left > 0) && (utf16Left > 0) ) {
+			size_t len;
+			UTF32Unit inUnit = UTF32InSwap(utf32Pos);
+			if ( inUnit <= 0xFFFF ) break;
+			CodePoint_to_UTF16Swp_Surrogate ( inUnit, utf16Pos, utf16Left, &len );
+			if ( len == 0 ) goto Done;	// Not enough room in the output buffer.
+			UC_Assert ( len == 2 );
+			utf32Left -= 1;
+			utf32Pos  += 1;
+			utf16Left -= 2;
+			utf16Pos  += 2;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf32Read = utf32Len - utf32Left;
+	*utf16Written = utf16Len - utf16Left;
+	
+}	// UTF32Swp_to_UTF16Swp
+
+// =================================================================================================
+
+static void UTF16Nat_to_UTF32Swp ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written )
+{
+	const UTF16Unit * utf16Pos = utf16In;
+	UTF32Unit *       utf32Pos = utf32Out;
+	
+	size_t utf16Left = utf16Len;
+	size_t utf32Left = utf32Len;
+	
+	UC_Assert ( (utf16In != 0) && (utf32Out != 0) && (utf16Read != 0) && (utf32Written != 0) );
+	
+	while ( (utf16Left > 0) && (utf32Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf16Left;
+		if ( limit > utf32Left ) limit = utf32Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF16Unit inUnit = *utf16Pos;
+			if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) break;
+			UTF32OutSwap ( utf32Pos, inUnit );
+			++utf16Pos;
+			++utf32Pos;
+		}
+		utf16Left -= i;
+		utf32Left -= i;
+		
+		// Do a run of surrogate pairs, it copies 2 input units into 1 output unit.
+		while ( (utf16Left > 0) && (utf32Left > 0) ) {
+			size_t len;
+			UTF32Unit cp;
+			UTF16Unit inUnit = *utf16Pos;
+			if ( (inUnit < 0xD800) || (0xDFFF < inUnit) ) break;
+			CodePoint_from_UTF16Nat_Surrogate ( utf16Pos, utf16Left, &cp, &len );
+			if ( len == 0 ) goto Done;	// The input buffer ends in the middle of a surrogate pair.
+			UC_Assert ( len == 2 );
+			UTF32OutSwap ( utf32Pos, cp );
+			utf16Left -= len;
+			utf16Pos  += len;
+			utf32Left -= 1;
+			utf32Pos  += 1;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf16Read = utf16Len - utf16Left;
+	*utf32Written = utf32Len - utf32Left;
+	
+}	// UTF16Nat_to_UTF32Swp
+
+// =================================================================================================
+
+static void UTF16Swp_to_UTF32Nat ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                   UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                   size_t *          utf16Read, size_t *     utf32Written )
+{
+	const UTF16Unit * utf16Pos = utf16In;
+	UTF32Unit *       utf32Pos = utf32Out;
+	
+	size_t utf16Left = utf16Len;
+	size_t utf32Left = utf32Len;
+	
+	UC_Assert ( (utf16In != 0) && (utf32Out != 0) && (utf16Read != 0) && (utf32Written != 0) );
+	
+	while ( (utf16Left > 0) && (utf32Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf16Left;
+		if ( limit > utf32Left ) limit = utf32Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF16Unit inUnit = UTF16InSwap(utf16Pos);
+			if ( (0xD800 <= inUnit) && (inUnit <= 0xDFFF) ) break;
+			*utf32Pos = inUnit;
+			++utf16Pos;
+			++utf32Pos;
+		}
+		utf16Left -= i;
+		utf32Left -= i;
+		
+		// Do a run of surrogate pairs, it copies 2 input units into 1 output unit.
+		while ( (utf16Left > 0) && (utf32Left > 0) ) {
+			size_t len;
+			UTF16Unit inUnit = UTF16InSwap(utf16Pos);
+			if ( (inUnit < 0xD800) || (0xDFFF < inUnit) ) break;
+			CodePoint_from_UTF16Swp_Surrogate ( utf16Pos, utf16Left, utf32Pos, &len );
+			if ( len == 0 ) goto Done;	// The input buffer ends in the middle of a surrogate pair.
+			UC_Assert ( len == 2 );
+			utf16Left -= len;
+			utf16Pos  += len;
+			utf32Left -= 1;
+			utf32Pos  += 1;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf16Read = utf16Len - utf16Left;
+	*utf32Written = utf32Len - utf32Left;
+	
+}	// UTF16Swp_to_UTF32Nat
+
+// =================================================================================================
+
+static void UTF32Nat_to_UTF16Swp ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written )
+{
+	const UTF32Unit * utf32Pos = utf32In;
+	UTF16Unit *       utf16Pos = utf16Out;
+	
+	size_t utf32Left = utf32Len;
+	size_t utf16Left = utf16Len;
+	
+	UC_Assert ( (utf32In != 0) && (utf16Out != 0) && (utf32Read != 0) && (utf16Written != 0) );
+	
+	while ( (utf32Left > 0) && (utf16Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf32Left;
+		if ( limit > utf16Left ) limit = utf16Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF32Unit inUnit = *utf32Pos;
+			if ( inUnit > 0xFFFF ) break;
+			UTF16OutSwap ( utf16Pos, UTF16Unit(inUnit) );
+			++utf32Pos;
+			++utf16Pos;
+		}
+		utf32Left -= i;
+		utf16Left -= i;
+		
+		// Do a run of non-BMP, it copies 1 input unit into 2 output units.
+		while ( (utf32Left > 0) && (utf16Left > 0) ) {
+			size_t len;
+			UTF32Unit inUnit = *utf32Pos;
+			if ( inUnit <= 0xFFFF ) break;
+			CodePoint_to_UTF16Swp_Surrogate ( inUnit, utf16Pos, utf16Left, &len );
+			if ( len == 0 ) goto Done;	// Not enough room in the output buffer.
+			UC_Assert ( len == 2 );
+			utf32Left -= 1;
+			utf32Pos  += 1;
+			utf16Left -= 2;
+			utf16Pos  += 2;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf32Read = utf32Len - utf32Left;
+	*utf16Written = utf16Len - utf16Left;
+	
+}	// UTF32Nat_to_UTF16Swp
+
+// =================================================================================================
+
+static void UTF32Swp_to_UTF16Nat ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                   UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                   size_t *          utf32Read, size_t *     utf16Written )
+{
+	const UTF32Unit * utf32Pos = utf32In;
+	UTF16Unit *       utf16Pos = utf16Out;
+	
+	size_t utf32Left = utf32Len;
+	size_t utf16Left = utf16Len;
+	
+	UC_Assert ( (utf32In != 0) && (utf16Out != 0) && (utf32Read != 0) && (utf16Written != 0) );
+	
+	while ( (utf32Left > 0) && (utf16Left > 0) ) {
+	
+		// Do a run of BMP, it copies 1 input unit into 1 output unit.
+		size_t i, limit = utf32Left;
+		if ( limit > utf16Left ) limit = utf16Left;
+		for ( i = 0; i < limit; ++i ) {
+			UTF32Unit inUnit = UTF32InSwap(utf32Pos);
+			if ( inUnit > 0xFFFF ) break;
+			*utf16Pos = UTF16Unit(inUnit);
+			++utf32Pos;
+			++utf16Pos;
+		}
+		utf32Left -= i;
+		utf16Left -= i;
+		
+		// Do a run of non-BMP, it copies 1 input unit into 2 output units.
+		while ( (utf32Left > 0) && (utf16Left > 0) ) {
+			size_t len;
+			UTF32Unit inUnit = UTF32InSwap(utf32Pos);
+			if ( inUnit <= 0xFFFF ) break;
+			CodePoint_to_UTF16Nat_Surrogate ( inUnit, utf16Pos, utf16Left, &len );
+			if ( len == 0 ) goto Done;	// Not enough room in the output buffer.
+			UC_Assert ( len == 2 );
+			utf32Left -= 1;
+			utf32Pos  += 1;
+			utf16Left -= 2;
+			utf16Pos  += 2;
+		}
+	
+	}
+	
+Done:	// Set the output lengths.
+	*utf32Read = utf32Len - utf32Left;
+	*utf16Written = utf16Len - utf16Left;
+	
+}	// UTF32Swp_to_UTF16Nat
+
+// =================================================================================================
diff --git a/source/UnicodeConversions.hpp b/source/UnicodeConversions.hpp
new file mode 100644
index 0000000..f09437c
--- /dev/null
+++ b/source/UnicodeConversions.hpp
@@ -0,0 +1,115 @@
+#ifndef __UnicodeConversions_h__
+#define __UnicodeConversions_h__
+
+// =================================================================================================
+// Copyright 2004 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>
+
+// =================================================================================================
+
+typedef XMP_Uns8  UTF8Unit;
+typedef XMP_Uns16 UTF16Unit;
+typedef XMP_Uns32 UTF32Unit;
+
+// -------------------------------------------------------------------------------------------------
+
+// ! The UTF16 and UTF32 counts are in storage units, not bytes! CodePoint values are always native.
+
+// *** MIght be better to return a status than throw an exception for errors?
+
+typedef void (*CodePoint_to_UTF16_Proc) ( const UTF32Unit cpIn, UTF16Unit * utf16Out, const size_t utf16Len, size_t * utf16Written );
+
+typedef void (*CodePoint_from_UTF16_Proc) ( const UTF16Unit * utf16In, const size_t utf16Len, UTF32Unit * cpOut, size_t * utf16Read );
+
+typedef void (*UTF8_to_UTF16_Proc)  ( const UTF8Unit *  utf8In,    const size_t utf8Len,
+				                      UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                      size_t *          utf8Read,  size_t *     utf16Written );
+
+typedef void (*UTF8_to_UTF32_Proc)  ( const UTF8Unit *  utf8In,    const size_t utf8Len,
+				                      UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                      size_t *          utf8Read,  size_t *     utf32Written );
+
+typedef void (*UTF16_to_UTF8_Proc)  ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                      UTF8Unit *        utf8Out,   const size_t utf8Len,
+				                      size_t *          utf16Read, size_t *     utf8Written );
+
+typedef void (*UTF32_to_UTF8_Proc)  ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                      UTF8Unit *        utf8Out,   const size_t utf8Len,
+				                      size_t *          utf32Read, size_t *     utf8Written );
+
+typedef void (*UTF16_to_UTF32_Proc) ( const UTF16Unit * utf16In,   const size_t utf16Len,
+				                      UTF32Unit *       utf32Out,  const size_t utf32Len,
+				                      size_t *          utf16Read, size_t *     utf32Written );
+
+typedef void (*UTF32_to_UTF16_Proc) ( const UTF32Unit * utf32In,   const size_t utf32Len,
+				                      UTF16Unit *       utf16Out,  const size_t utf16Len,
+				                      size_t *          utf32Read, size_t *     utf16Written );
+
+// -------------------------------------------------------------------------------------------------
+
+extern void CodePoint_to_UTF8 ( const UTF32Unit cpIn, UTF8Unit *  utf8Out,  const size_t utf8Len,  size_t * utf8Written );
+
+extern void CodePoint_from_UTF8 ( const UTF8Unit *  utf8In,  const size_t utf8Len,  UTF32Unit * cpOut, size_t * utf8Read );
+
+extern CodePoint_to_UTF16_Proc CodePoint_to_UTF16BE;
+extern CodePoint_to_UTF16_Proc CodePoint_to_UTF16LE;
+
+extern CodePoint_from_UTF16_Proc CodePoint_from_UTF16BE;
+extern CodePoint_from_UTF16_Proc CodePoint_from_UTF16LE;
+
+extern UTF8_to_UTF16_Proc  UTF8_to_UTF16BE;
+extern UTF8_to_UTF16_Proc  UTF8_to_UTF16LE;
+
+extern UTF8_to_UTF32_Proc  UTF8_to_UTF32BE;
+extern UTF8_to_UTF32_Proc  UTF8_to_UTF32LE;
+
+extern UTF16_to_UTF8_Proc  UTF16BE_to_UTF8;
+extern UTF16_to_UTF8_Proc  UTF16LE_to_UTF8;
+
+extern UTF32_to_UTF8_Proc  UTF32BE_to_UTF8;
+extern UTF32_to_UTF8_Proc  UTF32LE_to_UTF8;
+
+extern UTF8_to_UTF16_Proc  UTF8_to_UTF16Native;
+extern UTF8_to_UTF32_Proc  UTF8_to_UTF32Native;
+
+extern UTF16_to_UTF8_Proc  UTF16Native_to_UTF8;
+extern UTF32_to_UTF8_Proc  UTF32Native_to_UTF8;
+
+extern UTF16_to_UTF32_Proc UTF16BE_to_UTF32BE;
+extern UTF16_to_UTF32_Proc UTF16BE_to_UTF32LE;
+
+extern UTF16_to_UTF32_Proc UTF16LE_to_UTF32BE;
+extern UTF16_to_UTF32_Proc UTF16LE_to_UTF32LE;
+
+extern UTF32_to_UTF16_Proc UTF32BE_to_UTF16BE;
+extern UTF32_to_UTF16_Proc UTF32BE_to_UTF16LE;
+
+extern UTF32_to_UTF16_Proc UTF32LE_to_UTF16BE;
+extern UTF32_to_UTF16_Proc UTF32LE_to_UTF16LE;
+
+extern void SwapUTF16 ( const UTF16Unit * utf16In, UTF16Unit * utf16Out, const size_t utf16Len );
+extern void SwapUTF32 ( const UTF32Unit * utf32In, UTF32Unit * utf32Out, const size_t utf32Len );
+
+extern void ToUTF16 ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf16Str, bool bigEndian );
+extern void ToUTF32 ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf32Str, bool bigEndian );
+
+extern void FromUTF16 ( const UTF16Unit * utf16In, size_t utf16Len, std::string * utf8Str, bool bigEndian );
+extern void FromUTF32 ( const UTF32Unit * utf32In, size_t utf32Len, std::string * utf8Str, bool bigEndian );
+
+extern void ToUTF16Native ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf16Str );
+extern void ToUTF32Native ( const UTF8Unit * utf8In, size_t utf8Len, std::string * utf32Str );
+
+extern void FromUTF16Native ( const UTF16Unit * utf16In, size_t utf16Len, std::string * utf8Str );
+extern void FromUTF32Native ( const UTF32Unit * utf32In, size_t utf32Len, std::string * utf8Str );
+
+extern void InitializeUnicodeConversions();
+
+// =================================================================================================
+
+#endif	// __UnicodeConversions_h__
diff --git a/source/UnicodeInlines.incl_cpp b/source/UnicodeInlines.incl_cpp
new file mode 100644
index 0000000..829132a
--- /dev/null
+++ b/source/UnicodeInlines.incl_cpp
@@ -0,0 +1,129 @@
+#ifndef __UnicodeInlines_incl_cpp__
+#define __UnicodeInlines_incl_cpp__
+
+// =================================================================================================
+// Copyright 2004 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 "source/UnicodeConversions.hpp"
+
+// =================================================================================================
+// Inner loop utilities that need to be inlined.
+// =================================================================================================
+
+static inline XMP_Uns32 GetCodePoint ( const XMP_Uns8 ** utf8Str_io )
+{
+	const XMP_Uns8 * u8Ptr = *utf8Str_io;
+	XMP_Uns32 cp;
+	size_t u8Len;
+	CodePoint_from_UTF8 ( u8Ptr, 4, &cp, &u8Len );	// Throws an exception for errors.
+	*utf8Str_io = u8Ptr + u8Len;
+	return cp;
+}
+
+// =================================================================================================
+
+static inline bool IsStartChar_ASCII ( XMP_Uns32 cp )
+{
+	// ASCII starting characters for an XML name.
+	if ( (('a' <= cp) && (cp <= 'z')) || (('A' <= cp) && (cp <= 'Z')) || (cp == '_') ) return true;
+	return false;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline bool IsStartChar_NonASCII ( XMP_Uns32 cp )
+{
+	// Non-ASCII starting characters for an XML name.
+	
+	if ( ((0xC0 <= cp) && (cp <= 0xD6))  || ((0xD8 <= cp) && (cp <= 0xF6)) ) return true;
+	if ( ((0xF8 <= cp) && (cp <= 0x2FF)) || ((0x370 <= cp) && (cp <= 0x37D)) ) return true;
+
+	if ( ((0x37F <= cp) && (cp <= 0x1FFF))  || ((0x200C <= cp) && (cp <= 0x200D)) ) return true;
+	if ( ((0x2070 <= cp) && (cp <= 0x218F)) || ((0x2C00 <= cp) && (cp <= 0x2FEF)) ) return true;
+	if ( ((0x3001 <= cp) && (cp <= 0xD7FF)) || ((0xF900 <= cp) && (cp <= 0xFDCF)) ) return true;
+	if ( ((0xFDF0 <= cp) && (cp <= 0xFFFD)) || ((0x10000 <= cp) && (cp <= 0xEFFFF)) ) return true;
+
+	return false;
+
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline bool IsOtherChar_ASCII ( XMP_Uns32 cp )
+{
+	// ASCII following characters for an XML name.
+	if ( (('0' <= cp) && (cp <= '9')) || (cp == '-') || (cp == '.') ) return true;
+	return false;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline bool IsOtherChar_NonASCII ( XMP_Uns32 cp )
+{
+	// Non-ASCII following characters for an XML name.
+	if ( (cp == 0xB7) || ((0x300 <= cp) && (cp <= 0x36F))  || ((0x203F <= cp) && (cp <= 0x2040)) ) return true;
+	return false;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void VerifyUTF8 ( XMP_StringPtr str )
+{
+	const XMP_Uns8 * utf8Str = (XMP_Uns8*)str;
+	while ( *utf8Str != 0 ) {
+		while ( (*utf8Str != 0) && (*utf8Str < 0x80) ) ++utf8Str;
+		if ( *utf8Str >= 0x80 ) (void) GetCodePoint ( &utf8Str );	// Throws for bad UTF-8.
+	}
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline void VerifySimpleXMLName ( XMP_StringPtr _nameStart, XMP_StringPtr _nameEnd )
+{
+
+	const XMP_Uns8 * nameStart = (const XMP_Uns8 *) _nameStart;
+	const XMP_Uns8 * nameEnd   = (const XMP_Uns8 *) _nameEnd;
+	const XMP_Uns8 * namePos   = nameStart;
+	XMP_Uns32 cp;
+	
+	// The first character is more restricted.
+	
+	if ( nameStart >= nameEnd ) XMP_Throw ( "Empty XML name", kXMPErr_BadXPath );
+
+	cp = *namePos;
+	if ( cp < 0x80 ) {
+		++namePos;
+		if ( ! IsStartChar_ASCII(cp) ) goto NameError;
+	} else {
+		cp = GetCodePoint ( &namePos );
+		if ( ! IsStartChar_NonASCII(cp) ) goto NameError;
+	}
+
+	// Check the rest of the name.
+	
+	while ( namePos < nameEnd ) {
+		cp = *namePos;
+		if ( cp < 0x80 ) {
+			++namePos;
+			if ( (! IsStartChar_ASCII(cp)) && (! IsOtherChar_ASCII(cp)) ) goto NameError;
+		} else {
+			cp = GetCodePoint ( &namePos );
+			if ( (! IsStartChar_NonASCII(cp)) && (! IsOtherChar_NonASCII(cp)) ) goto NameError;
+		}
+	}
+
+	return;
+
+NameError:
+	XMP_Throw ( "Bad XML name", kXMPErr_BadXPath );
+	
+}	// VerifySimpleXMLName
+
+// =================================================================================================
+
+#endif	// __UnicodeInlines_incl_cpp__
diff --git a/source/XIO.cpp b/source/XIO.cpp
new file mode 100644
index 0000000..83c5bfd
--- /dev/null
+++ b/source/XIO.cpp
@@ -0,0 +1,242 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "source/XIO.hpp"
+#include "source/XMP_LibUtils.hpp"
+#include "source/UnicodeConversions.hpp"
+
+#if XMP_WinBuild
+	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
+// =================================================================================================
+
+static inline void MakeLowerCase ( std::string * str )
+{
+	for ( size_t i = 0, limit = str->size(); i < limit; ++i ) {
+		char ch = (*str)[i];
+		if ( ('A' <= ch) && (ch <= 'Z') ) (*str)[i] += 0x20;
+	}
+}
+
+// =================================================================================================
+// XIO::SplitLeafName
+// ==================
+
+void XIO::SplitLeafName ( std::string * path, std::string * leafName )
+{
+	size_t dirPos = path->size();
+	// Return if path is empty or just the slash or DOT
+	if ( dirPos == 0 || (dirPos == 1 &&
+				     ((*path)[dirPos-1] == kDirChar
+					      || (*path)[dirPos-1] == '.')
+				     )
+		     )
+	{
+		leafName->erase();
+		path->erase();
+		return;
+	}
+
+	// Remove trailing slashes
+	--dirPos;
+#if XMP_WinBuild
+	if ( (*path)[dirPos] == '/' ) (*path)[dirPos] = kDirChar;	// Tolerate both '\' and '/'.
+#endif
+	if ( (*path)[dirPos] == kDirChar )
+	{
+		path->erase(dirPos);
+	}
+
+	// Search next slash
+	for ( --dirPos; dirPos > 0; --dirPos ) {
+		#if XMP_WinBuild
+			if ( (*path)[dirPos] == '/' ) (*path)[dirPos] = kDirChar;	// Tolerate both '\' and '/'.
+		#endif
+		if ( (*path)[dirPos] == kDirChar ) break;
+	}
+
+	if ( (*path)[dirPos] == kDirChar ) {
+		leafName->assign ( &(*path)[dirPos+1] );
+		path->erase ( dirPos );
+	} else if ( dirPos == 0 ) {
+		leafName->erase();
+		leafName->swap ( *path );
+	}
+
+}	// XIO::SplitLeafName
+
+// =================================================================================================
+// XIO::SplitFileExtension
+// =======================
+//
+// ! Must only be called after using SplitLeafName!
+
+void XIO::SplitFileExtension ( std::string * leafName, std::string * fileExt , bool lowercase )
+{
+
+	fileExt->erase();
+
+	size_t extPos = leafName->size();
+	if ( extPos == 0 ) return;
+	
+	for ( --extPos; extPos > 0; --extPos ) if ( (*leafName)[extPos] == '.' ) break;
+
+	if ( (*leafName)[extPos] == '.' ) {
+		fileExt->assign ( &((*leafName)[extPos+1]) );
+		if (lowercase) MakeLowerCase ( fileExt );
+		leafName->erase ( extPos );
+	}
+
+}	// XIO::SplitFileExtension
+
+// =================================================================================================
+// XIO::ReplaceTextFile
+// ====================
+//
+// Replace the contents of a text file in a manner that preserves the meaning of the old content if
+// a disk full error occurs. This can mean appended spaces appear in the old content.
+
+void XIO::ReplaceTextFile ( XMP_IO* textFile, const std::string & newContent, bool doSafeUpdate )
+{
+	XMP_Int64 newContentSize = (XMP_Int64)newContent.size();
+	XMP_Enforce ( newContentSize <= (XMP_Int64)0xFFFFFFFFULL );	// Make sure it fits in UInt32 for Write.
+
+	if ( doSafeUpdate ) {
+	
+		// Safe updates are no problem, the old content is untouched if the temp file write fails.
+
+		XMP_IO* tempFile = textFile->DeriveTemp();
+		tempFile->Write ( newContent.data(), (XMP_Uns32)newContentSize );
+		textFile->AbsorbTemp();
+
+	} else {
+	
+		// We're overwriting the existing file. Make sure it is big enough, write the new content,
+		// then truncate if necessary.
+		
+		XMP_Int64 oldContentSize = textFile->Length();
+		
+		if ( oldContentSize < newContentSize ) {
+			size_t spaceCount = (size_t) (newContentSize - oldContentSize);	// AUDIT: newContentSize fits in UInt32.
+			std::string spaces;
+			spaces.assign ( spaceCount, ' ' );
+			textFile->ToEOF();
+			textFile->Write ( spaces.data(), (XMP_Uns32)spaceCount );
+		}
+
+		XMP_Assert ( newContentSize <= textFile->Length() );
+		textFile->Rewind();
+		textFile->Write ( newContent.data(), (XMP_Uns32)newContentSize );
+		
+		if ( oldContentSize > newContentSize ) textFile->Truncate ( newContentSize );
+	
+	}
+
+}	// XIO::ReplaceTextFile
+
+// =================================================================================================
+// XIO::Copy
+// =========
+
+void XIO::Copy ( XMP_IO* sourceFile, XMP_IO* destFile, XMP_Int64 length,
+				 XMP_AbortProc abortProc /* = 0 */, void* abortArg /* = 0 */ )
+{
+	const bool checkAbort = (abortProc != 0);
+	XMP_Uns8 buffer [64*1024];
+
+	while ( length > 0 ) {
+
+		if ( checkAbort && abortProc(abortArg) ) {
+			XMP_Throw ( "XIO::Copy, user abort", kXMPErr_UserAbort );
+		}
+
+		XMP_Int32 ioCount = sizeof(buffer);
+		if ( length < ioCount ) ioCount = (XMP_Int32)length;
+
+		sourceFile->Read ( buffer, ioCount, XMP_IO::kReadAll );
+		destFile->Write ( buffer, ioCount );
+		length -= ioCount;
+
+	}
+
+}	// XIO::Copy
+
+// =================================================================================================
+// XIO::Move
+// =========
+
+// allows to move data within a file (just pass in the same file handle as srcFile and dstFile)
+// shadow effects (stumbling over just-written data) are avoided.
+//
+// * however can also be used to move data between two files *
+// (having both option is handy for flexible use in update()/re-write() handler routines)
+
+void XIO::Move ( XMP_IO* srcFile, XMP_Int64 srcOffset,
+				 XMP_IO* dstFile, XMP_Int64 dstOffset,
+				 XMP_Int64 length, XMP_AbortProc abortProc /* = 0 */, void * abortArg /* = 0 */ )
+{
+	enum { kBufferLen = 64*1024 };
+	XMP_Uns8 buffer [kBufferLen];
+
+	const bool checkAbort = (abortProc != 0);
+
+	if ( srcOffset > dstOffset ) {	// avoiding shadow effects
+
+	// move down -> shift lowest packet first !
+
+		while ( length > 0 ) {
+
+			if ( checkAbort && abortProc(abortArg) ) XMP_Throw ( "XIO::Move - User abort", kXMPErr_UserAbort );
+			XMP_Int32 ioCount = kBufferLen;
+			if ( length < kBufferLen ) ioCount = (XMP_Int32)length; //smartly avoids 32/64 bit issues
+
+			srcFile->Seek ( srcOffset, kXMP_SeekFromStart );
+			srcFile->ReadAll ( buffer, ioCount );
+			dstFile->Seek ( dstOffset, kXMP_SeekFromStart );
+			dstFile->Write ( buffer, ioCount );
+			length -= ioCount;
+
+			srcOffset += ioCount;
+			dstOffset += ioCount;
+
+		}
+
+	} else {	// move up -> shift highest packet first
+
+		srcOffset += length; //move to end
+		dstOffset += length;
+
+		while ( length > 0 ) {
+
+			if ( checkAbort && abortProc(abortArg) ) XMP_Throw ( "XIO::Move - User abort", kXMPErr_UserAbort );
+			XMP_Int32 ioCount = kBufferLen;
+			if ( length < kBufferLen ) ioCount = (XMP_Int32)length; //smartly avoids 32/64 bit issues
+
+			srcOffset -= ioCount;
+			dstOffset -= ioCount;
+
+			srcFile->Seek ( srcOffset, kXMP_SeekFromStart );
+			srcFile->ReadAll ( buffer, ioCount );
+			dstFile->Seek ( dstOffset, kXMP_SeekFromStart );
+			dstFile->Write ( buffer, ioCount );
+			length -= ioCount;
+
+		}
+
+	}
+
+}	// XIO::Move
+
+// =================================================================================================
diff --git a/source/XIO.hpp b/source/XIO.hpp
new file mode 100644
index 0000000..3a8d3b9
--- /dev/null
+++ b/source/XIO.hpp
@@ -0,0 +1,388 @@
+#ifndef __XIO_hpp__
+#define __XIO_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "source/Host_IO.hpp"
+#include "source/EndianUtils.hpp"
+
+#include <string>
+
+// =================================================================================================
+// Support for I/O
+// ===============
+
+namespace XIO {
+
+	// =============================================================================================
+	// Internal utilities layered on top of the abstract XMP_IO and XMPFiles_IO classes.
+	// =================================================================================
+
+	void SplitLeafName ( std::string * path, std::string * leafName );
+	void SplitFileExtension ( std::string * path, std::string * fileExt , bool lowercase=true);
+	
+	void ReplaceTextFile ( XMP_IO* textFile, const std::string & newContent, bool doSafeUpdate );
+
+	extern void Copy ( XMP_IO* sourceFile, XMP_IO* destFile, XMP_Int64 length,
+					   XMP_AbortProc abortProc = 0, void* abortArg = 0 );
+
+	extern void Move ( XMP_IO* sourceFile, XMP_Int64 sourceOffset,
+					   XMP_IO* destFile, XMP_Int64 destOffset,
+					   XMP_Int64 length, XMP_AbortProc abortProc = 0, void* abortArg = 0 );
+
+	static inline bool CheckFileSpace ( XMP_IO* file, XMP_Int64 length )
+	{
+		XMP_Int64 remaining = file->Length() - file->Offset();
+		return (length <= remaining);
+	}
+	
+	// *** Need to absorb more of the utilities like FolderInfo, GetFileMode.
+
+	// =============================================================================================
+	// Inline utilities for endian-oriented reads and writes of numerbers.
+	// ===================================================================
+
+	// -------------------------------------
+	// Unsigned forms that do the real work.
+
+	static inline XMP_Uns8 ReadUns8 ( XMP_IO* file )
+	{
+		XMP_Uns8 value;
+		file->ReadAll ( &value, 1 );
+		return value;
+	}
+
+	static inline XMP_Uns16 ReadUns16_BE ( XMP_IO* file )
+	{
+		XMP_Uns16 value;
+		file->ReadAll ( &value, 2 );
+		return MakeUns16BE ( value );
+	}
+
+	static inline XMP_Uns16 ReadUns16_LE ( XMP_IO* file )
+	{
+		XMP_Uns16 value;
+		file->ReadAll ( &value, 2 );
+		return MakeUns16LE ( value );
+	}
+
+	static inline XMP_Uns32 ReadUns32_BE ( XMP_IO* file )
+	{
+		XMP_Uns32 value;
+		file->ReadAll ( &value, 4 );
+		return MakeUns32BE ( value );
+	}
+
+	static inline XMP_Uns32 ReadUns32_LE ( XMP_IO* file )
+	{
+		XMP_Uns32 value;
+		file->ReadAll ( &value, 4 );
+		return MakeUns32LE ( value );
+	}
+
+	static inline XMP_Uns64 ReadUns64_BE ( XMP_IO* file )
+	{
+		XMP_Uns64 value;
+		file->ReadAll ( &value, 8 );
+		return MakeUns64BE ( value );
+	}
+
+	static inline XMP_Uns64 ReadUns64_LE ( XMP_IO* file )
+	{
+		XMP_Uns64 value;
+		file->ReadAll ( &value, 8 );
+		return MakeUns64LE ( value );
+	}
+
+	static inline XMP_Uns8 PeekUns8 ( XMP_IO* file )
+	{
+		XMP_Uns8 value = XIO::ReadUns8 ( file );
+		file->Seek ( -1, kXMP_SeekFromCurrent );
+		return value;
+	}
+
+	static inline XMP_Uns16 PeekUns16_BE ( XMP_IO* file )
+	{
+		XMP_Uns16 value = XIO::ReadUns16_BE ( file );
+		file->Seek ( -2, kXMP_SeekFromCurrent );
+		return value;
+	}
+
+	static inline XMP_Uns16 PeekUns16_LE ( XMP_IO* file )
+	{
+		XMP_Uns16 value = XIO::ReadUns16_LE ( file );
+		file->Seek ( -2, kXMP_SeekFromCurrent );
+		return value;
+	}
+
+	static inline XMP_Uns32 PeekUns32_BE ( XMP_IO* file )
+	{
+		XMP_Uns32 value = XIO::ReadUns32_BE ( file );
+		file->Seek ( -4, kXMP_SeekFromCurrent );
+		return value;
+	}
+
+	static inline XMP_Uns32 PeekUns32_LE ( XMP_IO* file )
+	{
+		XMP_Uns32 value = XIO::ReadUns32_LE ( file );
+		file->Seek ( -4, kXMP_SeekFromCurrent );
+		return value;
+	}
+
+	static inline XMP_Uns64 PeekUns64_BE ( XMP_IO* file )
+	{
+		XMP_Uns64 value = XIO::ReadUns64_BE ( file );
+		file->Seek ( -8, kXMP_SeekFromCurrent );
+		return value;
+	}
+
+	static inline XMP_Uns64 PeekUns64_LE ( XMP_IO* file )
+	{
+		XMP_Uns64 value = XIO::ReadUns64_LE ( file );
+		file->Seek ( -8, kXMP_SeekFromCurrent );
+		return value;
+	}
+
+	static inline void WriteUns8 ( XMP_IO* file, XMP_Uns8 value )
+	{
+		file->Write ( &value, 1 );
+	}
+
+	static inline void WriteUns16_BE ( XMP_IO* file, XMP_Uns16 value )
+	{
+		XMP_Uns16 v = MakeUns16BE ( value );
+		file->Write ( &v, 2 );
+	}
+
+	static inline void WriteUns16_LE ( XMP_IO* file, XMP_Uns16 value )
+	{
+		XMP_Uns16 v = MakeUns16LE ( value );
+		file->Write ( &v, 2 );
+	}
+
+	static inline void WriteUns32_BE ( XMP_IO* file, XMP_Uns32 value )
+	{
+		XMP_Uns32 v = MakeUns32BE ( value );
+		file->Write ( &v, 4 );
+	}
+
+	static inline void WriteUns32_LE ( XMP_IO* file, XMP_Uns32 value )
+	{
+		XMP_Uns32 v = MakeUns32LE ( value );
+		file->Write ( &v, 4 );
+	}
+
+	static inline void WriteUns64_BE ( XMP_IO* file, XMP_Uns64 value )
+	{
+		XMP_Uns64 v = MakeUns64BE ( value );
+		file->Write ( &v, 8 );
+	}
+
+	static inline void WriteUns64_LE ( XMP_IO* file, XMP_Uns64 value )
+	{
+		XMP_Uns64 v = MakeUns64LE ( value );
+		file->Write ( &v, 8 );
+	}
+
+	// ------------------------------------------------------------------
+	// Signed forms that just cast to unsigned and use the unsigned call.
+
+	static inline XMP_Int8 ReadInt8 ( XMP_IO* file )
+	{
+		return (XMP_Int8) XIO::ReadUns8 ( file );
+	}
+
+	static inline XMP_Int16 ReadInt16_BE ( XMP_IO* file )
+	{
+		return (XMP_Int16) XIO::ReadUns16_BE ( file );
+	}
+
+	static inline XMP_Int16 ReadInt16_LE ( XMP_IO* file )
+	{
+		return (XMP_Int16) XIO::ReadUns16_LE ( file );
+	}
+
+	static inline XMP_Int32 ReadInt32_BE ( XMP_IO* file )
+	{
+		return (XMP_Int32) XIO::ReadUns32_BE ( file );
+	}
+
+	static inline XMP_Int32 ReadInt32_LE ( XMP_IO* file )
+	{
+		return (XMP_Int32) XIO::ReadUns32_LE ( file );
+	}
+
+	static inline XMP_Int64 ReadInt64_BE ( XMP_IO* file )
+	{
+		return (XMP_Int64) XIO::ReadUns64_BE ( file );
+	}
+
+	static inline XMP_Int64 ReadInt64_LE ( XMP_IO* file )
+	{
+		return (XMP_Int64) XIO::ReadUns64_LE ( file );
+	}
+
+	static inline XMP_Int8 PeekInt8 ( XMP_IO* file )
+	{
+		return (XMP_Int8) XIO::PeekUns8 ( file );
+	}
+
+	static inline XMP_Int16 PeekInt16_BE ( XMP_IO* file )
+	{
+		return (XMP_Int16) XIO::PeekUns16_BE ( file );
+	}
+
+	static inline XMP_Int16 PeekInt16_LE ( XMP_IO* file )
+	{
+		return (XMP_Int16) XIO::PeekUns16_LE ( file );
+	}
+
+	static inline XMP_Int32 PeekInt32_BE ( XMP_IO* file )
+	{
+		return (XMP_Int32) XIO::PeekUns32_BE ( file );
+	}
+
+	static inline XMP_Int32 PeekInt32_LE ( XMP_IO* file )
+	{
+		return (XMP_Int32) XIO::PeekUns32_LE ( file );
+	}
+
+	static inline XMP_Int64 PeekInt64_BE ( XMP_IO* file )
+	{
+		return (XMP_Int64) XIO::PeekUns64_BE ( file );
+	}
+
+	static inline XMP_Int64 PeekInt64_LE ( XMP_IO* file )
+	{
+		return (XMP_Int64) XIO::PeekUns64_LE ( file );
+	}
+
+	static inline void WriteInt8 ( XMP_IO* file, XMP_Int8 value )
+	{
+		XIO::WriteUns8 ( file, (XMP_Uns8)value );
+	}
+
+	static inline void WriteInt16_BE ( XMP_IO* file, XMP_Int16 value )
+	{
+		XIO::WriteUns16_BE ( file, (XMP_Uns16)value );
+	}
+
+	static inline void WriteInt16_LE ( XMP_IO* file, XMP_Int16 value )
+	{
+		XIO::WriteUns16_LE ( file, (XMP_Uns16)value );
+	}
+
+	static inline void WriteInt32_BE ( XMP_IO* file, XMP_Int32 value )
+	{
+		XIO::WriteUns32_BE ( file, (XMP_Uns32)value );
+	}
+
+	static inline void WriteInt32_LE ( XMP_IO* file, XMP_Int32 value )
+	{
+		XIO::WriteUns32_LE ( file, (XMP_Uns32)value );
+	}
+
+	static inline void WriteInt64_BE ( XMP_IO* file, XMP_Int64 value )
+	{
+		XIO::WriteUns64_BE ( file, (XMP_Uns64)value );
+	}
+
+	static inline void WriteInt64_LE ( XMP_IO* file, XMP_Int64 value )
+	{
+		XIO::WriteUns64_LE ( file, (XMP_Uns64)value );
+	}
+
+};
+
+// =================================================================================================
+
+// **********************************************************************************************
+// I/O buffer used in JPEG, PSD, and TIFF handlers. Discredited, a mistake, do not use elsewhere.
+// **********************************************************************************************
+
+// -------------------------------------------------------------------------------------------------
+// CheckFileSpace and RefillBuffer
+// -------------------------------
+//
+// There is always a problem in file scanning of managing what you want to check against what is
+// available in a buffer, trying to keep the logic understandable and minimize data movement. The
+// CheckFileSpace and RefillBuffer functions are used here for a standard scanning model.
+//
+// The format scanning routines have an outer, "infinite" loop that looks for file markers. There
+// is a local (on stack) buffer, a pointer to the current position in the buffer, and a pointer for
+// the end of the buffer. The end pointer is just past the end of the buffer, "bufPtr == bufLimit"
+// means you are out of data. The outer loop ends when the necessary markers are found or we reach
+// the end of the file.
+//
+// The filePos is the file offset of the start of the current buffer. This is maintained so that
+// we can tell where the packet is in the file, part of the info returned to the client.
+//
+// At each check CheckFileSpace is used to make sure there is enough data in the buffer for the
+// check to be made. It refills the buffer if necessary, preserving the unprocessed data, setting
+// bufPtr and bufLimit appropriately. If we are too close to the end of the file to make the check
+// a failure status is returned.
+
+enum { kIOBufferSize = 128*1024 };
+
+struct IOBuffer {
+	XMP_Int64 filePos;
+	XMP_Uns8* ptr;
+	XMP_Uns8* limit;
+	size_t    len;
+	XMP_Uns8  data [kIOBufferSize];
+	IOBuffer() : filePos(0), ptr(&data[0]), limit(ptr), len(0) {};
+};
+
+static inline void FillBuffer ( XMP_IO* fileRef, XMP_Int64 fileOffset, IOBuffer* ioBuf )
+{
+	ioBuf->filePos = fileRef->Seek ( fileOffset, kXMP_SeekFromStart );
+	if ( ioBuf->filePos != fileOffset ) {
+		throw XMP_Error ( kXMPErr_ExternalFailure, "Seek failure in FillBuffer" );
+	}
+	ioBuf->len = fileRef->Read ( &ioBuf->data[0], kIOBufferSize );
+	ioBuf->ptr = &ioBuf->data[0];
+	ioBuf->limit = ioBuf->ptr + ioBuf->len;
+}
+
+static inline void MoveToOffset ( XMP_IO* fileRef, XMP_Int64 fileOffset, IOBuffer* ioBuf )
+{
+	if ( (ioBuf->filePos <= fileOffset) && (fileOffset < (XMP_Int64)(ioBuf->filePos + ioBuf->len)) ) {
+		size_t bufOffset = (size_t)(fileOffset - ioBuf->filePos);
+		ioBuf->ptr = &ioBuf->data[bufOffset];
+	} else {
+		FillBuffer ( fileRef, fileOffset, ioBuf );
+	}
+}
+
+static inline void RefillBuffer ( XMP_IO* fileRef, IOBuffer* ioBuf )
+{
+	// Refill including part of the current data, seek back to the new buffer origin and read.
+	ioBuf->filePos += (ioBuf->ptr - &ioBuf->data[0]);	// ! Increment before the read.
+	size_t bufTail = ioBuf->limit - ioBuf->ptr;	// We'll re-read the tail portion of the buffer.
+	if ( bufTail > 0 ) ioBuf->filePos = fileRef->Seek ( -((XMP_Int64)bufTail), kXMP_SeekFromCurrent );
+	ioBuf->len = fileRef->Read ( &ioBuf->data[0], kIOBufferSize );
+	ioBuf->ptr = &ioBuf->data[0];
+	ioBuf->limit = ioBuf->ptr + ioBuf->len;
+}
+
+static inline bool CheckFileSpace ( XMP_IO* fileRef, IOBuffer* ioBuf, size_t neededLen )
+{
+	if ( size_t(ioBuf->limit - ioBuf->ptr) < size_t(neededLen) ) {	// ! Avoid VS.Net compare warnings.
+		RefillBuffer ( fileRef, ioBuf );
+	}
+	return (size_t(ioBuf->limit - ioBuf->ptr) >= size_t(neededLen));
+}
+
+#endif	// __XIO_hpp__
diff --git a/source/XMLParserAdapter.hpp b/source/XMLParserAdapter.hpp
new file mode 100644
index 0000000..2527862
--- /dev/null
+++ b/source/XMLParserAdapter.hpp
@@ -0,0 +1,155 @@
+#ifndef __XMLParserAdapter_hpp__
+#define __XMLParserAdapter_hpp__
+
+// =================================================================================================
+// Copyright 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.
+// =================================================================================================
+
+#include "public/include/XMP_Environment.h"	// ! Must be the first #include!
+#include "public/include/XMP_Const.h"
+
+#include "source/XMP_LibUtils.hpp"
+
+#include <string>
+#include <vector>
+
+// =================================================================================================
+// XML_Node details
+//
+// The XML_Nodes are used only during the XML/RDF parsing process. This presently uses an XML parser
+// to create an XML tree, then a recursive descent RDF recognizer to build the corresponding XMP.
+// This makes it easier to swap XML parsers and provides a clean separation of XML and RDF issues.
+// The overall parsing would be faster and use less memory if the RDF recognition were done on the
+// fly using a state machine. But it was much easier to write the recursive descent version. The
+// current implementation is pretty fast in absolute terms, so being faster might not be crucial.
+//
+// Like the XMP tree, the XML tree contains vectors of pointers for down links, and offspring have
+// a pointer to their parent. Unlike the XMP tree, this is an exact XML document tree. There are no
+// introduced top level namespace nodes or rearrangement of the nodes..
+//
+// The exact state of namespaces can vary during the XML parsing, depending on the parser in use.
+// By the time the RDF recognition is done though, the namespaces must be normalized. All of the
+// used namespaces must be registered, this is done automatically if necessary. All of the "live"
+// namespace prefixes will be unique. The ns field of an XML_Node is the namespace URI, the name
+// field contains a qualified name (prefix:local). This includes default namespace mapping, the
+// URI and prefix will be missing only for elements and attributes in no namespace.
+
+class XML_Node;
+
+typedef XML_Node *	XML_NodePtr;	// Handy for things like: XML_Node * a, b; - b is XML_Node, not XML_Node*!
+
+enum { kRootNode = 0, kElemNode = 1, kAttrNode = 2, kCDataNode = 3, kPINode = 4 };
+
+#define IsWhitespaceChar(ch)	( ((ch) == ' ') || ((ch) == 0x09) || ((ch) == 0x0A) || ((ch) == 0x0D) )
+
+typedef std::vector<XML_NodePtr>		XML_NodeVector;
+typedef XML_NodeVector::iterator		XML_NodePos;
+typedef XML_NodeVector::const_iterator	XML_cNodePos;
+
+#if 0	// Pattern for iterating over the children or attributes:
+	for ( size_t xxNum = 0, xxLim = _node_->_offspring_.size(); xxNum < xxLim; ++xxNum ) {
+		const XML_NodePtr _curr_ = _node_->_offspring_[xxNum];
+	}
+#endif
+
+class XML_Node {
+public:
+
+	// Intended for lightweight internal use. Clients are expected to use the data directly.
+	
+	XMP_Uns8		kind;
+	std::string		ns, name, value;
+	size_t          nsPrefixLen;
+	XML_NodePtr		parent;
+	XML_NodeVector	attrs;
+	XML_NodeVector	content;
+	
+	bool IsWhitespaceNode() const;
+	bool IsLeafContentNode() const;	// An empty element or one with a single character data child node.
+	bool IsEmptyLeafNode() const;
+
+	XMP_StringPtr GetAttrValue ( XMP_StringPtr attrName ) const;
+	void SetAttrValue ( XMP_StringPtr attrName, XMP_StringPtr attrValue );
+
+	XMP_StringPtr GetLeafContentValue() const;
+	std::string* GetLeafContentPtr() const;
+	void SetLeafContentValue ( XMP_StringPtr value );
+	
+	size_t CountNamedElements ( XMP_StringPtr nsURI, XMP_StringPtr localName ) const;	// Number of child elements with this name.
+	XML_NodePtr GetNamedElement ( XMP_StringPtr nsURI, XMP_StringPtr localName, size_t which = 0 );
+	
+	void Dump ( std::string * buffer );
+	void Serialize ( std::string * buffer );
+	
+	void RemoveAttrs();
+	void RemoveContent();
+	void ClearNode();
+
+	XML_Node ( XML_NodePtr _parent, XMP_StringPtr _name, XMP_Uns8 _kind )
+		: kind(_kind), name(_name), nsPrefixLen(0), parent(_parent) {};
+
+	XML_Node ( XML_NodePtr _parent, const std::string & _name, XMP_Uns8 _kind )
+		: kind(_kind), name(_name), nsPrefixLen(0), parent(_parent) {};
+
+	virtual ~XML_Node() { RemoveAttrs(); RemoveContent(); };
+
+private:
+
+	XML_Node() : kind(0), parent(0)	{};	// ! Hidden to make sure parent pointer is always set.
+
+};
+
+// =================================================================================================
+// Abstract base class for XML parser adapters used by the XMP toolkit.
+
+enum { kXMLPendingInputMax = 16 };
+
+class XMLParserAdapter {
+public:
+
+	XMLParserAdapter() : tree(0,"",kRootNode), rootNode(0), rootCount(0),
+	                     charEncoding(XMP_OptionBits(-1)), pendingCount(0),
+	                     errorCallback(0)
+	{
+		#if XMP_DebugBuild
+			parseLog = 0;
+		#endif
+	};
+
+	virtual ~XMLParserAdapter() {};
+	
+	virtual void ParseBuffer ( const void * buffer, size_t length, bool last ) = 0;
+	
+	virtual void SetErrorCallback ( GenericErrorCallback * ec )
+		{ this->errorCallback = ec; };
+
+	virtual void NotifyClient ( XMP_ErrorSeverity severity, XMP_Error & error )
+	{
+		if (this->errorCallback)
+			this->errorCallback->NotifyClient( severity, error );
+	}
+
+	XML_Node		tree;
+	XML_NodeVector	parseStack;
+	XML_NodePtr		rootNode;
+	size_t			rootCount;
+
+	XMP_OptionBits	charEncoding;
+	size_t          pendingCount;
+	unsigned char	pendingInput[kXMLPendingInputMax];	// Buffered input for character encoding checks.
+
+	GenericErrorCallback * errorCallback;	// Set if the relevant XMPCore or XMPFiles object has one.
+
+	#if XMP_DebugBuild
+		FILE * parseLog;
+	#endif
+
+};
+
+// =================================================================================================
+
+#endif	// __XMLParserAdapter_hpp__
diff --git a/source/XML_Node.cpp b/source/XML_Node.cpp
new file mode 100644
index 0000000..c71c312
--- /dev/null
+++ b/source/XML_Node.cpp
@@ -0,0 +1,473 @@
+// =================================================================================================
+// Copyright 2007 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 "public/include/XMP_Environment.h"	// ! Must be the first #include!
+#include "source/XMLParserAdapter.hpp"
+
+#include <map>
+#include <cstring>
+#include <cstdio>
+
+// ! Can't include XMP..._Impl.hpp - used by both Core and Files.
+#define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
+
+#if XMP_WinBuild
+	#define snprintf _snprintf
+	#pragma warning ( disable : 4996 )	// snprintf is safe
+#endif
+
+// =================================================================================================
+
+#if 0	// Pattern for iterating over the children or attributes:
+	for ( size_t xxNum = 0, xxLim = _node_->_offspring_->size(); xxNum < xxLim; ++xxNum ) {
+		const XML_NodePtr _curr_ = _node_->_offspring_[xxNum];
+	}
+#endif
+
+// =================================================================================================
+// XML_Node::IsWhitespaceNode
+//===========================
+
+bool XML_Node::IsWhitespaceNode() const
+{
+	if ( this->kind != kCDataNode ) return false;
+
+	for ( size_t i = 0; i < this->value.size(); ++i ) {
+		unsigned char ch = this->value[i];
+		if ( IsWhitespaceChar ( ch ) ) continue;
+		// *** Add checks for other whitespace characters.
+		return false;	// All the checks failed, this isn't whitespace.
+	}
+
+	return true;
+
+}	// XML_Node::IsWhitespaceNode
+
+// =================================================================================================
+// XML_Node::IsLeafContentNode
+//============================
+
+bool XML_Node::IsLeafContentNode() const
+{
+	if ( this->kind != kElemNode ) return false;
+	if ( this->content.size() == 0 ) return true;
+	if ( this->content.size() > 1 ) return false;
+	if ( this->content[0]->kind != kCDataNode ) return false;
+
+	return true;
+
+}	// XML_Node::IsLeafContentNode
+
+// =================================================================================================
+// XML_Node::IsEmptyLeafNode
+//==========================
+
+bool XML_Node::IsEmptyLeafNode() const
+{
+
+	if ( (this->kind != kElemNode) || (this->content.size() != 0) ) return false;
+	return true;
+
+}	// XML_Node::IsEmptyLeafNode
+
+// =================================================================================================
+// XML_Node::GetAttrValue
+//=======================
+
+XMP_StringPtr XML_Node::GetAttrValue ( XMP_StringPtr attrName ) const
+{
+
+	for ( size_t i = 0, aLim = this->attrs.size(); i < aLim; ++i ) {
+		XML_Node * attrPtr = this->attrs[i];
+		if ( ! attrPtr->ns.empty() ) continue;	// This form of GetAttrValue is for attrs in no namespace.
+		if ( attrPtr->name == attrName ) return attrPtr->value.c_str();
+	}
+
+	return 0;	// Not found.
+
+}	// XML_Node::GetAttrValue
+
+// =================================================================================================
+// XML_Node::SetAttrValue
+//=======================
+
+void XML_Node::SetAttrValue ( XMP_StringPtr attrName, XMP_StringPtr attrValue )
+{
+
+	for ( size_t i = 0, aLim = this->attrs.size(); i < aLim; ++i ) {
+		XML_Node * attrPtr = this->attrs[i];
+		if ( ! attrPtr->ns.empty() ) continue;	// This form of SetAttrValue is for attrs in no namespace.
+		if ( attrPtr->name == attrName ) {
+			attrPtr->value = attrValue;
+			return;
+		}
+	}
+
+}	// XML_Node::SetAttrValue
+
+// =================================================================================================
+// XML_Node::GetLeafContentValue
+//==============================
+
+XMP_StringPtr XML_Node::GetLeafContentValue() const
+{
+	if ( (! this->IsLeafContentNode()) || this->content.empty() ) return "";
+
+	return this->content[0]->value.c_str();
+
+}	// XML_Node::GetLeafContentValue
+
+// =================================================================================================
+// XML_Node::GetLeafContentValue
+//==============================
+
+std::string* XML_Node::GetLeafContentPtr() const
+{
+	if ( (! this->IsLeafContentNode()) || this->content.empty() ) return 0;
+
+	return &this->content[0]->value;
+
+}	// XML_Node::GetLeafContentValue
+
+// =================================================================================================
+// XML_Node::SetLeafContentValue
+//==============================
+
+void XML_Node::SetLeafContentValue ( XMP_StringPtr newValue )
+{
+	XML_Node * valueNode;
+
+	if ( ! this->content.empty() ) {
+		valueNode = this->content[0];
+	} else {
+		valueNode = new XML_Node ( this, "", kCDataNode );
+		this->content.push_back ( valueNode );
+	}
+
+	valueNode->value = newValue;
+
+}	// XML_Node::SetLeafContentValue
+
+// =================================================================================================
+// XML_Node::CountNamedElements
+//=============================
+
+size_t XML_Node::CountNamedElements ( XMP_StringPtr nsURI, XMP_StringPtr localName ) const
+{
+	size_t count = 0;
+
+	for ( size_t i = 0, vLim = this->content.size(); i < vLim; ++i ) {
+		const XML_Node & child = *this->content[i];
+		if ( child.ns != nsURI ) continue;
+		if ( strcmp ( localName, child.name.c_str()+child.nsPrefixLen ) != 0 ) continue;
+		++count;
+	}
+
+	return count;
+
+}	// XML_Node::CountNamedElements
+
+// =================================================================================================
+// XML_Node::GetNamedElement
+//==========================
+
+XML_NodePtr XML_Node::GetNamedElement ( XMP_StringPtr nsURI, XMP_StringPtr localName, size_t which /* = 0 */ )
+{
+
+	for ( size_t i = 0, vLim = this->content.size(); i < vLim; ++i ) {
+		XML_Node * childPtr = this->content[i];
+		if ( childPtr->ns != nsURI ) continue;
+		if ( strcmp ( localName, childPtr->name.c_str()+childPtr->nsPrefixLen ) != 0 ) continue;
+		if ( which == 0 ) return childPtr;
+		--which;
+	}
+
+	return 0;	/// Not found.
+
+}	// XML_Node::GetNamedElement
+
+// =================================================================================================
+// DumpNodeList
+// ============
+
+static const char * kNodeKinds[] = { "root", "elem", "attr", "cdata", "pi" };
+
+static void DumpNodeList ( std::string * buffer, const XML_NodeVector & list, int indent )
+{
+
+	for ( size_t i = 0, limit = list.size(); i < limit; ++i ) {
+
+		const XML_Node * node = list[i];
+
+		for ( int t = indent; t > 0; --t ) *buffer += "  ";
+		if ( node->IsWhitespaceNode() ) {
+			*buffer += "-- whitespace --\n";
+			continue;
+		}
+
+		*buffer += node->name;
+		*buffer += " - ";
+		*buffer += kNodeKinds[node->kind];
+		if ( ! node->value.empty() ) {
+			*buffer += ", value=\"";
+			*buffer += node->value;
+			*buffer += "\"";
+		}
+		if ( ! node->ns.empty() ) {
+			*buffer += ", ns=\"";
+			*buffer += node->ns;
+			*buffer += "\"";
+		}
+		if ( node->nsPrefixLen != 0 ) {
+			*buffer += ", prefixLen=";
+			char numBuf [20];
+			snprintf ( numBuf, sizeof(numBuf), "%d", (int)node->nsPrefixLen );
+			*buffer += numBuf;
+		}
+		*buffer += "\n";
+
+		if ( ! node->attrs.empty() ) {
+			for ( int t = indent+1; t > 0; --t ) *buffer += "  ";
+			*buffer += "attrs:\n";
+			DumpNodeList ( buffer, node->attrs, indent+2 );
+		}
+
+		if ( ! node->content.empty() ) {
+			DumpNodeList ( buffer, node->content, indent+1 );
+		}
+
+	}
+
+}	// DumpNodeList
+
+// =================================================================================================
+// XML_Node::Dump
+//===============
+
+void XML_Node::Dump ( std::string * buffer )
+{
+
+	*buffer = "Dump of XML_Node tree\n";
+
+	*buffer += "Root info: name=\"";
+	*buffer += this->name;
+	*buffer += "\", value=\"";
+	*buffer += this->value;
+	*buffer += "\", ns=\"";
+	*buffer += this->ns;
+	*buffer += "\", kind=";
+	*buffer += kNodeKinds[this->kind];
+	*buffer += "\n";
+
+	if ( ! this->attrs.empty() ) {
+		*buffer += "  attrs:\n";
+		DumpNodeList ( buffer, this->attrs, 2 );
+	}
+	*buffer += "\n";
+
+	DumpNodeList ( buffer, this->content, 0 );
+
+}	// XML_Node::Dump
+
+// =================================================================================================
+// SerializeOneNode
+// ================
+
+static void SerializeOneNode ( std::string * buffer, const XML_Node & node )
+{
+	size_t i, limit;
+	XMP_StringPtr namePtr = node.name.c_str();
+	if ( XMP_LitNMatch ( namePtr, "_dflt_:", 7 ) ) namePtr += 7;	// Hack for default namespaces.
+
+	switch ( node.kind ) {
+
+		case kElemNode:
+			*buffer += '<';
+			*buffer += namePtr;
+			for ( i = 0, limit = node.attrs.size(); i < limit; ++i ) {
+				SerializeOneNode ( buffer, *node.attrs[i] );
+			}
+			if ( node.content.empty() ) {
+				*buffer += "/>";
+			} else {
+				*buffer += '>';
+				for ( i = 0, limit = node.content.size(); i < limit; ++i ) {
+					SerializeOneNode ( buffer, *node.content[i] );
+				}
+				*buffer += "</";
+				*buffer += namePtr;
+				*buffer += '>';
+			}
+			break;
+
+		case kAttrNode:
+			*buffer += ' ';
+			*buffer += namePtr;
+			*buffer += "=\"";
+			*buffer += node.value;
+			*buffer += '"';
+			break;
+
+		case kCDataNode:
+			*buffer += node.value;
+			break;
+
+		case kPINode:
+			*buffer += node.value;	// *** Note that we're dropping PIs during the Expat parse.
+			break;
+
+	}
+
+}	// SerializeOneNode
+
+// =================================================================================================
+// CollectNamespaceDecls
+// =====================
+
+typedef std::map < std::string, std::string > NamespaceMap;
+
+static void CollectNamespaceDecls ( NamespaceMap * nsMap, const XML_Node & node )
+{
+	size_t i, limit;
+
+	if ( ! node.ns.empty() ) {
+		size_t nameMid = 0;
+		while ( node.name[nameMid] != ':' ) ++nameMid;
+		std::string prefix = node.name.substr ( 0, nameMid );
+		(*nsMap)[prefix] = node.ns;
+	}
+
+	if ( node.kind == kElemNode ) {
+
+		for ( i = 0, limit = node.attrs.size(); i < limit; ++i ) {
+			CollectNamespaceDecls ( nsMap, *node.attrs[i] );
+		}
+
+		for ( i = 0, limit = node.content.size(); i < limit; ++i ) {
+			const XML_Node & content = *node.content[i];
+			if ( content.kind == kElemNode ) CollectNamespaceDecls ( nsMap, content );
+		}
+
+	}
+
+}	// CollectNamespaceDecls
+
+// =================================================================================================
+// XML_Node::Serialize
+//====================
+
+void XML_Node::Serialize ( std::string * buffer )
+{
+	buffer->erase();
+
+	if ( this->kind != kRootNode ) {
+
+		SerializeOneNode ( buffer, *this );
+
+	} else {
+
+		// Do the outermost level here, in order to add the XML version and namespace declarations.
+
+		*buffer += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+
+		for ( size_t outer = 0, oLimit = this->content.size(); outer < oLimit; ++outer ) {
+
+			const XML_Node & node = *this->content[outer];
+
+			if ( node.kind != kElemNode ) {
+
+				SerializeOneNode ( buffer, node );
+
+			} else {
+
+				XMP_StringPtr namePtr = node.name.c_str();
+				if ( XMP_LitNMatch ( namePtr, "_dflt_:", 7 ) ) namePtr += 7;	// Hack for default namespaces.
+
+				*buffer += '<';
+				*buffer += namePtr;
+
+				NamespaceMap nsMap;
+				CollectNamespaceDecls ( &nsMap, node );
+				NamespaceMap::iterator nsDecl = nsMap.begin();
+				NamespaceMap::iterator nsEnd  = nsMap.end();
+				for ( ; nsDecl != nsEnd; ++nsDecl ) {
+					const std::string & prefix = nsDecl->first;
+					*buffer += " xmlns";
+					if ( prefix != "_dflt_" ) { *buffer += ':'; *buffer += prefix; }
+					*buffer += "=\"";
+					*buffer += nsDecl->second;
+					*buffer += '"';
+				}
+
+				for ( size_t attr = 0, aLimit = node.attrs.size(); attr < aLimit; ++attr ) {
+					SerializeOneNode ( buffer, *node.attrs[attr] );
+				}
+
+				if ( node.content.empty() ) {
+					*buffer += "/>";
+				} else {
+					*buffer += '>';
+					for ( size_t child = 0, cLimit = node.content.size(); child < cLimit; ++child ) {
+						SerializeOneNode ( buffer, *node.content[child] );
+					}
+					*buffer += "</";
+					*buffer += namePtr;
+					*buffer += '>';
+				}
+
+			}
+
+		}
+
+	}
+
+
+}	// XML_Node::Serialize
+
+// =================================================================================================
+// XML_Node::RemoveAttrs
+//======================
+
+void XML_Node::RemoveAttrs()
+{
+
+	for ( size_t i = 0, vLim = this->attrs.size(); i < vLim; ++i ) delete this->attrs[i];
+	this->attrs.clear();
+
+}	// XML_Node::RemoveAttrs
+
+// =================================================================================================
+// XML_Node::RemoveContent
+//========================
+
+void XML_Node::RemoveContent()
+{
+
+	for ( size_t i = 0, vLim = this->content.size(); i < vLim; ++i ) delete this->content[i];
+	this->content.clear();
+
+}	// XML_Node::RemoveContent
+
+// =================================================================================================
+// XML_Node::ClearNode
+//====================
+
+void XML_Node::ClearNode()
+{
+
+	this->kind = 0;
+	this->ns.erase();
+	this->name.erase();
+	this->value.erase();
+
+	this->RemoveAttrs();
+	this->RemoveContent();
+
+}	// XML_Node::ClearNode
+
+// =================================================================================================
diff --git a/source/XMPFiles_IO.cpp b/source/XMPFiles_IO.cpp
new file mode 100644
index 0000000..83507bf
--- /dev/null
+++ b/source/XMPFiles_IO.cpp
@@ -0,0 +1,388 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "source/XMP_LibUtils.hpp"
+#include "source/XMPFiles_IO.hpp"
+#include "source/XIO.hpp"
+
+
+#define EMPTY_FILE_PATH ""
+#define XMP_FILESIO_STATIC_START try { int a;
+#define XMP_FILESIO_STATIC_END1(errorCallbackPtr, filePath, severity)											\
+		a = 1;																									\
+	} catch ( XMP_Error & error ) {																				\
+		if ( (errorCallbackPtr) != NULL ) (errorCallbackPtr)->NotifyClient ( (severity), error, (filePath) );	\
+		else throw;																								\
+	}
+#define XMP_FILESIO_START try { int b;
+#define XMP_FILESIO_END1(severity)																				\
+		b = 1;																									\
+	} catch ( XMP_Error & error ) {																				\
+		if ( errorCallback != NULL ) errorCallback->NotifyClient ( (severity), error, filePath.c_str() );		\
+		else throw;																								\
+	}
+#define XMP_FILESIO_END2(filePath, severity)																	\
+		b = 1;																									\
+	} catch ( XMP_Error & error ) {																				\
+		if ( errorCallback != NULL ) errorCallback->NotifyClient ( (severity), error, (filePath) );				\
+		else throw;																								\
+	}
+#define XMP_FILESIO_STATIC_NOTIFY_ERROR(errorCallbackPtr, filePath, severity, error)							\
+	if ( (errorCallbackPtr) != NULL ) errorCallbackPtr->NotifyClient ( (severity), (error), (filePath) );
+#define XMP_FILESIO_NOTIFY_ERROR(filePath, severity, error)														\
+	XMP_FILESIO_STATIC_NOTIFY_ERROR(errorCallback, (filePath), (severity), (error))
+
+
+// =================================================================================================
+// XMPFiles_IO::New_XMPFiles_IO
+// ============================
+
+/* class static */
+XMPFiles_IO * XMPFiles_IO::New_XMPFiles_IO (
+	const char * filePath,
+	bool readOnly,
+	GenericErrorCallback * _errorCallback,
+	XMP_ProgressTracker * _progressTracker )
+{
+	XMP_FILESIO_STATIC_START
+	Host_IO::FileRef hostFile = Host_IO::noFileRef;
+	
+	switch ( Host_IO::GetFileMode ( filePath ) ) {
+		case Host_IO::kFMode_IsFile:
+			hostFile = Host_IO::Open ( filePath, readOnly );
+			break;
+		case Host_IO::kFMode_DoesNotExist:
+			break;
+		default:
+			XMP_Throw ( "New_XMPFiles_IO, path must be a file or not exist", kXMPErr_FilePathNotAFile );
+	}
+	if ( hostFile == Host_IO::noFileRef ) {
+		XMP_Error error (kXMPErr_NoFile, "New_XMPFiles_IO, file does not exist");
+		XMP_FILESIO_STATIC_NOTIFY_ERROR ( _errorCallback, filePath, kXMPErrSev_Recoverable, error );
+		return 0;
+	}
+
+	Host_IO::Rewind ( hostFile );	// Make sure offset really is 0.
+
+	XMPFiles_IO * newFile = new XMPFiles_IO ( hostFile, filePath, readOnly, _errorCallback, _progressTracker );
+	return newFile;
+	XMP_FILESIO_STATIC_END1 ( _errorCallback, filePath, kXMPErrSev_FileFatal )
+	return NULL;
+
+}	// XMPFiles_IO::New_XMPFiles_IO
+
+// =================================================================================================
+// XMPFiles_IO::XMPFiles_IO
+// ========================
+
+XMPFiles_IO::XMPFiles_IO (
+	Host_IO::FileRef hostFile,
+	const char * _filePath,
+	bool _readOnly,
+	GenericErrorCallback * _errorCallback,
+	XMP_ProgressTracker * _progressTracker )
+	: readOnly(_readOnly)
+	, filePath(_filePath)
+	, fileRef(hostFile)
+	, currOffset(0)
+	, isTemp(false)
+	, derivedTemp(0)
+	, progressTracker(_progressTracker)
+	, errorCallback(_errorCallback)
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+
+	this->currLength = Host_IO::Length ( this->fileRef );
+	XMP_FILESIO_END2 ( _filePath, kXMPErrSev_FileFatal )
+}	// XMPFiles_IO::XMPFiles_IO
+
+// =================================================================================================
+// XMPFiles_IO::~XMPFiles_IO
+// =========================
+
+XMPFiles_IO::~XMPFiles_IO()
+{
+	try {
+		XMP_FILESIO_START
+		if ( this->derivedTemp != 0 ) this->DeleteTemp();
+		if ( this->fileRef != Host_IO::noFileRef ) Host_IO::Close ( this->fileRef );
+		if ( this->isTemp && (! this->filePath.empty()) ) Host_IO::Delete ( this->filePath.c_str() );
+		XMP_FILESIO_END1 ( kXMPErrSev_Recoverable )
+	} catch ( ... ) {
+		// All of the above is fail-safe cleanup, ignore problems.
+	}
+}	// XMPFiles_IO::~XMPFiles_IO
+
+// =================================================================================================
+// XMPFiles_IO::operator=
+// ======================
+
+void XMPFiles_IO::operator = ( const XMP_IO& in )
+{
+	XMP_FILESIO_START
+	XMP_Throw ( "No assignment for XMPFiles_IO", kXMPErr_InternalFailure );
+	XMP_FILESIO_END1 ( kXMPErrSev_OperationFatal )
+
+};	// XMPFiles_IO::operator=
+
+// =================================================================================================
+// XMPFiles_IO::Read
+// =================
+
+XMP_Uns32 XMPFiles_IO::Read ( void * buffer, XMP_Uns32 count, bool readAll /* = false */ )
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+	XMP_Assert ( this->currOffset == Host_IO::Offset ( this->fileRef ) );
+	XMP_Assert ( this->currLength == Host_IO::Length ( this->fileRef ) );
+	XMP_Assert ( this->currOffset <= this->currLength );
+
+	if ( count > (this->currLength - this->currOffset) ) {
+		if ( readAll ) XMP_Throw ( "XMPFiles_IO::Read, not enough data", kXMPErr_EnforceFailure );
+		count = (XMP_Uns32) (this->currLength - this->currOffset);
+	}
+
+	XMP_Uns32 amountRead = Host_IO::Read ( this->fileRef, buffer, count );
+	XMP_Enforce ( amountRead == count );
+
+	this->currOffset += amountRead;
+	return amountRead;
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal )
+	return 0;
+
+}	// XMPFiles_IO::Read
+
+// =================================================================================================
+// XMPFiles_IO::Write
+// ==================
+
+void XMPFiles_IO::Write ( const void * buffer, XMP_Uns32 count )
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+	XMP_Assert ( this->currOffset == Host_IO::Offset ( this->fileRef ) );
+	XMP_Assert ( this->currLength == Host_IO::Length ( this->fileRef ) );
+	XMP_Assert ( this->currOffset <= this->currLength );
+
+	try {
+		if ( this->readOnly )
+			XMP_Throw ( "New_XMPFiles_IO, write not permitted on read only file", kXMPErr_FilePermission );
+		Host_IO::Write ( this->fileRef, buffer, count );
+		if ( this->progressTracker != 0 ) this->progressTracker->AddWorkDone ( (float) count );
+	} catch ( ... ) {
+		try {
+			// we should try to maintain the state as best as possible
+			// but no exception should escape from this backup plan.
+			// Make sure the internal state reflects partial writes.
+			this->currOffset = Host_IO::Offset ( this->fileRef );
+			this->currLength = Host_IO::Length ( this->fileRef );
+		} catch ( ... ) {
+			// don't do anything
+		}
+		throw;
+	}
+
+	this->currOffset += count;
+	if ( this->currOffset > this->currLength ) this->currLength = this->currOffset;
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal )
+
+}	// XMPFiles_IO::Write
+
+// =================================================================================================
+// XMPFiles_IO::Seek
+// =================
+
+XMP_Int64 XMPFiles_IO::Seek ( XMP_Int64 offset, SeekMode mode )
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+	XMP_Assert ( this->currOffset == Host_IO::Offset ( this->fileRef ) );
+	XMP_Assert ( this->currLength == Host_IO::Length ( this->fileRef ) );
+
+	XMP_Int64 newOffset = offset;
+	if ( mode == kXMP_SeekFromCurrent ) {
+		newOffset += this->currOffset;
+	} else if ( mode == kXMP_SeekFromEnd ) {
+		newOffset += this->currLength;
+	}
+	XMP_Enforce ( newOffset >= 0 );
+
+	if ( newOffset <= this->currLength ) {
+		this->currOffset = Host_IO::Seek ( this->fileRef, offset, mode );
+	} else if ( this->readOnly ) {
+		XMP_Throw ( "XMPFiles_IO::Seek, read-only seek beyond EOF", kXMPErr_EnforceFailure );
+	} else {
+		Host_IO::SetEOF ( this->fileRef, newOffset );	// Extend a file open for writing.
+		this->currLength = newOffset;
+		this->currOffset = Host_IO::Seek ( this->fileRef, 0, kXMP_SeekFromEnd );
+	}
+
+	XMP_Assert ( this->currOffset == newOffset );
+	return this->currOffset;
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal );
+	return -1;
+
+}	// XMPFiles_IO::Seek
+
+// =================================================================================================
+// XMPFiles_IO::Length
+// ===================
+
+XMP_Int64 XMPFiles_IO::Length()
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+	XMP_Assert ( this->currOffset == Host_IO::Offset ( this->fileRef ) );
+	XMP_Assert ( this->currLength == Host_IO::Length ( this->fileRef ) );
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal )
+	return this->currLength;
+
+}	// XMPFiles_IO::Length
+
+// =================================================================================================
+// XMPFiles_IO::Truncate
+// =====================
+
+void XMPFiles_IO::Truncate ( XMP_Int64 length )
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+	XMP_Assert ( this->currOffset == Host_IO::Offset ( this->fileRef ) );
+	XMP_Assert ( this->currLength == Host_IO::Length ( this->fileRef ) );
+
+	if ( this->readOnly )
+		XMP_Throw ( "New_XMPFiles_IO, truncate not permitted on read only file", kXMPErr_FilePermission );
+
+	XMP_Enforce ( length <= this->currLength );
+	Host_IO::SetEOF ( this->fileRef, length );
+
+	this->currLength = length;
+	if ( this->currOffset > this->currLength ) this->currOffset = this->currLength;
+
+	// ! Seek to the expected offset, some versions of Host_IO::SetEOF implicitly seek to EOF.
+	Host_IO::Seek ( this->fileRef, this->currOffset, kXMP_SeekFromStart );
+	XMP_Assert ( this->currOffset == Host_IO::Offset ( this->fileRef ) );
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal )
+
+}	// XMPFiles_IO::Truncate
+
+// =================================================================================================
+// XMPFiles_IO::DeriveTemp
+// =======================
+
+XMP_IO* XMPFiles_IO::DeriveTemp()
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+
+	if ( this->derivedTemp != 0 ) return this->derivedTemp;
+
+	if ( this->readOnly ) {
+		XMP_Throw ( "XMPFiles_IO::DeriveTemp, can't derive from read-only", kXMPErr_InternalFailure );
+	}
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal )
+
+	std::string tempPath;
+
+	XMP_FILESIO_START
+	tempPath = Host_IO::CreateTemp ( this->filePath.c_str() );
+
+	XMPFiles_IO* newTemp = XMPFiles_IO::New_XMPFiles_IO ( tempPath.c_str(), Host_IO::openReadWrite );
+	if ( newTemp == 0 ) {
+		Host_IO::Delete ( tempPath.c_str() );
+		XMP_Throw ( "XMPFiles_IO::DeriveTemp, can't open temp file", kXMPErr_InternalFailure );
+	}
+
+	newTemp->isTemp = true;
+	this->derivedTemp = newTemp;
+	newTemp->progressTracker = this->progressTracker;	// Automatically track writes to the temp file.
+	XMP_FILESIO_END2 ( tempPath.c_str(), kXMPErrSev_FileFatal )
+	return this->derivedTemp;
+
+}	// XMPFiles_IO::DeriveTemp
+
+// =================================================================================================
+// XMPFiles_IO::AbsorbTemp
+// =======================
+
+void XMPFiles_IO::AbsorbTemp()
+{
+	XMP_FILESIO_START
+	XMP_Assert ( this->fileRef != Host_IO::noFileRef );
+
+	XMPFiles_IO * temp = this->derivedTemp;
+	if ( temp == 0 ) {
+		XMP_Throw ( "XMPFiles_IO::AbsorbTemp, no temp to absorb", kXMPErr_InternalFailure );
+	}
+	XMP_Assert ( temp->isTemp );
+
+	this->Close();
+	temp->Close();
+
+	Host_IO::SwapData ( this->filePath.c_str(), temp->filePath.c_str() );
+	this->DeleteTemp();
+
+	this->fileRef = Host_IO::Open ( this->filePath.c_str(), Host_IO::openReadWrite );
+	this->currLength = Host_IO::Length ( this->fileRef );
+	this->currOffset = 0;
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal )
+
+}	// XMPFiles_IO::AbsorbTemp
+
+// =================================================================================================
+// XMPFiles_IO::DeleteTemp
+// =======================
+
+void XMPFiles_IO::DeleteTemp()
+{
+	XMP_FILESIO_START
+	XMPFiles_IO * temp = this->derivedTemp;
+
+	if ( temp != 0 ) {
+
+		if ( temp->fileRef != Host_IO::noFileRef ) {
+			Host_IO::Close ( temp->fileRef );
+			temp->fileRef = Host_IO::noFileRef;
+		}
+
+		if ( ! temp->filePath.empty() ) {
+			Host_IO::Delete ( temp->filePath.c_str() );
+			temp->filePath.erase();
+		}
+
+		delete temp;
+		this->derivedTemp = 0;
+
+	}
+	XMP_FILESIO_END2 ( this->derivedTemp->filePath.c_str(), kXMPErrSev_FileFatal )
+
+}	// XMPFiles_IO::DeleteTemp
+
+// =================================================================================================
+// XMPFiles_IO::Close
+// ==================
+
+void XMPFiles_IO::Close()
+{
+	XMP_FILESIO_START
+	if ( this->fileRef != Host_IO::noFileRef ) {
+		Host_IO::Close ( this->fileRef );
+		this->fileRef = Host_IO::noFileRef;
+	}
+	XMP_FILESIO_END1 ( kXMPErrSev_FileFatal )
+
+}	// XMPFiles_IO::Close
+
+// =================================================================================================
diff --git a/source/XMPFiles_IO.hpp b/source/XMPFiles_IO.hpp
new file mode 100644
index 0000000..728641f
--- /dev/null
+++ b/source/XMPFiles_IO.hpp
@@ -0,0 +1,97 @@
+#ifndef __XMPFiles_IO_hpp__
+#define __XMPFiles_IO_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2010 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+#include "public/include/XMP_IO.hpp"
+
+#include "source/Host_IO.hpp"
+#include "source/XMP_ProgressTracker.hpp"
+#include "XMP_LibUtils.hpp"
+
+#include <string>
+
+// =================================================================================================
+
+class XMPFiles_IO : public XMP_IO {
+	// Implementation class for I/O inside XMPFiles, uses host O/S file services. All of the common
+	// functions behave as described for XMP_IO. Use openReadOnly and openReadWrite constants from
+	// Host_IO for the readOnly parameter to the constructors.
+public:
+	static XMPFiles_IO * New_XMPFiles_IO(
+		const char * filePath,
+		bool readOnly,
+		GenericErrorCallback * _errorCallback = 0,
+		XMP_ProgressTracker * _progressTracker = 0);
+
+	XMPFiles_IO(Host_IO::FileRef hostFile,
+		const char * filePath,
+		bool readOnly, 
+		GenericErrorCallback* _errorCallback = 0,
+		XMP_ProgressTracker * _progressTracker = 0);
+
+	virtual ~XMPFiles_IO();
+
+	XMP_Uns32 Read(void * buffer, XMP_Uns32 count, bool readAll = false);
+
+	void Write(const void * buffer, XMP_Uns32 count);
+
+	XMP_Int64 Seek(XMP_Int64 offset, SeekMode mode);
+
+	XMP_Int64 Length();
+
+	void Truncate(XMP_Int64 length);
+
+	XMP_IO * DeriveTemp();
+	void AbsorbTemp();
+	void DeleteTemp();
+	
+	void SetProgressTracker(XMP_ProgressTracker * _progressTracker) {
+		this->progressTracker = _progressTracker;
+	};
+
+	void SetErrorCallback(GenericErrorCallback & _errorCallback) {
+		this->errorCallback = &_errorCallback;
+	};
+
+	void Close();	// Not part of XMP_IO, added here to let errors propagate.
+
+private:
+	bool					readOnly;
+	std::string				filePath;
+	Host_IO::FileRef		fileRef;
+	XMP_Int64				currOffset;
+	XMP_Int64				currLength;
+	bool					isTemp;
+	XMPFiles_IO *			derivedTemp;
+	
+	XMP_ProgressTracker *	progressTracker;	// ! Owned by the XMPFiles object!
+	GenericErrorCallback *	errorCallback;		// ! Owned by the XMPFiles object!
+
+	// Hidden on purpose.
+	XMPFiles_IO()
+		: fileRef(Host_IO::noFileRef)
+		, isTemp(false)
+		, derivedTemp(0)
+		, progressTracker(0) {};
+
+	// The copy constructor and assignment operators are private to prevent client use. Allowing
+	// them would require shared I/O state between XMPFiles_IO objects.
+	XMPFiles_IO(const XMPFiles_IO & original);
+	void operator = (const XMP_IO & in);
+	void operator = (const XMPFiles_IO & in);
+};
+
+// =================================================================================================
+
+#endif	// __XMPFiles_IO_hpp__
diff --git a/source/XMP_LibUtils.cpp b/source/XMP_LibUtils.cpp
new file mode 100644
index 0000000..8d62e74
--- /dev/null
+++ b/source/XMP_LibUtils.cpp
@@ -0,0 +1,705 @@
+// =================================================================================================
+// Copyright 2009 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 "public/include/XMP_Environment.h"
+
+#include "source/XMP_LibUtils.hpp"
+
+#include "source/UnicodeInlines.incl_cpp"
+
+#include <cstdio>
+#include <cstring>
+
+// =================================================================================================
+
+#ifndef TraceThreadLocks
+	#define TraceThreadLocks 0
+#endif
+
+// -------------------------------------------------------------------------------------------------
+
+extern "C" bool Initialize_LibUtils()
+{
+	return true;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+extern "C" void Terminate_LibUtils(){
+	// Nothing to do.
+}
+
+// =================================================================================================
+// Error notifications
+// =================================================================================================
+
+bool GenericErrorCallback::CheckLimitAndSeverity ( XMP_ErrorSeverity severity ) const
+{
+
+	if ( this->limit == 0 ) return true;	// Always notify if the limit is zero.
+	if ( severity < this->topSeverity ) return false;	// Don't notify, don't count.
+
+	if ( severity > this->topSeverity ) {
+		this->topSeverity = severity;
+		this->notifications = 0;
+	}
+
+	this->notifications += 1;
+	return (this->notifications <= this->limit);
+
+}	// GenericErrorCallback::CheckLimitAndSeverity
+
+// =================================================================================================
+
+void GenericErrorCallback::NotifyClient ( XMP_ErrorSeverity severity, XMP_Error & error, XMP_StringPtr filePath /*= 0 */ ) const
+{
+	bool notifyClient = CanNotify() && !error.IsNotified();
+	bool returnAndRecover (severity == kXMPErrSev_Recoverable);
+
+	if ( notifyClient ) {
+		error.SetNotified();
+		notifyClient = CheckLimitAndSeverity ( severity );
+		if ( notifyClient ) {
+			returnAndRecover &= ClientCallbackWrapper( filePath, severity, error.GetID(), error.GetErrMsg() );
+		}
+	}
+
+	if ( ! returnAndRecover ) XMP_Error_Throw ( error );
+
+}
+
+// =================================================================================================
+// Thread synchronization locks
+// =================================================================================================
+
+XMP_ReadWriteLock::XMP_ReadWriteLock() : beingWritten(false)
+{
+	#if XMP_DebugBuild && HaveAtomicIncrDecr
+		this->lockCount = 0;
+		// Atomic counter must be 32 or 64 bits and naturally aligned.
+		size_t counterSize = sizeof ( XMP_AtomicCounter );
+		size_t counterOffset = XMP_OffsetOf ( XMP_ReadWriteLock, lockCount );
+		XMP_Assert ( (counterSize == 4) || (counterSize == 8) );	// Counter must be 32 or 64 bits.
+		XMP_Assert ( (counterOffset & (counterSize-1)) == 0 );		// Counter must be naturally aligned.
+	#endif
+	XMP_BasicRWLock_Initialize ( this->lock );
+	#if TraceThreadLocks
+		fprintf ( stderr, "Created lock %.8X\n", this );
+	#endif
+}
+
+// ---------------------------------------------------------------------------------------------
+
+XMP_ReadWriteLock::~XMP_ReadWriteLock()
+{
+	#if TraceThreadLocks
+		fprintf ( stderr, "Deleting lock %.8X\n", this );
+	#endif
+	#if XMP_DebugBuild && HaveAtomicIncrDecr
+		XMP_Assert ( this->lockCount == 0 );
+	#endif
+	XMP_BasicRWLock_Terminate ( this->lock );
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void XMP_ReadWriteLock::Acquire ( bool forWriting )
+{
+	#if TraceThreadLocks
+		fprintf ( stderr, "Acquiring lock %.8X for %s, count %d%s\n",
+				  this, (forWriting ? "writing" : "reading"), this->lockCount, (this->beingWritten ? ", being written" : "") );
+	#endif
+
+	if ( forWriting ) {
+		XMP_BasicRWLock_AcquireForWrite ( this->lock );
+		#if XMP_DebugBuild && HaveAtomicIncrDecr
+			XMP_Assert ( this->lockCount == 0 );
+		#endif
+	} else {
+		XMP_BasicRWLock_AcquireForRead ( this->lock );
+		XMP_Assert ( ! this->beingWritten );
+	}
+	#if XMP_DebugBuild && HaveAtomicIncrDecr
+		XMP_AtomicIncrement ( this->lockCount );
+	#endif
+	this->beingWritten = forWriting;
+
+	#if TraceThreadLocks
+		fprintf ( stderr, "Acquired lock %.8X for %s, count %d%s\n",
+				  this, (forWriting ? "writing" : "reading"), this->lockCount, (this->beingWritten ? ", being written" : "") );
+	#endif
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void XMP_ReadWriteLock::Release()
+{
+	#if TraceThreadLocks
+		fprintf ( stderr, "Releasing lock %.8X, count %d%s\n", this, this->lockCount, (this->beingWritten ? ", being written" : "") );
+	#endif
+
+	#if XMP_DebugBuild && HaveAtomicIncrDecr
+		XMP_Assert ( this->lockCount > 0 );
+		XMP_AtomicDecrement ( this->lockCount );	// ! Do these before unlocking, that might release a waiting thread.
+	#endif
+	bool forWriting = this->beingWritten;
+	this->beingWritten = false;
+
+	if ( forWriting ) {
+		XMP_BasicRWLock_ReleaseFromWrite ( this->lock );
+	} else {
+		XMP_BasicRWLock_ReleaseFromRead ( this->lock );
+	}
+
+	#if TraceThreadLocks
+		fprintf ( stderr, "Released lock %.8X, count %d%s\n", this, this->lockCount, (this->beingWritten ? ", being written" : "") );
+	#endif
+}
+
+// =================================================================================================
+
+#if UseHomeGrownLock
+
+	#if XMP_MacBuild | XMP_UNIXBuild | XMP_iOSBuild
+
+		// -----------------------------------------------------------------------------------------
+
+		// About pthread mutexes and conditions:
+		//
+		// The mutex protecting the condition must be locked before waiting for the condition. A
+		// thread can wait for a condition to be signaled by calling the pthread_cond_wait
+		// subroutine. The subroutine atomically unlocks the mutex and blocks the calling thread
+		// until the condition is signaled. When the call returns, the mutex is locked again.
+
+		#define InitializeBasicMutex(mutex)	{ int err = pthread_mutex_init ( &mutex, 0 ); XMP_Enforce ( err == 0 ); }
+		#define TerminateBasicMutex(mutex)	{ int err = pthread_mutex_destroy ( &mutex ); XMP_Enforce ( err == 0 ); }
+
+		#define AcquireBasicMutex(mutex)	{ int err = pthread_mutex_lock ( &mutex ); XMP_Enforce ( err == 0 ); }
+		#define ReleaseBasicMutex(mutex)	{ int err = pthread_mutex_unlock ( &mutex ); XMP_Enforce ( err == 0 ); }
+
+		#define InitializeBasicQueue(queue)	{ int err = pthread_cond_init ( &queue, 0 ); XMP_Enforce ( err == 0 ); }
+		#define TerminateBasicQueue(queue)	{ int err = pthread_cond_destroy ( &queue ); XMP_Enforce ( err == 0 ); }
+
+		#define WaitOnBasicQueue(queue,mutex)	{ int err = pthread_cond_wait ( &queue, &mutex ); XMP_Enforce ( err == 0 ); }
+		#define ReleaseOneBasicQueue(queue)		{ int err = pthread_cond_signal ( &queue ); XMP_Enforce ( err == 0 ); }
+		#define ReleaseAllBasicQueue(queue)		{ int err = pthread_cond_broadcast ( &queue ); XMP_Enforce ( err == 0 ); }
+
+		// -----------------------------------------------------------------------------------------
+
+	#elif XMP_WinBuild
+
+		// -----------------------------------------------------------------------------------------
+
+		#define InitializeBasicMutex(mutex)	{ InitializeCriticalSection ( &mutex ); }
+		#define TerminateBasicMutex(mutex)	{ DeleteCriticalSection ( &mutex ); }
+
+		#define AcquireBasicMutex(mutex)	{ EnterCriticalSection ( &mutex ); }
+		#define ReleaseBasicMutex(mutex)	{ LeaveCriticalSection ( &mutex ); }
+
+		#if ! BuildLocksForWinXP
+
+			// About Win32 condition variables (not on XP):
+			//
+			// Condition variables enable threads to atomically release a lock and enter the
+			// sleeping state. They can be used with critical sections or slim reader/writer (SRW)
+			// locks. Condition variables support operations that "wake one" or "wake all" waiting
+			// threads. After a thread is woken, it re-acquires the lock it released when the thread
+			// entered the sleeping state.
+
+			#define InitializeBasicQueue(queue)	{ InitializeConditionVariable ( &queue ); }
+			#define TerminateBasicQueue(queue)	/* Do nothing. */
+
+			#define WaitOnBasicQueue(queue,mutex)	\
+				{ BOOL ok = SleepConditionVariableCS ( &queue, &mutex, INFINITE /* timeout */ ); XMP_Enforce ( ok ); }
+
+			#define ReleaseOneBasicQueue(queue)	{ WakeConditionVariable ( &queue ); }
+			#define ReleaseAllBasicQueue(queue)	{ WakeAllConditionVariable ( &queue ); }
+
+		#else
+
+			// Need to create our own queue for Windows XP. This is not a general queue, it depends
+			// on the usage inside XMP_HomeGrownLock where the queueMutex guarantees that the
+			// queueing operations are done single threaded.
+
+			#define InitializeBasicQueue(queue)	/* Do nothing. */
+			#define TerminateBasicQueue(queue)	/* Do nothing. */
+
+			#define WaitOnBasicQueue(queue,mutex)	{ queue.Wait ( mutex ); }
+			#define ReleaseOneBasicQueue(queue)		{ queue.ReleaseOne(); }
+			#define ReleaseAllBasicQueue(queue)		{ queue.ReleaseAll(); }
+
+			// -------------------------------------------------------------------------------------
+
+			XMP_WinXP_HGQueue::XMP_WinXP_HGQueue() : queueEvent(0), waitCount(0), releaseAll(false)
+			{
+				this->queueEvent = CreateEvent ( NULL, FALSE, TRUE, NULL );	// Auto reset, initially clear.
+				XMP_Enforce ( this->queueEvent != 0 );
+			}
+
+			// -------------------------------------------------------------------------------------
+
+			XMP_WinXP_HGQueue::~XMP_WinXP_HGQueue()
+			{
+				CloseHandle ( this->queueEvent );
+			}
+
+			// -------------------------------------------------------------------------------------
+
+			void XMP_WinXP_HGQueue::Wait ( XMP_BasicMutex & queueMutex )
+			{
+				++this->waitCount;	// ! Does not need atomic increment, protected by queue mutex.
+				ReleaseBasicMutex ( queueMutex );
+				DWORD status = WaitForSingleObject ( this->queueEvent, INFINITE );
+				if ( status != WAIT_OBJECT_0 ) XMP_Throw ( "Failure from WaitForSingleObject", kXMPErr_ExternalFailure );
+				AcquireBasicMutex ( queueMutex );
+				--this->waitCount;	// ! Does not need atomic decrement, protected by queue mutex.
+
+				if ( this->releaseAll ) {
+					if ( this->waitCount == 0 ) {
+						this->releaseAll = false;
+					} else {
+						BOOL ok = SetEvent ( this->queueEvent );
+						if ( ! ok ) XMP_Throw ( "Failure from SetEvent", kXMPErr_ExternalFailure );
+					}
+				}
+			}
+
+			// -------------------------------------------------------------------------------------
+
+			void XMP_WinXP_HGQueue::ReleaseOne()
+			{
+				XMP_Assert ( ! this->releaseAll );
+				BOOL ok = SetEvent ( this->queueEvent );
+				if ( ! ok ) XMP_Throw ( "Failure from SetEvent", kXMPErr_ExternalFailure );
+			}
+
+			// -------------------------------------------------------------------------------------
+
+			void XMP_WinXP_HGQueue::ReleaseAll()
+			{
+				this->releaseAll = true;
+				BOOL ok = SetEvent ( this->queueEvent );
+				if ( ! ok ) XMP_Throw ( "Failure from SetEvent", kXMPErr_ExternalFailure );
+			}
+
+		#endif
+
+		// -----------------------------------------------------------------------------------------
+
+	#endif
+
+	// =============================================================================================
+
+	XMP_HomeGrownLock::XMP_HomeGrownLock() : lockCount(0), readersWaiting(0), writersWaiting(0), beingWritten(false)
+	{
+		InitializeBasicMutex ( this->queueMutex );
+		InitializeBasicQueue ( this->writerQueue );
+		InitializeBasicQueue ( this->readerQueue );
+	}
+
+	// =============================================================================================
+
+	XMP_HomeGrownLock::~XMP_HomeGrownLock()
+	{
+		TerminateBasicMutex ( this->queueMutex );
+		TerminateBasicQueue ( this->writerQueue );
+		TerminateBasicQueue ( this->readerQueue );
+	}
+
+	// =============================================================================================
+
+	void XMP_HomeGrownLock::AcquireForRead()
+	{
+		XMP_AutoMutex autoMutex ( &this->queueMutex );
+
+		++this->readersWaiting;	// ! Does not need atomic increment, protected by queue mutex.
+		while ( (this->beingWritten) || (this->writersWaiting > 0) ) {
+			// Don't allow more readers if writers are waiting.
+			WaitOnBasicQueue ( this->readerQueue, this->queueMutex );
+		}
+		--this->readersWaiting;	// ! Does not need atomic decrement, protected by queue mutex.
+		XMP_Assert ( ! this->beingWritten );
+
+		++this->lockCount;	// ! Does not need atomic increment, protected by queue mutex.
+	}
+
+	// =============================================================================================
+
+	void XMP_HomeGrownLock::AcquireForWrite()
+	{
+		XMP_AutoMutex autoMutex ( &this->queueMutex );
+
+		++this->writersWaiting;	// ! Does not need atomic increment, protected by queue mutex.
+		while ( this->lockCount > 0 ) {
+			WaitOnBasicQueue ( this->writerQueue, this->queueMutex );
+		}
+		--this->writersWaiting;	// ! Does not need atomic decrement, protected by queue mutex.
+		XMP_Assert ( (! this->beingWritten) && (this->lockCount == 0) );
+
+		++this->lockCount;	// ! Does not need atomic increment, protected by queue mutex.
+		this->beingWritten = true;
+	}
+
+	// =============================================================================================
+
+	void XMP_HomeGrownLock::ReleaseFromRead()
+	{
+		XMP_AutoMutex autoMutex ( &this->queueMutex );
+
+		XMP_Assert ( (! this->beingWritten) && (this->lockCount > 0) );
+		--this->lockCount;	// ! Does not need atomic decrement, protected by queue mutex.
+
+		if ( this->writersWaiting > 0 ) {
+			ReleaseOneBasicQueue ( this->writerQueue );
+		} else if ( this->readersWaiting > 0 ) {
+			ReleaseAllBasicQueue ( this->readerQueue );
+		}
+
+	}
+
+	// =============================================================================================
+
+	void XMP_HomeGrownLock::ReleaseFromWrite()
+	{
+		XMP_AutoMutex autoMutex ( &this->queueMutex );
+
+		XMP_Assert ( this->beingWritten && (this->lockCount == 1) );
+		--this->lockCount;	// ! Does not need atomic decrement, protected by queue mutex.
+		this->beingWritten = false;
+
+		if ( this->writersWaiting > 0 ) {
+			ReleaseOneBasicQueue ( this->writerQueue );
+		} else if ( this->readersWaiting > 0 ) {
+			ReleaseAllBasicQueue ( this->readerQueue );
+		}
+	}
+
+	// =============================================================================================
+
+#endif
+
+// =================================================================================================
+// Data structure dumping utilities
+// ================================
+
+void
+DumpClearString ( const XMP_VarString & value, XMP_TextOutputProc outProc, void * refCon )
+{
+
+	char buffer [20];
+	bool prevNormal;
+	XMP_Status status = 0;
+
+	XMP_StringPtr spanStart, spanEnd;
+	XMP_StringPtr valueEnd = &value[0] + value.size();
+
+	spanStart = &value[0];
+	while ( spanStart < valueEnd ) {
+
+		// Output the next span of regular characters.
+		for ( spanEnd = spanStart; spanEnd < valueEnd; ++spanEnd ) {
+			if ( *spanEnd > 0x7F ) break;
+			if ( (*spanEnd < 0x20) && (*spanEnd != kTab) && (*spanEnd != kLF) ) break;
+		}
+		if ( spanStart != spanEnd ) status = (*outProc) ( refCon,  spanStart, (XMP_StringLen)(spanEnd-spanStart) );
+		if ( status != 0 ) break;
+		spanStart = spanEnd;
+
+		// Output the next span of irregular characters.
+		prevNormal = true;
+		for ( spanEnd = spanStart; spanEnd < valueEnd; ++spanEnd ) {
+			if ( ((0x20 <= *spanEnd) && (*spanEnd <= 0x7F)) || (*spanEnd == kTab) || (*spanEnd == kLF) ) break;
+			char space = ' ';
+			if ( prevNormal ) space = '<';
+			status = (*outProc) ( refCon, &space, 1 );
+			if ( status != 0 ) break;
+			OutProcHexByte ( *spanEnd );
+			prevNormal = false;
+		}
+		if ( ! prevNormal ) {
+			status = (*outProc) ( refCon, ">", 1 );
+			if ( status != 0 ) return;
+		}
+		spanStart = spanEnd;
+
+	}
+
+}	// DumpClearString
+
+// -------------------------------------------------------------------------------------------------
+
+static void
+DumpStringMap ( const XMP_StringMap & map, XMP_StringPtr label, XMP_TextOutputProc outProc, void * refCon )
+{
+	XMP_cStringMapPos currPos;
+	XMP_cStringMapPos endPos = map.end();
+
+	size_t maxLen = 0;
+	for ( currPos = map.begin(); currPos != endPos; ++currPos ) {
+		size_t currLen = currPos->first.size();
+		if ( currLen > maxLen ) maxLen = currLen;
+	}
+
+	OutProcNewline();
+	OutProcLiteral ( label );
+	OutProcNewline();
+
+	for ( currPos = map.begin(); currPos != endPos; ++currPos ) {
+		OutProcNChars ( "  ", 2 );
+		DumpClearString ( currPos->first, outProc, refCon );
+		OutProcPadding ( maxLen - currPos->first.size() );
+		OutProcNChars ( " => ", 4 );
+		DumpClearString ( currPos->second, outProc, refCon );
+		OutProcNewline();
+	}
+
+}	// DumpStringMap
+
+// =================================================================================================
+// Namespace Tables
+// =================================================================================================
+
+XMP_NamespaceTable::XMP_NamespaceTable ( const XMP_NamespaceTable & presets )
+{
+	XMP_AutoLock presetLock ( &presets.lock, kXMP_ReadLock );
+
+	this->uriToPrefixMap = presets.uriToPrefixMap;
+	this->prefixToURIMap = presets.prefixToURIMap;
+
+}	// XMP_NamespaceTable::XMP_NamespaceTable
+
+// =================================================================================================
+
+bool XMP_NamespaceTable::Define ( XMP_StringPtr _uri, XMP_StringPtr _suggPrefix,
+								  XMP_StringPtr * prefixPtr, XMP_StringLen * prefixLen )
+{
+	XMP_AutoLock tableLock ( &this->lock, kXMP_WriteLock );
+	bool prefixMatches = false;
+
+	XMP_Assert ( (_uri != 0) && (*_uri != 0) && (_suggPrefix != 0) && (*_suggPrefix != 0) );
+
+	XMP_VarString	uri ( _uri );
+	XMP_VarString	suggPrefix ( _suggPrefix );
+	if ( suggPrefix[suggPrefix.size()-1] != ':' ) suggPrefix += ':';
+	VerifySimpleXMLName ( _suggPrefix, _suggPrefix+suggPrefix.size()-1 );	// Exclude the colon.
+
+	XMP_StringMapPos uriPos = this->uriToPrefixMap.find ( uri );
+
+	if ( uriPos == this->uriToPrefixMap.end() ) {
+
+		// The URI is not yet registered, make sure we use a unique prefix.
+
+		XMP_VarString uniqPrefix ( suggPrefix );
+		int  suffix = 0;
+		char buffer [32];	// AUDIT: Plenty of room for the "_%d_" suffix.
+
+		while ( true ) {
+			if ( this->prefixToURIMap.find ( uniqPrefix ) == this->prefixToURIMap.end() ) break;
+			++suffix;
+			snprintf ( buffer, sizeof(buffer), "_%d_:", suffix );	// AUDIT: Using sizeof for snprintf length is safe.
+			uniqPrefix = suggPrefix;
+			uniqPrefix.erase ( uniqPrefix.size()-1 );	// ! Remove the trailing ':'.
+			uniqPrefix += buffer;
+		}
+
+		// Add the new namespace to both maps.
+
+		XMP_StringPair newNS ( uri, uniqPrefix );
+		uriPos = this->uriToPrefixMap.insert ( this->uriToPrefixMap.end(), newNS );
+
+		newNS.first.swap ( newNS.second );
+		(void) this->prefixToURIMap.insert ( this->prefixToURIMap.end(), newNS );
+
+	}
+
+	// Return the actual prefix and see if it matches the suggested prefix.
+
+	if ( prefixPtr != 0 ) *prefixPtr = uriPos->second.c_str();
+	if ( prefixLen != 0 ) *prefixLen = (XMP_StringLen)uriPos->second.size();
+
+	prefixMatches = ( uriPos->second == suggPrefix );
+	return prefixMatches;
+
+}	// XMP_NamespaceTable::Define
+
+// =================================================================================================
+
+bool XMP_NamespaceTable::GetPrefix ( XMP_StringPtr _uri, XMP_StringPtr * prefixPtr, XMP_StringLen * prefixLen ) const
+{
+	XMP_AutoLock tableLock ( &this->lock, kXMP_ReadLock );
+	bool found = false;
+
+	XMP_Assert ( (_uri != 0) && (*_uri != 0) );
+
+	XMP_VarString uri ( _uri );
+	XMP_cStringMapPos uriPos = this->uriToPrefixMap.find ( uri );
+
+	if ( uriPos != this->uriToPrefixMap.end() ) {
+		if ( prefixPtr != 0 ) *prefixPtr = uriPos->second.c_str();
+		if ( prefixLen != 0 ) *prefixLen = (XMP_StringLen)uriPos->second.size();
+		found = true;
+	}
+
+	return found;
+
+}	// XMP_NamespaceTable::GetPrefix
+
+// =================================================================================================
+
+bool XMP_NamespaceTable::GetURI ( XMP_StringPtr _prefix, XMP_StringPtr * uriPtr, XMP_StringLen * uriLen ) const
+{
+	XMP_AutoLock tableLock ( &this->lock, kXMP_ReadLock );
+
+	bool found = false;
+
+	XMP_Assert ( (_prefix != 0) && (*_prefix != 0) );
+
+	XMP_VarString prefix ( _prefix );
+	if ( prefix[prefix.size()-1] != ':' ) prefix += ':';
+	XMP_cStringMapPos prefixPos = this->prefixToURIMap.find ( prefix );
+
+	if ( prefixPos != this->prefixToURIMap.end() ) {
+		if ( uriPtr != 0 ) *uriPtr = prefixPos->second.c_str();
+		if ( uriLen != 0 ) *uriLen = (XMP_StringLen)prefixPos->second.size();
+		found = true;
+	}
+
+	return found;
+
+}	// XMP_NamespaceTable::GetURI
+
+// =================================================================================================
+
+void XMP_NamespaceTable::Dump ( XMP_TextOutputProc outProc, void * refCon ) const
+{
+	XMP_AutoLock tableLock ( &this->lock, kXMP_ReadLock );
+
+	XMP_cStringMapPos p2uEnd = this->prefixToURIMap.end();	// ! Move up to avoid gcc complaints.
+	XMP_cStringMapPos u2pEnd = this->uriToPrefixMap.end();
+
+	DumpStringMap ( this->prefixToURIMap, "Dumping namespace prefix to URI map", outProc, refCon );
+
+	if ( this->prefixToURIMap.size() != this->uriToPrefixMap.size() ) {
+		OutProcLiteral ( "** bad namespace map sizes **" );
+		XMP_Throw ( "Fatal namespace map problem", kXMPErr_InternalFailure );
+	}
+
+	for ( XMP_cStringMapPos nsLeft = this->prefixToURIMap.begin(); nsLeft != p2uEnd; ++nsLeft ) {
+
+		XMP_cStringMapPos nsOther = this->uriToPrefixMap.find ( nsLeft->second );
+		if ( (nsOther == u2pEnd) || (nsLeft != this->prefixToURIMap.find ( nsOther->second )) ) {
+			OutProcLiteral ( "  ** bad namespace URI **  " );
+			DumpClearString ( nsLeft->second, outProc, refCon );
+			break;
+		}
+
+		for ( XMP_cStringMapPos nsRight = nsLeft; nsRight != p2uEnd; ++nsRight ) {
+			if ( nsRight == nsLeft ) continue;	// ! Can't start at nsLeft+1, no operator+!
+			if ( nsLeft->second == nsRight->second ) {
+				OutProcLiteral ( "  ** duplicate namespace URI **  " );
+				DumpClearString ( nsLeft->second, outProc, refCon );
+				break;
+			}
+		}
+
+	}
+
+	for ( XMP_cStringMapPos nsLeft = this->uriToPrefixMap.begin(); nsLeft != u2pEnd; ++nsLeft ) {
+
+		XMP_cStringMapPos nsOther = this->prefixToURIMap.find ( nsLeft->second );
+		if ( (nsOther == p2uEnd) || (nsLeft != this->uriToPrefixMap.find ( nsOther->second )) ) {
+			OutProcLiteral ( "  ** bad namespace prefix **  " );
+			DumpClearString ( nsLeft->second, outProc, refCon );
+			break;
+		}
+
+		for ( XMP_cStringMapPos nsRight = nsLeft; nsRight != u2pEnd; ++nsRight ) {
+			if ( nsRight == nsLeft ) continue;	// ! Can't start at nsLeft+1, no operator+!
+			if ( nsLeft->second == nsRight->second ) {
+				OutProcLiteral ( "  ** duplicate namespace prefix **  " );
+				DumpClearString ( nsLeft->second, outProc, refCon );
+				break;
+			}
+		}
+
+	}
+
+}	// XMP_NamespaceTable::Dump
+
+// =================================================================================================
+static XMP_Bool matchdigit ( XMP_StringPtr text ) {
+	if ( *text >= '0' && *text <= '9' )
+		return true;
+	return false;
+}
+
+static XMP_Bool matchUpperCase ( XMP_StringPtr text ) {
+	if ( *text >= 'A' && *text <= 'Z' )
+		return true;
+	return false;
+}
+
+static XMP_Bool matchLowerCase ( XMP_StringPtr text ) {
+	if ( *text >= 'a' && *text <= 'z' )
+		return true;
+	return false;
+}
+
+/* matchhere: search for regexp at beginning of text */
+static XMP_Bool matchhere ( XMP_StringPtr regexp, XMP_StringPtr text ) {
+	if ( regexp[0] == '\0' )
+		return true;
+	if ( regexp[0] == '\\' ) {
+		if ( regexp[1] == 'd' ) {
+			if ( matchdigit(text) )
+				return matchhere ( regexp+2, text+1 );
+			else
+				return false;
+		}	
+		else if ( regexp[1] == 'W' ) {
+			if ( matchUpperCase(text) )
+				return matchhere ( regexp+2, text+1 );
+			else
+				return false;
+		}
+		else if ( regexp[1] == 'w' ) {
+			if ( matchLowerCase(text) )
+				return matchhere ( regexp+2, text+1 );
+			else
+				return false;
+		}
+	}
+
+	if ( regexp[0] == '$' && regexp[1] == '\0' )
+		return *text == '\0';
+
+	if ( *text != '\0' && regexp[0] == *text )
+		return matchhere ( regexp+1, text+1 );
+	return 0;
+}
+
+/* match: search for regexp anywhere in text */
+static XMP_Bool match ( XMP_StringPtr regexp, XMP_StringPtr text ) {
+	if ( regexp[0] == '^' )
+		return matchhere ( regexp+1, text );
+	do {    /* must look even if string is empty */
+		if ( matchhere ( regexp, text ) )
+			return true;
+	} while ( *text++ != '\0' );
+	return false;
+}
+
+XMP_Bool XMP_RegExp::Match ( XMP_StringPtr s )
+{
+	if ( regExpStr.size() == 0 )
+		return true;
+	if ( s == NULL )
+		return false;
+	return match ( this->regExpStr.c_str(), s );
+}
+// =================================================================================================
diff --git a/source/XMP_LibUtils.hpp b/source/XMP_LibUtils.hpp
new file mode 100644
index 0000000..3fa7a8b
--- /dev/null
+++ b/source/XMP_LibUtils.hpp
@@ -0,0 +1,598 @@
+#ifndef __XMP_LibUtils_hpp__
+#define __XMP_LibUtils_hpp__ 1
+
+// =================================================================================================
+// Copyright 2009 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 "public/include/XMP_Environment.h"	// ! Must be the first include.
+#include "public/include/XMP_Const.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+#if XMP_DebugBuild
+	#include <cassert>
+#endif
+
+#if XMP_WinBuild
+	#ifndef snprintf
+		#define snprintf _snprintf
+	#endif
+#endif
+
+// =================================================================================================
+// Basic types, constants
+// ======================
+
+#define kTab ((char)0x09)
+#define kLF ((char)0x0A)
+#define kCR ((char)0x0D)
+
+#if XMP_WinBuild
+	#define kDirChar '\\'
+#else
+	#define kDirChar '/'
+#endif
+
+typedef std::string XMP_VarString;
+
+#define EliminateGlobal(g) delete ( g ); g = 0
+
+extern "C" bool Initialize_LibUtils();
+extern "C" void Terminate_LibUtils();
+
+#define IgnoreParam(p)	(void)p
+
+// The builtin offsetof macro sometimes violates C++ data member rules.
+#define XMP_OffsetOf(struct,field)	( (char*)(&((struct*)0x100)->field) - (char*)0x100 )
+
+// =================================================================================================
+// Support for exceptions and asserts
+// ==================================
+
+#define AnnounceThrow(msg)		/* Do nothing. */
+#define AnnounceCatch(msg)		/* Do nothing. */
+
+#define XMP_Throw(msg,id)	{ AnnounceThrow ( msg ); throw XMP_Error ( id, msg ); }
+
+#if XMP_DebugBuild
+#define XMP_Throw_Verbose(msg,e,id)						\
+{														\
+	char tmpMsg[255];									\
+	snprintf(tmpMsg, sizeof(tmpMsg), #msg "( %d )", e);	\
+	XMP_Throw( tmpMsg, id);								\
+}
+#else
+	#define XMP_Throw_Verbose(msg,e,id) XMP_Throw(msg, id)
+#endif
+
+class GenericErrorCallback {
+public:
+	// Abstract base class for XMPCore and XMPFiles internal error notification support. Needed so
+	// that the XMLParserAdapter (used by both XMPCore and XMPFiles) can send error notifications,
+	// and so that utility parts of just XMPCore or XMPFiles can avoid dependence on XMPCore.hpp or
+	// XMPFiles.hpp if that is appropriate.
+
+	XMP_Uns32					limit;
+	mutable XMP_Uns32			notifications;
+	mutable XMP_ErrorSeverity	topSeverity;
+
+	GenericErrorCallback() : limit(1), notifications(0), topSeverity(kXMPErrSev_Recoverable) {};
+	virtual ~GenericErrorCallback() {};
+
+	void Clear() { this->notifications = 0; this->limit = 1; this->topSeverity = kXMPErrSev_Recoverable; };
+
+	bool CheckLimitAndSeverity (XMP_ErrorSeverity severity ) const;
+
+	// Const so they can be used with const XMPMeta and XMPFiles objects.
+	void NotifyClient ( XMP_ErrorSeverity severity, XMP_Error & error, XMP_StringPtr filePath = 0 ) const;
+
+	virtual bool CanNotify ( ) const = 0;
+	virtual bool ClientCallbackWrapper ( XMP_StringPtr filePath, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr messsage ) const = 0;
+
+};
+
+#define XMP_Error_Throw(error)	{ AnnounceThrow (error.GetErrMsg()); throw error; }
+
+
+// -------------------------------------------------------------------------------------------------
+
+#define _MakeStr(p) #p
+#define _NotifyMsg(n,c,f,l)	#n " failed: " #c " in " f " at line " _MakeStr(l)
+#define _ExplicitMsg(msg,c,e) #e " " #msg ": " #c
+
+#define XMP_Validate(c,msg,e)									\
+	if ( ! (c) ) {												\
+		const char * validate_msg = _ExplicitMsg ( msg, c, e );	\
+		XMP_Throw ( validate_msg, e );							\
+	}
+
+// This statement is needed in XMP_Assert definition to reduce warnings from
+// static analysis tool in Visual Studio. Defined here, as platform fork not
+// possible within macro definition below
+#if XMP_WinBuild
+	#define analysis_assume(c) __analysis_assume( c );
+#else
+	#define analysis_assume(c) ((void) 0)
+#endif
+
+#if ! XMP_DebugBuild
+	#define XMP_Assert(c)	((void) 0)
+#else
+		#define XMP_Assert(c)	assert ( c )
+#endif
+
+	#define XMP_Enforce(c)																	\
+		if ( ! (c) ) {																		\
+			const char * assert_msg = _NotifyMsg ( XMP_Enforce, (c), __FILE__, __LINE__ );	\
+			XMP_Throw ( assert_msg , kXMPErr_EnforceFailure );								\
+		}
+// =================================================================================================
+// Thread synchronization locks
+// ============================
+
+// About XMP and thread synchronization
+//
+// A variety of choices are provided for thread synchronization. Exactly one method must be chosen
+// by defining the appropriate symbol to 1.
+//
+// * UseNoLock - This choice turns the synchronization functions into no-ops. It must only be used
+//   by single threaded clients, or clients providing their own control at a higher level.
+//
+// * UseGlobalLibraryLock - This choice uses a single per-library lock. The result is thread safe
+//   but unfriendly behavior, no true concurrency. This should only be used as a debugging fallback.
+//
+// * UseBoostLock - This choice uses the Boost shared_mutex mechanism. It has the advantage of being
+//   robust and being available on pretty much all platforms. It has the disadvantage of requiring
+//   the developer to download, integrate, and build the Boost thread library.
+//
+// * UsePThreadLock - This choice uses the POSIX pthread rwlock mechanism. It has the advantage of
+//   being robust and being available on any modern UNIX platform, including Mac OS X.
+//
+// * UseWinSlimLock - This choice uses the Windows slim reader/writer mechanism. It is robust but
+//   only available on Vista and newer versions of Windows, it is not available on XP.
+//
+// * UseHomeGrownLock - This choice uses local code plus lower level synchronization primitives. It
+//   has the advantage of being usable on all platforms, and having exposed and tunable policy. It
+//   has the disadvantage of possibly being less robust than Boost or the O/S provided mechanisms.
+//   The lower level synchronization primitives are pthread mutex and condition for UNIX (including
+//   Mac OS X). For Windows there is a choice of critical section and condition variable for Vista
+//   and newer; or critical section, event, and semaphore for XP and newer.
+
+#define UseHomeGrownLock 1
+
+// -------------------------------------------------------------------------------------------------
+// A basic exclusive access mutex and atomic increment/decrement operations.
+
+#if XMP_WinBuild
+
+	#include <Windows.h>
+
+	#define HaveAtomicIncrDecr 1
+	typedef LONG XMP_AtomicCounter;
+
+	#define XMP_AtomicIncrement(x)	InterlockedIncrement ( &(x) )
+	#define XMP_AtomicDecrement(x)	InterlockedDecrement ( &(x) )
+
+	typedef CRITICAL_SECTION XMP_BasicMutex;
+	
+	#define InitializeBasicMutex(mutex)	{ InitializeCriticalSection ( &mutex ); }
+	#define TerminateBasicMutex(mutex)	{ DeleteCriticalSection ( &mutex ); }
+	#define AcquireBasicMutex(mutex)	{ EnterCriticalSection ( &mutex ); }
+	#define ReleaseBasicMutex(mutex)	{ LeaveCriticalSection ( &mutex ); }
+
+#elif XMP_MacBuild | XMP_iOSBuild
+
+	#include <pthread.h>
+	#include <libkern/OSAtomic.h>
+
+	#define HaveAtomicIncrDecr 1
+	typedef int32_t XMP_AtomicCounter;
+
+	#define XMP_AtomicIncrement(x)	OSAtomicIncrement32 ( &(x) )
+	#define XMP_AtomicDecrement(x)	OSAtomicDecrement32 ( &(x) )
+
+	typedef pthread_mutex_t XMP_BasicMutex;
+
+	#define InitializeBasicMutex(mutex)	{ int err = pthread_mutex_init ( &mutex, 0 ); XMP_Enforce ( err == 0 ); }
+	#define TerminateBasicMutex(mutex)	{ int err = pthread_mutex_destroy ( &mutex ); XMP_Enforce ( err == 0 ); }
+	#define AcquireBasicMutex(mutex)	{ int err = pthread_mutex_lock ( &mutex ); XMP_Enforce ( err == 0 ); }
+	#define ReleaseBasicMutex(mutex)	{ int err = pthread_mutex_unlock ( &mutex ); XMP_Enforce ( err == 0 ); }
+
+#elif XMP_UNIXBuild
+
+	#include <pthread.h>
+
+	// Atomic increment/decrement intrinsics should be in gcc 4.1, but Solaris seems to lack them.
+	#ifndef HaveAtomicIncrDecr
+		#define HaveAtomicIncrDecr 1
+	#endif
+	#if HaveAtomicIncrDecr
+		typedef XMP_Uns32 XMP_AtomicCounter;
+		#define XMP_AtomicIncrement(x)	__sync_add_and_fetch ( &(x), 1 )
+		#define XMP_AtomicDecrement(x)	__sync_sub_and_fetch ( &(x), 1 )
+	#endif
+
+	typedef pthread_mutex_t XMP_BasicMutex;
+
+	#define InitializeBasicMutex(mutex)	{ int err = pthread_mutex_init ( &mutex, 0 ); XMP_Enforce ( err == 0 ); }
+	#define TerminateBasicMutex(mutex)	{ int err = pthread_mutex_destroy ( &mutex ); XMP_Enforce ( err == 0 ); }
+	#define AcquireBasicMutex(mutex)	{ int err = pthread_mutex_lock ( &mutex ); XMP_Enforce ( err == 0 ); }
+	#define ReleaseBasicMutex(mutex)	{ int err = pthread_mutex_unlock ( &mutex ); XMP_Enforce ( err == 0 ); }
+
+#endif
+
+class XMP_AutoMutex {
+public:
+	XMP_AutoMutex ( XMP_BasicMutex * _mutex ) : mutex(_mutex) { AcquireBasicMutex ( *this->mutex ); }
+	~XMP_AutoMutex() { this->Release(); }
+	void Release() { if ( this->mutex != 0 ) ReleaseBasicMutex ( *this->mutex ); this->mutex = 0; }
+private:
+	XMP_BasicMutex * mutex;
+	XMP_AutoMutex() {};	// ! Must not be used.
+};
+
+// -------------------------------------------------------------------------------------------------
+// Details for the various locking mechanisms.
+
+#if UseNoLock
+
+	typedef void* XMP_BasicRWLock;	// For single threaded clients that want maximum performance.
+	
+	#define XMP_BasicRWLock_Initialize(lck)			/* Do nothing. */
+	#define XMP_BasicRWLock_Terminate(lck)			/* Do nothing. */
+
+	#define XMP_BasicRWLock_AcquireForRead(lck)		/* Do nothing. */
+	#define XMP_BasicRWLock_AcquireForWrite(lck)	/* Do nothing. */
+
+	#define XMP_BasicRWLock_ReleaseFromRead(lck)	/* Do nothing. */
+	#define XMP_BasicRWLock_ReleaseFromWrite(lck)	/* Do nothing. */
+
+#elif UseGlobalLibraryLock
+	
+	extern XMP_BasicMutex sLibraryLock;
+
+	typedef void* XMP_BasicRWLock;	// Use the old thread-unfriendly per-DLL mutex.
+	
+	#define XMP_BasicRWLock_Initialize(lck)			/* Do nothing. */
+	#define XMP_BasicRWLock_Terminate(lck)			/* Do nothing. */
+
+	#define XMP_BasicRWLock_AcquireForRead(lck)		/* Do nothing. */
+	#define XMP_BasicRWLock_AcquireForWrite(lck)	/* Do nothing. */
+
+	#define XMP_BasicRWLock_ReleaseFromRead(lck)	/* Do nothing. */
+	#define XMP_BasicRWLock_ReleaseFromWrite(lck)	/* Do nothing. */
+
+#elif UseBoostLock
+
+	#include <boost/thread/shared_mutex.hpp>
+	typedef boost::shared_mutex XMP_BasicRWLock;
+	
+	#define XMP_BasicRWLock_Initialize(lck)			/* Do nothing. */
+	#define XMP_BasicRWLock_Terminate(lck)			/* Do nothing. */
+
+	#define XMP_BasicRWLock_AcquireForRead(lck)		lck.lock_shared()
+	#define XMP_BasicRWLock_AcquireForWrite(lck)	lck.lock()
+
+	#define XMP_BasicRWLock_ReleaseFromRead(lck)	lck.unlock_shared()
+	#define XMP_BasicRWLock_ReleaseFromWrite(lck)	lck.unlock()
+
+#elif UsePThreadLock
+
+	#include <pthread.h>
+	typedef pthread_rwlock_t XMP_BasicRWLock;
+	
+	#define XMP_BasicRWLock_Initialize(lck)				\
+		{ int err = pthread_rwlock_init ( &lck, 0 );	\
+		  if ( err != 0 ) XMP_Throw ( "Initialize pthread rwlock failed", kXMPErr_ExternalFailure ); }
+	#define XMP_BasicRWLock_Terminate(lck)	\
+		{ int err = pthread_rwlock_destroy ( &lck ); XMP_Assert ( err == 0 ); }
+
+	#define XMP_BasicRWLock_AcquireForRead(lck)		\
+		{ int err = pthread_rwlock_rdlock ( &lck );	\
+		  if ( err != 0 ) XMP_Throw ( "Acquire pthread read lock failed", kXMPErr_ExternalFailure ); }
+	#define XMP_BasicRWLock_AcquireForWrite(lck)	\
+		{ int err = pthread_rwlock_wrlock ( &lck );	\
+		  if ( err != 0 ) XMP_Throw ( "Acquire pthread write lock failed", kXMPErr_ExternalFailure ); }
+
+	#define XMP_BasicRWLock_ReleaseFromRead(lck)	\
+		{ int err = pthread_rwlock_unlock ( &lck );	\
+		  if ( err != 0 ) XMP_Throw ( "Release pthread read lock failed", kXMPErr_ExternalFailure ); }
+	#define XMP_BasicRWLock_ReleaseFromWrite(lck)	\
+		{ int err = pthread_rwlock_unlock ( &lck );	\
+		  if ( err != 0 ) XMP_Throw ( "Release pthread write lock failed", kXMPErr_ExternalFailure ); }
+
+#elif UseWinSlimLock
+
+	#include <Windows.h>
+	typedef SRWLOCK XMP_BasicRWLock;
+	
+	#define XMP_BasicRWLock_Initialize(lck)			InitializeSRWLock ( &lck )
+	#define XMP_BasicRWLock_Terminate(lck)			/* Do nothing. */
+
+	#define XMP_BasicRWLock_AcquireForRead(lck)		AcquireSRWLockShared ( &lck )
+	#define XMP_BasicRWLock_AcquireForWrite(lck)	AcquireSRWLockExclusive ( &lck )
+
+	#define XMP_BasicRWLock_ReleaseFromRead(lck)	ReleaseSRWLockShared ( &lck )
+	#define XMP_BasicRWLock_ReleaseFromWrite(lck)	ReleaseSRWLockExclusive ( &lck )
+
+#elif UseHomeGrownLock
+
+	class XMP_HomeGrownLock;
+	typedef XMP_HomeGrownLock XMP_BasicRWLock;
+	
+	#define XMP_BasicRWLock_Initialize(lck)			/* Do nothing. */
+	#define XMP_BasicRWLock_Terminate(lck)			/* Do nothing. */
+	#define XMP_BasicRWLock_AcquireForRead(lck)		lck.AcquireForRead()
+	#define XMP_BasicRWLock_AcquireForWrite(lck)	lck.AcquireForWrite()
+	#define XMP_BasicRWLock_ReleaseFromRead(lck)	lck.ReleaseFromRead()
+	#define XMP_BasicRWLock_ReleaseFromWrite(lck)	lck.ReleaseFromWrite()
+	
+	#if XMP_MacBuild | XMP_UNIXBuild | XMP_iOSBuild
+
+		#include <pthread.h>
+
+		typedef pthread_cond_t  XMP_BasicQueue;
+
+	#elif XMP_WinBuild
+	
+		#include <Windows.h>
+		#ifndef BuildLocksForWinXP
+			#define BuildLocksForWinXP 1
+		#endif
+
+		#if ! BuildLocksForWinXP
+			typedef CONDITION_VARIABLE XMP_BasicQueue;	// ! Requires Vista or newer.
+		#else
+			class XMP_WinXP_HGQueue {
+			public:
+				XMP_WinXP_HGQueue();
+				~XMP_WinXP_HGQueue();
+				void Wait ( XMP_BasicMutex & queueMutex );
+				void ReleaseOne();
+				void ReleaseAll();
+			private:
+				HANDLE queueEvent;
+				volatile XMP_Uns32 waitCount;	// ! Does not need to be XMP_AtomicCounter.
+				volatile bool releaseAll;
+			};
+			typedef XMP_WinXP_HGQueue XMP_BasicQueue;
+		#endif
+
+	#endif
+	
+	class XMP_HomeGrownLock {
+	public:
+		XMP_HomeGrownLock();
+		~XMP_HomeGrownLock();
+		void AcquireForRead();
+		void AcquireForWrite();
+		void ReleaseFromRead();
+		void ReleaseFromWrite();
+	private:
+		XMP_BasicMutex queueMutex;	// Used to protect queueing operations.
+		XMP_BasicQueue readerQueue, writerQueue;
+		volatile XMP_Uns32 lockCount, readersWaiting, writersWaiting;	// ! Does not need to be XMP_AtomicCounter.
+		volatile bool beingWritten;
+	};
+
+#else
+
+	#error "No locking mechanism chosen"
+
+#endif
+
+class XMP_ReadWriteLock {	// For the lock objects, use XMP_AutoLock to do the locking.
+public:
+	XMP_ReadWriteLock();
+	~XMP_ReadWriteLock();
+	void Acquire ( bool forWriting );
+	void Release();
+private:
+	XMP_BasicRWLock lock;
+	#if XMP_DebugBuild && HaveAtomicIncrDecr
+		volatile XMP_AtomicCounter lockCount;	// ! Only for debug checks, must be XMP_AtomicCounter.
+	#endif
+	volatile bool beingWritten;
+};
+
+#define kXMP_ReadLock	false
+#define kXMP_WriteLock	true
+
+class XMP_AutoLock {
+public:
+	XMP_AutoLock ( const XMP_ReadWriteLock * _lock, bool forWriting, bool cond = true ) : lock(0)
+		{
+			if ( cond ) {
+				// The cast below is needed because the _lock parameter might come from something
+				// like "const XMPMeta &", which would make the lock itself const. But we need to
+				// modify the lock (to acquire and release) even if the owning object is const.
+				this->lock = (XMP_ReadWriteLock*)_lock;
+				this->lock->Acquire ( forWriting );
+			}
+		}
+	~XMP_AutoLock() { this->Release(); }
+	void Release() { if ( this->lock != 0 ) this->lock->Release(); this->lock = 0; }
+private:
+	XMP_ReadWriteLock * lock;
+	XMP_AutoLock() {};	// ! Must not be used.
+};
+
+// =================================================================================================
+// Support for wrappers
+// ====================
+
+#define AnnounceStaticEntry(proc)			/* Do nothing. */
+#define AnnounceObjectEntry(proc,rwMode)	/* Do nothing. */
+
+#define AnnounceExit()	/* Do nothing. */
+
+// -------------------------------------------------------------------------------------------------
+
+#if UseGlobalLibraryLock
+	#define AcquireLibraryLock(lck)	XMP_AutoMutex libLock ( &lck )
+#else
+	#define AcquireLibraryLock(lck)	/* nothing */
+#endif
+
+#define XMP_ENTER_NoLock(Proc)		\
+	AnnounceStaticEntry ( Proc );	\
+	try {							\
+		wResult->SetErrMessage(0);
+
+#define XMP_ENTER_Static(Proc)				\
+	AnnounceStaticEntry ( Proc );			\
+	AcquireLibraryLock ( sLibraryLock );	\
+	try {									\
+		wResult->SetErrMessage(0);
+
+#define XMP_ENTER_ObjRead(XMPClass,Proc)				\
+	AnnounceObjectEntry ( Proc, "reader" );				\
+	AcquireLibraryLock ( sLibraryLock );				\
+	const XMPClass & thiz = *((XMPClass*)xmpObjRef);	\
+	XMP_AutoLock objLock ( &thiz.lock, kXMP_ReadLock );	\
+	try {												\
+		wResult->SetErrMessage(0);
+
+#define XMP_ENTER_ObjWrite(XMPClass,Proc)					\
+	AnnounceObjectEntry ( Proc, "writer" );					\
+	AcquireLibraryLock ( sLibraryLock );					\
+	XMPClass * thiz = (XMPClass*)xmpObjRef;					\
+	XMP_AutoLock objLock ( &thiz->lock, kXMP_WriteLock );	\
+	try {													\
+		wResult->SetErrMessage(0);
+
+#define XMP_EXIT			\
+	XMP_CATCH_EXCEPTIONS	\
+	AnnounceExit();
+
+#define XMP_EXIT_NoThrow						\
+	} catch ( ... )	{							\
+		AnnounceCatch ( "no-throw catch-all" );	\
+		/* Do nothing. */						\
+	}											\
+	AnnounceExit();
+
+#define XMP_CATCH_EXCEPTIONS										\
+	} catch ( XMP_Error & xmpErr ) {								\
+		wResult->int32Result = xmpErr.GetID(); 						\
+		wResult->ptrResult   = (void*)"XMP";						\
+		wResult->SetErrMessage(xmpErr.GetErrMsg());             \
+		if ( wResult->GetErrMessage() == 0 ) wResult->SetErrMessage(""); \
+		AnnounceCatch ( wResult->GetErrMessage() );             \
+	} catch ( std::exception & stdErr ) {							\
+		wResult->int32Result = kXMPErr_StdException; 				\
+		wResult->SetErrMessage(stdErr.what());                  \
+		if ( wResult->GetErrMessage() == 0 ) wResult->SetErrMessage(""); \
+		AnnounceCatch ( wResult->GetErrMessage() );             \
+	} catch ( ... ) {												\
+		wResult->int32Result = kXMPErr_UnknownException; 			\
+		wResult->SetErrMessage("Caught unknown exception");     \
+		AnnounceCatch ( wResult->GetErrMessage() );                \
+	}
+
+#if XMP_DebugBuild
+	#define RELEASE_NO_THROW	/* empty */
+#else
+	#define RELEASE_NO_THROW	throw()
+#endif
+
+// =================================================================================================
+// Data structure dumping utilities
+// ================================
+
+#define IsHexDigit(ch)		( (('0' <= (ch)) && ((ch) <= '9')) || (('A' <= (ch)) && ((ch) <= 'F')) )
+#define HexDigitValue(ch)	( (((ch) - '0') < 10) ? ((ch) - '0') : ((ch) - 'A' + 10) )
+
+#define kTenSpaces "          "
+#define OutProcPadding(pad)	{ size_t padLen = (pad); 												\
+							  for ( ; padLen >= 10; padLen -= 10 ) OutProcNChars ( kTenSpaces, 10 );	\
+							  for ( ; padLen > 0; padLen -= 1 ) OutProcNChars ( " ", 1 ); }
+
+
+#define OutProcNewline()	{ XMP_Status status = (*outProc) ( refCon, "\n", 1 );  if ( status != 0 ) return; }
+
+#define OutProcNChars(p,n)	{ XMP_Status status = (*outProc) ( refCon, (p), (n) );  if ( status != 0 ) return; }
+
+#define OutProcLiteral(lit)	{ XMP_Status _status = (*outProc) ( refCon, (lit), (XMP_StringLen)strlen(lit) );  if ( _status != 0 ) return; }
+
+#define OutProcString(str)	{ XMP_Status _status = (*outProc) ( refCon, (str).c_str(), (XMP_StringLen)(str).size() );  if ( _status != 0 ) return; }
+
+#define OutProcDecInt(num)	{ snprintf ( buffer, sizeof(buffer), "%ld", (long)(num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
+							  buffer[sizeof(buffer) -1] = 0; /* AUDIT warning C6053: Make sure buffer is terminated */							\
+							  XMP_Status _status = (*outProc) ( refCon, buffer, (XMP_StringLen)strlen(buffer) );  if ( _status != 0 ) return; }
+
+#define OutProcHexInt(num)	{ snprintf ( buffer, sizeof(buffer), "%lX", (long)(num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
+							  buffer[sizeof(buffer) -1] = 0; /* AUDIT warning C6053: Make sure buffer is terminated */							\
+							  XMP_Status _status = (*outProc) ( refCon, buffer, (XMP_StringLen)strlen(buffer) );  if ( _status != 0 ) return; }
+
+#define OutProcHexByte(num)	{ snprintf ( buffer, sizeof(buffer), "%.2X", (unsigned char)(num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
+							  XMP_Status _status = (*outProc) ( refCon, buffer, (XMP_StringLen)strlen(buffer) );  if ( _status != 0 ) return; }
+
+#define kIndent "   "
+#define OutProcIndent(lev)	{ for ( size_t i = 0; i < (lev); ++i ) OutProcNChars ( kIndent, 3 ); }
+
+void DumpClearString ( const XMP_VarString & value, XMP_TextOutputProc outProc, void * refCon );
+
+// =================================================================================================
+// Namespace Tables
+// ================
+typedef std::vector <XMP_VarString> XMP_StringVector;
+typedef XMP_StringVector::iterator XMP_StringVectorPos;
+typedef XMP_StringVector::const_iterator XMP_StringVectorCPos;
+
+typedef std::pair < XMP_VarString, XMP_VarString >	XMP_StringPair;
+
+typedef std::map < XMP_VarString, XMP_VarString > XMP_StringMap;
+typedef XMP_StringMap::iterator       XMP_StringMapPos;
+typedef XMP_StringMap::const_iterator XMP_cStringMapPos;
+
+class XMP_NamespaceTable {
+public:
+
+	XMP_NamespaceTable() {};
+	XMP_NamespaceTable ( const XMP_NamespaceTable & presets );
+	virtual ~XMP_NamespaceTable() {};
+
+    bool Define ( XMP_StringPtr uri, XMP_StringPtr suggPrefix,
+    			  XMP_StringPtr * prefixPtr, XMP_StringLen * prefixLen);
+
+    bool GetPrefix ( XMP_StringPtr uri, XMP_StringPtr * prefixPtr, XMP_StringLen * prefixLen ) const;
+    bool GetURI    ( XMP_StringPtr prefix, XMP_StringPtr * uriPtr, XMP_StringLen * uriLen ) const;
+
+    void Dump ( XMP_TextOutputProc outProc, void * refCon ) const;
+
+private:
+
+	XMP_ReadWriteLock lock;
+	XMP_StringMap uriToPrefixMap, prefixToURIMap;
+
+};
+
+
+// Right now it supports only ^, $ and \d, in future we should use it as a wrapper over
+// regex object once mac and Linux compilers start supporting them.
+
+class XMP_RegExp {
+public:
+	XMP_RegExp ( XMP_StringPtr regExp )
+	{
+		if ( regExp )
+			regExpStr = regExp;
+	}
+
+	XMP_Bool Match ( XMP_StringPtr s );
+
+private:
+	XMP_VarString regExpStr;
+};
+
+// =================================================================================================
+
+#endif	// __XMP_LibUtils_hpp__
diff --git a/source/XMP_ProgressTracker.cpp b/source/XMP_ProgressTracker.cpp
new file mode 100644
index 0000000..9982425
--- /dev/null
+++ b/source/XMP_ProgressTracker.cpp
@@ -0,0 +1,163 @@
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2012 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+
+#include "source/XMP_LibUtils.hpp"
+#include "source/XMP_ProgressTracker.hpp"
+
+// =================================================================================================
+// XMP_ProgressTracker::XMP_ProgressTracker
+// ========================================
+
+XMP_ProgressTracker::XMP_ProgressTracker ( const CallbackInfo & _cbInfo )
+{
+
+	this->Clear();
+	if ( _cbInfo.clientProc == 0 ) return;
+	XMP_Assert ( _cbInfo.wrapperProc != 0 );
+	
+	this->cbInfo = _cbInfo;
+	if ( this->cbInfo.interval < 0.0 ) this->cbInfo.interval = 1.0;
+
+}	// XMP_ProgressTracker::XMP_ProgressTracker
+
+// =================================================================================================
+// XMP_ProgressTracker::BeginWork
+// ==============================
+
+void XMP_ProgressTracker::BeginWork ( float _totalWork )
+{
+
+	if ( _totalWork < 0.0 ) _totalWork = 0.0;
+	this->totalWork = _totalWork;
+	this->workDone = 0.0;
+	this->workInProgress = true;
+
+	this->startTime = this->prevTime = PerfUtils::NoteThisMoment();
+	if ( this->cbInfo.sendStartStop ) this->NotifyClient ( true );
+
+}	// XMP_ProgressTracker::BeginWork
+
+// =================================================================================================
+// XMP_ProgressTracker::AddTotalWork
+// =================================
+
+void XMP_ProgressTracker::AddTotalWork ( float workIncrement )
+{
+
+	if ( workIncrement < 0.0 ) workIncrement = 0.0;
+	this->totalWork += workIncrement;
+	
+}	// XMP_ProgressTracker::AddTotalWork
+
+// =================================================================================================
+// XMP_ProgressTracker::AddWorkDone
+// ================================
+
+void XMP_ProgressTracker::AddWorkDone ( float workIncrement )
+{
+
+	if ( workIncrement < 0.0 ) workIncrement = 0.0;
+	this->workDone += workIncrement;
+	this->NotifyClient();
+	
+}	// XMP_ProgressTracker::AddWorkDone
+
+// =================================================================================================
+// XMP_ProgressTracker::WorkComplete
+// =================================
+
+void XMP_ProgressTracker::WorkComplete ()
+{
+
+	if ( this->totalWork == 0.0 ) this->totalWork = 1.0;	// Force non-zero fraction done.
+	this->workDone = this->totalWork;
+	XMP_Assert ( this->workDone > 0.0 );	// Needed in NotifyClient for start/stop case.
+
+	this->NotifyClient ( this->cbInfo.sendStartStop );
+	this->workInProgress = false;
+
+}	// XMP_ProgressTracker::WorkComplete
+
+// =================================================================================================
+// XMP_ProgressTracker::Clear
+// ==========================
+
+void XMP_ProgressTracker::Clear ()
+{
+
+	this->cbInfo.Clear();
+	this->workInProgress = false;
+	this->totalWork = 0.0;
+	this->workDone = 0.0;
+	this->startTime = this->prevTime = PerfUtils::kZeroMoment;
+	// ! There is no standard zero value for PerfUtils::MomentValue.
+
+}	// XMP_ProgressTracker::Clear
+
+// =================================================================================================
+// XMP_ProgressTracker::NotifyClient
+// =================================
+//
+// The math for the time remaining is easy but not immediately obvious. We know the elapsed time and
+// fraction of work done:
+//
+//		elapsedTime = totalTime * fractionDone		or		totalTime = (elapsedTime / fractionDone)
+//		remainingTime = totalTime * (1 - fractionDone)
+// so:
+//		remainingTime = (elapsedTime / fractionDone) * (1 - fractionDone)
+
+void XMP_ProgressTracker::NotifyClient ( bool isStartStop )
+{
+	XMP_Bool ok = !kXMP_Bool_False;
+	float fractionDone = 0.0;
+	
+	if ( this->cbInfo.clientProc == 0 ) return;
+	XMP_Assert ( this->cbInfo.wrapperProc != 0 );
+	XMP_Assert ( (this->totalWork >= 0.0) && (this->workDone >= 0.0) && (this->cbInfo.interval >= 0.0) );
+	// ! Note that totalWork might be unknown or understimated, and workDone greater than totalWork.
+	
+	if ( isStartStop ) {
+
+		float totalTime = 0.0;
+		if ( this->workDone > 0.0 ) {
+			fractionDone = 1.0;	// This is the stop call.
+			totalTime = PerfUtils::GetElapsedSeconds ( this->startTime, PerfUtils::NoteThisMoment() );
+		}
+		ok = (*this->cbInfo.wrapperProc ) ( this->cbInfo.clientProc, this->cbInfo.context,
+											totalTime, fractionDone, 0.0 );
+
+	} else {
+
+		PerfUtils::MomentValue currentTime = PerfUtils::NoteThisMoment();
+		float elapsedTime = PerfUtils::GetElapsedSeconds ( this->prevTime, currentTime );
+		if ( elapsedTime < this->cbInfo.interval ) return;
+
+		float remainingTime = 0.0;
+		if ( (this->totalWork > 0.0) && (this->workDone > 0.0) ) {
+			fractionDone = this->workDone / this->totalWork;
+			if ( fractionDone > 1.0 ) fractionDone = 1.0;
+			elapsedTime = PerfUtils::GetElapsedSeconds ( this->startTime, currentTime );
+			remainingTime = (elapsedTime / fractionDone) * (1.0 - fractionDone);
+		}
+
+		this->prevTime = currentTime;
+		ok = (*this->cbInfo.wrapperProc ) ( this->cbInfo.clientProc, this->cbInfo.context,
+											elapsedTime, fractionDone, remainingTime );
+
+	}
+
+	if ( ok == kXMP_Bool_False ) XMP_Throw ( "Abort signaled by progress reporting callback", kXMPErr_ProgressAbort );
+		
+}	// XMP_ProgressTracker::NotifyClient
+
+// =================================================================================================
diff --git a/source/XMP_ProgressTracker.hpp b/source/XMP_ProgressTracker.hpp
new file mode 100644
index 0000000..b6776fb
--- /dev/null
+++ b/source/XMP_ProgressTracker.hpp
@@ -0,0 +1,69 @@
+#ifndef __XMP_ProgressTracker_hpp__
+#define __XMP_ProgressTracker_hpp__ 1
+
+// =================================================================================================
+// ADOBE SYSTEMS INCORPORATED
+// Copyright 2012 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 "public/include/XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
+
+#include "public/include/XMP_Const.h"
+
+#include "source/PerfUtils.hpp"
+
+// =================================================================================================
+
+class XMP_ProgressTracker {
+public:
+	
+	struct CallbackInfo {
+
+		XMP_ProgressReportWrapper wrapperProc;
+		XMP_ProgressReportProc clientProc;
+		void * context;
+		float  interval;
+		bool   sendStartStop;
+
+		void Clear() { this->wrapperProc = 0; this->clientProc = 0;
+					   this->context = 0; this->interval = 1.0; this->sendStartStop = false; };
+		CallbackInfo() { this->Clear(); };
+		CallbackInfo ( XMP_ProgressReportWrapper _wrapperProc, XMP_ProgressReportProc _clientProc,
+					   void * _context, float _interval, bool _sendStartStop )
+			: wrapperProc(_wrapperProc), clientProc(_clientProc),
+			  context(_context), interval(_interval), sendStartStop(_sendStartStop) {};
+
+	};
+
+	XMP_ProgressTracker ( const CallbackInfo & _cbInfo );
+
+	void BeginWork ( float _totalWork = 0.0 );
+	void AddTotalWork ( float workIncrement );
+	void AddWorkDone ( float workIncrement );
+	void WorkComplete();
+
+	bool WorkInProgress() { return this->workInProgress; };
+
+	~XMP_ProgressTracker() {};
+
+private:
+
+	XMP_ProgressTracker() { this->Clear(); };	// Hidden on purpose.
+
+	void Clear();
+	void NotifyClient ( bool isStartStop = false );
+	
+	CallbackInfo cbInfo;
+	bool workInProgress;
+	float totalWork, workDone;
+	PerfUtils::MomentValue startTime, prevTime;
+
+};	// XMP_ProgressTracker
+
+// =================================================================================================
+
+#endif	// __XMP_ProgressTracker_hpp__
diff --git a/test-driver b/test-driver
new file mode 100755
index 0000000..32bf39e
--- /dev/null
+++ b/test-driver
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
new file mode 100644
index 0000000..211ebcf
--- /dev/null
+++ b/third-party/Makefile.am
@@ -0,0 +1,4 @@
+
+SUBDIRS = zuid/interfaces
+
+DIST_SUBDIRS = zuid/interfaces zlib expat
diff --git a/third-party/Makefile.in b/third-party/Makefile.in
new file mode 100644
index 0000000..103c6e8
--- /dev/null
+++ b/third-party/Makefile.in
@@ -0,0 +1,642 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = third-party
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = zuid/interfaces
+DIST_SUBDIRS = zuid/interfaces zlib expat
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third-party/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign third-party/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/third-party/expat/Makefile.am b/third-party/expat/Makefile.am
new file mode 100644
index 0000000..c6f44fb
--- /dev/null
+++ b/third-party/expat/Makefile.am
@@ -0,0 +1,3 @@
+
+
+EXTRA_DIST=ReadMe.txt lib/expat.h
diff --git a/third-party/expat/Makefile.in b/third-party/expat/Makefile.in
new file mode 100644
index 0000000..a072424
--- /dev/null
+++ b/third-party/expat/Makefile.in
@@ -0,0 +1,462 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = third-party/expat
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ReadMe.txt lib/expat.h
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third-party/expat/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign third-party/expat/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/third-party/expat/ReadMe.txt b/third-party/expat/ReadMe.txt
new file mode 100644
index 0000000..37766c3
--- /dev/null
+++ b/third-party/expat/ReadMe.txt
@@ -0,0 +1,76 @@
+The XMP Toolkit needs an external XML parser. The source from Adobe is written to use Expat,
+
+although adapters for other parsers can easily be written. The most recent version of Expat used
+
+with XMP is 2.1.0. To use Expat:
+
+
+
+1. Obtain a copy of the Expat distribution. One good place is SourceForge:
+
+	http://sourceforge.net/projects/expat/files/expat/2.1.0/
+
+
+
+2. Place Expat's lib directory within .../third-party/expat. I.e. as a sibling of this file.
+
+
+
+For Expat version 2.0.0 the contents of .../third-party/expat/lib are:
+
+
+
+	amigaconfig.h
+
+	ascii.h
+
+	asciitab.h
+
+	expat.dsp
+
+	expat.h
+
+	expatw.dsp
+
+	expatw_static.dsp
+
+	expat_external.h
+
+	expat_static.dsp
+
+	iasciitab.h
+
+	internal.h
+
+	latin1tab.h
+
+	libexpat.def
+
+	libexpatw.def
+
+	macconfig.h
+
+	Makefile.MPW
+
+	nametab.h
+
+	utf8tab.h
+
+	winconfig.h
+
+	xmlparse.c
+
+	xmlrole.c
+
+	xmlrole.h
+
+	xmltok.c
+
+	xmltok.h
+
+	xmltok_impl.c
+
+	xmltok_impl.h
+
+	xmltok_ns.c
+
diff --git a/third-party/expat/lib/expat.h b/third-party/expat/lib/expat.h
new file mode 100644
index 0000000..cca1bc6
--- /dev/null
+++ b/third-party/expat/lib/expat.h
@@ -0,0 +1,3 @@
+// Exempi: use a system header instead
+#include <expat.h>
+
diff --git a/third-party/zlib/Makefile.am b/third-party/zlib/Makefile.am
new file mode 100644
index 0000000..3e40bb2
--- /dev/null
+++ b/third-party/zlib/Makefile.am
@@ -0,0 +1,3 @@
+
+
+EXTRA_DIST=ReadMe.txt zlib.h
diff --git a/third-party/zlib/Makefile.in b/third-party/zlib/Makefile.in
new file mode 100644
index 0000000..7e38d37
--- /dev/null
+++ b/third-party/zlib/Makefile.in
@@ -0,0 +1,462 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = third-party/zlib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ReadMe.txt zlib.h
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third-party/zlib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign third-party/zlib/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/third-party/zlib/ReadMe.txt b/third-party/zlib/ReadMe.txt
new file mode 100755
index 0000000..e610fce
--- /dev/null
+++ b/third-party/zlib/ReadMe.txt
@@ -0,0 +1,13 @@
+The XMP Toolkit SDK needs zlib.
+This release uses zlib Version 1.2.8
+
+
+



To get zlib:
+
+



1. Obtain a copy of the zlib source code (not the compiled dll)

   
+	from http://www.zlib.net/

   
+	(download links at the time of writing were at the bottom)

   
+
+
+

2. Place all top-level .c and .h files of the tar/zip you downloaded

   
+	directly in .../third-party/zlib



   


diff --git a/third-party/zlib/zlib.h b/third-party/zlib/zlib.h
new file mode 100644
index 0000000..f4615cd
--- /dev/null
+++ b/third-party/zlib/zlib.h
@@ -0,0 +1,2 @@
+// Proxy. Use system zlib.
+#include <zlib.h>
diff --git a/third-party/zuid/interfaces/MD5.cpp b/third-party/zuid/interfaces/MD5.cpp
new file mode 100644
index 0000000..5fa7447
--- /dev/null
+++ b/third-party/zuid/interfaces/MD5.cpp
@@ -0,0 +1,327 @@
+#include "third-party/zuid/interfaces/MD5.h"
+
+#include <cassert>
+#include <cstring>
+
+using namespace std;
+
+/******************************************************************************/
+
+/*
+	MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+
+	Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights 
+	reserved.
+
+	License to copy and use this software is granted provided that it is 
+	identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in 
+	all material mentioning or referencing this software or this function. 
+
+	License is also granted to make and use derivative works provided that such 
+	works are identified as "derived from the RSA Data Security, Inc. MD5 
+	Message-Digest Algorithm" in all material mentioning or referencing the 
+	derived work. 
+	
+	RSA Data Security, Inc. makes no representations concerning either the 
+	merchantability of this software or the suitability of this software for 
+	any particular purpose. It is provided "as is" without express or implied 
+	warranty of any kind. 
+	
+	These notices must be retained in any copies of any part of this 
+	documentation and/or software. 
+*/
+
+/******************************************************************************/
+
+/* Constants for MD5Transform routine. */
+
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+static void MD5Transform (XMP_Uns32 [4], XMP_Uns8 [64]);
+static void Encode (XMP_Uns8 *, XMP_Uns32 *, XMP_Uns32);
+static void Decode (XMP_Uns32 *, XMP_Uns8 *, XMP_Uns32);
+
+static XMP_Uns8 PADDING[64] =
+	{
+     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	};
+
+/* F, G, H and I are basic MD5 functions.
+
+      */
+
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits.
+
+      */
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+Rotation is separate from addition to prevent recomputation.
+
+      */
+
+#define FF(a, b, c, d, x, s, ac) { \
+     (a) += F ((b), (c), (d)) + (x) + (XMP_Uns32)(ac); \
+     (a) = ROTATE_LEFT ((a), (s)); \
+     (a) += (b); \
+     }
+#define GG(a, b, c, d, x, s, ac) { \
+     (a) += G ((b), (c), (d)) + (x) + (XMP_Uns32)(ac); \
+     (a) = ROTATE_LEFT ((a), (s)); \
+     (a) += (b); \
+     }
+#define HH(a, b, c, d, x, s, ac) { \
+     (a) += H ((b), (c), (d)) + (x) + (XMP_Uns32)(ac); \
+     (a) = ROTATE_LEFT ((a), (s)); \
+     (a) += (b); \
+     }
+#define II(a, b, c, d, x, s, ac) { \
+     (a) += I ((b), (c), (d)) + (x) + (XMP_Uns32)(ac); \
+     (a) = ROTATE_LEFT ((a), (s)); \
+     (a) += (b); \
+     }
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context.
+
+      */
+
+void MD5Init (MD5_CTX * context)
+{
+     context->count[0] = context->count[1] = 0;
+
+       /* Load magic initialization constants.
+
+*/
+     context->state[0] = 0x67452301;
+     context->state[1] = 0xefcdab89;
+     context->state[2] = 0x98badcfe;
+     context->state[3] = 0x10325476;
+}
+
+/* MD5 block update operation. Continues an MD5 message-digest
+     operation, processing another message block, and updating the context.
+
+      */
+
+void MD5Update (	MD5_CTX *context, /* context */
+					XMP_Uns8 *input, /* input block */
+					XMP_Uns32 inputLen) /* length of input block */
+{
+	using namespace std;
+
+     XMP_Uns32 i, index, partLen;
+
+       /* Compute number of bytes mod 64 */
+       index = (XMP_Uns32)((context->count[0] >> 3) & 0x3F);
+
+       /* Update number of bits */
+       if ((context->count[0] += ((XMP_Uns32)inputLen << 3))
+        < ((XMP_Uns32)inputLen << 3))
+      context->count[1]++;
+       context->count[1] += ((XMP_Uns32)inputLen >> 29);
+
+     partLen = 64 - index;
+
+       /* Transform as many times as possible.
+
+*/
+     if (inputLen >= partLen) {
+	 std::memcpy (&context->buffer[index], input, partLen);	// AUDIT: From public MD5 code, assumed safe.
+     MD5Transform (context->state, context->buffer);
+
+     for (i = partLen; i + 63 < inputLen; i += 64)
+     MD5Transform (context->state, &input[i]);
+
+     index = 0;
+     }
+     else
+     i = 0;
+
+       /* Buffer remaining input */
+	 std::memcpy (&context->buffer[index], &input[i], inputLen-i);	// AUDIT: From public MD5 code, assumed safe.
+
+}
+
+/* MD5 finalization. Ends an MD5 message-digest operation, writing the
+     the message digest and zeroizing the context.
+
+      */
+
+void MD5Final (	XMP_Uns8 digest[16], /* message digest */
+				MD5_CTX *context /* context */)
+{
+     XMP_Uns8 bits[8];
+     XMP_Uns32 index, padLen;
+
+       /* Save number of bits */
+       Encode (bits, context->count, 8);
+
+       /* Pad out to 56 mod 64.
+
+*/
+     index = (XMP_Uns32)((context->count[0] >> 3) & 0x3f);
+     padLen = (index < 56) ? (56 - index) : (120 - index);
+     MD5Update (context, PADDING, padLen);
+
+       /* Append length (before padding) */
+       MD5Update (context, bits, 8);
+       /* Store state in digest */
+       Encode (digest, context->state, 16);
+
+       /* Zeroize sensitive information.
+
+*/
+	assert ( sizeof(*context) == sizeof(MD5_CTX) );
+    memset ( context, 0, sizeof (*context) );	// AUDIT: Safe, using sizeof destination.
+}
+
+/* MD5 basic transformation. Transforms state based on block.
+
+      */
+
+static void MD5Transform (	XMP_Uns32 state[4],
+							XMP_Uns8 block[64])
+{
+     XMP_Uns32 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+     Decode (x, block, 64);
+
+       /* Round 1 */
+       FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+       FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+       FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+       FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+       FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+       FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+       FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+       FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+       FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+       FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+       FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+       FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+       FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+       FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+       FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+       FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+      /* Round 2 */
+       GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+       GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+       GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+       GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+       GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+       GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+       GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+       GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+       GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+       GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+       GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+     GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+     GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+     GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+     GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+     GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+       /* Round 3 */
+       HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+       HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+       HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+       HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+       HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+       HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+       HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+       HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+       HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+       HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+       HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+       HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+       HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+       HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+       HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+       HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+       /* Round 4 */
+       II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+       II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+       II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+       II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+       II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+       II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+       II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+       II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+       II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+       II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+       II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+       II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+       II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+       II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+       II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+       II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
+     state[0] += a;
+     state[1] += b;
+     state[2] += c;
+     state[3] += d;
+
+       /* Zeroize sensitive information.
+*/
+    memset (x, 0, sizeof (x));
+}
+
+/* Encodes input (XMP_Uns32) into output (XMP_Uns8). Assumes len is
+     a multiple of 4.
+
+      */
+
+static void Encode (	XMP_Uns8 *output,
+						XMP_Uns32 *input,
+						XMP_Uns32 len)
+{
+     XMP_Uns32 i, j;
+
+     for (i = 0, j = 0; j < len; i++, j += 4) {
+     output[j] = (XMP_Uns8)(input[i] & 0xff);
+     output[j+1] = (XMP_Uns8)((input[i] >> 8) & 0xff);
+     output[j+2] = (XMP_Uns8)((input[i] >> 16) & 0xff);
+     output[j+3] = (XMP_Uns8)((input[i] >> 24) & 0xff);
+     }
+}
+
+/* Decodes input (XMP_Uns8) into output (XMP_Uns32). Assumes len is
+     a multiple of 4.
+
+      */
+
+static void Decode (	XMP_Uns32 *output,
+						XMP_Uns8 *input,
+						XMP_Uns32 len)
+{
+     XMP_Uns32 i, j;
+
+     for (i = 0, j = 0; j < len; i++, j += 4)
+     output[i] = ((XMP_Uns32)input[j]) | (((XMP_Uns32)input[j+1]) << 8) |
+     (((XMP_Uns32)input[j+2]) << 16) | (((XMP_Uns32)input[j+3]) << 24);
+}
diff --git a/third-party/zuid/interfaces/MD5.h b/third-party/zuid/interfaces/MD5.h
new file mode 100644
index 0000000..6810bdf
--- /dev/null
+++ b/third-party/zuid/interfaces/MD5.h
@@ -0,0 +1,48 @@
+#ifndef __MD5_h__
+#define __MD5_h__
+
+/******************************************************************************/
+
+/*
+	MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+
+	Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights 
+	reserved.
+
+	License to copy and use this software is granted provided that it is 
+	identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in 
+	all material mentioning or referencing this software or this function. 
+
+	License is also granted to make and use derivative works provided that such 
+	works are identified as "derived from the RSA Data Security, Inc. MD5 
+	Message-Digest Algorithm" in all material mentioning or referencing the 
+	derived work. 
+	
+	RSA Data Security, Inc. makes no representations concerning either the 
+	merchantability of this software or the suitability of this software for 
+	any particular purpose. It is provided "as is" without express or implied 
+	warranty of any kind. 
+	
+	These notices must be retained in any copies of any part of this 
+	documentation and/or software. 
+*/
+
+/******************************************************************************/
+
+#include "public/include/XMP_Const.h"	// For safe fixed integer sizes.
+
+/* MD5 context. */
+struct MD5_CTX
+	{
+	XMP_Uns32 state[4];                                   /* state (ABCD) */
+	XMP_Uns32 count[2];        /* number of bits, modulo 2^64 (lsb first) */
+	XMP_Uns8 buffer[64];                         /* input buffer */
+	};
+
+extern void MD5Init (MD5_CTX *);
+extern void MD5Update (MD5_CTX *, XMP_Uns8 *, XMP_Uns32);
+extern void MD5Final(XMP_Uns8 [16], MD5_CTX *);
+
+/******************************************************************************/
+
+#endif
diff --git a/third-party/zuid/interfaces/Makefile.am b/third-party/zuid/interfaces/Makefile.am
new file mode 100644
index 0000000..2a602a1
--- /dev/null
+++ b/third-party/zuid/interfaces/Makefile.am
@@ -0,0 +1,50 @@
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+AM_CPPFLAGS = -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/public/include/client-glue \
+	-I$(top_srcdir)/build/ \
+	-I$(top_srcdir) \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_LTLIBRARIES = libmd5.la
+
+
+
+libmd5_la_SOURCES = MD5.cpp MD5.h
diff --git a/third-party/zuid/interfaces/Makefile.in b/third-party/zuid/interfaces/Makefile.in
new file mode 100644
index 0000000..532598f
--- /dev/null
+++ b/third-party/zuid/interfaces/Makefile.in
@@ -0,0 +1,675 @@
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# exempi - Makefile.am
+#
+# Copyright (C) 2007-2013 Hubert Figuiere
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1 Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# 2 Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+#
+# 3 Neither the name of the Authors, nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software wit hout specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = third-party/zuid/interfaces
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+	$(top_srcdir)/m4/ax_ld_check_flag.m4 \
+	$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/boost.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmd5_la_LIBADD =
+am_libmd5_la_OBJECTS = MD5.lo
+libmd5_la_OBJECTS = $(am_libmd5_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmd5_la_SOURCES)
+DIST_SOURCES = $(libmd5_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_LDPATH = @BOOST_LDPATH@
+BOOST_ROOT = @BOOST_ROOT@
+BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
+BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEMPI_AGE = @EXEMPI_AGE@
+EXEMPI_CURRENT = @EXEMPI_CURRENT@
+EXEMPI_CURRENT_MIN = @EXEMPI_CURRENT_MIN@
+EXEMPI_INCLUDE_BASE = @EXEMPI_INCLUDE_BASE@
+EXEMPI_MAJOR_VERSION = @EXEMPI_MAJOR_VERSION@
+EXEMPI_PLATFORM_DEF = @EXEMPI_PLATFORM_DEF@
+EXEMPI_REVISION = @EXEMPI_REVISION@
+EXEMPI_VERSION_INFO = @EXEMPI_VERSION_INFO@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+XMPCORE_CPPFLAGS = @XMPCORE_CPPFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+
+AM_CPPFLAGS = -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/public/include/client-glue \
+	-I$(top_srcdir)/build/ \
+	-I$(top_srcdir) \
+	-Wall @XMPCORE_CPPFLAGS@
+
+noinst_LTLIBRARIES = libmd5.la
+libmd5_la_SOURCES = MD5.cpp MD5.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign third-party/zuid/interfaces/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign third-party/zuid/interfaces/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libmd5.la: $(libmd5_la_OBJECTS) $(libmd5_la_DEPENDENCIES) $(EXTRA_libmd5_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK)  $(libmd5_la_OBJECTS) $(libmd5_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MD5.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT: