Merge branch 'GraphiteEditor:master' into space_selects_anchor_and_handles

DaraghD · web-flow · commit ea9e92453cbb · 2024-10-25T22:05:12.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libraries/raw-rs/Cargo.toml b/libraries/raw-rs/Cargo.toml
@@ -26,6 +26,7 @@ thiserror = { workspace = true }
 # Required dependencies
 bitstream-io = "2.3.0"
 num_enum = "0.7.2"
+fortuples = "0.9.1"
 
 # Optional workspace dependencies
 image = { workspace = true, optional = true }
diff --git a/libraries/raw-rs/build-camera-data/src/lib.rs b/libraries/raw-rs/build-camera-data/src/lib.rs
@@ -71,7 +71,7 @@ pub fn build_camera_data(_: TokenStream) -> TokenStream {
 
 			let mut values: Table = toml::from_str(&fs::read_to_string(model_path).unwrap()).unwrap();
 
-			if let Some(val) = values.get_mut("camera_to_xyz") {
+			if let Some(val) = values.get_mut("xyz_to_camera") {
 				*val = Value::Array(val.as_array().unwrap().iter().map(|x| Value::Integer((x.as_float().unwrap() * 10_000.) as i64)).collect());
 			}
 
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A100.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A100.toml
@@ -1 +1 @@
-camera_to_xyz = [0.9437, -0.2812, -0.0774, -0.8405, 1.6215, 0.2291, -0.0709, 0.0596, 0.7181]
+xyz_to_camera = [0.9437, -0.2812, -0.0774, -0.8405, 1.6215, 0.2291, -0.0709, 0.0596, 0.7181]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A200.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A200.toml
@@ -1 +1 @@
-camera_to_xyz = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]
+xyz_to_camera = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A300.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A300.toml
@@ -1 +1 @@
-camera_to_xyz = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]
+xyz_to_camera = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A330.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A330.toml
@@ -1 +1 @@
-camera_to_xyz = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]
+xyz_to_camera = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A350.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A350.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6038, -0.1484, -0.0579, -0.9145, 1.6746, 0.2512, -0.0875, 0.0746, 0.7218]
+xyz_to_camera = [0.6038, -0.1484, -0.0579, -0.9145, 1.6746, 0.2512, -0.0875, 0.0746, 0.7218]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A550.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A550.toml
@@ -1 +1 @@
-camera_to_xyz = [0.4950, -0.0580, -0.0103, -0.5228, 1.2542, 0.3029, -0.0709, 0.1435, 0.7371]
+xyz_to_camera = [0.4950, -0.0580, -0.0103, -0.5228, 1.2542, 0.3029, -0.0709, 0.1435, 0.7371]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A700.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A700.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5775, -0.0805, -0.0359, -0.8573, 1.6294, 0.2391, -0.1943, 0.2342, 0.7249]
+xyz_to_camera = [0.5775, -0.0805, -0.0359, -0.8573, 1.6294, 0.2391, -0.1943, 0.2342, 0.7249]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A850.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A850.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5413, -0.1162, -0.0365, -0.5665, 1.3098, 0.2866, -0.0608, 0.1179, 0.8440]
+xyz_to_camera = [0.5413, -0.1162, -0.0365, -0.5665, 1.3098, 0.2866, -0.0608, 0.1179, 0.8440]
diff --git a/libraries/raw-rs/camera_data/Sony/DSLR-A900.toml b/libraries/raw-rs/camera_data/Sony/DSLR-A900.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5209, -0.1072, -0.0397, -0.8845, 1.6121, 0.2919, -0.1618, 0.1802, 0.8654]
+xyz_to_camera = [0.5209, -0.1072, -0.0397, -0.8845, 1.6121, 0.2919, -0.1618, 0.1802, 0.8654]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCA-68.toml b/libraries/raw-rs/camera_data/Sony/ILCA-68.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6435, -0.1903, -0.0536, -0.4722, 1.2449, 0.2550, -0.0663, 0.1363, 0.6517]
+xyz_to_camera = [0.6435, -0.1903, -0.0536, -0.4722, 1.2449, 0.2550, -0.0663, 0.1363, 0.6517]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCA-99M2.toml b/libraries/raw-rs/camera_data/Sony/ILCA-99M2.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6660, -0.1918, -0.0471, -0.4613, 1.2398, 0.2485, -0.0649, 0.1433, 0.6447]
+xyz_to_camera = [0.6660, -0.1918, -0.0471, -0.4613, 1.2398, 0.2485, -0.0649, 0.1433, 0.6447]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-1.toml b/libraries/raw-rs/camera_data/Sony/ILCE-1.toml
@@ -1 +1 @@
-camera_to_xyz = [0.8161, -0.2947, -0.0739, -0.4811, 1.2668, 0.2389, -0.0437, 0.1229, 0.6524]
+xyz_to_camera = [0.8161, -0.2947, -0.0739, -0.4811, 1.2668, 0.2389, -0.0437, 0.1229, 0.6524]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-5100.toml b/libraries/raw-rs/camera_data/Sony/ILCE-5100.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5991, -0.1456, -0.0455, -0.4764, 1.2135, 0.2980, -0.0707, 0.1425, 0.6701]
+xyz_to_camera = [0.5991, -0.1456, -0.0455, -0.4764, 1.2135, 0.2980, -0.0707, 0.1425, 0.6701]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-6000.toml b/libraries/raw-rs/camera_data/Sony/ILCE-6000.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5991, -0.1456, -0.0455, -0.4764, 1.2135, 0.2980, -0.0707, 0.1425, 0.6701]
+xyz_to_camera = [0.5991, -0.1456, -0.0455, -0.4764, 1.2135, 0.2980, -0.0707, 0.1425, 0.6701]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-6100.toml b/libraries/raw-rs/camera_data/Sony/ILCE-6100.toml
@@ -1 +1 @@
-camera_to_xyz = [0.7657, -0.2847, -0.0607, -0.4083, 1.1966, 0.2389, -0.0684, 0.1418, 0.5844]
+xyz_to_camera = [0.7657, -0.2847, -0.0607, -0.4083, 1.1966, 0.2389, -0.0684, 0.1418, 0.5844]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-6300.toml b/libraries/raw-rs/camera_data/Sony/ILCE-6300.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5973, -0.1695, -0.0419, -0.3826, 1.1797, 0.2293, -0.0639, 0.1398, 0.5789]
+xyz_to_camera = [0.5973, -0.1695, -0.0419, -0.3826, 1.1797, 0.2293, -0.0639, 0.1398, 0.5789]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-6400.toml b/libraries/raw-rs/camera_data/Sony/ILCE-6400.toml
@@ -1 +1 @@
-camera_to_xyz = [0.7657, -0.2847, -0.0607, -0.4083, 1.1966, 0.2389, -0.0684, 0.1418, 0.5844]
+xyz_to_camera = [0.7657, -0.2847, -0.0607, -0.4083, 1.1966, 0.2389, -0.0684, 0.1418, 0.5844]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-6500.toml b/libraries/raw-rs/camera_data/Sony/ILCE-6500.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5973, -0.1695, -0.0419, -0.3826, 1.1797, 0.2293, -0.0639, 0.1398, 0.5789]
+xyz_to_camera = [0.5973, -0.1695, -0.0419, -0.3826, 1.1797, 0.2293, -0.0639, 0.1398, 0.5789]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-6600.toml b/libraries/raw-rs/camera_data/Sony/ILCE-6600.toml
@@ -1 +1 @@
-camera_to_xyz = [0.7657, -0.2847, -0.0607, -0.4083, 1.1966, 0.2389, -0.0684, 0.1418, 0.5844]
+xyz_to_camera = [0.7657, -0.2847, -0.0607, -0.4083, 1.1966, 0.2389, -0.0684, 0.1418, 0.5844]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-6700.toml b/libraries/raw-rs/camera_data/Sony/ILCE-6700.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6972, -0.2408, -0.0600, -0.4330, 1.2101, 0.2515, -0.0388, 0.1277, 0.5847]
+xyz_to_camera = [0.6972, -0.2408, -0.0600, -0.4330, 1.2101, 0.2515, -0.0388, 0.1277, 0.5847]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7CM2.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7CM2.toml
@@ -1 +1 @@
-camera_to_xyz = [0.7460, -0.2365, -0.0588, -0.5687, 1.3442, 0.2474, -0.0624, 0.1156, 0.6584]
+xyz_to_camera = [0.7460, -0.2365, -0.0588, -0.5687, 1.3442, 0.2474, -0.0624, 0.1156, 0.6584]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7CR.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7CR.toml
@@ -1 +1 @@
-camera_to_xyz = [0.8200, -0.2976, -0.0719, -0.4296, 1.2053, 0.2532, -0.0429, 0.1282, 0.5774]
+xyz_to_camera = [0.8200, -0.2976, -0.0719, -0.4296, 1.2053, 0.2532, -0.0429, 0.1282, 0.5774]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7M2.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7M2.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5271, -0.0712, -0.0347, -0.6153, 1.3653, 0.2763, -0.1601, 0.2366, 0.7242]
+xyz_to_camera = [0.5271, -0.0712, -0.0347, -0.6153, 1.3653, 0.2763, -0.1601, 0.2366, 0.7242]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7M3.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7M3.toml
@@ -1 +1 @@
-camera_to_xyz = [0.7374, -0.2389, -0.0551, -0.5435, 1.3162, 0.2519, -0.1006, 0.1795, 0.6552]
+xyz_to_camera = [0.7374, -0.2389, -0.0551, -0.5435, 1.3162, 0.2519, -0.1006, 0.1795, 0.6552]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7RM3.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7RM3.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6640, -0.1847, -0.0503, -0.5238, 1.3010, 0.2474, -0.0993, 0.1673, 0.6527]
+xyz_to_camera = [0.6640, -0.1847, -0.0503, -0.5238, 1.3010, 0.2474, -0.0993, 0.1673, 0.6527]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7RM4.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7RM4.toml
@@ -1 +1 @@
-camera_to_xyz = [0.7662, -0.2686, -0.0660, -0.5240, 1.2965, 0.2530, -0.0796, 0.1508, 0.6167]
+xyz_to_camera = [0.7662, -0.2686, -0.0660, -0.5240, 1.2965, 0.2530, -0.0796, 0.1508, 0.6167]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7RM5.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7RM5.toml
@@ -1 +1 @@
-camera_to_xyz = [0.8200, -0.2976, -0.0719, -0.4296, 1.2053, 0.2532, -0.0429, 0.1282, 0.5774]
+xyz_to_camera = [0.8200, -0.2976, -0.0719, -0.4296, 1.2053, 0.2532, -0.0429, 0.1282, 0.5774]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-7SM2.toml b/libraries/raw-rs/camera_data/Sony/ILCE-7SM2.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5838, -0.1430, -0.0246, -0.3497, 1.1477, 0.2297, -0.0748, 0.1885, 0.5778]
+xyz_to_camera = [0.5838, -0.1430, -0.0246, -0.3497, 1.1477, 0.2297, -0.0748, 0.1885, 0.5778]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-9.toml b/libraries/raw-rs/camera_data/Sony/ILCE-9.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6389, -0.1703, -0.0378, -0.4562, 1.2265, 0.2587, -0.0670, 0.1489, 0.6550]
+xyz_to_camera = [0.6389, -0.1703, -0.0378, -0.4562, 1.2265, 0.2587, -0.0670, 0.1489, 0.6550]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-9M2.toml b/libraries/raw-rs/camera_data/Sony/ILCE-9M2.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6389, -0.1703, -0.0378, -0.4562, 1.2265, 0.2587, -0.0670, 0.1489, 0.6550]
+xyz_to_camera = [0.6389, -0.1703, -0.0378, -0.4562, 1.2265, 0.2587, -0.0670, 0.1489, 0.6550]
diff --git a/libraries/raw-rs/camera_data/Sony/ILCE-9M3.toml b/libraries/raw-rs/camera_data/Sony/ILCE-9M3.toml
@@ -1 +1 @@
-camera_to_xyz = [0.9811, -0.3908, -0.0752, -0.3704, 1.1577, 0.2417, -0.0073, 0.0950, 0.5980]
+xyz_to_camera = [0.9811, -0.3908, -0.0752, -0.3704, 1.1577, 0.2417, -0.0073, 0.0950, 0.5980]
diff --git a/libraries/raw-rs/camera_data/Sony/NEX-3.toml b/libraries/raw-rs/camera_data/Sony/NEX-3.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6549, -0.1550, -0.0436, -0.4880, 1.2435, 0.2753, -0.0854, 0.1868, 0.6976]
+xyz_to_camera = [0.6549, -0.1550, -0.0436, -0.4880, 1.2435, 0.2753, -0.0854, 0.1868, 0.6976]
diff --git a/libraries/raw-rs/camera_data/Sony/NEX-3N.toml b/libraries/raw-rs/camera_data/Sony/NEX-3N.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6129, -0.1545, -0.0418, -0.4930, 1.2490, 0.2743, -0.0977, 0.1693, 0.6615]
+xyz_to_camera = [0.6129, -0.1545, -0.0418, -0.4930, 1.2490, 0.2743, -0.0977, 0.1693, 0.6615]
diff --git a/libraries/raw-rs/camera_data/Sony/NEX-5R.toml b/libraries/raw-rs/camera_data/Sony/NEX-5R.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6129, -0.1545, -0.0418, -0.4930, 1.2490, 0.2743, -0.0977, 0.1693, 0.6615]
+xyz_to_camera = [0.6129, -0.1545, -0.0418, -0.4930, 1.2490, 0.2743, -0.0977, 0.1693, 0.6615]
diff --git a/libraries/raw-rs/camera_data/Sony/NEX-6.toml b/libraries/raw-rs/camera_data/Sony/NEX-6.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6129, -0.1545, -0.0418, -0.4930, 1.2490, 0.2743, -0.0977, 0.1693, 0.6615]
+xyz_to_camera = [0.6129, -0.1545, -0.0418, -0.4930, 1.2490, 0.2743, -0.0977, 0.1693, 0.6615]
diff --git a/libraries/raw-rs/camera_data/Sony/NEX-7.toml b/libraries/raw-rs/camera_data/Sony/NEX-7.toml
@@ -1 +1 @@
-camera_to_xyz = [0.5491, -0.1192, -0.0363, -0.4951, 1.2342, 0.2948, -0.0911, 0.1722, 0.7192]
+xyz_to_camera = [0.5491, -0.1192, -0.0363, -0.4951, 1.2342, 0.2948, -0.0911, 0.1722, 0.7192]
diff --git a/libraries/raw-rs/camera_data/Sony/ZV-1.toml b/libraries/raw-rs/camera_data/Sony/ZV-1.toml
@@ -1 +1 @@
-camera_to_xyz = [0.8280, -0.2987, -0.0703, -0.3531, 1.1645, 0.2133, -0.0550, 0.1542, 0.5312]
+xyz_to_camera = [0.8280, -0.2987, -0.0703, -0.3531, 1.1645, 0.2133, -0.0550, 0.1542, 0.5312]
diff --git a/libraries/raw-rs/camera_data/Sony/ZV-1M2.toml b/libraries/raw-rs/camera_data/Sony/ZV-1M2.toml
@@ -1 +1 @@
-camera_to_xyz = [0.8280, -0.2987, -0.0703, -0.3531, 1.1645, 0.2133, -0.0550, 0.1542, 0.5312]
+xyz_to_camera = [0.8280, -0.2987, -0.0703, -0.3531, 1.1645, 0.2133, -0.0550, 0.1542, 0.5312]
diff --git a/libraries/raw-rs/camera_data/Sony/ZV-E1.toml b/libraries/raw-rs/camera_data/Sony/ZV-E1.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6912, -0.2127, -0.0469, -0.4470, 1.2175, 0.2587, -0.0398, 0.1478, 0.6492]
+xyz_to_camera = [0.6912, -0.2127, -0.0469, -0.4470, 1.2175, 0.2587, -0.0398, 0.1478, 0.6492]
diff --git a/libraries/raw-rs/camera_data/Sony/ZV-E10.toml b/libraries/raw-rs/camera_data/Sony/ZV-E10.toml
@@ -1 +1 @@
-camera_to_xyz = [0.6355, -0.2067, -0.0490, -0.3653, 1.1542, 0.2400, -0.0406, 0.1258, 0.5506]
+xyz_to_camera = [0.6355, -0.2067, -0.0490, -0.3653, 1.1542, 0.2400, -0.0406, 0.1258, 0.5506]
diff --git a/libraries/raw-rs/src/decoder/arw1.rs b/libraries/raw-rs/src/decoder/arw1.rs
@@ -28,10 +28,9 @@ pub fn decode_a100<R: Read + Seek>(ifd: Ifd, file: &mut TiffRead<R>) -> RawImage
 		black: SubtractBlack::None,
 		transform: Transform::Horizontal,
 		camera_model: None,
