Basic support for the Fuji F600EXR

based on 094e251 by pedrocr
darktable-org · Jun 7, 2015 · 8de931b · 8de931b
1 parent e21d830
commit 8de931b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/external/adobe_coeff.c b/src/external/adobe_coeff.c
@@ -124,6 +124,7 @@ static void dt_dcraw_adobe_coeff(const char *name, float cam_xyz[1][12])
     { "FUJIFILM E550", 0, 0, { 11044,-3888,-1120,-7248,15168,2208,-1531,2277,8069 } },
     { "FUJIFILM E900", 0, 0, { 9183,-2526,-1078,-7461,15071,2574,-2022,2440,8639 } },
     { "FUJIFILM F5", 0, 0, { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } },
+    { "FUJIFILM F600EXR", 0, 0, { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } },
     { "FUJIFILM F6", 0, 0, { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } },
     { "FUJIFILM F700", 0, 0x3fff, { 10004,-3219,-1201,-7036,15047,2107,-1863,2565,7736 } },
     { "FUJIFILM F900EXR", 256, 0xf3c, { 12085,-4727,-953,-3257,11489,2002,-511,2046,4592 } },

diff --git a/src/external/rawspeed/data/cameras.xml b/src/external/rawspeed/data/cameras.xml
@@ -5967,6 +5967,16 @@
 		<Crop x="28" y="0" width="-28" height="0"/>
 		<Sensor black="519" white="16250"/>
 	</Camera>
+	<Camera make="FUJIFILM" model="FinePix F600EXR">
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="34" y="0" width="-32" height="0"/>
+		<Sensor black="256" white="3900"/>
+	</Camera>
 	<Camera make="FUJIFILM" model="FinePix F700">
 		<CFA2 width="2" height="2">
 			<ColorRow y="0">GB</ColorRow>