diff --git a/Cargo.lock b/Cargo.lock index 2d25db9642..0807fd6a80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1204,7 +1204,7 @@ source = "git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd [[package]] name = "craft-crw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3#23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3" +source = "git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a#f589ff485707007e814671229d0f4e77bc06968a" dependencies = [ "thiserror 2.0.21", ] @@ -1284,8 +1284,8 @@ dependencies = [ "avif-serialize", "craft-dds", "craft-jpeg", - "craft-metadata", - "craft-tiff", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", "craft-video", "crc32fast", "exr", @@ -1341,7 +1341,19 @@ source = "git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd dependencies = [ "brotli-decompressor 6.0.1", "chrono", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", + "quick-xml 0.41.0", + "serde", +] + +[[package]] +name = "craft-metadata" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a#f589ff485707007e814671229d0f4e77bc06968a" +dependencies = [ + "brotli-decompressor 6.0.1", + "chrono", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a)", "quick-xml 0.41.0", "serde", ] @@ -1387,12 +1399,12 @@ dependencies = [ [[package]] name = "craft-raw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3#23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3" +source = "git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a#f589ff485707007e814671229d0f4e77bc06968a" dependencies = [ "chrono", "craft-crw", - "craft-metadata", - "craft-tiff", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a)", "jxl-oxide", "miniz_oxide 0.9.1", "rayon", @@ -1411,6 +1423,15 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-tiff" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a#f589ff485707007e814671229d0f4e77bc06968a" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-ui" version = "0.1.0" @@ -3919,9 +3940,9 @@ dependencies = [ "craft-image-codecs", "craft-jpeg", "craft-jxl", - "craft-metadata", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", "craft-psd", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", "craft-video", "dhat", "jpeg-encoder 0.7.1", @@ -4002,7 +4023,8 @@ dependencies = [ "craft-mime", "craft-pdf", "craft-plist", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a)", "crc32fast", "fs4", "harfrust 0.13.3", @@ -4159,10 +4181,10 @@ version = "0.21.1" dependencies = [ "chrono", "craft-heif", - "craft-metadata", + "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", "craft-psd", "craft-raw", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", "lightcraft-geom", "proptest", "serde", @@ -4219,7 +4241,8 @@ dependencies = [ "craft-image-codecs", "craft-jxl", "craft-raw", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a)", "dhat", "jixel", "lightcraft-color", diff --git a/Cargo.toml b/Cargo.toml index 47669d19a8..176796d4c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,9 @@ 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 = "23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3" } -craft-raw = { git = "https://github.com/storytold/craft-libs", rev = "23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3" } +craft-raw = { git = "https://github.com/storytold/craft-libs", rev = "f589ff485707007e814671229d0f4e77bc06968a" } +# Match the RAW writer’s TIFF type without changing other app TIFF consumers. +craft-raw-tiff = { package = "craft-tiff", git = "https://github.com/storytold/craft-libs", rev = "f589ff485707007e814671229d0f4e77bc06968a" } lightcraft-raw = { path = "crates/raw" } lightcraft-codecs = { path = "crates/codecs" } lightcraft-meta = { path = "crates/meta" } diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index 807a5e5c82..0fa54516b2 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -64,6 +64,8 @@ denoise = ["dep:lightcraft-denoise", "lightcraft-denoise/runtime", "lightcraft-g rawnind-model = ["denoise", "lightcraft-denoise/rawnind-model", "lightcraft-denoise-core/rawnind-model"] [dev-dependencies] +# Construct RAW errors using the same TIFF package as craft-raw. +craft-raw-tiff = { workspace = true } # tests record why they skip (`cargo xtask ci` lists the skips) lightcraft-testkit = { workspace = true } # HDR JPEG XL tests read the file's colour encoding diff --git a/crates/engine/src/files/tests.rs b/crates/engine/src/files/tests.rs index d2a5bb36ea..12128d785b 100644 --- a/crates/engine/src/files/tests.rs +++ b/crates/engine/src/files/tests.rs @@ -1681,7 +1681,7 @@ fn decode_failures_of_recognised_raws_may_fall_back_to_the_preview() { assert_eq!(preview_reason(b"x", RawError::Unsupported("x".into())), Ok("x".to_string())); assert!(preview_reason(b"x", RawError::Corrupt("bad strip".into())).is_ok_and(|w| w.contains("bad strip"))); assert!(preview_reason(b"x", RawError::Limit("too big")).is_ok()); - assert!(preview_reason(b"x", RawError::Tiff(craft_tiff::TiffError::MissingTag(256))).is_ok()); + assert!(preview_reason(b"x", RawError::Tiff(craft_raw_tiff::TiffError::MissingTag(256))).is_ok()); assert!(preview_reason(b"x", RawError::NotRaw).is_err()); assert!(preview_reason(cr3, RawError::Corrupt("bad".into())).is_ok_and(|w| w.starts_with("CR3 "))); } diff --git a/crates/raw/Cargo.toml b/crates/raw/Cargo.toml index 078d76eb97..a09f539d89 100644 --- a/crates/raw/Cargo.toml +++ b/crates/raw/Cargo.toml @@ -11,6 +11,7 @@ workspace = true [dependencies] craft-tiff = { workspace = true } craft-raw = { workspace = true } +craft-raw-tiff = { workspace = true } lightcraft-meta = { workspace = true } lightcraft-raster = { workspace = true } lightcraft-color = { workspace = true } diff --git a/crates/raw/src/dcp_legacy_tests.rs b/crates/raw/src/dcp_legacy_tests.rs index 6144de0bf1..a374118e8c 100644 --- a/crates/raw/src/dcp_legacy_tests.rs +++ b/crates/raw/src/dcp_legacy_tests.rs @@ -5,6 +5,8 @@ //! `UniqueCameraModel`, `ProfileName`, the colour/forward matrices and calibration illuminants, the //! hue/saturation map, look table and tone curve. Nothing here ships a profile. +// Keep shared RAW field types aligned; this TIFF source is unchanged across the pin. +use craft_raw_tiff as craft_tiff; use craft_tiff::{ByteOrder, Ifd, ParseOptions, Tiff, tags as t}; use lightcraft_color::Xy; diff --git a/crates/raw/src/dngwrite.rs b/crates/raw/src/dngwrite.rs index d705f10c4a..e12eafbd33 100644 --- a/crates/raw/src/dngwrite.rs +++ b/crates/raw/src/dngwrite.rs @@ -158,7 +158,7 @@ pub fn write_dng(raw: &RawImage, opts: &DngWriteOptions) -> Result> { }; let options = craft_raw::DngWriteOptions { compression, - order: opts.order, + order: raw_byte_order(opts.order), software: SOFTWARE.into(), xmp: Some(opts.xmp.clone().unwrap_or_else(|| lightcraft_meta::write_xmp(&raw.metadata, None))), }; @@ -239,6 +239,13 @@ pub fn write_rendered_dng( write_dng(&raw, &DngWriteOptions { compression: DngCompression::Deflate { tile: 256, half: true }, order, xmp }) } +fn raw_byte_order(order: ByteOrder) -> craft_raw_tiff::ByteOrder { + match order { + ByteOrder::Little => craft_raw_tiff::ByteOrder::Little, + ByteOrder::Big => craft_raw_tiff::ByteOrder::Big, + } +} + #[cfg(test)] #[path = "dngwrite_legacy_tests.rs"] mod legacy; @@ -305,7 +312,7 @@ mod tests { ), ] { let options = DngWriteOptions { compression, order, xmp: None }; - let old_options = legacy::DngWriteOptions { compression: old_compression, order, xmp: None }; + let old_options = legacy::DngWriteOptions { compression: old_compression, order: raw_byte_order(order), xmp: None }; assert_eq!(write_dng(&raw, &options).unwrap(), legacy::write_dng(&raw, &old_options).unwrap()); } } diff --git a/crates/raw/src/dngwrite_legacy_tests.rs b/crates/raw/src/dngwrite_legacy_tests.rs index b5dc6a67fb..c11adf7626 100644 --- a/crates/raw/src/dngwrite_legacy_tests.rs +++ b/crates/raw/src/dngwrite_legacy_tests.rs @@ -6,6 +6,8 @@ //! bit-exact decoder round-trip tests. The raw image is stored in IFD0 (allowed by DNG 1.7 §"File Structure"). use crate::{RawData, RawError, RawImage, Result, ljpeg, opcodes}; +// Keep shared RAW field types aligned; this TIFF source is unchanged across the pin. +use craft_raw_tiff as craft_tiff; use craft_tiff::tags::{self as t, compression, photometric}; use craft_tiff::writer::{rational, srational}; use craft_tiff::{ByteOrder, IfdBuilder, ImageData, TiffWriter, Value}; diff --git a/crates/raw/tests/it/dng.rs b/crates/raw/tests/it/dng.rs index 1b4909c366..14e0349be4 100644 --- a/crates/raw/tests/it/dng.rs +++ b/crates/raw/tests/it/dng.rs @@ -1164,3 +1164,27 @@ fn legacy_lightcraft_dng_keeps_the_sensor_anchored_pattern() { assert_eq!(build("Adobe Photoshop Lightroom").cfa.unwrap().name(), "BGGR"); assert_ne!(lightcraft_raw::dngwrite::SOFTWARE, "LightCraft"); } + +/// The DJI compatibility fix in craft-raw #2042 must reach the application decoder, +/// without making a genuinely truncated raster acceptable. +#[test] +fn active_width_strip_count_keeps_the_full_sensor_raster() { + let mut raw = synthetic(16, 16, Some(Cfa::bayer("RGGB").unwrap()), 1); + raw.active_area = Rect::new(0, 0, 12, 16); + raw.crop = raw.active_area; + let mut bytes = write_dng(&raw, &DngWriteOptions { compression: DngCompression::Uncompressed, order: ByteOrder::Little, xmp: None }).unwrap(); + let ifd = u32::from_le_bytes(bytes[4..8].try_into().unwrap()) as usize; + let count = u16::from_le_bytes(bytes[ifd..ifd + 2].try_into().unwrap()) as usize; + let entry = + (0..count).map(|i| ifd + 2 + i * 12).find(|&at| u16::from_le_bytes(bytes[at..at + 2].try_into().unwrap()) == t::STRIP_BYTE_COUNTS).unwrap(); + assert_eq!(u16::from_le_bytes(bytes[entry + 2..entry + 4].try_into().unwrap()), 4); + assert_eq!(u32::from_le_bytes(bytes[entry + 4..entry + 8].try_into().unwrap()), 1); + bytes[entry + 8..entry + 12].copy_from_slice(&(12u32 * 16 * 2).to_le_bytes()); + let decoded = decode(&bytes).unwrap(); + assert_eq!((decoded.width, decoded.height), (16, 16)); + assert_eq!(decoded.data, raw.data); + assert_eq!(decoded.active_area, raw.active_area); + assert_eq!(lightcraft_raw::probe_info(&bytes).unwrap(), decoded.info()); + bytes.truncate(bytes.len() - 8); + assert!(decode(&bytes).is_err(), "a short raster must still be refused"); +} diff --git a/packaging/linux/flatpak/cargo-sources.json b/packaging/linux/flatpak/cargo-sources.json index c1e2598673..2de7728da1 100644 --- a/packaging/linux/flatpak/cargo-sources.json +++ b/packaging/linux/flatpak/cargo-sources.json @@ -5,6 +5,18 @@ "commit": "23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3", "dest": "flatpak-cargo/git/craft-libs-23acc70" }, + { + "type": "git", + "url": "https://github.com/storytold/craft-libs", + "commit": "f589ff485707007e814671229d0f4e77bc06968a", + "dest": "flatpak-cargo/git/craft-libs-f589ff4" + }, + { + "type": "git", + "url": "https://github.com/storytold/craft-libs", + "commit": "010702ee9b030844c852939095b1da0d0656a890", + "dest": "flatpak-cargo/git/craft-libs-010702e" + }, { "type": "git", "url": "https://github.com/storytold/egui", @@ -1564,19 +1576,19 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-23acc70/crates/crw\" \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-crw\"" + "mkdir -p \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-f589ff4/crates/crw\" \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/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\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.cargo]\nunused_workspace_dependencies = \"allow\"\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[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/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-crw", + "dest": "cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-crw", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-crw", + "dest": "cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-crw", "dest-filename": ".cargo-checksum.json" }, { @@ -1795,6 +1807,24 @@ "dest": "cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-metadata", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-f589ff4/crates/metadata\" \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/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.cargo]\nunused_workspace_dependencies = \"allow\"\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/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-metadata", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-metadata", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -1852,37 +1882,37 @@ { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-23acc70/crates/psd\" \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-psd\"" + "mkdir -p \"cargo/vendor-git/99bc9343a717980ecc0a6060bc456c868efb30d9fd2df9c4ad24ce778f67f446\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-010702e/crates/psd\" \"cargo/vendor-git/99bc9343a717980ecc0a6060bc456c868efb30d9fd2df9c4ad24ce778f67f446/craft-psd\"" ] }, { "type": "inline", "contents": "[package]\nname = \"craft-psd\"\ndescription = \"Faithful, lossless reader and writer for Adobe Photoshop PSD and PSB files, and for the Photoshop resource files that share their primitives (ABR, ASL, ACO, ACT, ASE, GRD, PAT, ATN, CSH, SHC)\"\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[features]\ncorpus = []\ndefault = []\nserde = [\"dep:serde\"]\ntest-support = []\ntestgen = [\"test-support\"]\n\n[dependencies]\nthiserror = \"2\"\nencoding_rs = \"0.8\"\n\n[dependencies.flate2]\nversion = \"1.1.10\"\ndefault-features = false\nfeatures = [\"zlib-rs\", \"runtime_detection\"]\n\n[dependencies.serde]\noptional = true\nversion = \"1\"\nfeatures = [\"derive\"]\n\n[target.\"cfg(not(target_arch = \\\"wasm32\\\"))\".dependencies]\nrayon = \"1\"\n\n[dev-dependencies]\nproptest = \"1\"\n\n[dev-dependencies.craft-psd]\npath = \".\"\nfeatures = [\"test-support\"]\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.cargo]\nunused_workspace_dependencies = \"allow\"\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n", - "dest": "cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-psd", + "dest": "cargo/vendor-git/99bc9343a717980ecc0a6060bc456c868efb30d9fd2df9c4ad24ce778f67f446/craft-psd", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-psd", + "dest": "cargo/vendor-git/99bc9343a717980ecc0a6060bc456c868efb30d9fd2df9c4ad24ce778f67f446/craft-psd", "dest-filename": ".cargo-checksum.json" }, { "type": "shell", "commands": [ - "mkdir -p \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-23acc70/crates/raw\" \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-raw\"" + "mkdir -p \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-f589ff4/crates/raw\" \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/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\"\n\n[lints.rust.unexpected_cfgs]\nlevel = \"warn\"\ncheck-cfg = [\"cfg(craft_pdf_unicode_fixtures)\"]\n\n[lints.cargo]\nunused_workspace_dependencies = \"allow\"\n\n[lints.clippy]\ncognitive_complexity = \"deny\"\ntoo_many_arguments = \"deny\"\nwildcard_imports = \"deny\"\ndbg_macro = \"warn\"\ntodo = \"warn\"\n\n[features]\nline-dng = [\"dng\"]\nline-dng-threads = [\"line-dng\"]\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/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-raw", + "dest": "cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-raw", "dest-filename": "Cargo.toml" }, { "type": "inline", "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-raw", + "dest": "cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-raw", "dest-filename": ".cargo-checksum.json" }, { @@ -1903,6 +1933,24 @@ "dest": "cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2/craft-tiff", "dest-filename": ".cargo-checksum.json" }, + { + "type": "shell", + "commands": [ + "mkdir -p \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845\" && cp -r --reflink=auto \"flatpak-cargo/git/craft-libs-f589ff4/crates/tiff\" \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/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.cargo]\nunused_workspace_dependencies = \"allow\"\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/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-tiff", + "dest-filename": "Cargo.toml" + }, + { + "type": "inline", + "contents": "{\"package\": null, \"files\": {}}", + "dest": "cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845/craft-tiff", + "dest-filename": ".cargo-checksum.json" + }, { "type": "shell", "commands": [ @@ -10065,7 +10113,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=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2\"\nrev = \"23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3\"\n\n[source.git-vendor-05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2]\ndirectory = \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2\"\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=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2\"\nrev = \"23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3\"\n\n[source.git-vendor-05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2]\ndirectory = \"cargo/vendor-git/05379771fa41dc3c15fd5db47eb1620f814f86df62e796a9c20c7d492ad11cc2\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=f589ff485707007e814671229d0f4e77bc06968a\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845\"\nrev = \"f589ff485707007e814671229d0f4e77bc06968a\"\n\n[source.git-vendor-7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845]\ndirectory = \"cargo/vendor-git/7cf03c85c6ea81c9ddd6837c900f42209a261692c9bf567f0cd0644ba50cc845\"\n\n[source.\"https://github.com/storytold/craft-libs?rev=010702ee9b030844c852939095b1da0d0656a890\"]\ngit = \"https://github.com/storytold/craft-libs\"\nreplace-with = \"git-vendor-99bc9343a717980ecc0a6060bc456c868efb30d9fd2df9c4ad24ce778f67f446\"\nrev = \"010702ee9b030844c852939095b1da0d0656a890\"\n\n[source.git-vendor-99bc9343a717980ecc0a6060bc456c868efb30d9fd2df9c4ad24ce778f67f446]\ndirectory = \"cargo/vendor-git/99bc9343a717980ecc0a6060bc456c868efb30d9fd2df9c4ad24ce778f67f446\"\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" }