From 0f2cb22ce739b19e5dc8769489a025cfa073f7b2 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Sun, 15 Nov 2026 21:18:51 +0100 Subject: [PATCH] chore(codecs): keep craft-image-codecs on craft-libs main (d6cd7836d) b3b8521ab isn't on craft-libs main. Its probe_stored_size was only needed for DXF image sizes, which vectorcraft_doc::header_size already reads from PNG, JPEG, BMP and TIFF headers. --- Cargo.lock | 97 +++++++++++++----------------------------------------- Cargo.toml | 2 +- 2 files changed, 23 insertions(+), 76 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbde79e8c0..f18472beab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1081,38 +1081,13 @@ dependencies = [ "writeable", ] -[[package]] -name = "craft-image-codecs" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639#b3b8521ab4029033a9ffc4ebad53f4901cbdf639" -dependencies = [ - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", - "crc32fast", - "exr", - "flate2", - "half", - "hayro-jpeg2000", - "image", - "image-webp", - "jpeg-encoder", - "png 0.18.1", - "rayon", - "serde_json", - "thiserror 2.0.21", - "tiff", - "zune-core", - "zune-jpeg", - "zune-jpegxl", -] - [[package]] name = "craft-image-codecs" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae17f48a0805e83a5f32#d6cd7836d364177661b0ae17f48a0805e83a5f32" dependencies = [ - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae17f48a0805e83a5f32)", - "craft-metadata 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae17f48a0805e83a5f32)", + "craft-jpeg", + "craft-metadata", "exr", "flate2", "half", @@ -1130,14 +1105,6 @@ dependencies = [ "zune-jpegxl", ] -[[package]] -name = "craft-jpeg" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639#b3b8521ab4029033a9ffc4ebad53f4901cbdf639" -dependencies = [ - "thiserror 2.0.21", -] - [[package]] name = "craft-jpeg" version = "0.1.0" @@ -1166,18 +1133,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "craft-metadata" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639#b3b8521ab4029033a9ffc4ebad53f4901cbdf639" -dependencies = [ - "brotli-decompressor 6.3.1", - "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", - "quick-xml 0.41.0", - "serde", -] - [[package]] name = "craft-metadata" version = "0.1.0" @@ -1185,7 +1140,7 @@ source = "git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae dependencies = [ "brotli-decompressor 6.3.1", "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae17f48a0805e83a5f32)", + "craft-tiff", "quick-xml 0.41.0", "serde", ] @@ -1264,7 +1219,7 @@ name = "craft-svg" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae17f48a0805e83a5f32#d6cd7836d364177661b0ae17f48a0805e83a5f32" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae17f48a0805e83a5f32)", + "craft-image-codecs", "craft-xml", "flate2", "kurbo 0.13.1", @@ -1276,15 +1231,6 @@ dependencies = [ "vectorcraft-pathops 0.18.0", ] -[[package]] -name = "craft-tiff" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639#b3b8521ab4029033a9ffc4ebad53f4901cbdf639" -dependencies = [ - "serde", - "thiserror 2.0.21", -] - [[package]] name = "craft-tiff" version = "0.1.0" @@ -6657,7 +6603,7 @@ name = "vectorcraft-affinity" version = "0.24.1" dependencies = [ "craft-affinity", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "crc32fast", "proptest", ] @@ -6686,7 +6632,7 @@ name = "vectorcraft-cad" version = "0.24.1" dependencies = [ "craft-dxf", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "image", "kurbo 0.13.1", "serde_json", @@ -6739,6 +6685,7 @@ name = "vectorcraft-doc" version = "0.24.1" dependencies = [ "chrono", + "craft-image-codecs", "hayro-ccitt", "image", "jpeg-encoder", @@ -6757,7 +6704,7 @@ dependencies = [ name = "vectorcraft-effects" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-svg", "image", "kurbo 0.13.1", @@ -6782,7 +6729,7 @@ dependencies = [ "chrono", "craft-docpath", "craft-heif", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-jxl", "craft-proof", "craft-xml", @@ -6828,12 +6775,12 @@ name = "vectorcraft-eps" version = "0.24.1" dependencies = [ "craft-eps", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-pdf", - "craft-stream-codecs", "encoding_rs", "fax", "flate2", + "hayro-ccitt", "image", "kurbo 0.13.1", "memchr", @@ -6906,7 +6853,7 @@ dependencies = [ name = "vectorcraft-mcp" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "image", "log", "proptest", @@ -6926,7 +6873,7 @@ dependencies = [ name = "vectorcraft-metafile" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-metafile", "image", "kurbo 0.13.1", @@ -6967,7 +6914,7 @@ version = "0.24.1" dependencies = [ "aes", "chrono", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-pdf", "craft-stream-codecs", "craft-xml", @@ -7001,7 +6948,7 @@ dependencies = [ name = "vectorcraft-plugins" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-vectorcraft-format", "log", "serde", @@ -7021,10 +6968,10 @@ name = "vectorcraft-render" version = "0.24.1" dependencies = [ "craft-gif", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-psd", "craft-stream-codecs", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d6cd7836d364177661b0ae17f48a0805e83a5f32)", + "craft-tiff", "flate2", "image", "log", @@ -7059,7 +7006,7 @@ name = "vectorcraft-svg" version = "0.24.1" dependencies = [ "craft-docpath", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-svg", "data-url", "flate2", @@ -7088,7 +7035,7 @@ dependencies = [ name = "vectorcraft-testkit" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "fax", "kurbo 0.13.1", "proptest", @@ -7135,7 +7082,7 @@ dependencies = [ name = "vectorcraft-tools" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "kurbo 0.13.1", "serde", "serde_json", @@ -7152,7 +7099,7 @@ dependencies = [ name = "vectorcraft-trace" version = "0.24.1" dependencies = [ - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "image", "kurbo 0.13.1", "serde", @@ -7167,7 +7114,7 @@ version = "0.24.1" dependencies = [ "bytemuck", "chrono", - "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3b8521ab4029033a9ffc4ebad53f4901cbdf639)", + "craft-image-codecs", "craft-keymap", "craft-ui", "craft-update", diff --git a/Cargo.toml b/Cargo.toml index fd32091836..05330c906a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "6d620e971e # WMF, EMF and EMF+ reader (craft-libs#778). craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "6d620e971e820b517b11a99cad040ebac670e1e2" } craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "d6cd7836d364177661b0ae17f48a0805e83a5f32" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "b3b8521ab4029033a9ffc4ebad53f4901cbdf639" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "d6cd7836d364177661b0ae17f48a0805e83a5f32" } craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "d6cd7836d364177661b0ae17f48a0805e83a5f32" } craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "d6cd7836d364177661b0ae17f48a0805e83a5f32" } craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "d6cd7836d364177661b0ae17f48a0805e83a5f32" }