-		camera_white_balance_multiplier: None,
-		white_balance_multiplier: None,
+		camera_white_balance: None,
+		white_balance: None,
 		camera_to_rgb: None,
-		rgb_to_camera: None,
 	}
 }
 
diff --git a/libraries/raw-rs/src/decoder/arw2.rs b/libraries/raw-rs/src/decoder/arw2.rs
@@ -52,10 +52,9 @@ pub fn decode<R: Read + Seek>(ifd: Ifd, file: &mut TiffRead<R>) -> RawImage {
 		black: SubtractBlack::CfaGrid([512, 512, 512, 512]), // TODO: Find the correct way to do this
 		transform: Transform::Horizontal,
 		camera_model: None,
-		camera_white_balance_multiplier: ifd.white_balance_levels.map(|arr| arr.map(|x| x as f64)),
-		white_balance_multiplier: None,
+		camera_white_balance: ifd.white_balance_levels.map(|arr| arr.map(|x| x as f64)),
+		white_balance: None,
 		camera_to_rgb: None,
-		rgb_to_camera: None,
 	}
 }
 
diff --git a/libraries/raw-rs/src/decoder/uncompressed.rs b/libraries/raw-rs/src/decoder/uncompressed.rs
@@ -60,9 +60,8 @@ pub fn decode<R: Read + Seek>(ifd: Ifd, file: &mut TiffRead<R>) -> RawImage {
 		black: SubtractBlack::CfaGrid(ifd.black_level),
 		transform: Transform::Horizontal,
 		camera_model: None,
-		camera_white_balance_multiplier: ifd.white_balance_levels.map(|arr| arr.map(|x| x as f64)),
-		white_balance_multiplier: None,
+		camera_white_balance: ifd.white_balance_levels.map(|arr| arr.map(|x| x as f64)),
+		white_balance: None,
 		camera_to_rgb: None,
-		rgb_to_camera: None,
 	}
 }
