[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=4a9c193

The following commit has been merged in the master branch:
commit 4a9c1936242ffc7a7aad9dee380dfb725ae7bb35
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Dec 7 16:01:14 2009 +0000

    #658: Header of SP-560UZ ORF files seems to have a different magic.
---
 src/orfimage.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/orfimage.cpp b/src/orfimage.cpp
index 91a903d..9ae011b 100644
--- a/src/orfimage.cpp
+++ b/src/orfimage.cpp
@@ -209,7 +209,7 @@ namespace Exiv2 {
     namespace Internal {
 
     OrfHeader::OrfHeader()
-        : TiffHeaderBase('O'<< 8 | 'R', 8, littleEndian, 0x00000008)
+        : TiffHeaderBase(0x4f52, 8, littleEndian, 0x00000008)
     {
     }
 
@@ -230,7 +230,8 @@ namespace Exiv2 {
         else {
             return false;
         }
-        if (tag() != getUShort(pData + 2, byteOrder())) return false;
+        uint16_t sig = getUShort(pData + 2, byteOrder());
+        if (tag() != sig && 0x5352 != sig) return false; // #658: Added 0x5352 for SP-560UZ
         setOffset(getULong(pData + 4, byteOrder()));
         if (offset() != 0x00000008) return false;
 

-- 
exiv2 packaging