From 31658546a8b6bf21505704cfcba1409c62cbe49b Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Sun, 15 Nov 2026 18:05:45 +0100 Subject: [PATCH] fix(codecs): build the cutover against craft-libs d6cd7836d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Test files whose image→craft-image-codecs rewrites didn't compile against main's newer tests go back to main's versions (engine fileio/tests.rs, tests_tiffbmp.rs, tests/menucmds.rs, eps tests.rs); they still use the image crate, which keeps its format features. - craft_jxl::encode, craft_image_codecs::encode and Image::icc at d6cd7836d. - jp2read and pdf export pass DecodeOptions, not Limits. - EPS DCTDecode: grey JPEGs no longer use the image after moving it, and keep main's one-channel output. - svg keeps its direct usvg dependency for main's image href code; pdf keeps jpeg-encoder for CMYK JPEGs. - clippy -D warnings and rustfmt clean. --- crates/cad/src/scene.rs | 3 +- crates/effects/src/pixel/loaded.rs | 3 +- crates/effects/src/svg_filter.rs | 4 +- crates/engine/src/cmd/addons/color/tests.rs | 2 +- crates/engine/src/cmd/addons/image.rs | 7 +- .../engine/src/cmd/addons/image/mask/tests.rs | 4 +- crates/engine/src/cmd/addons/image/tests.rs | 11 +- crates/engine/src/cmd/docinfo.rs | 4 +- crates/engine/src/cmd/fileio/affinity.rs | 1 - .../engine/src/cmd/fileio/affinity/import.rs | 4 +- .../engine/src/cmd/fileio/affinity/layout.rs | 2 +- crates/engine/src/cmd/fileio/jxlread.rs | 2 +- crates/engine/src/cmd/fileio/tests.rs | 578 +++--------------- .../engine/src/cmd/fileio/tests_affinity.rs | 3 +- crates/engine/src/cmd/fileio/tests_jxlread.rs | 16 +- crates/engine/src/cmd/fileio/tests_pdf.rs | 2 +- .../engine/src/cmd/fileio/tests_selexport.rs | 2 +- crates/engine/src/cmd/fileio/tests_tiffbmp.rs | 211 +------ crates/engine/src/cmd/flatten/analysis.rs | 3 +- crates/engine/src/cmd/links.rs | 2 +- crates/engine/src/cmd/place/document.rs | 3 +- crates/engine/src/tests/adjust.rs | 2 +- crates/engine/src/tests/build.rs | 2 +- crates/engine/src/tests/clipflavours.rs | 2 +- crates/engine/src/tests/colorize.rs | 2 +- crates/engine/src/tests/dynamic_symbols.rs | 2 +- crates/engine/src/tests/editcolors.rs | 2 +- crates/engine/src/tests/envelope_distort.rs | 6 +- crates/engine/src/tests/eyedropper.rs | 4 +- crates/engine/src/tests/legacy_ai.rs | 6 +- crates/engine/src/tests/links.rs | 2 +- crates/engine/src/tests/live.rs | 2 +- crates/engine/src/tests/menucmds.rs | 148 +---- crates/engine/src/tests/pdfraster.rs | 3 +- crates/engine/src/tests/place.rs | 4 +- crates/engine/src/tests/rasterfilters.rs | 2 +- crates/engine/src/tests/recolor.rs | 4 +- crates/engine/src/tests/warp_images.rs | 6 +- crates/engine/tests/color_settings.rs | 2 +- crates/engine/tests/command_sweep.rs | 2 +- crates/engine/tests/import_fuzz.rs | 21 +- crates/engine/tests/plugin_export.rs | 2 +- crates/engine/tests/plugin_import.rs | 2 +- crates/eps/src/ai_editing/tests.rs | 6 +- crates/eps/src/import/data/filters.rs | 4 +- crates/eps/src/import/tests.rs | 2 +- crates/eps/src/import/tests_native.rs | 2 +- crates/eps/src/legacy_ai/tests.rs | 2 +- crates/eps/src/tests.rs | 138 +---- crates/metafile/src/import/pict.rs | 1 - crates/pdf/src/export.rs | 2 +- crates/pdf/src/tests.rs | 2 +- crates/pdf/src/tests/cmykimages.rs | 2 +- crates/pdf/src/tests/colorize.rs | 6 +- crates/pdf/src/tests/output.rs | 1 - crates/pdf/src/tests/pdfx.rs | 4 +- crates/pdf/src/tests/webview.rs | 7 +- crates/render/src/tests/adjust.rs | 2 +- crates/render/src/tests/changed.rs | 2 +- crates/render/src/tests/cmykblend.rs | 4 +- crates/render/src/tests/colorize.rs | 10 +- crates/render/src/tests/layeropts.rs | 2 +- crates/render/src/tests/memory.rs | 6 +- crates/render/src/tests/meshwarp.rs | 2 +- crates/render/src/tests/objectfx.rs | 4 +- crates/render/src/tests/placed_document.rs | 2 +- crates/render/src/tests/viewraster.rs | 2 +- crates/svg/src/glyph.rs | 1 - crates/svg/src/import/css.rs | 1 - crates/svg/src/import/css_transform.rs | 1 - crates/svg/src/import/depth.rs | 1 - crates/svg/src/import/symbol_units.rs | 1 - crates/svg/src/import/vector_effect.rs | 1 - crates/svg/tests/classes.rs | 1 - crates/svg/tests/it/basic_shapes.rs | 1 - crates/svg/tests/it/blend_export.rs | 1 - crates/svg/tests/it/colorized_images.rs | 1 - crates/svg/tests/it/dash_align.rs | 1 - crates/svg/tests/it/data_attributes.rs | 1 - crates/svg/tests/it/foreign_attributes.rs | 1 - crates/svg/tests/it/import_details.rs | 1 - crates/svg/tests/it/import_live.rs | 1 - crates/svg/tests/it/interactivity.rs | 1 - crates/svg/tests/it/mask_options.rs | 1 - crates/svg/tests/it/mesh_export.rs | 1 - crates/svg/tests/it/spread.rs | 1 - crates/svg/tests/it/stroke_export.rs | 1 - crates/svg/tests/it/symbols_layers.rs | 1 - crates/svg/tests/it/warp_pieces.rs | 1 - crates/ui-egui/src/addons/image/tests.rs | 2 +- crates/ui-egui/src/canvas/tests.rs | 10 +- crates/ui-egui/src/i18n/tests.rs | 2 +- crates/ui-egui/src/panels/brushes/tests.rs | 2 +- .../ui-egui/src/panels/image_trace/tests.rs | 10 +- crates/ui-egui/src/placing/tests.rs | 4 +- crates/ui-egui/src/tests/sysclip.rs | 2 +- crates/ui-egui/src/tests/trace_runs.rs | 2 +- 97 files changed, 235 insertions(+), 1131 deletions(-) diff --git a/crates/cad/src/scene.rs b/crates/cad/src/scene.rs index 28d05e04f9..27a8cc2cce 100644 --- a/crates/cad/src/scene.rs +++ b/crates/cad/src/scene.rs @@ -5,7 +5,6 @@ //! filled outlines where the look needs them. use std::collections::HashMap; -use std::io::Cursor; use kurbo::PathEl; use vectorcraft_color::Paint; @@ -1422,7 +1421,7 @@ impl<'a> Scene<'a> { RasterFormat::Jpeg => { // No alpha in JPEG: transparent pixels over white. let mut rgb = Vec::with_capacity(rgba.len() / 4 * 3); - for p in rgba.chunks_exact_mut(4) { + for p in rgba.as_chunks_mut::<4>().0 { let a = u32::from(p[3]); for c in &p[..3] { rgb.push(((u32::from(*c) * a + 255 * (255 - a)) / 255) as u8); diff --git a/crates/effects/src/pixel/loaded.rs b/crates/effects/src/pixel/loaded.rs index c3b8038911..b36db047fc 100644 --- a/crates/effects/src/pixel/loaded.rs +++ b/crates/effects/src/pixel/loaded.rs @@ -6,7 +6,6 @@ //! lies one pixel per point at 100 %, centered on the object's center and repeated in both //! directions. -use std::io::Cursor; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::{Arc, Mutex, PoisonError}; @@ -107,7 +106,7 @@ impl LoadedTexture { return None; } let mut opts = craft_image_codecs::DecodeOptions::default(); - opts.limits.max_alloc = vectorcraft_doc::MAX_RASTER_ALLOC as u64; + opts.limits.max_alloc = vectorcraft_doc::MAX_RASTER_ALLOC; let img = craft_image_codecs::decode_as_with(craft_image_codecs::Format::Png, png, &opts).ok()?; let (width, height) = img.dimensions(); if width == 0 || height == 0 { diff --git a/crates/effects/src/svg_filter.rs b/crates/effects/src/svg_filter.rs index 440b0ed45e..47a7d081ca 100644 --- a/crates/effects/src/svg_filter.rs +++ b/crates/effects/src/svg_filter.rs @@ -1651,7 +1651,6 @@ fn on_canvas(data: &[u8], w: usize, h: usize, cw: u32, ch: u32, to_canvas: Affin /// The pixels of `data` (premultiplied RGBA8, `w` wide) in columns x0..x1 and rows y0..y1, as a PNG. fn png_of(data: &[u8], w: usize, x0: usize, y0: usize, x1: usize, y1: usize) -> Option> { - use image::ImageEncoder; let px = data.as_chunks::<4>().0; let mut straight = Vec::with_capacity((x1 - x0) * (y1 - y0) * 4); for y in y0..y1 { @@ -1669,8 +1668,7 @@ fn png_of(data: &[u8], w: usize, x0: usize, y0: usize, x1: usize, y1: usize) -> straight, ) .ok()?; - let mut opts = craft_image_codecs::EncodeOptions::default(); - opts.png_compression = craft_image_codecs::PngCompression::Fast; + let opts = craft_image_codecs::EncodeOptions { png_compression: craft_image_codecs::PngCompression::Fast, ..Default::default() }; craft_image_codecs::encode(&raw, craft_image_codecs::Format::Png, &opts).ok() } diff --git a/crates/engine/src/cmd/addons/color/tests.rs b/crates/engine/src/cmd/addons/color/tests.rs index 4af9769386..213bc5ccf7 100644 --- a/crates/engine/src/cmd/addons/color/tests.rs +++ b/crates/engine/src/cmd/addons/color/tests.rs @@ -112,7 +112,7 @@ fn image(s: &mut Session, key: &str, blob: vectorcraft_doc::ImageBlob, x: f64) - fn png(img: image::DynamicImage) -> vectorcraft_doc::ImageBlob { let mut bytes = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img; let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/cmd/addons/image.rs b/crates/engine/src/cmd/addons/image.rs index 15eaf7b473..ca6420bf20 100644 --- a/crates/engine/src/cmd/addons/image.rs +++ b/crates/engine/src/cmd/addons/image.rs @@ -13,10 +13,9 @@ mod tests; pub(crate) use mask::refresh as refresh_color_masks; use std::collections::{HashMap, HashSet}; -use std::io::Cursor; use std::sync::{Arc, Weak}; -use image::{DynamicImage, ImageBuffer, LumaA, Rgba}; +use image::{ImageBuffer, Rgba}; use serde_json::{Value, json}; use vectorcraft_color::Color; use vectorcraft_doc::{ImageBlob, ImageObject, NodeId, NodeKind}; @@ -472,8 +471,8 @@ fn decode(blob: &ImageBlob, kept: Option<&mut DecodedImages>, cmd: &str) -> Resu let px = Arc::new(if deep { let rgba16 = match (img.layout(), img.to_u16_samples()) { (craft_image_codecs::ChannelLayout::Rgba, Some(v)) => v, - (craft_image_codecs::ChannelLayout::Rgb, Some(v)) => v.chunks_exact(3).flat_map(|c| [c[0], c[1], c[2], u16::MAX]).collect(), - (craft_image_codecs::ChannelLayout::GrayA, Some(v)) => v.chunks_exact(2).flat_map(|c| [c[0], c[0], c[0], c[1]]).collect(), + (craft_image_codecs::ChannelLayout::Rgb, Some(v)) => v.as_chunks::<3>().0.iter().flat_map(|c| [c[0], c[1], c[2], u16::MAX]).collect(), + (craft_image_codecs::ChannelLayout::GrayA, Some(v)) => v.as_chunks::<2>().0.iter().flat_map(|c| [c[0], c[0], c[0], c[1]]).collect(), (craft_image_codecs::ChannelLayout::Gray, Some(v)) => v.into_iter().flat_map(|g| [g, g, g, u16::MAX]).collect(), _ => img.to_rgba8().into_iter().map(|b| u16::from(b) * 257).collect(), }; diff --git a/crates/engine/src/cmd/addons/image/mask/tests.rs b/crates/engine/src/cmd/addons/image/mask/tests.rs index 1b69c709f0..7fa1cd50fb 100644 --- a/crates/engine/src/cmd/addons/image/mask/tests.rs +++ b/crates/engine/src/cmd/addons/image/mask/tests.rs @@ -1,5 +1,3 @@ -use std::io::Cursor; - use image::DynamicImage; use serde_json::{Value, json}; use vectorcraft_color::{Color, Paint}; @@ -16,7 +14,7 @@ const RED: [u8; 4] = [200, 0, 0, 255]; fn png(img: DynamicImage) -> Vec { let mut out = Vec::new(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img; let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/cmd/addons/image/tests.rs b/crates/engine/src/cmd/addons/image/tests.rs index 23cfb6ad51..e5f50c5fda 100644 --- a/crates/engine/src/cmd/addons/image/tests.rs +++ b/crates/engine/src/cmd/addons/image/tests.rs @@ -1,4 +1,3 @@ -use std::io::Cursor; use std::sync::Arc; use image::{DynamicImage, ImageBuffer, Luma, LumaA, Rgb}; @@ -22,7 +21,7 @@ fn settings(background: Background) -> Settings { fn png(img: DynamicImage) -> Vec { let mut out = Vec::new(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img; let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -219,7 +218,7 @@ fn reused_pixels_keep_their_depth_gray_and_profile() { let raw: Vec = gray16.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(); let mut cimg = craft_image_codecs::Image::from_raw(8, 8, craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U16, raw).unwrap(); - cimg.meta.icc = Some(icc.clone()); + cimg.icc = Some(icc.clone()); let bytes = craft_image_codecs::encode(&cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap(); let decodes = || super::DECODES.with(std::cell::Cell::get); let (mut s, id) = open(&bytes); @@ -235,7 +234,7 @@ fn reused_pixels_keep_their_depth_gray_and_profile() { assert_eq!((out.get_pixel(0, 0).0, out.get_pixel(3, 3).0), ([61_000, 0], [7_000, 65_535])); let result = bytes_of(&s, id); let decoded = craft_image_codecs::decode_as(craft_image_codecs::Format::Png, result.as_slice()).unwrap(); - assert_eq!(decoded.meta.icc, Some(icc)); + assert_eq!(decoded.icc, Some(icc)); } /// Once the background is cleared, most edge pixels are clear and a second run clears nothing: the @@ -445,12 +444,12 @@ fn the_color_profile_is_kept() { f.into_raw(), ) .unwrap(); - cimg.meta.icc = Some(icc.clone()); + cimg.icc = Some(icc.clone()); let bytes = craft_image_codecs::encode(&cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap(); let blob = ImageBlob::png(bytes); let out = super::clear(&blob, &settings(Background::Edges), None, super::C).unwrap().unwrap(); let decoded = craft_image_codecs::decode_as(craft_image_codecs::Format::Png, out.blob.bytes.as_slice()).unwrap(); - assert_eq!(decoded.meta.icc, Some(icc)); + assert_eq!(decoded.icc, Some(icc)); } /// The resolution the file declares stays with the pixels, so a later Replace or relink sizes the diff --git a/crates/engine/src/cmd/docinfo.rs b/crates/engine/src/cmd/docinfo.rs index 91a45ec4de..59d39625db 100644 --- a/crates/engine/src/cmd/docinfo.rs +++ b/crates/engine/src/cmd/docinfo.rs @@ -1501,7 +1501,7 @@ mod tests { s.execute("swatch.new", &json!({"name": "Ink", "color": {"model": "cmyk", "c": 0, "m": 1, "y": 1, "k": 0}, "spot": true})).unwrap(); let mut bytes = Vec::new(); { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(2, 1, vec![0, 255]).unwrap())).into(); + let __dyn: image::DynamicImage = image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(2, 1, vec![0, 255]).unwrap()); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -1690,7 +1690,7 @@ mod tests { // A grayscale image colorized with the spot color. let mut bytes = Vec::new(); { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(2, 1, vec![0, 255]).unwrap())).into(); + let __dyn: image::DynamicImage = image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(2, 1, vec![0, 255]).unwrap()); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/cmd/fileio/affinity.rs b/crates/engine/src/cmd/fileio/affinity.rs index c8ef3235ec..e10495e815 100644 --- a/crates/engine/src/cmd/fileio/affinity.rs +++ b/crates/engine/src/cmd/fileio/affinity.rs @@ -4,7 +4,6 @@ //! native document can't be read opens as its embedded preview instead, with a warning that says //! why, and can't be placed. -use std::io::Cursor; use std::sync::Arc; use kurbo::{Affine, BezPath, Point, Rect, Vec2}; diff --git a/crates/engine/src/cmd/fileio/affinity/import.rs b/crates/engine/src/cmd/fileio/affinity/import.rs index 755ad5b07b..27964bc665 100644 --- a/crates/engine/src/cmd/fileio/affinity/import.rs +++ b/crates/engine/src/cmd/fileio/affinity/import.rs @@ -1,4 +1,4 @@ -use super::{Builder, Cursor, Document, Result, err, raster_doc}; +use super::{Builder, Document, Result, err, raster_doc}; /// What an Affinity file opened as. pub(in super::super) struct Imported { @@ -34,7 +34,7 @@ fn preview(name: &str, bytes: &[u8], native: &vectorcraft_affinity::Error) -> Re opts.limits.max_width = 4096; opts.limits.max_height = 4096; opts.limits.max_alloc = 128 << 20; - let _pixels = craft_image_codecs::decode_as_with(craft_image_codecs::Format::Png, &p.png, &opts).map_err(err)?; + let _pixels = craft_image_codecs::decode_as_with(craft_image_codecs::Format::Png, p.png, &opts).map_err(err)?; let d = raster_doc(name, p.png)?; Ok(( d, diff --git a/crates/engine/src/cmd/fileio/affinity/layout.rs b/crates/engine/src/cmd/fileio/affinity/layout.rs index 4f47811c7f..da7ce9aaee 100644 --- a/crates/engine/src/cmd/fileio/affinity/layout.rs +++ b/crates/engine/src/cmd/fileio/affinity/layout.rs @@ -1,5 +1,5 @@ use super::nodes::MAX_DEPTH; -use super::{AfAlign, CharStyle, Cursor, Justify, Kind, Rect, TextKind, TextObject, VerticalAlign, af, shapes}; +use super::{AfAlign, CharStyle, Justify, Kind, Rect, TextKind, TextObject, VerticalAlign, af, shapes}; /// The master page instances among `nodes` (also inside layers and groups): (master, first page, /// first master page, page count). diff --git a/crates/engine/src/cmd/fileio/jxlread.rs b/crates/engine/src/cmd/fileio/jxlread.rs index 62b821cf90..37b28f63a9 100644 --- a/crates/engine/src/cmd/fileio/jxlread.rs +++ b/crates/engine/src/cmd/fileio/jxlread.rs @@ -52,7 +52,7 @@ pub fn decode(bytes: &[u8], max_alloc: u64) -> Result<(image::RgbaImage, Option< let gray = channels < 3; let has_alpha = decoded.layout.has_alpha(); let mut out = image::RgbaImage::new(w, h); - for (dst, src) in out.chunks_exact_mut(4).zip(decoded.pixels.chunks_exact(channels)) { + for (dst, src) in out.as_chunks_mut::<4>().0.iter_mut().zip(decoded.pixels.chunks_exact(channels)) { let a = if has_alpha { src[channels - 1].clamp(0.0, 1.0) } else { 1.0 }; let unpremul = |v: f32| if decoded.pixels_premultiplied && a > 0.0 { v / a } else { v }; let rgb = if gray { diff --git a/crates/engine/src/cmd/fileio/tests.rs b/crates/engine/src/cmd/fileio/tests.rs index 418578ec71..bbf6883834 100644 --- a/crates/engine/src/cmd/fileio/tests.rs +++ b/crates/engine/src/cmd/fileio/tests.rs @@ -28,48 +28,15 @@ fn open(s: &mut Session, name: &str, bytes: &[u8]) -> Value { } /// A `w`×`h` image of one colour in `format`. -fn image_bytes(w: u32, h: u32, format: craft_image_codecs::Format) -> Vec { +fn image_bytes(w: u32, h: u32, format: image::ImageFormat) -> Vec { let rgba = image::RgbaImage::from_pixel(w, h, image::Rgba([200, 30, 40, 255])); - let img = if format == craft_image_codecs::Format::Jpeg { + let img = if format == image::ImageFormat::Jpeg { image::DynamicImage::ImageRgb8(image::DynamicImage::ImageRgba8(rgba).to_rgb8()) } else { rgba.into() }; let mut out = Vec::new(); - { - let __dyn: image::DynamicImage = (img).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, format, &craft_image_codecs::EncodeOptions::default()).map(|__b| out.extend_from_slice(&__b)) - } - .unwrap(); + img.write_to(&mut Cursor::new(&mut out), format).unwrap(); out } @@ -117,12 +84,12 @@ fn opens_every_readable_format() { assert!(s.doc().unwrap().doc.node_count() >= 2, "{name}: the rectangle came through"); } for (name, kind) in [ - ("p.png", craft_image_codecs::Format::Png), - ("p.jpg", craft_image_codecs::Format::Jpeg), - ("p.gif", craft_image_codecs::Format::Gif), - ("p.webp", craft_image_codecs::Format::WebP), - ("p.tif", craft_image_codecs::Format::Tiff), - ("p.bmp", craft_image_codecs::Format::Bmp), + ("p.png", image::ImageFormat::Png), + ("p.jpg", image::ImageFormat::Jpeg), + ("p.gif", image::ImageFormat::Gif), + ("p.webp", image::ImageFormat::WebP), + ("p.tif", image::ImageFormat::Tiff), + ("p.bmp", image::ImageFormat::Bmp), ] { let r = open(&mut s, name, &image_bytes(5, 4, kind)); assert_eq!(r["format"], format(name.rsplit('.').next().unwrap()).unwrap().id, "{name}"); @@ -140,12 +107,12 @@ fn opens_every_readable_format() { #[test] fn webp_opens_at_its_pixel_size() { let mut s = Session::new(); - open(&mut s, "tiny.webp", &image_bytes(3, 2, craft_image_codecs::Format::WebP)); + open(&mut s, "tiny.webp", &image_bytes(3, 2, image::ImageFormat::WebP)); let im = image_of(&s); assert_eq!((im.width, im.height), (3, 2)); let ab = s.doc().unwrap().doc.artboards[0].rect; assert_eq!((ab.width(), ab.height()), (3.0, 2.0)); - let r = raster_image(&image_bytes(3, 2, craft_image_codecs::Format::WebP)).unwrap(); + let r = raster_image(&image_bytes(3, 2, image::ImageFormat::WebP)).unwrap(); assert_eq!((r.width, r.height, r.blob.mime.as_str()), (3, 2, "image/webp")); } @@ -156,7 +123,7 @@ fn cmyk_tiffs_keep_their_inks_and_other_tiffs_become_png() { let r = raster_image(&tiff.bytes).unwrap(); assert_eq!((r.width, r.height, r.blob.mime.as_str()), (2, 1, "image/tiff")); assert_eq!(r.blob.cmyk(), Some(inks)); - let rgb = raster_image(&image_bytes(2, 1, craft_image_codecs::Format::Tiff)).unwrap(); + let rgb = raster_image(&image_bytes(2, 1, image::ImageFormat::Tiff)).unwrap(); assert_eq!(rgb.blob.mime, "image/png"); } @@ -173,25 +140,7 @@ fn kept(what: &str, bytes: &[u8]) -> (Option>, Vec) { let r = raster_image(bytes).unwrap_or_else(|e| panic!("{what}: {e}")); assert_eq!((r.width, r.height, r.ppi), (3, 2, Some((150.0, 150.0))), "{what}"); assert_eq!(super::ppi::resolution(&r.blob.bytes), Some((150.0, 150.0)), "{what}: the stored image keeps the resolution"); - let rgba = craft_image_codecs::decode(&r.blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap_or_else(|e| panic!("{what}: {e}")) - .to_rgba8() - .into_raw(); + let rgba = image::load_from_memory(&r.blob.bytes).unwrap_or_else(|e| panic!("{what}: {e}")).to_rgba8().into_raw(); (r.blob.cmyk().map(|i| i.data), rgba) } @@ -346,26 +295,7 @@ fn planar_cmyk_tiffs_open_and_place_with_their_inks() { let inks = [vec![255u16, 0, 12, 0, 40, 9], vec![0, 255, 34, 0, 50, 8], vec![0, 0, 56, 0, 60, 7], vec![0, 0, 78, 255, 70, 6]]; let file = hand_tiff(5, 8, &[], true, &inks); let want: Vec = (0..6).flat_map(|i| inks.iter().map(move |v| v[i] as u8)).collect(); - assert!( - craft_image_codecs::decode(&file) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .is_err(), - "the image decoder reads planar CMYK now" - ); + assert!(image::load_from_memory(&file).is_err(), "the image decoder reads planar CMYK now"); let mut s = Session::new(); open(&mut s, "planar.tif", &file); let blob = &s.doc().unwrap().doc.images[&image_of(&s).key]; @@ -374,26 +304,7 @@ fn planar_cmyk_tiffs_open_and_place_with_their_inks() { s.execute("file.place", &json!({"name": "planar.tif", "dataBase64": vectorcraft_format::base64_encode(&file)})).unwrap(); let blob = &s.doc().unwrap().doc.images[&image_of(&s).key]; assert_eq!(blob.cmyk().map(|i| i.data), Some(want), "Place keeps the inks"); - assert!( - craft_image_codecs::decode(&blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .is_ok(), - "the image decoder reads the stored image" - ); + assert!(image::load_from_memory(&blob.bytes).is_ok(), "the image decoder reads the stored image"); } /// A 70 × 7 picture, `true` for black: a white row and a black row (runs past 63 take a make-up @@ -438,49 +349,12 @@ fn ccitt_group3_tiffs_open_and_place_with_their_pixels() { rtc, }; let file = vectorcraft_testkit::tiff::group3(&g); - assert!( - craft_image_codecs::decode(&file) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .is_err(), - "{what}: the image decoder reads Group 3 now" - ); + assert!(image::load_from_memory(&file).is_err(), "{what}: the image decoder reads Group 3 now"); // A black run's pixels are 1 bits, which show as black when white is zero. let want: Vec = rows.concat().iter().map(|&black| if black == (photometric == 0) { 0 } else { 255 }).collect(); let pixels = |s: &Session| { let blob = &s.doc().unwrap().doc.images[&image_of(s).key]; - craft_image_codecs::decode(&blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap_or_else(|e| panic!("{what}: {e}")) - .to_luma8() - .into_raw() + image::load_from_memory(&blob.bytes).unwrap_or_else(|e| panic!("{what}: {e}")).to_luma8().into_raw() }; open(&mut s, "fax.tif", &file); assert_eq!(pixels(&s), want, "{what}: Open"); @@ -542,7 +416,7 @@ fn ccitt_group3_tiffs_too_large_or_cut_short_are_refused() { #[test] fn content_beats_a_wrong_extension() { - let png = image_bytes(2, 2, craft_image_codecs::Format::Png); + let png = image_bytes(2, 2, image::ImageFormat::Png); assert_eq!(detect("photo.jpg", &png).unwrap().id, "png"); assert_eq!(detect("noext", b"").unwrap().id, "svg"); assert_eq!(detect("x.ait", b"%PDF-1.7").unwrap().id, "ait"); @@ -750,27 +624,7 @@ fn pdf_export_honours_artboard_and_range() { // Single-image formats take one artboard. assert!(s.execute("document.export", &json!({"format": "png", "range": "1-2"})).is_err()); let png = b64(&s.execute("document.export", &json!({"format": "png", "range": "2", "scale": 0.5})).unwrap()); - assert_eq!( - craft_image_codecs::decode(&png) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .width(), - 50 - ); + assert_eq!(image::load_from_memory(&png).unwrap().width(), 50); assert!(s.execute("document.export", &json!({"format": "png", "scale": "big"})).is_err(), "typed options reject a bad type"); } @@ -811,26 +665,7 @@ fn template_doc() -> (Session, u64, u64) { } fn has_red(png: &[u8]) -> bool { - craft_image_codecs::decode(png) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8() - .pixels() - .any(|p| p[0] > 200 && p[2] < 80 && p[3] > 0) + image::load_from_memory(png).unwrap().to_rgba8().pixels().any(|p| p[0] > 200 && p[2] < 80 && p[3] > 0) } #[test] @@ -838,29 +673,7 @@ fn raster_exports_leave_template_layers_out() { let (mut s, red, blue) = template_doc(); let png = b64(&s.execute("document.export", &json!({"format": "png"})).unwrap()); assert!(!has_red(&png), "no red pixels from the template layer"); - assert!( - craft_image_codecs::decode(&png) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8() - .get_pixel(75, 50)[2] - > 200, - "the normal layer is exported" - ); + assert!(image::load_from_memory(&png).unwrap().to_rgba8().get_pixel(75, 50)[2] > 200, "the normal layer is exported"); s.execute("select.set", &json!({"ids": [red, blue]})).unwrap(); let r = s.execute("document.exportSelection", &json!({"format": "png"})).unwrap(); assert!(!has_red(&b64(&r))); @@ -892,27 +705,7 @@ fn export_for_screens_one_page_per_pdf_unique_names() { // No folder: the files come back as bytes. let r = s.execute("document.exportForScreens", &json!({"range": "3", "formats": [{"format": "jpg", "scale": 0.5}]})).unwrap(); assert_eq!(r["files"][0]["name"], "Artboard-3@0.5x.jpg"); - assert_eq!( - craft_image_codecs::decode(&b64(&r["files"][0])) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .width(), - 50 - ); + assert_eq!(image::load_from_memory(&b64(&r["files"][0])).unwrap().width(), 50); // A native row: each artboard as a document of its own to edit. let r = s.execute("document.exportForScreens", &json!({"range": "1", "formats": [{"format": "vectorcraft"}]})).unwrap(); assert!(r["files"][0]["name"].as_str().unwrap().ends_with(".vectorcraft"), "{r}"); @@ -1182,41 +975,7 @@ fn a_photo_places_the_way_its_exif_orientation_says() { } } let mut jpg = Vec::new(); - { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageRgb8(rgb)).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Jpeg, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| jpg.extend_from_slice(&__b)) - } - .unwrap(); + image::DynamicImage::ImageRgb8(rgb).write_to(&mut Cursor::new(&mut jpg), image::ImageFormat::Jpeg).unwrap(); // An EXIF segment with Orientation 6: turn a quarter clockwise to show. let exif: Vec = [b"Exif\0\0".as_slice(), b"II", &[0x2a, 0, 8, 0, 0, 0], &[1, 0], &[0x12, 0x01, 3, 0, 1, 0, 0, 0, 6, 0, 0, 0], &[0, 0, 0, 0]].concat(); @@ -1229,24 +988,7 @@ fn a_photo_places_the_way_its_exif_orientation_says() { assert_eq!((plain.width, plain.height, plain.blob.bytes.as_slice()), (16, 8, jpg.as_slice()), "a photo as taken keeps its bytes"); let img = raster_image(&turned).unwrap(); assert_eq!((img.width, img.height), (8, 16), "turned a quarter"); - let px = craft_image_codecs::decode(&img.blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgb8(); + let px = image::load_from_memory(&img.blob.bytes).unwrap().to_rgb8(); let red = |p: &image::Rgb| p[0] > 150 && p[1] < 80; assert!(red(px.get_pixel(4, 3)) && !red(px.get_pixel(4, 12)), "the left half is on top"); } @@ -1292,41 +1034,7 @@ fn a_quarter_turn_swaps_the_resolution_axes() { // 48 × 32: the top-left 16 × 16 (one whole JPEG MCU) red, the rest white. let rgb = image::RgbImage::from_fn(48, 32, |x, y| if x < 16 && y < 16 { image::Rgb([220, 0, 0]) } else { image::Rgb([255, 255, 255]) }); let mut jpg = Vec::new(); - { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageRgb8(rgb)).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Jpeg, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| jpg.extend_from_slice(&__b)) - } - .unwrap(); + image::DynamicImage::ImageRgb8(rgb).write_to(&mut Cursor::new(&mut jpg), image::ImageFormat::Jpeg).unwrap(); for orientation in [0u16, 1, 2, 3, 4, 5, 6, 7, 8, 9] { let exif = [b"Exif\0\0".as_slice(), &exif_block(orientation, (300, 150))].concat(); // Without a JFIF density the resolution comes from the EXIF block. @@ -1342,24 +1050,7 @@ fn a_quarter_turn_swaps_the_resolution_axes() { let img = raster_image(&turned).unwrap(); assert_eq!(((img.width, img.height), img.ppi), (size, Some(ppi)), "{what}"); assert_eq!(super::ppi::resolution(&img.blob.bytes), Some(ppi), "{what}: the stored image"); - let px = craft_image_codecs::decode(&img.blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgb8(); + let px = image::load_from_memory(&img.blob.bytes).unwrap().to_rgb8(); let red = |x: u32, y: u32| px.get_pixel(x, y)[1] < 80; let (w, h) = size; let corners = [(false, false), (true, false), (true, true), (false, true)]; @@ -1421,26 +1112,7 @@ fn tiffs_read_without_the_image_decoder_follow_their_orientation() { let fax = vectorcraft_testkit::tiff::group3(&g); // The Group 3 file declares no resolution. for (kind, file, y_ppi) in [("Group 3", fax, None), ("gray with alpha", gray, Some(300))] { - assert!( - craft_image_codecs::decode(&file) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .is_err(), - "{kind}: the image decoder reads it now" - ); + assert!(image::load_from_memory(&file).is_err(), "{kind}: the image decoder reads it now"); for (orientation, long) in (1..=8).flat_map(|o| [(o, false), (o, true)]) { let what = format!("{kind}, orientation {orientation}, LONG {long}"); let img = raster_image(&tiff_oriented(&file, orientation, long, y_ppi)).unwrap_or_else(|e| panic!("{what}: {e}")); @@ -1449,24 +1121,7 @@ fn tiffs_read_without_the_image_decoder_follow_their_orientation() { let ppi = y_ppi.map(|y| if quarter { (f64::from(y), 150.0) } else { (150.0, f64::from(y)) }); assert_eq!(((img.width, img.height), img.ppi), (size, ppi), "{what}"); assert_eq!(super::ppi::resolution(&img.blob.bytes), ppi, "{what}: the stored image"); - let px = craft_image_codecs::decode(&img.blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_luma8(); + let px = image::load_from_memory(&img.blob.bytes).unwrap().to_luma8(); let (right, bottom) = first_pixel_at(orientation); let (x, y) = (if right { size.0 - 1 } else { 0 }, if bottom { size.1 - 1 } else { 0 }); let black: Vec<_> = px.enumerate_pixels().filter(|p| p.2[0] < 128).map(|p| (p.0, p.1)).collect(); @@ -1555,25 +1210,18 @@ fn cmyk_jpegs_turned_by_their_orientation_keep_their_inks() { /// half turn keeps them. #[test] fn png_webp_and_rgb_tiff_turned_a_quarter_swap_their_resolution() { + use image::ImageEncoder as _; let rgb = image::RgbImage::from_fn(3, 2, |x, y| image::Rgb(if x == 0 && y == 0 { [0, 0, 0] } else { [255, 255, 255] })); for orientation in [3u16, 6, 8] { - let mut cimg = craft_image_codecs::Image::from_raw( - 3, - 2, - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U8, - rgb.as_raw().to_vec(), - ) - .unwrap(); - cimg.meta.exif = Some(exif_block(orientation, (150, 300))); - let png = craft_image_codecs::encode(&cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap(); + let mut png = Vec::new(); + let mut enc = image::codecs::png::PngEncoder::new(&mut png); + enc.set_exif_metadata(exif_block(orientation, (150, 300))).unwrap(); + enc.write_image(rgb.as_raw(), 3, 2, image::ExtendedColorType::Rgb8).unwrap(); let png = super::ppi::with_png_resolution(&png, (150.0, 300.0)); - let webp = craft_image_codecs::encode( - &cimg, - craft_image_codecs::Format::WebP, - &craft_image_codecs::EncodeOptions { webp_lossless: true, ..craft_image_codecs::EncodeOptions::default() }, - ) - .unwrap(); + let mut webp = Vec::new(); + let mut enc = image::codecs::webp::WebPEncoder::new_lossless(&mut webp); + enc.set_exif_metadata(exif_block(orientation, (150, 300))).unwrap(); + enc.write_image(rgb.as_raw(), 3, 2, image::ExtendedColorType::Rgb8).unwrap(); let channel = |c: usize| -> Vec { rgb.pixels().map(|p| u16::from(p[c])).collect() }; let tiff = tiff_oriented(&hand_tiff(2, 8, &[], false, &[channel(0), channel(1), channel(2)]), orientation, false, Some(300)); for (kind, file) in [("PNG", png), ("WebP", webp), ("TIFF", tiff)] { @@ -1584,24 +1232,7 @@ fn png_webp_and_rgb_tiff_turned_a_quarter_swap_their_resolution() { let img = raster_image(&file).unwrap_or_else(|e| panic!("{what}: {e}")); assert_eq!(((img.width, img.height), img.ppi), (size, Some(ppi)), "{what}"); assert_eq!(super::ppi::resolution(&img.blob.bytes), Some(ppi), "{what}: the stored image"); - let px = craft_image_codecs::decode(&img.blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_luma8(); + let px = image::load_from_memory(&img.blob.bytes).unwrap().to_luma8(); let (right, bottom) = first_pixel_at(orientation); let at = (if right { size.0 - 1 } else { 0 }, if bottom { size.1 - 1 } else { 0 }); let black: Vec<_> = px.enumerate_pixels().filter(|p| p.2[0] < 128).map(|p| (p.0, p.1)).collect(); @@ -1648,34 +1279,18 @@ fn tiff_with_icc(tiff: &[u8], icc: &[u8]) -> Vec { out } -/// The ICC profile, sample bit depth, and pixels of a stored image, read by the image decoder for its format. -fn stored_pixels(what: &str, img: &RasterImage) -> (Option>, u16, image::DynamicImage) { - let fmt = match img.blob.mime.as_str() { - "image/png" => craft_image_codecs::Format::Png, - "image/tiff" => craft_image_codecs::Format::Tiff, +/// The ICC profile and pixels of a stored image, read by the image decoder for its format. +fn stored_pixels(what: &str, img: &RasterImage) -> (Option>, image::ExtendedColorType, image::DynamicImage) { + use image::ImageDecoder as _; + let bytes = Cursor::new(img.blob.bytes.as_slice()); + let mut d: Box = match img.blob.mime.as_str() { + "image/png" => Box::new(image::codecs::png::PngDecoder::new(bytes).unwrap()), + "image/tiff" => Box::new(image::codecs::tiff::TiffDecoder::new(bytes).unwrap()), other => panic!("{what}: stored as {other}"), }; - let opts = craft_image_codecs::DecodeOptions { keep_orientation: true, ..Default::default() }; - let decoded = craft_image_codecs::decode_as_with(fmt, img.blob.bytes.as_slice(), &opts).unwrap(); - let icc = decoded.meta.icc.clone(); - let bits = u16::try_from(decoded.sample_type().bytes() * 8).unwrap(); - let (w, h) = decoded.dimensions(); - let dyn_img = match (decoded.layout(), decoded.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(w, h, decoded.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U16) => { - image::DynamicImage::ImageLuma16(image::ImageBuffer::from_raw(w, h, decoded.to_u16_samples().unwrap()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(w, h, decoded.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U16) => { - image::DynamicImage::ImageRgb16(image::ImageBuffer::from_raw(w, h, decoded.to_u16_samples().unwrap()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(w, h, decoded.to_rgba8()).unwrap()), - }; - (icc, bits, dyn_img) + let icc = d.icc_profile().unwrap(); + let color = d.original_color_type(); + (icc, color, image::DynamicImage::from_decoder(d).unwrap()) } /// An image turned by its orientation and stored as PNG keeps the gray or RGB ICC profile its file @@ -1684,7 +1299,7 @@ fn stored_pixels(what: &str, img: &RasterImage) -> (Option>, u16, image: /// space than the samples' is left out. #[test] fn images_stored_as_png_keep_their_icc_profile_and_16_bit_samples() { - use image::DynamicImage; + use image::{DynamicImage, ImageEncoder as _}; let (rgb_icc, gray_icc, cmyk_icc) = (icc_profile(b"RGB ", 600), icc_profile(b"GRAY", 300), icc_profile(b"CMYK", 400)); // 3 × 2, every sample's low byte different. let rgb16 = image::ImageBuffer::from_fn(3, 2, |x, y| { @@ -1694,56 +1309,27 @@ fn images_stored_as_png_keep_their_icc_profile_and_16_bit_samples() { let rgb16 = DynamicImage::ImageRgb16(rgb16); let gray16 = DynamicImage::ImageLuma16(image::ImageBuffer::from_fn(3, 2, |x, y| image::Luma([u16::try_from(x * 0x3001 + y * 0x0107).unwrap()]))); let rgb8 = DynamicImage::ImageRgb8(image::RgbImage::from_fn(3, 2, |x, y| image::Rgb([u8::try_from(x * 70 + y * 9).unwrap(), 200, 13]))); - let to_cimg = |img: &DynamicImage| -> craft_image_codecs::Image { - match img { - DynamicImage::ImageRgb8(b) => craft_image_codecs::Image::from_raw( - b.width(), - b.height(), - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U8, - b.as_raw().to_vec(), - ) - .unwrap(), - DynamicImage::ImageRgb16(b) => craft_image_codecs::Image::from_raw( - b.width(), - b.height(), - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.as_raw().iter().flat_map(|s| s.to_ne_bytes()).collect(), - ) - .unwrap(), - DynamicImage::ImageLuma16(b) => craft_image_codecs::Image::from_raw( - b.width(), - b.height(), - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.as_raw().iter().flat_map(|s| s.to_ne_bytes()).collect(), - ) - .unwrap(), - _ => unreachable!(), - } - }; let png = |img: &DynamicImage, icc: &[u8], orientation: u16| { - let mut cimg = to_cimg(img); - cimg.meta.icc = Some(icc.to_vec()); - cimg.meta.exif = Some(exif_block(orientation, (150, 150))); - craft_image_codecs::encode(&cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap() + let mut out = Vec::new(); + let mut enc = image::codecs::png::PngEncoder::new(&mut out); + enc.set_icc_profile(icc.to_vec()).unwrap(); + enc.set_exif_metadata(exif_block(orientation, (150, 150))).unwrap(); + img.write_with_encoder(enc).unwrap(); + out }; let webp = { - let mut cimg = to_cimg(&rgb8); - cimg.meta.icc = Some(rgb_icc.clone()); - cimg.meta.exif = Some(exif_block(6, (150, 150))); - craft_image_codecs::encode( - &cimg, - craft_image_codecs::Format::WebP, - &craft_image_codecs::EncodeOptions { webp_lossless: true, ..craft_image_codecs::EncodeOptions::default() }, - ) - .unwrap() + let mut out = Vec::new(); + let mut enc = image::codecs::webp::WebPEncoder::new_lossless(&mut out); + enc.set_icc_profile(rgb_icc.clone()).unwrap(); + enc.set_exif_metadata(exif_block(6, (150, 150))).unwrap(); + rgb8.write_with_encoder(enc).unwrap(); + out }; let tiff = |orientation: Option| { - let mut cimg = to_cimg(&rgb16); - cimg.meta.icc = Some(rgb_icc.clone()); - let out = craft_image_codecs::encode(&cimg, craft_image_codecs::Format::Tiff, &craft_image_codecs::EncodeOptions::default()).unwrap(); + let mut out = Vec::new(); + let mut enc = image::codecs::tiff::TiffEncoder::new(Cursor::new(&mut out)); + enc.set_icc_profile(rgb_icc.clone()).unwrap(); + rgb16.write_with_encoder(enc).unwrap(); match orientation { Some(o) => tiff_oriented(&out, o, false, None), None => out, @@ -1763,9 +1349,9 @@ fn images_stored_as_png_keep_their_icc_profile_and_16_bit_samples() { for (what, file, icc, want, wide) in cases { let img = raster_image(&file).unwrap_or_else(|e| panic!("{what}: {e}")); assert_eq!((img.width, img.height, img.blob.mime.as_str()), (want.width(), want.height(), "image/png"), "{what}"); - let (kept, bits, px) = stored_pixels(what, &img); + let (kept, color, px) = stored_pixels(what, &img); assert_eq!(kept.as_deref(), icc, "{what}: the ICC profile"); - assert_eq!(bits, if wide { 16 } else { 8 }, "{what}: the sample depth"); + assert_eq!(color.bits_per_pixel() / u16::from(color.channel_count()), if wide { 16 } else { 8 }, "{what}: the sample depth"); if wide { assert_eq!(px.to_rgb16(), want.to_rgb16(), "{what}: the samples"); } else { @@ -1773,14 +1359,10 @@ fn images_stored_as_png_keep_their_icc_profile_and_16_bit_samples() { } } // A JPEG's samples change in encoding; its profile is kept. - let mut cimg = to_cimg(&rgb8); - cimg.meta.icc = Some(rgb_icc.clone()); - let jpg = craft_image_codecs::encode( - &cimg, - craft_image_codecs::Format::Jpeg, - &craft_image_codecs::EncodeOptions { jpeg_quality: 95, ..craft_image_codecs::EncodeOptions::default() }, - ) - .unwrap(); + let mut jpg = Vec::new(); + let mut enc = image::codecs::jpeg::JpegEncoder::new_with_quality(&mut jpg, 95); + enc.set_icc_profile(rgb_icc.clone()).unwrap(); + rgb8.write_with_encoder(enc).unwrap(); let exif = [b"Exif\0\0".as_slice(), &exif_block(6, (150, 150))].concat(); let mut turned = jpg[..2].to_vec(); turned.extend([0xff, 0xe1]); @@ -1916,23 +1498,7 @@ fn export_for_screens_jpgs_open_in_every_colour_model() { assert_eq!(bytes.get(..2), Some(&[0xFF, 0xD8][..]), "{what}: starts with SOI"); let jfif = bytes.get(2..4) == Some(&[0xFF, 0xE0][..]); assert_eq!(jfif, components != 4, "{what}: JFIF only on one- and three-component files"); - let image = craft_image_codecs::decode(&bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap_or_else(|e| panic!("{what}: {e}")); + let image = image::load_from_memory(&bytes).unwrap_or_else(|e| panic!("{what}: {e}")); assert_eq!(image.width(), width, "{what}"); } } diff --git a/crates/engine/src/cmd/fileio/tests_affinity.rs b/crates/engine/src/cmd/fileio/tests_affinity.rs index 54fca28217..db9a0657d2 100644 --- a/crates/engine/src/cmd/fileio/tests_affinity.rs +++ b/crates/engine/src/cmd/fileio/tests_affinity.rs @@ -4,13 +4,12 @@ use super::*; use proptest::prelude::*; use serde_json::json; -use std::io::Cursor; fn png() -> Vec { let im = image::RgbaImage::from_fn(2, 1, |x, _| if x == 0 { image::Rgba([220, 40, 60, 255]) } else { image::Rgba([0, 0, 0, 0]) }); let mut bytes = Vec::new(); { - let __dyn: image::DynamicImage = (im).into(); + let __dyn: image::DynamicImage = im.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/cmd/fileio/tests_jxlread.rs b/crates/engine/src/cmd/fileio/tests_jxlread.rs index 0408712828..111132d689 100644 --- a/crates/engine/src/cmd/fileio/tests_jxlread.rs +++ b/crates/engine/src/cmd/fileio/tests_jxlread.rs @@ -18,10 +18,20 @@ enum BitDepth { fn jxl(w: usize, h: usize, layout: Layout, depth: BitDepth, samples: &[u8]) -> Vec { let opts = EncodeOptions { lossless: true, ..EncodeOptions::default() }; match depth { - BitDepth::Eight => craft_jxl::encode(ImageRef { width: w as u32, height: h as u32, layout, samples: Samples::U8(samples) }, opts).unwrap(), + BitDepth::Eight => craft_jxl::encode( + &ImageRef { width: w as u32, height: h as u32, layout, samples: Samples::U8(samples) }, + opts, + &craft_jxl::Metadata::default(), + ) + .unwrap(), BitDepth::Sixteen => { - let u16s: Vec = samples.chunks_exact(2).map(|c| u16::from_ne_bytes([c[0], c[1]])).collect(); - craft_jxl::encode(ImageRef { width: w as u32, height: h as u32, layout, samples: Samples::U16(&u16s) }, opts).unwrap() + let u16s: Vec = samples.as_chunks::<2>().0.iter().map(|c| u16::from_ne_bytes([c[0], c[1]])).collect(); + craft_jxl::encode( + &ImageRef { width: w as u32, height: h as u32, layout, samples: Samples::U16(&u16s) }, + opts, + &craft_jxl::Metadata::default(), + ) + .unwrap() } } } diff --git a/crates/engine/src/cmd/fileio/tests_pdf.rs b/crates/engine/src/cmd/fileio/tests_pdf.rs index dac6ef33e4..e4173eb71e 100644 --- a/crates/engine/src/cmd/fileio/tests_pdf.rs +++ b/crates/engine/src/cmd/fileio/tests_pdf.rs @@ -376,7 +376,7 @@ fn a_16_bit_png_is_written_at_8_bits_before_pdf_1_5() { let deep = image::ImageBuffer::from_fn(8, 8, |x, y| image::Rgb([x as u16 * 8000, y as u16 * 8000, 40000])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageRgb16(deep)).into(); + let __dyn: image::DynamicImage = image::DynamicImage::ImageRgb16(deep); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/cmd/fileio/tests_selexport.rs b/crates/engine/src/cmd/fileio/tests_selexport.rs index 1f45dac2a9..5e485ae355 100644 --- a/crates/engine/src/cmd/fileio/tests_selexport.rs +++ b/crates/engine/src/cmd/fileio/tests_selexport.rs @@ -121,7 +121,7 @@ fn export_selection_of_a_clipped_object_keeps_its_clip() { let reopened = canvas(&t, board); let mut png = vec![]; { - let __dyn: image::DynamicImage = (reopened).into(); + let __dyn: image::DynamicImage = reopened.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/cmd/fileio/tests_tiffbmp.rs b/crates/engine/src/cmd/fileio/tests_tiffbmp.rs index 43207d43a4..f36fa14b8d 100644 --- a/crates/engine/src/cmd/fileio/tests_tiffbmp.rs +++ b/crates/engine/src/cmd/fileio/tests_tiffbmp.rs @@ -53,24 +53,7 @@ fn tiff_options_reach_the_file() { let t = tags(&rgb); assert_eq!((t[&259].2, t[&262].2, t[&277].2), (5, 2, 4), "LZW, RGB, an alpha channel for the transparent corner"); assert!(t.contains_key(&34675), "the sRGB profile"); - let img = craft_image_codecs::decode_as(craft_image_codecs::Format::Tiff, &rgb) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let img = image::load_from_memory_with_format(&rgb, image::ImageFormat::Tiff).unwrap().to_rgba8(); assert_eq!(img.dimensions(), (60, 40)); assert_eq!(img.get_pixel(5, 5).0[3], 0, "transparent where nothing is drawn"); let black = img.get_pixel(40, 20).0; @@ -121,23 +104,7 @@ fn bmp_options_reach_the_file() { assert_eq!(i32::from_le_bytes(flipped[22..26].try_into().unwrap()), -40, "top-down rows"); let os2 = bmp(&mut s, json!({"fileFormat": "os2", "depth": 4})); assert_eq!(u32::from_le_bytes(os2[14..18].try_into().unwrap()), 12, "OS/2 core header"); - let gray = craft_image_codecs::decode_as(craft_image_codecs::Format::Bmp, &bmp(&mut s, json!({"colorModel": "gray", "depth": 8}))) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap(); + let gray = image::load_from_memory_with_format(&bmp(&mut s, json!({"colorModel": "gray", "depth": 8})), image::ImageFormat::Bmp).unwrap(); assert!(gray.to_rgb8().pixels().all(|p| p[0] == p[1] && p[1] == p[2])); for bad in [ json!({"depth": 2}), @@ -177,24 +144,7 @@ fn stored_pixels(s: &Session) -> image::RgbaImage { vectorcraft_doc::NodeKind::Image(im) => im.clone(), other => panic!("expected an image, got {other:?}"), }; - craft_image_codecs::decode(&doc.images[&im.key].bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8() + image::load_from_memory(&doc.images[&im.key].bytes).unwrap().to_rgba8() } /// A Targa header: no image id or color map, image type `kind`, `w` × `h` pixels of `depth` bits, @@ -309,65 +259,9 @@ fn dib_rle_and_pns_files_open_and_place() { fn targa_layouts_and_alpha_read() { let src = image::RgbaImage::from_fn(3, 2, |x, y| image::Rgba([x as u8 * 100, y as u8 * 200, 50, if x == 1 { 128 } else { 255 }])); let mut rle = Vec::new(); - { - let __dyn: image::DynamicImage = (src).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Tga, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| rle.extend_from_slice(&__b)) - } - .unwrap(); + src.write_to(&mut std::io::Cursor::new(&mut rle), image::ImageFormat::Tga).unwrap(); assert_eq!((rle[2], rle[17] & 0x20), (10, 0x20), "run-length encoded true color, stored top down"); - assert_eq!( - raster_image(&rle) - .map(|r| craft_image_codecs::decode(&r.blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8()) - .unwrap(), - src - ); + assert_eq!(raster_image(&rle).map(|r| image::load_from_memory(&r.blob.bytes).unwrap().to_rgba8()).unwrap(), src); // 3 × 2, 5-5-5 color and an attribute bit, right to left (bit 4), top down (bit 5): a raw // packet of red, blue and a clear pixel for the first row, then a run of green. @@ -376,24 +270,7 @@ fn targa_layouts_and_alpha_read() { f.extend([0xfc00u16, 0x801f, 0x0000].iter().flat_map(|v| v.to_le_bytes())); f.push(0x82); f.extend(0x83e0u16.to_le_bytes()); - let img = craft_image_codecs::decode(&raster_image(&f).unwrap().blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let img = image::load_from_memory(&raster_image(&f).unwrap().blob.bytes).unwrap().to_rgba8(); let px = |x, y| img.get_pixel(x, y).0; assert_eq!((px(2, 0), px(1, 0), px(0, 0)[3]), ([255, 0, 0, 255], [0, 0, 255, 255], 0), "the first row, right to left"); assert!((0..3).all(|x| px(x, 1) == [0, 255, 0, 255]), "the run"); @@ -402,47 +279,13 @@ fn targa_layouts_and_alpha_read() { for fourth in [[0, 0], [0, 255]] { let mut f = targa_header(2, 2, 1, 32, 0x20); f.extend([10, 20, 30, fourth[0], 40, 50, 60, fourth[1]]); - let img = craft_image_codecs::decode(&raster_image(&f).unwrap().blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let img = image::load_from_memory(&raster_image(&f).unwrap().blob.bytes).unwrap().to_rgba8(); assert_eq!((img.get_pixel(0, 0).0, img.get_pixel(1, 0).0), ([30, 20, 10, 255], [60, 50, 40, 255]), "{fourth:?}"); } // The same with eight attribute bits: the fourth byte is alpha, also when it is 0 everywhere. let mut f = targa_header(2, 2, 1, 32, 0x28); f.extend([10, 20, 30, 0, 40, 50, 60, 0]); - let img = craft_image_codecs::decode(&raster_image(&f).unwrap().blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let img = image::load_from_memory(&raster_image(&f).unwrap().blob.bytes).unwrap().to_rgba8(); assert!(img.pixels().all(|p| p.0[3] == 0)); // The extension area's Attributes Type: undefined data (1, 2) isn't alpha, premultiplied colors // (4) are divided by their alpha, and alpha (3) or 0, the field left unset, keeps it. @@ -457,24 +300,7 @@ fn targa_layouts_and_alpha_read() { f.extend(at.to_le_bytes()); f.extend([0; 4]); f.extend(b"TRUEVISION-XFILE.\0"); - let img = craft_image_codecs::decode(&raster_image(&f).unwrap().blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let img = image::load_from_memory(&raster_image(&f).unwrap().blob.bytes).unwrap().to_rgba8(); assert_eq!(img.get_pixel(0, 0).0, want, "Attributes Type {kind}"); } @@ -484,24 +310,7 @@ fn targa_layouts_and_alpha_read() { let mut f = vec![0, 1, kind, 5, 0, 2, 0, 16, 0, 0, 0, 0, 3, 0, 1, 0, 8, 0x21]; f.extend([0x0000u16, 0xfc00].iter().flat_map(|v| v.to_le_bytes())); f.extend(data); - let img = craft_image_codecs::decode(&raster_image(&f).unwrap().blob.bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let img = image::load_from_memory(&raster_image(&f).unwrap().blob.bytes).unwrap().to_rgba8(); let row: Vec<[u8; 4]> = (0..3).map(|x| img.get_pixel(x, 0).0).collect(); assert_eq!(row, [[255, 0, 0, 255], [0, 0, 0, 0], [255, 0, 0, 255]], "image type {kind}"); } diff --git a/crates/engine/src/cmd/flatten/analysis.rs b/crates/engine/src/cmd/flatten/analysis.rs index 56ab512d8d..839246930e 100644 --- a/crates/engine/src/cmd/flatten/analysis.rs +++ b/crates/engine/src/cmd/flatten/analysis.rs @@ -72,7 +72,8 @@ pub(crate) fn carry(from: &Node, mut to: Node) -> Node { pub(crate) fn see_through_images(doc: &Document) -> BTreeSet { let see_through = |b: &ImageBlob| { b.mime != "image/jpeg" - && craft_image_codecs::decode(&b.bytes).is_ok_and(|i| i.layout().has_alpha() && i.to_rgba8().chunks_exact(4).any(|p| p[3] < 255)) + && craft_image_codecs::decode(&b.bytes) + .is_ok_and(|i| i.layout().has_alpha() && i.to_rgba8().as_chunks::<4>().0.iter().any(|p| p[3] < 255)) }; doc.images.iter().filter(|(_, b)| see_through(b)).map(|(k, _)| k.clone()).collect() } diff --git a/crates/engine/src/cmd/links.rs b/crates/engine/src/cmd/links.rs index e2b455d6f0..8ad4ad43d3 100644 --- a/crates/engine/src/cmd/links.rs +++ b/crates/engine/src/cmd/links.rs @@ -2597,7 +2597,7 @@ fn convert_image(bytes: &[u8], ext: &str) -> std::result::Result, String }; let img = craft_image_codecs::decode(bytes).map_err(|e| e.to_string())?; let raw = if format == craft_image_codecs::Format::Jpeg { - let rgb: Vec = img.to_rgba8().chunks_exact(4).flat_map(|p| [p[0], p[1], p[2]]).collect(); + let rgb: Vec = img.to_rgba8().as_chunks::<4>().0.iter().flat_map(|p| [p[0], p[1], p[2]]).collect(); craft_image_codecs::Image::from_raw( img.width(), img.height(), diff --git a/crates/engine/src/cmd/place/document.rs b/crates/engine/src/cmd/place/document.rs index b263ebe7ac..454f7302a8 100644 --- a/crates/engine/src/cmd/place/document.rs +++ b/crates/engine/src/cmd/place/document.rs @@ -377,8 +377,7 @@ fn preview(doc: &Document, art: &Node, frame: Rect) -> Option> { rgb.into_raw(), ) .ok()?; - let mut opts = craft_image_codecs::EncodeOptions::default(); - opts.jpeg_quality = 80; + let opts = craft_image_codecs::EncodeOptions { jpeg_quality: 80, ..Default::default() }; craft_image_codecs::encode(&raw, craft_image_codecs::Format::Jpeg, &opts).ok() } else { let raw = craft_image_codecs::Image::from_raw( diff --git a/crates/engine/src/tests/adjust.rs b/crates/engine/src/tests/adjust.rs index ea123961d1..ca348ea4fa 100644 --- a/crates/engine/src/tests/adjust.rs +++ b/crates/engine/src/tests/adjust.rs @@ -32,7 +32,7 @@ fn red_image(s: &mut Session) -> NodeId { let img = image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/build.rs b/crates/engine/src/tests/build.rs index b3d5e2bd70..8e0165cd5f 100644 --- a/crates/engine/src/tests/build.rs +++ b/crates/engine/src/tests/build.rs @@ -4985,7 +4985,7 @@ fn live_paint_bucket_alt_image_samples_fill_and_clears_stroke() { let img = image::RgbaImage::from_raw(1, 1, vec![0, 255, 0, 255]).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/clipflavours.rs b/crates/engine/src/tests/clipflavours.rs index ba1dfbf75f..ca64c077a2 100644 --- a/crates/engine/src/tests/clipflavours.rs +++ b/crates/engine/src/tests/clipflavours.rs @@ -247,7 +247,7 @@ fn a_pasted_bitmap_is_drawn_without_decoding_it_again() { let img = image::RgbImage::from_fn(300, 200, |x, y| image::Rgb([(x % 253) as u8, (y % 233) as u8, 17])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/colorize.rs b/crates/engine/src/tests/colorize.rs index 3425ab526d..faa0af57db 100644 --- a/crates/engine/src/tests/colorize.rs +++ b/crates/engine/src/tests/colorize.rs @@ -16,7 +16,7 @@ fn session() -> Session { fn png(img: image::DynamicImage) -> ImageBlob { let mut out = Vec::new(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img; let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/dynamic_symbols.rs b/crates/engine/src/tests/dynamic_symbols.rs index 1cbcd673d9..c3e8cf8ea0 100644 --- a/crates/engine/src/tests/dynamic_symbols.rs +++ b/crates/engine/src/tests/dynamic_symbols.rs @@ -799,7 +799,7 @@ fn image_symbol(s: &mut Session) -> (NodeId, Value) { let mut png = Vec::new(); let pixels = image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(2, 1, vec![0, 255]).unwrap()); { - let __dyn: image::DynamicImage = (pixels).into(); + let __dyn: image::DynamicImage = pixels; let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/editcolors.rs b/crates/engine/src/tests/editcolors.rs index a2d2e85e48..a42f2c4ca7 100644 --- a/crates/engine/src/tests/editcolors.rs +++ b/crates/engine/src/tests/editcolors.rs @@ -404,7 +404,7 @@ fn png(px: [[u8; 4]; 4]) -> Vec { let img = image::RgbaImage::from_raw(2, 2, px.concat()).unwrap(); let mut out = Vec::new(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/envelope_distort.rs b/crates/engine/src/tests/envelope_distort.rs index 0a4be6e3ce..7c086afa77 100644 --- a/crates/engine/src/tests/envelope_distort.rs +++ b/crates/engine/src/tests/envelope_distort.rs @@ -118,7 +118,7 @@ fn red_image(s: &mut Session) -> NodeId { let img = image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -194,7 +194,7 @@ fn a_colorized_image_keeps_its_color_in_an_envelope() { let img = image::GrayImage::from_pixel(4, 4, image::Luma([0])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageLuma8(img)).into(); + let __dyn: image::DynamicImage = image::DynamicImage::ImageLuma8(img); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -256,7 +256,7 @@ fn two_color_image(s: &mut Session) -> NodeId { let img = image::RgbaImage::from_fn(2, 2, |x, _| if x == 0 { image::Rgba([255, 0, 0, 255]) } else { image::Rgba([0, 0, 255, 255]) }); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/eyedropper.rs b/crates/engine/src/tests/eyedropper.rs index 0079d062bf..f4728f8a18 100644 --- a/crates/engine/src/tests/eyedropper.rs +++ b/crates/engine/src/tests/eyedropper.rs @@ -563,7 +563,7 @@ fn clicking_an_image_samples_its_pixel() { let img = image::RgbaImage::from_raw(2, 1, [[255, 128, 0, 255], [0, 128, 128, 255]].concat()).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -623,7 +623,7 @@ fn cmyk_doc_with_image(px: &[[u8; 4]]) -> Session { let img = image::RgbaImage::from_raw(w, 1, px.concat()).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/legacy_ai.rs b/crates/engine/src/tests/legacy_ai.rs index df12becc1e..3ecdb4a065 100644 --- a/crates/engine/src/tests/legacy_ai.rs +++ b/crates/engine/src/tests/legacy_ai.rs @@ -437,7 +437,7 @@ fn disk(size: u32, r: f64) -> Vec { }); let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -866,7 +866,7 @@ fn checker(a: [u8; 4], b: [u8; 4]) -> Vec { let img = image::RgbaImage::from_fn(32, 32, |x, y| image::Rgba(if (x < 16) == (y < 16) { a } else { b })); let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -928,7 +928,7 @@ fn colorized_pattern_over_blue() -> Session { let tile = image::GrayImage::from_fn(32, 32, |x, y| image::Luma([if (x < 16) == (y < 16) { 0 } else { 255 }])); let mut bytes = vec![]; { - let __dyn: image::DynamicImage = (tile).into(); + let __dyn: image::DynamicImage = tile.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/links.rs b/crates/engine/src/tests/links.rs index 4a93a98821..4367bfea0a 100644 --- a/crates/engine/src/tests/links.rs +++ b/crates/engine/src/tests/links.rs @@ -1369,7 +1369,7 @@ pub(crate) fn cut_png(w: u32, h: u32) -> Vec { }); let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/live.rs b/crates/engine/src/tests/live.rs index f2723ca825..2aa182c8b9 100644 --- a/crates/engine/src/tests/live.rs +++ b/crates/engine/src/tests/live.rs @@ -1526,7 +1526,7 @@ fn two_colour_image(s: &mut Session, clear_right: bool, linked: bool) -> NodeId let img = image::RgbaImage::from_fn(8, 4, |x, _| if x < 4 { image::Rgba([255, 0, 0, 255]) } else { right }); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/menucmds.rs b/crates/engine/src/tests/menucmds.rs index b4b97fbb66..1db3ffa34e 100644 --- a/crates/engine/src/tests/menucmds.rs +++ b/crates/engine/src/tests/menucmds.rs @@ -48,41 +48,9 @@ pub(crate) fn place_undecodable_png(s: &mut Session) -> NodeId { /// different images, each stored under its own key. pub(crate) fn place_undecodable_png_sized(s: &mut Session, w: u32, h: u32) -> NodeId { let mut png = Vec::new(); - { - let __dyn: image::DynamicImage = (image::RgbaImage::from_pixel(w, h, image::Rgba([200, 30, 30, 255]))).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| png.extend_from_slice(&__b)) - } - .unwrap(); + image::RgbaImage::from_pixel(w, h, image::Rgba([200, 30, 30, 255])) + .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png) + .unwrap(); let r = s.execute("file.place", &json!({"name": "cut.png", "dataBase64": vectorcraft_format::base64_encode(&png)})).unwrap(); let id = NodeId(r["ids"][0].as_u64().unwrap()); cut_pixels(s, id); @@ -1589,41 +1557,7 @@ fn busy_image_at_two_points_a_pixel() -> (Session, NodeId, image::RgbaImage) { *p = image::Rgba([(x * 37 % 256) as u8, (y * 91 % 256) as u8, ((x ^ y) * 13 % 256) as u8, 255]); } let mut png = Vec::new(); - { - let __dyn: image::DynamicImage = (px).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| png.extend_from_slice(&__b)) - } - .unwrap(); + px.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap(); let mut s = Session::new(); s.execute("document.open", &json!({"name": "art.png", "dataBase64": vectorcraft_format::base64_encode(&png)})).unwrap(); s.execute("select.all", &json!({})).unwrap(); @@ -1641,24 +1575,7 @@ fn crop_image_to_rect_copies_the_pixels_without_resampling() { let b = bounds(&s, img); assert!(close(b.x0, 20.0) && close(b.y0, 10.0) && close(b.width(), 60.0) && close(b.height(), 40.0), "{b:?}"); let NodeKind::Image(im) = &node(&s, img).kind else { panic!("an image") }; - let out = craft_image_codecs::decode(&s.doc().unwrap().doc.images[&im.key].bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let out = image::load_from_memory(&s.doc().unwrap().doc.images[&im.key].bytes).unwrap().to_rgba8(); assert_eq!(out, image::imageops::crop_imm(&px, 10, 5, 30, 20).to_image()); } @@ -5374,41 +5291,7 @@ fn crop_image_trim_cuts_to_the_opaque_pixels_as_they_are() { } } let mut png = Vec::new(); - { - let __dyn: image::DynamicImage = (px).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| png.extend_from_slice(&__b)) - } - .unwrap(); + px.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap(); let mut s = Session::new(); s.execute("document.open", &json!({"name": "art.png", "dataBase64": vectorcraft_format::base64_encode(&png)})).unwrap(); s.execute("select.all", &json!({})).unwrap(); @@ -5421,24 +5304,7 @@ fn crop_image_trim_cuts_to_the_opaque_pixels_as_they_are() { assert!(close(b.x0, 40.0) && close(b.y0, 20.0) && close(b.width(), 60.0) && close(b.height(), 60.0), "{b:?}"); // Pixel for pixel, a barely visible (alpha 1) edge included. let NodeKind::Image(im) = &node(&s, img).kind else { panic!("an image") }; - let out = craft_image_codecs::decode(&s.doc().unwrap().doc.images[&im.key].bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let out = image::load_from_memory(&s.doc().unwrap().doc.images[&im.key].bytes).unwrap().to_rgba8(); assert_eq!(out, image::imageops::crop_imm(&px, 20, 10, 30, 30).to_image()); assert_eq!(r["trimmed"], true); // Nothing transparent left to cut: left as it is, and not an error (scripts trim every image). diff --git a/crates/engine/src/tests/pdfraster.rs b/crates/engine/src/tests/pdfraster.rs index b9eecd7fbd..c4438cf7e2 100644 --- a/crates/engine/src/tests/pdfraster.rs +++ b/crates/engine/src/tests/pdfraster.rs @@ -2,7 +2,6 @@ //! live objects and single fills and strokes are written with images of their shadows, glows and //! blurs (no "left out" warning), and the PDF reads back looking like the canvas. -use std::io::Cursor; use std::sync::Arc; use serde_json::json; @@ -39,7 +38,7 @@ fn png(w: u32, h: u32) -> Vec { let img = image::RgbaImage::from_fn(w, h, |x, _| image::Rgba([(x * 255 / w) as u8, 60, 160, 255])); let mut out = Vec::new(); { - let __dyn: image::DynamicImage = (image::DynamicImage::from(img)).into(); + let __dyn: image::DynamicImage = image::DynamicImage::from(img); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/place.rs b/crates/engine/src/tests/place.rs index 93c98e275b..43c98600a5 100644 --- a/crates/engine/src/tests/place.rs +++ b/crates/engine/src/tests/place.rs @@ -523,7 +523,7 @@ fn noise(w: u32, h: u32, format: craft_image_codecs::Format) -> Vec { }); let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -1260,7 +1260,7 @@ fn the_place_queue_draws_a_thumbnail_without_decoding_the_image_again() { let img = image::RgbImage::from_fn(320, 160, |x, y| image::Rgb([(x % 251) as u8, 23, (y % 241) as u8])); let mut bytes = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/rasterfilters.rs b/crates/engine/src/tests/rasterfilters.rs index 8b6d8efcd9..b46cd1e572 100644 --- a/crates/engine/src/tests/rasterfilters.rs +++ b/crates/engine/src/tests/rasterfilters.rs @@ -288,7 +288,7 @@ fn rings_png() -> Vec { }); let mut png = Vec::new(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/recolor.rs b/crates/engine/src/tests/recolor.rs index 42136ea951..203c548381 100644 --- a/crates/engine/src/tests/recolor.rs +++ b/crates/engine/src/tests/recolor.rs @@ -1142,7 +1142,7 @@ fn halves_image(s: &mut Session, w: u32, h: u32, left: [u8; 4], right: [u8; 4]) let img = image::RgbaImage::from_fn(w, h, |x, _| image::Rgba(if x < w / 2 { left } else { right })); let mut png = Vec::new(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -1390,7 +1390,7 @@ fn theme_picker_reads_an_image_inside_its_clipping_path() { }); let mut png = Vec::new(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/src/tests/warp_images.rs b/crates/engine/src/tests/warp_images.rs index 4fc09f7d84..3645157a2b 100644 --- a/crates/engine/src/tests/warp_images.rs +++ b/crates/engine/src/tests/warp_images.rs @@ -35,7 +35,7 @@ fn quarters(s: &mut Session) -> NodeId { }); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -293,7 +293,7 @@ fn red_on_clear(s: &mut Session) -> NodeId { let img = image::GrayImage::from_fn(40, 40, |_, y| image::Luma([if y < 20 { 0 } else { 255 }])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageLuma8(img)).into(); + let __dyn: image::DynamicImage = image::DynamicImage::ImageLuma8(img); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -388,7 +388,7 @@ fn clear_arc(s: &mut Session, alpha: impl Fn(u32) -> u8) { let img = image::RgbaImage::from_fn(40, 40, |x, _| image::Rgba([255, 0, 0, alpha(x)])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/tests/color_settings.rs b/crates/engine/tests/color_settings.rs index 117e8c9d42..a7d516f8eb 100644 --- a/crates/engine/tests/color_settings.rs +++ b/crates/engine/tests/color_settings.rs @@ -559,7 +559,7 @@ fn the_eyedropper_takes_an_image_pixel_into_the_working_rgb_space() { let img = image::RgbaImage::from_raw(1, 1, vec![83, 170, 223, 255]).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/tests/command_sweep.rs b/crates/engine/tests/command_sweep.rs index c23b5a631e..b8f0765f17 100644 --- a/crates/engine/tests/command_sweep.rs +++ b/crates/engine/tests/command_sweep.rs @@ -1473,7 +1473,7 @@ fn gradient_mesh_from_images_with_junk_params() { let img = image::RgbaImage::from_fn(5, 3, |x, y| image::Rgba([x as u8 * 50, y as u8 * 90, 7, if x == 2 { 0 } else { 255 }])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/tests/import_fuzz.rs b/crates/engine/tests/import_fuzz.rs index 0fcd7a7db7..c329f6788b 100644 --- a/crates/engine/tests/import_fuzz.rs +++ b/crates/engine/tests/import_fuzz.rs @@ -38,7 +38,7 @@ fn affinity_preview_sample() -> Vec { let im = image::RgbaImage::from_pixel(2, 1, image::Rgba([220, 40, 60, 255])); let mut png = Vec::new(); { - let __dyn: image::DynamicImage = (im).into(); + let __dyn: image::DynamicImage = im.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -1800,7 +1800,7 @@ fn raster_samples() -> Vec<(&'static str, Vec)> { ] { let mut b = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.clone().into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -1864,9 +1864,22 @@ fn raster_samples() -> Vec<(&'static str, Vec)> { use craft_jxl::{EncodeOptions, ImageRef, Layout, Samples}; let opts = EncodeOptions { lossless: true, ..EncodeOptions::default() }; let rgba: Vec = (0..60).map(|i| (i * 17) as u8).collect(); - out.push(("a.jxl", craft_jxl::encode(ImageRef { width: 5, height: 3, layout: Layout::Rgba, samples: Samples::U8(&rgba) }, opts).unwrap())); + out.push(( + "a.jxl", + craft_jxl::encode( + &ImageRef { width: 5, height: 3, layout: Layout::Rgba, samples: Samples::U8(&rgba) }, + opts, + &craft_jxl::Metadata::default(), + ) + .unwrap(), + )); let gray_u16: Vec = (0..15).map(|i| u16::from_ne_bytes([(i * 2 * 41) as u8, ((i * 2 + 1) * 41) as u8])).collect(); - let gray = craft_jxl::encode(ImageRef { width: 5, height: 3, layout: Layout::Gray, samples: Samples::U16(&gray_u16) }, opts).unwrap(); + let gray = craft_jxl::encode( + &ImageRef { width: 5, height: 3, layout: Layout::Gray, samples: Samples::U16(&gray_u16) }, + opts, + &craft_jxl::Metadata::default(), + ) + .unwrap(); let mut boxed = vec![0, 0, 0, 0x0c, b'J', b'X', b'L', b' ', 0x0d, 0x0a, 0x87, 0x0a]; boxed.extend(20u32.to_be_bytes()); boxed.extend(b"ftypjxl \0\0\0\0jxl "); diff --git a/crates/engine/tests/plugin_export.rs b/crates/engine/tests/plugin_export.rs index 607b17d468..cc39566875 100644 --- a/crates/engine/tests/plugin_export.rs +++ b/crates/engine/tests/plugin_export.rs @@ -84,7 +84,7 @@ fn the_exporter_is_given_the_native_file_s_json() { }); let mut png = vec![]; { - let __dyn: image::DynamicImage = (noise).into(); + let __dyn: image::DynamicImage = noise.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/engine/tests/plugin_import.rs b/crates/engine/tests/plugin_import.rs index 4f336ef806..9bf9b87f0d 100644 --- a/crates/engine/tests/plugin_import.rs +++ b/crates/engine/tests/plugin_import.rs @@ -425,7 +425,7 @@ fn a_built_in_file_past_the_input_limit_still_opens() { }; let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| png.extend_from_slice(&__b)) + .map(|__b| png.get_mut().extend_from_slice(&__b)) } .unwrap(); std::fs::write(&path, png.get_ref()).unwrap(); diff --git a/crates/eps/src/ai_editing/tests.rs b/crates/eps/src/ai_editing/tests.rs index 7bf0fe7b9b..928fb8cbb8 100644 --- a/crates/eps/src/ai_editing/tests.rs +++ b/crates/eps/src/ai_editing/tests.rs @@ -801,7 +801,7 @@ fn unsupported() -> Document { let mut png = vec![]; let img = image::RgbaImage::from_raw(2, 1, vec![255, 0, 0, 255, 0, 0, 255, 255]).unwrap(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -3259,7 +3259,7 @@ fn a_pattern_swatchs_own_placement_is_reported_left_out() { fn png_of(img: image::DynamicImage) -> Vec { let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img; let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -5207,7 +5207,7 @@ fn beside(doc: &mut Document, kind: Beside, x: f64, state: (f32, BlendMode, bool let mut png = vec![]; let img = image::RgbaImage::from_raw(1, 1, vec![255, 0, 0, 255]).unwrap(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/eps/src/import/data/filters.rs b/crates/eps/src/import/data/filters.rs index 93ae45f0a8..107f7d0b10 100644 --- a/crates/eps/src/import/data/filters.rs +++ b/crates/eps/src/import/data/filters.rs @@ -157,11 +157,11 @@ fn dct(raw: &[u8]) -> Res<(Vec, usize, u8)> { let gray = if img.sample_type() == craft_image_codecs::SampleType::U8 { img.into_data() } else { - img.to_rgba8().chunks_exact(4).map(|p| p[0]).collect() + img.to_rgba8().as_chunks::<4>().0.iter().map(|p| p[0]).collect() }; return Ok((gray, end, 1)); } - let rgb: Vec = img.to_rgba8().chunks_exact(4).flat_map(|p| [p[0], p[1], p[2]]).collect(); + let rgb: Vec = img.to_rgba8().as_chunks::<4>().0.iter().flat_map(|p| [p[0], p[1], p[2]]).collect(); Ok((rgb, end, 3)) } diff --git a/crates/eps/src/import/tests.rs b/crates/eps/src/import/tests.rs index 3b1f9cc939..bcd830a28d 100644 --- a/crates/eps/src/import/tests.rs +++ b/crates/eps/src/import/tests.rs @@ -836,7 +836,7 @@ fn rich_doc() -> Document { } let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/eps/src/import/tests_native.rs b/crates/eps/src/import/tests_native.rs index e2e2c04fbe..5a12d24dc2 100644 --- a/crates/eps/src/import/tests_native.rs +++ b/crates/eps/src/import/tests_native.rs @@ -621,7 +621,7 @@ fn top_level_placed_file_replacement_keeps_page_image_data() { let pixels = image::RgbaImage::from_pixel(4, 4, image::Rgba([0, 255, 255, 255])); let mut png = Vec::new(); { - let __dyn: image::DynamicImage = (pixels).into(); + let __dyn: image::DynamicImage = pixels.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/eps/src/legacy_ai/tests.rs b/crates/eps/src/legacy_ai/tests.rs index 49f1f926ff..b35eb94fc0 100644 --- a/crates/eps/src/legacy_ai/tests.rs +++ b/crates/eps/src/legacy_ai/tests.rs @@ -59,7 +59,7 @@ fn sample() -> Document { let mut png = vec![]; let img = image::RgbaImage::from_raw(2, 1, vec![255, 0, 0, 255, 0, 0, 255, 255]).unwrap(); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/eps/src/tests.rs b/crates/eps/src/tests.rs index 4e8ba10daa..60b5832859 100644 --- a/crates/eps/src/tests.rs +++ b/crates/eps/src/tests.rs @@ -803,41 +803,7 @@ fn png_doc() -> Document { /// A 200 × 200 pt document holding `img` as a PNG, its pixels `scale` points wide, at (10, 10). fn image_doc(img: &image::RgbaImage, scale: f64) -> Document { let mut png = vec![]; - { - let __dyn: image::DynamicImage = (img).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| png.extend_from_slice(&__b)) - } - .unwrap(); + img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap(); let mut d = Document::new(200.0, 200.0); d.images.insert("pic".into(), ImageBlob::new("image/png", png)); let im = ImageObject { @@ -968,41 +934,9 @@ fn colorized_doc(gray: Vec, paint: Option) -> Document { let mut d = Document::new(200.0, 200.0); d.swatches.push(Swatch { name: "Ink".into(), paint: Paint::solid(Color::cmyk(0.0, 1.0, 1.0, 0.0)), global: true, spot: true }); let mut png = Vec::new(); - { - let __dyn: image::DynamicImage = (image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(gray.len() as u32, 1, gray).unwrap())).into(); - let (__w, __h) = (__dyn.width(), __dyn.height()); - let (__layout, __sample, __raw) = match __dyn { - image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLumaA8(b) => (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgb8(b) => (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageRgba8(b) => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, b.into_raw()), - image::DynamicImage::ImageLuma16(b) => ( - craft_image_codecs::ChannelLayout::Gray, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageLumaA16(b) => ( - craft_image_codecs::ChannelLayout::GrayA, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgb16(b) => ( - craft_image_codecs::ChannelLayout::Rgb, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - image::DynamicImage::ImageRgba16(b) => ( - craft_image_codecs::ChannelLayout::Rgba, - craft_image_codecs::SampleType::U16, - b.into_raw().into_iter().flat_map(|s| s.to_ne_bytes()).collect(), - ), - other => (craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, other.into_rgba8().into_raw()), - }; - let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); - craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| png.extend_from_slice(&__b)) - } - .unwrap(); + image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(gray.len() as u32, 1, gray).unwrap()) + .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png) + .unwrap(); d.images.insert("gray".into(), ImageBlob::png(png)); let im = ImageObject { key: "gray".into(), @@ -1204,27 +1138,7 @@ fn noise(w: u32, h: u32) -> image::RgbaImage { fn imported_images(bytes: &[u8]) -> Vec> { fn walk(n: &Node, d: &Document, out: &mut Vec>) { if let NodeKind::Image(im) = &n.kind { - out.push( - craft_image_codecs::decode(&d.images[&im.key].bytes) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8() - .into_raw(), - ); + out.push(image::load_from_memory(&d.images[&im.key].bytes).unwrap().to_rgba8().into_raw()); } for c in n.children().into_iter().flatten() { walk(c, d, out); @@ -1859,24 +1773,7 @@ fn a_tiff_preview_sits_behind_the_binary_header() { assert_eq!(unpack(&[strip, &[128]].concat()), [0b1000_0000, 0b1010_0000]); continue; } - let img = craft_image_codecs::decode_as(craft_image_codecs::Format::Tiff, tiff) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8(); + let img = image::load_from_memory_with_format(tiff, image::ImageFormat::Tiff).unwrap().to_rgba8(); assert_eq!(img.dimensions(), (3, 2)); let expect: [u8; 4] = if transparent { [0, 0, 0, 0] } else { [255; 4] }; assert_eq!(img.get_pixel(2, 0).0, expect, "transparent, or on white"); @@ -1896,28 +1793,7 @@ fn the_native_document_and_thumbnail_come_back() { let out = export(&d, &o, Some(&preview()), Some(&preview())).unwrap(); assert_eq!(super::native(&out.bytes).as_deref(), Some(&native[..])); let png = super::thumbnail(&out.bytes).unwrap(); - assert_eq!( - craft_image_codecs::decode(&png) - .map(|__cimg| { - let (__w, __h) = __cimg.dimensions(); - match (__cimg.layout(), __cimg.sample_type()) { - (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLuma8(image::GrayImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::GrayA, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageLumaA8(image::GrayAlphaImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - (craft_image_codecs::ChannelLayout::Rgb, craft_image_codecs::SampleType::U8) => { - image::DynamicImage::ImageRgb8(image::RgbImage::from_raw(__w, __h, __cimg.into_data()).unwrap()) - } - _ => image::DynamicImage::ImageRgba8(image::RgbaImage::from_raw(__w, __h, __cimg.to_rgba8()).unwrap()), - } - }) - .unwrap() - .to_rgba8() - .dimensions(), - (3, 2) - ); + assert_eq!(image::load_from_memory(&png).unwrap().to_rgba8().dimensions(), (3, 2)); let ps = text(&out); checked_page(&ps); assert!(ps.find("%VectorCraft_BeginData: thumbnail").unwrap() < ps.find("%%BeginProlog").unwrap()); diff --git a/crates/metafile/src/import/pict.rs b/crates/metafile/src/import/pict.rs index 0f6562d976..a1e5a674e0 100644 --- a/crates/metafile/src/import/pict.rs +++ b/crates/metafile/src/import/pict.rs @@ -20,7 +20,6 @@ //! nothing VectorCraft reads are skipped; a picture cut short keeps what came before. use std::collections::HashMap; -use std::io::Cursor; use vectorcraft_geom::{Affine, BezPath, FillRule, Point, Rect, Shape, Vec2, shapes}; diff --git a/crates/pdf/src/export.rs b/crates/pdf/src/export.rs index 86a750b345..880770bd30 100644 --- a/crates/pdf/src/export.rs +++ b/crates/pdf/src/export.rs @@ -174,7 +174,7 @@ mod tests { assert!(png_16_bit(&png)); let out = png_8_bit(&png).unwrap(); assert!(!png_16_bit(&out)); - let decoded = craft_image_codecs::decode_as_with(Format::Png, &out, &craft_image_codecs::Limits::default()).unwrap(); + let decoded = craft_image_codecs::decode_as_with(Format::Png, &out, &craft_image_codecs::DecodeOptions::default()).unwrap(); assert_eq!(decoded.icc, Some(icc)); assert_eq!(decoded.layout(), ChannelLayout::Gray); assert_eq!(decoded.sample_type(), SampleType::U8); diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs index e0bef22696..2337cc8dee 100644 --- a/crates/pdf/src/tests.rs +++ b/crates/pdf/src/tests.rs @@ -835,7 +835,7 @@ fn tiny_png() -> Vec { } let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/pdf/src/tests/cmykimages.rs b/crates/pdf/src/tests/cmykimages.rs index c56977d635..6ca07b865e 100644 --- a/crates/pdf/src/tests/cmykimages.rs +++ b/crates/pdf/src/tests/cmykimages.rs @@ -883,7 +883,7 @@ fn export_smasks(d: &Document) -> (Vec, Vec>>) { fn png(img: impl Into) -> Vec { let mut out = Vec::new(); { - let __dyn: image::DynamicImage = (img.into()).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/pdf/src/tests/colorize.rs b/crates/pdf/src/tests/colorize.rs index 48b21dd1ca..004f8f04ec 100644 --- a/crates/pdf/src/tests/colorize.rs +++ b/crates/pdf/src/tests/colorize.rs @@ -20,7 +20,7 @@ fn doc(mode: ColorMode, colorize: Option) -> Document { let gray = image::GrayImage::from_raw(2, 1, vec![0, 255]).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (gray).into(); + let __dyn: image::DynamicImage = gray.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -145,7 +145,7 @@ fn colorized_images_are_downsampled() { let gray = image::GrayImage::from_fn(600, 600, |x, y| image::Luma([((x + y) % 200) as u8])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (gray).into(); + let __dyn: image::DynamicImage = gray.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -210,7 +210,7 @@ fn a_colorized_warped_image_is_written_once_for_all_its_pieces() { let gray = image::GrayImage::from_fn(600, 600, |x, y| image::Luma([((x + y) % 200) as u8])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (gray).into(); + let __dyn: image::DynamicImage = gray.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/pdf/src/tests/output.rs b/crates/pdf/src/tests/output.rs index eccd946480..71461ae1f8 100644 --- a/crates/pdf/src/tests/output.rs +++ b/crates/pdf/src/tests/output.rs @@ -1,7 +1,6 @@ //! Save PDF › Output: colours converted to the destination (or their numbers preserved), ICC //! profiles tagging them, images converted too, and the output intent and Trapped entries. -use std::io::Cursor; use std::sync::Arc; use craft_pdf::syntax::Pdf; diff --git a/crates/pdf/src/tests/pdfx.rs b/crates/pdf/src/tests/pdfx.rs index 83409bc38a..2003a6b7c6 100644 --- a/crates/pdf/src/tests/pdfx.rs +++ b/crates/pdf/src/tests/pdfx.rs @@ -114,7 +114,7 @@ fn pdfx_1a_files_have_no_rgb() { let img = image::RgbaImage::from_pixel(4, 4, image::Rgba([10, 200, 30, 255])); let mut out = std::io::Cursor::new(vec![]); { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -145,7 +145,7 @@ fn pdfx_1a_files_have_no_rgb() { }; let __cimg = craft_image_codecs::Image::from_raw(__w, __h, __layout, __sample, __raw).unwrap(); craft_image_codecs::encode(&__cimg, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()) - .map(|__b| out.extend_from_slice(&__b)) + .map(|__b| out.get_mut().extend_from_slice(&__b)) } .unwrap(); out.into_inner() diff --git a/crates/pdf/src/tests/webview.rs b/crates/pdf/src/tests/webview.rs index 30e3d4331e..9c0a3e8752 100644 --- a/crates/pdf/src/tests/webview.rs +++ b/crates/pdf/src/tests/webview.rs @@ -3,9 +3,9 @@ //! linearisation checker does), also when encrypted; with both off the export is unchanged. use std::collections::{HashMap, HashSet}; -use std::io::{Cursor, Read}; +use std::io::Read; -use image::{DynamicImage, ImageFormat}; +use image::DynamicImage; use serde_json::json; use vectorcraft_color::{Color, Paint}; use vectorcraft_doc::{Appearance, Artboard, Document, ImageBlob, ImageObject, Node, NodeKind}; @@ -36,8 +36,7 @@ fn doc(n: usize, image: bool, on_first: bool) -> Document { } let mut png = vec![]; { - let __dyn: image::DynamicImage = - (DynamicImage::from(image::RgbImage::from_fn(8, 8, |x, y| image::Rgb([(x * 30) as u8, (y * 30) as u8, 90])))).into(); + let __dyn: image::DynamicImage = DynamicImage::from(image::RgbImage::from_fn(8, 8, |x, y| image::Rgb([(x * 30) as u8, (y * 30) as u8, 90]))); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/adjust.rs b/crates/render/src/tests/adjust.rs index ba138034a3..3820551ce7 100644 --- a/crates/render/src/tests/adjust.rs +++ b/crates/render/src/tests/adjust.rs @@ -48,7 +48,7 @@ fn red_image() -> (String, ImageBlob) { let img = image::RgbaImage::from_pixel(30, 30, image::Rgba([255, 0, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/changed.rs b/crates/render/src/tests/changed.rs index c62b6864c2..07251df938 100644 --- a/crates/render/src/tests/changed.rs +++ b/crates/render/src/tests/changed.rs @@ -548,7 +548,7 @@ fn traced(view: &str) -> (Document, NodeId, NodeId, NodeId) { let mut png = vec![]; let red = image::RgbaImage::from_pixel(1, 1, image::Rgba([255, 0, 0, 255])); { - let __dyn: image::DynamicImage = (red).into(); + let __dyn: image::DynamicImage = red.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/cmykblend.rs b/crates/render/src/tests/cmykblend.rs index afc37ea207..56f02a80a0 100644 --- a/crates/render/src/tests/cmykblend.rs +++ b/crates/render/src/tests/cmykblend.rs @@ -212,7 +212,7 @@ fn placed_images_are_separated_not_blackened() { let img = image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -290,7 +290,7 @@ fn rich_black_shows_black_ink_alone_as_rgb_black() { let img = image::RgbaImage::from_pixel(20, 20, image::Rgba([255, 0, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/colorize.rs b/crates/render/src/tests/colorize.rs index acf7154af1..38f3b6dca5 100644 --- a/crates/render/src/tests/colorize.rs +++ b/crates/render/src/tests/colorize.rs @@ -29,7 +29,7 @@ fn gray_png() -> Vec { let img = image::GrayImage::from_raw(2, 1, vec![0, 255]).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -116,7 +116,7 @@ fn shrunk_copies_are_kept_per_color() { let black = image::GrayImage::from_raw(64, 64, vec![0; 64 * 64]).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (black).into(); + let __dyn: image::DynamicImage = black.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -171,7 +171,7 @@ fn kept_images_only_draw_the_colorized_pixels() { let black = image::GrayImage::from_raw(48, 48, vec![0; 48 * 48]).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (black).into(); + let __dyn: image::DynamicImage = black.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -238,7 +238,7 @@ fn colorize_dims_with_the_grays() { let gray = image::GrayImage::from_raw(2, 1, vec![128, 255]).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (gray).into(); + let __dyn: image::DynamicImage = gray.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -483,7 +483,7 @@ fn rgb_png(width: u32, height: u32, pixels: &[[u8; 3]]) -> Vec { let img = image::RgbImage::from_raw(width, height, pixels.concat()).unwrap(); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/layeropts.rs b/crates/render/src/tests/layeropts.rs index 7fb585c372..6e327c143f 100644 --- a/crates/render/src/tests/layeropts.rs +++ b/crates/render/src/tests/layeropts.rs @@ -13,7 +13,7 @@ fn doc(layer: impl FnOnce(&mut NodeKind)) -> Document { let img = image::RgbaImage::from_pixel(30, 30, image::Rgba([255, 0, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/memory.rs b/crates/render/src/tests/memory.rs index 93b4361771..2cdc41df3c 100644 --- a/crates/render/src/tests/memory.rs +++ b/crates/render/src/tests/memory.rs @@ -19,7 +19,7 @@ fn png(w: u32, h: u32, seed: u8) -> Vec { }); let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -2571,7 +2571,7 @@ fn a_reduced_image_on_the_ink_planes_shows_its_average() { let lines = image::RgbaImage::from_fn(64, 64, |x, _| image::Rgba(if x % 2 == 0 { [0, 0, 0, 255] } else { [255; 4] })); let mut bytes = vec![]; { - let __dyn: image::DynamicImage = (lines).into(); + let __dyn: image::DynamicImage = lines.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -2629,7 +2629,7 @@ fn varied_png(w: u32, h: u32, seed: u8) -> Vec { let img = image::RgbaImage::from_fn(w, h, |x, y| image::Rgba([(x * 5 + y) as u8, (x / 3 + y * 7) as u8, (x ^ y) as u8 ^ seed, 255])); let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/meshwarp.rs b/crates/render/src/tests/meshwarp.rs index 7f3992c4b5..3316ba70bb 100644 --- a/crates/render/src/tests/meshwarp.rs +++ b/crates/render/src/tests/meshwarp.rs @@ -11,7 +11,7 @@ fn png(alpha: u8) -> Vec { let img = image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, alpha])); let mut out = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/objectfx.rs b/crates/render/src/tests/objectfx.rs index a952fa3a34..8e79c50451 100644 --- a/crates/render/src/tests/objectfx.rs +++ b/crates/render/src/tests/objectfx.rs @@ -307,7 +307,7 @@ fn image_doc(effects: Vec) -> Document { let img = image::RgbaImage::from_pixel(30, 30, image::Rgba([255, 0, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), @@ -821,7 +821,7 @@ fn an_images_outline_object_stroke_follows_new_pixels_under_the_same_key() { }); let mut png = vec![]; { - let __dyn: image::DynamicImage = (disc).into(); + let __dyn: image::DynamicImage = disc.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/placed_document.rs b/crates/render/src/tests/placed_document.rs index 85e3b1ecb1..c2790d8185 100644 --- a/crates/render/src/tests/placed_document.rs +++ b/crates/render/src/tests/placed_document.rs @@ -375,7 +375,7 @@ fn a_placed_document_kept_as_its_preview_draws_the_preview() { let img = image::RgbaImage::from_pixel(20, 10, image::Rgba([0, 200, 0, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/render/src/tests/viewraster.rs b/crates/render/src/tests/viewraster.rs index b32ea5225e..7d7399e608 100644 --- a/crates/render/src/tests/viewraster.rs +++ b/crates/render/src/tests/viewraster.rs @@ -116,7 +116,7 @@ fn large_image(effects: &[(&str, serde_json::Value)]) -> Document { let img = image::RgbaImage::from_fn(300, 200, |x, y| image::Rgba([(x * 7) as u8, (y * 13) as u8, ((x + y) * 3) as u8, 255])); let mut png = vec![]; { - let __dyn: image::DynamicImage = (img).into(); + let __dyn: image::DynamicImage = img.into(); let (__w, __h) = (__dyn.width(), __dyn.height()); let (__layout, __sample, __raw) = match __dyn { image::DynamicImage::ImageLuma8(b) => (craft_image_codecs::ChannelLayout::Gray, craft_image_codecs::SampleType::U8, b.into_raw()), diff --git a/crates/svg/src/glyph.rs b/crates/svg/src/glyph.rs index 160c6679ea..2f0ccf6528 100644 --- a/crates/svg/src/glyph.rs +++ b/crates/svg/src/glyph.rs @@ -2,7 +2,6 @@ //! it, made as the importer makes art of any SVG file. The text crate asks for it through the //! reader the app registers ([`vectorcraft_text::set_svg_glyph_reader`]). -use craft_svg::tree::usvg; use std::ops::Range; use std::sync::Arc; use std::sync::atomic::AtomicU64; diff --git a/crates/svg/src/import/css.rs b/crates/svg/src/import/css.rs index 4b98b271d0..de823a49db 100644 --- a/crates/svg/src/import/css.rs +++ b/crates/svg/src/import/css.rs @@ -7,7 +7,6 @@ //! skipped. Precedence: `!important`, then the `style` attribute, then specificity, then source //! order; a presentation attribute applies only when no rule sets the property. -use craft_svg::tree::usvg; use std::cell::RefCell; use std::collections::{HashMap, HashSet}; use std::rc::Rc; diff --git a/crates/svg/src/import/css_transform.rs b/crates/svg/src/import/css_transform.rs index da43953bb8..dc59b28426 100644 --- a/crates/svg/src/import/css_transform.rs +++ b/crates/svg/src/import/css_transform.rs @@ -8,7 +8,6 @@ //! functions SVG lacks (`translateX`, `scaleY`, `skew`…) spelled with SVG's. A value that can't be //! (percentages, `em`, 3D functions) is left as it is. -use craft_svg::tree::usvg; use std::f64::consts::PI; use std::ops::Range; diff --git a/crates/svg/src/import/depth.rs b/crates/svg/src/import/depth.rs index f3c89aafbc..d6b6eb7e20 100644 --- a/crates/svg/src/import/depth.rs +++ b/crates/svg/src/import/depth.rs @@ -12,7 +12,6 @@ //! the same stack: the depths of the SVGs around it are added to its own, and an image past the //! cap is left out (`files`). -use craft_svg::tree::usvg; use std::borrow::Cow; use std::collections::HashMap; use std::collections::hash_map::Entry; diff --git a/crates/svg/src/import/symbol_units.rs b/crates/svg/src/import/symbol_units.rs index 792453a0a3..78bb34ee19 100644 --- a/crates/svg/src/import/symbol_units.rs +++ b/crates/svg/src/import/symbol_units.rs @@ -6,7 +6,6 @@ //! the `viewBox`, so it comes out too large and out of place (#1561). Before usvg runs, the //! percentages of the shapes' geometry are rewritten in the `viewBox`'s units. -use craft_svg::tree::usvg; use std::ops::Range; use std::str::FromStr; diff --git a/crates/svg/src/import/vector_effect.rs b/crates/svg/src/import/vector_effect.rs index 974f113211..f98a24977c 100644 --- a/crates/svg/src/import/vector_effect.rs +++ b/crates/svg/src/import/vector_effect.rs @@ -4,7 +4,6 @@ //! document-space stroke of the screen width is exact; type and the art usvg drops ids from //! (patterns, markers, `` copies) can't always keep it, and a warning says so. -use craft_svg::tree::usvg; use std::collections::HashSet; use craft_svg::tree::usvg::roxmltree; diff --git a/crates/svg/tests/classes.rs b/crates/svg/tests/classes.rs index f302a06885..d1b1c19af5 100644 --- a/crates/svg/tests/classes.rs +++ b/crates/svg/tests/classes.rs @@ -1,6 +1,5 @@ //! CSS classes on imported elements come back on export, beside the generated `cls-N` classes. #![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)] -use craft_svg::tree::usvg; use craft_svg::tree::usvg::roxmltree; use vectorcraft_svg::{ExportOptions, Profile, Styling, export, import}; diff --git a/crates/svg/tests/it/basic_shapes.rs b/crates/svg/tests/it/basic_shapes.rs index d71a57b68b..bf7623c989 100644 --- a/crates/svg/tests/it/basic_shapes.rs +++ b/crates/svg/tests/it/basic_shapes.rs @@ -4,7 +4,6 @@ //! reimported geometry don't change. use craft_svg::tree::draw::resvg; -use craft_svg::tree::usvg; use vectorcraft_color::{Color, Paint}; use vectorcraft_doc::{Appearance, AppearanceItem, Dash, Document, FillLayer, Node, StrokeLayer}; use vectorcraft_geom::{Affine, PathData, Point, Rect, SubPath, shapes}; diff --git a/crates/svg/tests/it/blend_export.rs b/crates/svg/tests/it/blend_export.rs index 425173cfd6..01246393de 100644 --- a/crates/svg/tests/it/blend_export.rs +++ b/crates/svg/tests/it/blend_export.rs @@ -2,7 +2,6 @@ //! reference formulas when resvg draws the file, and masks take luminance the canvas's way. use craft_svg::tree::draw::resvg; -use craft_svg::tree::usvg; use craft_svg::tree::usvg::roxmltree; use vectorcraft_color::blend::blend_rgb; use vectorcraft_color::{BlendMode, Color, Paint}; diff --git a/crates/svg/tests/it/colorized_images.rs b/crates/svg/tests/it/colorized_images.rs index e1bb8d9696..f7fb3a8136 100644 --- a/crates/svg/tests/it/colorized_images.rs +++ b/crates/svg/tests/it/colorized_images.rs @@ -1,7 +1,6 @@ //! Colorized gray and bilevel image export, checked as pixels as well as markup. use craft_svg::tree::draw::resvg; -use craft_svg::tree::usvg; use vectorcraft_color::{Color, Paint, Swatch}; use vectorcraft_doc::{Document, ImageBlob, ImageObject, LinkInfo, Node, NodeKind}; use vectorcraft_geom::Affine; diff --git a/crates/svg/tests/it/dash_align.rs b/crates/svg/tests/it/dash_align.rs index c24ece700d..ced8beeee7 100644 --- a/crates/svg/tests/it/dash_align.rs +++ b/crates/svg/tests/it/dash_align.rs @@ -2,7 +2,6 @@ //! exact dashes stay a `stroke-dasharray`. Checked by rendering the exported SVG with resvg. use craft_svg::tree::draw::resvg; -use craft_svg::tree::usvg; use vectorcraft_color::{Color, Paint}; use vectorcraft_doc::{Appearance, AppearanceItem, Dash, Document, Node, StrokeLayer}; use vectorcraft_geom::{Rect, shapes}; diff --git a/crates/svg/tests/it/data_attributes.rs b/crates/svg/tests/it/data_attributes.rs index 83bcaf3be6..60edf3dd60 100644 --- a/crates/svg/tests/it/data_attributes.rs +++ b/crates/svg/tests/it/data_attributes.rs @@ -1,6 +1,5 @@ //! Synthetic XML 1.0/SVG round trips: https://www.w3.org/TR/xml/#AVNormalize //! https://www.w3.org/TR/xml/#NT-NameChar https://www.w3.org/TR/xml/#charsets -use craft_svg::tree::usvg; use craft_svg::tree::usvg::roxmltree; use std::collections::HashSet; use vectorcraft_doc::{Document, Node}; diff --git a/crates/svg/tests/it/foreign_attributes.rs b/crates/svg/tests/it/foreign_attributes.rs index 5aaabf894e..ba9131979d 100644 --- a/crates/svg/tests/it/foreign_attributes.rs +++ b/crates/svg/tests/it/foreign_attributes.rs @@ -1,7 +1,6 @@ //! Attributes in other applications' XML namespaces (https://www.w3.org/TR/xml-names/) survive a //! round trip through VectorCraft: kept on import, written back on export with their namespaces //! declared on the root. -use craft_svg::tree::usvg; use craft_svg::tree::usvg::roxmltree; use vectorcraft_doc::{Document, ForeignAttribute, Node, NodeKind}; use vectorcraft_svg::{ExportOptions, MAX_FOREIGN, MAX_FOREIGN_VALUE, export, export_full, import, import_with_report}; diff --git a/crates/svg/tests/it/import_details.rs b/crates/svg/tests/it/import_details.rs index c3ac1f27ef..25c5152de9 100644 --- a/crates/svg/tests/it/import_details.rs +++ b/crates/svg/tests/it/import_details.rs @@ -3,7 +3,6 @@ //! hidden objects, and reflected or repeated gradients. use craft_svg::tree::draw::resvg; -use craft_svg::tree::usvg; use std::path::{Path, PathBuf}; use vectorcraft_doc::{Document, ImageObject, LinkInfo, Node, NodeKind}; diff --git a/crates/svg/tests/it/import_live.rs b/crates/svg/tests/it/import_live.rs index 1620647bc2..b3b33cd8fc 100644 --- a/crates/svg/tests/it/import_live.rs +++ b/crates/svg/tests/it/import_live.rs @@ -3,7 +3,6 @@ //! export → import keeps them. use craft_svg::tree::draw::resvg; -use craft_svg::tree::usvg; use std::sync::Arc; use serde_json::json; diff --git a/crates/svg/tests/it/interactivity.rs b/crates/svg/tests/it/interactivity.rs index 0e3d4de3b1..17f5e3b671 100644 --- a/crates/svg/tests/it/interactivity.rs +++ b/crates/svg/tests/it/interactivity.rs @@ -2,7 +2,6 @@ //! and `