Finally fix the rawspeed support for the fuji F700

mlq · Aug 15, 2014 · 798b789 · 798b789
1 parent 8d15eb2
commit 798b789
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/external/rawspeed/RawSpeed/RafDecoder.cpp b/src/external/rawspeed/RawSpeed/RafDecoder.cpp
@@ -89,9 +89,11 @@ RawImage RafDecoder::decodeRawInternal() {
   ByteStream input(mFile->getData(off), mFile->getSize() - off);
   iPoint2D pos(0, 0);
 
-  if (mRootIFD->endian == big)
+  if (hints.find("double_width_unpacked") != hints.end()) {
+    Decode16BitRawUnpacked(input, width*2, height);
+  } else if (mRootIFD->endian == big) {
     Decode16BitRawBEunpacked(input, width, height);
-  else {
+  } else {
     if (hints.find("jpeg32_bitorder") != hints.end())
       readUncompressedRaw(input, mRaw->dim, pos, width*bps/8, bps, BitOrder_Jpeg32);
     else

diff --git a/src/external/rawspeed/data/cameras.xml b/src/external/rawspeed/data/cameras.xml
@@ -4654,7 +4654,7 @@
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="519" white="16250"/>
 	</Camera>
-	<Camera make="FUJIFILM" model="FinePix F700" supported="no">
+	<Camera make="FUJIFILM" model="FinePix F700">
 		<CFA2 width="2" height="2">
 			<ColorRow y="0">GB</ColorRow>
 			<ColorRow y="1">RG</ColorRow>
@@ -4663,6 +4663,7 @@
 		<Sensor black="0" white="16383"/>
 	  <Hints>
 			<Hint name="fuji_rotate" value=""/>
+			<Hint name="double_width_unpacked" value=""/>
 		</Hints>
 	</Camera>
 	<Camera make="FUJIFILM" model="FinePix F900EXR">