Cr2Decoder: read black/white levels from ColorData4 ver.3

Refs. exiftool/exiftool#233
LebedevRI · Dec 4, 2023 · 6dd9444 · 6dd9444
1 parent 348c14d
commit 6dd9444
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/data/cameras.xml b/data/cameras.xml
@@ -318,7 +318,6 @@
 			<Color x="1" y="1">BLUE</Color>
 		</CFA>
 		<Crop x="30" y="18" width="3908" height="2602"/>
-		<Sensor black="1021" white="13600"/>
 		<BlackAreas>
 			<Vertical x="0" width="28"/>
 			<Horizontal y="4" height="12"/>
@@ -334,7 +333,6 @@
 	<Camera make="Canon" model="Canon EOS 40D" mode="sRaw1">
 		<ID make="Canon" model="EOS 40D">Canon EOS 40D</ID>
 		<Crop x="0" y="0" width="0" height="0"/>
-		<Sensor black="0" white="16383"/>
 		<Hints>
 			<Hint name="sraw_40d" value=""/>
 		</Hints>
@@ -349,7 +347,6 @@
 	<Camera make="Canon" model="Canon EOS 40D" mode="sRaw2">
 		<ID make="Canon" model="EOS 40D">Canon EOS 40D</ID>
 		<Crop x="0" y="0" width="1944" height="1296"/>
-		<Sensor black="0" white="16383"/>
 		<Hints>
 			<Hint name="sraw_40d" value=""/>
 		</Hints>

diff --git a/src/librawspeed/decoders/Cr2Decoder.cpp b/src/librawspeed/decoders/Cr2Decoder.cpp
@@ -318,8 +318,9 @@ getBlackAndWhiteLevelOffsetsInColorData(ColorDataFormat f,
   case ColorData4:
     switch (colorDataVersion) {
     case 2:
-    case 3:
       return std::nullopt; // Still no `SpecularWhiteLevel`.
+    case 3:
+      return {{231, 617}};
     case 4:
     case 5:
       return {{692, 697}};