mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-16 22:34:43 +00:00
Conflicts resolved in favour of main/#7664 in the 13 source files both touched (doc/cmyk.rs, metafile/dib.rs, pdf images, svg import/files.rs, render paint and encode tests, trace, engine load.rs), keeping main's newer TIFF/CMYK, DIB and PDF image fixes. vectorcraft-doc stays on main's version until its CMYK reader moves to craft-tiff. The image crate keeps its format features, and usvg, tiff, zune-jpeg, hayro-ccitt and jpeg-encoder stay for the readers not yet moved. Codec crates pinned to craft-libs d6cd7836d364177661b0ae17f48a0805e83a5f32. Also fixes the compile errors CodeRabbit flagged (jp2read DecodeOptions, filters.rs use-after-move) and the encode() arity at d6cd7836d.