[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9026954

The following commit has been merged in the master branch:
commit 9026954816cac25bba8f59b65af17d37d0cf631b
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 1 14:17:25 2016 +0000

    #1074 Work in progress for ICC/jpg - changes to readMetadata() and printStructure()
---
 Makefile                   |   6 ++++--
 config/Makefile.in         |   8 +++++---
 include/exiv2/jpgimage.hpp |   1 +
 src/jpgimage.cpp           |  38 ++++++++++++++++++++++++++++++--------
 test/bugfixes-test.sh      | Bin 19826 -> 1911690 bytes
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 5c1e982..dafad45 100644
--- a/Makefile
+++ b/Makefile
@@ -93,14 +93,16 @@ path-test.sh       preview-test.sh sshiotest.sh     stringto-test.sh       tiff-
 write-test.sh      write-video-test.sh              write2-test.sh         xmpparser-test.sh webp-test.sh:
 	cd test && ./$@
 
-# convenience target for running bugfixes-test.sh
+# convenience targets for running bugfixes-test.sh webp-test.sh and preview-test.sh
 bugtest bugstest testbugs bugfixes:
 	cd test && ./bugfixes-test.sh
 
-# convenience target for running webp-test.sh
 webp-test webptest:
 	cd test && ./webp-test.sh
 
+preview-test preview:
+	cd test && ./preview-test.sh
+
 # convenience target for building individual sample programs
 addmoddel		exifcomment		exifvalue	httptest	iptctest		mmap-test	stringto-test \
 exifdata		iotest			key-test	path-test	taglist			write2-test write-test	\
diff --git a/config/Makefile.in b/config/Makefile.in
index 2cc77de..dafad45 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -50,7 +50,7 @@
 ########################################################################
 
 SHELL = /bin/sh
-ENABLE_XMP = @ENABLE_XMP@
+ENABLE_XMP = 1
 
 .PHONY: all doc config samples xmpsdk                \
         mostlyclean clean distclean maintainer-clean \
@@ -93,14 +93,16 @@ path-test.sh       preview-test.sh sshiotest.sh     stringto-test.sh       tiff-
 write-test.sh      write-video-test.sh              write2-test.sh         xmpparser-test.sh webp-test.sh:
 	cd test && ./$@
 
-# convenience target for running bugfixes-test.sh
+# convenience targets for running bugfixes-test.sh webp-test.sh and preview-test.sh
 bugtest bugstest testbugs bugfixes:
 	cd test && ./bugfixes-test.sh
 
-# convenience target for running webp-test.sh
 webp-test webptest:
 	cd test && ./webp-test.sh
 
+preview-test preview:
+	cd test && ./preview-test.sh
+
 # convenience target for building individual sample programs
 addmoddel		exifcomment		exifvalue	httptest	iptctest		mmap-test	stringto-test \
 exifdata		iotest			key-test	path-test	taglist			write2-test write-test	\
diff --git a/include/exiv2/jpgimage.hpp b/include/exiv2/jpgimage.hpp
index c04f5c5..93b67b2 100644
--- a/include/exiv2/jpgimage.hpp
+++ b/include/exiv2/jpgimage.hpp
@@ -252,6 +252,7 @@ namespace Exiv2 {
         static const char exifId_[];            //!< Exif identifier
         static const char jfifId_[];            //!< JFIF identifier
         static const char xmpId_[];             //!< XMP packet identifier
+        static const char iccId_[];             //!< ICC profile identifier
 
     private:
         //! @name NOT implemented
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index f56546b..8b50ac8 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -95,6 +95,7 @@ namespace Exiv2 {
     const char     JpegBase::exifId_[] = "Exif

-- 
exiv2 packaging