Exiv2: headers diff between 0.23 and 0.24 versions

	basicio.hpp	basicio.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file basicio.hpp	@file basicio.hpp
	@brief Simple binary IO abstraction	@brief Simple binary IO abstraction

	@version $Rev: 2681 $	@version $Rev: 3091 $
	@author Brad Schick (brad)	@author Brad Schick (brad)
	<a href="mailto:brad@robotbattle.com">brad@robotbattle.com</a>	<a href="mailto:brad@robotbattle.com">brad@robotbattle.com</a>
	@date 04-Dec-04, brad: created	@date 04-Dec-04, brad: created
	*/	*/
	#ifndef BASICIO_HPP_	#ifndef BASICIO_HPP_
	#define BASICIO_HPP_	#define BASICIO_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "types.hpp"	#include "types.hpp"

	skipping to change at line 172	skipping to change at line 172
	*/	*/
	virtual void transfer(BasicIo& src) = 0;	virtual void transfer(BasicIo& src) = 0;
	/*!	/*!
	@brief Move the current IO position.	@brief Move the current IO position.
	@param offset Number of bytes to move the position relative	@param offset Number of bytes to move the position relative
	to the starting position specified by \em pos	to the starting position specified by \em pos
	@param pos Position from which the seek should start	@param pos Position from which the seek should start
	@return 0 if successful;<BR>	@return 0 if successful;<BR>
	Nonzero if failure;	Nonzero if failure;
	*/	*/

	virtual int seek(long offset, Position pos) = 0;	#if defined(_MSC_VER)
		virtual int seek(uint64_t offset, Position pos) = 0;
		#else
		virtual int seek(long offset, Position pos) = 0;
		#endif

	/*!	/*!
	@brief Direct access to the IO data. For files, this is done by	@brief Direct access to the IO data. For files, this is done by
	mapping the file into the process's address space; for mem ory	mapping the file into the process's address space; for mem ory
	blocks, this allows direct access to the memory block.	blocks, this allows direct access to the memory block.
	@param isWriteable Set to true if the mapped area should be write able	@param isWriteable Set to true if the mapped area should be write able
	(default is false).	(default is false).
	@return A pointer to the mapped area.	@return A pointer to the mapped area.
	@throw Error In case of failure.	@throw Error In case of failure.
	*/	*/
	virtual byte* mmap(bool isWriteable =false) =0;	virtual byte* mmap(bool isWriteable =false) =0;

	skipping to change at line 427	skipping to change at line 432
	*/	*/
	virtual void transfer(BasicIo& src);	virtual void transfer(BasicIo& src);
	/*!	/*!
	@brief Move the current file position.	@brief Move the current file position.
	@param offset Number of bytes to move the file position	@param offset Number of bytes to move the file position
	relative to the starting position specified by \em pos	relative to the starting position specified by \em pos
	@param pos Position from which the seek should start	@param pos Position from which the seek should start
	@return 0 if successful;<BR>	@return 0 if successful;<BR>
	Nonzero if failure;	Nonzero if failure;
	*/	*/

		#if defined(_MSC_VER)
		virtual int seek(uint64_t offset, Position pos);
		#else
	virtual int seek(long offset, Position pos);	virtual int seek(long offset, Position pos);

	/*!	#endif
		/*!
	@brief Map the file into the process's address space. The file mu st be	@brief Map the file into the process's address space. The file mu st be
	open before mmap() is called. If the mapped area is writea ble,	open before mmap() is called. If the mapped area is writea ble,
	changes may not be written back to the underlying file unt il	changes may not be written back to the underlying file unt il
	munmap() is called. The pointer is valid only as long as t he	munmap() is called. The pointer is valid only as long as t he
	FileIo object exists.	FileIo object exists.
	@param isWriteable Set to true if the mapped area should be write able	@param isWriteable Set to true if the mapped area should be write able
	(default is false).	(default is false).
	@return A pointer to the mapped area.	@return A pointer to the mapped area.
	@throw Error In case of failure.	@throw Error In case of failure.
	*/	*/

	skipping to change at line 635	skipping to change at line 644
	*/	*/
	virtual void transfer(BasicIo& src);	virtual void transfer(BasicIo& src);
	/*!	/*!
	@brief Move the current IO position.	@brief Move the current IO position.
	@param offset Number of bytes to move the IO position	@param offset Number of bytes to move the IO position
	relative to the starting position specified by \em pos	relative to the starting position specified by \em pos
	@param pos Position from which the seek should start	@param pos Position from which the seek should start
	@return 0 if successful;<BR>	@return 0 if successful;<BR>
	Nonzero if failure;	Nonzero if failure;
	*/	*/

	virtual int seek(long offset, Position pos);	#if defined(_MSC_VER)
	/*!	virtual int seek(uint64_t offset, Position pos);
		#else
		virtual int seek(long offset, Position pos);
		#endif
		/*!
	@brief Allow direct access to the underlying data buffer. The buf fer	@brief Allow direct access to the underlying data buffer. The buf fer
	is not protected against write access in any way, the argu ment	is not protected against write access in any way, the argu ment
	is ignored.	is ignored.
	@note The application must ensure that the memory pointed to by the	@note The application must ensure that the memory pointed to by the
	returned pointer remains valid and allocated as long as th e	returned pointer remains valid and allocated as long as th e
	MemIo object exists.	MemIo object exists.
	*/	*/
	virtual byte* mmap(bool /isWriteable/ =false);	virtual byte* mmap(bool /isWriteable/ =false);
	virtual int munmap();	virtual int munmap();
	//@}	//@}

	skipping to change at line 730	skipping to change at line 743
	#ifdef EXV_UNICODE_PATH	#ifdef EXV_UNICODE_PATH
	/*!	/*!
	@brief Like writeFile() but accepts a unicode path in an std::wstring .	@brief Like writeFile() but accepts a unicode path in an std::wstring .
	@note This function is only available on Windows.	@note This function is only available on Windows.
	*/	*/
	EXIV2API long writeFile(const DataBuf& buf, const std::wstring& wpath);	EXIV2API long writeFile(const DataBuf& buf, const std::wstring& wpath);

	#endif	#endif

	} // namespace Exiv2	} // namespace Exiv2


	#endif // #ifndef BASICIO_HPP_	#endif // #ifndef BASICIO_HPP_

