third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#658: Header of SP-560UZ ORF files seems to have a different magic.

Browse Source
This commit is contained in:
Andreas Huggel 2009-12-07 16:01:14 +00:00
parent 53e442d0e6
commit 4a9c193624
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/orfimage.cpp
View File

@ -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;