From fc3fd541b0449a66b7b3cb5a247d119613b5a1da Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:40:31 +0000 Subject: [PATCH 01/24] Use shared JPEG EOI and SEF repair --- Cargo.lock | 27 ++++--- Cargo.toml | 4 +- crates/codecs/src/jpeg.rs | 148 ++++++++++---------------------------- 3 files changed, 58 insertions(+), 121 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 98d0d10626..4e2a69d81f 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=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "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=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" dependencies = [ "thiserror 2.0.21", ] @@ -1307,11 +1309,11 @@ dependencies = [ [[package]] name = "craft-metadata" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff#149e74d739443d22fabb877745dad665f51c5eff" +source = "git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", "quick-xml 0.41.0", "serde", ] @@ -1360,7 +1362,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff#149e74d739443d22fabb877745dad665f51c5eff" +source = "git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" dependencies = [ "serde", "thiserror 2.0.21", @@ -3054,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" @@ -3854,7 +3865,7 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", @@ -4090,7 +4101,7 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index 33112fe8b7..93a3805faa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,8 @@ craft-cms = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01 craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", features = ["frames"] } 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 = "149e74d739443d22fabb877745dad665f51c5eff" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01581d79577b9bf5046c06f4e77b1f18" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "5da1f0c521143adaeb1829afa65ef36d623823ef" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "5da1f0c521143adaeb1829afa65ef36d623823ef" } 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/jpeg.rs b/crates/codecs/src/jpeg.rs index 9f6fc9506a..24cc4fbfb5 100644 --- a/crates/codecs/src/jpeg.rs +++ b/crates/codecs/src/jpeg.rs @@ -3,6 +3,7 @@ use crate::convert::{Buf, Meta, Model, Raw, check_size, finish}; use crate::{DecodeOptions, Decoded, Error, Format, Result, Thumbnail, ThumbnailSource, exif}; +use craft_image_codecs::jpeg_sef::{reaches_eoi, repair as without_sef_trailer}; const F: Format = Format::Jpeg; @@ -42,88 +43,6 @@ pub(crate) fn header(bytes: &[u8]) -> Result<(u32, u32, u16)> { Ok((m.width, m.height, orientation)) } -/// Whether the markers after SOI, followed through every segment and scan, reach an EOI marker -/// (the first one: the primary image's, ahead of any MPF images appended to the file). Segments -/// are skipped by their length; in scan data `FF 00` (stuffing), `FF FF` (fill) and RSTn are not -/// markers that end it. -fn reaches_eoi(b: &[u8]) -> bool { - let mut p = 2usize; - loop { - // entropy-coded data (or garbage between segments, as `parse_markers` tolerates it) - let Some(skip) = b.get(p..).and_then(find_ff) else { return false }; - p = p.saturating_add(skip); - let Some(&marker) = b.get(p.saturating_add(1)) else { return false }; - p = match marker { - 0xD9 => return true, - 0xFF => p.saturating_add(1), - 0x00 | 0x01 | 0xD0..=0xD8 => p.saturating_add(2), - _ => { - let Some(len) = b.get(p.saturating_add(2)..p.saturating_add(4)).map(|l| u16::from_be_bytes([l[0], l[1]]) as usize) else { - return false; - }; - if len < 2 { - return false; - } - p.saturating_add(2).saturating_add(len) - } - }; - } -} - -/// A Samsung panorama whose scan runs straight into its SEF trailer, with no EOI marker (issue -/// #3350), as the file it stands for: the bytes before the trailer's earliest data block plus an -/// EOI. Every other file, a genuinely truncated one included, is borrowed unchanged. -fn without_sef_trailer(bytes: &[u8]) -> std::borrow::Cow<'_, [u8]> { - use std::borrow::Cow; - // The trailer is checked first: it reads only the file's last bytes, not the scan data. - let Some(image) = sef_image_end(bytes).and_then(|end| bytes.get(..end)) else { return Cow::Borrowed(bytes) }; - // the image before the trailer: an FF D9 inside the SEF data doesn't end the scan - if reaches_eoi(image) { - return Cow::Borrowed(bytes); - } - let mut fixed = Vec::with_capacity(image.len().saturating_add(2)); - fixed.extend_from_slice(image); - fixed.extend_from_slice(&[0xFF, 0xD9]); - // The cut must leave the scan data, not a segment or anything before the first scan, open. - let in_scan = parse_markers(&fixed).is_some_and(|m| m.first_scan_components > 0) && reaches_eoi(&fixed); - if in_scan { Cow::Owned(fixed) } else { Cow::Borrowed(bytes) } -} - -/// Where the image ends in a file carrying a Samsung SEF trailer: the start of its earliest data -/// block. The trailer is the file's last bytes: `SEFH`, a u32 LE version and entry count, 12-byte -/// entries (u16 padding, u16 type, u32 LE offset of the block back from `SEFH`, u32 LE length), -/// then the u32 LE length of that directory and `SEFT`. Each block starts with the same padding -/// and type as its entry. `None` unless every entry's block is nonempty, starts with its entry's -/// type and lies inside the file, before `SEFH`. -fn sef_image_end(b: &[u8]) -> Option { - let le32 = |at: usize| b.get(at..at.checked_add(4)?)?.try_into().ok().map(|v| u32::from_le_bytes(v) as usize); - let tail = b.len().checked_sub(8)?; - if b.get(tail.checked_add(4)?..)? != b"SEFT" { - return None; - } - let dir = tail.checked_sub(le32(tail)?)?; - if b.get(dir..dir.checked_add(4)?)? != b"SEFH" { - return None; - } - let count = le32(dir.checked_add(8)?)?; - let entries = dir.checked_add(12)?; - if count == 0 || count > tail.checked_sub(entries)? / 12 { - return None; - } - let mut start = dir; - for i in 0..count { - let entry = entries.checked_add(i.checked_mul(12)?)?; - let block = dir.checked_sub(le32(entry.checked_add(4)?)?)?; - let len = le32(entry.checked_add(8)?)?; - let kind = |at: usize| b.get(at.checked_add(2)?..at.checked_add(4)?); - if len < 4 || block.checked_add(len)? > dir || kind(block)? != kind(entry)? { - return None; - } - start = start.min(block); - } - Some(start) -} - pub(crate) fn decode_with_fallback(bytes: &[u8], opts: &DecodeOptions, fallback: Option) -> Result { let bytes = &*without_sef_trailer(bytes); let m = parse_markers(bytes).ok_or_else(|| Error::Malformed(F, "missing SOI".into()))?; @@ -179,21 +98,6 @@ fn decode_via_craft_codecs(bytes: &[u8], budget: &DecodeOptions) -> Result Ok(Raw { width: w, height: h, model, alpha: false, premultiplied: false, buf, bit_depth }) } -/// The first `0xFF` byte, eight bytes at a time (scan data has one every few hundred bytes: this -/// is most of [`header`]'s time). -fn find_ff(b: &[u8]) -> Option { - const ONES: u64 = 0x0101_0101_0101_0101; - let (words, tail) = b.as_chunks::<8>(); - for (i, w) in words.iter().enumerate() { - // a zero byte in !w is an 0xFF byte in w - let x = !u64::from_ne_bytes(*w); - if x.wrapping_sub(ONES) & !x & (ONES << 7) != 0 { - return w.iter().position(|&v| v == 0xFF).map(|j| i * 8 + j); - } - } - tail.iter().position(|&v| v == 0xFF).map(|j| words.len() * 8 + j) -} - /// Fast path: an embedded JPEG preview (EXIF IFD1 thumbnail, or the largest MPF preview) whose long /// edge is ≥ `max_edge`, decoded with DCT scaling and fitted. pub(crate) fn embedded_thumbnail(bytes: &[u8], max_edge: u32, min_edge: u32) -> Option { @@ -275,6 +179,42 @@ pub(crate) fn decode_codes8(bytes: &[u8]) -> Result<(usize, usize, usize, Vec bool { + let mut p = 2usize; + loop { + let Some(skip) = b.get(p..).and_then(|s| s.iter().position(|&v| v == 0xff)) else { return false }; + p = p.saturating_add(skip); + let Some(&marker) = b.get(p.saturating_add(1)) else { return false }; + p = match marker { + 0xd9 => return true, + 0xff => p.saturating_add(1), + 0x00 | 0x01 | 0xd0..=0xd8 => p.saturating_add(2), + _ => { + let Some(len) = b.get(p.saturating_add(2)..p.saturating_add(4)).map(|s| u16::from_be_bytes([s[0], s[1]]) as usize) else { + return false; + }; + if len < 2 { + return false; + } + p.saturating_add(2).saturating_add(len) + } + }; + } + } + let base = [0xff, 0xd8, 0xff, 0xe1, 0, 4, 1, 2, 0xff, 0xda, 0, 3, 1, 1, 0xff, 0, 3, 0xff, 0xd0, 4, 0xff, 0xd9]; + for end in 0..=base.len() { + for at in 0..end { + for value in [0, 1, 0xff, 0xd9] { + let mut bytes = base[..end].to_vec(); + bytes[at] = value; + assert_eq!(reaches_eoi(&bytes), previous(&bytes), "end {end}, at {at}, value {value}"); + } + } + } + } + #[test] fn mpf_shared_matches_previous_reader_on_mutated_indices() { fn previous(base: usize, data: &[u8]) -> Vec { @@ -453,20 +393,6 @@ mod tests { assert!(markers.icc_invalid); } - #[test] - fn find_ff_matches_a_plain_search() { - let mut b: Vec = (0..300u32).map(|i| (i * 7 % 255) as u8).collect(); - for at in [None, Some(0), Some(7), Some(8), Some(15), Some(203), Some(296), Some(299)] { - if let Some(i) = at { - b[i] = 0xFF; - } - for start in [0, 1, 5, 9, 290, 299, 300] { - let s = &b[start..]; - assert_eq!(find_ff(s), s.iter().position(|&v| v == 0xFF), "{at:?} from {start}"); - } - } - } - #[test] fn unbounded_fit_box_decodes_at_full_size() { // a full-size load asks for the largest box (`usize::MAX` saturated to `u32::MAX`): no DCT scaling, From 9c879fa1419267e20ec8b0bcd49fcea9c00c17f0 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:49:49 +0000 Subject: [PATCH 02/24] Use shared verbatim metadata helpers --- Cargo.lock | 16 ++--- Cargo.toml | 4 +- crates/codecs/src/encode.rs | 127 ++++++------------------------------ 3 files changed, 31 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e2a69d81f..4f86fe93e6 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=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" +source = "git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", "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=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" +source = "git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" 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=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" +source = "git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", "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=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" +source = "git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" dependencies = [ "serde", "thiserror 2.0.21", @@ -3865,7 +3865,7 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", @@ -4101,7 +4101,7 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index 93a3805faa..3abe8b3bf1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,8 @@ craft-cms = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01 craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", features = ["frames"] } 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 = "5da1f0c521143adaeb1829afa65ef36d623823ef" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "5da1f0c521143adaeb1829afa65ef36d623823ef" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "a99e47639e63552863d23696229704fa458c71a7" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "a99e47639e63552863d23696229704fa458c71a7" } 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/encode.rs b/crates/codecs/src/encode.rs index fb848ea2b9..4f5dd22d9b 100644 --- a/crates/codecs/src/encode.rs +++ b/crates/codecs/src/encode.rs @@ -81,46 +81,25 @@ pub enum ChromaSubsampling { S420, } -const XMP_NS: &[u8] = b"http://ns.adobe.com/xap/1.0/\0"; - -/// The APP segments [`encode_jpeg`] writes for `meta` (marker byte, payload): JFIF density, EXIF, -/// XMP and the ICC profile in chunks, in that order. -pub(crate) fn jpeg_app_segments(meta: &EncodeMeta) -> Result)>> { - let mut segs: Vec<(u8, Vec)> = Vec::new(); - let ppi = meta.ppi.filter(|p| *p > 0).map_or([0u8, 0, 1, 0, 1], |p| { - let [hi, lo] = p.to_be_bytes(); - [1, hi, lo, hi, lo] - }); - segs.push((0xE0, [&b"JFIF\0\x01\x02"[..], &ppi, &[0, 0]].concat())); - if let Some(exif) = meta.exif { - if exif.len() > 65_527 { - return Err(Error::Encode("EXIF larger than one APP1 segment (64 KiB)".into())); - } - segs.push((0xE1, [&b"Exif\0\0"[..], exif].concat())); +fn metadata_error(error: craft_image_codecs::CodecError) -> Error { + match error { + craft_image_codecs::CodecError::Encode { message, .. } => Error::Encode(message), + other => Error::Encode(other.to_string()), } - if let Some(xmp) = meta.xmp { - segs.push((0xE1, xmp_segment(xmp)?)); - } - if let Some(icc) = meta.icc { - // ICC.1 Annex B.4: "ICC_PROFILE\0", 1-based chunk number, chunk count - let chunks: Vec<&[u8]> = icc.chunks(65_519).collect(); - if chunks.len() > 255 { - return Err(Error::Encode("ICC profile too large for JPEG".into())); - } - for (i, c) in chunks.iter().enumerate() { - segs.push((0xE2, [&b"ICC_PROFILE\0"[..], &[i as u8 + 1, chunks.len() as u8], c].concat())); - } - } - Ok(segs) } -/// An APP1 XMP payload (namespace + packet), refusing packets larger than one segment. +pub(crate) fn jpeg_app_segments(meta: &EncodeMeta) -> Result)>> { + craft_image_codecs::raw_metadata::jpeg_segments(craft_image_codecs::raw_metadata::JpegMetadata { + exif: meta.exif, + xmp: meta.xmp, + icc: meta.icc, + ppi: meta.ppi, + }) + .map_err(metadata_error) +} + pub(crate) fn xmp_segment(xmp: &str) -> Result> { - let seg = [XMP_NS, xmp.as_bytes()].concat(); - if seg.len() > 65_533 { - return Err(Error::Encode("XMP larger than one APP1 segment (extended XMP not supported)".into())); - } - Ok(seg) + craft_image_codecs::raw_metadata::jpeg_xmp(xmp).map_err(metadata_error) } /// Encode baseline JPEG (8-bit; alpha is dropped). `quality` 1..=100. @@ -151,10 +130,8 @@ pub fn encode_jpeg(img: &EncodeImage, quality: u8, subsampling: ChromaSubsamplin { return Err(Error::Encode("EXIF larger than one APP1 segment (64 KiB)".into())); } - if let Some(xmp) = meta.xmp - && XMP_NS.len() + xmp.len() > 65_533 - { - return Err(Error::Encode("XMP larger than one APP1 segment (extended XMP not supported)".into())); + if let Some(xmp) = meta.xmp { + xmp_segment(xmp)?; } let (layout, rgb_data): (craft_image_codecs::ChannelLayout, Vec) = match img.channels { 1 => (craft_image_codecs::ChannelLayout::Gray, data[..n].to_vec()), @@ -169,11 +146,8 @@ pub fn encode_jpeg(img: &EncodeImage, quality: u8, subsampling: ChromaSubsamplin ic_img.meta.dpi = meta.ppi.filter(|&p| p > 0).map(|p| (p as f32, p as f32)); let ic_opts = craft_image_codecs::EncodeOptions { jpeg_quality: quality.clamp(1, 100), jpeg_chroma_subsampling: true, ..Default::default() }; let mut out = craft_image_codecs::encode(&ic_img, craft_image_codecs::Format::Jpeg, &ic_opts).map_err(|e| Error::Encode(e.to_string()))?; - if let Some(exif) = meta.exif - && let Some(pos) = out.windows(6).position(|w| w == b"Exif\0\0") - && let Some(dst) = out.get_mut(pos + 6..pos + 6 + exif.len()) - { - dst.copy_from_slice(exif); + if let Some(exif) = meta.exif { + craft_image_codecs::raw_metadata::replace_jpeg_exif(&mut out, exif); } Ok(out) } @@ -201,29 +175,11 @@ pub fn encode_png(img: &EncodeImage, meta: &EncodeMeta) -> Result> { let ic_opts = craft_image_codecs::EncodeOptions { png_compression: craft_image_codecs::PngCompression::Fast, ..Default::default() }; let mut out = craft_image_codecs::encode(&ic_img, craft_image_codecs::Format::Png, &ic_opts).map_err(|e| Error::Encode(e.to_string()))?; if let Some(exif) = meta.exif { - replace_png_exif_chunk(&mut out, exif); + craft_image_codecs::raw_metadata::replace_png_exif(&mut out, exif).map_err(metadata_error)?; } Ok(out) } -/// Replace the `eXIf` chunk in an encoded PNG so caller-supplied EXIF (including non-1 -/// orientation tags) is preserved verbatim. -fn replace_png_exif_chunk(png: &mut Vec, exif: &[u8]) { - let mut p = 8usize; - while let Some(len_bytes) = png.get(p..p + 4) { - let len = u32::from_be_bytes([len_bytes[0], len_bytes[1], len_bytes[2], len_bytes[3]]) as usize; - let end = p.saturating_add(12).saturating_add(len); - if end > png.len() { - break; - } - if png.get(p + 4..p + 8) == Some(b"eXIf") { - png.splice(p..end, png_chunk(*b"eXIf", exif)); - return; - } - p = end; - } -} - /// TIFF compression. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] pub enum TiffCompression { @@ -290,36 +246,11 @@ pub fn encode_webp_lossless(img: &EncodeImage, meta: &EncodeMeta) -> Result, exif: &[u8]) { - let mut p = 12usize; - while let Some(h) = webp.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); - let padded_end = end.saturating_add(size & 1); - if &h[0..4] == b"EXIF" && padded_end <= webp.len() { - let mut replacement = Vec::with_capacity(8 + exif.len() + (exif.len() & 1)); - replacement.extend_from_slice(b"EXIF"); - replacement.extend_from_slice(&(exif.len() as u32).to_le_bytes()); - replacement.extend_from_slice(exif); - if exif.len() & 1 == 1 { - replacement.push(0); - } - webp.splice(p..padded_end, replacement); - let riff_size = (webp.len().saturating_sub(8)) as u32; - webp[4..8].copy_from_slice(&riff_size.to_le_bytes()); - return; - } - p = padded_end; - } -} - /// Encode AVIF (sRGB, 4:4:4, 10-bit AV1) with `ravif` (rav1e). 8-bit samples are widened by the /// encoder; 16-bit samples keep 10 bits of precision (BT.601 full-range YCbCr computed here). /// `quality` 1..=100, `speed` 1 (slow) ..= 10. EXIF is embedded; ICC is not supported by the muxer @@ -569,22 +500,6 @@ pub fn encode_png_pq(width: u32, height: u32, rgb: &[f32], meta: &EncodeMeta) -> craft_image_codecs::encode_png_pq(&image, &options).map_err(|e| Error::Encode(e.to_string())) } -fn png_chunk(kind: [u8; 4], data: &[u8]) -> Vec { - let mut out = Vec::with_capacity(12 + data.len()); - out.extend_from_slice(&(data.len() as u32).to_be_bytes()); - out.extend_from_slice(&kind); - out.extend_from_slice(data); - let mut crc = 0xFFFF_FFFFu32; - for &b in &out[4..] { - crc ^= u32::from(b); - for _ in 0..8 { - crc = if crc & 1 != 0 { (crc >> 1) ^ 0xEDB8_8320 } else { crc >> 1 }; - } - } - out.extend_from_slice(&(!crc).to_be_bytes()); - out -} - /// 16-bit RGB(A) → 10-bit BT.601 full-range YCbCr planes (the matrix `ravif` uses for 8-bit input). #[cfg(all(feature = "avif", not(target_arch = "wasm32")))] fn avif_10bit(enc: &ravif::Encoder, img: &EncodeImage, s: &[u16]) -> Result> { From 16b80d6c87a6b87940e5159d0761047aa2d98155 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:52:26 +0000 Subject: [PATCH 03/24] Pin metadata mutation coverage --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f86fe93e6..f762f5feda 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=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" +source = "git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", "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=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" +source = "git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" 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=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" +source = "git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", "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=a99e47639e63552863d23696229704fa458c71a7#a99e47639e63552863d23696229704fa458c71a7" +source = "git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" dependencies = [ "serde", "thiserror 2.0.21", @@ -3865,7 +3865,7 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", @@ -4101,7 +4101,7 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a99e47639e63552863d23696229704fa458c71a7)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index 3abe8b3bf1..c5130c4526 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,8 @@ craft-cms = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01 craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", features = ["frames"] } 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 = "a99e47639e63552863d23696229704fa458c71a7" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "a99e47639e63552863d23696229704fa458c71a7" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "a152abdb8be4817339fb02fabf81bb38d4c4c7ff" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "a152abdb8be4817339fb02fabf81bb38d4c4c7ff" } 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 ebb1c4d044a3e15bc29e6638655437e08cfc3951 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:53:57 +0000 Subject: [PATCH 04/24] Pin default EXIF normalization regression --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f762f5feda..e5d53dd276 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=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" +source = "git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", "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=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" +source = "git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" 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=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" +source = "git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", "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=a152abdb8be4817339fb02fabf81bb38d4c4c7ff#a152abdb8be4817339fb02fabf81bb38d4c4c7ff" +source = "git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" dependencies = [ "serde", "thiserror 2.0.21", @@ -3865,7 +3865,7 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", @@ -4101,7 +4101,7 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a152abdb8be4817339fb02fabf81bb38d4c4c7ff)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index c5130c4526..ae7de77395 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,8 @@ craft-cms = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01 craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", features = ["frames"] } 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 = "a152abdb8be4817339fb02fabf81bb38d4c4c7ff" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "a152abdb8be4817339fb02fabf81bb38d4c4c7ff" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "1ef2c5359dc671fb6ca7f851a623a9a919b5867c" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "1ef2c5359dc671fb6ca7f851a623a9a919b5867c" } 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 f85d3ecf2247222a8cfce3eb45dd0082c8a24edc Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 16:55:51 +0000 Subject: [PATCH 05/24] Pin JPEG ICC boundary coverage --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5d53dd276..06181e54fd 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=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" +source = "git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1#3a28181f0e8aaade4e7dd5fc712dd1fec58499a1" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1)", "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=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" +source = "git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1#3a28181f0e8aaade4e7dd5fc712dd1fec58499a1" 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=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" +source = "git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1#3a28181f0e8aaade4e7dd5fc712dd1fec58499a1" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1)", "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=1ef2c5359dc671fb6ca7f851a623a9a919b5867c#1ef2c5359dc671fb6ca7f851a623a9a919b5867c" +source = "git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1#3a28181f0e8aaade4e7dd5fc712dd1fec58499a1" dependencies = [ "serde", "thiserror 2.0.21", @@ -3865,7 +3865,7 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", @@ -4101,7 +4101,7 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1ef2c5359dc671fb6ca7f851a623a9a919b5867c)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a28181f0e8aaade4e7dd5fc712dd1fec58499a1)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index ae7de77395..1a7cc7a284 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,8 @@ craft-cms = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01 craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", features = ["frames"] } 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 = "1ef2c5359dc671fb6ca7f851a623a9a919b5867c" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "1ef2c5359dc671fb6ca7f851a623a9a919b5867c" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "3a28181f0e8aaade4e7dd5fc712dd1fec58499a1" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "3a28181f0e8aaade4e7dd5fc712dd1fec58499a1" } 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 4383e6f362e4746f828626fae177aabb0e215a63 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:28:27 +0000 Subject: [PATCH 06/24] Delegate TIFF RAW classification to shared codecs --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- crates/codecs/src/exif.rs | 3 +++ crates/codecs/src/sniff.rs | 26 +++++++++++++++++++++++++- 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e54612419..78bcc6471e 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=42abc84c82cd573e2fb0277298caffecb7bee905#42abc84c82cd573e2fb0277298caffecb7bee905" +source = "git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=42abc84c82cd573e2fb0277298caffecb7bee905)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", "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=42abc84c82cd573e2fb0277298caffecb7bee905#42abc84c82cd573e2fb0277298caffecb7bee905" +source = "git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" 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=42abc84c82cd573e2fb0277298caffecb7bee905#42abc84c82cd573e2fb0277298caffecb7bee905" +source = "git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=42abc84c82cd573e2fb0277298caffecb7bee905)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", "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=42abc84c82cd573e2fb0277298caffecb7bee905#42abc84c82cd573e2fb0277298caffecb7bee905" +source = "git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" dependencies = [ "serde", "thiserror 2.0.21", @@ -3865,7 +3865,7 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=42abc84c82cd573e2fb0277298caffecb7bee905)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", @@ -4101,7 +4101,7 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=42abc84c82cd573e2fb0277298caffecb7bee905)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index 82af4ae968..a112aefe71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,8 @@ craft-cms = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01 craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", features = ["frames"] } 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 = "42abc84c82cd573e2fb0277298caffecb7bee905" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "42abc84c82cd573e2fb0277298caffecb7bee905" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "1fb21f048785bba73b5ba604ec61cf5fb69367b0" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "1fb21f048785bba73b5ba604ec61cf5fb69367b0" } 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/exif.rs b/crates/codecs/src/exif.rs index b3e45fef68..f9b84cde9d 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)? { diff --git a/crates/codecs/src/sniff.rs b/crates/codecs/src/sniff.rs index 5bc5c40278..181f271038 100644 --- a/crates/codecs/src/sniff.rs +++ b/crates/codecs/src/sniff.rs @@ -1,5 +1,6 @@ //! Format detection from leading bytes. +#[cfg(test)] use crate::exif::Tiff; use serde::{Deserialize, Serialize}; @@ -125,7 +126,7 @@ pub fn sniff(b: &[u8]) -> Option { return Some(Format::RawTiffLike); } if b.starts_with(b"II*\0") || b.starts_with(b"MM\0*") { - return Some(if tiff_is_raw(b) { Format::RawTiffLike } else { Format::Tiff }); + return Some(if craft_image_codecs::legacy_tiff_raw_hint(b) { Format::RawTiffLike } else { Format::Tiff }); } if b.starts_with(b"II+\0") || b.starts_with(b"MM\0+") { return Some(Format::Tiff); @@ -167,6 +168,7 @@ fn sniff_bmff(b: &[u8]) -> Option { /// Heuristic camera-raw detection for classic TIFF: DNGVersion, the CR2 signature, CFA/LinearRaw /// photometric or raw-only compressions in IFD0 or its SubIFDs, or a camera Make with 10–16-bit data /// and no ordinary photometric. +#[cfg(test)] fn tiff_is_raw(b: &[u8]) -> bool { if b.len() >= 10 && &b[8..10] == b"CR" { return true; @@ -221,6 +223,28 @@ fn tiff_is_raw(b: &[u8]) -> bool { mod tests { use super::*; + #[test] + fn raw_tiff_classifier_matches_legacy_on_mutations() { + let fixtures: &[&[u8]] = &[ + b"II*\0\x08\0\0\0\x01\0\x12\xc6\x01\0\x04\0\0\0\x01\x04\0\0\0\0\0\0", + b"II*\0\x08\0\0\0\x01\0\x03\x01\x03\0\x01\0\0\0\x09\x80\0\0\0\0\0\0", + b"II*\0\x10\0\0\0CR\x02\0", + ]; + for fixture in fixtures { + for end in 0..=fixture.len() { + let bytes = &fixture[..end]; + assert_eq!(craft_image_codecs::legacy_tiff_raw_hint(bytes), tiff_is_raw(bytes), "truncation {end}"); + for i in 0..bytes.len() { + for value in [0, 255] { + let mut changed = bytes.to_vec(); + changed[i] = value; + assert_eq!(craft_image_codecs::legacy_tiff_raw_hint(&changed), tiff_is_raw(&changed), "byte {i} value {value} length {end}"); + } + } + } + } + } + #[test] fn magic_numbers() { assert_eq!(sniff(b"\xFF\xD8\xFF\xE0\0\x10JFIF"), Some(Format::Jpeg)); From 867adf87f5b8b76bcf4505cdb33a574ce3f0c2c1 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:29:14 +0000 Subject: [PATCH 07/24] Retain TIFF reader for remaining thumbnail route --- crates/codecs/src/exif.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/crates/codecs/src/exif.rs b/crates/codecs/src/exif.rs index f9b84cde9d..b3e45fef68 100644 --- a/crates/codecs/src/exif.rs +++ b/crates/codecs/src/exif.rs @@ -2,14 +2,12 @@ //! 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, @@ -19,7 +17,6 @@ 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)? { From 1898478f4df1444a85bae662ce41d0b6b4f79861 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:31:00 +0000 Subject: [PATCH 08/24] Limit legacy scalar helper to tests --- crates/codecs/src/exif.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/codecs/src/exif.rs b/crates/codecs/src/exif.rs index b3e45fef68..79f4d52753 100644 --- a/crates/codecs/src/exif.rs +++ b/crates/codecs/src/exif.rs @@ -57,6 +57,7 @@ impl<'a> Tiff<'a> { Some((v, next)) } /// First value of a SHORT/LONG entry. + #[cfg(test)] pub fn uint(&self, e: &Entry) -> Option { match e.typ { 3 => self.u16_at(e.value_pos).map(u32::from), From 646895e2afdb998b7c7e21aa3b457aaa49855199 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:46:43 +0000 Subject: [PATCH 09/24] Delegate first IFD orientation to shared metadata --- Cargo.toml | 4 ++-- crates/meta/src/exif.rs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a112aefe71..a8e5e84bf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,8 @@ craft-cms = { git = "https://github.com/storytold/craft-libs", rev = "f0f4758c01 craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f30bb10de10d8436ca9b39fe94e3bb67", features = ["frames"] } 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 = "1fb21f048785bba73b5ba604ec61cf5fb69367b0" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "1fb21f048785bba73b5ba604ec61cf5fb69367b0" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "8920871fe42baea05ad1e90acc9b47fb4f1fe7b7" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "8920871fe42baea05ad1e90acc9b47fb4f1fe7b7" } 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/meta/src/exif.rs b/crates/meta/src/exif.rs index ffc07f602f..c35b96856d 100644 --- a/crates/meta/src/exif.rs +++ b/crates/meta/src/exif.rs @@ -1,6 +1,6 @@ use crate::convert::{from_craft, to_craft}; use crate::{Metadata, Orientation}; -use craft_tiff::{ParseOptions, Tiff, TiffError, tags as t}; +use craft_tiff::{ParseOptions, Tiff, TiffError}; pub fn strip_exif_header(b: &[u8]) -> &[u8] { craft_metadata::strip_exif_header(b) @@ -27,8 +27,7 @@ pub fn write_exif(meta: &Metadata) -> Vec { } pub(crate) fn ifd0_orientation(bytes: &[u8]) -> Option { - let tiff = Tiff::parse(strip_exif_header(bytes)).ok()?; - tiff.ifds.first()?.u16(t::ORIENTATION).map(Orientation::from_exif) + craft_metadata::ifd0_orientation_compat(bytes).map(crate::convert::orientation_from_craft) } #[cfg(test)] From 637aec8144d296c6595ed00f19d4e6bbe682a0d4 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:46:56 +0000 Subject: [PATCH 10/24] Lock shared first IFD orientation API --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78bcc6471e..e270ecdcdb 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=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" +source = "git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7#8920871fe42baea05ad1e90acc9b47fb4f1fe7b7" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7)", "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=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" +source = "git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7#8920871fe42baea05ad1e90acc9b47fb4f1fe7b7" 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=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" +source = "git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7#8920871fe42baea05ad1e90acc9b47fb4f1fe7b7" dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7)", "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=1fb21f048785bba73b5ba604ec61cf5fb69367b0#1fb21f048785bba73b5ba604ec61cf5fb69367b0" +source = "git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7#8920871fe42baea05ad1e90acc9b47fb4f1fe7b7" dependencies = [ "serde", "thiserror 2.0.21", @@ -3865,7 +3865,7 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "dhat", @@ -4101,7 +4101,7 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1fb21f048785bba73b5ba604ec61cf5fb69367b0)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=8920871fe42baea05ad1e90acc9b47fb4f1fe7b7)", "craft-psd", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", "lightcraft-geom", From f62c7b21a79b3cae231b0edb7b00ff2d5904e5c6 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:49:33 +0000 Subject: [PATCH 11/24] Align TIFF revision with stacked metadata --- Cargo.lock | 45 ++++++++++++--------------------------------- Cargo.toml | 4 ++-- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c7137f13f..6adfafbeef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "craft-crw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff#149e74d739443d22fabb877745dad665f51c5eff" +source = "git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" dependencies = [ "thiserror 2.0.21", ] @@ -1269,7 +1269,7 @@ version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" dependencies = [ "craft-jpeg", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "craft-metadata", "crc32fast", "exr", "flate2", @@ -1313,19 +1313,7 @@ source = "git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829 dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", - "quick-xml 0.41.0", - "serde", -] - -[[package]] -name = "craft-metadata" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18#f0f4758c01581d79577b9bf5046c06f4e77b1f18" -dependencies = [ - "brotli-decompressor 6.0.1", - "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18)", + "craft-tiff", "quick-xml 0.41.0", "serde", ] @@ -1344,12 +1332,12 @@ dependencies = [ [[package]] name = "craft-raw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff#149e74d739443d22fabb877745dad665f51c5eff" +source = "git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef#5da1f0c521143adaeb1829afa65ef36d623823ef" dependencies = [ "chrono", "craft-crw", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-metadata", + "craft-tiff", "jxl-oxide", "miniz_oxide 0.9.1", "rayon", @@ -1368,15 +1356,6 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "craft-tiff" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9bf5046c06f4e77b1f18#f0f4758c01581d79577b9bf5046c06f4e77b1f18" -dependencies = [ - "serde", - "thiserror 2.0.21", -] - [[package]] name = "craft-ui" version = "0.1.0" @@ -3865,9 +3844,9 @@ dependencies = [ "craft-heif", "craft-image-codecs", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "craft-metadata", "craft-psd", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-tiff", "dhat", "jxl-oxide", "lightcraft-color", @@ -3944,7 +3923,7 @@ dependencies = [ "chrono", "craft-docpath", "craft-heif", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-tiff", "crc32fast", "fs4", "harfrust 0.13.3", @@ -4101,9 +4080,9 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5da1f0c521143adaeb1829afa65ef36d623823ef)", + "craft-metadata", "craft-psd", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-tiff", "lightcraft-geom", "proptest", "serde", @@ -4158,7 +4137,7 @@ dependencies = [ "chrono", "craft-image-codecs", "craft-raw", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=149e74d739443d22fabb877745dad665f51c5eff)", + "craft-tiff", "dhat", "lightcraft-color", "lightcraft-geom", diff --git a/Cargo.toml b/Cargo.toml index c915837ea6..3307f7f8ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,10 +38,10 @@ lightcraft-wincolor = { path = "crates/wincolor" } lightcraft-color = { path = "crates/color" } lightcraft-raster = { path = "crates/raster" } # TIFF/IFD: the shared reader and writer (moved from crates/tiff; craft-libs#783). -craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "149e74d739443d22fabb877745dad665f51c5eff" } +craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "5da1f0c521143adaeb1829afa65ef36d623823ef" } # Camera raw files, the format layer: every maker but CR3, ARW, RAF, RW2 and ORF (craft-libs#862 and the maker PRs). # On the same commit as craft-tiff: its errors and IFDs are shared. -craft-raw = { git = "https://github.com/storytold/craft-libs", rev = "149e74d739443d22fabb877745dad665f51c5eff" } +craft-raw = { git = "https://github.com/storytold/craft-libs", rev = "5da1f0c521143adaeb1829afa65ef36d623823ef" } lightcraft-raw = { path = "crates/raw" } lightcraft-codecs = { path = "crates/codecs" } lightcraft-meta = { path = "crates/meta" } From fc782216f4497f79a3d5427b37c97a311775a8e3 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 18:54:10 +0000 Subject: [PATCH 12/24] Keep RAW fixtures valid under shared container and strip bounds --- crates/raw/tests/it/cr3_variants.rs | 6 +++--- crates/raw/tests/it/crx_properties.rs | 5 ++--- crates/raw/tests/it/dng.rs | 3 ++- crates/raw/tests/it/robust.rs | 5 ++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/raw/tests/it/cr3_variants.rs b/crates/raw/tests/it/cr3_variants.rs index 54d7f8d9f2..fb6628561d 100644 --- a/crates/raw/tests/it/cr3_variants.rs +++ b/crates/raw/tests/it/cr3_variants.rs @@ -105,10 +105,10 @@ fn cr3_file(coding: &[u8], sample: &[u8]) -> Vec { let trak = box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))); let mut file = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); file.extend(box_bytes(b"moov", &trak)); - let offset = file.len(); - file.extend_from_slice(sample); - let at = file.len() - sample.len() - 8; // the co64 offset field ends the moov + let at = file.len() - 8; // the co64 offset field ends the moov + let offset = file.len() + 8; // samples belong to the mdat payload, after its header file[at..at + 8].copy_from_slice(&u64::try_from(offset).unwrap().to_be_bytes()); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/crx_properties.rs b/crates/raw/tests/it/crx_properties.rs index 30ff2dd195..215f2c3405 100644 --- a/crates/raw/tests/it/crx_properties.rs +++ b/crates/raw/tests/it/crx_properties.rs @@ -410,11 +410,10 @@ fn cr3_file(entry: &[u8], sample: &[u8]) -> Vec { // The track length does not depend on the offset value (always a 64-bit field), so it can be // measured with a placeholder before the real offset is known. let track_len = track_box(entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut file = ftyp; file.extend(box_bytes(b"moov", &track_box(entry, offset as u64, sample.len() as u32))); - file.resize(offset, 0); - file.extend_from_slice(sample); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/dng.rs b/crates/raw/tests/it/dng.rs index 79b1a15d40..7e6685bdb7 100644 --- a/crates/raw/tests/it/dng.rs +++ b/crates/raw/tests/it/dng.rs @@ -1016,7 +1016,8 @@ fn malformed_semantic_masks_are_skipped() { assert_eq!(decode(&bytes).unwrap().cpp, 3); let masks = lightcraft_raw::semantic_masks(&bytes); let names: Vec<&str> = masks.iter().map(|m| m.name.as_str()).collect(); - assert_eq!(names, ["short strip", "sub area too small"]); + // Truncated strip pixels are rejected by the shared reader instead of zero-filled. + assert_eq!(names, ["sub area too small"]); assert!(masks.iter().all(|m| m.sub_area.is_none()), "sub areas the mask doesn't fit are ignored"); for m in &masks { let d = m.developed(Rect::new(0, 0, 8, 6), Rect::new(0, 0, 8, 6)).unwrap(); diff --git a/crates/raw/tests/it/robust.rs b/crates/raw/tests/it/robust.rs index 3cd54e47e9..1d864da1df 100644 --- a/crates/raw/tests/it/robust.rs +++ b/crates/raw/tests/it/robust.rs @@ -231,11 +231,10 @@ mod cr3 { let entry = box_bytes(b"CRAW", &craw); let ftyp = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); let track_len = track(&entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut out = ftyp; out.extend(box_bytes(b"moov", &track(&entry, offset as u64, sample.len() as u32))); - out.resize(offset, 0); - out.extend_from_slice(sample); + out.extend(box_bytes(b"mdat", sample)); out } From 6bd59dbb43bb2b2c5e4068abc87dc271af802292 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 18:54:10 +0000 Subject: [PATCH 13/24] Keep RAW fixtures valid under shared container and strip bounds --- crates/raw/tests/it/cr3_variants.rs | 6 +++--- crates/raw/tests/it/crx_properties.rs | 5 ++--- crates/raw/tests/it/dng.rs | 3 ++- crates/raw/tests/it/robust.rs | 5 ++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/raw/tests/it/cr3_variants.rs b/crates/raw/tests/it/cr3_variants.rs index 54d7f8d9f2..fb6628561d 100644 --- a/crates/raw/tests/it/cr3_variants.rs +++ b/crates/raw/tests/it/cr3_variants.rs @@ -105,10 +105,10 @@ fn cr3_file(coding: &[u8], sample: &[u8]) -> Vec { let trak = box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))); let mut file = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); file.extend(box_bytes(b"moov", &trak)); - let offset = file.len(); - file.extend_from_slice(sample); - let at = file.len() - sample.len() - 8; // the co64 offset field ends the moov + let at = file.len() - 8; // the co64 offset field ends the moov + let offset = file.len() + 8; // samples belong to the mdat payload, after its header file[at..at + 8].copy_from_slice(&u64::try_from(offset).unwrap().to_be_bytes()); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/crx_properties.rs b/crates/raw/tests/it/crx_properties.rs index 30ff2dd195..215f2c3405 100644 --- a/crates/raw/tests/it/crx_properties.rs +++ b/crates/raw/tests/it/crx_properties.rs @@ -410,11 +410,10 @@ fn cr3_file(entry: &[u8], sample: &[u8]) -> Vec { // The track length does not depend on the offset value (always a 64-bit field), so it can be // measured with a placeholder before the real offset is known. let track_len = track_box(entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut file = ftyp; file.extend(box_bytes(b"moov", &track_box(entry, offset as u64, sample.len() as u32))); - file.resize(offset, 0); - file.extend_from_slice(sample); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/dng.rs b/crates/raw/tests/it/dng.rs index 79b1a15d40..7e6685bdb7 100644 --- a/crates/raw/tests/it/dng.rs +++ b/crates/raw/tests/it/dng.rs @@ -1016,7 +1016,8 @@ fn malformed_semantic_masks_are_skipped() { assert_eq!(decode(&bytes).unwrap().cpp, 3); let masks = lightcraft_raw::semantic_masks(&bytes); let names: Vec<&str> = masks.iter().map(|m| m.name.as_str()).collect(); - assert_eq!(names, ["short strip", "sub area too small"]); + // Truncated strip pixels are rejected by the shared reader instead of zero-filled. + assert_eq!(names, ["sub area too small"]); assert!(masks.iter().all(|m| m.sub_area.is_none()), "sub areas the mask doesn't fit are ignored"); for m in &masks { let d = m.developed(Rect::new(0, 0, 8, 6), Rect::new(0, 0, 8, 6)).unwrap(); diff --git a/crates/raw/tests/it/robust.rs b/crates/raw/tests/it/robust.rs index 3cd54e47e9..1d864da1df 100644 --- a/crates/raw/tests/it/robust.rs +++ b/crates/raw/tests/it/robust.rs @@ -231,11 +231,10 @@ mod cr3 { let entry = box_bytes(b"CRAW", &craw); let ftyp = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); let track_len = track(&entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut out = ftyp; out.extend(box_bytes(b"moov", &track(&entry, offset as u64, sample.len() as u32))); - out.resize(offset, 0); - out.extend_from_slice(sample); + out.extend(box_bytes(b"mdat", sample)); out } From a5756f84d4e05a5c45bdb8273f31be1c0bf7feca Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 18:54:10 +0000 Subject: [PATCH 14/24] Keep RAW fixtures valid under shared container and strip bounds --- crates/raw/tests/it/cr3_variants.rs | 6 +++--- crates/raw/tests/it/crx_properties.rs | 5 ++--- crates/raw/tests/it/dng.rs | 3 ++- crates/raw/tests/it/robust.rs | 5 ++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/raw/tests/it/cr3_variants.rs b/crates/raw/tests/it/cr3_variants.rs index 54d7f8d9f2..fb6628561d 100644 --- a/crates/raw/tests/it/cr3_variants.rs +++ b/crates/raw/tests/it/cr3_variants.rs @@ -105,10 +105,10 @@ fn cr3_file(coding: &[u8], sample: &[u8]) -> Vec { let trak = box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))); let mut file = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); file.extend(box_bytes(b"moov", &trak)); - let offset = file.len(); - file.extend_from_slice(sample); - let at = file.len() - sample.len() - 8; // the co64 offset field ends the moov + let at = file.len() - 8; // the co64 offset field ends the moov + let offset = file.len() + 8; // samples belong to the mdat payload, after its header file[at..at + 8].copy_from_slice(&u64::try_from(offset).unwrap().to_be_bytes()); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/crx_properties.rs b/crates/raw/tests/it/crx_properties.rs index 30ff2dd195..215f2c3405 100644 --- a/crates/raw/tests/it/crx_properties.rs +++ b/crates/raw/tests/it/crx_properties.rs @@ -410,11 +410,10 @@ fn cr3_file(entry: &[u8], sample: &[u8]) -> Vec { // The track length does not depend on the offset value (always a 64-bit field), so it can be // measured with a placeholder before the real offset is known. let track_len = track_box(entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut file = ftyp; file.extend(box_bytes(b"moov", &track_box(entry, offset as u64, sample.len() as u32))); - file.resize(offset, 0); - file.extend_from_slice(sample); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/dng.rs b/crates/raw/tests/it/dng.rs index 79b1a15d40..7e6685bdb7 100644 --- a/crates/raw/tests/it/dng.rs +++ b/crates/raw/tests/it/dng.rs @@ -1016,7 +1016,8 @@ fn malformed_semantic_masks_are_skipped() { assert_eq!(decode(&bytes).unwrap().cpp, 3); let masks = lightcraft_raw::semantic_masks(&bytes); let names: Vec<&str> = masks.iter().map(|m| m.name.as_str()).collect(); - assert_eq!(names, ["short strip", "sub area too small"]); + // Truncated strip pixels are rejected by the shared reader instead of zero-filled. + assert_eq!(names, ["sub area too small"]); assert!(masks.iter().all(|m| m.sub_area.is_none()), "sub areas the mask doesn't fit are ignored"); for m in &masks { let d = m.developed(Rect::new(0, 0, 8, 6), Rect::new(0, 0, 8, 6)).unwrap(); diff --git a/crates/raw/tests/it/robust.rs b/crates/raw/tests/it/robust.rs index 3cd54e47e9..1d864da1df 100644 --- a/crates/raw/tests/it/robust.rs +++ b/crates/raw/tests/it/robust.rs @@ -231,11 +231,10 @@ mod cr3 { let entry = box_bytes(b"CRAW", &craw); let ftyp = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); let track_len = track(&entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut out = ftyp; out.extend(box_bytes(b"moov", &track(&entry, offset as u64, sample.len() as u32))); - out.resize(offset, 0); - out.extend_from_slice(sample); + out.extend(box_bytes(b"mdat", sample)); out } From 715a9d226cf119d4bc48683ddbc8bc431ded2824 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 18:54:10 +0000 Subject: [PATCH 15/24] Keep RAW fixtures valid under shared container and strip bounds --- crates/raw/tests/it/cr3_variants.rs | 6 +++--- crates/raw/tests/it/crx_properties.rs | 5 ++--- crates/raw/tests/it/dng.rs | 3 ++- crates/raw/tests/it/robust.rs | 5 ++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/raw/tests/it/cr3_variants.rs b/crates/raw/tests/it/cr3_variants.rs index 54d7f8d9f2..fb6628561d 100644 --- a/crates/raw/tests/it/cr3_variants.rs +++ b/crates/raw/tests/it/cr3_variants.rs @@ -105,10 +105,10 @@ fn cr3_file(coding: &[u8], sample: &[u8]) -> Vec { let trak = box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))); let mut file = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); file.extend(box_bytes(b"moov", &trak)); - let offset = file.len(); - file.extend_from_slice(sample); - let at = file.len() - sample.len() - 8; // the co64 offset field ends the moov + let at = file.len() - 8; // the co64 offset field ends the moov + let offset = file.len() + 8; // samples belong to the mdat payload, after its header file[at..at + 8].copy_from_slice(&u64::try_from(offset).unwrap().to_be_bytes()); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/crx_properties.rs b/crates/raw/tests/it/crx_properties.rs index 30ff2dd195..215f2c3405 100644 --- a/crates/raw/tests/it/crx_properties.rs +++ b/crates/raw/tests/it/crx_properties.rs @@ -410,11 +410,10 @@ fn cr3_file(entry: &[u8], sample: &[u8]) -> Vec { // The track length does not depend on the offset value (always a 64-bit field), so it can be // measured with a placeholder before the real offset is known. let track_len = track_box(entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut file = ftyp; file.extend(box_bytes(b"moov", &track_box(entry, offset as u64, sample.len() as u32))); - file.resize(offset, 0); - file.extend_from_slice(sample); + file.extend(box_bytes(b"mdat", sample)); file } diff --git a/crates/raw/tests/it/dng.rs b/crates/raw/tests/it/dng.rs index 79b1a15d40..7e6685bdb7 100644 --- a/crates/raw/tests/it/dng.rs +++ b/crates/raw/tests/it/dng.rs @@ -1016,7 +1016,8 @@ fn malformed_semantic_masks_are_skipped() { assert_eq!(decode(&bytes).unwrap().cpp, 3); let masks = lightcraft_raw::semantic_masks(&bytes); let names: Vec<&str> = masks.iter().map(|m| m.name.as_str()).collect(); - assert_eq!(names, ["short strip", "sub area too small"]); + // Truncated strip pixels are rejected by the shared reader instead of zero-filled. + assert_eq!(names, ["sub area too small"]); assert!(masks.iter().all(|m| m.sub_area.is_none()), "sub areas the mask doesn't fit are ignored"); for m in &masks { let d = m.developed(Rect::new(0, 0, 8, 6), Rect::new(0, 0, 8, 6)).unwrap(); diff --git a/crates/raw/tests/it/robust.rs b/crates/raw/tests/it/robust.rs index 3cd54e47e9..1d864da1df 100644 --- a/crates/raw/tests/it/robust.rs +++ b/crates/raw/tests/it/robust.rs @@ -231,11 +231,10 @@ mod cr3 { let entry = box_bytes(b"CRAW", &craw); let ftyp = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); let track_len = track(&entry, 0, sample.len() as u32).len(); - let offset = (ftyp.len() + 8 + track_len + 7) & !7; + let offset = ftyp.len() + 8 + track_len + 8; // moov and mdat headers let mut out = ftyp; out.extend(box_bytes(b"moov", &track(&entry, offset as u64, sample.len() as u32))); - out.resize(offset, 0); - out.extend_from_slice(sample); + out.extend(box_bytes(b"mdat", sample)); out } From 614ca1b7c3371faa087e9bd263f14a79d16e0af8 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:26:37 -0500 Subject: [PATCH 16/24] test(raw): add valid CR3 sample-to-chunk mappings --- crates/raw/tests/it/cr3_variants.rs | 5 ++++- crates/raw/tests/it/crx_properties.rs | 5 ++++- crates/raw/tests/it/robust.rs | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/crates/raw/tests/it/cr3_variants.rs b/crates/raw/tests/it/cr3_variants.rs index fb6628561d..1da91d41cf 100644 --- a/crates/raw/tests/it/cr3_variants.rs +++ b/crates/raw/tests/it/cr3_variants.rs @@ -101,7 +101,10 @@ fn cr3_file(coding: &[u8], sample: &[u8]) -> Vec { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); // entry count co64.extend([0u8; 8]); // sample offset, patched once the layout is known - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); let trak = box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))); let mut file = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); file.extend(box_bytes(b"moov", &trak)); diff --git a/crates/raw/tests/it/crx_properties.rs b/crates/raw/tests/it/crx_properties.rs index 215f2c3405..5f99837394 100644 --- a/crates/raw/tests/it/crx_properties.rs +++ b/crates/raw/tests/it/crx_properties.rs @@ -399,7 +399,10 @@ fn track_box(entry: &[u8], offset: u64, size: u32) -> Vec { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); co64.extend(offset.to_be_bytes()); - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))) } diff --git a/crates/raw/tests/it/robust.rs b/crates/raw/tests/it/robust.rs index 1d864da1df..41a4ef302e 100644 --- a/crates/raw/tests/it/robust.rs +++ b/crates/raw/tests/it/robust.rs @@ -202,7 +202,10 @@ mod cr3 { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); co64.extend(offset.to_be_bytes()); - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))) } From 482ee7bac3158d215ae0e05dd628e852a37aca0f Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:37:25 -0500 Subject: [PATCH 17/24] Include sample-to-chunk mappings in CR3 fixtures --- crates/raw/tests/it/cr3_variants.rs | 5 ++++- crates/raw/tests/it/crx_properties.rs | 5 ++++- crates/raw/tests/it/robust.rs | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/crates/raw/tests/it/cr3_variants.rs b/crates/raw/tests/it/cr3_variants.rs index fb6628561d..1da91d41cf 100644 --- a/crates/raw/tests/it/cr3_variants.rs +++ b/crates/raw/tests/it/cr3_variants.rs @@ -101,7 +101,10 @@ fn cr3_file(coding: &[u8], sample: &[u8]) -> Vec { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); // entry count co64.extend([0u8; 8]); // sample offset, patched once the layout is known - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); let trak = box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))); let mut file = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); file.extend(box_bytes(b"moov", &trak)); diff --git a/crates/raw/tests/it/crx_properties.rs b/crates/raw/tests/it/crx_properties.rs index 215f2c3405..5f99837394 100644 --- a/crates/raw/tests/it/crx_properties.rs +++ b/crates/raw/tests/it/crx_properties.rs @@ -399,7 +399,10 @@ fn track_box(entry: &[u8], offset: u64, size: u32) -> Vec { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); co64.extend(offset.to_be_bytes()); - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))) } diff --git a/crates/raw/tests/it/robust.rs b/crates/raw/tests/it/robust.rs index 1d864da1df..41a4ef302e 100644 --- a/crates/raw/tests/it/robust.rs +++ b/crates/raw/tests/it/robust.rs @@ -202,7 +202,10 @@ mod cr3 { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); co64.extend(offset.to_be_bytes()); - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))) } From 70be4b19d47da65d17bd29c1cda8ca3098593739 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 17:37:27 -0500 Subject: [PATCH 18/24] Include sample-to-chunk mappings in CR3 fixtures --- crates/raw/tests/it/cr3_variants.rs | 5 ++++- crates/raw/tests/it/crx_properties.rs | 5 ++++- crates/raw/tests/it/robust.rs | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/crates/raw/tests/it/cr3_variants.rs b/crates/raw/tests/it/cr3_variants.rs index fb6628561d..1da91d41cf 100644 --- a/crates/raw/tests/it/cr3_variants.rs +++ b/crates/raw/tests/it/cr3_variants.rs @@ -101,7 +101,10 @@ fn cr3_file(coding: &[u8], sample: &[u8]) -> Vec { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); // entry count co64.extend([0u8; 8]); // sample offset, patched once the layout is known - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); let trak = box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))); let mut file = box_bytes(b"ftyp", b"crx \0\0\0\x01crx isom"); file.extend(box_bytes(b"moov", &trak)); diff --git a/crates/raw/tests/it/crx_properties.rs b/crates/raw/tests/it/crx_properties.rs index 215f2c3405..5f99837394 100644 --- a/crates/raw/tests/it/crx_properties.rs +++ b/crates/raw/tests/it/crx_properties.rs @@ -399,7 +399,10 @@ fn track_box(entry: &[u8], offset: u64, size: u32) -> Vec { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); co64.extend(offset.to_be_bytes()); - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))) } diff --git a/crates/raw/tests/it/robust.rs b/crates/raw/tests/it/robust.rs index 1d864da1df..41a4ef302e 100644 --- a/crates/raw/tests/it/robust.rs +++ b/crates/raw/tests/it/robust.rs @@ -202,7 +202,10 @@ mod cr3 { let mut co64 = vec![0u8; 4]; co64.extend(1u32.to_be_bytes()); co64.extend(offset.to_be_bytes()); - let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); + // One sample in chunk 1, using sample description 1. The shared parser + // deliberately refuses sample access without this mapping. + let stsc: Vec = [0u32, 1, 1, 1, 1].into_iter().flat_map(u32::to_be_bytes).collect(); + let tables = [box_bytes(b"stsd", &stsd), box_bytes(b"stsc", &stsc), box_bytes(b"stsz", &stsz), box_bytes(b"co64", &co64)].concat(); box_bytes(b"trak", &box_bytes(b"mdia", &box_bytes(b"minf", &box_bytes(b"stbl", &tables)))) } From b75c55e38b416d6ce8a6e430890a6e84a992315b Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 16 Nov 2026 11:21:32 +0100 Subject: [PATCH 19/24] codecs: cover the shared verbatim metadata helpers in the encoder --- crates/codecs/src/encode.rs | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/crates/codecs/src/encode.rs b/crates/codecs/src/encode.rs index d6b74b504c..0ad8fd3b9a 100644 --- a/crates/codecs/src/encode.rs +++ b/crates/codecs/src/encode.rs @@ -544,3 +544,67 @@ mod hlg_tests { assert!(encode_avif_hdr(0, 4, &[], 80, 10, &m, HdrTransfer::Hlg).is_err()); } } + +#[cfg(test)] +mod metadata_tests { + use super::*; + + /// Little-endian TIFF with one IFD0 entry, Orientation = 6 (the case the verbatim helpers exist for). + const ORIENTED_EXIF: &[u8] = &[ + 0x49, 0x49, 0x2a, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x12, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + ]; + + fn contains(haystack: &[u8], needle: &[u8]) -> bool { + haystack.windows(needle.len()).any(|w| w == needle) + } + + fn tiny_rgba() -> Vec { + [200u8, 10, 10, 255].repeat(4) + } + + #[test] + fn metadata_errors_keep_the_encode_message_and_describe_other_errors() { + let encode = craft_image_codecs::CodecError::Encode { format: craft_image_codecs::Format::Jpeg, message: "too big".into() }; + assert!(matches!(metadata_error(encode), Error::Encode(m) if m == "too big")); + let other = craft_image_codecs::CodecError::LimitExceeded("riff".into()); + assert!(matches!(metadata_error(other), Error::Encode(m) if m.contains("riff"))); + } + + #[test] + fn jpeg_segments_come_in_jfif_exif_xmp_icc_order_with_density() { + let icc = vec![7u8; 70_000]; + let meta = EncodeMeta { exif: Some(ORIENTED_EXIF), xmp: Some(""), icc: Some(&icc), ppi: Some(300) }; + let segs = jpeg_app_segments(&meta).expect("segments"); + let markers: Vec = segs.iter().map(|(m, _)| *m).collect(); + assert_eq!(markers, [0xE0, 0xE1, 0xE1, 0xE2, 0xE2]); + assert_eq!(&segs[0].1[7..12], &[1, 1, 0x2c, 1, 0x2c]); + assert_eq!(segs[1].1, [&b"Exif\0\0"[..], ORIENTED_EXIF].concat()); + assert!(segs[2].1.ends_with(b"")); + assert_eq!(&segs[3].1[12..14], &[1, 2]); + assert_eq!(&segs[4].1[12..14], &[2, 2]); + } + + #[test] + fn oversized_jpeg_metadata_is_an_encode_error() { + let big_exif = vec![0u8; 65_528]; + let meta = EncodeMeta { exif: Some(&big_exif), ..Default::default() }; + assert!(matches!(jpeg_app_segments(&meta), Err(Error::Encode(m)) if m.contains("EXIF"))); + let big_xmp = "x".repeat(65_534); + assert!(matches!(xmp_segment(&big_xmp), Err(Error::Encode(m)) if m.contains("XMP"))); + let meta = EncodeMeta { xmp: Some(&big_xmp), ..Default::default() }; + assert!(matches!(jpeg_app_segments(&meta), Err(Error::Encode(_)))); + } + + #[test] + fn png_and_webp_keep_caller_exif_verbatim() { + let px = tiny_rgba(); + let img = EncodeImage { width: 2, height: 2, channels: 4, samples: Samples::U8(&px) }; + let meta = EncodeMeta { exif: Some(ORIENTED_EXIF), ..Default::default() }; + let png = encode_png(&img, &meta).expect("png"); + assert!(contains(&png, &[&b"eXIf"[..], ORIENTED_EXIF].concat())); + let webp = encode_webp_lossless(&img, &meta).expect("webp"); + assert!(contains(&webp, &[&b"EXIF"[..], &(ORIENTED_EXIF.len() as u32).to_le_bytes(), ORIENTED_EXIF].concat())); + assert_eq!(u32::from_le_bytes([webp[4], webp[5], webp[6], webp[7]]) as usize, webp.len() - 8); + } +} From 276a5b1af7e0778ba28825a3fad860a06ef87760 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 16 Nov 2026 11:53:45 +0100 Subject: [PATCH 20/24] codecs: rustfmt the encoder metadata test fixture --- crates/codecs/src/encode.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/codecs/src/encode.rs b/crates/codecs/src/encode.rs index 0ad8fd3b9a..6a426cfe0e 100644 --- a/crates/codecs/src/encode.rs +++ b/crates/codecs/src/encode.rs @@ -551,8 +551,8 @@ mod metadata_tests { /// Little-endian TIFF with one IFD0 entry, Orientation = 6 (the case the verbatim helpers exist for). const ORIENTED_EXIF: &[u8] = &[ - 0x49, 0x49, 0x2a, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x12, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x49, 0x49, 0x2a, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x12, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, ]; fn contains(haystack: &[u8], needle: &[u8]) -> bool { From 5bba2c23d2dd59293b34dd63ac2911441b031687 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 16:03:31 -0500 Subject: [PATCH 21/24] 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 22/24] 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 23/24] 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 8d8e5b89d2b4021ab43cb5391f5d73bdec0deb2a Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 18 Nov 2026 10:00:31 -0500 Subject: [PATCH 24/24] Restore merged DNG dependency pins after metadata stack integration Keep the RAW, TIFF and metadata public types at the merged writer revision. Drop only the unused egui patches already removed on main, and regenerate Flatpak sources. Preserve the existing metadata and JPEG cutovers and contributor history. --- Cargo.lock | 75 +++++++---- Cargo.toml | 9 +- packaging/linux/flatpak/cargo-sources.json | 150 ++++++++++++--------- 3 files changed, 138 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc7c0e25f4..9b7d94384c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1213,7 +1213,7 @@ source = "git+https://github.com/storytold/craft-libs?rev=f0f4758c01581d79577b9b [[package]] name = "craft-crw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845#c28356d400aed7575b04ec1551b4665107cfe845" +source = "git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e#3a6613f058e355a4fd8d196b2f385260bd4b4a8e" dependencies = [ "thiserror 2.0.21", ] @@ -1314,6 +1314,7 @@ dependencies = [ "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "craft-video 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", "crc32fast", "exr", "flate2", @@ -1408,6 +1409,23 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-media" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845#c28356d400aed7575b04ec1551b4665107cfe845" + +[[package]] +name = "craft-metadata" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e#3a6613f058e355a4fd8d196b2f385260bd4b4a8e" +dependencies = [ + "brotli-decompressor 6.0.1", + "chrono", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", + "quick-xml 0.41.0", + "serde", +] + [[package]] name = "craft-metadata" version = "0.1.0" @@ -1485,12 +1503,12 @@ dependencies = [ [[package]] name = "craft-raw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845#c28356d400aed7575b04ec1551b4665107cfe845" +source = "git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e#3a6613f058e355a4fd8d196b2f385260bd4b4a8e" dependencies = [ "chrono", "craft-crw", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", "jxl-oxide", "miniz_oxide 0.9.1", "rayon", @@ -1500,6 +1518,15 @@ dependencies = [ "zune-jpeg", ] +[[package]] +name = "craft-tiff" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e#3a6613f058e355a4fd8d196b2f385260bd4b4a8e" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-tiff" version = "0.1.0" @@ -1580,12 +1607,21 @@ name = "craft-video" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=5c91598ccc86537a779f438d520fa6406c26efe6#5c91598ccc86537a779f438d520fa6406c26efe6" dependencies = [ - "craft-media", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5c91598ccc86537a779f438d520fa6406c26efe6)", "rav1e", "rayon", "thiserror 2.0.21", ] +[[package]] +name = "craft-video" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845#c28356d400aed7575b04ec1551b4665107cfe845" +dependencies = [ + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "thiserror 2.0.21", +] + [[package]] name = "craft-window" version = "0.1.0" @@ -4036,10 +4072,10 @@ dependencies = [ "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=cae7c1d8a6fec9a9ee136169918c5dd20ca509a0)", "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=478c50560d3c6fad3d613af2a30b35c3bc9f4c0f)", "craft-jxl", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", "craft-psd", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", - "craft-video", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", + "craft-video 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5c91598ccc86537a779f438d520fa6406c26efe6)", "dhat", "jpeg-encoder 0.7.1", "lightcraft-color", @@ -4119,7 +4155,7 @@ dependencies = [ "craft-mime", "craft-pdf", "craft-plist", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", "crc32fast", "fs4", "harfrust 0.13.3", @@ -4276,10 +4312,10 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", "craft-psd", "craft-raw", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", "lightcraft-geom", "proptest", "serde", @@ -4336,7 +4372,7 @@ dependencies = [ "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", "craft-jxl", "craft-raw", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c28356d400aed7575b04ec1551b4665107cfe845)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=3a6613f058e355a4fd8d196b2f385260bd4b4a8e)", "dhat", "jixel", "lightcraft-color", @@ -8701,18 +8737,3 @@ dependencies = [ "syn 3.0.6", "winnow", ] - -[[patch.unused]] -name = "egui_demo_lib" -version = "0.37.0" -source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a" - -[[patch.unused]] -name = "egui_inspection" -version = "0.37.0" -source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a" - -[[patch.unused]] -name = "egui_system_font_provider" -version = "0.37.0" -source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a" diff --git a/Cargo.toml b/Cargo.toml index 065317147d..364c9ff3ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "b77af389f3 craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "478c50560d3c6fad3d613af2a30b35c3bc9f4c0f", default-features = false, features = ["decode", "encode"] } jixel = "=0.3.4" # Photo metadata: EXIF, IPTC-IIM, XMP packets and GPX track logs (craft-libs#949) -craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "c28356d400aed7575b04ec1551b4665107cfe845" } +craft-metadata = { git = "https://github.com/storytold/craft-libs", rev = "3a6613f058e355a4fd8d196b2f385260bd4b4a8e" } craft-jpeg = { git = "https://github.com/storytold/craft-libs", rev = "478c50560d3c6fad3d613af2a30b35c3bc9f4c0f" } craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "c28356d400aed7575b04ec1551b4665107cfe845" } craft-video = { git = "https://github.com/storytold/craft-libs", rev = "5c91598ccc86537a779f438d520fa6406c26efe6", features = ["av1", "av1-large-encode", "threads"] } @@ -48,8 +48,8 @@ lightcraft-wincolor = { path = "crates/wincolor" } lightcraft-color = { path = "crates/color" } lightcraft-raster = { path = "crates/raster" } # TIFF/IFD: the shared reader and writer (moved from crates/tiff; craft-libs#783). -craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "c28356d400aed7575b04ec1551b4665107cfe845" } -craft-raw = { git = "https://github.com/storytold/craft-libs", rev = "c28356d400aed7575b04ec1551b4665107cfe845" } +craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "3a6613f058e355a4fd8d196b2f385260bd4b4a8e" } +craft-raw = { git = "https://github.com/storytold/craft-libs", rev = "3a6613f058e355a4fd8d196b2f385260bd4b4a8e" } lightcraft-raw = { path = "crates/raw" } lightcraft-codecs = { path = "crates/codecs" } lightcraft-meta = { path = "crates/meta" } @@ -206,8 +206,5 @@ egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc79968 egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } -egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } -egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } -egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" } diff --git a/packaging/linux/flatpak/cargo-sources.json b/packaging/linux/flatpak/cargo-sources.json index 7581d11ede..7126d20e65 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": "c28356d400aed7575b04ec1551b4665107cfe845", - "dest": "flatpak-cargo/git/craft-libs-c28356d" + "commit": "3a6613f058e355a4fd8d196b2f385260bd4b4a8e", + "dest": "flatpak-cargo/git/craft-libs-3a6613f" }, { "type": "git", @@ -53,6 +53,12 @@ "commit": "5ac7c9664c8d54aaf69d1bb826e187686c1a4e1a", "dest": "flatpak-cargo/git/craft-libs-5ac7c96" }, + { + "type": "git", + "url": "https://github.com/storytold/craft-libs", + "commit": "c28356d400aed7575b04ec1551b4665107cfe845", + "dest": "flatpak-cargo/git/craft-libs-c28356d" + }, { "type": "git", "url": "https://github.com/storytold/craft-libs", @@ -1672,19 +1678,19 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-c28356d/crates/crw\" \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-crw\"" + "mkdir -p \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-3a6613f/crates/crw\" \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-crw\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-crw\"\ndescription = \"Clean-room Canon CRW (CIFF) raw decoder: the heap container, the derived entropy coding, sensor levels and as-shot white balance.\"\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\"\nunused_workspace_dependencies = \"allow\"\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\"\nunused_workspace_dependencies = \"allow\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[dependencies]\nthiserror = \"2\"\n\n[dev-dependencies]\nproptest = \"1\"\nserde_json = \"1\"\n\n[dev-dependencies.serde]\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[dev-dependencies.sha2]\nversion = \"0.10\"\ndefault-features = false\nfeatures = [\"std\"]\n", - "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-crw", + "dest": "cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-crw", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-crw", + "dest": "cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-crw", "dest-filename": ".cargo-checksum.json" }, { @@ -1957,6 +1963,42 @@ "dest": "cargo/vendor-git/6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c/craft-media", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-c28356d/crates/media\" \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-media\"" + ] + }, + { + "type": "inline", + "contents": "[package]\nname = \"craft-media\"\ndescription = \"Bit-level I/O, clean-room ISO BMFF (MP4), QuickTime (MOV) and Matroska (MKV, WebM) and MXF demuxers and muxers, and Ogg, AVI and MPEG-TS/PS demuxers.\"\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[package.metadata.docs.rs]\nall-features = true\n\n[lints.rust]\nunsafe_code = \"forbid\"\nunused_workspace_dependencies = \"allow\"\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\"\nunused_workspace_dependencies = \"allow\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\ndefault = [\"isobmff\"]\nbitstream = []\nisobmff = [\"bitstream\", \"dep:thiserror\"]\nmatroska = []\navi = []\nmxf = [\"dep:chrono\"]\nmpegts = []\nogg = []\nserde = [\"dep:serde\"]\n\n[dependencies.thiserror]\noptional = true\nversion = \"2\"\n\n[dependencies.serde]\noptional = true\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[dependencies.chrono]\noptional = true\nversion = \"0.4.45\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dev-dependencies]\nproptest = \"1\"\nserde_json = \"1\"\n\n[dev-dependencies.craft-media-testkit]\npath = \"crates/media-testkit\"\n\n[[test]]\nname = \"fuzz\"\nrequired-features = [\"isobmff\"]\n\n[[test]]\nname = \"fuzz_matroska\"\nrequired-features = [\"matroska\"]\n\n[[test]]\nname = \"oracle_avi\"\nrequired-features = [\"avi\"]\n\n[[test]]\nname = \"oracle_avi_mux\"\nrequired-features = [\"avi\"]\n\n[[test]]\nname = \"oracle_demux\"\nrequired-features = [\"isobmff\"]\n\n[[test]]\nname = \"oracle_matroska\"\nrequired-features = [\"matroska\"]\n\n[[test]]\nname = \"oracle_mpegts\"\nrequired-features = [\"mpegts\"]\n\n[[test]]\nname = \"oracle_mux\"\nrequired-features = [\"isobmff\"]\n\n[[test]]\nname = \"oracle_mxf\"\nrequired-features = [\"mxf\"]\n\n[[test]]\nname = \"oracle_ogg\"\nrequired-features = [\"ogg\"]\n\n[[test]]\nname = \"roundtrip\"\nrequired-features = [\"isobmff\"]\n", + "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-media", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-media", + "dest-filename": ".cargo-checksum.json" + }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-3a6613f/crates/metadata\" \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/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\"\nunused_workspace_dependencies = \"allow\"\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\"\nunused_workspace_dependencies = \"allow\"\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/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-metadata", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-metadata", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -2086,19 +2128,37 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-c28356d/crates/raw\" \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-raw\"" + "mkdir -p \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-3a6613f/crates/raw\" \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-raw\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-raw\"\ndescription = \"Camera raw files, the file-format layer: container parsing, decompression and the sensor data out as a neutral raw image with its levels, crop, orientation, colour tags and embedded previews. DNG (read and write), Hasselblad 3FR/FFF, MRW, ERF, MEF, Kodak DCS, Pentax PEF, Samsung SRW, Canon CR2, Nikon NEF/NRW, Panasonic RW2, Fujifilm RAF, Olympus ORF (uncompressed), Sony ARW, Canon CR3 and Canon CRW so far.\"\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\"\nunused_workspace_dependencies = \"allow\"\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\"\nunused_workspace_dependencies = \"allow\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\ndefault = [\"dng\", \"jxl\", \"crw\", \"hasselblad\", \"mrw\", \"erf\", \"mef\", \"kodak\", \"pef\", \"srw\", \"cr2\", \"nef\", \"rw2\", \"raf\", \"orf\", \"arw\", \"cr3\"]\ndng = [\"dep:miniz_oxide\", \"dep:zune-jpeg\", \"dep:zune-core\"]\njxl = [\"dng\", \"dep:jxl-oxide\"]\nhasselblad = [\"dng\"]\nmrw = []\nerf = []\nmef = []\nkodak = []\npef = []\nsrw = []\ncr2 = []\nnef = []\nrw2 = []\nraf = []\norf = []\narw = []\ncr3 = [\"dep:craft-metadata\"]\ncrw = [\"dep:craft-crw\", \"dep:chrono\"]\n\n[dependencies]\nthiserror = \"2\"\nrayon = \"1\"\n\n[dependencies.craft-tiff]\npath = \"crates/tiff\"\n\n[dependencies.craft-crw]\noptional = true\npath = \"crates/crw\"\n\n[dependencies.craft-metadata]\noptional = true\npath = \"crates/metadata\"\n\n[dependencies.serde]\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[dependencies.chrono]\noptional = true\nversion = \"0.4.45\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dependencies.miniz_oxide]\nversion = \"0.9\"\noptional = true\n\n[dependencies.zune-jpeg]\nversion = \"0.5\"\ndefault-features = false\nfeatures = [\"std\", \"x86\", \"neon\"]\noptional = true\n\n[dependencies.zune-core]\nversion = \"0.5\"\ndefault-features = false\nfeatures = [\"std\"]\noptional = true\n\n[dependencies.jxl-oxide]\nversion = \"0.12\"\ndefault-features = false\noptional = true\n\n[dev-dependencies]\nproptest = \"1\"\n\n[dev-dependencies.sha2]\nversion = \"0.10\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dev-dependencies.jpeg-encoder]\nversion = \"0.7\"\ndefault-features = false\nfeatures = [\"std\"]\n\n[dev-dependencies.zune-jpegxl]\nversion = \"0.5\"\ndefault-features = false\nfeatures = [\"std\"]\n", - "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-raw", + "dest": "cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-raw", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-raw", + "dest": "cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-raw", + "dest-filename": ".cargo-checksum.json" + }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-3a6613f/crates/tiff\" \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/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\"\nunused_workspace_dependencies = \"allow\"\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\"\nunused_workspace_dependencies = \"allow\"\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/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-tiff", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09/craft-tiff", "dest-filename": ".cargo-checksum.json" }, { @@ -2209,6 +2269,24 @@ "dest": "cargo/vendor-git/6f5ad8618176b3fc0aac703e6e74df7229b0350b4574c7edbe0bb86c53c1cb6c/craft-video", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-c28356d/crates/video\" \"cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-video\"" + ] + }, + { + "type": "inline", + "contents": "[package]\nname = \"craft-video\"\ndescription = \"Clean-room pure-Rust video codecs, one feature per codec: DNxHD/DNxHR, VP8, ProRes, H.264, HEVC, VP9, AV1, MPEG-4 Part 2.\"\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[package.metadata.docs.rs]\nall-features = true\n\n[lints.rust]\nunsafe_code = \"forbid\"\nunused_workspace_dependencies = \"allow\"\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\"\nunused_workspace_dependencies = \"allow\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\ndnx = []\napv = [\"apv-decode\", \"apv-encode\"]\napv-decode = [\"craft-media/bitstream\"]\napv-encode = [\"craft-media/bitstream\"]\nvp8 = [\"vp8-decode\", \"vp8-encode\"]\nvp8-decode = []\nvp8-encode = []\nmpeg2 = [\"mpeg2-decode\", \"mpeg2-encode\"]\nmpeg2-decode = []\nmpeg2-encode = [\"mpeg2-decode\"]\nmpeg4 = [\"mpeg4-encode\"]\nmpeg4-encode = [\"craft-media/bitstream\"]\nffv1 = []\nprores = [\"craft-media/bitstream\"]\nh264 = [\"h264-decode\", \"h264-encode\"]\nh264-decode = [\"craft-media/bitstream\"]\nh264-encode = [\"craft-media/isobmff\"]\nhevc = [\"hevc-decode\", \"hevc-encode\"]\nhevc-decode = [\"craft-media/bitstream\"]\nhevc-encode = [\"craft-media/isobmff\"]\nvp9 = [\"vp9-decode\", \"vp9-encode\"]\nvp9-decode = [\"craft-media/bitstream\"]\nvp9-encode = [\"craft-media/isobmff\"]\nav1 = [\"av1-decode\", \"av1-encode\"]\nav1-decode = []\nav1-encode = [\"craft-media/isobmff\"]\nav1-large-encode = [\"av1-encode\", \"dep:rav1e\"]\nthreads = [\"dep:rayon\"]\n\n[dependencies]\nthiserror = \"2\"\n\n[dependencies.craft-media]\npath = \"crates/media\"\ndefault-features = false\n\n[dependencies.rayon]\noptional = true\nversion = \"1\"\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies.rav1e]\nversion = \"0.8\"\ndefault-features = false\noptional = true\n\n[dev-dependencies.craft-media-testkit]\npath = \"crates/media-testkit\"\n\n[dev-dependencies.craft-media]\nfeatures = [\"avi\"]\npath = \"crates/media\"\ndefault-features = false\n\n[[test]]\nname = \"dnx\"\nrequired-features = [\"dnx\"]\n\n[[test]]\nname = \"apv\"\nrequired-features = [\"apv\"]\n\n[[test]]\nname = \"vp8\"\nrequired-features = [\"vp8-decode\"]\n\n[[test]]\nname = \"av1_decode\"\nrequired-features = [\"av1-decode\"]\n\n[[test]]\nname = \"h264_decode\"\nrequired-features = [\"h264-decode\"]\n\n[[test]]\nname = \"h264_encode\"\nrequired-features = [\"h264-encode\"]\n\n[[test]]\nname = \"hevc_decode\"\nrequired-features = [\"hevc-decode\"]\n\n[[test]]\nname = \"vp8_encode\"\nrequired-features = [\"vp8\"]\n\n[[test]]\nname = \"vp9_decode\"\nrequired-features = [\"vp9-decode\"]\n\n[[test]]\nname = \"mpeg4_encode\"\nrequired-features = [\"mpeg4-encode\"]\n\n[[test]]\nname = \"mpeg2\"\nrequired-features = [\"mpeg2-decode\"]\n\n[[test]]\nname = \"ffv1\"\nrequired-features = [\"ffv1\"]\n\n[[test]]\nname = \"prores\"\nrequired-features = [\"prores\"]\n\n[[test]]\nname = \"hevc\"\nrequired-features = [\"hevc-encode\"]\n\n[[test]]\nname = \"av1\"\nrequired-features = [\"av1\"]\n\n[[example]]\nname = \"vp8_fuzz\"\nrequired-features = [\"vp8-decode\"]\n\n[[example]]\nname = \"vp8_vp8dec\"\nrequired-features = [\"vp8-decode\"]\n\n[[example]]\nname = \"av1_av1dec\"\nrequired-features = [\"av1-decode\"]\n\n[[example]]\nname = \"h264_h264dec\"\nrequired-features = [\"h264-decode\"]\n\n[[example]]\nname = \"h264_h264enc_bench\"\nrequired-features = [\"h264-encode\"]\ntest = true\n\n[[example]]\nname = \"hevc_hevcdec\"\nrequired-features = [\"hevc-decode\"]\n\n[[example]]\nname = \"vp9_vp9dec\"\nrequired-features = [\"vp9-decode\"]\n", + "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-video", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/547b31fae2076d587e497f8a6226e18e0bfe27e9014d2bdf3cce7d69262df801/craft-video", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -10261,63 +10339,9 @@ "dest": "cargo/vendor/zvariant_utils-4.2.0", "dest-filename": ".cargo-checksum.json" }, - { - "type": "shell", - "commands": [ - "mkdir -p \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\" && cp -r --reflink=auto \"flatpak-cargo/git/egui-6d518fc/crates/egui_demo_lib\" \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_demo_lib\"" - ] - }, { "type": "inline", - "contents": "[package]\nname = \"egui_demo_lib\"\nversion = \"0.37.0\"\nauthors = [\"Emil Ernerfeldt \"]\ndescription = \"Example library for egui\"\nedition = \"2024\"\nrust-version = \"1.95\"\nhomepage = \"https://github.com/emilk/egui/tree/main/crates/egui_demo_lib\"\nlicense = \"MIT OR Apache-2.0\"\nreadme = \"README.md\"\nrepository = \"https://github.com/emilk/egui/tree/main/crates/egui_demo_lib\"\ncategories = [\"gui\", \"graphics\"]\nkeywords = [\"glow\", \"egui\", \"gui\", \"gamedev\"]\ninclude = [\"../../LICENSE-APACHE\", \"../../LICENSE-MIT\", \"**/*.rs\", \"Cargo.toml\", \"data/*\"]\n\n[package.metadata.docs.rs]\nall-features = true\nrustdoc-args = [\"--generate-link-to-definition\"]\n\n[package.metadata.cargo-shear]\nignored = [\"image\"]\n\n[lints.rust]\nunsafe_code = \"deny\"\ntrivial_numeric_casts = \"warn\"\nunused_import_braces = \"warn\"\nunused_lifetimes = \"warn\"\ntrivial_casts = \"allow\"\nunused_qualifications = \"allow\"\n\n[lints.rust.future_incompatible]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.nonstandard_style]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.rust_2018_idioms]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(web_sys_unstable_apis)\"]\n\n[lints.rustdoc]\nall = \"warn\"\n\n[lints.clippy]\nallow_attributes = \"warn\"\nas_ptr_cast_mut = \"warn\"\nbranches_sharing_code = \"warn\"\nclear_with_drain = \"warn\"\nclone_on_ref_ptr = \"warn\"\ncoerce_container_to_any = \"warn\"\ndbg_macro = \"warn\"\ndebug_assert_with_mut_call = \"warn\"\ndefault_union_representation = \"warn\"\nderive_partial_eq_without_eq = \"warn\"\ndisallowed_script_idents = \"warn\"\ndoc_include_without_cfg = \"warn\"\nempty_enum_variants_with_brackets = \"warn\"\nequatable_if_let = \"warn\"\nexit = \"warn\"\nfallible_impl_from = \"warn\"\nfloat_cmp_const = \"warn\"\nfn_to_numeric_cast_any = \"warn\"\nget_unwrap = \"warn\"\nimprecise_flops = \"warn\"\ninfinite_loop = \"warn\"\niter_on_empty_collections = \"warn\"\niter_on_single_items = \"warn\"\niter_over_hash_type = \"warn\"\nlarge_include_file = \"warn\"\nlarge_stack_frames = \"warn\"\nliteral_string_with_formatting_args = \"warn\"\nlossy_float_literal = \"warn\"\nmap_err_ignore = \"warn\"\nmem_forget = \"warn\"\nmissing_assert_message = \"warn\"\nmutex_integer = \"warn\"\nneedless_pass_by_ref_mut = \"warn\"\nneedless_type_cast = \"warn\"\nnon_zero_suggestions = \"warn\"\nnonstandard_macro_braces = \"warn\"\nor_fun_call = \"warn\"\npath_buf_push_overwrite = \"warn\"\npathbuf_init_then_push = \"warn\"\nprecedence_bits = \"warn\"\nprint_stderr = \"warn\"\nprint_stdout = \"warn\"\npub_without_shorthand = \"warn\"\nrc_mutex = \"warn\"\nredundant_type_annotations = \"warn\"\nref_patterns = \"warn\"\nrest_pat_in_fully_bound_structs = \"warn\"\nreturn_and_then = \"warn\"\nset_contains_or_insert = \"warn\"\nsingle_option_map = \"warn\"\nstd_instead_of_core = \"warn\"\nstr_to_string = \"warn\"\nstring_add = \"warn\"\nstring_lit_as_bytes = \"warn\"\nstring_lit_chars_any = \"warn\"\nsuspicious_xor_used_as_pow = \"warn\"\ntodo = \"warn\"\ntoo_long_first_doc_paragraph = \"warn\"\ntrailing_empty_array = \"warn\"\ntrait_duplication_in_bounds = \"warn\"\ntuple_array_conversions = \"warn\"\nundocumented_unsafe_blocks = \"warn\"\nunimplemented = \"warn\"\nuninhabited_references = \"warn\"\nunnecessary_safety_comment = \"warn\"\nunnecessary_safety_doc = \"warn\"\nunnecessary_self_imports = \"warn\"\nunnecessary_struct_initialization = \"warn\"\nunused_peekable = \"warn\"\nunused_rounding = \"warn\"\nunused_trait_names = \"warn\"\nunwrap_used = \"warn\"\nuse_self = \"warn\"\nuseless_let_if_seq = \"warn\"\nverbose_file_reads = \"warn\"\ncast_lossless = \"allow\"\ncast_possible_truncation = \"allow\"\ncast_possible_wrap = \"allow\"\ncast_precision_loss = \"allow\"\ncast_sign_loss = \"allow\"\ncomparison_chain = \"allow\"\ndefault_trait_access = \"allow\"\nfloat_cmp = \"allow\"\ninline_always = \"allow\"\nitems_after_statements = \"allow\"\nmany_single_char_names = \"allow\"\nmissing_panics_doc = \"allow\"\nmust_use_candidate = \"allow\"\nredundant_closure_for_method_calls = \"allow\"\nreturn_self_not_must_use = \"allow\"\nshould_panic_without_expect = \"allow\"\nsimilar_names = \"allow\"\nstruct_excessive_bools = \"allow\"\nstruct_field_names = \"allow\"\ntoo_many_lines = \"allow\"\ntrivially_copy_pass_by_ref = \"allow\"\nunreadable_literal = \"allow\"\nused_underscore_binding = \"allow\"\nassigning_clones = \"allow\"\nmanual_range_contains = \"allow\"\nmap_unwrap_or = \"allow\"\nmultiple_crate_versions = \"allow\"\nwildcard_imports = \"allow\"\nlet_underscore_must_use = \"allow\"\nlet_underscore_untyped = \"allow\"\nself_named_module_files = \"allow\"\nsignificant_drop_tightening = \"allow\"\n\n[lints.clippy.all]\nlevel = \"warn\"\npriority = -1\n\n[lints.clippy.cargo]\nlevel = \"warn\"\npriority = -1\n\n[lints.clippy.pedantic]\nlevel = \"warn\"\npriority = -1\n\n[lib]\n\n[features]\ndefault = []\njiff = [\"egui_extras/datepicker\", \"dep:jiff\"]\nserde = [\"egui/serde\", \"dep:serde\", \"egui_extras/serde\"]\nsyntect = [\"egui_extras/syntect\"]\n\n[dependencies.egui]\ndefault-features = false\nfeatures = [\"color-hex\", \"default_fonts\"]\nversion = \"0.37.0\"\npath = \"crates/egui\"\n\n[dependencies.egui_extras]\nfeatures = [\"image\", \"svg\"]\nversion = \"0.37.0\"\npath = \"crates/egui_extras\"\ndefault-features = false\n\n[dependencies.log]\nversion = \"0.4.34\"\nfeatures = [\"std\"]\n\n[dependencies.unicode_names2]\nversion = \"3.1\"\ndefault-features = false\n\n[dependencies.jiff]\noptional = true\nfeatures = [\"std\", \"js\"]\nversion = \"0.2.35\"\ndefault-features = false\n\n[dependencies.document-features]\noptional = true\nversion = \"0.2.12\"\n\n[dependencies.serde]\noptional = true\nversion = \"1.0\"\nfeatures = [\"derive\"]\n\n[dev-dependencies]\nmimalloc = \"0.1.52\"\nrand = \"0.10.2\"\n\n[dev-dependencies.criterion]\nversion = \"0.8.2\"\ndefault-features = false\n\n[dev-dependencies.egui]\nfeatures = [\"default_fonts\", \"monochrome_emoji_fonts\"]\nversion = \"0.37.0\"\npath = \"crates/egui\"\ndefault-features = false\n\n[dev-dependencies.egui_extras]\nfeatures = [\"image\", \"svg\"]\nversion = \"0.37.0\"\npath = \"crates/egui_extras\"\ndefault-features = false\n\n[dev-dependencies.egui_kittest]\nfeatures = [\"wgpu\", \"snapshot\"]\nversion = \"0.37.0\"\npath = \"crates/egui_kittest\"\ndefault-features = false\n\n[dev-dependencies.image]\nfeatures = [\"png\"]\nversion = \"0.25.10\"\ndefault-features = false\n\n[[bench]]\nname = \"benchmark\"\nharness = false\n", - "dest": "cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_demo_lib", - "dest-filename": "Cargo.toml" - }, - { - "type": "inline", - "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_demo_lib", - "dest-filename": ".cargo-checksum.json" - }, - { - "type": "shell", - "commands": [ - "mkdir -p \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\" && cp -r --reflink=auto \"flatpak-cargo/git/egui-6d518fc/crates/egui_inspection\" \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_inspection\"" - ] - }, - { - "type": "inline", - "contents": "[package]\nname = \"egui_inspection\"\nversion = \"0.37.0\"\nauthors = [\"Lucas Meurer \", \"Emil Ernerfeldt \"]\ndescription = \"Protocol and egui::Plugin for inspection of egui apps\"\nedition = \"2024\"\nrust-version = \"1.95\"\nhomepage = \"https://github.com/emilk/egui\"\nlicense = \"MIT OR Apache-2.0\"\nreadme = \"./README.md\"\nrepository = \"https://github.com/emilk/egui\"\ncategories = [\"gui\", \"development-tools::testing\", \"accessibility\"]\nkeywords = [\"gui\", \"egui\", \"inspector\", \"accesskit\", \"mcp\"]\ninclude = [\"../../LICENSE-APACHE\", \"../../LICENSE-MIT\", \"**/*.rs\", \"Cargo.toml\"]\n\n[package.metadata.docs.rs]\nall-features = true\nrustdoc-args = [\"--generate-link-to-definition\"]\n\n[features]\ndefault = []\npng = [\"dep:image\", \"image/png\", \"egui/bytemuck\"]\nplugin = [\"png\", \"dep:log\"]\n\n[dependencies]\nserde_bytes = \"0.11.19\"\nrmp-serde = \"1.3\"\n\n[dependencies.egui]\nfeatures = [\"serde\"]\nversion = \"0.37.0\"\npath = \"crates/egui\"\ndefault-features = false\n\n[dependencies.serde]\nversion = \"1.0\"\nfeatures = [\"derive\"]\n\n[dependencies.image]\noptional = true\nversion = \"0.25.10\"\ndefault-features = false\n\n[dependencies.log]\noptional = true\nversion = \"0.4.34\"\nfeatures = [\"std\"]\n\n[dependencies.document-features]\noptional = true\nversion = \"0.2.12\"\n\n[lints.rust]\nunsafe_code = \"deny\"\ntrivial_numeric_casts = \"warn\"\nunused_import_braces = \"warn\"\nunused_lifetimes = \"warn\"\ntrivial_casts = \"allow\"\nunused_qualifications = \"allow\"\n\n[lints.rust.future_incompatible]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.nonstandard_style]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.rust_2018_idioms]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(web_sys_unstable_apis)\"]\n\n[lints.rustdoc]\nall = \"warn\"\n\n[lints.clippy]\nallow_attributes = \"warn\"\nas_ptr_cast_mut = \"warn\"\nbranches_sharing_code = \"warn\"\nclear_with_drain = \"warn\"\nclone_on_ref_ptr = \"warn\"\ncoerce_container_to_any = \"warn\"\ndbg_macro = \"warn\"\ndebug_assert_with_mut_call = \"warn\"\ndefault_union_representation = \"warn\"\nderive_partial_eq_without_eq = \"warn\"\ndisallowed_script_idents = \"warn\"\ndoc_include_without_cfg = \"warn\"\nempty_enum_variants_with_brackets = \"warn\"\nequatable_if_let = \"warn\"\nexit = \"warn\"\nfallible_impl_from = \"warn\"\nfloat_cmp_const = \"warn\"\nfn_to_numeric_cast_any = \"warn\"\nget_unwrap = \"warn\"\nimprecise_flops = \"warn\"\ninfinite_loop = \"warn\"\niter_on_empty_collections = \"warn\"\niter_on_single_items = \"warn\"\niter_over_hash_type = \"warn\"\nlarge_include_file = \"warn\"\nlarge_stack_frames = \"warn\"\nliteral_string_with_formatting_args = \"warn\"\nlossy_float_literal = \"warn\"\nmap_err_ignore = \"warn\"\nmem_forget = \"warn\"\nmissing_assert_message = \"warn\"\nmutex_integer = \"warn\"\nneedless_pass_by_ref_mut = \"warn\"\nneedless_type_cast = \"warn\"\nnon_zero_suggestions = \"warn\"\nnonstandard_macro_braces = \"warn\"\nor_fun_call = \"warn\"\npath_buf_push_overwrite = \"warn\"\npathbuf_init_then_push = \"warn\"\nprecedence_bits = \"warn\"\nprint_stderr = \"warn\"\nprint_stdout = \"warn\"\npub_without_shorthand = \"warn\"\nrc_mutex = \"warn\"\nredundant_type_annotations = \"warn\"\nref_patterns = \"warn\"\nrest_pat_in_fully_bound_structs = \"warn\"\nreturn_and_then = \"warn\"\nset_contains_or_insert = \"warn\"\nsingle_option_map = \"warn\"\nstd_instead_of_core = \"warn\"\nstr_to_string = \"warn\"\nstring_add = \"warn\"\nstring_lit_as_bytes = \"warn\"\nstring_lit_chars_any = \"warn\"\nsuspicious_xor_used_as_pow = \"warn\"\ntodo = \"warn\"\ntoo_long_first_doc_paragraph = \"warn\"\ntrailing_empty_array = \"warn\"\ntrait_duplication_in_bounds = \"warn\"\ntuple_array_conversions = \"warn\"\nundocumented_unsafe_blocks = \"warn\"\nunimplemented = \"warn\"\nuninhabited_references = \"warn\"\nunnecessary_safety_comment = \"warn\"\nunnecessary_safety_doc = \"warn\"\nunnecessary_self_imports = \"warn\"\nunnecessary_struct_initialization = \"warn\"\nunused_peekable = \"warn\"\nunused_rounding = \"warn\"\nunused_trait_names = \"warn\"\nunwrap_used = \"warn\"\nuse_self = \"warn\"\nuseless_let_if_seq = \"warn\"\nverbose_file_reads = \"warn\"\ncast_lossless = \"allow\"\ncast_possible_truncation = \"allow\"\ncast_possible_wrap = \"allow\"\ncast_precision_loss = \"allow\"\ncast_sign_loss = \"allow\"\ncomparison_chain = \"allow\"\ndefault_trait_access = \"allow\"\nfloat_cmp = \"allow\"\ninline_always = \"allow\"\nitems_after_statements = \"allow\"\nmany_single_char_names = \"allow\"\nmissing_panics_doc = \"allow\"\nmust_use_candidate = \"allow\"\nredundant_closure_for_method_calls = \"allow\"\nreturn_self_not_must_use = \"allow\"\nshould_panic_without_expect = \"allow\"\nsimilar_names = \"allow\"\nstruct_excessive_bools = \"allow\"\nstruct_field_names = \"allow\"\ntoo_many_lines = \"allow\"\ntrivially_copy_pass_by_ref = \"allow\"\nunreadable_literal = \"allow\"\nused_underscore_binding = \"allow\"\nassigning_clones = \"allow\"\nmanual_range_contains = \"allow\"\nmap_unwrap_or = \"allow\"\nmultiple_crate_versions = \"allow\"\nwildcard_imports = \"allow\"\nlet_underscore_must_use = \"allow\"\nlet_underscore_untyped = \"allow\"\nself_named_module_files = \"allow\"\nsignificant_drop_tightening = \"allow\"\n\n[lints.clippy.all]\nlevel = \"warn\"\npriority = -1\n\n[lints.clippy.cargo]\nlevel = \"warn\"\npriority = -1\n\n[lints.clippy.pedantic]\nlevel = \"warn\"\npriority = -1\n", - "dest": "cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_inspection", - "dest-filename": "Cargo.toml" - }, - { - "type": "inline", - "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_inspection", - "dest-filename": ".cargo-checksum.json" - }, - { - "type": "shell", - "commands": [ - "mkdir -p \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6\" && cp -r --reflink=auto \"flatpak-cargo/git/egui-6d518fc/crates/egui_system_font_provider\" \"cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_system_font_provider\"" - ] - }, - { - "type": "inline", - "contents": "[package]\nname = \"egui_system_font_provider\"\nversion = \"0.37.0\"\nauthors = [\"Emil Ernerfeldt \"]\ndescription = \"Load system fonts on demand for characters the egui fonts lack\"\nedition = \"2024\"\nrust-version = \"1.95\"\nhomepage = \"https://github.com/emilk/egui/tree/main/crates/egui_system_font_provider\"\nlicense = \"MIT OR Apache-2.0\"\nreadme = \"README.md\"\nrepository = \"https://github.com/emilk/egui/tree/main/crates/egui_system_font_provider\"\ncategories = [\"gui\"]\nkeywords = [\"egui\", \"gui\", \"fonts\", \"text\"]\ninclude = [\"../../LICENSE-APACHE\", \"../../LICENSE-MIT\", \"**/*.rs\", \"Cargo.toml\"]\n\n[package.metadata.docs.rs]\nall-features = true\nrustdoc-args = [\"--generate-link-to-definition\"]\n\n[lints.rust]\nunsafe_code = \"deny\"\ntrivial_numeric_casts = \"warn\"\nunused_import_braces = \"warn\"\nunused_lifetimes = \"warn\"\ntrivial_casts = \"allow\"\nunused_qualifications = \"allow\"\n\n[lints.rust.future_incompatible]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.nonstandard_style]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.rust_2018_idioms]\nlevel = \"warn\"\npriority = -1\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(web_sys_unstable_apis)\"]\n\n[lints.rustdoc]\nall = \"warn\"\n\n[lints.clippy]\nallow_attributes = \"warn\"\nas_ptr_cast_mut = \"warn\"\nbranches_sharing_code = \"warn\"\nclear_with_drain = \"warn\"\nclone_on_ref_ptr = \"warn\"\ncoerce_container_to_any = \"warn\"\ndbg_macro = \"warn\"\ndebug_assert_with_mut_call = \"warn\"\ndefault_union_representation = \"warn\"\nderive_partial_eq_without_eq = \"warn\"\ndisallowed_script_idents = \"warn\"\ndoc_include_without_cfg = \"warn\"\nempty_enum_variants_with_brackets = \"warn\"\nequatable_if_let = \"warn\"\nexit = \"warn\"\nfallible_impl_from = \"warn\"\nfloat_cmp_const = \"warn\"\nfn_to_numeric_cast_any = \"warn\"\nget_unwrap = \"warn\"\nimprecise_flops = \"warn\"\ninfinite_loop = \"warn\"\niter_on_empty_collections = \"warn\"\niter_on_single_items = \"warn\"\niter_over_hash_type = \"warn\"\nlarge_include_file = \"warn\"\nlarge_stack_frames = \"warn\"\nliteral_string_with_formatting_args = \"warn\"\nlossy_float_literal = \"warn\"\nmap_err_ignore = \"warn\"\nmem_forget = \"warn\"\nmissing_assert_message = \"warn\"\nmutex_integer = \"warn\"\nneedless_pass_by_ref_mut = \"warn\"\nneedless_type_cast = \"warn\"\nnon_zero_suggestions = \"warn\"\nnonstandard_macro_braces = \"warn\"\nor_fun_call = \"warn\"\npath_buf_push_overwrite = \"warn\"\npathbuf_init_then_push = \"warn\"\nprecedence_bits = \"warn\"\nprint_stderr = \"warn\"\nprint_stdout = \"warn\"\npub_without_shorthand = \"warn\"\nrc_mutex = \"warn\"\nredundant_type_annotations = \"warn\"\nref_patterns = \"warn\"\nrest_pat_in_fully_bound_structs = \"warn\"\nreturn_and_then = \"warn\"\nset_contains_or_insert = \"warn\"\nsingle_option_map = \"warn\"\nstd_instead_of_core = \"warn\"\nstr_to_string = \"warn\"\nstring_add = \"warn\"\nstring_lit_as_bytes = \"warn\"\nstring_lit_chars_any = \"warn\"\nsuspicious_xor_used_as_pow = \"warn\"\ntodo = \"warn\"\ntoo_long_first_doc_paragraph = \"warn\"\ntrailing_empty_array = \"warn\"\ntrait_duplication_in_bounds = \"warn\"\ntuple_array_conversions = \"warn\"\nundocumented_unsafe_blocks = \"warn\"\nunimplemented = \"warn\"\nuninhabited_references = \"warn\"\nunnecessary_safety_comment = \"warn\"\nunnecessary_safety_doc = \"warn\"\nunnecessary_self_imports = \"warn\"\nunnecessary_struct_initialization = \"warn\"\nunused_peekable = \"warn\"\nunused_rounding = \"warn\"\nunused_trait_names = \"warn\"\nunwrap_used = \"warn\"\nuse_self = \"warn\"\nuseless_let_if_seq = \"warn\"\nverbose_file_reads = \"warn\"\ncast_lossless = \"allow\"\ncast_possible_truncation = \"allow\"\ncast_possible_wrap = \"allow\"\ncast_precision_loss = \"allow\"\ncast_sign_loss = \"allow\"\ncomparison_chain = \"allow\"\ndefault_trait_access = \"allow\"\nfloat_cmp = \"allow\"\ninline_always = \"allow\"\nitems_after_statements = \"allow\"\nmany_single_char_names = \"allow\"\nmissing_panics_doc = \"allow\"\nmust_use_candidate = \"allow\"\nredundant_closure_for_method_calls = \"allow\"\nreturn_self_not_must_use = \"allow\"\nshould_panic_without_expect = \"allow\"\nsimilar_names = \"allow\"\nstruct_excessive_bools = \"allow\"\nstruct_field_names = \"allow\"\ntoo_many_lines = \"allow\"\ntrivially_copy_pass_by_ref = \"allow\"\nunreadable_literal = \"allow\"\nused_underscore_binding = \"allow\"\nassigning_clones = \"allow\"\nmanual_range_contains = \"allow\"\nmap_unwrap_or = \"allow\"\nmultiple_crate_versions = \"allow\"\nwildcard_imports = \"allow\"\nlet_underscore_must_use = \"allow\"\nlet_underscore_untyped = \"allow\"\nself_named_module_files = \"allow\"\nsignificant_drop_tightening = \"allow\"\n\n[lints.clippy.all]\nlevel = \"warn\"\npriority = -1\n\n[lints.clippy.cargo]\nlevel = \"warn\"\npriority = -1\n\n[lints.clippy.pedantic]\nlevel = \"warn\"\npriority = -1\n\n[lib]\n\n[dependencies]\nsys-locale = \"0.3.2\"\nunicode-script = \"0.5.8\"\n\n[dependencies.epaint]\nfeatures = [\"color_fonts\"]\nversion = \"0.37.0\"\npath = \"crates/epaint\"\ndefault-features = false\n\n[dependencies.fontique]\nversion = \"0.11.1\"\ndefault-features = false\nfeatures = [\"system\", \"fontconfig-dlopen\"]\n\n[dependencies.log]\nversion = \"0.4.34\"\nfeatures = [\"std\"]\n\n[dependencies.poll-promise]\nversion = \"0.3.0\"\ndefault-features = false\n\n[dependencies.skrifa]\nversion = \"0.44.0\"\ndefault-features = false\nfeatures = [\"std\", \"autohint_shaping\"]\n\n[dev-dependencies.egui]\nversion = \"0.37.0\"\npath = \"crates/egui\"\ndefault-features = false\n", - "dest": "cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_system_font_provider", - "dest-filename": "Cargo.toml" - }, - { - "type": "inline", - "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/11e349eb0774eb3ab9192b38c47d748bf18abba91a0e3952d8f196513da96ee6/egui_system_font_provider", - "dest-filename": ".cargo-checksum.json" - }, - { - "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=eeb134def2daa7e03512b4946bd59d6b419b9484\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-92168c1af4f3f511076af4245ec3ce22c5c554b4cc78c215ddf71587aac87d85\"\nrev = \"eeb134def2daa7e03512b4946bd59d6b419b9484\"\n\n[source.git-vendor-92168c1af4f3f511076af4245ec3ce22c5c554b4cc78c215ddf71587aac87d85]\ndirectory = \"cargo/vendor-git/92168c1af4f3f511076af4245ec3ce22c5c554b4cc78c215ddf71587aac87d85\"\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=4ffa307f1a0a6fbd8897318cc719440ab06e9c63\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-ded75ace3b48131a7498b2ad3ce7884b178155a1ef794dda2327c20c2979a816\"\nrev = \"4ffa307f1a0a6fbd8897318cc719440ab06e9c63\"\n\n[source.git-vendor-ded75ace3b48131a7498b2ad3ce7884b178155a1ef794dda2327c20c2979a816]\ndirectory = \"cargo/vendor-git/ded75ace3b48131a7498b2ad3ce7884b178155a1ef794dda2327c20c2979a816\"\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=cae7c1d8a6fec9a9ee136169918c5dd20ca509a0\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-48669c9c614317aff9d7e68539500174242c7d7449b5e293b3b821cd2c3b4c2f\"\nrev = \"cae7c1d8a6fec9a9ee136169918c5dd20ca509a0\"\n\n[source.git-vendor-48669c9c614317aff9d7e68539500174242c7d7449b5e293b3b821cd2c3b4c2f]\ndirectory = \"cargo/vendor-git/48669c9c614317aff9d7e68539500174242c7d7449b5e293b3b821cd2c3b4c2f\"\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=eeb134def2daa7e03512b4946bd59d6b419b9484\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-92168c1af4f3f511076af4245ec3ce22c5c554b4cc78c215ddf71587aac87d85\"\nrev = \"eeb134def2daa7e03512b4946bd59d6b419b9484\"\n\n[source.git-vendor-92168c1af4f3f511076af4245ec3ce22c5c554b4cc78c215ddf71587aac87d85]\ndirectory = \"cargo/vendor-git/92168c1af4f3f511076af4245ec3ce22c5c554b4cc78c215ddf71587aac87d85\"\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=3a6613f058e355a4fd8d196b2f385260bd4b4a8e\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09\"\nrev = \"3a6613f058e355a4fd8d196b2f385260bd4b4a8e\"\n\n[source.git-vendor-fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09]\ndirectory = \"cargo/vendor-git/fa803dfb7a41f05b5ba573459e7fc3d4f96f40797cfef348caafdeab92c94c09\"\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=4ffa307f1a0a6fbd8897318cc719440ab06e9c63\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-ded75ace3b48131a7498b2ad3ce7884b178155a1ef794dda2327c20c2979a816\"\nrev = \"4ffa307f1a0a6fbd8897318cc719440ab06e9c63\"\n\n[source.git-vendor-ded75ace3b48131a7498b2ad3ce7884b178155a1ef794dda2327c20c2979a816]\ndirectory = \"cargo/vendor-git/ded75ace3b48131a7498b2ad3ce7884b178155a1ef794dda2327c20c2979a816\"\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=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=cae7c1d8a6fec9a9ee136169918c5dd20ca509a0\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-48669c9c614317aff9d7e68539500174242c7d7449b5e293b3b821cd2c3b4c2f\"\nrev = \"cae7c1d8a6fec9a9ee136169918c5dd20ca509a0\"\n\n[source.git-vendor-48669c9c614317aff9d7e68539500174242c7d7449b5e293b3b821cd2c3b4c2f]\ndirectory = \"cargo/vendor-git/48669c9c614317aff9d7e68539500174242c7d7449b5e293b3b821cd2c3b4c2f\"\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" }