Skip to content

Commit fb5799b

Browse files
committed
Move Orientation to metadata module
1 parent dd87098 commit fb5799b

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

src/codecs/jpeg/decoder.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ use crate::error::{
66
DecodingError, ImageError, ImageResult, LimitError, UnsupportedError, UnsupportedErrorKind,
77
};
88
use crate::image::{ImageDecoder, ImageFormat};
9-
use crate::{Limits, Orientation};
9+
use crate::metadata::Orientation;
10+
use crate::Limits;
1011

1112
type ZuneColorSpace = zune_core::colorspace::ColorSpace;
1213

src/codecs/tiff.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::error::{
1818
ParameterError, ParameterErrorKind, UnsupportedError, UnsupportedErrorKind,
1919
};
2020
use crate::image::{ImageDecoder, ImageEncoder, ImageFormat};
21-
use crate::Orientation;
21+
use crate::metadata::Orientation;
2222

2323
/// Decoder for TIFF images.
2424
pub struct TiffDecoder<R>

src/codecs/webp/decoder.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ use std::io::{BufRead, Read, Seek};
33
use crate::buffer::ConvertBuffer;
44
use crate::error::{DecodingError, ImageError, ImageResult};
55
use crate::image::{ImageDecoder, ImageFormat};
6-
use crate::{
7-
AnimationDecoder, ColorType, Delay, Frame, Frames, Orientation, RgbImage, Rgba, RgbaImage,
8-
};
6+
use crate::metadata::Orientation;
7+
use crate::{AnimationDecoder, ColorType, Delay, Frame, Frames, RgbImage, Rgba, RgbaImage};
98

109
/// WebP Image format decoder.
1110
///

src/dynimage.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ use crate::flat::FlatSamples;
1616
use crate::image::{GenericImage, GenericImageView, ImageDecoder, ImageEncoder, ImageFormat};
1717
use crate::image_reader::free_functions;
1818
use crate::math::resize_dimensions;
19+
use crate::metadata::Orientation;
1920
use crate::traits::Pixel;
21+
use crate::ImageReader;
2022
use crate::{image, Luma, LumaA};
2123
use crate::{imageops, ExtendedColorType};
22-
use crate::{ImageReader, Orientation};
2324
use crate::{Rgb32FImage, Rgba32FImage};
2425

2526
/// A Dynamic Image
@@ -940,7 +941,7 @@ impl DynamicImage {
940941
///
941942
/// ```
942943
/// # fn only_check_if_this_compiles() -> Result<(), Box<dyn std::error::Error>> {
943-
/// use image::{Orientation, DynamicImage, ImageReader, ImageDecoder};
944+
/// use image::{DynamicImage, ImageReader, ImageDecoder, metadata::Orientation};
944945
///
945946
/// let mut decoder = ImageReader::open("file.jpg")?.into_decoder()?;
946947
/// let orientation = decoder.orientation()?;

src/image.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ use crate::error::{
1111
ParameterErrorKind, UnsupportedError, UnsupportedErrorKind,
1212
};
1313
use crate::math::Rect;
14+
use crate::metadata::Orientation;
1415
use crate::traits::Pixel;
15-
use crate::{ImageBuffer, Orientation};
16+
use crate::ImageBuffer;
1617

1718
use crate::animation::Frames;
1819

src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ pub use crate::image_reader::{ImageReader, LimitSupport, Limits};
172172
pub use crate::dynimage::DynamicImage;
173173

174174
pub use crate::animation::{Delay, Frame, Frames};
175-
pub use crate::metadata::Orientation;
176175

177176
// More detailed error type
178177
pub mod error;
@@ -290,7 +289,7 @@ mod color;
290289
mod dynimage;
291290
mod image;
292291
mod image_reader;
293-
mod metadata;
292+
pub mod metadata;
294293
//TODO delete this module after a few releases
295294
/// deprecated io module the original io module has been renamed to `image_reader`
296295
pub mod io {

src/metadata.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//! Types describing image metadata
2+
13
use std::io::{Cursor, Read};
24

35
use byteorder_lite::{BigEndian, LittleEndian, ReadBytesExt};

0 commit comments

Comments
 (0)