From 4a9c1936242ffc7a7aad9dee380dfb725ae7bb35 Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Mon, 7 Dec 2009 16:01:14 +0000 Subject: [PATCH] #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 91a903d1..9ae011b9 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;