mirror of
https://github.com/storytold/lightcraft.git
synced 2026-11-21 01:43:51 +01:00
Conflicts in Cargo.toml and crates/codecs/src/psd.rs after #4301:
- keep this branch's craft-psd d181e08d (merged reader; newer than main's
16d83810) and main's jpeg-encoder line;
- keep the shared merged reader (craft_psd::merged) for decode and header,
with main's writer (craft_psd::flat) and resources(&[ImageResource]);
- keep main's behaviour that a damaged image resources section is left out
of the decode (8dd2d60a): Merged::open refuses it, so the file is reopened
with that section emptied.