Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge remote-tracking branch 'origin/main' into r55

Brandon Thomas2c8ea6d1678d
diff --cc Cargo.lock
index ed2bd477d,82a6f1b93..222b525f8
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -1016,11 -1016,10 +1016,11 @@@ dependencies =
name = "designcraft-images"
version = "0.2.1"
dependencies = [
+ "designcraft-color",
"designcraft-fonts",
"image",
- "psd",
"resvg",
+ "tiff",
]
[[package]]
diff --cc Cargo.toml
index 37ea3c8a4,a53ca7240..715ab8f57
--- a/Cargo.toml
+++ b/Cargo.toml
@@@ -50,12 -50,9 +50,11 @@@ harfrust = "0.13
vello_cpu = "0.2"
vello_common = { version = "0.2", default-features = false }
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp", "gif", "tiff", "bmp"] }
+# CMYK TIFF samples for PDF export (`image` decodes them to RGB); the version `image` uses.
+tiff = "0.11"
- # SVG (same usvg as krilla-svg) and Photoshop composites.
+ # SVG (same usvg as krilla-svg).
resvg = { version = "0.47", default-features = false, features = ["text"] }
krilla-svg = "0.8"
- psd = "0.3"
# Boolean operations on Bézier paths (Pathfinder).
flo_curves = "0.8"
# QR codes (Object › Generate QR Code); MIT.
diff --cc crates/images/Cargo.toml
index b7be5df13,8f57600d7..de878d596
--- a/crates/images/Cargo.toml
+++ b/crates/images/Cargo.toml
@@@ -9,8 -9,7 +9,8 @@@ description = "DesignCraft placed-graph
workspace = true
[dependencies]
+ designcraft-color = { workspace = true }
designcraft-fonts = { workspace = true }
image = { workspace = true }
+tiff = { workspace = true }
resvg = { workspace = true }
- psd = { workspace = true }