Exiv2: headers diff between 0.22 and 0.23 versions

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

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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"

	skipping to change at line 82	skipping to change at line 82
	method to get a temporary reference.	method to get a temporary reference.
	@param create Specifies if an existing image should be read (fals e)	@param create Specifies if an existing image should be read (fals e)
	or if a new file should be created (true).	or if a new file should be created (true).
	*/	*/
	Cr2Image(BasicIo::AutoPtr io, bool create);	Cr2Image(BasicIo::AutoPtr io, bool create);
	//@}	//@}

	//! @name Manipulators	//! @name Manipulators
	//@{	//@{
	void readMetadata();	void readMetadata();

	/*!
	@brief Todo: Write metadata back to the image. This method is not
	yet implemented. Calling it will throw an Error(31).
	*/
	void writeMetadata();	void writeMetadata();
	/*!	/*!

	@brief Todo: Not supported yet, requires writeMetadata(). Calling
	this function will throw an Error(32).
	*/
	void setExifData(const ExifData& exifData);
	/*!
	@brief Todo: Not supported yet, requires writeMetadata(). Calling
	this function will throw an Error(32).
	*/
	void setIptcData(const IptcData& iptcData);
	/*!
	@brief Not supported. CR2 format does not contain a comment.	@brief Not supported. CR2 format does not contain a comment.
	Calling this function will throw an Error(32).	Calling this function will throw an Error(32).
	*/	*/
	void setComment(const std::string& comment);	void setComment(const std::string& comment);
	//@}	//@}

	//! @name Accessors	//! @name Accessors
	//@{	//@{
	std::string mimeType() const;	std::string mimeType() const;
	int pixelWidth() const;	int pixelWidth() const;

	skipping to change at line 146	skipping to change at line 132
	IptcData& iptcData,	IptcData& iptcData,
	XmpData& xmpData,	XmpData& xmpData,
	const byte* pData,	const byte* pData,
	uint32_t size	uint32_t size
	);	);
	/*!	/*!
	@brief Encode metadata from the provided metadata to CR2 format.	@brief Encode metadata from the provided metadata to CR2 format.
	See TiffParser::encode().	See TiffParser::encode().
	*/	*/
	static WriteMethod encode(	static WriteMethod encode(

	Blob& blob,	BasicIo& io,
	const byte* pData,	const byte* pData,
	uint32_t size,	uint32_t size,

		ByteOrder byteOrder,
	const ExifData& exifData,	const ExifData& exifData,
	const IptcData& iptcData,	const IptcData& iptcData,
	const XmpData& xmpData	const XmpData& xmpData
	);	);

	}; // class Cr2Parser	}; // class Cr2Parser

	// ********************************************************************** ***	// ********************************************************************** ***
	// template, inline and free functions	// template, inline and free functions