End of changes. 7 change blocks.
	7 lines changed or deleted	19 lines changed or added

	cr2image.hpp	cr2image.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file cr2image.hpp	@file cr2image.hpp
	@brief Class Cr2Image	@brief Class Cr2Image

	@version $Rev: 2681 $	@version $Rev: 3091 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 22-Apr-06, ahu: created	@date 22-Apr-06, ahu: created
	*/	*/
	#ifndef CR2IMAGE_HPP_	#ifndef CR2IMAGE_HPP_
	#define CR2IMAGE_HPP_	#define CR2IMAGE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "image.hpp"	#include "image.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	crwimage.hpp	crwimage.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	skipping to change at line 26	skipping to change at line 26
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file crwimage.hpp	@file crwimage.hpp
	@brief Class CrwImage to access Canon CRW images.<BR>	@brief Class CrwImage to access Canon CRW images.<BR>
	References:<BR>	References:<BR>
	<a href="http://www.sno.phy.queensu.ca/~phil/exiftool/canon_raw. html">The Canon RAW (CRW) File Format</a> by Phil Harvey	<a href="http://www.sno.phy.queensu.ca/~phil/exiftool/canon_raw. html">The Canon RAW (CRW) File Format</a> by Phil Harvey

	@version $Rev: 2681 $	@version $Rev: 3091 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 28-Aug-05, ahu: created	@date 28-Aug-05, ahu: created
	*/	*/
	#ifndef CRWIMAGE_HPP_	#ifndef CRWIMAGE_HPP_
	#define CRWIMAGE_HPP_	#define CRWIMAGE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "types.hpp"	#include "types.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	epsimage.hpp	epsimage.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	exif.hpp	exif.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file exif.hpp	@file exif.hpp
	@brief Encoding and decoding of Exif data	@brief Encoding and decoding of Exif data

	@version $Rev: 2681 $	@version $Rev: 3091 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 09-Jan-04, ahu: created	@date 09-Jan-04, ahu: created
	*/	*/
	#ifndef EXIF_HPP_	#ifndef EXIF_HPP_
	#define EXIF_HPP_	#define EXIF_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "metadatum.hpp"	#include "metadatum.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	exiv2.hpp	exiv2.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file exiv2.hpp	@file exiv2.hpp
	@brief Include all Exiv2 header files.	@brief Include all Exiv2 header files.

	@version $Rev: 2681 $	@version $Rev: 3091 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 21-Jun-10, ahu: created	@date 21-Jun-10, ahu: created
	*/	*/
	#ifndef EXIV2_HPP_	#ifndef EXIV2_HPP_
	#define EXIV2_HPP_	#define EXIV2_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "basicio.hpp"	#include "basicio.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	exv_conf.h	exv_conf.h

	skipping to change at line 146	skipping to change at line 146
	/* Define to the address where bug reports for this package should be sent. */	/* Define to the address where bug reports for this package should be sent. */
	#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"	#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"

	/* Define to the name of this package. */	/* Define to the name of this package. */
	#define EXV_PACKAGE "exiv2"	#define EXV_PACKAGE "exiv2"

	/* Define to the full name of this package. */	/* Define to the full name of this package. */
	#define EXV_PACKAGE_NAME "exiv2"	#define EXV_PACKAGE_NAME "exiv2"

	/* Define to the full name and version of this package. */	/* Define to the full name and version of this package. */

	#define EXV_PACKAGE_STRING "exiv2 0.23"	#define EXV_PACKAGE_STRING "exiv2 0.24"

	/* Define to the one symbol short name of this package. */	/* Define to the one symbol short name of this package. */
	#define EXV_PACKAGE_TARNAME "exiv2"	#define EXV_PACKAGE_TARNAME "exiv2"

	/* Define to the version of this package. */	/* Define to the version of this package. */

	#define EXV_PACKAGE_VERSION "0.23"	#define EXV_PACKAGE_VERSION "0.24"

	/* Define to 1 if you have the ANSI C header files. */	/* Define to 1 if you have the ANSI C header files. */
	#define EXV_STDC_HEADERS 1	#define EXV_STDC_HEADERS 1

	/* Define to 1 if strerror_r returns char . /	/* Define to 1 if strerror_r returns char . /
	/* #undef EXV_STRERROR_R_CHAR_P */	/* #undef EXV_STRERROR_R_CHAR_P */

	/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */	/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
	/* #undef EXV_TIME_WITH_SYS_TIME */	/* #undef EXV_TIME_WITH_SYS_TIME */


	skipping to change at line 250	skipping to change at line 250
	/* Define EXIV2API for DLL builds */	/* Define EXIV2API for DLL builds */
	#ifdef EXV_HAVE_DLL	#ifdef EXV_HAVE_DLL
	# ifdef EXV_BUILDING_LIB	# ifdef EXV_BUILDING_LIB
	# define EXIV2API EXV_EXPORT	# define EXIV2API EXV_EXPORT
	# else	# else
	# define EXIV2API EXV_IMPORT	# define EXIV2API EXV_IMPORT
	# endif /* ! EXV_BUILDING_LIB */	# endif /* ! EXV_BUILDING_LIB */
	#else	#else
	# define EXIV2API	# define EXIV2API
	#endif /* ! EXV_HAVE_DLL */	#endif /* ! EXV_HAVE_DLL */


		/*
		If you're using Solaris and the Solaris Studio compiler, then you really
		do need to use -library=stdcxx4 along with these inclusions below
		*/
		#if defined(OS_SOLARIS)
		#include <stdio.h>
		#include <string.h>
		#include <strings.h>
		#include <stdlib.h>
		#include <math.h>
		#if defined(__cplusplus)
		#include <ios>
		#include <fstream>
		#endif
		#endif

