Merge pull request #2349 from Shnatsel/orientation-in-metadata

Move Orientation to metadata module

src/codecs/jpeg/decoder.rs

@@ -6,7 +6,8 @@ use crate::error::{
     DecodingError, ImageError, ImageResult, LimitError, UnsupportedError, UnsupportedErrorKind,
 };
 use crate::image::{ImageDecoder, ImageFormat};
-use crate::{Limits, Orientation};
+use crate::metadata::Orientation;
+use crate::Limits;
 
 type ZuneColorSpace = zune_core::colorspace::ColorSpace;
 

src/codecs/tiff.rs

@@ -18,7 +18,7 @@ use crate::error::{
     ParameterError, ParameterErrorKind, UnsupportedError, UnsupportedErrorKind,
 };
 use crate::image::{ImageDecoder, ImageEncoder, ImageFormat};
-use crate::Orientation;
+use crate::metadata::Orientation;
 
 /// Decoder for TIFF images.
 pub struct TiffDecoder<R>

src/codecs/webp/decoder.rs

@@ -3,9 +3,8 @@ use std::io::{BufRead, Read, Seek};
 use crate::buffer::ConvertBuffer;
 use crate::error::{DecodingError, ImageError, ImageResult};
 use crate::image::{ImageDecoder, ImageFormat};
-use crate::{
-    AnimationDecoder, ColorType, Delay, Frame, Frames, Orientation, RgbImage, Rgba, RgbaImage,
-};
+use crate::metadata::Orientation;
+use crate::{AnimationDecoder, ColorType, Delay, Frame, Frames, RgbImage, Rgba, RgbaImage};
 
 /// WebP Image format decoder.
 ///

src/dynimage.rs

@@ -16,10 +16,11 @@ use crate::flat::FlatSamples;
 use crate::image::{GenericImage, GenericImageView, ImageDecoder, ImageEncoder, ImageFormat};
 use crate::image_reader::free_functions;
 use crate::math::resize_dimensions;
+use crate::metadata::Orientation;
 use crate::traits::Pixel;
+use crate::ImageReader;
 use crate::{image, Luma, LumaA};
 use crate::{imageops, ExtendedColorType};
-use crate::{ImageReader, Orientation};
 use crate::{Rgb32FImage, Rgba32FImage};
 
 /// A Dynamic Image
@@ -940,7 +941,7 @@ impl DynamicImage {
     ///
     /// ```
     /// # fn only_check_if_this_compiles() -> Result<(), Box<dyn std::error::Error>> {
-    /// use image::{Orientation, DynamicImage, ImageReader, ImageDecoder};
+    /// use image::{DynamicImage, ImageReader, ImageDecoder};
     ///
     /// let mut decoder = ImageReader::open("file.jpg")?.into_decoder()?;
     /// let orientation = decoder.orientation()?;

src/image.rs

@@ -11,8 +11,9 @@ use crate::error::{
     ParameterErrorKind, UnsupportedError, UnsupportedErrorKind,
 };
 use crate::math::Rect;
+use crate::metadata::Orientation;
 use crate::traits::Pixel;
-use crate::{ImageBuffer, Orientation};
+use crate::ImageBuffer;
 
 use crate::animation::Frames;
 

src/lib.rs

@@ -172,7 +172,6 @@ pub use crate::image_reader::{ImageReader, LimitSupport, Limits};
 pub use crate::dynimage::DynamicImage;
 
 pub use crate::animation::{Delay, Frame, Frames};
-pub use crate::metadata::Orientation;
 
 // More detailed error type
 pub mod error;
@@ -290,7 +289,7 @@ mod color;
 mod dynimage;
 mod image;
 mod image_reader;
-mod metadata;
+pub mod metadata;
 //TODO delete this module after a few releases
 /// deprecated io module the original io module has been renamed to `image_reader`
 pub mod io {

src/metadata.rs

@@ -1,3 +1,5 @@
+//! Types describing image metadata
+
 use std::io::{Cursor, Read};
 
 use byteorder_lite::{BigEndian, LittleEndian, ReadBytesExt};