Skip to content

Commit

Permalink
Merge pull request #1 from pmjdebruijn/master
Browse files Browse the repository at this point in the history 
camera.xml additions and fixes from darktable
  • Loading branch information
@klauspost
klauspost committed May 16, 2014
2 parents 2f61346 + eb8a890 commit 0f1d601
Showing 1 changed file with 124 additions and 22 deletions.
146 changes: 124 additions & 22 deletions data/cameras.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,25 @@
<Alias>Canon EOS REBEL T3</Alias>
</Aliases>
</Camera>
<Camera make="Canon" model="Canon EOS 1200D">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
<Color x="1" y="0">BLUE</Color>
<Color x="0" y="1">RED</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="146" y="54" width="0" height="0"/>
<Sensor black="2046" white="12279" iso_min="0" iso_max = "199"/>
<Sensor black="2046" white="15000"/>
<BlackAreas>
<Vertical x="0" width="140"/>
<Horizontal y="4" height="44"/>
</BlackAreas>
<Aliases>
<Alias>Canon EOS REBEL T5</Alias>
<Alias>Canon EOS Kiss X70</Alias>
</Aliases>
</Camera>
<Camera make="Canon" model="Canon EOS 400D DIGITAL">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
Expand Down Expand Up @@ -691,6 +710,20 @@
<Horizontal y="0" height="46"/>
</BlackAreas>
</Camera>
<Camera make="Canon" model="Canon PowerShot G1 X Mark II">
<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="82" y="52" width="-14" height="0"/>
<Sensor black="0" white="16000"/>
<BlackAreas>
<Vertical x="0" width="68"/>
<Horizontal y="0" height="46"/>
</BlackAreas>
</Camera>
<Camera make="Canon" model="Canon PowerShot G12">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
Expand Down Expand Up @@ -1016,6 +1049,19 @@
<Crop x="0" y="0" width="-48" height="0"/>
<Sensor black="0" white="16383"/>
</Camera>
<Camera make="NIKON CORPORATION" model="NIKON D3300">
<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="8" y="8" width="-8" height="-8"/>
<Sensor black="150" white="3880"/>
<Hints>
<Hint name="nikon_override_auto_black" value=""/>
</Hints>
</Camera>
<Camera make="NIKON CORPORATION" model="NIKON D4">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
Expand Down Expand Up @@ -1120,7 +1166,10 @@
<Color x="1" y="1">BLUE</Color>
</CFA>
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="4096"/>
<Sensor black="600" white="15892"/>
<Hints>
<Hint name="nikon_override_auto_black" value=""/>
</Hints>
</Camera>
<Camera make="NIKON CORPORATION" model="NIKON D60">
<CFA width="2" height="2">
Expand Down Expand Up @@ -1672,6 +1721,16 @@
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="255" white="4095"/>
</Camera>
<Camera make="OLYMPUS IMAGING CORP." model="E-M10">
<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="254" white="4000"/>
</Camera>
<Camera make="OLYMPUS IMAGING CORP." model="E-M5">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
Expand Down Expand Up @@ -3392,6 +3451,19 @@
<Crop x="0" y="2" width="-8" height="-22"/>
<Sensor black="0" white="16383"/>
</Camera>
<Camera make="SAMSUNG" model="NX5">
<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="17" y="8" width="4602" height="3068"/>
<Sensor black="0" white="4095"/>
<BlackAreas>
<Vertical x="0" width="8"/>
</BlackAreas>
</Camera>
<Camera make="SAMSUNG" model="NX10">
<CFA width="2" height="2">
<Color x="0" y="0">BLUE</Color>
Expand Down Expand Up @@ -3440,7 +3512,20 @@
<Color x="0" y="1">BLUE</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="48" y="4" width="-60" height="-28"/>
<Crop x="89" y="17" width="-71" height="-55"/>
<Sensor black="0" white="4095"/>
<Hints>
<Hint name="msb_override" value="false"/>
</Hints>
</Camera>
<Camera make="SAMSUNG" model="NX1100" decoder_version="2">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
<Color x="1" y="0">RED</Color>
<Color x="0" y="1">BLUE</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="89" y="17" width="-71" height="-55"/>
<Sensor black="0" white="4095"/>
<Hints>
<Hint name="msb_override" value="false"/>
Expand All @@ -3453,7 +3538,7 @@
<Color x="0" y="1">BLUE</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="48" y="4" width="-60" height="-28"/>
<Crop x="89" y="17" width="-71" height="-55"/>
<Sensor black="0" white="4095"/>
<Hints>
<Hint name="msb_override" value="false"/>
Expand All @@ -3466,7 +3551,7 @@
<Color x="0" y="1">BLUE</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="48" y="4" width="-60" height="-60"/>
<Crop x="89" y="17" width="-71" height="-55"/>
<Sensor black="0" white="4095"/>
<Hints>
<Hint name="msb_override" value="false"/>
Expand All @@ -3479,7 +3564,7 @@
<Color x="0" y="1">BLUE</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="48" y="4" width="-60" height="-60"/>
<Crop x="89" y="17" width="-71" height="-55"/>
<Sensor black="0" white="4095"/>
<Hints>
<Hint name="msb_override" value="false"/>
Expand All @@ -3492,41 +3577,38 @@
<Color x="0" y="1">RED</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="0" y="0" width="-10" height="-18"/>
<Crop x="45" y="25" width="-11" height="-29"/>
<Sensor black="0" white="4095"/>
</Camera>
<Camera make="SAMSUNG" model="NX300" decoder_version="3">
<Camera make="SAMSUNG" model="NX30" decoder_version="3">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
<Color x="1" y="0">BLUE</Color>
<Color x="0" y="1">RED</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="0" y="0" width="-10" height="-18"/>
<Crop x="45" y="25" width="-11" height="-29"/>
<Sensor black="0" white="4095"/>
</Camera>
<Camera make="SAMSUNG" model="EK-GN120" decoder_version="3">
<Camera make="SAMSUNG" model="NX300" decoder_version="3">
<CFA width="2" height="2">
<Color x="0" y="0">GREEN</Color>
<Color x="1" y="0">BLUE</Color>
<Color x="0" y="1">RED</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="0" y="0" width="-10" height="-18"/>
<Crop x="45" y="25" width="-11" height="-29"/>
<Sensor black="0" white="4095"/>
</Camera>
<Camera make="SAMSUNG" model="NX5">
<Camera make="SAMSUNG" model="EK-GN120" decoder_version="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>
<Color x="0" y="0">GREEN</Color>
<Color x="1" y="0">BLUE</Color>
<Color x="0" y="1">RED</Color>
<Color x="1" y="1">GREEN</Color>
</CFA>
<Crop x="17" y="8" width="4602" height="3068"/>
<Crop x="45" y="25" width="-11" height="-29"/>
<Sensor black="0" white="4095"/>
<BlackAreas>
<Vertical x="0" width="8"/>
</BlackAreas>
</Camera>
<Camera make="SAMSUNG" model="WB2000">
<CFA width="2" height="2">
Expand Down Expand Up @@ -3850,7 +3932,27 @@
<Color x="0" y="1">GREEN</Color>
<Color x="1" y="1">BLUE</Color>
</CFA>
<Crop x="0" y="0" width="0" height="0"/>
<Crop x="0" y="0" width="-34" height="0"/>
<Sensor black="512" white="16300"/>
</Camera>
<Camera make="SONY" model="ILCE-5000" 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="-34" height="0"/>
<Sensor black="512" white="16300"/>
</Camera>
<Camera make="SONY" model="ILCE-6000" 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="-28" height="0"/>
<Sensor black="512" white="16300"/>
</Camera>
<Camera make="SONY" model="ILCE-7" supported="yes">
Expand All @@ -3860,7 +3962,7 @@
<Color x="0" y="1">GREEN</Color>
<Color x="1" y="1">BLUE</Color>
</CFA>
<Crop x="0" y="0" width="0" height="0"/>
<Crop x="0" y="0" width="-26" height="0"/>
<Sensor black="512" white="16300"/>
</Camera>
<Camera make="SONY" model="ILCE-7R" supported="yes">
Expand All @@ -3870,7 +3972,7 @@
<Color x="0" y="1">GREEN</Color>
<Color x="1" y="1">BLUE</Color>
</CFA>
<Crop x="0" y="0" width="0" height="0"/>
<Crop x="0" y="0" width="-26" height="0"/>
<Sensor black="512" white="16300"/>
</Camera>
<Camera make="SONY" model="DSC-RX1">
Expand Down

0 comments on commit 0f1d601

Please sign in to comment.