End of changes. 3 change blocks.
	2 lines changed or deleted	2 lines changed or added

	mrwimage.hpp	mrwimage.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	skipping to change at line 25	skipping to change at line 25
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file mrwimage.hpp	@file mrwimage.hpp
	@brief Minolta RAW image, implemented using the following references:	@brief Minolta RAW image, implemented using the following references:
	<a href="http://www.dalibor.cz/minolta/raw_file_format.htm">Mino lta Raw file format</a> by Dalibor Jelinek	<a href="http://www.dalibor.cz/minolta/raw_file_format.htm">Mino lta Raw file format</a> by Dalibor Jelinek

	@version $Rev: 2681 $	@version $Rev: 3091 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 13-May-06, ahu: created	@date 13-May-06, ahu: created
	*/	*/
	#ifndef MRWIMAGE_HPP_	#ifndef MRWIMAGE_HPP_
	#define MRWIMAGE_HPP_	#define MRWIMAGE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "image.hpp"	#include "image.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	orfimage.hpp	orfimage.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file orfimage.hpp	@file orfimage.hpp
	@brief Olympus RAW image	@brief Olympus RAW image

	@version $Rev: 2681 $	@version $Rev: 3091 $
	@author Jeff Costlow	@author Jeff Costlow
	<a href="mailto:costlow@gmail.com">costlow@gmail.com</a>	<a href="mailto:costlow@gmail.com">costlow@gmail.com</a>
	@date 31-Jul-07, costlow: created	@date 31-Jul-07, costlow: created
	*/	*/
	#ifndef ORFIMAGE_HPP_	#ifndef ORFIMAGE_HPP_
	#define ORFIMAGE_HPP_	#define ORFIMAGE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "image.hpp"	#include "image.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	rafimage.hpp	rafimage.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file rafimage.hpp	@file rafimage.hpp
	@brief Fujifilm RAW image	@brief Fujifilm RAW image

	@version $Rev: 2681 $	@version $Rev: 3201 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 05-Feb-07, ahu: created	@date 05-Feb-07, ahu: created
	*/	*/
	#ifndef RAFIMAGE_HPP_	#ifndef RAFIMAGE_HPP_
	#define RAFIMAGE_HPP_	#define RAFIMAGE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "image.hpp"	#include "image.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	rw2image.hpp	rw2image.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file rw2image.hpp	@file rw2image.hpp
	@brief Class Rw2Image	@brief Class Rw2Image

	@version $Rev: 2681 $	@version $Rev: 3201 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 06-Jan-09, ahu: created	@date 06-Jan-09, ahu: created
	*/	*/
	#ifndef RW2IMAGE_HPP_	#ifndef RW2IMAGE_HPP_
	#define RW2IMAGE_HPP_	#define RW2IMAGE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "image.hpp"	#include "image.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	tiffimage.hpp	tiffimage.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file tiffimage.hpp	@file tiffimage.hpp
	@brief Class TiffImage	@brief Class TiffImage

	@version $Rev: 2681 $	@version $Rev: 3201 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 15-Mar-06, ahu: created	@date 15-Mar-06, ahu: created
	*/	*/
	#ifndef TIFFIMAGE_HPP_	#ifndef TIFFIMAGE_HPP_
	#define TIFFIMAGE_HPP_	#define TIFFIMAGE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "image.hpp"	#include "image.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	value.hpp	value.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file value.hpp	@file value.hpp
	@brief Value interface and concrete subclasses	@brief Value interface and concrete subclasses

	@version $Rev: 2681 $	@version $Rev: 3201 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 09-Jan-04, ahu: created	@date 09-Jan-04, ahu: created
	11-Feb-04, ahu: isolated as a component	11-Feb-04, ahu: isolated as a component
	31-Jul-04, brad: added Time, Data and String values	31-Jul-04, brad: added Time, Data and String values
	*/	*/
	#ifndef VALUE_HPP_	#ifndef VALUE_HPP_
	#define VALUE_HPP_	#define VALUE_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***

	skipping to change at line 496	skipping to change at line 496
	to append a terminating '\\0' character if buf doesn't end	to append a terminating '\\0' character if buf doesn't end
	with '\\0'.	with '\\0'.
	*/	*/
	virtual int read(const std::string& buf);	virtual int read(const std::string& buf);
	//@}	//@}

	//! @name Accessors	//! @name Accessors
	//@{	//@{
	AutoPtr clone() const { return AutoPtr(clone_()); }	AutoPtr clone() const { return AutoPtr(clone_()); }
	/*!	/*!

	@brief Write the value to an output stream. Any trailing '\\0'	@brief Write the ASCII value up to the the first '\\0' character
	characters of the ASCII value are stripped and not written	to an
	to	output stream. Any further characters are ignored and not
	the output stream.	written to the output stream.
	*/	*/
	virtual std::ostream& write(std::ostream& os) const;	virtual std::ostream& write(std::ostream& os) const;
	//@}	//@}

	private:	private:
	//! Internal virtual copy constructor.	//! Internal virtual copy constructor.
	EXV_DLLLOCAL virtual AsciiValue* clone_() const;	EXV_DLLLOCAL virtual AsciiValue* clone_() const;

	}; // class AsciiValue	}; // class AsciiValue


	skipping to change at line 984	skipping to change at line 984
	//@{	//@{
	//! Default constructor.	//! Default constructor.
	DateValue();	DateValue();
	//! Constructor	//! Constructor
	DateValue(int year, int month, int day);	DateValue(int year, int month, int day);
	//! Virtual destructor.	//! Virtual destructor.
	virtual ~DateValue();	virtual ~DateValue();
	//@}	//@}

	//! Simple Date helper structure	//! Simple Date helper structure

	EXIV2API struct Date	struct EXIV2API Date {
	{
	Date() : year(0), month(0), day(0) {}	Date() : year(0), month(0), day(0) {}
	int year; //!< Year	int year; //!< Year
	int month; //!< Month	int month; //!< Month
	int day; //!< Day	int day; //!< Day
	};	};

	//! @name Manipulators	//! @name Manipulators
	//@{	//@{
	/*!	/*!
	@brief Read the value from a character buffer.	@brief Read the value from a character buffer.

End of changes. 4 change blocks.
	8 lines changed or deleted	7 lines changed or added

	version.hpp	version.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file version.hpp	@file version.hpp
	@brief Precompiler define and a function to test the %Exiv2 version.	@brief Precompiler define and a function to test the %Exiv2 version.
	References: Similar versioning defines are used in KDE, GTK and other	References: Similar versioning defines are used in KDE, GTK and other
	libraries. See http://apr.apache.org/versioning.html for accompa nying	libraries. See http://apr.apache.org/versioning.html for accompa nying
	guidelines.	guidelines.

	@version $Rev: 2685 $	@version $Rev: 3201 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 31-May-06, ahu: created	@date 31-May-06, ahu: created
	*/	*/
	#ifndef VERSION_HPP_	#ifndef VERSION_HPP_
	#define VERSION_HPP_	#define VERSION_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	// + standard includes	// + standard includes
	#include <string>	#include <string>

	/*!	/*!
	@brief %Exiv2 MAJOR version number of the library used at compile-time.	@brief %Exiv2 MAJOR version number of the library used at compile-time.
	*/	*/
	#define EXIV2_MAJOR_VERSION (0)	#define EXIV2_MAJOR_VERSION (0)
	/*!	/*!
	@brief %Exiv2 MINOR version number of the library used at compile-time.	@brief %Exiv2 MINOR version number of the library used at compile-time.
	*/	*/

	#define EXIV2_MINOR_VERSION (23)	#define EXIV2_MINOR_VERSION (24)
	/*!	/*!
	@brief %Exiv2 PATCH version number of the library used at compile-time.	@brief %Exiv2 PATCH version number of the library used at compile-time.
	*/	*/
	#define EXIV2_PATCH_VERSION (0)	#define EXIV2_PATCH_VERSION (0)
	/*!	/*!
	@brief Make an integer version number for comparison from a major, minor and	@brief Make an integer version number for comparison from a major, minor and
	a patch version number.	a patch version number.
	*/	*/
	#define EXIV2_MAKE_VERSION(major,minor,patch) \	#define EXIV2_MAKE_VERSION(major,minor,patch) \
	(((major) << 16) \| ((minor) << 8) \| (patch))	(((major) << 16) \| ((minor) << 8) \| (patch))

	skipping to change at line 125	skipping to change at line 125
	( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )	( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )

	// ********************************************************************** ***	// ********************************************************************** ***
	// namespace extensions	// namespace extensions
	namespace Exiv2 {	namespace Exiv2 {
	/*!	/*!
	@brief Return the version of %Exiv2 available at runtime as an intege r.	@brief Return the version of %Exiv2 available at runtime as an intege r.
	*/	*/
	EXIV2API int versionNumber();	EXIV2API int versionNumber();
	/*!	/*!

		@brief Return the version string Example: "0.24.0" (major.minor.patch
		)
		*/
		EXIV2API std::string versionString();
		/*!
	@brief Return the version of %Exiv2 as hex string of fixed length 6.	@brief Return the version of %Exiv2 as hex string of fixed length 6.
	*/	*/
	EXIV2API std::string versionNumberHexString();	EXIV2API std::string versionNumberHexString();
	/*!	/*!
	@brief Return the version of %Exiv2 available at runtime as a string.	@brief Return the version of %Exiv2 available at runtime as a string.
	*/	*/
	EXIV2API const char* version();	EXIV2API const char* version();
	/*!	/*!
	@brief Test the version of the available %Exiv2 library at runtime. R eturn	@brief Test the version of the available %Exiv2 library at runtime. R eturn
	true if it is the same as or newer than the passed-in version.	true if it is the same as or newer than the passed-in version.

	skipping to change at line 176	skipping to change at line 180
	else {	else {
	std::cout << "Installed Exiv2 version is less than 0.13\n";	std::cout << "Installed Exiv2 version is less than 0.13\n";
	}	}
	#else	#else
	std::cout << "Compile-time Exiv2 version doesn't have Exiv2::testVers ion()\n";	std::cout << "Compile-time Exiv2 version doesn't have Exiv2::testVers ion()\n";
	#endif	#endif
	@endcode	@endcode
	*/	*/
	EXIV2API bool testVersion(int major, int minor, int patch);	EXIV2API bool testVersion(int major, int minor, int patch);
	} // namespace Exiv2	} // namespace Exiv2


		// dumpLibraryInfo is general purpose and not in the Exiv2 namespace
		// used by exiv2 test suite to inspect libraries loaded at run-time
		EXIV2API void dumpLibraryInfo(std::ostream& os);

	#endif // VERSION_HPP_	#endif // VERSION_HPP_

End of changes. 5 change blocks.
	3 lines changed or deleted	13 lines changed or added

	xmp.hpp	xmp.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file xmp.hpp	@file xmp.hpp
	@brief Encoding and decoding of XMP data	@brief Encoding and decoding of XMP data

	@version $Rev: 2681 $	@version $Rev: 3201 $
	@author Andreas Huggel (ahu)	@author Andreas Huggel (ahu)
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 13-Jul-07, ahu: created	@date 13-Jul-07, ahu: created
	*/	*/
	#ifndef XMP_HPP_	#ifndef XMP_HPP_
	#define XMP_HPP_	#define XMP_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "metadatum.hpp"	#include "metadatum.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	xmpsidecar.hpp	xmpsidecar.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2012 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2013 Andreas Huggel <ahuggel@gmx.net>
	*	*
	* This program is part of the Exiv2 distribution.	* This program is part of the Exiv2 distribution.
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version 2	* as published by the Free Software Foundation; either version 2
	* of the License, or (at your option) any later version.	* of the License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.	* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 U SA.
	*/	*/
	/*!	/*!
	@file xmpsidecar.hpp	@file xmpsidecar.hpp
	@brief An Image subclass to support XMP sidecar files	@brief An Image subclass to support XMP sidecar files

	@version $Rev: 2681 $	@version $Rev: 3201 $
	@author Andreas Huggel	@author Andreas Huggel
	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>	<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
	@date 07-Mar-08, ahu: created	@date 07-Mar-08, ahu: created
	*/	*/
	#ifndef XMPSIDECAR_HPP_	#ifndef XMPSIDECAR_HPP_
	#define XMPSIDECAR_HPP_	#define XMPSIDECAR_HPP_

	// ********************************************************************** ***	// ********************************************************************** ***
	// included header files	// included header files
	#include "image.hpp"	#include "image.hpp"

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/