Skip to content

Commit

Permalink
Nikon E5400: reenable camera support after check, fixes #11228
Browse files Browse the repository at this point in the history
User manual mentions only uncompressed TIFF, no option to switch
to 14Bit or compressed mode. Also there is a NEF sample file on
rawsamples.ch.
  • Loading branch information
schenlap committed Oct 15, 2016
1 parent ab650b9 commit 85d9cd9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
16 changes: 1 addition & 15 deletions src/external/rawspeed/data/cameras.xml
Expand Up @@ -3351,21 +3351,7 @@
<Crop x="0" y="0" width="0" height="0"/>
<Sensor black="0" white="4095"/>
</Camera>
<Camera make="NIKON" model="E5400" mode="12bit-compressed" decoder_version="3" supported="no"> <!-- need raw sample for whitelevel -->
<ID make="Nikon" model="E5400">Nikon E5400</ID>
<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="2608" height="1950"/>
<Sensor black="0" white="4095"/>
<Hints>
<Hint name="coolpixsplit" value=""/>
</Hints>
</Camera>
<Camera make="NIKON" model="E5400" mode="12bit-uncompressed" decoder_version="3" supported="no"> <!-- need raw sample for whitelevel -->
<Camera make="NIKON" model="E5400" mode="12bit-uncompressed" decoder_version="3">
<ID make="Nikon" model="E5400">Nikon E5400</ID>
<CFA width="2" height="2">
<Color x="0" y="0">BLUE</Color>
Expand Down
6 changes: 4 additions & 2 deletions tools/rawspeed-check-nikon-modes.rb
Expand Up @@ -53,7 +53,8 @@
["NIKON", "COOLPIX P6000"] => "uncompressed",
["NIKON", "COOLPIX P7100"] => "uncompressed",
["NIKON", "COOLPIX P7700"] => "compressed",
["NIKON", "COOLPIX P7800"] => "compressed"
["NIKON", "COOLPIX P7800"] => "compressed",
["NIKON", "E5400"] => "uncompressed"
}

IGNORE_HIGH_WHITELEVEL = [
Expand All @@ -69,7 +70,8 @@
["NIKON", "COOLPIX P330"],
["NIKON", "COOLPIX P6000"],
["NIKON", "COOLPIX P7700"],
["NIKON", "COOLPIX P7800"]
["NIKON", "COOLPIX P7800"],
["NIKON", "E5400"]
]

require 'nokogiri'
Expand Down

0 comments on commit 85d9cd9

Please sign in to comment.