Remove image feature from pilatus-engineering, whoes features were moved to imbuf directly

Author: Markus Ineichen

pilatus-emulation-camera-rt/Cargo.toml

@@ -12,7 +12,7 @@ image.workspace = true
 minfac.workspace = true
 pilatus = { workspace = true, features = ["minfac"] }
 pilatus-emulation-camera = { workspace = true, features = ["unstable"] }
-pilatus-engineering = { path = "../pilatus-engineering", features = ["image"] }
+pilatus-engineering = { path = "../pilatus-engineering" }
 pilatus-axum.workspace = true
 serde.workspace = true
 tokio = { workspace = true, features = ["sync"] }
@@ -25,12 +25,12 @@ serde_json = { version = "1", optional = true }
 pilatus-axum-rt = { workspace = true, optional = true }
 pilatus-engineering-rt = { workspace = true, optional = true, features = ["axum"] }
 pilatus-rt = { workspace = true, features = ["unstable"], optional = true }
-reqwest = { version = "0.12", optional = true }
+reqwest = { version = "0.13", optional = true }
 
 [dev-dependencies]
 tracing-test = { version = "0.2", features = ["no-env-filter"] }
 tokio = { workspace = true, features = ["sync", "macros"]}
-imbuf.workspace = true
+imbuf = { workspace = true, features = ["image_0_25"] }
 
 [features]
 integration = [

pilatus-emulation-camera-rt/src/publish_frame.rs

@@ -11,7 +11,7 @@ use pilatus::{
     RelativeDirectoryPath, TransactionError,
     device::{ActorMessage, HandlerResult, Step2, WeakUntypedActorMessageSender},
 };
-use pilatus_engineering::image::{DynamicImage as PilatusDynamicImage, FromImage, ImageWithMeta};
+use pilatus_engineering::image::{DynamicImage as PilatusDynamicImage, ImageWithMeta};
 use tracing::{debug, warn};
 
 use super::DeviceState;
@@ -172,7 +172,7 @@ impl PublisherState {
         let img =
             tokio::task::spawn_blocking(move || image::load_from_memory(&image_data)).await??;
 
-        let pilatus_image = PilatusDynamicImage::from_image(img)?;
+        let pilatus_image = PilatusDynamicImage::try_from(img)?;
         debug!(
             "Publish '{:?}': {:?}",
             &path.0.file_name().and_then(|x| x.to_str()).unwrap_or(""),

pilatus-emulation-camera-rt/src/upload_image.rs

@@ -7,7 +7,7 @@ use pilatus_axum::{
     DeviceJsonError, ServiceCollectionExtensions,
     extract::{InjectRegistered, Path, Query},
 };
-use pilatus_engineering::image::{FromImage, ImageEncoderTrait};
+use pilatus_engineering::image::ImageEncoderTrait;
 
 use crate::DeviceState;
 
@@ -58,7 +58,7 @@ async fn upload_image_to_collection(
         .await
         .map_err(ActorError::custom)?;
 
-    let image = pilatus_engineering::image::DynamicImage::from_image(decode_image)
+    let image = pilatus_engineering::image::DynamicImage::try_from(decode_image)
         .map_err(ActorError::custom)?;
 
     Ok(actor_system

pilatus-emulation-camera/src/lib.rs

@@ -89,6 +89,6 @@ mod tests {
         let params = Params::default();
         let serialized = serde_json::to_string(&params).unwrap();
         println!("serialized = {}", serialized);
-        let deserialized: ParamsImpex = serde_json::from_str(&serialized).unwrap();
+        let _deserialized: ParamsImpex = serde_json::from_str(&serialized).unwrap();
     }
 }

pilatus-engineering-rt/Cargo.toml

@@ -10,11 +10,11 @@ bytes.workspace = true
 chrono = { workspace = true, features = ["serde"], optional = true }
 futures.workspace = true
 image.workspace = true # Must remain an internal dependency
-imbuf.workspace = true 
+imbuf = { workspace = true, features = ["image_0_25"] } 
 minfac.workspace = true
 pilatus = { workspace = true, features = ["minfac"] }
 pilatus-axum = { workspace = true, optional = true }
-pilatus-engineering = { workspace = true }
+pilatus-engineering.workspace = true
 resvg = { version = "0.45.0" }
 thiserror.workspace = true
 tracing.workspace = true

pilatus-engineering/Cargo.toml

@@ -10,7 +10,6 @@ anyhow.workspace = true
 approx = "0.5"
 bytes.workspace = true
 futures.workspace = true
-image = { workspace = true, optional = true }
 imbuf.workspace = true
 jpeg-encoder = { version = "0.6", features = ["simd"], optional = true }
 nalgebra = { version = "0.34", optional = true }
@@ -28,12 +27,12 @@ tracing.workspace = true
 
 tokio = { workspace = true, features = ["sync"], optional = true }
 tokio-stream = { version = "0.1", features = ["fs", "sync"], optional = true }
+
 [dev-dependencies]
 nalgebra = "0.34"
 serde_json.workspace = true
 
 
 [features]
 axum = ["dep:pilatus-axum", "dep:jpeg-encoder", "dep:serde_json"]
-image = ["dep:image"]
 tokio = ["dep:tokio", "tokio-stream"]

pilatus-engineering/src/image.rs

@@ -148,57 +148,6 @@ pub enum EncodeError {
 #[error("Unsupported format {1}")]
 pub struct UnsupportedImageError<TIn>(TIn, Cow<'static, str>);
 
-#[cfg(feature = "image")]
-pub trait FromImage: Sized {
-    fn from_image(value: image::DynamicImage) -> Result<Self, std::num::TryFromIntError>;
-}
-
-#[cfg(feature = "image")]
-impl FromImage for DynamicImage {
-    fn from_image(value: image::DynamicImage) -> Result<Self, std::num::TryFromIntError> {
-        use image::GenericImageView;
-
-        let (width, height) = value.dimensions();
-        let (width, height) = (width.try_into()?, height.try_into()?);
-        Ok(match value {
-            image::DynamicImage::ImageLuma8(x) => {
-                Image::<u8, 1>::new_vec(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageLuma16(x) => {
-                Image::<u16, 1>::new_vec(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageLumaA8(x) => {
-                Image::<[u8; 2], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageLumaA16(x) => {
-                Image::<[u16; 2], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageRgb8(x) => {
-                Image::<[u8; 3], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageRgb16(x) => {
-                Image::<[u16; 3], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageRgb32F(x) => {
-                Image::<[f32; 3], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageRgba8(x) => {
-                Image::<[u8; 4], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageRgba16(x) => {
-                Image::<[u16; 4], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            image::DynamicImage::ImageRgba32F(x) => {
-                Image::<[f32; 4], 1>::new_vec_flat(x.into_vec(), width, height).into()
-            }
-            _ => {
-                tracing::error!("Unexhaustive Enum was extended... returning wrong error");
-                return Err(NonZeroU32::try_from(0).unwrap_err());
-            }
-        })
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -213,19 +162,4 @@ mod tests {
             vec!(1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3)
         );
     }
-
-    #[test]
-    #[cfg(feature = "image")]
-    fn create_image_from_zero_width_fails() {
-        let image: ::image::ImageBuffer<image::Luma<u8>, Vec<u8>> =
-            image::ImageBuffer::from_raw(0, 1, vec![]).unwrap();
-        DynamicImage::from_image(image.into()).unwrap_err();
-    }
-    #[test]
-    #[cfg(feature = "image")]
-    fn create_image_from_zero_height_fails() {
-        let image: ::image::ImageBuffer<image::Luma<u8>, Vec<u8>> =
-            image::ImageBuffer::from_raw(1, 0, vec![]).unwrap();
-        DynamicImage::from_image(image.into()).unwrap_err();
-    }
 }