external/fast_image_resize
1
0
Fork 0
mirror of https://github.com/Cykooz/fast_image_resize.git synced 2026-10-08 01:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the deprecation warning about ImageReader from the image crate.

Browse Source
This commit is contained in:
Kirill Kuzminykh
2025-05-16 16:18:03 +03:00
parent 6ec8f5babb
commit 24f006a404
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/src/lib.rs
+15 -17
View File
@@ -3,12 +3,10 @@ use std::io::BufReader;
use std::num::NonZeroU32;
use std::ops::Deref;
use image::io::{Reader as ImageReader, Reader};
use image::{ColorType, ExtendedColorType, ImageBuffer};
use fast_image_resize::images::Image;
use fast_image_resize::pixels::*;
use fast_image_resize::{change_type_of_pixel_components, CpuExtensions, PixelTrait, PixelType};
use image::{ColorType, ExtendedColorType, ImageBuffer, ImageReader};
pub fn nonzero(v: u32) -> NonZeroU32 {
NonZeroU32::new(v).unwrap()
@@ -112,7 +110,7 @@ pub trait PixelTestingExt: PixelTrait {
}
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container>;
fn load_big_image() -> ImageBuffer<Self::ImagePixel, Self::Container> {
@@ -172,7 +170,7 @@ pub mod not_u8x4 {
type Container = Vec<u8>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_luma8()
}
@@ -187,7 +185,7 @@ pub mod not_u8x4 {
type Container = Vec<u8>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_luma_alpha8()
}
@@ -202,7 +200,7 @@ pub mod not_u8x4 {
type Container = Vec<u8>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_rgb8()
}
@@ -217,7 +215,7 @@ pub mod not_u8x4 {
type Container = Vec<u16>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_luma16()
}
@@ -237,7 +235,7 @@ pub mod not_u8x4 {
type Container = Vec<u16>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_luma_alpha16()
}
@@ -252,7 +250,7 @@ pub mod not_u8x4 {
type Container = Vec<u16>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_rgb16()
}
@@ -267,7 +265,7 @@ pub mod not_u8x4 {
type Container = Vec<u16>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_rgba16()
}
@@ -286,7 +284,7 @@ pub mod not_u8x4 {
}
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
let image_u16 = img_reader.decode().unwrap().to_luma32f();
ImageBuffer::from_fn(image_u16.width(), image_u16.height(), |x, y| {
@@ -308,7 +306,7 @@ pub mod not_u8x4 {
type Container = Vec<f32>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_luma32f()
}
@@ -326,7 +324,7 @@ pub mod not_u8x4 {
type Container = Vec<f32>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_luma_alpha32f()
}
@@ -344,7 +342,7 @@ pub mod not_u8x4 {
type Container = Vec<f32>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_rgb32f()
}
@@ -359,7 +357,7 @@ pub mod not_u8x4 {
type Container = Vec<f32>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_rgba32f()
}
@@ -375,7 +373,7 @@ impl PixelTestingExt for U8x4 {
type Container = Vec<u8>;
fn load_image_buffer(
img_reader: Reader<BufReader<File>>,
img_reader: ImageReader<BufReader<File>>,
) -> ImageBuffer<Self::ImagePixel, Self::Container> {
img_reader.decode().unwrap().to_rgba8()
}
tests/resize_tests.rs
+1 -2
View File
@@ -1,14 +1,13 @@
use std::cmp::Ordering;
use std::fmt::Debug;
use image::io::Reader as ImageReader;
use fast_image_resize::images::{Image, TypedImage, TypedImageRef};
use fast_image_resize::pixels::*;
use fast_image_resize::{
testing as fr_testing, CpuExtensions, CropBoxError, Filter, FilterType, IntoImageView,
PixelTrait, PixelType, ResizeAlg, ResizeError, ResizeOptions, Resizer,
};
use image::ImageReader;
use testing::{cpu_ext_into_str, image_checksum, save_result, PixelTestingExt};
fn get_new_height(src_image: &impl IntoImageView, new_width: u32) -> u32 {