Author: post
Date: 2014-01-05 23:17:12 +0100 (Sun, 05 Jan 2014)
New Revision: 610
Modified:
data/cameras.xml
Log:
Merge darktable camera definitions - huge thanks to Pascal de Bruijn
Modified: data/cameras.xml
===================================================================
--- data/cameras.xml 2014-01-05 19:12:58 UTC (rev 609)
+++ data/cameras.xml 2014-01-05 22:17:12 UTC (rev 610)
@@ -1029,6 +1029,19 @@
<Vertical x="4984" width="8"/>
</BlackAreas>
</Camera>
+ <Camera make="NIKON CORPORATION" model="NIKON Df">
+ <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="2" y="0" width="-50" height="0"/>
+ <Sensor black="0" white="16383"/>
+ <BlackAreas>
+ <Vertical x="4984" width="8"/>
+ </BlackAreas>
+ </Camera>
<Camera make="NIKON CORPORATION" model="NIKON D5100"
decoder_version="2">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
@@ -1099,6 +1112,16 @@
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="4096"/>
</Camera>
+ <Camera make="NIKON CORPORATION" model="NIKON D5300">
+ <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="0" y="0" width="0" height="0"/>
+ <Sensor black="0" white="4096"/>
+ </Camera>
<Camera make="NIKON CORPORATION" model="NIKON D60">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
@@ -1119,6 +1142,16 @@
<Crop x="0" y="0" width="-50" height="0"/>
<Sensor black="0" white="16383"/>
</Camera>
+ <Camera make="NIKON CORPORATION" model="NIKON D610">
+ <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="0" y="0" width="-50" height="0"/>
+ <Sensor black="0" white="16383"/>
+ </Camera>
<Camera make="NIKON CORPORATION" model="NIKON D70">
<CFA width="2" height="2">
<Color x="0" y="0">BLUE</Color>
@@ -1272,6 +1305,16 @@
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="4095"/>
</Camera>
+ <Camera make="NIKON CORPORATION" model="NIKON 1 AW1"
decoder_version="4">
+ <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="0" y="0" width="0" height="0"/>
+ <Sensor black="0" white="4095"/>
+ </Camera>
<Camera make="NIKON" model="E5400" decoder_version="3">
<CFA width="2" height="2">
<Color x="0" y="0">BLUE</Color>
@@ -1600,7 +1643,6 @@
<Sensor black="80" white="4095"/>
</Camera>
<Camera make="OLYMPUS OPTICAL CO.,LTD" model="E-10">
-
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
<Color x="1" y="0">GREEN</Color>
@@ -1628,7 +1670,7 @@
<Color x="1" y="1">RED</Color>
</CFA>
<Crop x="0" y="0" width="0" height="0"/>
- <Sensor black="0" white="4095"/>
+ <Sensor black="255" white="4095"/>
</Camera>
<Camera make="OLYMPUS IMAGING CORP." model="E-M5">
<CFA width="2" height="2">
@@ -1638,7 +1680,7 @@
<Color x="1" y="1">BLUE</Color>
</CFA>
<Crop x="0" y="0" width="0" height="0"/>
- <Sensor black="250" white="4095"/>
+ <Sensor black="255" white="4095"/>
</Camera>
<Camera make="OLYMPUS IMAGING CORP." model="E-P1">
<CFA width="2" height="2">
@@ -1704,8 +1746,8 @@
<Color x="1" y="1">BLUE</Color>
</CFA>
<Crop x="0" y="0" width="0" height="0"/>
- <Sensor black="250" white="4095"/>
- </Camera>
+ <Sensor black="250" white="4095"/>
+ </Camera>
<Camera make="OLYMPUS IMAGING CORP." model="E-PM1">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
@@ -1772,6 +1814,16 @@
<Hint name="force_uncompressed" value=""/>
</Hints>
</Camera>
+ <Camera make="OLYMPUS IMAGING CORP." model="STYLUS1">
+ <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="0" y="0" width="-14" height="0"/>
+ <Sensor black="200" white="3900"/>
+ </Camera>
<Camera make="Panasonic" model = "DMC-FX150">
<CFA width="2" height="2">
<Color x="0" y="0">BLUE</Color>
@@ -2077,7 +2129,6 @@
<Hint name="zero_is_bad" value=""/>
</Hints>
</Camera>
-
<Camera make="Panasonic" model = "DMC-GF1">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
@@ -2205,6 +2256,72 @@
<Crop x="0" y="0" width="-74" height="0"/>
<Sensor black="150" white="3956"/>
</Camera>
+ <Camera make="Panasonic" model = "DMC-GM1" mode="4:3">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="-206" height="0"/>
+ <Sensor black="143" white="3971"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ </Camera>
+ <Camera make="Panasonic" model = "DMC-GM1" mode="3:2">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="-206" height="0"/>
+ <Sensor black="143" white="3971"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ </Camera>
+ <Camera make="Panasonic" model = "DMC-GM1" mode="16:9">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="-206" height="0"/>
+ <Sensor black="143" white="3971"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ </Camera>
+ <Camera make="Panasonic" model = "DMC-GM1" mode="1:1">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="0" height="0"/>
+ <Sensor black="143" white="3971"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ </Camera>
+ <!-- Default Guess -->
+ <Camera make="Panasonic" model = "DMC-GM1">
+ <CFA width="2" height="2">
+ <Color x="0" y="0">BLUE</Color>
+ <Color x="1" y="0">GREEN</Color>
+ <Color x="0" y="1">GREEN</Color>
+ <Color x="1" y="1">RED</Color>
+ </CFA>
+ <Crop x="0" y="0" width="-206" height="0"/>
+ <Sensor black="143" white="3971"/>
+ <Hints>
+ <Hint name="zero_is_bad" value=""/>
+ </Hints>
+ </Camera>
<Camera make="Panasonic" model = "DMC-G3">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
@@ -2936,7 +3053,6 @@
<Hint name="zero_is_bad" value=""/>
</Hints>
</Camera>
-
<!-- Leica D-Lux 5 is the same camera as LX-5 -->
<Camera make="LEICA" model = "D-LUX 5">
<CFA width="2" height="2">
@@ -3383,6 +3499,16 @@
<Crop x="0" y="2" width="-10" height="-2"/>
<Sensor black="0" white="4095"/>
</Camera>
+ <Camera make="SONY" model="DSC-RX10">
+ <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="0" y="0" width="-8" height="0"/>
+ <Sensor black="800" white="16300"/>
+ </Camera>
<Camera make="SONY" model="DSC-RX100">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
@@ -3678,6 +3804,36 @@
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="520" white="16360"/>
</Camera>
+ <Camera make="SONY" model="ILCE-3000" supported="yes">
+ <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="0" y="0" width="0" height="0"/>
+ <Sensor black="512" white="16300"/>
+ </Camera>
+ <Camera make="SONY" model="ILCE-7" supported="yes">
+ <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="0" y="0" width="0" height="0"/>
+ <Sensor black="512" white="16300"/>
+ </Camera>
+ <Camera make="SONY" model="ILCE-7R" supported="yes">
+ <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="0" y="0" width="0" height="0"/>
+ <Sensor black="512" white="16300"/>
+ </Camera>
<Camera make="SONY" model="DSC-RX1">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
