This commit is contained in:
Matteo Paonessa 2024-04-04 15:59:30 +02:00
parent 635c143f99
commit de9303e1c2
4 changed files with 9 additions and 9 deletions

View File

@ -1,6 +1,6 @@
[package] [package]
name = "libcaesium" name = "libcaesium"
version = "0.15.2" version = "0.15.3"
authors = ["Matteo Paonessa <matteo.paonessa@gmail.com>"] authors = ["Matteo Paonessa <matteo.paonessa@gmail.com>"]
edition = "2021" edition = "2021"
categories = ["multimedia::images"] categories = ["multimedia::images"]
@ -34,9 +34,9 @@ mozjpeg-sys = { version = "1.1", optional = true }
oxipng = { version = "9.0", default-features = false, features = ["filetime", "zopfli"], optional = true } oxipng = { version = "9.0", default-features = false, features = ["filetime", "zopfli"], optional = true }
libc = "0.2" libc = "0.2"
gifsicle = { version = "1.94", optional = true } gifsicle = { version = "1.94", optional = true }
webp = { version = "0.2.6", optional = true } webp = { version = "0.2.7", optional = true }
infer = "0.15.0" infer = "0.15.0"
image = { version = "0.24.8", default-features = false } image = { version = "0.25.1", default-features = false }
img-parts = "0.3" img-parts = "0.3"
bytes = "1.5" bytes = "1.5"
lodepng = { version = "3.10", optional = true } lodepng = { version = "3.10", optional = true }

View File

@ -4,7 +4,7 @@ use std::io::Write;
use std::mem; use std::mem;
use std::panic::catch_unwind; use std::panic::catch_unwind;
use image::ImageOutputFormat::Jpeg; use image::ImageFormat::Jpeg;
use img_parts::{ImageEXIF, ImageICC}; use img_parts::{ImageEXIF, ImageICC};
use img_parts::jpeg::Jpeg as PartsJpeg; use img_parts::jpeg::Jpeg as PartsJpeg;
use libc::free; use libc::free;
@ -54,10 +54,10 @@ pub fn compress_to_memory(
if parameters.width > 0 || parameters.height > 0 { if parameters.width > 0 || parameters.height > 0 {
if parameters.keep_metadata { if parameters.keep_metadata {
let metadata = extract_metadata(in_file.clone()); let metadata = extract_metadata(in_file.clone());
in_file = resize(in_file, parameters.width, parameters.height, Jpeg(80))?; in_file = resize(in_file, parameters.width, parameters.height, Jpeg)?;
in_file = save_metadata(in_file, metadata.0, metadata.1); in_file = save_metadata(in_file, metadata.0, metadata.1);
} else { } else {
in_file = resize(in_file, parameters.width, parameters.height, Jpeg(80))?; in_file = resize(in_file, parameters.width, parameters.height, Jpeg)?;
} }
} }

View File

@ -3,7 +3,7 @@ use std::fs::File;
use std::io::Write; use std::io::Write;
use std::num::NonZeroU8; use std::num::NonZeroU8;
use image::ImageOutputFormat; use image::ImageFormat;
use oxipng::Deflaters::Zopfli; use oxipng::Deflaters::Zopfli;
use crate::CSParameters; use crate::CSParameters;
@ -25,7 +25,7 @@ pub fn compress(
in_file, in_file,
parameters.width, parameters.width,
parameters.height, parameters.height,
ImageOutputFormat::Png, ImageFormat::Png,
)?; )?;
} }

View File

@ -10,7 +10,7 @@ pub fn resize(
image_buffer: Vec<u8>, image_buffer: Vec<u8>,
width: u32, width: u32,
height: u32, height: u32,
format: image::ImageOutputFormat, format: image::ImageFormat,
) -> Result<Vec<u8>, CaesiumError> { ) -> Result<Vec<u8>, CaesiumError> {
let mut image = ImageReader::new(Cursor::new(image_buffer)) let mut image = ImageReader::new(Cursor::new(image_buffer))
.with_guessed_format() .with_guessed_format()