Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

LR-EDIT-OPTICS-PROFILE: merge main and resolve validation conflicts

Elliot Graham92de4c1bbc68
diff --cc crates/engine/src/media.rs
index e45191375,ce41bfaa2..d719a32de
--- a/crates/engine/src/media.rs
+++ b/crates/engine/src/media.rs
@@@ -62,7 -62,7 +62,7 @@@ impl SettingsHashes
}
/// Bump when the pipeline's output changes, to invalidate cached thumbnails.
- pub const RENDER_CACHE_VERSION: u64 = 23;
-pub const RENDER_CACHE_VERSION: u64 = 22;
++pub const RENDER_CACHE_VERSION: u64 = 24;
/// Thumbnails render at one of these long edges (so window/cell size changes reuse the cache).
pub const THUMB_SIZES: [usize; 4] = [128, 256, 384, 512];
diff --cc xtask/src/main.rs
index 4c4a9484c,cfdec92a3..833396127
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@@ -305,19 -305,10 +305,20 @@@ fn cmd_ci() -> Result<(), String>
}
/// CC0 raw samples (raw.pixls.us). Small, representative set; extend freely (CC0 only).
- /// CC0 raw samples from raw.pixls.us (each verified CC0 on the site; files matched by their published SHA-256).
+ /// CC0 raw samples from raw.pixls.us (each verified CC0 on the site).
+ /// The third field is the SHA-256 of the file as downloaded; `cargo xtask corpus --download` checks it.
/// One per format / compression variant we decode or deliberately report as unsupported (preview only).
- const RAW_SAMPLES: &[(&str, &str)] = &[
- // ILCE-7RM4A / CC0-1.0; SHA-256 690c774f1d7bc1db3fa8c2489762743d8e7586e50b6f65d0b6a61cb467972c67
+ const RAW_SAMPLES: &[(&str, &str, &str)] = &[
+ (
+ "arw-sony-a7rm4a-compressed.arw",
+ "https://raw.pixls.us/getfile.php/4822/nice/Sony%20-%20ILCE-7RM4A%20-%2014bit%2014bit%20compressed%20%283:2%29.ARW",
++ "690c774f1d7bc1db3fa8c2489762743d8e7586e50b6f65d0b6a61cb467972c67",
+ ),
- // ILCE-9M2 / CC0-1.0; SHA-256 161c2a9da2b5f1e50be6117a0b4da0ce249660b5d7de13568d301c4034716b97
+ (
+ "arw-sony-a9m2-compressed.arw",
+ "https://raw.pixls.us/getfile.php/3989/nice/Sony%20-%20ILCE-9M2%20-%2014bit%2014bit%20compressed%20%283:2%29.ARW",
++ "161c2a9da2b5f1e50be6117a0b4da0ce249660b5d7de13568d301c4034716b97",
+ ),
(
"arw-sony-a7m3-compressed.arw",
"https://raw.pixls.us/getfile.php/2414/nice/Sony%20-%20ILCE-7M3%20-%2014bit%2014bit%20compressed%20%283:2%29.ARW",