Skip to content

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

CI: reconcile lint and known unsupported corpus expectations

harrisonoconnorhoverda49bb5f7fb4
diff --git a/crates/engine/src/slide_overlay.rs b/crates/engine/src/slide_overlay.rs
index 409739335..a27f75d49 100644
--- a/crates/engine/src/slide_overlay.rs
+++ b/crates/engine/src/slide_overlay.rs
@@ -903,7 +903,7 @@ fn shadow(img: &mut Rgba8, tl: &crate::text::TextLayout, x: f64, y: f64, sigma:
let my0 = (y - pad).floor().max(-pad);
let mx1 = (x + tl.width as f64 + pad).ceil().min(iw + pad);
let my1 = (y + tl.height as f64 + pad).ceil().min(ih + pad);
- if !(mx1 > mx0 && my1 > my0) || !mx0.is_finite() || !my0.is_finite() {
+ if !(mx1 > mx0 && my1 > my0 && mx0.is_finite() && my0.is_finite()) {
return;
}
let (w, h) = ((mx1 - mx0) as usize, (my1 - my0) as usize);
diff --git a/crates/engine/src/tests_export.rs b/crates/engine/src/tests_export.rs
index 2f1a05116..e66090b39 100644
--- a/crates/engine/src/tests_export.rs
+++ b/crates/engine/src/tests_export.rs
@@ -1038,7 +1038,6 @@ fn same_folder_as_original_refuses_photos_without_a_folder() {
assert_eq!(f["photo"], id.0, "{f}");
assert!(f["error"].as_str().unwrap().contains("no folder on disk"), "{f}");
}
- drop(write);
assert!(written.is_empty(), "{written:?}");
// a photo on disk whose folder is gone (moved, an unplugged drive)
diff --git a/crates/raw/tests/corpus.rs b/crates/raw/tests/corpus.rs
index 31e62f7dc..cb7f6791a 100644
--- a/crates/raw/tests/corpus.rs
+++ b/crates/raw/tests/corpus.rs
@@ -16,10 +16,11 @@ fn corpus_root() -> PathBuf {
/// Variants known not to decode yet (see the crate docs): matched against the lower-case file name.
const KNOWN_UNSUPPORTED: &[&str] = &[
- "cr3-", // Unverified CRX coding variants; exact supported cases live in cr3_corpus.rs.
- "orf-olympus-em", // Olympus compressed ORF
- "-he.nef", // Nikon High Efficiency (HE / HE★) NEF, issue #193
- "sraw", // Canon sRAW / mRAW
+ "cr3-", // Unverified CRX coding variants; exact supported cases live in cr3_corpus.rs.
+ "orf-olympus-em", // Olympus compressed ORF
+ "orf-olympus-epl7.orf", // E-PL7 is preview-only too (docs/raw/coverage.tsv).
+ "-he.nef", // Nikon High Efficiency (HE / HE★) NEF, issue #193
+ "sraw", // Canon sRAW / mRAW
];
#[test]