From 9b04f4c99eb37343dcaccca8b3d93c51e539ba79 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 18 Nov 2026 19:10:44 -0500 Subject: [PATCH] cutover: use craft_jpeg::finer_than_first (#2478) --- Cargo.lock | 11 ++++++++- Cargo.toml | 1 + crates/format/Cargo.toml | 1 + crates/format/src/jpeg.rs | 47 +-------------------------------------- 4 files changed, 13 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f3f898177..b267423d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1181,7 +1181,7 @@ version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=010702ee9b030844c852939095b1da0d0656a890#010702ee9b030844c852939095b1da0d0656a890" dependencies = [ "craft-dds", - "craft-jpeg", + "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=010702ee9b030844c852939095b1da0d0656a890)", "craft-metadata", "craft-tiff", "crc32fast", @@ -1210,6 +1210,14 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-jpeg" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=e7873217287876f76a045550369c90a541693c33#e7873217287876f76a045550369c90a541693c33" +dependencies = [ + "thiserror 2.0.21", +] + [[package]] name = "craft-keymap" version = "0.1.0" @@ -2203,6 +2211,7 @@ dependencies = [ "craft-fig", "craft-figcraft-format", "craft-figma-rest", + "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e7873217287876f76a045550369c90a541693c33)", "craft-penpot", "craft-sketch", "figcraft-doc", diff --git a/Cargo.toml b/Cargo.toml index 76690bed1..03ac7eb0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,6 +67,7 @@ craft-sketch = { git = "https://github.com/storytold/craft-libs", rev = "453b0da craft-fig = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" } craft-figcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" } craft-figma-rest = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" } +craft-jpeg = { git = "https://github.com/storytold/craft-libs", rev = "e7873217287876f76a045550369c90a541693c33" } # foundation kurbo = { version = "0.13", features = ["serde"] } diff --git a/crates/format/Cargo.toml b/crates/format/Cargo.toml index d988a7269..ce387ea37 100644 --- a/crates/format/Cargo.toml +++ b/crates/format/Cargo.toml @@ -25,3 +25,4 @@ craft-sketch = { workspace = true } craft-fig = { workspace = true } craft-figcraft-format = { workspace = true } craft-figma-rest = { workspace = true } +craft-jpeg = { workspace = true } diff --git a/crates/format/src/jpeg.rs b/crates/format/src/jpeg.rs index ce0dd79b3..ee729cbaf 100644 --- a/crates/format/src/jpeg.rs +++ b/crates/format/src/jpeg.rs @@ -1,49 +1,4 @@ //! A JPEG header check run before any JPEG from a file is decoded: on the canvas and in exports //! (`figcraft-render`) and for the pictures files carry ([`crate::thumbnail`]). -/// Whether `bytes` are a progressive JPEG whose frame samples some component more finely (across -/// or down) than its first. zune-jpeg 0.5.15, the decoder behind `image`, asserts in its upsampler -/// on such a frame (etemesi254/zune-image#236; fixed there by 36007420, unreleased as of -/// 0.5.16-rc3), and in the browser a panic aborts the page. Until the fix ships, such a JPEG is -/// refused from its header: the decoder refuses the larger ones itself, so nothing that decoded is -/// lost. Baseline frames of the same shape decode and are left to it. -/// shortcut: remove this check (and its callers' early return) once `Cargo.lock` has zune-jpeg -/// 0.5.16 or later. -pub fn finer_than_first(bytes: &[u8]) -> bool { - let Some((marker, frame)) = frame(bytes) else { return false }; - if !matches!(marker, 0xC2 | 0xC6 | 0xCA | 0xCE) { - return false; - } - // Length (2), precision (1), height (2), width (2), components (1), then id, sampling and - // table for each component. - let n = usize::from(frame.get(7).copied().unwrap_or(0)); - let sampling = |k: usize| frame.get(9 + 3 * k).map(|b| (b >> 4, b & 0x0F)); - let Some((h0, v0)) = sampling(0) else { return false }; - (1..n).any(|k| sampling(k).is_some_and(|(h, v)| h > h0 || v > v0)) -} - -/// A JPEG's start-of-frame marker and the segment after it (from its length bytes), found as the -/// decoders find it: fill bytes are skipped and markers without a length stepped over. `None` for -/// anything but a JPEG, or one whose scan, end or bytes come before a frame. -fn frame(bytes: &[u8]) -> Option<(u8, &[u8])> { - if !bytes.starts_with(&[0xFF, 0xD8]) { - return None; - } - let mut at = 2; - loop { - if *bytes.get(at)? != 0xFF { - return None; - } - let marker = *bytes.get(at + 1)?; - match marker { - 0xFF => at += 1, - 0x01 | 0xD0..=0xD8 => at += 2, - 0xD9 | 0xDA => return None, - 0xC0..=0xC3 | 0xC5..=0xC7 | 0xC9..=0xCB | 0xCD..=0xCF => return Some((marker, bytes.get(at + 2..)?)), - _ => { - let len = usize::from(u16::from_be_bytes([*bytes.get(at + 2)?, *bytes.get(at + 3)?])); - at = at.checked_add(2)?.checked_add(len)?; - } - } - } -} +pub use craft_jpeg::finer_than_first;