TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor thumbnail math

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-15 08:35:02 +00:00
parent 923a98eb66
commit 739eab46d5
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/service/media/thumbnail.rs
View file

@ -1,4 +1,4 @@
use std::{io::Cursor, num::Saturating as Sat}; use std::{cmp, io::Cursor, num::Saturating as Sat};
use conduit::{checked, Result}; use conduit::{checked, Result};
use image::{imageops::FilterType, DynamicImage}; use image::{imageops::FilterType, DynamicImage};
@ -127,26 +127,29 @@ fn thumbnail_generate(image: &DynamicImage, width: u32, height: u32, crop: bool)
} }
fn thumbnail_dimension(image: &DynamicImage, width: u32, height: u32) -> Result<(u32, u32)> { fn thumbnail_dimension(image: &DynamicImage, width: u32, height: u32) -> Result<(u32, u32)> {
let original_width = image.width(); let image_width = image.width();
let original_height = image.height(); let image_height = image.height();
let ratio = Sat(original_width) * Sat(height); let width = cmp::min(width, image_width);
let nratio = Sat(width) * Sat(original_height); let height = cmp::min(height, image_height);
let use_width = nratio <= ratio;
let intermediate = if use_width { let use_width = Sat(width) * Sat(image_height) < Sat(height) * Sat(image_width);
Sat(original_height) * Sat(checked!(width / original_width)?)
let x = if use_width {
let dividend = (Sat(height) * Sat(image_width)).0;
checked!(dividend / image_height)?
} else { } else {
Sat(original_width) * Sat(checked!(height / original_height)?) width
}; };
let dims = if use_width { let y = if !use_width {
(width, intermediate.0) let dividend = (Sat(width) * Sat(image_height)).0;
checked!(dividend / image_width)?
} else { } else {
(intermediate.0, height) height
}; };
Ok(dims) Ok((x, y))
} }
/// Returns width, height of the thumbnail and whether it should be cropped. /// Returns width, height of the thumbnail and whether it should be cropped.