Add dmi_resize_png using the image crate (#39)

Tweak from panic to error return

Finally fix the resize_png fn (Oh god thank you PJB3005)

Allow user to pick resize mode, use rust_g::Error instead of custom enum

Cargo.toml

@@ -26,6 +26,7 @@ hex = { version = "0.4", optional = true }
 percent-encoding = { version = "2.1", optional = true }
 url-dep = { version = "2.1", package = "url", optional = true }
 png = { version = "0.16", optional = true }
+image = { version = "0.23.10", optional = true }
 git2 = { version = "0.13", optional = true, default-features = false }
 noise = { version = "0.6", optional = true}
 reqwest = { version = "0.10", optional = true, default-features = false, features = ["blocking", "rustls-tls"] }
@@ -40,7 +41,7 @@ zip = { version = "0.5.8", optional = true }
 
 [features]
 default = ["dmi", "log", "git", "http", "json", "sql", "noise"]
-dmi = ["png"]
+dmi = ["png", "image"]
 file = []
 hash = ["md-5", "sha-1", "sha2", "hex"]
 json = ["serde", "serde_json"]

dmsrc/dmi.dm

@@ -1,2 +1,3 @@
 #define rustg_dmi_strip_metadata(fname) call(RUST_G, "dmi_strip_metadata")(fname)
-#define rustg_dmi_create_png(path, width, height, data) call(RUST_G, "dmi_create_png")(path, width, height, data)
+#define rustg_dmi_create_png(path, width, height, data) call(RUST_G, "dmi_create_png")(path, width, height, data)
+#define rustg_dmi_resize_png(path, width, height, resizetype) call(RUST_G, "dmi_resize_png")(path, width, height, resizetype)

src/dmi.rs

@@ -10,7 +10,19 @@ byond_fn! { dmi_strip_metadata(path) {
 } }
 
 byond_fn! { dmi_create_png(path, width, height, data) {
-    create_png(path, width, height , data).err()
+    create_png(path, width, height, data).err()
+} }
+
+byond_fn! { dmi_resize_png(path, width, height, resizetype) {
+    let resizetype = match resizetype {
+        "catmull" => image::imageops::CatmullRom,
+        "gaussian" => image::imageops::Gaussian,
+        "lanczos3" => image::imageops::Lanczos3,
+        "nearest" => image::imageops::Nearest,
+        "triangle" => image::imageops::Triangle,
+        _ => image::imageops::Nearest,
+    };
+    resize_png(path, width, height, resizetype).err()
 } }
 
 fn strip_metadata(path: &str) -> Result<()> {
@@ -63,3 +75,14 @@ fn create_png(path: &str, width: &str, height: &str, data: &str) -> Result<()> {
     let mut writer = encoder.write_header()?;
     Ok(writer.write_image_data(&result)?)
 }
+
+fn resize_png<P: AsRef<Path>>(path: P, width: &str, height: &str, resizetype: image::imageops::FilterType) -> std::result::Result<(), Error> {
+    let width = u32::from_str_radix(width, 10)?;
+    let height = u32::from_str_radix(height, 10)?;
+
+    let img = image::open(path.as_ref())?;
+
+    let newimg = img.resize(width, height, resizetype);
+
+    Ok(newimg.save_with_format(path.as_ref(), image::ImageFormat::Png)?)
+}

src/error.rs

@@ -8,6 +8,8 @@ use thiserror::Error;
 
 #[cfg(feature = "png")]
 use png::{DecodingError, EncodingError};
+#[cfg(feature = "png")]
+use image::error::{ImageError};
 
 #[cfg(feature = "unzip")]
 use zip::result::ZipError;
@@ -36,6 +38,8 @@ pub enum Error {
     ParseIntError(#[from] ParseIntError),
     #[error(transparent)]
     ParseFloatError(#[from] ParseFloatError),
+    #[error(transparent)]
+    GenericImageError(#[from] ImageError),
     #[cfg(feature = "png")]
     #[error("Invalid png data.")]
     InvalidPngDataError,