End of changes. 6 change blocks.
	17 lines changed or deleted	4 lines changed or added

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

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2479 $	@version $Rev: 2681 $
	@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

	image.hpp	image.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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 image.hpp	@file image.hpp
	@brief Class Image, defining the interface for all Image subclasses.	@brief Class Image, defining the interface for all Image subclasses.

	@version $Rev: 2553 $	@version $Rev: 2701 $
	@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>
	@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 09-Jan-04, ahu: created<BR>	@date 09-Jan-04, ahu: created<BR>
	11-Feb-04, ahu: isolated as a component<BR>	11-Feb-04, ahu: isolated as a component<BR>
	19-Jul-04, brad: revamped to be more flexible and support IPTC<B R>	19-Jul-04, brad: revamped to be more flexible and support IPTC<B R>
	15-Jan-05, brad: inside-out design changes	15-Jan-05, brad: inside-out design changes
	*/	*/
	#ifndef IMAGE_HPP_	#ifndef IMAGE_HPP_

	skipping to change at line 63	skipping to change at line 63
	// ********************************************************************** ***	// ********************************************************************** ***
	// class definitions	// class definitions

	//! Supported image formats	//! Supported image formats
	namespace ImageType {	namespace ImageType {
	const int none = 0; //!< Not an image	const int none = 0; //!< Not an image
	}	}

	//! Native preview information. This is meant to be used only by the Pr eviewManager.	//! Native preview information. This is meant to be used only by the Pr eviewManager.
	struct NativePreview {	struct NativePreview {

	long position_;	long position_; //!< Position
	uint32_t size_;	uint32_t size_; //!< Size
	uint32_t width_;	uint32_t width_; //!< Width
	uint32_t height_;	uint32_t height_; //!< Height
	std::string filter_;	std::string filter_; //!< Filter
	std::string mimeType_;	std::string mimeType_; //!< MIME type
	};	};

	//! List of native previews. This is meant to be used only by the Previ ewManager.	//! List of native previews. This is meant to be used only by the Previ ewManager.
	typedef std::vector<NativePreview> NativePreviewList;	typedef std::vector<NativePreview> NativePreviewList;

	/*!	/*!
	@brief Abstract base class defining the interface for an image. This is	@brief Abstract base class defining the interface for an image. This is
	the top-level interface to the Exiv2 library.	the top-level interface to the Exiv2 library.

	Image has containers to store image metadata and subclasses implement	Image has containers to store image metadata and subclasses implement

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

	jpgimage.hpp	jpgimage.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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 jpgimage.hpp	@file jpgimage.hpp
	@brief Class JpegImage to access JPEG images	@brief Class JpegImage to access JPEG images

	@version $Rev: 2558 $	@version $Rev: 2681 $
	@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>
	@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>
	@author Volker Grabsch (vog)	@author Volker Grabsch (vog)
	<a href="mailto:vog@notjusthosting.com">vog@notjusthosting.com</ a>	<a href="mailto:vog@notjusthosting.com">vog@notjusthosting.com</ a>
	@author Michael Ulbrich (mul)	@author Michael Ulbrich (mul)
	<a href="mailto:mul@rentapacs.de">mul@rentapacs.de</a>	<a href="mailto:mul@rentapacs.de">mul@rentapacs.de</a>
	@date 15-Jan-05, brad: split out from image.cpp	@date 15-Jan-05, brad: split out from image.cpp
	*/	*/

	skipping to change at line 67	skipping to change at line 67
	const int exv = 2; //!< EXV image type (see class ExvImage )	const int exv = 2; //!< EXV image type (see class ExvImage )
	}	}

	/*!	/*!
	@brief Helper class, has methods to deal with %Photoshop "Information	@brief Helper class, has methods to deal with %Photoshop "Information
	Resource Blocks" (IRBs).	Resource Blocks" (IRBs).
	*/	*/
	struct EXIV2API Photoshop {	struct EXIV2API Photoshop {
	// Todo: Public for now	// Todo: Public for now
	static const char ps3Id_[]; //!< %Photoshop marker	static const char ps3Id_[]; //!< %Photoshop marker

	static const char bimId_[]; //!< %Photoshop marker	static const char* irbId_[]; //!< %Photoshop IRB markers
		static const char bimId_[]; //!< %Photoshop IRB marker (depreca
		ted)
	static const uint16_t iptc_; //!< %Photoshop IPTC marker	static const uint16_t iptc_; //!< %Photoshop IPTC marker
	static const uint16_t preview_; //!< %Photoshop preview marker	static const uint16_t preview_; //!< %Photoshop preview marker

	/*!	/*!

		@brief Checks an IRB

		@param pPsData Existing IRB buffer
		@param sizePsData Size of the IRB buffer
		@return true if the IRB marker is known and the buffer is big en
		ough to check this;<BR>
		false otherwise
		*/
		static bool isIrb(const byte* pPsData,
		long sizePsData);
		/*!
	@brief Validates all IRBs	@brief Validates all IRBs

	@param pPsData Existing IRB buffer	@param pPsData Existing IRB buffer
	@param sizePsData Size of the IRB buffer, may be 0	@param sizePsData Size of the IRB buffer, may be 0
	@return true if all IRBs are valid;<BR>	@return true if all IRBs are valid;<BR>
	false otherwise	false otherwise
	*/	*/
	static bool valid(const byte* pPsData,	static bool valid(const byte* pPsData,
	long sizePsData);	long sizePsData);
	/*!	/*!

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

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

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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

	properties.hpp	properties.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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 properties.hpp	@file properties.hpp
	@brief XMP property and type information.<BR>References:<BR>	@brief XMP property and type information.<BR>References:<BR>
	<a href="http://www.adobe.com/devnet/xmp/pdfs/xmp_specification.pdf">XMP Specification</a> from Adobe	<a href="http://www.adobe.com/devnet/xmp/pdfs/xmp_specification.pdf">XMP Specification</a> from Adobe
	<I>(Property descriptions copied from the XMP specification with the perm ission of Adobe)</I>	<I>(Property descriptions copied from the XMP specification with the perm ission of Adobe)</I>

	@version $Rev: 2453 $	@version $Rev: 2701 $
	@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>
	@author Gilles Caulier (cgilles)	@author Gilles Caulier (cgilles)
	<a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>	<a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
	@date 13-Jul-07, ahu: created	@date 13-Jul-07, ahu: created
	*/	*/
	#ifndef PROPERTIES_HPP_	#ifndef PROPERTIES_HPP_
	#define PROPERTIES_HPP_	#define PROPERTIES_HPP_

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

	skipping to change at line 134	skipping to change at line 134
	static const char* propertyDesc(const XmpKey& key);	static const char* propertyDesc(const XmpKey& key);
	/*!	/*!
	@brief Return the type for property \em key. The default	@brief Return the type for property \em key. The default
	for unknown keys is xmpText.	for unknown keys is xmpText.
	@param key The property key	@param key The property key
	@return The type of the property	@return The type of the property
	*/	*/
	static TypeId propertyType(const XmpKey& key);	static TypeId propertyType(const XmpKey& key);
	/*!	/*!
	@brief Return information for the property for key.	@brief Return information for the property for key.


		If the key is a path to a nested property (one which contains a s
		lash,
		like \c Xmp.MP.RegionInfo/MPRI:Regions), determines the innermost
		element
		(\c Xmp.MPRI.Regions) and returns its property information.

	@param key The property key	@param key The property key
	@return A pointer to the property information, 0 if the	@return A pointer to the property information, 0 if the
	key is of an unknown property.	key is of an unknown property.
	*/	*/
	static const XmpPropertyInfo* propertyInfo(const XmpKey& key);	static const XmpPropertyInfo* propertyInfo(const XmpKey& key);
	/*!	/*!
	@brief Return the namespace name for the schema associated	@brief Return the namespace name for the schema associated
	with \em prefix.	with \em prefix.
	@param prefix Prefix	@param prefix Prefix
	@return The namespace name	@return The namespace name

	skipping to change at line 220	skipping to change at line 225
	*/	*/
	static void unregisterNs();	static void unregisterNs();
	//! Type for the namespace registry	//! Type for the namespace registry
	typedef std::map<std::string, XmpNsInfo> NsRegistry;	typedef std::map<std::string, XmpNsInfo> NsRegistry;
	/*!	/*!
	@brief Get the registered namespace for a specific \em prefix fro m the registry.	@brief Get the registered namespace for a specific \em prefix fro m the registry.
	*/	*/
	static const XmpNsInfo* lookupNsRegistry(const XmpNsInfo::Prefix& p refix);	static const XmpNsInfo* lookupNsRegistry(const XmpNsInfo::Prefix& p refix);

	// DATA	// DATA

	static NsRegistry nsRegistry_; //! Namespace registry	static NsRegistry nsRegistry_; //!< Namespace registry

	}; // class XmpProperties	}; // class XmpProperties

	/*!	/*!
	@brief Concrete keys for XMP metadata.	@brief Concrete keys for XMP metadata.
	*/	*/
	class EXIV2API XmpKey : public Key {	class EXIV2API XmpKey : public Key {
	public:	public:
	//! Shortcut for an %XmpKey auto pointer.	//! Shortcut for an %XmpKey auto pointer.
	typedef std::auto_ptr<XmpKey> AutoPtr;	typedef std::auto_ptr<XmpKey> AutoPtr;

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

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

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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

	types.hpp	types.hpp
	// ***************************************************************** -- C+ + --	// ***************************************************************** -- C+ + --
	/*	/*

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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 types.hpp	@file types.hpp
	@brief Type definitions for %Exiv2 and related functionality	@brief Type definitions for %Exiv2 and related functionality

	@version $Rev: 2528 $	@version $Rev: 2681 $
	@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<BR>	@date 09-Jan-04, ahu: created<BR>
	11-Feb-04, ahu: isolated as a component<BR>	11-Feb-04, ahu: isolated as a component<BR>
	31-Jul-04, brad: added Time, Data and String values	31-Jul-04, brad: added Time, Data and String values
	*/	*/
	#ifndef TYPES_HPP_	#ifndef TYPES_HPP_
	#define TYPES_HPP_	#define TYPES_HPP_

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

	skipping to change at line 51	skipping to change at line 51

	#include "version.hpp"	#include "version.hpp"

	// + standard includes	// + standard includes
	#include <string>	#include <string>
	#include <vector>	#include <vector>
	#include <iosfwd>	#include <iosfwd>
	#include <utility>	#include <utility>
	#include <algorithm>	#include <algorithm>
	#include <sstream>	#include <sstream>


	#ifdef EXV_HAVE_STDINT_H	#ifdef EXV_HAVE_STDINT_H
	# include <stdint.h>	# include <stdint.h>

	#endif	#elif defined(_MSC_VER)
		// MSVC (before 2010) doesn't provide C99 types, but it has MS specific var
	// MSVC macro to convert a string to a wide string	iants
	#ifdef EXV_UNICODE_PATH
	# define EXV_WIDEN(t) L ## t
	#endif

	// MSVC doesn't provide C99 types, but it has MS specific variants
	#ifdef _MSC_VER
	typedef unsigned __int8 uint8_t;	typedef unsigned __int8 uint8_t;
	typedef unsigned __int16 uint16_t;	typedef unsigned __int16 uint16_t;
	typedef unsigned __int32 uint32_t;	typedef unsigned __int32 uint32_t;
	typedef unsigned __int64 uint64_t;	typedef unsigned __int64 uint64_t;
	typedef __int8 int8_t;	typedef __int8 int8_t;
	typedef __int16 int16_t;	typedef __int16 int16_t;
	typedef __int32 int32_t;	typedef __int32 int32_t;
	typedef __int64 int64_t;	typedef __int64 int64_t;
	#endif	#endif


		// MSVC macro to convert a string to a wide string
		#ifdef EXV_UNICODE_PATH
		# define EXV_WIDEN(t) L ## t
		#endif

	/*!	/*!
	@brief Macro to make calls to member functions through a pointer more rea dable.	@brief Macro to make calls to member functions through a pointer more rea dable.
	See the C++ FAQ LITE, item	See the C++ FAQ LITE, item
	<a href="http://www.parashift.com/c++-faq-lite/pointers-to-members .html#faq-33.5" title="[33.5] How can I avoid syntax errors when calling a member function using a pointer-to-member-function?">[33.5] How can I avoid syntax errors when calling a member function using a pointer-to-member-fun ction?</a>.	<a href="http://www.parashift.com/c++-faq-lite/pointers-to-members .html#faq-33.5" title="[33.5] How can I avoid syntax errors when calling a member function using a pointer-to-member-function?">[33.5] How can I avoid syntax errors when calling a member function using a pointer-to-member-fun ction?</a>.
	*/	*/
	#define EXV_CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))	#define EXV_CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))

	// Simple min and max macros	// Simple min and max macros
	//! Simple common min macro	//! Simple common min macro
	#define EXV_MIN(a,b) ((a) < (b) ? (a) : (b))	#define EXV_MIN(a,b) ((a) < (b) ? (a) : (b))

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

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

	* Copyright (C) 2004-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2538 $	@version $Rev: 2681 $
	@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-2011 Andreas Huggel <ahuggel@gmx.net>	* Copyright (C) 2004-2012 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: 2453 $	@version $Rev: 2681 $
	@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/

	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.22"	#define EXV_PACKAGE_STRING "exiv2 0.23"

	/* 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.22"	#define EXV_PACKAGE_VERSION "0.23"

	/* 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 */


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