[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=64af778

The following commit has been merged in the master branch:
commit 64af7781b80cab378bee48776eee59f194596c84
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Dec 18 09:40:06 2009 +0000

    #661: Changed type of tag Exif.Image.Resources to BYTE (1).
---
 src/tags.cpp        | 2 +-
 src/tiffvisitor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index 21ceacb..a9917d5 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -566,7 +566,7 @@ namespace Exiv2 {
                 ifd0Id, otherTags, asciiString, print0x8298),
         TagInfo(0x8649, "ImageResources", N_("Image Resources Block"),
                 N_("Contains information embedded by the Adobe Photoshop application"),
-                ifd0Id, otherTags, undefined, printValue),
+                ifd0Id, otherTags, unsignedByte, printValue),
         TagInfo(0x8769, "ExifTag", N_("Exif IFD Pointer"),
                 N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the "
                 "same structure as that of the IFD specified in TIFF. "
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index ea702d5..2d6233b 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -513,7 +513,7 @@ namespace Exiv2 {
             irbBuf = Photoshop::setIptcIrb(irbBuf.pData_, irbBuf.size_, iptcData_);
             exifData_.erase(pos);
             if (irbBuf.size_ != 0) {
-                Value::AutoPtr value = Value::create(undefined);
+                Value::AutoPtr value = Value::create(unsignedByte);
                 value->read(irbBuf.pData_, irbBuf.size_, invalidByteOrder);
                 Exifdatum iptcDatum(irbKey, value.get());
                 exifData_.add(iptcDatum);

-- 
exiv2 packaging