Merge pull request image-rs#1328 from fintelia/codecs-module

Move image file encoders/decoders to codecs module
fintelia · Oct 9, 2020 · af700d2 · af700d2
2 parents 861ae83 + 2164035
commit af700d2
Show file tree

Hide file tree

Showing 35 changed files with 35 additions and 29 deletions.
diff --git a/src/avif/mod.rs → src/codecs/avif/mod.rs b/src/avif/mod.rs → src/codecs/avif/mod.rs
diff --git a/src/bmp/decoder.rs → src/codecs/bmp/decoder.rs b/src/bmp/decoder.rs → src/codecs/bmp/decoder.rs
diff --git a/src/bmp/encoder.rs → src/codecs/bmp/encoder.rs b/src/bmp/encoder.rs → src/codecs/bmp/encoder.rs
diff --git a/src/bmp/mod.rs → src/codecs/bmp/mod.rs b/src/bmp/mod.rs → src/codecs/bmp/mod.rs
diff --git a/src/dds.rs → src/codecs/dds.rs b/src/dds.rs → src/codecs/dds.rs
diff --git a/src/dxt.rs → src/codecs/dxt.rs b/src/dxt.rs → src/codecs/dxt.rs
diff --git a/src/farbfeld.rs → src/codecs/farbfeld.rs b/src/farbfeld.rs → src/codecs/farbfeld.rs
diff --git a/src/gif.rs → src/codecs/gif.rs b/src/gif.rs → src/codecs/gif.rs
diff --git a/src/hdr/decoder.rs → src/codecs/hdr/decoder.rs b/src/hdr/decoder.rs → src/codecs/hdr/decoder.rs
diff --git a/src/hdr/encoder.rs → src/codecs/hdr/encoder.rs b/src/hdr/encoder.rs → src/codecs/hdr/encoder.rs
diff --git a/src/hdr/mod.rs → src/codecs/hdr/mod.rs b/src/hdr/mod.rs → src/codecs/hdr/mod.rs
diff --git a/src/ico/decoder.rs → src/codecs/ico/decoder.rs b/src/ico/decoder.rs → src/codecs/ico/decoder.rs
diff --git a/src/ico/encoder.rs → src/codecs/ico/encoder.rs b/src/ico/encoder.rs → src/codecs/ico/encoder.rs
diff --git a/src/ico/mod.rs → src/codecs/ico/mod.rs b/src/ico/mod.rs → src/codecs/ico/mod.rs
diff --git a/src/jpeg/decoder.rs → src/codecs/jpeg/decoder.rs b/src/jpeg/decoder.rs → src/codecs/jpeg/decoder.rs
diff --git a/src/jpeg/encoder.rs → src/codecs/jpeg/encoder.rs b/src/jpeg/encoder.rs → src/codecs/jpeg/encoder.rs
diff --git a/src/jpeg/entropy.rs → src/codecs/jpeg/entropy.rs b/src/jpeg/entropy.rs → src/codecs/jpeg/entropy.rs
diff --git a/src/jpeg/mod.rs → src/codecs/jpeg/mod.rs b/src/jpeg/mod.rs → src/codecs/jpeg/mod.rs
diff --git a/src/jpeg/transform.rs → src/codecs/jpeg/transform.rs b/src/jpeg/transform.rs → src/codecs/jpeg/transform.rs
diff --git a/src/png.rs → src/codecs/png.rs b/src/png.rs → src/codecs/png.rs
diff --git a/src/pnm/autobreak.rs → src/codecs/pnm/autobreak.rs b/src/pnm/autobreak.rs → src/codecs/pnm/autobreak.rs
diff --git a/src/pnm/decoder.rs → src/codecs/pnm/decoder.rs b/src/pnm/decoder.rs → src/codecs/pnm/decoder.rs
diff --git a/src/pnm/encoder.rs → src/codecs/pnm/encoder.rs b/src/pnm/encoder.rs → src/codecs/pnm/encoder.rs
diff --git a/src/pnm/header.rs → src/codecs/pnm/header.rs b/src/pnm/header.rs → src/codecs/pnm/header.rs
diff --git a/src/pnm/mod.rs → src/codecs/pnm/mod.rs b/src/pnm/mod.rs → src/codecs/pnm/mod.rs
diff --git a/src/tga/decoder.rs → src/codecs/tga/decoder.rs b/src/tga/decoder.rs → src/codecs/tga/decoder.rs
diff --git a/src/tga/encoder.rs → src/codecs/tga/encoder.rs b/src/tga/encoder.rs → src/codecs/tga/encoder.rs
diff --git a/src/tga/header.rs → src/codecs/tga/header.rs b/src/tga/header.rs → src/codecs/tga/header.rs
diff --git a/src/tga/mod.rs → src/codecs/tga/mod.rs b/src/tga/mod.rs → src/codecs/tga/mod.rs
diff --git a/src/tiff.rs → src/codecs/tiff.rs b/src/tiff.rs → src/codecs/tiff.rs
diff --git a/src/webp/decoder.rs → src/codecs/webp/decoder.rs b/src/webp/decoder.rs → src/codecs/webp/decoder.rs
diff --git a/src/webp/mod.rs → src/codecs/webp/mod.rs b/src/webp/mod.rs → src/codecs/webp/mod.rs
diff --git a/src/webp/transform.rs → src/codecs/webp/transform.rs b/src/webp/transform.rs → src/codecs/webp/transform.rs
diff --git a/src/webp/vp8.rs → src/codecs/webp/vp8.rs b/src/webp/vp8.rs → src/codecs/webp/vp8.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -208,35 +208,41 @@ pub mod io;
 // Buffer representations for ffi.
 pub mod flat;
 
