summaryrefslogtreecommitdiff
path: root/dichroism/src
diff options
context:
space:
mode:
authorAdam T. Carpenter <atc@53hor.net>2020-12-28 08:43:44 -0500
committerAdam T. Carpenter <atc@53hor.net>2020-12-28 08:43:44 -0500
commitbb1edd35721d34ce394ab9e51c4095015f26b185 (patch)
tree2287c44f6ccc660abcd508df239909bbb0ecc9c2 /dichroism/src
parent9c02faa06170d7d3140bf252d1dca4630e4b0172 (diff)
downloadtheglassyladies-bb1edd35721d34ce394ab9e51c4095015f26b185.tar.xz
theglassyladies-bb1edd35721d34ce394ab9e51c4095015f26b185.zip
fixed images that were rotated with exif tags not displaying rotateddev
Diffstat (limited to 'dichroism/src')
-rw-r--r--dichroism/src/handlers.rs2
-rw-r--r--dichroism/src/image_service.rs26
2 files changed, 25 insertions, 3 deletions
diff --git a/dichroism/src/handlers.rs b/dichroism/src/handlers.rs
index 8dd0f3b..b9420af 100644
--- a/dichroism/src/handlers.rs
+++ b/dichroism/src/handlers.rs
@@ -117,7 +117,7 @@ async fn post_photo(
}
// create new photo_set
- let photo_set = web::block(move || image_service::generate_photo_set(&data))
+ let photo_set = web::block(move || image_service::generate_photo_set(data))
.await
.map_err(to_internal_error)?;
let conn = pool.get().map_err(to_internal_error)?;
diff --git a/dichroism/src/image_service.rs b/dichroism/src/image_service.rs
index a69cca2..0d2ed14 100644
--- a/dichroism/src/image_service.rs
+++ b/dichroism/src/image_service.rs
@@ -2,14 +2,36 @@ use crate::config::CONFIG_INSTANCE;
use crate::constants::{PHOTO_BASE_XY, PHOTO_FULLSIZE_XY, PHOTO_THUMBNAIL_XY};
use crate::error::DichroismError;
use crate::models::{Photo, PhotoSet};
+use exif::Reader;
use image::imageops::FilterType;
use image::DynamicImage;
use image::GenericImageView;
+use std::io::{BufReader, Cursor};
use std::path::PathBuf;
use uuid::Uuid;
-pub fn generate_photo_set(data: &[u8]) -> Result<PhotoSet, DichroismError> {
- let original = image::load_from_memory(&data)?;
+pub fn generate_photo_set(data: Vec<u8>) -> Result<PhotoSet, DichroismError> {
+ // load image data from bytes
+ let mut original = image::load_from_memory(&data)?;
+
+ // read EXIF tags to check for required rotation
+ let exifreader = Reader::new();
+ let mut reader = BufReader::new(Cursor::new(data));
+ let exif = exifreader.read_from_container(&mut reader).unwrap();
+ if let Some(orient) = exif
+ .get_field(exif::Tag::Orientation, exif::In::PRIMARY)
+ .map(|o| o.value.get_uint(0))
+ .flatten()
+ {
+ // if a tag was present, rotate original image data as necessary
+ match orient {
+ 8 => original = original.rotate270(),
+ 3 => original = original.rotate180(),
+ 6 => original = original.rotate90(),
+ _ => {}
+ }
+ }
+
let fullsize = original.resize(PHOTO_FULLSIZE_XY, PHOTO_FULLSIZE_XY, FilterType::Lanczos3);
let base = original.resize(PHOTO_BASE_XY, PHOTO_BASE_XY, FilterType::Lanczos3);