From e2f0379b911f569fb9b8770b94ece1e35f7d139c Mon Sep 17 00:00:00 2001 From: Daniel Hauck Date: Sat, 4 Jan 2025 00:00:07 +0100 Subject: [PATCH 1/3] Update image --- xcommon/Cargo.toml | 2 +- xcommon/src/lib.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xcommon/Cargo.toml b/xcommon/Cargo.toml index 4d725d7d..4f8d99f2 100644 --- a/xcommon/Cargo.toml +++ b/xcommon/Cargo.toml @@ -10,7 +10,7 @@ license = "Apache-2.0 OR MIT" anyhow = "1.0.68" byteorder = "1.4.3" dunce = "1" -image = { version = "0.24.5", default-features = false, features = ["png", "webp"] } +image = { version = "0.25.5", default-features = false, features = ["png", "webp"] } pem = "1.1.0" rasn = "0.6.1" rasn-pkix = "0.6.0" diff --git a/xcommon/src/lib.rs b/xcommon/src/lib.rs index 61e7c0af..9d504769 100644 --- a/xcommon/src/lib.rs +++ b/xcommon/src/lib.rs @@ -2,9 +2,9 @@ pub mod llvm; use anyhow::{Context, Result}; use byteorder::{LittleEndian, ReadBytesExt}; -use image::imageops::FilterType; -use image::io::Reader as ImageReader; -use image::{DynamicImage, GenericImageView, ImageOutputFormat, RgbaImage}; +use image::ImageReader; +use image::{imageops::FilterType, ImageFormat}; +use image::{DynamicImage, GenericImageView, RgbaImage}; use rsa::pkcs8::DecodePrivateKey; use rsa::{PaddingScheme, RsaPrivateKey, RsaPublicKey}; use sha2::{Digest, Sha256}; @@ -64,13 +64,13 @@ impl Scaler { .img .resize(opts.scaled_size, opts.scaled_size, FilterType::Nearest); if opts.scaled_size == opts.target_width && opts.scaled_size == opts.target_height { - resized.write_to(w, ImageOutputFormat::Png)?; + resized.write_to(w, ImageFormat::Png)?; } else { let x = (opts.target_width - opts.scaled_size) / 2; let y = (opts.target_height - opts.scaled_size) / 2; let mut padded = RgbaImage::new(opts.target_width, opts.target_height); image::imageops::overlay(&mut padded, &resized, x as i64, y as i64); - padded.write_to(w, ImageOutputFormat::Png)?; + padded.write_to(w, ImageFormat::Png)?; } Ok(()) } From a456bfb9eec15312597cd8dfe3f1af586c2e44f0 Mon Sep 17 00:00:00 2001 From: Daniel Hauck Date: Sat, 4 Jan 2025 01:07:45 +0100 Subject: [PATCH 2/3] Lower image version --- xcommon/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcommon/Cargo.toml b/xcommon/Cargo.toml index 4f8d99f2..713bc8e5 100644 --- a/xcommon/Cargo.toml +++ b/xcommon/Cargo.toml @@ -10,7 +10,7 @@ license = "Apache-2.0 OR MIT" anyhow = "1.0.68" byteorder = "1.4.3" dunce = "1" -image = { version = "0.25.5", default-features = false, features = ["png", "webp"] } +image = { version = "0.25.2", default-features = false, features = ["png", "webp"] } pem = "1.1.0" rasn = "0.6.1" rasn-pkix = "0.6.0" From e8159e262ee7ac40aa3d633b02876ecd10ee68e7 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Mon, 6 Jan 2025 10:53:23 +0100 Subject: [PATCH 3/3] Reformat imports Only imports within the same module share a line. --- xcommon/src/lib.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xcommon/src/lib.rs b/xcommon/src/lib.rs index 9d504769..a4fde16b 100644 --- a/xcommon/src/lib.rs +++ b/xcommon/src/lib.rs @@ -2,9 +2,8 @@ pub mod llvm; use anyhow::{Context, Result}; use byteorder::{LittleEndian, ReadBytesExt}; -use image::ImageReader; -use image::{imageops::FilterType, ImageFormat}; -use image::{DynamicImage, GenericImageView, RgbaImage}; +use image::imageops::FilterType; +use image::{DynamicImage, GenericImageView, ImageFormat, ImageReader, RgbaImage}; use rsa::pkcs8::DecodePrivateKey; use rsa::{PaddingScheme, RsaPrivateKey, RsaPublicKey}; use sha2::{Digest, Sha256};