[Rawstudio-commit] rawspeed r206 - RawSpeed

[Klaus Post]

Author: post
Date: 2010-03-21 16:13:43 +0100 (Sun, 21 Mar 2010)
New Revision: 206

Modified:
   RawSpeed/TiffEntry.cpp
   RawSpeed/TiffEntryBE.cpp
Log:
Relaxed restrictions on Big Endian requests to match Little Endian.

Modified: RawSpeed/TiffEntry.cpp
===================================================================
--- RawSpeed/TiffEntry.cpp      2010-03-21 11:52:25 UTC (rev 205)
+++ RawSpeed/TiffEntry.cpp      2010-03-21 15:13:43 UTC (rev 206)
@@ -76,7 +76,7 @@
 }
 
 const unsigned int* TiffEntry::getIntArray() {
-  if (type != TIFF_LONG && type != TIFF_RATIONAL && type != TIFF_SRATIONAL)
+  if (type != TIFF_LONG && type != TIFF_RATIONAL && type != TIFF_SRATIONAL && 
type != TIFF_UNDEFINED )
     throw TiffParserException("TIFF, getIntArray: Wrong type encountered. 
Expected Long");
   return (unsigned int*)&data[0];
 }

Modified: RawSpeed/TiffEntryBE.cpp
===================================================================
--- RawSpeed/TiffEntryBE.cpp    2010-03-21 11:52:25 UTC (rev 205)
+++ RawSpeed/TiffEntryBE.cpp    2010-03-21 15:13:43 UTC (rev 206)
@@ -75,7 +75,7 @@
 
 const unsigned int* TiffEntryBE::getIntArray() {
   //TODO: Make critical section to avoid clashes.
-  if (!(type == TIFF_LONG || type == TIFF_UNDEFINED))
+  if (!(type == TIFF_LONG || type == TIFF_UNDEFINED || type == TIFF_RATIONAL 
||  type == TIFF_SRATIONAL))
     throw TiffParserException("TIFF, getIntArray: Wrong type encountered. 
Expected Int");
   if (mDataSwapped)
     return (unsigned int*)&data[0];


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit