Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-19 14:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix rotation for small images and avatars

Browse Source
This commit is contained in:
B. Petersen
2020-11-01 22:33:38 +01:00
committed by link2xt
parent 4f836950bc
commit 7c15e4e948
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/blob.rs
View File

@@ -426,30 +426,40 @@ impl<'a> BlobObject<'a> {
blob_abs: PathBuf,
img_wh: u32,
) -> Result<(), BlobError> {
let img = image::open(&blob_abs).map_err(|err| BlobError::RecodeFailure {
let mut img = image::open(&blob_abs).map_err(|err| BlobError::RecodeFailure {
blobdir: context.get_blobdir().to_path_buf(),
blobname: blob_abs.to_str().unwrap_or_default().to_string(),
cause: err,
})?;
let orientation = self.get_exif_orientation(context);
if img.width() <= img_wh && img.height() <= img_wh {
return Ok(());
let do_scale = img.width() > img_wh || img.height() > img_wh;
let do_rotate = match orientation {
Ok(90) | Ok(180) | Ok(270) => true,
_ => false,
};
if do_scale || do_rotate {
if do_scale {
img = img.thumbnail(img_wh, img_wh);
}
if do_rotate {
img = match orientation {
Ok(90) => img.rotate90(),
Ok(180) => img.rotate180(),
Ok(270) => img.rotate270(),
_ => img,
}
}
img.save(&blob_abs).map_err(|err| BlobError::WriteFailure {
blobdir: context.get_blobdir().to_path_buf(),
blobname: blob_abs.to_str().unwrap_or_default().to_string(),
cause: err.into(),
})?;
}
let mut img = img.thumbnail(img_wh, img_wh);
match self.get_exif_orientation(context) {
Ok(90) => img = img.rotate90(),
Ok(180) => img = img.rotate180(),
Ok(270) => img = img.rotate270(),
_ => {}
}
img.save(&blob_abs).map_err(|err| BlobError::WriteFailure {
blobdir: context.get_blobdir().to_path_buf(),
blobname: blob_abs.to_str().unwrap_or_default().to_string(),
cause: err.into(),
})?;
Ok(())
}