Merge pull request #151 from axetroy/new_from_blob

feat: create image from Blob and Image

Author: silvia-odwyer

crate/Cargo.toml

@@ -24,27 +24,27 @@ rand="0.7.2"
 imageproc = { version = "0.22.0", default-features = false }
 rusttype="0.9.2"
 base64="0.13.0"
-time="0.2.23"
-wasm-bindgen = { version = "=0.2.78", optional = true }
+time="0.3.21"
+wasm-bindgen = { version = "=0.2.85", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
-js-sys = { version = "0.3.45", optional = true }
+js-sys = { version = "0.3.62", optional = true }
 node-sys = { version = "0.4.2", optional = true }
 perlin2d = "0.2.6"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
 # code size when deploying.
-console_error_panic_hook = { version = "0.1.5", optional = true }
+console_error_panic_hook = { version = "0.1.7", optional = true }
 
 # `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
 # compared to the default allocator's ~10K. It is slower than the default
 # allocator, however.
 wee_alloc = { version = "0.4.2", optional = true }
 
 [dev-dependencies]
-time="0.2.1"
+time="0.3.21"
 criterion = "0.3"
 
 [[bench]]
@@ -69,6 +69,7 @@ features = [
   "console",
   'CssStyleDeclaration',
   'EventTarget',
+  "Blob"
 ]
 optional = true
 

crate/benches/photon_benchmark.rs

@@ -4,11 +4,11 @@ use photon_rs::transform::{resize, SamplingFilter};
 use std::time::Duration;
 
 fn criterion_benchmark(c: &mut Criterion) {
-    c.bench_function("invert_image", |b| b.iter(|| invert_image()));
+    c.bench_function("invert_image", |b| b.iter(invert_image));
 
-    c.bench_function("resize_png", |b| b.iter(|| resize_png()));
+    c.bench_function("resize_png", |b| b.iter(resize_png));
 
-    c.bench_function("resize_jpg", |b| b.iter(|| resize_jpg()));
+    c.bench_function("resize_jpg", |b| b.iter(resize_jpg));
 }
 
 fn invert_image() {
@@ -22,30 +22,30 @@ fn invert_image() {
     let output_img_path = "output.jpg";
 
     // Write to filesystem
-    save_image(img, output_img_path);
+    save_image(img, output_img_path).unwrap();
 }
 
 fn resize_png() {
-    let mut img =
+    let img =
         open_image("examples/input_images/underground.png").expect("File should open");
 
-    let resized_img = resize(&mut img, 800, 600, SamplingFilter::Lanczos3);
+    let resized_img = resize(&img, 800, 600, SamplingFilter::Lanczos3);
 
     let output_img_path = "output.png";
 
-    save_image(resized_img, output_img_path);
+    save_image(resized_img, output_img_path).unwrap();
 }
 
 fn resize_jpg() {
     // Open the image (a PhotonImage is returned)
-    let mut img =
+    let img =
         open_image("examples/input_images/underground.jpg").expect("File should open");
 
-    let resized_img = resize(&mut img, 800, 600, SamplingFilter::Lanczos3);
+    let resized_img = resize(&img, 800, 600, SamplingFilter::Lanczos3);
 
     let output_img_path = "output.jpg";
 
-    save_image(resized_img, output_img_path);
+    save_image(resized_img, output_img_path).unwrap();
 }
 
 fn alter_sample_size() -> Criterion {

crate/examples/seam_carver.rs

@@ -7,14 +7,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("file name = {}", file_name);
 
     // // Open the image
-    let mut img = photon_rs::native::open_image(file_name)?;
+    let img = photon_rs::native::open_image(file_name)?;
     let start = time::Instant::now();
     // Seam Carver
     let (w, h) = (img.get_width(), img.get_height());
     println!("original = w: {}, h: {}", w, h);
     let w = w - 60;
     let h = h - 10;
-    let res = photon_rs::transform::seam_carve(&mut img, w, h);
+    let res = photon_rs::transform::seam_carve(&img, w, h);
     println!("after = w: {}, h: {}", w, h);
 
     // Write the contents of this image in JPEG format.

crate/src/lib.rs

@@ -51,7 +51,9 @@ use wasm_bindgen::prelude::*;
 use wasm_bindgen::Clamped;
 
 #[cfg(feature = "web-sys")]
-use web_sys::{CanvasRenderingContext2d, HtmlCanvasElement, ImageData};
+use web_sys::{
+    Blob, CanvasRenderingContext2d, HtmlCanvasElement, HtmlImageElement, ImageData,
+};
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
@@ -101,6 +103,46 @@ impl PhotonImage {
         }
     }
 
+    /// Create a new PhotonImage from a Blob/File.
+    #[cfg(feature = "web-sys")]
+    pub fn new_from_blob(blob: Blob) -> PhotonImage {
+        let bytes: js_sys::Uint8Array = js_sys::Uint8Array::new(&blob);
+
+        let vec = bytes.to_vec();
+
+        PhotonImage::new_from_byteslice(vec)
+    }
+
+    /// Create a new PhotonImage from a HTMLImageElement
+    #[cfg(feature = "web-sys")]
+    pub fn new_from_image(image: HtmlImageElement) -> PhotonImage {
+        set_panic_hook();
+
+        let document = web_sys::window().unwrap().document().unwrap();
+
+        let canvas = document
+            .create_element("canvas")
+            .unwrap()
+            .dyn_into::<web_sys::HtmlCanvasElement>()
+            .unwrap();
+
+        canvas.set_width(image.width());
+        canvas.set_height(image.height());
+
+        let context = canvas
+            .get_context("2d")
+            .unwrap()
+            .unwrap()
+            .dyn_into::<CanvasRenderingContext2d>()
+            .unwrap();
+
+        context
+            .draw_image_with_html_image_element(&image, 0.0, 0.0)
+            .unwrap();
+
+        open_image(canvas, context)
+    }
+
     // pub fn new_from_buffer(buffer: &Buffer, width: u32, height: u32) -> PhotonImage {
     //     // Convert a Node.js Buffer into a Vec<u8>
     //     let raw_pixels: Vec<u8> = Uint8Array::new_with_byte_offset_and_length(