From 45a9a2376016b519bf37dc3709f9fe482371e686 Mon Sep 17 00:00:00 2001 From: Laurenz Stampfl <47084093+LaurenzV@users.noreply.github.com> Date: Fri, 30 Aug 2024 17:45:20 +0200 Subject: [PATCH] fix compiler warnings --- src/object/annotation.rs | 4 ++-- src/object/cid_font.rs | 4 ++-- src/object/color_space.rs | 4 ++-- src/object/ext_g_state.rs | 4 ++-- src/object/image.rs | 3 --- src/object/mask.rs | 4 ++-- src/object/outline.rs | 4 ++-- src/object/page.rs | 4 ++-- src/svg/filter.rs | 1 - src/svg/image.rs | 8 +------- src/tests/mod.rs | 2 +- 11 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/object/annotation.rs b/src/object/annotation.rs index c9ad3988..7e244283 100644 --- a/src/object/annotation.rs +++ b/src/object/annotation.rs @@ -86,8 +86,8 @@ mod tests { use crate::object::annotation::{LinkAnnotation, Target}; use crate::object::destination::XyzDestination; use crate::rgb::Rgb; - use crate::serialize::SerializeSettings; - use crate::tests::{check_snapshot, rect_to_path}; + + use crate::tests::rect_to_path; use crate::Fill; use krilla_macros::snapshot; use tiny_skia_path::{Point, Rect, Size}; diff --git a/src/object/cid_font.rs b/src/object/cid_font.rs index 2fa9bb47..6d5d96f7 100644 --- a/src/object/cid_font.rs +++ b/src/object/cid_font.rs @@ -255,8 +255,8 @@ fn subset_tag(subsetted_font: &[u8]) -> String { mod tests { use crate::font::Font; - use crate::serialize::{SerializeSettings, SerializerContext}; - use crate::tests::{check_snapshot, LATIN_MODERN_ROMAN, NOTO_SANS}; + use crate::serialize::SerializerContext; + use crate::tests::{LATIN_MODERN_ROMAN, NOTO_SANS}; use krilla_macros::snapshot; use skrifa::instance::Location; use skrifa::GlyphId; diff --git a/src/object/color_space.rs b/src/object/color_space.rs index faf64255..3a5f2d47 100644 --- a/src/object/color_space.rs +++ b/src/object/color_space.rs @@ -345,8 +345,8 @@ mod tests { use crate::object::color_space::luma::SGray; use crate::object::color_space::rgb::Srgb; use crate::resource::ColorSpaceResource; - use crate::serialize::{SerializeSettings, SerializerContext}; - use crate::tests::check_snapshot; + use crate::serialize::SerializerContext; + use krilla_macros::snapshot; #[snapshot] diff --git a/src/object/ext_g_state.rs b/src/object/ext_g_state.rs index ccd7760b..2ae79c00 100644 --- a/src/object/ext_g_state.rs +++ b/src/object/ext_g_state.rs @@ -138,9 +138,9 @@ impl Object for ExtGState { mod tests { use crate::object::ext_g_state::ExtGState; use crate::object::mask::Mask; - use crate::serialize::{SerializeSettings, SerializerContext}; + use crate::serialize::SerializerContext; use crate::stream::Stream; - use crate::tests::check_snapshot; + use crate::MaskType; use krilla_macros::snapshot; use pdf_writer::types::BlendMode; diff --git a/src/object/image.rs b/src/object/image.rs index bed9458d..ff188b7c 100644 --- a/src/object/image.rs +++ b/src/object/image.rs @@ -3,16 +3,13 @@ use crate::error::KrillaResult; use crate::object::color_space::DEVICE_GRAY; use crate::serialize::{FilterStream, Object, SerializerContext}; use crate::util::{NameExt, Prehashed, SizeWrapper}; -use image::{ColorType, DynamicImage, Luma, Rgb, Rgba}; use pdf_writer::{Chunk, Finish, Name, Ref}; -use std::borrow::Cow; use std::ops::DerefMut; use std::sync::Arc; use tiny_skia_path::Size; use zune_jpeg::zune_core::result::DecodingResult; use zune_jpeg::JpegDecoder; use zune_png::zune_core::colorspace::ColorSpace; -use zune_png::zune_core::options::DecoderOptions; use zune_png::PngDecoder; #[derive(Debug, Hash, Eq, PartialEq)] diff --git a/src/object/mask.rs b/src/object/mask.rs index 1c6df744..1245bb52 100644 --- a/src/object/mask.rs +++ b/src/object/mask.rs @@ -123,9 +123,9 @@ impl Object for Mask { mod tests { use crate::object::mask::Mask; use crate::rgb::Rgb; - use crate::serialize::{SerializeSettings, SerializerContext}; + use crate::serialize::SerializerContext; use crate::surface::StreamBuilder; - use crate::tests::check_snapshot; + use crate::{rgb, Fill, MaskType, Paint}; use krilla_macros::snapshot; use tiny_skia_path::{PathBuilder, Rect}; diff --git a/src/object/outline.rs b/src/object/outline.rs index 5489f67a..58729389 100644 --- a/src/object/outline.rs +++ b/src/object/outline.rs @@ -163,8 +163,8 @@ mod tests { use crate::document::Document; use crate::object::outline::{Outline, OutlineNode}; use crate::rgb::Rgb; - use crate::serialize::SerializeSettings; - use crate::tests::check_snapshot; + + use crate::Fill; use krilla_macros::snapshot; use tiny_skia_path::{PathBuilder, Point, Rect, Size}; diff --git a/src/object/page.rs b/src/object/page.rs index 018c4769..5141f185 100644 --- a/src/object/page.rs +++ b/src/object/page.rs @@ -186,9 +186,9 @@ mod tests { use crate::document::Document; use crate::object::page::{Page, PageLabel}; use crate::rgb::Rgb; - use crate::serialize::{SerializeSettings, SerializerContext}; + use crate::serialize::SerializerContext; use crate::surface::StreamBuilder; - use crate::tests::check_snapshot; + use crate::Fill; use krilla_macros::snapshot; use pdf_writer::types::NumberingStyle; diff --git a/src/svg/filter.rs b/src/svg/filter.rs index 1bd82bae..447a3a8a 100644 --- a/src/svg/filter.rs +++ b/src/svg/filter.rs @@ -1,7 +1,6 @@ use crate::object::image::Image; use crate::surface::Surface; use crate::svg::ProcessContext; -use image::ImageFormat; use tiny_skia_path::{Size, Transform}; /// Render a filter into a surface by rasterizing it with `resvg` and drawing diff --git a/src/svg/image.rs b/src/svg/image.rs index 3162f597..60d1928e 100644 --- a/src/svg/image.rs +++ b/src/svg/image.rs @@ -1,11 +1,5 @@ -use crate::object::image::Image; use crate::surface::Surface; -use crate::svg::{group, ProcessContext}; -use crate::util::RectExt; -use crate::FillRule; -use image::ImageFormat; -use tiny_skia_path::Rect; -use usvg::ImageKind; +use crate::svg::ProcessContext; /// Render an image into a surface. pub fn render(image: &usvg::Image, surface: &mut Surface, process_context: &mut ProcessContext) { diff --git a/src/tests/mod.rs b/src/tests/mod.rs index ad0de795..825bd0af 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -1,6 +1,6 @@ use crate::image::Image; use difference::{Changeset, Difference}; -use image::{load_from_memory, DynamicImage, Rgba, RgbaImage}; +use image::{load_from_memory, Rgba, RgbaImage}; use oxipng::{InFile, OutFile}; use sitro::{ render_ghostscript, render_mupdf, render_pdfbox, render_pdfium, render_pdfjs, render_poppler,