diff --git a/libraries/raw-rs/src/demosaicing/linear_demosaicing.rs b/libraries/raw-rs/src/demosaicing/linear_demosaicing.rs
@@ -1,4 +1,4 @@
-use crate::{Image, RawImage};
+use crate::{Pixel, RawImage};
 
 fn average(data: &[u16], indexes: impl Iterator<Item = i64>) -> u16 {
 	let mut sum = 0;
@@ -13,62 +13,69 @@ fn average(data: &[u16], indexes: impl Iterator<Item = i64>) -> u16 {
 	(sum / count) as u16
 }
 
-pub fn linear_demosaic(raw_image: RawImage) -> Image<u16> {
-	match raw_image.cfa_pattern {
-		[0, 1, 1, 2] => linear_demosaic_rggb(raw_image),
-		_ => todo!(),
+impl RawImage {
+	pub fn linear_demosaic_iter(&self) -> impl Iterator<Item = Pixel> + use<'_> {
+		match self.cfa_pattern {
+			[0, 1, 1, 2] => self.linear_demosaic_rggb_iter(),
+			_ => todo!(),
+		}
 	}
-}
 
-fn linear_demosaic_rggb(raw_image: RawImage) -> Image<u16> {
-	let mut image = vec![0; raw_image.width * raw_image.height * 3];
-	let width = raw_image.width as i64;
-	let height = raw_image.height as i64;
+	fn linear_demosaic_rggb_iter(&self) -> impl Iterator<Item = Pixel> + use<'_> {
+		let width = self.width as i64;
+		let height = self.height as i64;
 
-	for row in 0..height {
-		let row_by_width = row * width;
+		(0..height).flat_map(move |row| {
+			let row_by_width = row * width;
 
-		for col in 0..width {
-			let pixel_index = row_by_width + col;
+			(0..width).map(move |column| {
+				let pixel_index = row_by_width + column;
 
-			let vertical_indexes = [pixel_index + width, pixel_index - width];
-			let horizontal_indexes = [pixel_index + 1, pixel_index - 1];
-			let cross_indexes = [pixel_index + width, pixel_index - width, pixel_index + 1, pixel_index - 1];
-			let diagonal_indexes = [pixel_index + width + 1, pixel_index - width + 1, pixel_index + width - 1, pixel_index - width - 1];
+				let vertical_indexes = [pixel_index + width, pixel_index - width];
+				let horizontal_indexes = [pixel_index + 1, pixel_index - 1];
+				let cross_indexes = [pixel_index + width, pixel_index - width, pixel_index + 1, pixel_index - 1];
+				let diagonal_indexes = [pixel_index + width + 1, pixel_index - width + 1, pixel_index + width - 1, pixel_index - width - 1];
 
-			let pixel_index = pixel_index as usize;
-			match (row % 2 == 0, col % 2 == 0) {
-				(true, true) => {
-					image[3 * pixel_index] = raw_image.data[pixel_index];
-					image[3 * pixel_index + 1] = average(&raw_image.data, cross_indexes.into_iter());
-					image[3 * pixel_index + 2] = average(&raw_image.data, diagonal_indexes.into_iter());
-				}
-				(true, false) => {
-					image[3 * pixel_index] = average(&raw_image.data, horizontal_indexes.into_iter());
-					image[3 * pixel_index + 1] = raw_image.data[pixel_index];
-					image[3 * pixel_index + 2] = average(&raw_image.data, vertical_indexes.into_iter());
-				}
-				(false, true) => {
-					image[3 * pixel_index] = average(&raw_image.data, vertical_indexes.into_iter());
-					image[3 * pixel_index + 1] = raw_image.data[pixel_index];
-					image[3 * pixel_index + 2] = average(&raw_image.data, horizontal_indexes.into_iter());
+				let pixel_index = pixel_index as usize;
+				match (row % 2 == 0, column % 2 == 0) {
+					(true, true) => Pixel {
+						values: [
+							self.data[pixel_index],
+							average(&self.data, cross_indexes.into_iter()),
+							average(&self.data, diagonal_indexes.into_iter()),
+						],
+						row: row as usize,
+						column: column as usize,
+					},
+					(true, false) => Pixel {
+						values: [
+							average(&self.data, horizontal_indexes.into_iter()),
+							self.data[pixel_index],
+							average(&self.data, vertical_indexes.into_iter()),
+						],
+						row: row as usize,
+						column: column as usize,
+					},
+					(false, true) => Pixel {
+						values: [
+							average(&self.data, vertical_indexes.into_iter()),
+							self.data[pixel_index],
+							average(&self.data, horizontal_indexes.into_iter()),
+						],
+						row: row as usize,
+						column: column as usize,
+					},
+					(false, false) => Pixel {
+						values: [
+							average(&self.data, diagonal_indexes.into_iter()),
+							average(&self.data, cross_indexes.into_iter()),
+							self.data[pixel_index],
+						],
+						row: row as usize,
+						column: column as usize,
+					},
 				}
-				(false, false) => {
-					image[3 * pixel_index] = average(&raw_image.data, diagonal_indexes.into_iter());
-					image[3 * pixel_index + 1] = average(&raw_image.data, cross_indexes.into_iter());
-					image[3 * pixel_index + 2] = raw_image.data[pixel_index];
-				}
-			}
-		}
-	}
-
-	Image {
-		channels: 3,
-		data: image,
-		width: raw_image.width,
-		height: raw_image.height,
-		transform: raw_image.transform,
-		rgb_to_camera: raw_image.rgb_to_camera,
-		histogram: None,
+			})
+		})
 	}
 }
diff --git a/libraries/raw-rs/src/lib.rs b/libraries/raw-rs/src/lib.rs
diff --git a/libraries/raw-rs/src/metadata/camera_data.rs b/libraries/raw-rs/src/metadata/camera_data.rs
diff --git a/libraries/raw-rs/src/metadata/mod.rs b/libraries/raw-rs/src/metadata/mod.rs
diff --git a/libraries/raw-rs/src/postprocessing/convert_to_rgb.rs b/libraries/raw-rs/src/postprocessing/convert_to_rgb.rs
diff --git a/libraries/raw-rs/src/postprocessing/gamma_correction.rs b/libraries/raw-rs/src/postprocessing/gamma_correction.rs
diff --git a/libraries/raw-rs/src/postprocessing/mod.rs b/libraries/raw-rs/src/postprocessing/mod.rs
diff --git a/libraries/raw-rs/src/postprocessing/record_histogram.rs b/libraries/raw-rs/src/postprocessing/record_histogram.rs
diff --git a/libraries/raw-rs/src/postprocessing/transform.rs b/libraries/raw-rs/src/postprocessing/transform.rs
diff --git a/libraries/raw-rs/src/preprocessing/mod.rs b/libraries/raw-rs/src/preprocessing/mod.rs
diff --git a/libraries/raw-rs/src/preprocessing/scale_colors.rs b/libraries/raw-rs/src/preprocessing/scale_colors.rs
diff --git a/libraries/raw-rs/src/preprocessing/scale_to_16bit.rs b/libraries/raw-rs/src/preprocessing/scale_to_16bit.rs
diff --git a/libraries/raw-rs/src/preprocessing/scale_white_balance.rs b/libraries/raw-rs/src/preprocessing/scale_white_balance.rs
diff --git a/libraries/raw-rs/src/preprocessing/subtract_black.rs b/libraries/raw-rs/src/preprocessing/subtract_black.rs
diff --git a/libraries/raw-rs/src/processing.rs b/libraries/raw-rs/src/processing.rs
diff --git a/node-graph/gcore/src/raster/adjustments.rs b/node-graph/gcore/src/raster/adjustments.rs
diff --git a/node-graph/graph-craft/src/document/value.rs b/node-graph/graph-craft/src/document/value.rs
diff --git a/website/other/bezier-rs-demos/wasm/src/lib.rs b/website/other/bezier-rs-demos/wasm/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ pub fn build_camera_data(_: TokenStream) -> TokenStream {`
`71`	`71`
`72`	`72`	`let mut values: Table = toml::from_str(&fs::read_to_string(model_path).unwrap()).unwrap();`
`73`	`73`
`74`		`- if let Some(val) = values.get_mut("camera_to_xyz") {`
	`74`	`+ if let Some(val) = values.get_mut("xyz_to_camera") {`
`75`	`75`	`val = Value::Array(val.as_array().unwrap().iter().map(\|x\| Value::Integer((x.as_float().unwrap() 10_000.) as i64)).collect());`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-camera_to_xyz = [0.9437, -0.2812, -0.0774, -0.8405, 1.6215, 0.2291, -0.0709, 0.0596, 0.7181]`
	`1`	`+xyz_to_camera = [0.9437, -0.2812, -0.0774, -0.8405, 1.6215, 0.2291, -0.0709, 0.0596, 0.7181]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-camera_to_xyz = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]`
	`1`	`+xyz_to_camera = [0.9847, -0.3091, -0.0929, -0.8485, 1.6346, 0.2225, -0.0714, 0.0595, 0.7103]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-camera_to_xyz = [0.6038, -0.1484, -0.0579, -0.9145, 1.6746, 0.2512, -0.0875, 0.0746, 0.7218]`
	`1`	`+xyz_to_camera = [0.6038, -0.1484, -0.0579, -0.9145, 1.6746, 0.2512, -0.0875, 0.0746, 0.7218]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-camera_to_xyz = [0.4950, -0.0580, -0.0103, -0.5228, 1.2542, 0.3029, -0.0709, 0.1435, 0.7371]`
	`1`	`+xyz_to_camera = [0.4950, -0.0580, -0.0103, -0.5228, 1.2542, 0.3029, -0.0709, 0.1435, 0.7371]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-camera_to_xyz = [0.5775, -0.0805, -0.0359, -0.8573, 1.6294, 0.2391, -0.1943, 0.2342, 0.7249]`
	`1`	`+xyz_to_camera = [0.5775, -0.0805, -0.0359, -0.8573, 1.6294, 0.2391, -0.1943, 0.2342, 0.7249]`