mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-17 10:46:46 +00:00
Merge #7664 (fix/restore-codec-cutover-ci) into feat/cutover-remaining-codecs
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.
This commit is contained in:
@@ -597,6 +597,7 @@ fn declared_embedded_and_linked_images_have_distinct_metadata_and_pixel_omission
|
||||
let gray = craft_image_codecs::encode(
|
||||
&craft_image_codecs::Image::from_raw(2, 2, craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, vec![90; 4]).unwrap(),
|
||||
craft_image_codecs::Format::Png,
|
||||
&craft_image_codecs::EncodeOptions::default(),
|
||||
)
|
||||
.unwrap();
|
||||
for (blob, mode) in [(ImageBlob::png(gray), "gray"), (ImageBlob::png(b"not an image".to_vec()), "unknown")] {
|
||||
|
||||
Reference in New Issue
Block a user