[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=c2fe8be

The following commit has been merged in the master branch:
commit c2fe8be4ef5eb53854c1f0d7c16d76a68c62182f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Mar 21 00:52:38 2012 +0000

    Fixed the supported metadata declared by the image for several image formats (mostly XMP was missing).
---
 src/cr2image.cpp  | 2 +-
 src/jpgimage.cpp  | 2 +-
 src/mrwimage.cpp  | 2 +-
 src/orfimage.cpp  | 2 +-
 src/rafimage.cpp  | 2 +-
 src/tiffimage.cpp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 537bfa9..8ca56b6 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -59,7 +59,7 @@ namespace Exiv2 {
     using namespace Internal;
 
     Cr2Image::Cr2Image(BasicIo::AutoPtr io, bool /*create*/)
-        : Image(ImageType::cr2, mdExif | mdIptc, io)
+        : Image(ImageType::cr2, mdExif | mdIptc | mdXmp, io)
     {
     } // Cr2Image::Cr2Image
 
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 66cd87b..4c48793 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -287,7 +287,7 @@ namespace Exiv2 {
 
     JpegBase::JpegBase(int type, BasicIo::AutoPtr io, bool create,
                        const byte initData[], long dataSize)
-        : Image(type, mdExif | mdIptc | mdComment, io)
+        : Image(type, mdExif | mdIptc | mdXmp | mdComment, io)
     {
         if (create) {
             initImage(initData, dataSize);
diff --git a/src/mrwimage.cpp b/src/mrwimage.cpp
index e349cdf..e27f20f 100644
--- a/src/mrwimage.cpp
+++ b/src/mrwimage.cpp
@@ -55,7 +55,7 @@ EXIV2_RCSID("@(#) $Id$")
 namespace Exiv2 {
 
     MrwImage::MrwImage(BasicIo::AutoPtr io, bool /*create*/)
-        : Image(ImageType::mrw, mdExif | mdIptc, io)
+        : Image(ImageType::mrw, mdExif | mdIptc | mdXmp, io)
     {
     } // MrwImage::MrwImage
 
diff --git a/src/orfimage.cpp b/src/orfimage.cpp
index e53c02e..ac05556 100644
--- a/src/orfimage.cpp
+++ b/src/orfimage.cpp
@@ -59,7 +59,7 @@ namespace Exiv2 {
     using namespace Internal;
 
     OrfImage::OrfImage(BasicIo::AutoPtr io, bool /*create*/)
-        : Image(ImageType::orf, mdExif | mdIptc, io)
+        : Image(ImageType::orf, mdExif | mdIptc | mdXmp, io)
     {
     } // OrfImage::OrfImage
 
diff --git a/src/rafimage.cpp b/src/rafimage.cpp
index 54c5383..1a7eab8 100644
--- a/src/rafimage.cpp
+++ b/src/rafimage.cpp
@@ -55,7 +55,7 @@ EXIV2_RCSID("@(#) $Id$")
 namespace Exiv2 {
 
     RafImage::RafImage(BasicIo::AutoPtr io, bool /*create*/)
-        : Image(ImageType::raf, mdExif | mdIptc, io)
+        : Image(ImageType::raf, mdExif | mdIptc | mdXmp, io)
     {
     } // RafImage::RafImage
 
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 354bfb9..826fa39 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -80,7 +80,7 @@ namespace Exiv2 {
     using namespace Internal;
 
     TiffImage::TiffImage(BasicIo::AutoPtr io, bool /*create*/)
-        : Image(ImageType::tiff, mdExif | mdIptc, io),
+        : Image(ImageType::tiff, mdExif | mdIptc | mdXmp, io),
           pixelWidth_(0), pixelHeight_(0)
     {
     } // TiffImage::TiffImage

-- 
exiv2 packaging