mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 12:38:18 +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:
@@ -124,8 +124,10 @@ fn gray_and_bilevel_images_store_gray() {
|
||||
assert_eq!(gray(&file), levels);
|
||||
let (mime, file) = img.to_bilevel(150.0).unwrap();
|
||||
assert_eq!(mime, "image/tiff");
|
||||
let mut d = ::tiff::decoder::Decoder::new(std::io::Cursor::new(&file)).unwrap();
|
||||
assert_eq!(d.colortype().unwrap(), ::tiff::ColorType::Gray(1));
|
||||
let tiff = craft_tiff::Tiff::parse(&file).unwrap();
|
||||
let ifd = &tiff.ifds[0];
|
||||
assert_eq!(ifd.u16(craft_tiff::tags::SAMPLES_PER_PIXEL), Some(1));
|
||||
assert_eq!(ifd.value(craft_tiff::tags::BITS_PER_SAMPLE).unwrap().to_u64_vec(), vec![1]);
|
||||
let bw: Vec<u8> = [0u8, 0, 255, 255, 255, 0].iter().flat_map(|&g| [g, 255]).collect();
|
||||
assert_eq!(gray(&file), bw, "from 128 up is white");
|
||||
// Half-covered white over the light grey; a clear pixel is white.
|
||||
|
||||
Reference in New Issue
Block a user