apply orientation EXIF to single image containers

Cargo.toml

@@ -9,8 +9,6 @@ image = {version = "0.25", default-features = false, features = [
       "jpeg",
       "png",
       "tiff",
-      "pnm",
-      "bmp"
 ]}
 nalgebra = "0.33.2"
 serde = {version = "1.0.214", features= ["derive"]}

src/image_container.rs

@@ -1,6 +1,6 @@
 use crate::image_helpers::{binary_image_from_image, fax_to_grayimage};
 use crate::ErrorWrapper;
-use image::{DynamicImage, GrayImage};
+use image::{DynamicImage, GrayImage, ImageDecoder};
 
 use pdf::any::AnySync;
 use pdf::file::NoLog;
@@ -28,6 +28,25 @@ pub struct SingleImageContainer {
     pub image: DynamicImage,
 }
 
+impl SingleImageContainer {
+    pub fn from_data_with_format(data: &[u8], format: image::ImageFormat) -> Self {
+        let reader = image::ImageReader::with_format(std::io::Cursor::new(data), format);
+        if let Ok(mut decoder) = reader.into_decoder() {
+            let orientation = decoder
+                .orientation()
+                .unwrap_or(image::metadata::Orientation::NoTransforms);
+
+            if let Ok(mut dynimage) = image::DynamicImage::from_decoder(decoder) {
+                dynimage.apply_orientation(orientation);
+
+                return SingleImageContainer { image: dynimage };
+            }
+        }
+
+        panic!("could not decode single image!");
+    }
+}
+
 pub trait ImageContainer {
     fn get_page(&mut self, n: usize) -> Result<GrayImage, ErrorWrapper>;
 

src/main.rs

@@ -135,13 +135,6 @@ fn main() -> Result<(), ErrorWrapper> {
                 _ => println!("Unsupported file type: {:?}", imagefile),
             }
         }
-        Some(("test", _sub_matches)) => {
-            println!("foo");
-            let t: Template =
-                serde_json::from_reader(std::fs::File::open("private/40qtemplate.json")?)?;
-            let outfile = std::fs::File::create("cbortest.cbor")?;
-            let _ = serde_cbor::to_writer(outfile, &t);
-        }
         Some(("debug", sub_matches)) => {
             let templatepath = sub_matches
                 .get_one::<String>("template")

src/webapp/generate_report.rs

@@ -76,17 +76,17 @@ fn raw_data_to_container(data: &Vec<u8>) -> Option<Box<dyn ImageContainer + '_>>
                 return Some(Box::new(container));
             }
             "image/png" => {
-                let image =
-                    image::load_from_memory_with_format(&clonedata, image::ImageFormat::Png)
-                        .unwrap();
-                let container = SingleImageContainer { image: image };
+                let container = SingleImageContainer::from_data_with_format(
+                    &clonedata,
+                    image::ImageFormat::Png,
+                );
                 return Some(Box::new(container));
             }
             "image/jpeg" => {
-                let image =
-                    image::load_from_memory_with_format(&clonedata, image::ImageFormat::Jpeg)
-                        .unwrap();
-                let container = SingleImageContainer { image: image };
+                let container = SingleImageContainer::from_data_with_format(
+                    &clonedata,
+                    image::ImageFormat::Jpeg,
+                );
                 return Some(Box::new(container));
             }
             _ => log::error!(