Author: post
Date: 2013-01-27 13:47:07 +0100 (Sun, 27 Jan 2013)
New Revision: 510
Modified:
RawSpeed/ArwDecoder.cpp
Log:
Fix images modified by Sony Image Data Converter SR. Regression tested.
Modified: RawSpeed/ArwDecoder.cpp
===================================================================
--- RawSpeed/ArwDecoder.cpp 2013-01-27 12:32:46 UTC (rev 509)
+++ RawSpeed/ArwDecoder.cpp 2013-01-27 12:47:07 UTC (rev 510)
@@ -64,9 +64,14 @@
// This camera has however another MAKER entry, so we MAY be able
// to detect it this way in the future.
data = mRootIFD->getIFDsWithTag(MAKE);
- string make = data[0]->getEntry(MAKE)->getString();
- if (!make.compare("SONY"))
- bitPerPixel = 8;
+ if (data.size() > 1) {
+ for (uint32 i = 0; i < data.size(); i++) {
+ string make = data[i]->getEntry(MAKE)->getString();
+ /* Check for maker "SONY" without spaces */
+ if (!make.compare("SONY"))
+ bitPerPixel = 8;
+ }
+ }
bool arw1 = counts->getInt() * 8 != width * height * bitPerPixel;
if (arw1)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
