[Rawstudio-commit] rawspeed r72 - RawSpeed

[Klaus Post]

Author: post
Date: 2009-06-08 19:54:54 +0200 (Mon, 08 Jun 2009)
New Revision: 72

Modified:
   RawSpeed/ArwDecoder.cpp
Log:
- Disabled A700 and A900, produces wrong output.

Modified: RawSpeed/ArwDecoder.cpp
===================================================================
--- RawSpeed/ArwDecoder.cpp     2009-06-08 17:54:16 UTC (rev 71)
+++ RawSpeed/ArwDecoder.cpp     2009-06-08 17:54:54 UTC (rev 72)
@@ -35,11 +35,23 @@
 
 RawImage ArwDecoder::decodeRaw()
 {
-  vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(STRIPOFFSETS);
+  vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
 
+  // TODO: Add support for these models.
+  if (!data[0]->getEntry(MODEL)->getString().compare("DSLR-A900")) {
+    ThrowRDE("ARW Decoder: Model not supported");
+  }
+  if (!data[0]->getEntry(MODEL)->getString().compare("DSLR-A700")) {
+    ThrowRDE("ARW Decoder: Model not supported");
+  }
+
+  data = mRootIFD->getIFDsWithTag(STRIPOFFSETS);
+
   if (data.empty())
     ThrowRDE("ARW Decoder: No image data found");
 
+  string model = data[0]->getEntry(MODEL)->getString();
+
   TiffIFD* raw = data[0];
   int compression = raw->getEntry(COMPRESSION)->getInt();
   if (32767 != compression)


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