Merge remote-tracking branch 'upstream/pr/524' into develop

* upstream/pr/524: Add Panasonic DMC-G10 crop modes
darktable-org · Oct 6, 2023 · c20f1aa · c20f1aa
2 parents 72c35e0 + 57e0413
commit c20f1aa
Showing 1 changed file with 36 additions and 0 deletions.
diff --git a/data/cameras.xml b/data/cameras.xml
@@ -7882,6 +7882,42 @@
 			</ColorMatrix>
 		</ColorMatrices>
 	</Camera>
+	<Camera make="Panasonic" model="DMC-G10" mode="3:2">
+		<ID make="Panasonic" model="DMC-G10">Panasonic DMC-G10</ID>
+		<Crop x="0" y="0" width="-44" height="0"/>
+		<Sensor black="0" white="3900"/>
+		<ColorMatrices>
+			<ColorMatrix planes="3">
+				<ColorMatrixRow plane="0">10113 -3400 -1114</ColorMatrixRow>
+				<ColorMatrixRow plane="1">-4765 12683 2317</ColorMatrixRow>
+				<ColorMatrixRow plane="2">-377 1437 6710</ColorMatrixRow>
+			</ColorMatrix>
+		</ColorMatrices>
+	</Camera>
+	<Camera make="Panasonic" model="DMC-G10" mode="16:9">
+		<ID make="Panasonic" model="DMC-G10">Panasonic DMC-G10</ID>
+		<Crop x="0" y="0" width="-44" height="0"/>
+		<Sensor black="0" white="3900"/>
+		<ColorMatrices>
+			<ColorMatrix planes="3">
+				<ColorMatrixRow plane="0">10113 -3400 -1114</ColorMatrixRow>
+				<ColorMatrixRow plane="1">-4765 12683 2317</ColorMatrixRow>
+				<ColorMatrixRow plane="2">-377 1437 6710</ColorMatrixRow>
+			</ColorMatrix>
+		</ColorMatrices>
+	</Camera>
+	<Camera make="Panasonic" model="DMC-G10" mode="1:1">
+		<ID make="Panasonic" model="DMC-G10">Panasonic DMC-G10</ID>
+		<Crop x="0" y="0" width="-44" height="0"/>
+		<Sensor black="0" white="3900"/>
+		<ColorMatrices>
+			<ColorMatrix planes="3">
+				<ColorMatrixRow plane="0">10113 -3400 -1114</ColorMatrixRow>
+				<ColorMatrixRow plane="1">-4765 12683 2317</ColorMatrixRow>
+				<ColorMatrixRow plane="2">-377 1437 6710</ColorMatrixRow>
+			</ColorMatrix>
+		</ColorMatrices>
+	</Camera>
 	<Camera make="Panasonic" model="DMC-GH1" mode="4:3">
 		<ID make="Panasonic" model="DMC-GH1">Panasonic DMC-GH1</ID>
 		<Crop x="0" y="0" width="-44" height="0"/>