diff --git a/crates/krilla/src/font/bitmap.rs b/crates/krilla/src/font/bitmap.rs index 45031acb..a295f70d 100644 --- a/crates/krilla/src/font/bitmap.rs +++ b/crates/krilla/src/font/bitmap.rs @@ -1,11 +1,11 @@ //! Drawing bitmap-based glyphs to a surface. -use std::sync::Arc; use crate::font::bitmap::utils::{BitmapData, BitmapFormat, BitmapStrikes, Origin}; use crate::font::Font; use crate::object::image::Image; use crate::surface::Surface; use skrifa::{GlyphId, MetadataProvider}; +use std::sync::Arc; use tiny_skia_path::{Size, Transform}; /// Draw a bitmap-based glyph on a surface. diff --git a/crates/krilla/src/object/image.rs b/crates/krilla/src/object/image.rs index af4dd0a8..e1a36b4b 100644 --- a/crates/krilla/src/object/image.rs +++ b/crates/krilla/src/object/image.rs @@ -7,8 +7,6 @@ //! - GIF //! - WEBP -use std::fmt::{Debug, Formatter}; -use std::hash::{Hash, Hasher}; use crate::color::{ICCBasedColorSpace, ICCProfile, ICCProfileWrapper, DEVICE_CMYK, DEVICE_RGB}; use crate::object::color::DEVICE_GRAY; use crate::resource::RegisterableResource; @@ -16,6 +14,8 @@ use crate::serialize::SerializerContext; use crate::stream::FilterStream; use crate::util::{Deferred, NameExt, SipHashable}; use pdf_writer::{Chunk, Finish, Name, Ref}; +use std::fmt::{Debug, Formatter}; +use std::hash::{Hash, Hasher}; use std::ops::DerefMut; use std::sync::Arc; use zune_jpeg::zune_core::result::DecodingResult; @@ -102,13 +102,13 @@ impl Repr { struct ImageMetadata { size: (u32, u32), color_space: ImageColorspace, - icc: Option + icc: Option, } struct ImageRepr { inner: Deferred>, metadata: ImageMetadata, - sip: u128 + sip: u128, } impl ImageRepr { @@ -400,14 +400,13 @@ fn decode_jpeg(data: &[u8]) -> Option { let input_color_space = decoder.get_input_colorspace()?; if matches!( - input_color_space, - ColorSpace::Luma - | ColorSpace::YCbCr - | ColorSpace::RGB - | ColorSpace::CMYK - | ColorSpace::YCCK - ) { - + input_color_space, + ColorSpace::Luma + | ColorSpace::YCbCr + | ColorSpace::RGB + | ColorSpace::CMYK + | ColorSpace::YCCK + ) { Some(Repr::Jpeg(JpegRepr { // TODO: Avoid cloning here? data: data.to_vec(), diff --git a/crates/krilla/src/svg/filter.rs b/crates/krilla/src/svg/filter.rs index 8ed2771e..7c4bea4c 100644 --- a/crates/krilla/src/svg/filter.rs +++ b/crates/krilla/src/svg/filter.rs @@ -1,7 +1,7 @@ -use std::sync::Arc; use crate::object::image::Image; use crate::surface::Surface; use crate::svg::ProcessContext; +use std::sync::Arc; use tiny_skia_path::{Size, Transform}; /// Render a filter into a surface by rasterizing it with `resvg` and drawing diff --git a/crates/krilla/src/tests/mod.rs b/crates/krilla/src/tests/mod.rs index 915063cd..801a2d19 100644 --- a/crates/krilla/src/tests/mod.rs +++ b/crates/krilla/src/tests/mod.rs @@ -191,19 +191,31 @@ pub fn rect_to_path(x1: f32, y1: f32, x2: f32, y2: f32) -> Path { } pub fn load_png_image(name: &str) -> Image { - Image::from_png(Arc::new(std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap())).unwrap() + Image::from_png(Arc::new( + std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(), + )) + .unwrap() } pub fn load_jpg_image(name: &str) -> Image { - Image::from_jpeg(Arc::new(std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap())).unwrap() + Image::from_jpeg(Arc::new( + std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(), + )) + .unwrap() } pub fn load_gif_image(name: &str) -> Image { - Image::from_gif(Arc::new(std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap())).unwrap() + Image::from_gif(Arc::new( + std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(), + )) + .unwrap() } pub fn load_webp_image(name: &str) -> Image { - Image::from_webp(Arc::new(std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap())).unwrap() + Image::from_webp(Arc::new( + std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(), + )) + .unwrap() } fn write_snapshot_to_store(name: &str, content: &[u8]) {