From 037fbd3da77415b010eeb10d5d84b4b574059b73 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 15:50:41 +0000 Subject: [PATCH 01/13] Use shared WebP header inspection --- Cargo.lock | 54 +++++++++++++---- Cargo.toml | 2 +- NOTICE | 124 ++++++++++++++++++++++++++++++++++++++ crates/codecs/src/webp.rs | 24 +------- 4 files changed, 169 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04c07b04f1..acc43b7116 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1266,13 +1266,15 @@ dependencies = [ [[package]] name = "craft-image-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18#f0f4758c01581d79577b9bf5046c06f4e77b1f18" +source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" dependencies = [ "craft-jpeg", - "craft-metadata", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9)", + "crc32fast", "exr", "flate2", "half", + "hayro-jpeg2000", "image", "image-webp", "jpeg-encoder", @@ -1289,7 +1291,7 @@ dependencies = [ [[package]] name = "craft-jpeg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18#f0f4758c01581d79577b9bf5046c06f4e77b1f18" +source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" dependencies = [ "thiserror 2.0.21", ] @@ -1304,6 +1306,18 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-metadata" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" +dependencies = [ + "brotli-decompressor 6.0.1", + "chrono", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9)", + "quick-xml 0.41.0", + "serde", +] + [[package]] name = "craft-metadata" version = "0.1.0" @@ -1311,7 +1325,7 @@ source = "git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9b dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "quick-xml 0.41.0", "serde", ] @@ -1334,8 +1348,8 @@ source = "git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9b dependencies = [ "chrono", "craft-crw", - "craft-metadata", - "craft-tiff", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "jxl-oxide", "miniz_oxide 0.9.1", "rayon", @@ -1345,6 +1359,15 @@ dependencies = [ "zune-jpeg", ] +[[package]] +name = "craft-tiff" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-tiff" version = "0.1.0" @@ -3033,6 +3056,15 @@ dependencies = [ "foldhash 0.2.0", ] +[[package]] +name = "hayro-jpeg2000" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ab947623ef4ccaa7acf0579edf7cbb5a73838e3839a7be73335e522f433a1" +dependencies = [ + "fearless_simd", +] + [[package]] name = "heck" version = "0.5.0" @@ -3834,7 +3866,7 @@ dependencies = [ "craft-image-codecs", "craft-jxl", "craft-psd", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", "jxl-oxide", "lightcraft-color", @@ -3911,7 +3943,7 @@ dependencies = [ "chrono", "craft-docpath", "craft-heif", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "crc32fast", "fs4", "harfrust 0.13.3", @@ -4068,9 +4100,9 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "craft-psd", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", "proptest", "serde", @@ -4125,7 +4157,7 @@ dependencies = [ "chrono", "craft-image-codecs", "craft-raw", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", "lightcraft-color", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index 2346d9cd48..f2c29a31df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f3 craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", default-features = false, features = ["decode", "encode"] } # Photo metadata: EXIF, IPTC-IIM, XMP packets and GPX track logs (craft-libs#949) craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" } craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } # craft-update: app-specific pretend versions apply to startup and manual checks. craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } diff --git a/NOTICE b/NOTICE index 39eb49db2c..e8576d71ee 100644 --- a/NOTICE +++ b/NOTICE @@ -335,3 +335,127 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +JPEG encoding dependency: jpeg-encoder 0.6.1 + +Source: https://crates.io/crates/jpeg-encoder/0.6.1 +Declared license: (MIT OR Apache-2.0) AND IJG. +This software is based in part on the work of the Independent JPEG Group. + +The MIT license and unaltered upstream IJG and SIMD notices follow. The Apache-2.0 +alternative is also retained in licenses/jpeg-encoder-0.6.1 at the repository root +(https://github.com/storytold/craft-libs/tree/main/licenses/jpeg-encoder-0.6.1). +The dependency is used unmodified; no encoder implementation is vendored here. + +LICENSE-MIT + +Copyright (c) 2021 Volker Ströbel + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +Original src/fdct.rs opening notice + +/* + * Ported from mozjpeg to rust + * + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1991-1996, Thomas G. Lane. + * libjpeg-turbo Modifications: + * Copyright (C) 2015, 2020, D. R. Commander. + * + * Conditions of distribution and use: + * In plain English: + * + * 1. We don't promise that this software works. (But if you find any bugs, + * please let us know!) + * 2. You can use this software for whatever you want. You don't have to pay us. + * 3. You may not pretend that you wrote this software. If you use it in a + * program, you must acknowledge somewhere in your documentation that + * you've used the IJG code. + * + * In legalese: + * + * The authors make NO WARRANTY or representation, either express or implied, + * with respect to this software, its quality, accuracy, merchantability, or + * fitness for a particular purpose. This software is provided "AS IS", and you, + * its user, assume the entire risk as to its quality and accuracy. + * + * This software is copyright (C) 1991-2020, Thomas G. Lane, Guido Vollbeding. + * All Rights Reserved except as specified below. + * + * Permission is hereby granted to use, copy, modify, and distribute this + * software (or portions thereof) for any purpose, without fee, subject to these + * conditions: + * (1) If any part of the source code for this software is distributed, then this + * README file must be included, with this copyright and no-warranty notice + * unaltered; and any additions, deletions, or changes to the original files + * must be clearly indicated in accompanying documentation. + * (2) If only executable code is distributed, then the accompanying + * documentation must state that "this software is based in part on the work of + * the Independent JPEG Group". + * (3) Permission for use of this software is granted only if the user accepts + * full responsibility for any undesirable consequences; the authors accept + * NO LIABILITY for damages of any kind. + * + * These conditions apply to any software derived from or based on the IJG code, + * not just to the unmodified library. If you use our work, you ought to + * acknowledge us. + * + * Permission is NOT granted for the use of any IJG author's name or company name + * in advertising or publicity relating to this software or products derived from + * it. This software may be referred to only as "the Independent JPEG Group's + * software". + * + * We specifically permit and encourage the use of this software as the basis of + * commercial products, provided that all warranty or liability claims are + * assumed by the product vendor. + * + * This file contains a slower but more accurate integer implementation of the + * forward DCT (Discrete Cosine Transform). + * + * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT + * on each column. Direct algorithms are also available, but they are + * much more complex and seem not to be any faster when reduced to code. + * + * This implementation is based on an algorithm described in + * C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT + * Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics, + * Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991. + * The primary algorithm described there uses 11 multiplies and 29 adds. + * We use their alternate method with 12 multiplies and 32 adds. + * The advantage of this method is that no data path contains more than one + * multiplication; this allows a very simple and accurate implementation in + * scaled fixed-point arithmetic, with a minimal number of shifts. + */ + +Original src/avx2/fdct.rs opening notice + +/* + * Ported from mozjpeg / jfdctint-avx2.asm to rust + * Copyright 2009 Pierre Ossman for Cendio AB + * Copyright (C) 2009, 2016, 2018, 2020, D. R. Commander. + * + * Based on the x86 SIMD extension for IJG JPEG library + * Copyright (C) 1999-2006, MIYASAKA Masaru. + */ diff --git a/crates/codecs/src/webp.rs b/crates/codecs/src/webp.rs index 854a6ca9c5..9b1011f2e9 100644 --- a/crates/codecs/src/webp.rs +++ b/crates/codecs/src/webp.rs @@ -41,29 +41,7 @@ pub(crate) fn decode(bytes: &[u8], opts: &DecodeOptions) -> Result { /// animation frame), or one that runs past the end of the file (truncated). The compressed data /// itself is not checked. pub(crate) fn header(bytes: &[u8]) -> Result<(u32, u32, u16)> { - let mut p = 12usize; - let mut has_image = false; - let mut exif_chunk: Option<&[u8]> = None; - while let Some(h) = bytes.get(p..p.saturating_add(8)) { - let size = u32::from_le_bytes([h[4], h[5], h[6], h[7]]) as usize; - let end = p.saturating_add(8).saturating_add(size); - if matches!(&h[0..4], b"VP8 " | b"VP8L" | b"ANMF") { - if end > bytes.len() { - return Err(err("truncated image data")); - } - has_image = true; - } else if &h[0..4] == b"EXIF" && end <= bytes.len() && exif_chunk.is_none() { - exif_chunk = Some(&bytes[p + 8..end]); - } - p = end.saturating_add(size & 1); - } - if !has_image { - return Err(err("no image data")); - } - let (w, h) = craft_image_codecs::probe_size(bytes).map_err(err)?; - let orientation = - exif_chunk.map(|e| e.strip_prefix(b"Exif\0\0").unwrap_or(e)).map(crate::exif::summarize).unwrap_or_default().orientation.unwrap_or(1); - let (w, h) = if (5..=8).contains(&orientation) { (h, w) } else { (w, h) }; + let (w, h, orientation) = craft_image_codecs::webp_probe::header(bytes).map_err(err)?; check_size(F, w as u64, h as u64, &DecodeOptions::default())?; Ok((w, h, orientation)) } From 5d26a44ae76fe172d5fc42621832f8a7f58eaa24 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:08:20 +0000 Subject: [PATCH 02/13] Use shared merged PSD plane reader --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/codecs/src/psd.rs | 189 ++++++++------------------------------- 3 files changed, 37 insertions(+), 156 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04c07b04f1..a9d0f91b05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=9dcbd90c7d16e1a668b3afa057e940e2db328b93#9dcbd90c7d16e1a668b3afa057e940e2db328b93" +source = "git+https://github.com/storytold/craft-libs?rev=eeb1147733ee4584dd9edcbe4418f3af1b646aba#eeb1147733ee4584dd9edcbe4418f3af1b646aba" dependencies = [ "encoding_rs", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 2346d9cd48..502181ea25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ craft-window = { git = "https://github.com/storytold/craft-libs", rev = "c5a1cbf # HDR gain maps: ISO 21496-1 and hdrgm metadata, compute and apply (moved from crates/codecs; craft-libs#904). craft-gainmap = { git = "https://github.com/storytold/craft-libs", rev = "9dcbd90c7d16e1a668b3afa057e940e2db328b93" } # PSD/PSB: the header, colour mode data and image resources (craft-libs#885). -craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "9dcbd90c7d16e1a668b3afa057e940e2db328b93" } +craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "eeb1147733ee4584dd9edcbe4418f3af1b646aba" } # internal lightcraft-denoise-core = { path = "crates/denoise-core" } lightcraft-denoise = { path = "crates/denoise", default-features = false } diff --git a/crates/codecs/src/psd.rs b/crates/codecs/src/psd.rs index f0422edc13..565794a098 100644 --- a/crates/codecs/src/psd.rs +++ b/crates/codecs/src/psd.rs @@ -14,11 +14,13 @@ fn err(s: &str) -> Error { Error::Malformed(F, s.to_string()) } +#[cfg(test)] struct Rd<'a> { b: &'a [u8], p: usize, } +#[cfg(test)] impl<'a> Rd<'a> { fn take(&mut self, n: usize) -> Result<&'a [u8]> { let end = self.p.checked_add(n).filter(|&e| e <= self.b.len()).ok_or_else(|| err("truncated"))?; @@ -34,66 +36,28 @@ impl<'a> Rd<'a> { let s = self.take(4)?; Ok(u32::from_be_bytes([s[0], s[1], s[2], s[3]])) } - fn u64(&mut self) -> Result { - let s = self.take(8)?; - Ok(u64::from_be_bytes([s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7]])) - } } -/// The header, colour mode data and image resources (`craft-psd`), with a reader at the layer and mask section. -struct Start<'a> { - psb: bool, - channels: usize, - width: usize, - height: usize, - depth: u16, - mode: u16, - head: craft_psd::Head, - r: Rd<'a>, -} - -fn start<'a>(bytes: &'a [u8], opts: &DecodeOptions) -> Result> { - // the size limit first, from the header's fixed fields, so an oversized file is `TooLarge` as for other formats - if let (Some(&[h0, h1, h2, h3]), Some(&[w0, w1, w2, w3])) = (bytes.get(14..18), bytes.get(18..22)) { - check_size(F, u64::from(u32::from_be_bytes([w0, w1, w2, w3])), u64::from(u32::from_be_bytes([h0, h1, h2, h3])), opts)?; - } - let head = craft_psd::Head::from_bytes(bytes).map_err(|e| match e { - craft_psd::PsdError::UnexpectedEof { .. } => err("truncated"), - e => err(&e.to_string()), - })?; - let h = &head.header; - check_size(F, u64::from(h.width), u64::from(h.height), opts)?; - let p = usize::try_from(head.layer_section_offset).map_err(|_| err("truncated"))?; - Ok(Start { - psb: h.version.is_psb(), - channels: usize::from(h.channels), - width: h.width as usize, - height: h.height as usize, - depth: h.depth, - mode: h.color_mode.as_u16(), - r: Rd { b: bytes, p }, - head, +fn open_merged(bytes: &[u8], opts: &DecodeOptions) -> Result> { + craft_psd::merged::Merged::open(bytes, opts.max_pixels).map_err(|error| match error { + craft_psd::PsdError::LimitExceeded("pixel count") => { + let (w, h) = craft_psd::merged::declared_dimensions(bytes).unwrap_or((0, 0)); + Error::TooLarge(u64::from(w), u64::from(h)) + } + other => err(&other.to_string()), }) } pub(crate) fn decode(bytes: &[u8], opts: &DecodeOptions) -> Result { - let Start { psb, channels, width, height, depth, mode, head, mut r } = start(bytes, opts)?; + let merged = open_merged(bytes, opts)?; + let head = &merged.head; + let h = &head.header; + let (channels, width, height, depth, mode) = (usize::from(h.channels), h.width as usize, h.height as usize, h.depth, h.color_mode.as_u16()); let color_mode_data = head.color_mode_data.as_slice(); - let (icc, exif, xmp) = resources(&head); - - // Layer and mask information: only the layer count sign matters (merged transparency). - let lm_len = if psb { r.u64()? } else { u64::from(r.u32()?) }; - let lm = r.take(usize::try_from(lm_len).map_err(|_| err("truncated"))?)?; - let merged_transparency = if lm.len() >= if psb { 10 } else { 6 } { - let off = if psb { 8 } else { 4 }; - let count = i16::from_be_bytes([lm[off], lm[off + 1]]); - count < 0 - } else { - false - }; + let (icc, exif, xmp) = resources(head); + let merged_transparency = merged.transparency; // Image data. - let compression = r.u16()?; let bpc = match depth { 8 => 1usize, 16 => 2, @@ -119,57 +83,11 @@ pub(crate) fn decode(bytes: &[u8], opts: &DecodeOptions) -> Result { let used = n_color + alpha as usize; let too_large = || Error::TooLarge(width as u64, height as u64); let n = width.checked_mul(height).ok_or_else(too_large)?; - let row_bytes = width.checked_mul(bpc).ok_or_else(too_large)?; - let plane = n.checked_mul(bpc).ok_or_else(too_large)?; - let mut planes: Vec> = Vec::with_capacity(used); - match compression { - 0 => { - // Raw planes are borrowed from the input, so their size is bounded by the file. - for _ in 0..used { - planes.push(r.take(plane)?.to_vec()); - } - } - 1 => { - // Row byte-count table: one entry per row per channel (all channels, since the data - // follows it). Taken from the input before anything is allocated from it. - let entry = if psb { 4 } else { 2 }; - let table_len = channels.checked_mul(height).and_then(|c| c.checked_mul(entry)).ok_or_else(|| err("truncated"))?; - let table = r.take(table_len)?; - let count = |i: usize| -> usize { - let at = i.saturating_mul(entry); - match table.get(at..at.saturating_add(entry)) { - Some(&[a, b]) => usize::from(u16::from_be_bytes([a, b])), - Some(&[a, b, c, d]) => u32::from_be_bytes([a, b, c, d]) as usize, - _ => 0, - } - }; - // PackBits expands at most 64× (a 2-byte repeat run yields 128 bytes), so a row needs - // at least this many encoded bytes. Requiring it (and the data being present) before - // allocating bounds the decoded planes by the file size: a tiny file can no longer - // declare gigabytes of zero-padded or repeat-run rows. - let min_row = row_bytes.div_ceil(128).saturating_mul(2); - let mut data_len = 0usize; - for i in 0..used.saturating_mul(height) { - let c = count(i); - if c < min_row { - return Err(err("RLE row too short for its width")); - } - data_len = data_len.saturating_add(c); - } - if data_len > bytes.len().saturating_sub(r.p) { - return Err(err("truncated")); - } - for c in 0..used { - let mut out = zeroed::(plane, too_large)?; - for (y, row) in out.chunks_exact_mut(row_bytes).enumerate() { - let src = r.take(count(c * height + y))?; - unpackbits(src, row)?; - } - planes.push(out); - } - } - _ => return Err(Error::Unsupported(F, "ZIP-compressed merged image data")), - } + let planes = merged.read_planes(used).map_err(|error| match error { + craft_psd::PsdError::LimitExceeded(_) | craft_psd::PsdError::OutOfMemory(_) => too_large(), + craft_psd::PsdError::Unsupported(_) => Error::Unsupported(F, "ZIP-compressed merged image data"), + other => err(&other.to_string()), + })?; let samples = n.checked_mul(used).ok_or_else(too_large)?; // Interleave to device samples. @@ -352,19 +270,17 @@ fn packbits(src: &[u8], out: &mut Vec) { /// depth, colour mode or compression, or merged image data that runs past the end of the file /// (truncated). The run-length data itself is not unpacked. pub(crate) fn header(bytes: &[u8]) -> Result<(u32, u32, u16)> { - let Start { psb, channels, width, height, depth, mode, head, mut r } = start(bytes, &DecodeOptions::default())?; + let merged = open_merged(bytes, &DecodeOptions::default())?; + let head = &merged.head; + let h = &head.header; + let (channels, width, height, depth, mode) = (usize::from(h.channels), h.width as usize, h.height as usize, h.depth, h.color_mode.as_u16()); let color_mode_data = head.color_mode_data.as_slice(); - let (_, exif, _) = resources(&head); - let lm_len = if psb { r.u64()? as usize } else { r.u32()? as usize }; - r.take(lm_len)?; - let compression = r.u16()?; - let bpc = match depth { - 8 => 1usize, - 16 => 2, - 32 => 4, + let (_, exif, _) = resources(head); + match depth { + 8 | 16 | 32 => {} 1 => return Err(Error::Unsupported(F, "1-bit bitmap PSD")), _ => return Err(err("bad depth")), - }; + } let n_color = match mode { 1 | 8 | 7 | 2 => 1, 3 => 3, @@ -378,24 +294,10 @@ pub(crate) fn header(bytes: &[u8]) -> Result<(u32, u32, u16)> { if mode == 2 && (color_mode_data.len() < 768 || depth != 8) { return Err(err("bad indexed palette")); } - let rest = bytes.len().saturating_sub(r.p); - let need = match compression { - 0 => width.checked_mul(height).and_then(|n| n.checked_mul(bpc)).and_then(|n| n.checked_mul(channels)), - 1 => { - // the row byte counts, then the rows they count - let rows = channels.checked_mul(height).ok_or_else(|| err("truncated"))?; - let table = rows.checked_mul(if psb { 4 } else { 2 }).filter(|&t| t <= rest).ok_or_else(|| err("truncated"))?; - let mut total = table; - for _ in 0..rows { - total = total.saturating_add(if psb { r.u32()? as usize } else { r.u16()? as usize }); - } - Some(total) - } - _ => return Err(Error::Unsupported(F, "ZIP-compressed merged image data")), - }; - if need.is_none_or(|n| n > rest) { - return Err(err("truncated")); - } + merged.validate_all().map_err(|error| match error { + craft_psd::PsdError::Unsupported(_) => Error::Unsupported(F, "ZIP-compressed merged image data"), + other => err(&other.to_string()), + })?; let orientation = exif.as_deref().map(crate::exif::summarize).unwrap_or_default().orientation.unwrap_or(1); Ok((width as u32, height as u32, orientation)) } @@ -408,30 +310,9 @@ fn zeroed(len: usize, too_large: impl Fn() -> Error) -> Resu Ok(v) } -/// PackBits: decode one row into `row` (pre-zeroed, so short run data leaves zero padding). -/// A run that would write past the end of the row is an error; trailing bytes are ignored. -fn unpackbits(mut src: &[u8], row: &mut [u8]) -> Result<()> { - let mut at = 0; - while at < row.len() { - let Some((&h, rest)) = src.split_first() else { break }; - src = rest; - let h = h as i8; - if h >= 0 { - let n = h as usize + 1; - let lit = src.get(..n).unwrap_or(src); - let dst = row.get_mut(at..at + lit.len()).ok_or_else(|| err("RLE row overruns its width"))?; - dst.copy_from_slice(lit); - at += lit.len(); - src = src.get(n..).unwrap_or(&[]); - } else if h != -128 { - let n = (1 - h as isize) as usize; - let Some((&b, rest)) = src.split_first() else { break }; - src = rest; - row.get_mut(at..at + n).ok_or_else(|| err("RLE row overruns its width"))?.fill(b); - at += n; - } - } - Ok(()) +#[cfg(test)] +fn unpackbits(src: &[u8], row: &mut [u8]) -> Result<()> { + craft_psd::merged::unpackbits(src, row).map_err(|error| err(&error.to_string())) } /// ICC (1039), EXIF (1058, without its optional `Exif\0\0` prefix) and XMP (1060) resources; the last of each id. From e647db4e1a3225d70cf305d26bb40a6d5f9b4bdf Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:09:55 +0000 Subject: [PATCH 03/13] Tie merged PSD borrow to input --- crates/codecs/src/psd.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/codecs/src/psd.rs b/crates/codecs/src/psd.rs index 565794a098..badd811df7 100644 --- a/crates/codecs/src/psd.rs +++ b/crates/codecs/src/psd.rs @@ -4,7 +4,7 @@ //! Also a flat-file writer ([`encode`]): the merged image of an 8- or 16-bit gray/RGB document //! with no layers, so an image editor opens it as one background layer and saves back to it. -use crate::convert::{Buf, Meta, Model, Raw, check_size, finish}; +use crate::convert::{Buf, Meta, Model, Raw, finish}; use crate::encode::{EncodeImage, EncodeMeta, Samples}; use crate::{DecodeOptions, Decoded, Error, Format, Result}; @@ -38,7 +38,7 @@ impl<'a> Rd<'a> { } } -fn open_merged(bytes: &[u8], opts: &DecodeOptions) -> Result> { +fn open_merged<'a>(bytes: &'a [u8], opts: &DecodeOptions) -> Result> { craft_psd::merged::Merged::open(bytes, opts.max_pixels).map_err(|error| match error { craft_psd::PsdError::LimitExceeded("pixel count") => { let (w, h) = craft_psd::merged::declared_dimensions(bytes).unwrap_or((0, 0)); From 5f14161d9b9903c78b1839eeeb1c402478e7f878 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:12:16 +0000 Subject: [PATCH 04/13] Preserve merged PSD errors --- crates/codecs/src/psd.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/codecs/src/psd.rs b/crates/codecs/src/psd.rs index badd811df7..648011cca5 100644 --- a/crates/codecs/src/psd.rs +++ b/crates/codecs/src/psd.rs @@ -44,6 +44,8 @@ fn open_merged<'a>(bytes: &'a [u8], opts: &DecodeOptions) -> Result err(&message), + craft_psd::PsdError::UnexpectedEof { .. } => err("truncated"), other => err(&other.to_string()), }) } @@ -86,6 +88,8 @@ pub(crate) fn decode(bytes: &[u8], opts: &DecodeOptions) -> Result { let planes = merged.read_planes(used).map_err(|error| match error { craft_psd::PsdError::LimitExceeded(_) | craft_psd::PsdError::OutOfMemory(_) => too_large(), craft_psd::PsdError::Unsupported(_) => Error::Unsupported(F, "ZIP-compressed merged image data"), + craft_psd::PsdError::Invalid(message) => err(&message), + craft_psd::PsdError::UnexpectedEof { .. } => err("truncated"), other => err(&other.to_string()), })?; let samples = n.checked_mul(used).ok_or_else(too_large)?; @@ -296,6 +300,8 @@ pub(crate) fn header(bytes: &[u8]) -> Result<(u32, u32, u16)> { } merged.validate_all().map_err(|error| match error { craft_psd::PsdError::Unsupported(_) => Error::Unsupported(F, "ZIP-compressed merged image data"), + craft_psd::PsdError::Invalid(message) => err(&message), + craft_psd::PsdError::UnexpectedEof { .. } => err("truncated"), other => err(&other.to_string()), })?; let orientation = exif.as_deref().map(crate::exif::summarize).unwrap_or_default().orientation.unwrap_or(1); From 0b1aadb018a7eb8b9b2f8113c945e995d415d64d Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:15:58 +0000 Subject: [PATCH 05/13] Preserve legacy WebP EXIF orientation --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- crates/codecs/src/webp.rs | 27 +++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index acc43b7116..801c31f9e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1266,10 +1266,10 @@ dependencies = [ [[package]] name = "craft-image-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" +source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76)", "crc32fast", "exr", "flate2", @@ -1291,7 +1291,7 @@ dependencies = [ [[package]] name = "craft-jpeg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" +source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" dependencies = [ "thiserror 2.0.21", ] @@ -1309,11 +1309,11 @@ dependencies = [ [[package]] name = "craft-metadata" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" +source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76)", "quick-xml 0.41.0", "serde", ] @@ -1362,7 +1362,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9#82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" +source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" dependencies = [ "serde", "thiserror 2.0.21", diff --git a/Cargo.toml b/Cargo.toml index f2c29a31df..58cc00d49c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f3 craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", default-features = false, features = ["decode", "encode"] } # Photo metadata: EXIF, IPTC-IIM, XMP packets and GPX track logs (craft-libs#949) craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "82e258ab6eae4f4d6cd9dfe463a8640fd20c96d9" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "e3712dd643591f1a36ab04e5be6329e8fd4d8a76" } craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } # craft-update: app-specific pretend versions apply to startup and manual checks. craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } diff --git a/crates/codecs/src/webp.rs b/crates/codecs/src/webp.rs index 9b1011f2e9..41c4084e58 100644 --- a/crates/codecs/src/webp.rs +++ b/crates/codecs/src/webp.rs @@ -45,3 +45,30 @@ pub(crate) fn header(bytes: &[u8]) -> Result<(u32, u32, u16)> { check_size(F, w as u64, h as u64, &DecodeOptions::default())?; Ok((w, h, orientation)) } + +#[cfg(test)] +mod tests { + use super::*; + #[test] + fn exif_orientation_mutation_parity() { + let exif = crate::exif::minimal_exif(6); + let image = crate::encode::EncodeImage::new(2, 3, 3, crate::encode::Samples::U8(&[80; 18])); + let base = crate::encode::encode_webp_lossless(&image, &crate::encode::EncodeMeta { exif: Some(&exif), ..Default::default() }).unwrap(); + let marker = base.windows(4).position(|v| v == b"EXIF").unwrap(); + for at in 0..exif.len() { + for value in [0, 255] { + let mut data = exif.clone(); + data[at] = value; + let mut webp = base.clone(); + webp[marker + 8..marker + 8 + data.len()].copy_from_slice(&data); + if let Ok((w, h)) = craft_image_codecs::probe_size(&webp) { + let orientation = crate::exif::summarize(&data).orientation.unwrap_or(1); + let (w, h) = if (5..=8).contains(&orientation) { (h, w) } else { (w, h) }; + assert_eq!(header(&webp).unwrap(), (w, h, orientation), "at {at}, value {value}"); + } else { + assert!(header(&webp).is_err()); + } + } + } + } +} From fef83ca2767ac18383658db33c96935304ac23b9 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:21:39 +0000 Subject: [PATCH 06/13] Pin full shared EXIF compatibility --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 801c31f9e6..6e3290d944 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1266,10 +1266,10 @@ dependencies = [ [[package]] name = "craft-image-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" +source = "git+https://github.com/storytold/craft-libs?rev=bf7b4a43c5e8cbe52a94497d9e3b889341f65466#bf7b4a43c5e8cbe52a94497d9e3b889341f65466" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bf7b4a43c5e8cbe52a94497d9e3b889341f65466)", "crc32fast", "exr", "flate2", @@ -1291,7 +1291,7 @@ dependencies = [ [[package]] name = "craft-jpeg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" +source = "git+https://github.com/storytold/craft-libs?rev=bf7b4a43c5e8cbe52a94497d9e3b889341f65466#bf7b4a43c5e8cbe52a94497d9e3b889341f65466" dependencies = [ "thiserror 2.0.21", ] @@ -1309,11 +1309,11 @@ dependencies = [ [[package]] name = "craft-metadata" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" +source = "git+https://github.com/storytold/craft-libs?rev=bf7b4a43c5e8cbe52a94497d9e3b889341f65466#bf7b4a43c5e8cbe52a94497d9e3b889341f65466" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bf7b4a43c5e8cbe52a94497d9e3b889341f65466)", "quick-xml 0.41.0", "serde", ] @@ -1362,7 +1362,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=e3712dd643591f1a36ab04e5be6329e8fd4d8a76#e3712dd643591f1a36ab04e5be6329e8fd4d8a76" +source = "git+https://github.com/storytold/craft-libs?rev=bf7b4a43c5e8cbe52a94497d9e3b889341f65466#bf7b4a43c5e8cbe52a94497d9e3b889341f65466" dependencies = [ "serde", "thiserror 2.0.21", diff --git a/Cargo.toml b/Cargo.toml index 58cc00d49c..90e9633b07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f3 craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", default-features = false, features = ["decode", "encode"] } # Photo metadata: EXIF, IPTC-IIM, XMP packets and GPX track logs (craft-libs#949) craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "e3712dd643591f1a36ab04e5be6329e8fd4d8a76" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "bf7b4a43c5e8cbe52a94497d9e3b889341f65466" } craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } # craft-update: app-specific pretend versions apply to startup and manual checks. craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } From d2e44260fc2a72ef0705d52d5ea0b54421ec88ae Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 18:04:35 +0000 Subject: [PATCH 07/13] Pin merged shared PSD reader --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9d0f91b05..1ae8af2e5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=eeb1147733ee4584dd9edcbe4418f3af1b646aba#eeb1147733ee4584dd9edcbe4418f3af1b646aba" +source = "git+https://github.com/storytold/craft-libs?rev=d181e08d3df8ff1c9b216778d668e6071a42993b#d181e08d3df8ff1c9b216778d668e6071a42993b" dependencies = [ "encoding_rs", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 502181ea25..e8c83d2d6b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ craft-window = { git = "https://github.com/storytold/craft-libs", rev = "c5a1cbf # HDR gain maps: ISO 21496-1 and hdrgm metadata, compute and apply (moved from crates/codecs; craft-libs#904). craft-gainmap = { git = "https://github.com/storytold/craft-libs", rev = "9dcbd90c7d16e1a668b3afa057e940e2db328b93" } # PSD/PSB: the header, colour mode data and image resources (craft-libs#885). -craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "eeb1147733ee4584dd9edcbe4418f3af1b646aba" } +craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "d181e08d3df8ff1c9b216778d668e6071a42993b" } # internal lightcraft-denoise-core = { path = "crates/denoise-core" } lightcraft-denoise = { path = "crates/denoise", default-features = false } From 8be9a6f835d8dd321b647454079d4d3542b3552d Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 18:08:57 +0000 Subject: [PATCH 08/13] Delegate PSD metadata resource selection --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/meta/src/psd.rs | 17 ++--------------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a1485bfd2..19187f800f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=9dcbd90c7d16e1a668b3afa057e940e2db328b93#9dcbd90c7d16e1a668b3afa057e940e2db328b93" +source = "git+https://github.com/storytold/craft-libs?rev=32ae528fa1e7114408520c1d365a9f557da08054#32ae528fa1e7114408520c1d365a9f557da08054" dependencies = [ "encoding_rs", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 2346d9cd48..613cfbc2f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ craft-window = { git = "https://github.com/storytold/craft-libs", rev = "c5a1cbf # HDR gain maps: ISO 21496-1 and hdrgm metadata, compute and apply (moved from crates/codecs; craft-libs#904). craft-gainmap = { git = "https://github.com/storytold/craft-libs", rev = "9dcbd90c7d16e1a668b3afa057e940e2db328b93" } # PSD/PSB: the header, colour mode data and image resources (craft-libs#885). -craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "9dcbd90c7d16e1a668b3afa057e940e2db328b93" } +craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "32ae528fa1e7114408520c1d365a9f557da08054" } # internal lightcraft-denoise-core = { path = "crates/denoise-core" } lightcraft-denoise = { path = "crates/denoise", default-features = false } diff --git a/crates/meta/src/psd.rs b/crates/meta/src/psd.rs index a37905ae7d..2792ff3884 100644 --- a/crates/meta/src/psd.rs +++ b/crates/meta/src/psd.rs @@ -6,21 +6,8 @@ use crate::Embedded; /// resources). `None` for a head that does not parse, a second EXIF or XMP resource, or XMP that is not UTF-8. pub(crate) fn parse(bytes: &[u8]) -> Option { let head = craft_psd::Head::from_bytes(bytes).ok()?; - let (mut exif, mut xmp) = (None, None); - for r in &head.resources { - match r.id { - 1058 if exif.is_some() => return None, - 1058 => exif = Some(r.data.as_slice()), - 1060 if xmp.is_some() => return None, - 1060 => xmp = Some(std::str::from_utf8(&r.data).ok()?), - _ => {} - } - } - Some(Embedded { - exif: exif.map(crate::strip_exif_header).map(<[u8]>::to_vec), - xmp: xmp.map(|text| text.trim_end_matches('\0').to_string()), - ..Default::default() - }) + let (exif, xmp) = craft_psd::resources::unique_exif_xmp(&head.resources)?; + Some(Embedded { exif: exif.map(crate::strip_exif_header).map(<[u8]>::to_vec), xmp: xmp.map(str::to_owned), ..Default::default() }) } #[cfg(test)] From 7215ade1d9759d135fcd62f9d709948b4895eb83 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:20:57 +0100 Subject: [PATCH 09/13] codecs: PSD resource recovery skips over-limit files and allocates fallibly --- crates/codecs/src/psd.rs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/crates/codecs/src/psd.rs b/crates/codecs/src/psd.rs index 6ab2e70a72..0a2104db6c 100644 --- a/crates/codecs/src/psd.rs +++ b/crates/codecs/src/psd.rs @@ -44,6 +44,8 @@ impl<'a> Rd<'a> { fn open_merged<'a>(bytes: &'a [u8], opts: &DecodeOptions, spare: &'a mut Vec) -> Result> { let error = match open_exact(bytes, opts) { Ok(merged) => return Ok(merged), + // a pixel-limit refusal reads the header, which the copy keeps: no retry + Err(error @ Error::TooLarge(..)) => return Err(error), Err(error) => error, }; let Some(stripped) = without_resources(bytes) else { return Err(error) }; @@ -60,7 +62,9 @@ fn without_resources(bytes: &[u8]) -> Option> { let len_at = |at: usize| -> Option { usize::try_from(u32::from_be_bytes(bytes.get(at..at.checked_add(4)?)?.try_into().ok()?)).ok() }; let res_at = 30usize.checked_add(len_at(26)?)?; let tail = bytes.get(res_at.checked_add(4)?.checked_add(len_at(res_at)?)?..)?; - let mut out = Vec::with_capacity(bytes.len()); + let mut out = Vec::new(); + // a failed allocation leaves the original parse error, not an abort + out.try_reserve_exact(bytes.len()).ok()?; out.extend_from_slice(bytes.get(..res_at)?); out.extend_from_slice(&0u32.to_be_bytes()); out.extend_from_slice(tail); @@ -338,6 +342,17 @@ mod tests { assert_eq!(super::header(&b).unwrap(), (1, 1, 1)); } + #[test] + fn a_damaged_resource_section_over_the_pixel_limit_is_too_large() { + // the size refusal comes before (and instead of) the copy without the resources + let mut b = header(3, 4, 4, 8, 3, 0); + b[30..34].copy_from_slice(&4u32.to_be_bytes()); + b.splice(34..34, *b"JUNK"); + let opts = DecodeOptions { max_pixels: 15, ..DecodeOptions::default() }; + let e = decode(&b, &opts).unwrap_err(); + assert!(matches!(e, Error::TooLarge(4, 4)), "{e:?}"); + } + #[test] fn rle_repeat_run_past_row_width_is_an_error() { // 4 × 1 gray 8-bit; the single row is a 128-byte repeat run. From 5bba2c23d2dd59293b34dd63ac2911441b031687 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 16:03:31 -0500 Subject: [PATCH 10/13] Delegate BMP header recognition to shared codecs --- Cargo.lock | 65 ++++++++++++++++++++++++++++++++++++++ crates/codecs/Cargo.toml | 2 ++ crates/codecs/src/sniff.rs | 22 ++++++++++--- 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7412025a1..0aa32e16ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1209,6 +1209,14 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-dds" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +dependencies = [ + "rayon", +] + [[package]] name = "craft-docpath" version = "0.1.0" @@ -1297,6 +1305,33 @@ dependencies = [ "zune-jpegxl", ] +[[package]] +name = "craft-image-codecs" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +dependencies = [ + "craft-dds", + "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", + "crc32fast", + "exr", + "flate2", + "half", + "hayro-jpeg2000", + "image", + "image-webp", + "jpeg-encoder 0.6.1", + "png", + "rayon", + "serde_json", + "thiserror 2.0.21", + "tiff", + "zune-core", + "zune-jpeg", + "zune-jpegxl", +] + [[package]] name = "craft-image-codecs" version = "0.1.0" @@ -1340,6 +1375,14 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-jpeg" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +dependencies = [ + "thiserror 2.0.21", +] + [[package]] name = "craft-jpeg" version = "0.1.0" @@ -1378,6 +1421,18 @@ dependencies = [ "serde", ] +[[package]] +name = "craft-metadata" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +dependencies = [ + "brotli-decompressor 6.0.1", + "chrono", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", + "quick-xml 0.41.0", + "serde", +] + [[package]] name = "craft-metadata" version = "0.1.0" @@ -1455,6 +1510,15 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-tiff" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-tiff" version = "0.1.0" @@ -3969,6 +4033,7 @@ dependencies = [ "craft-gif", "craft-heif", "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a)", + "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=478c50560d3c6fad3d613af2a30b35c3bc9f4c0f)", "craft-jxl", diff --git a/crates/codecs/Cargo.toml b/crates/codecs/Cargo.toml index bdb0e5ebce..ff564c18c7 100644 --- a/crates/codecs/Cargo.toml +++ b/crates/codecs/Cargo.toml @@ -16,6 +16,8 @@ craft-gainmap = { workspace = true } craft-cms = { workspace = true } craft-jpeg = { workspace = true } craft-image-codecs = { workspace = true } +# Isolate BMP routing until the shared prerequisite lands; other codec pins stay unchanged. +craft-bmp-header = { package = "craft-image-codecs", git = "https://github.com/storytold/craft-libs", rev = "be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8", default-features = false } craft-metadata = { workspace = true } craft-tiff = { workspace = true } craft-gif = { workspace = true } diff --git a/crates/codecs/src/sniff.rs b/crates/codecs/src/sniff.rs index 5bc5c40278..09ea7b4ca7 100644 --- a/crates/codecs/src/sniff.rs +++ b/crates/codecs/src/sniff.rs @@ -130,11 +130,8 @@ pub fn sniff(b: &[u8]) -> Option { if b.starts_with(b"II+\0") || b.starts_with(b"MM\0+") { return Some(Format::Tiff); } - if b.len() >= 26 && b.starts_with(b"BM") { - let dib = u32::from_le_bytes([b[14], b[15], b[16], b[17]]); - if matches!(dib, 12 | 16 | 40 | 52 | 56 | 64 | 108 | 124) { - return Some(Format::Bmp); - } + if craft_bmp_header::bmp_probe::is_supported_header(b) { + return Some(Format::Bmp); } None } @@ -221,6 +218,21 @@ fn tiff_is_raw(b: &[u8]) -> bool { mod tests { use super::*; + #[test] + fn bmp_routing_retains_supported_dib_and_truncation_rules() { + let mut b = [0_u8; 26]; + b[..2].copy_from_slice(b"BM"); + for dib in [12_u32, 16, 40, 52, 56, 64, 108, 124] { + b[14..18].copy_from_slice(&dib.to_le_bytes()); + assert_eq!(sniff(&b), Some(Format::Bmp)); + assert_eq!(sniff(&b[..25]), None); + } + for dib in [0_u32, 13, 39, 125, u32::MAX] { + b[14..18].copy_from_slice(&dib.to_le_bytes()); + assert_eq!(sniff(&b), None); + } + } + #[test] fn magic_numbers() { assert_eq!(sniff(b"\xFF\xD8\xFF\xE0\0\x10JFIF"), Some(Format::Jpeg)); From ad2d5ae7de329729bfbb0a09fe3f7eeff06e441e Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 16:06:54 -0500 Subject: [PATCH 11/13] Regenerate Flatpak sources for shared BMP routing --- packaging/linux/flatpak/cargo-sources.json | 98 +++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/packaging/linux/flatpak/cargo-sources.json b/packaging/linux/flatpak/cargo-sources.json index 2a326941c3..f9f159307b 100644 --- a/packaging/linux/flatpak/cargo-sources.json +++ b/packaging/linux/flatpak/cargo-sources.json @@ -17,6 +17,12 @@ "commit": "c28356d400aed7575b04ec1551b4665107cfe845", "dest": "flatpak-cargo/git/craft-libs-c28356d" }, + { + "type": "git", + "url": "https://github.com/storytold/craft-libs", + "commit": "be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8", + "dest": "flatpak-cargo/git/craft-libs-be8f06f" + }, { "type": "git", "url": "https://github.com/storytold/craft-libs", @@ -1651,6 +1657,24 @@ "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-crw", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/dds\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-dds\"" + ] + }, + { + "type": "inline", + "contents": "[package]\nname = \"craft-dds\"\ndescription = \"DirectDraw Surface (DDS) textures: uncompressed and BC1-BC5 block compression, read and write, without dependencies\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\ndefault = []\nparallel = [\"dep:rayon\"]\n\n[dependencies.rayon]\noptional = true\nversion = \"1\"\n", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-dds", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-dds", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -1777,6 +1801,24 @@ "dest": "cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545/craft-image-codecs", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/image-codecs\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-image-codecs\"" + ] + }, + { + "type": "inline", + "contents": "[package]\nname = \"craft-image-codecs\"\ndescription = \"Bounded, depth- and metadata-preserving codecs for flat raster image formats\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\ncorpus = []\ndefault = []\nthreads = [\"ravif?/threading\", \"rav1e?/threading\"]\nsgi = []\nsunraster = []\navif = [\"image/avif\", \"dep:ravif\", \"dep:rav1e\", \"dep:avif-serialize\"]\nheif = [\"dep:craft-heif\"]\navif-decode = [\"dep:craft-video\", \"craft-video/av1-decode\"]\n\n[dependencies]\ncrc32fast = \"1.5\"\nthiserror = \"2\"\npng = \"0.18\"\nhalf = \"2\"\nserde_json = \"1\"\nimage-webp = \"0.2\"\nzune-jpeg = \"0.5\"\nzune-core = \"0.5\"\njpeg-encoder = \"0.6\"\n\n[dependencies.craft-dds]\npath = \"crates/dds\"\n\n[dependencies.image]\nversion = \"0.25\"\ndefault-features = false\nfeatures = [\"png\", \"jpeg\", \"tiff\", \"gif\", \"bmp\", \"tga\", \"ico\", \"qoi\", \"hdr\"]\n\n[dependencies.tiff]\nversion = \"0.11\"\ndefault-features = false\nfeatures = [\"deflate\", \"fax\", \"jpeg\", \"lzw\"]\n\n[dependencies.exr]\nversion = \"1.73\"\ndefault-features = false\n\n[dependencies.flate2]\nversion = \"1.1.10\"\ndefault-features = false\nfeatures = [\"zlib-rs\", \"runtime_detection\"]\n\n[dependencies.craft-jpeg]\npath = \"crates/jpeg\"\n\n[dependencies.craft-metadata]\npath = \"crates/metadata\"\n\n[dependencies.craft-tiff]\npath = \"crates/tiff\"\n\n[dependencies.zune-jpegxl]\nversion = \"=0.5.2\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dependencies.craft-heif]\noptional = true\npath = \"crates/heif\"\n\n[dependencies.ravif]\nversion = \"0.13\"\ndefault-features = false\noptional = true\n\n[dependencies.rav1e]\nversion = \"0.8\"\ndefault-features = false\noptional = true\n\n[dependencies.avif-serialize]\nversion = \"0.8\"\noptional = true\n\n[dependencies.hayro-jpeg2000]\nversion = \"=0.3.5\"\ndefault-features = false\nfeatures = [\"std\", \"simd\"]\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies]\nrayon = \"1\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies.craft-dds]\nfeatures = [\"parallel\"]\npath = \"crates/dds\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies.craft-video]\noptional = true\npath = \"crates/video\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies.exr]\nversion = \"1.73\"\ndefault-features = false\nfeatures = [\"rayon\"]\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dev-dependencies.craft-video]\nfeatures = [\"av1-decode\"]\npath = \"crates/video\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dev-dependencies.jxl-oxide]\nversion = \"=0.12.6\"\ndefault-features = false\nfeatures = [\"rayon\"]\n\n[dev-dependencies]\nproptest = \"1\"\n\n[dev-dependencies.image]\nversion = \"0.25\"\ndefault-features = false\nfeatures = [\"png\", \"jpeg\", \"tiff\"]\n\n[dev-dependencies.sha2]\nversion = \"0.10\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dev-dependencies.craft-media-testkit]\npath = \"crates/media-testkit\"\n", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-image-codecs", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-image-codecs", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -1831,6 +1873,24 @@ "dest": "cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545/craft-jpeg", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/jpeg\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-jpeg\"" + ] + }, + { + "type": "inline", + "contents": "[package]\nname = \"craft-jpeg\"\ndescription = \"Clean-room JPEG decoder and 8-bit optimized baseline encoder (ITU-T T.81).\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[dependencies]\nthiserror = \"2\"\n\n[dependencies.rayon]\noptional = true\nversion = \"1\"\n\n[dev-dependencies]\njpeg-encoder = \"0.6\"\nzune-jpeg = \"0.5\"\njpeg-decoder = \"0.3\"\n\n[features]\ndefault = []\nparallel = [\"dep:rayon\"]\n", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-jpeg", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-jpeg", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -1903,6 +1963,24 @@ "dest": "cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545/craft-metadata", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/metadata\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-metadata\"" + ] + }, + { + "type": "inline", + "contents": "[package]\nname = \"craft-metadata\"\ndescription = \"Photo metadata: EXIF, IPTC-IIM, XMP packets (read, write, merge) and GPX track logs, the blocks that carry them in JPEG, PNG, WebP, TIFF and CR3 files, and one model they all read into.\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[dependencies]\nquick-xml = \"0.41\"\n\n[dependencies.craft-tiff]\npath = \"crates/tiff\"\n\n[dependencies.serde]\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[dependencies.chrono]\nversion = \"0.4.45\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dependencies.brotli-decompressor]\nversion = \"6\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dev-dependencies]\nproptest = \"1\"\nserde_json = \"1\"\n\n[dev-dependencies.brotli]\nversion = \"9\"\ndefault-features = false\nfeatures = [\"std\"]\n", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-metadata", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-metadata", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -2029,6 +2107,24 @@ "dest": "cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545/craft-tiff", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/tiff\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-tiff\"" + ] + }, + { + "type": "inline", + "contents": "[package]\nname = \"craft-tiff\"\ndescription = \"TIFF and BigTIFF IFD reader and writer: every field type, the Exif/GPS/Interop pointer IFDs, maker-note IFDs, strip and tile layout.\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[dependencies]\nthiserror = \"2\"\n\n[dependencies.serde]\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[dev-dependencies]\nproptest = \"1\"\n", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-tiff", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-tiff", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -10209,7 +10305,7 @@ }, { "type": "inline", - "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=7f30d664695cd5ce14fc30659d36c3e32f234247\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\nrev = \"7f30d664695cd5ce14fc30659d36c3e32f234247\"\n\n[source.git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44]\ndirectory = \"cargo/vendor-git/7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\nrev = \"f0f4758c01581d79577b9bf5046c06f4e77b1f18\"\n\n[source.git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7]\ndirectory = \"cargo/vendor-git/bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\nrev = \"c28356d400aed7575b04ec1551b4665107cfe845\"\n\n[source.git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801]\ndirectory = \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\nrev = \"c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"\n\n[source.git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298]\ndirectory = \"cargo/vendor-git/11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=9dcbd90c7d16e1a668b3afa057e940e2db328b93\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\nrev = \"9dcbd90c7d16e1a668b3afa057e940e2db328b93\"\n\n[source.git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61]\ndirectory = \"cargo/vendor-git/36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=b77af389f30bb10de10d8436ca9b39fe94e3bb67\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\nrev = \"b77af389f30bb10de10d8436ca9b39fe94e3bb67\"\n\n[source.git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc]\ndirectory = \"cargo/vendor-git/a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\nrev = \"5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"\n\n[source.git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545]\ndirectory = \"cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\nrev = \"478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"\n\n[source.git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2]\ndirectory = \"cargo/vendor-git/cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5c91598ccc86537a779f438d520fa6406c26efe6\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\nrev = \"5c91598ccc86537a779f438d520fa6406c26efe6\"\n\n[source.git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c]\ndirectory = \"cargo/vendor-git/6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\nrev = \"0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"\n\n[source.git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30]\ndirectory = \"cargo/vendor-git/fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=bea6ed1ff031b81df2d64be470485c1ca808847e\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\nrev = \"bea6ed1ff031b81df2d64be470485c1ca808847e\"\n\n[source.git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040]\ndirectory = \"cargo/vendor-git/32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=16d838105b07965832bb43132880176f299634d5\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\nrev = \"16d838105b07965832bb43132880176f299634d5\"\n\n[source.git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03]\ndirectory = \"cargo/vendor-git/879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\nrev = \"6e03f65bf45181db77ba6229716e6624db9eb25b\"\n\n[source.git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba]\ndirectory = \"cargo/vendor-git/4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\n\n[source.\"https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a\"]\ngit = \"https://github.com/storytold/egui\"\nreplace-with = \"git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\nrev = \"6d518fc799681571963842f95b55a6b68431b15a\"\n\n[source.git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6]\ndirectory = \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\n\n[source.\"https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc\"]\ngit = \"https://github.com/storytold/winit\"\nreplace-with = \"git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\nrev = \"a517b3846ee8457d84ee4975110bfda6797c44dc\"\n\n[source.git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9]\ndirectory = \"cargo/vendor-git/9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\n", + "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=7f30d664695cd5ce14fc30659d36c3e32f234247\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\nrev = \"7f30d664695cd5ce14fc30659d36c3e32f234247\"\n\n[source.git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44]\ndirectory = \"cargo/vendor-git/7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\nrev = \"f0f4758c01581d79577b9bf5046c06f4e77b1f18\"\n\n[source.git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7]\ndirectory = \"cargo/vendor-git/bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\nrev = \"c28356d400aed7575b04ec1551b4665107cfe845\"\n\n[source.git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801]\ndirectory = \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\"\nrev = \"be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8\"\n\n[source.git-vendor-b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50]\ndirectory = \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\nrev = \"c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"\n\n[source.git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298]\ndirectory = \"cargo/vendor-git/11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=9dcbd90c7d16e1a668b3afa057e940e2db328b93\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\nrev = \"9dcbd90c7d16e1a668b3afa057e940e2db328b93\"\n\n[source.git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61]\ndirectory = \"cargo/vendor-git/36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=b77af389f30bb10de10d8436ca9b39fe94e3bb67\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\nrev = \"b77af389f30bb10de10d8436ca9b39fe94e3bb67\"\n\n[source.git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc]\ndirectory = \"cargo/vendor-git/a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\nrev = \"5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"\n\n[source.git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545]\ndirectory = \"cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\nrev = \"478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"\n\n[source.git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2]\ndirectory = \"cargo/vendor-git/cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5c91598ccc86537a779f438d520fa6406c26efe6\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\nrev = \"5c91598ccc86537a779f438d520fa6406c26efe6\"\n\n[source.git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c]\ndirectory = \"cargo/vendor-git/6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\nrev = \"0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"\n\n[source.git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30]\ndirectory = \"cargo/vendor-git/fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=bea6ed1ff031b81df2d64be470485c1ca808847e\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\nrev = \"bea6ed1ff031b81df2d64be470485c1ca808847e\"\n\n[source.git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040]\ndirectory = \"cargo/vendor-git/32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=16d838105b07965832bb43132880176f299634d5\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\nrev = \"16d838105b07965832bb43132880176f299634d5\"\n\n[source.git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03]\ndirectory = \"cargo/vendor-git/879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\nrev = \"6e03f65bf45181db77ba6229716e6624db9eb25b\"\n\n[source.git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba]\ndirectory = \"cargo/vendor-git/4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\n\n[source.\"https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a\"]\ngit = \"https://github.com/storytold/egui\"\nreplace-with = \"git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\nrev = \"6d518fc799681571963842f95b55a6b68431b15a\"\n\n[source.git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6]\ndirectory = \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\n\n[source.\"https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc\"]\ngit = \"https://github.com/storytold/winit\"\nreplace-with = \"git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\nrev = \"a517b3846ee8457d84ee4975110bfda6797c44dc\"\n\n[source.git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9]\ndirectory = \"cargo/vendor-git/9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\n", "dest": "cargo", "dest-filename": "config" } From 4c119c1f5c6c367c1f393d7c5d0eaaf3f9f3ace1 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 18:01:34 -0500 Subject: [PATCH 12/13] Pin BMP routing to merged shared implementation --- Cargo.lock | 20 ++++++------ crates/codecs/Cargo.toml | 2 +- packaging/linux/flatpak/cargo-sources.json | 36 +++++++++++----------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0aa32e16ff..890821b09f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1212,7 +1212,7 @@ dependencies = [ [[package]] name = "craft-dds" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +source = "git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6#a9efd722b49924588448fba5c59f36d3aee3f4c6" dependencies = [ "rayon", ] @@ -1308,12 +1308,12 @@ dependencies = [ [[package]] name = "craft-image-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +source = "git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6#a9efd722b49924588448fba5c59f36d3aee3f4c6" dependencies = [ "craft-dds", - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", + "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6)", "crc32fast", "exr", "flate2", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "craft-jpeg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +source = "git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6#a9efd722b49924588448fba5c59f36d3aee3f4c6" dependencies = [ "thiserror 2.0.21", ] @@ -1424,11 +1424,11 @@ dependencies = [ [[package]] name = "craft-metadata" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +source = "git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6#a9efd722b49924588448fba5c59f36d3aee3f4c6" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6)", "quick-xml 0.41.0", "serde", ] @@ -1513,7 +1513,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8#be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8" +source = "git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6#a9efd722b49924588448fba5c59f36d3aee3f4c6" dependencies = [ "serde", "thiserror 2.0.21", @@ -4033,7 +4033,7 @@ dependencies = [ "craft-gif", "craft-heif", "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a)", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8)", + "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6)", "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=478c50560d3c6fad3d613af2a30b35c3bc9f4c0f)", "craft-jxl", diff --git a/crates/codecs/Cargo.toml b/crates/codecs/Cargo.toml index ff564c18c7..d751adb5c5 100644 --- a/crates/codecs/Cargo.toml +++ b/crates/codecs/Cargo.toml @@ -17,7 +17,7 @@ craft-cms = { workspace = true } craft-jpeg = { workspace = true } craft-image-codecs = { workspace = true } # Isolate BMP routing until the shared prerequisite lands; other codec pins stay unchanged. -craft-bmp-header = { package = "craft-image-codecs", git = "https://github.com/storytold/craft-libs", rev = "be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8", default-features = false } +craft-bmp-header = { package = "craft-image-codecs", git = "https://github.com/storytold/craft-libs", rev = "a9efd722b49924588448fba5c59f36d3aee3f4c6", default-features = false } craft-metadata = { workspace = true } craft-tiff = { workspace = true } craft-gif = { workspace = true } diff --git a/packaging/linux/flatpak/cargo-sources.json b/packaging/linux/flatpak/cargo-sources.json index f9f159307b..a710cda658 100644 --- a/packaging/linux/flatpak/cargo-sources.json +++ b/packaging/linux/flatpak/cargo-sources.json @@ -20,8 +20,8 @@ { "type": "git", "url": "https://github.com/storytold/craft-libs", - "commit": "be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8", - "dest": "flatpak-cargo/git/craft-libs-be8f06f" + "commit": "a9efd722b49924588448fba5c59f36d3aee3f4c6", + "dest": "flatpak-cargo/git/craft-libs-a9efd72" }, { "type": "git", @@ -1660,19 +1660,19 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/dds\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-dds\"" + "mkdir -p \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-a9efd72/crates/dds\" \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-dds\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-dds\"\ndescription = \"DirectDraw Surface (DDS) textures: uncompressed and BC1-BC5 block compression, read and write, without dependencies\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\ndefault = []\nparallel = [\"dep:rayon\"]\n\n[dependencies.rayon]\noptional = true\nversion = \"1\"\n", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-dds", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-dds", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-dds", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-dds", "dest-filename": ".cargo-checksum.json" }, { @@ -1804,19 +1804,19 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/image-codecs\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-image-codecs\"" + "mkdir -p \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-a9efd72/crates/image-codecs\" \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-image-codecs\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-image-codecs\"\ndescription = \"Bounded, depth- and metadata-preserving codecs for flat raster image formats\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\ncorpus = []\ndefault = []\nthreads = [\"ravif?/threading\", \"rav1e?/threading\"]\nsgi = []\nsunraster = []\navif = [\"image/avif\", \"dep:ravif\", \"dep:rav1e\", \"dep:avif-serialize\"]\nheif = [\"dep:craft-heif\"]\navif-decode = [\"dep:craft-video\", \"craft-video/av1-decode\"]\n\n[dependencies]\ncrc32fast = \"1.5\"\nthiserror = \"2\"\npng = \"0.18\"\nhalf = \"2\"\nserde_json = \"1\"\nimage-webp = \"0.2\"\nzune-jpeg = \"0.5\"\nzune-core = \"0.5\"\njpeg-encoder = \"0.6\"\n\n[dependencies.craft-dds]\npath = \"crates/dds\"\n\n[dependencies.image]\nversion = \"0.25\"\ndefault-features = false\nfeatures = [\"png\", \"jpeg\", \"tiff\", \"gif\", \"bmp\", \"tga\", \"ico\", \"qoi\", \"hdr\"]\n\n[dependencies.tiff]\nversion = \"0.11\"\ndefault-features = false\nfeatures = [\"deflate\", \"fax\", \"jpeg\", \"lzw\"]\n\n[dependencies.exr]\nversion = \"1.73\"\ndefault-features = false\n\n[dependencies.flate2]\nversion = \"1.1.10\"\ndefault-features = false\nfeatures = [\"zlib-rs\", \"runtime_detection\"]\n\n[dependencies.craft-jpeg]\npath = \"crates/jpeg\"\n\n[dependencies.craft-metadata]\npath = \"crates/metadata\"\n\n[dependencies.craft-tiff]\npath = \"crates/tiff\"\n\n[dependencies.zune-jpegxl]\nversion = \"=0.5.2\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dependencies.craft-heif]\noptional = true\npath = \"crates/heif\"\n\n[dependencies.ravif]\nversion = \"0.13\"\ndefault-features = false\noptional = true\n\n[dependencies.rav1e]\nversion = \"0.8\"\ndefault-features = false\noptional = true\n\n[dependencies.avif-serialize]\nversion = \"0.8\"\noptional = true\n\n[dependencies.hayro-jpeg2000]\nversion = \"=0.3.5\"\ndefault-features = false\nfeatures = [\"std\", \"simd\"]\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies]\nrayon = \"1\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies.craft-dds]\nfeatures = [\"parallel\"]\npath = \"crates/dds\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies.craft-video]\noptional = true\npath = \"crates/video\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies.exr]\nversion = \"1.73\"\ndefault-features = false\nfeatures = [\"rayon\"]\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dev-dependencies.craft-video]\nfeatures = [\"av1-decode\"]\npath = \"crates/video\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dev-dependencies.jxl-oxide]\nversion = \"=0.12.6\"\ndefault-features = false\nfeatures = [\"rayon\"]\n\n[dev-dependencies]\nproptest = \"1\"\n\n[dev-dependencies.image]\nversion = \"0.25\"\ndefault-features = false\nfeatures = [\"png\", \"jpeg\", \"tiff\"]\n\n[dev-dependencies.sha2]\nversion = \"0.10\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dev-dependencies.craft-media-testkit]\npath = \"crates/media-testkit\"\n", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-image-codecs", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-image-codecs", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-image-codecs", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-image-codecs", "dest-filename": ".cargo-checksum.json" }, { @@ -1876,19 +1876,19 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/jpeg\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-jpeg\"" + "mkdir -p \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-a9efd72/crates/jpeg\" \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-jpeg\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-jpeg\"\ndescription = \"Clean-room JPEG decoder and 8-bit optimized baseline encoder (ITU-T T.81).\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[dependencies]\nthiserror = \"2\"\n\n[dependencies.rayon]\noptional = true\nversion = \"1\"\n\n[dev-dependencies]\njpeg-encoder = \"0.6\"\nzune-jpeg = \"0.5\"\njpeg-decoder = \"0.3\"\n\n[features]\ndefault = []\nparallel = [\"dep:rayon\"]\n", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-jpeg", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-jpeg", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-jpeg", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-jpeg", "dest-filename": ".cargo-checksum.json" }, { @@ -1966,19 +1966,19 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/metadata\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-metadata\"" + "mkdir -p \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-a9efd72/crates/metadata\" \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-metadata\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-metadata\"\ndescription = \"Photo metadata: EXIF, IPTC-IIM, XMP packets (read, write, merge) and GPX track logs, the blocks that carry them in JPEG, PNG, WebP, TIFF and CR3 files, and one model they all read into.\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[dependencies]\nquick-xml = \"0.41\"\n\n[dependencies.craft-tiff]\npath = \"crates/tiff\"\n\n[dependencies.serde]\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[dependencies.chrono]\nversion = \"0.4.45\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dependencies.brotli-decompressor]\nversion = \"6\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dev-dependencies]\nproptest = \"1\"\nserde_json = \"1\"\n\n[dev-dependencies.brotli]\nversion = \"9\"\ndefault-features = false\nfeatures = [\"std\"]\n", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-metadata", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-metadata", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-metadata", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-metadata", "dest-filename": ".cargo-checksum.json" }, { @@ -2110,19 +2110,19 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-be8f06f/crates/tiff\" \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-tiff\"" + "mkdir -p \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-a9efd72/crates/tiff\" \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-tiff\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-tiff\"\ndescription = \"TIFF and BigTIFF IFD reader and writer: every field type, the Exif/GPS/Interop pointer IFDs, maker-note IFDs, strip and tile layout.\"\nversion = \"0.1.0\"\nedition = \"2024\"\nlicense = \"MIT OR Apache-2.0\"\nrust-version = \"1.95\"\nrepository = \"https://github.com/storytold/craft-libs\"\n\n[lints.rust]\nunsafe_code = \"forbid\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[dependencies]\nthiserror = \"2\"\n\n[dependencies.serde]\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[dev-dependencies]\nproptest = \"1\"\n", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-tiff", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-tiff", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50/craft-tiff", + "dest": "cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68/craft-tiff", "dest-filename": ".cargo-checksum.json" }, { @@ -10305,7 +10305,7 @@ }, { "type": "inline", - "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=7f30d664695cd5ce14fc30659d36c3e32f234247\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\nrev = \"7f30d664695cd5ce14fc30659d36c3e32f234247\"\n\n[source.git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44]\ndirectory = \"cargo/vendor-git/7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\nrev = \"f0f4758c01581d79577b9bf5046c06f4e77b1f18\"\n\n[source.git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7]\ndirectory = \"cargo/vendor-git/bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\nrev = \"c28356d400aed7575b04ec1551b4665107cfe845\"\n\n[source.git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801]\ndirectory = \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\"\nrev = \"be8f06f1fc39addaba8cf5e015b6f21a50eaa6a8\"\n\n[source.git-vendor-b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50]\ndirectory = \"cargo/vendor-git/b83351f86beea407db10400cef4b359e68870b4926e26b9230220ef1aabfec50\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\nrev = \"c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"\n\n[source.git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298]\ndirectory = \"cargo/vendor-git/11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=9dcbd90c7d16e1a668b3afa057e940e2db328b93\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\nrev = \"9dcbd90c7d16e1a668b3afa057e940e2db328b93\"\n\n[source.git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61]\ndirectory = \"cargo/vendor-git/36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=b77af389f30bb10de10d8436ca9b39fe94e3bb67\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\nrev = \"b77af389f30bb10de10d8436ca9b39fe94e3bb67\"\n\n[source.git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc]\ndirectory = \"cargo/vendor-git/a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\nrev = \"5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"\n\n[source.git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545]\ndirectory = \"cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\nrev = \"478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"\n\n[source.git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2]\ndirectory = \"cargo/vendor-git/cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5c91598ccc86537a779f438d520fa6406c26efe6\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\nrev = \"5c91598ccc86537a779f438d520fa6406c26efe6\"\n\n[source.git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c]\ndirectory = \"cargo/vendor-git/6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\nrev = \"0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"\n\n[source.git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30]\ndirectory = \"cargo/vendor-git/fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=bea6ed1ff031b81df2d64be470485c1ca808847e\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\nrev = \"bea6ed1ff031b81df2d64be470485c1ca808847e\"\n\n[source.git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040]\ndirectory = \"cargo/vendor-git/32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=16d838105b07965832bb43132880176f299634d5\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\nrev = \"16d838105b07965832bb43132880176f299634d5\"\n\n[source.git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03]\ndirectory = \"cargo/vendor-git/879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\nrev = \"6e03f65bf45181db77ba6229716e6624db9eb25b\"\n\n[source.git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba]\ndirectory = \"cargo/vendor-git/4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\n\n[source.\"https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a\"]\ngit = \"https://github.com/storytold/egui\"\nreplace-with = \"git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\nrev = \"6d518fc799681571963842f95b55a6b68431b15a\"\n\n[source.git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6]\ndirectory = \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\n\n[source.\"https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc\"]\ngit = \"https://github.com/storytold/winit\"\nreplace-with = \"git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\nrev = \"a517b3846ee8457d84ee4975110bfda6797c44dc\"\n\n[source.git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9]\ndirectory = \"cargo/vendor-git/9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\n", + "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=7f30d664695cd5ce14fc30659d36c3e32f234247\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\nrev = \"7f30d664695cd5ce14fc30659d36c3e32f234247\"\n\n[source.git-vendor-7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44]\ndirectory = \"cargo/vendor-git/7afa30ca311804d863bbc144ec2c79a3a321ce72c30264402ae2c6af8a05da44\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\nrev = \"f0f4758c01581d79577b9bf5046c06f4e77b1f18\"\n\n[source.git-vendor-bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7]\ndirectory = \"cargo/vendor-git/bc00bd22a20692df38f25839a8568cd55b90e379a41719721bbc0f04fe5e29f7\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\nrev = \"c28356d400aed7575b04ec1551b4665107cfe845\"\n\n[source.git-vendor-547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801]\ndirectory = \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=a9efd722b49924588448fba5c59f36d3aee3f4c6\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68\"\nrev = \"a9efd722b49924588448fba5c59f36d3aee3f4c6\"\n\n[source.git-vendor-124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68]\ndirectory = \"cargo/vendor-git/124b9d456ca3dbd86aff02b2333e69095d237bd512841c5bc17c9a7b93c3bb68\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\nrev = \"c5a1cbfb5f9049f9270955caffb5bee5997aebf7\"\n\n[source.git-vendor-11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298]\ndirectory = \"cargo/vendor-git/11a22760e699d74db2deeccbdb390b343ad010ce425dcb15451f0e14e45ff298\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=9dcbd90c7d16e1a668b3afa057e940e2db328b93\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\nrev = \"9dcbd90c7d16e1a668b3afa057e940e2db328b93\"\n\n[source.git-vendor-36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61]\ndirectory = \"cargo/vendor-git/36bf00be069421f8a8a7428c4360efee8b4243207a59d7b566c6f48fc5918f61\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=b77af389f30bb10de10d8436ca9b39fe94e3bb67\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\nrev = \"b77af389f30bb10de10d8436ca9b39fe94e3bb67\"\n\n[source.git-vendor-a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc]\ndirectory = \"cargo/vendor-git/a51e2c3f46af71f1caed91009f88b4f9982db0c4152c6659d11967a7731b1ccc\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\nrev = \"5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a\"\n\n[source.git-vendor-9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545]\ndirectory = \"cargo/vendor-git/9100d311acc530b0286234c55b78dbdc0325d5e30950478c5c7864bfed7a4545\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\nrev = \"478c50560d3c6fad3d613af2a30b35c3bc9f4c0f\"\n\n[source.git-vendor-cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2]\ndirectory = \"cargo/vendor-git/cb31475a7a9d19c00f48b4c43603f2f1a464c6dce15da1d21bba4c653eeba6b2\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=5c91598ccc86537a779f438d520fa6406c26efe6\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\nrev = \"5c91598ccc86537a779f438d520fa6406c26efe6\"\n\n[source.git-vendor-6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c]\ndirectory = \"cargo/vendor-git/6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\nrev = \"0fd30aeb3e02207d9d4c7c601540d9da45abf8de\"\n\n[source.git-vendor-fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30]\ndirectory = \"cargo/vendor-git/fafb086755da4e9bf32b4ac1b53a42a6017167d56ec0071462788465fa35eb30\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=bea6ed1ff031b81df2d64be470485c1ca808847e\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\nrev = \"bea6ed1ff031b81df2d64be470485c1ca808847e\"\n\n[source.git-vendor-32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040]\ndirectory = \"cargo/vendor-git/32c3b4109a3afdabed8bce488e027fa99fcc1b06e4fbe9ee85802b6b73337040\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=16d838105b07965832bb43132880176f299634d5\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\nrev = \"16d838105b07965832bb43132880176f299634d5\"\n\n[source.git-vendor-879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03]\ndirectory = \"cargo/vendor-git/879b5ad1e55c0c2de1d740528f2a8f8e2ffec953302517957e516331e9525f03\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\nrev = \"6e03f65bf45181db77ba6229716e6624db9eb25b\"\n\n[source.git-vendor-4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba]\ndirectory = \"cargo/vendor-git/4765c8f813a43ec0005270c9f4b16bff2eb2e09aeb15e4230bcd10e5bba1c4ba\"\n\n[source.\"https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a\"]\ngit = \"https://github.com/storytold/egui\"\nreplace-with = \"git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\nrev = \"6d518fc799681571963842f95b55a6b68431b15a\"\n\n[source.git-vendor-11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6]\ndirectory = \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\"\n\n[source.\"https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc\"]\ngit = \"https://github.com/storytold/winit\"\nreplace-with = \"git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\nrev = \"a517b3846ee8457d84ee4975110bfda6797c44dc\"\n\n[source.git-vendor-9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9]\ndirectory = \"cargo/vendor-git/9c7f809a50c4212d761a5b6359c5e4a02fcf86376d330a441c4ce9d112706ee9\"\n", "dest": "cargo", "dest-filename": "config" } From c3c8e93b20ded69eaa4c2b9bfbfcab7d2340fe14 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 18 Nov 2026 09:10:59 -0500 Subject: [PATCH 13/13] fix(codecs): gate the legacy EXIF walker to tests Merging main left the app-owned TIFF walker without non-test callers, so clippy's dead_code lint failed the gate. The walker is still the oracle for the shared-summary compatibility test. --- crates/codecs/src/exif.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/codecs/src/exif.rs b/crates/codecs/src/exif.rs index 79f4d52753..1f8496af91 100644 --- a/crates/codecs/src/exif.rs +++ b/crates/codecs/src/exif.rs @@ -2,12 +2,14 @@ //! thumbnail, colour-space hint). Full EXIF parsing lives in `lightcraft-meta`. /// Byte-order aware reader over a TIFF-structured blob. +#[cfg(test)] #[derive(Clone, Copy)] pub(crate) struct Tiff<'a> { pub data: &'a [u8], le: bool, } +#[cfg(test)] #[derive(Clone, Copy, Debug)] pub(crate) struct Entry { pub tag: u16, @@ -17,6 +19,7 @@ pub(crate) struct Entry { pub value_pos: usize, } +#[cfg(test)] impl<'a> Tiff<'a> { pub fn new(data: &'a [u8]) -> Option> { let le = match data.get(0..2)? {