-// Image codecs
-#[cfg(feature = "bmp")]
-pub mod bmp;
-#[cfg(feature = "dds")]
-pub mod dds;
-#[cfg(feature = "dxt")]
-pub mod dxt;
-#[cfg(feature = "gif")]
-pub mod gif;
-#[cfg(feature = "hdr")]
-pub mod hdr;
-#[cfg(feature = "ico")]
-pub mod ico;
-#[cfg(feature = "jpeg")]
-pub mod jpeg;
-#[cfg(feature = "png")]
-pub mod png;
-#[cfg(feature = "pnm")]
-pub mod pnm;
-#[cfg(feature = "tga")]
-pub mod tga;
-#[cfg(feature = "tiff")]
-pub mod tiff;
-#[cfg(feature = "webp")]
-pub mod webp;
-#[cfg(feature = "farbfeld")]
-pub mod farbfeld;
-#[cfg(feature = "avif")]
-pub mod avif;
+/// Encoding and decoding for various image file formats.
+pub mod codecs {
+	#[cfg(feature = "bmp")]
+	pub mod bmp;
+	#[cfg(feature = "dds")]
+	pub mod dds;
+	#[cfg(feature = "dxt")]
+	pub mod dxt;
+	#[cfg(feature = "gif")]
+	pub mod gif;
+	#[cfg(feature = "hdr")]
+	pub mod hdr;
+	#[cfg(feature = "ico")]
+	pub mod ico;
+	#[cfg(feature = "jpeg")]
+	pub mod jpeg;
+	#[cfg(feature = "png")]
+	pub mod png;
+	#[cfg(feature = "pnm")]
+	pub mod pnm;
+	#[cfg(feature = "tga")]
+	pub mod tga;
+	#[cfg(feature = "tiff")]
+	pub mod tiff;
+	#[cfg(feature = "webp")]
+	pub mod webp;
+	#[cfg(feature = "farbfeld")]
+	pub mod farbfeld;
+	#[cfg(feature = "avif")]
+	pub mod avif;
+}
+
+// Note: Due to #47236 this deprecation warning isn't actually displayed.
+#[deprecated = "Import via image::codecs:: instead."]
+pub use crate::codecs::*;
 
 mod animation;
 #[path = "buffer.rs"]